Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated events

Browse Source
This commit is contained in:
Richa-iitr 2022-06-15 03:38:28 +05:30
parent 16ef3fc9f4
commit e90fcd590a
9 changed files with 103 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/avalanche/connectors/swap/events.sol Normal file
View File

@ -0,0 +1,12 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
pragma abicoder v2;
contract Events {
event LogSwapAggregator(
string[] connectors,
string connectorName,
string eventName,
bytes eventParam
);
}

11
contracts/avalanche/connectors/swap/helpers.sol
View File

@ -18,7 +18,11 @@ contract SwapHelpers {
*/ */
function _swap(string[] memory _connectors, bytes[] memory _data) function _swap(string[] memory _connectors, bytes[] memory _data)
internal internal
returns (bool success, bytes memory returnData) returns (
bool success,
bytes memory returnData,
string memory connector
)
{ {
uint256 _length = _connectors.length; uint256 _length = _connectors.length;
require(_length > 0, "zero-length-not-allowed"); require(_length > 0, "zero-length-not-allowed");
@ -28,7 +32,10 @@ contract SwapHelpers {
(success, returnData) = instaConnectors (success, returnData) = instaConnectors
.connectors(_connectors[i]) .connectors(_connectors[i])
.delegatecall(_data[i]); .delegatecall(_data[i]);
if (success) break; if (success) {
connector = _connectors[i];
break;
}
} }
} }
} }

21
contracts/avalanche/connectors/swap/main.sol
View File

@ -9,26 +9,33 @@ pragma experimental ABIEncoderV2;
// import files // import files
import { SwapHelpers } from "./helpers.sol"; import { SwapHelpers } from "./helpers.sol";
import { Events } from "./events.sol";
abstract contract Swap is SwapHelpers { abstract contract Swap is SwapHelpers, Events {
/** /**
* @dev Swap ETH/ERC20_Token using dex aggregators. * @dev Swap ETH/ERC20_Token using dex aggregators.
* @notice Swap tokens from exchanges like 1INCH, 0x etc, with calculation done off-chain. * @notice Swap tokens from exchanges like 1INCH, 0x etc, with calculation done off-chain.
* @param _connectors The name of the connectors like 1INCH-A, 0x etc, in order of their priority. * @param _connectors The name of the connectors like 1INCH-A, 0x etc, in order of their priority.
* @param _data Encoded function call data including function selector encoded with parameters. * @param _data Encoded function call data including function selector encoded with parameters.
*/ */
function swap( function swap(string[] memory _connectors, bytes[] memory _data)
string[] memory _connectors,
bytes[] memory _data
)
external external
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
(bool success, bytes memory returnData) = _swap(_connectors, _data); (bool success, bytes memory returnData, string memory connector) = _swap(
_connectors,
_data
);
require(success, "swap-Aggregator-failed"); require(success, "swap-Aggregator-failed");
(_eventName, _eventParam) = abi.decode(returnData, (string, bytes)); (string memory eventName, bytes memory eventParam) = abi.decode(
returnData,
(string, bytes)
);
_eventName = "LogSwapAggregator(string[],string,string,bytes)";
_eventParam = abi.encode(_connectors, connector, eventName, eventParam);
} }
} }

12
contracts/mainnet/connectors/swap/events.sol Normal file
View File

@ -0,0 +1,12 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
pragma abicoder v2;
contract Events {
event SwapAggregator(
string[] connectors,
string connectorName,
string eventName,
bytes eventParam
);
}

11
contracts/mainnet/connectors/swap/helpers.sol
View File

@ -18,7 +18,11 @@ contract SwapHelpers {
*/ */
function _swap(string[] memory _connectors, bytes[] memory _data) function _swap(string[] memory _connectors, bytes[] memory _data)
internal internal
returns (bool success, bytes memory returnData) returns (
bool success,
bytes memory returnData,
string memory connector
)
{ {
uint256 _length = _connectors.length; uint256 _length = _connectors.length;
require(_length > 0, "zero-length-not-allowed"); require(_length > 0, "zero-length-not-allowed");
@ -28,7 +32,10 @@ contract SwapHelpers {
(success, returnData) = instaConnectors (success, returnData) = instaConnectors
.connectors(_connectors[i]) .connectors(_connectors[i])
.delegatecall(_data[i]); .delegatecall(_data[i]);
if (success) break; if (success) {
connector = _connectors[i];
break;
}
} }
} }
} }

16
contracts/mainnet/connectors/swap/main.sol
View File

@ -9,8 +9,9 @@ pragma experimental ABIEncoderV2;
// import files // import files
import { SwapHelpers } from "./helpers.sol"; import { SwapHelpers } from "./helpers.sol";
import { Events } from "./events.sol";
abstract contract Swap is SwapHelpers { abstract contract Swap is SwapHelpers, Events {
/** /**
* @dev Swap ETH/ERC20_Token using dex aggregators. * @dev Swap ETH/ERC20_Token using dex aggregators.
* @notice Swap tokens from exchanges like 1INCH, 0x etc, with calculation done off-chain. * @notice Swap tokens from exchanges like 1INCH, 0x etc, with calculation done off-chain.
@ -22,10 +23,19 @@ abstract contract Swap is SwapHelpers {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
(bool success, bytes memory returnData) = _swap(_connectors, _data); (bool success, bytes memory returnData, string memory connector) = _swap(
_connectors,
_data
);
require(success, "swap-Aggregator-failed"); require(success, "swap-Aggregator-failed");
(_eventName, _eventParam) = abi.decode(returnData, (string, bytes)); (string memory eventName, bytes memory eventParam) = abi.decode(
returnData,
(string, bytes)
);
_eventName = "LogSwapAggregator(string[],string,string,bytes)";
_eventParam = abi.encode(_connectors, connector, eventName, eventParam);
} }
} }

12
contracts/polygon/connectors/swap/events.sol Normal file
View File

@ -0,0 +1,12 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
pragma abicoder v2;
contract Events {
event SwapAggregator(
string[] connectors,
string connectorName,
string eventName,
bytes eventParam
);
}

11
contracts/polygon/connectors/swap/helpers.sol
View File

@ -18,7 +18,11 @@ contract SwapHelpers {
*/ */
function _swap(string[] memory _connectors, bytes[] memory _data) function _swap(string[] memory _connectors, bytes[] memory _data)
internal internal
returns (bool success, bytes memory returnData) returns (
bool success,
bytes memory returnData,
string memory connector
)
{ {
uint256 _length = _connectors.length; uint256 _length = _connectors.length;
require(_length > 0, "zero-length-not-allowed"); require(_length > 0, "zero-length-not-allowed");
@ -28,7 +32,10 @@ contract SwapHelpers {
(success, returnData) = instaConnectors (success, returnData) = instaConnectors
.connectors(_connectors[i]) .connectors(_connectors[i])
.delegatecall(_data[i]); .delegatecall(_data[i]);
if (success) break; if (success) {
connector = _connectors[i];
break;
}
} }
} }
} }

16
contracts/polygon/connectors/swap/main.sol
View File

@ -9,8 +9,9 @@ pragma experimental ABIEncoderV2;
// import files // import files
import { SwapHelpers } from "./helpers.sol"; import { SwapHelpers } from "./helpers.sol";
import { Events } from "./events.sol";
abstract contract Swap is SwapHelpers { abstract contract Swap is SwapHelpers, Events {
/** /**
* @dev Swap ETH/ERC20_Token using dex aggregators. * @dev Swap ETH/ERC20_Token using dex aggregators.
* @notice Swap tokens from exchanges like 1INCH, 0x etc, with calculation done off-chain. * @notice Swap tokens from exchanges like 1INCH, 0x etc, with calculation done off-chain.
@ -22,10 +23,19 @@ abstract contract Swap is SwapHelpers {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
(bool success, bytes memory returnData) = _swap(_connectors, _data); (bool success, bytes memory returnData, string memory connector) = _swap(
_connectors,
_data
);
require(success, "swap-Aggregator-failed"); require(success, "swap-Aggregator-failed");
(_eventName, _eventParam) = abi.decode(returnData, (string, bytes)); (string memory eventName, bytes memory eventParam) = abi.decode(
returnData,
(string, bytes)
);
_eventName = "LogSwapAggregator(string[],string,string,bytes)";
_eventParam = abi.encode(_connectors, connector, eventName, eventParam);
} }
} }