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

minor changes

Browse Source
This commit is contained in:
Richa-iitr 2022-06-13 14:15:21 +05:30
parent 32429d2b05
commit 8e98da39fd
6 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,19 +47,18 @@ contract SwapHelpers {
// require _connectors[i] == "1INCH-A" || "ZEROX-A" || "PARASWAP-A" || similar connectors // require _connectors[i] == "1INCH-A" || "ZEROX-A" || "PARASWAP-A" || similar connectors
for (uint256 i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
bytes4 swapData = bytes4( bytes4 swapData = (keccak256(bytes(_connectors[i])) ==
keccak256("swap(address,address,uint256,uint256,bytes,uint256)") keccak256(bytes("1INCH-A")))
); ? bytes4(
if (
keccak256(bytes(_connectors[i])) == keccak256(bytes("1INCH-A"))
) {
swapData = bytes4(
keccak256( keccak256(
"sell(address,address,uint256,uint256,bytes,uint256)" "sell(address,address,uint256,uint256,bytes,uint256)"
) )
)
: bytes4(
keccak256(
"swap(address,address,uint256,uint256,bytes,uint256)"
)
); );
}
bytes memory _data = abi.encodeWithSelector( bytes memory _data = abi.encodeWithSelector(
swapData, swapData,

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

@ -54,11 +54,8 @@ abstract contract Swap is SwapHelpers, Events {
uint256 _buyAmt; uint256 _buyAmt;
uint256 _sellAmt; uint256 _sellAmt;
if (!success) { require(success, "swap-Aggregator-failed");
revert("swap-failed");
} else {
(_buyAmt, _sellAmt) = decodeEvents(_connector, returnData); (_buyAmt, _sellAmt) = decodeEvents(_connector, returnData);
}
_eventName = "LogSwapAggregator(string,address,address,uint256,uint256,uint256)"; _eventName = "LogSwapAggregator(string,address,address,uint256,uint256,uint256)";
_eventParam = abi.encode( _eventParam = abi.encode(

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

@ -19,6 +19,7 @@ contract SwapHelpers {
bytes[] callDatas; bytes[] callDatas;
uint256 setId; uint256 setId;
} }
/** /**
*@dev Swap using the dex aggregators. *@dev Swap using the dex aggregators.
*@param _connectors name of the connectors in preference order. *@param _connectors name of the connectors in preference order.
@ -46,17 +47,18 @@ contract SwapHelpers {
// require _connectors[i] == "1INCH-A" || "ZEROX-A" || "PARASWAP-A" || similar connectors // require _connectors[i] == "1INCH-A" || "ZEROX-A" || "PARASWAP-A" || similar connectors
for (uint256 i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
bytes4 swapData = bytes4( bytes4 swapData = (keccak256(bytes(_connectors[i])) ==
keccak256("swap(address,address,uint256,uint256,bytes,uint256)") keccak256(bytes("1INCH-A")))
); ? bytes4(
if (keccak256(bytes(_connectors[i])) == keccak256(bytes("1INCH-A"))) {
swapData = bytes4(
keccak256( keccak256(
"sell(address,address,uint256,uint256,bytes,uint256)" "sell(address,address,uint256,uint256,bytes,uint256)"
) )
)
: bytes4(
keccak256(
"swap(address,address,uint256,uint256,bytes,uint256)"
)
); );
}
bytes memory _data = abi.encodeWithSelector( bytes memory _data = abi.encodeWithSelector(
swapData, swapData,

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

@ -54,11 +54,8 @@ abstract contract Swap is SwapHelpers, Events {
uint256 _buyAmt; uint256 _buyAmt;
uint256 _sellAmt; uint256 _sellAmt;
if (!success) { require(success, "swap-Aggregator-failed");
revert("swap-failed");
} else {
(_buyAmt, _sellAmt) = decodeEvents(_connector, returnData); (_buyAmt, _sellAmt) = decodeEvents(_connector, returnData);
}
_eventName = "LogSwapAggregator(string,address,address,uint256,uint256,uint256)"; _eventName = "LogSwapAggregator(string,address,address,uint256,uint256,uint256)";
_eventParam = abi.encode( _eventParam = abi.encode(

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

@ -47,17 +47,18 @@ contract SwapHelpers {
// require _connectors[i] == "1INCH-A" || "ZEROX-A" || "PARASWAP-A" || similar connectors // require _connectors[i] == "1INCH-A" || "ZEROX-A" || "PARASWAP-A" || similar connectors
for (uint256 i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
bytes4 swapData = bytes4( bytes4 swapData = (keccak256(bytes(_connectors[i])) ==
keccak256("swap(address,address,uint256,uint256,bytes,uint256)") keccak256(bytes("1INCH-A")))
); ? bytes4(
if (keccak256(bytes(_connectors[i])) == keccak256(bytes("1INCH-A"))) {
swapData = bytes4(
keccak256( keccak256(
"sell(address,address,uint256,uint256,bytes,uint256)" "sell(address,address,uint256,uint256,bytes,uint256)"
) )
)
: bytes4(
keccak256(
"swap(address,address,uint256,uint256,bytes,uint256)"
)
); );
}
bytes memory _data = abi.encodeWithSelector( bytes memory _data = abi.encodeWithSelector(
swapData, swapData,

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

@ -54,11 +54,8 @@ abstract contract Swap is SwapHelpers, Events {
uint256 _buyAmt; uint256 _buyAmt;
uint256 _sellAmt; uint256 _sellAmt;
if (!success) { require(success, "swap-Aggregator-failed");
revert("swap-failed");
} else {
(_buyAmt, _sellAmt) = decodeEvents(_connector, returnData); (_buyAmt, _sellAmt) = decodeEvents(_connector, returnData);
}
_eventName = "LogSwapAggregator(string,address,address,uint256,uint256,uint256)"; _eventName = "LogSwapAggregator(string,address,address,uint256,uint256,uint256)";
_eventParam = abi.encode( _eventParam = abi.encode(