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

Merge pull request #50 from Instadapp/1inch-update

Browse Source 
Updated 1inch connector
This commit is contained in:
Thrilok kumar 2021-06-25 22:44:49 +05:30 committed by GitHub
commit 6c5d8ae361
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contracts/mainnet/connectors/1inch/helpers.sol
View File

@ -9,10 +9,15 @@ abstract contract Helpers is DSMath, Basic {
/**
* @dev 1Inch Address
*/
address internal constant oneInchAddr = 0x111111125434b319222CdBf8C261674aDB56F3ae;
address internal constant oneInchAddr = 0x11111112542D85B3EF69AE05771c2dCCff4fAa26;
/**
* @dev 1inch swap function sig
*/
bytes4 internal constant oneInchSig = 0x90411a32;
bytes4 internal constant oneInchSwapSig = 0x7c025200;
/**
* @dev 1inch swap function sig
*/
bytes4 internal constant oneInchUnoswapSig = 0x2e95b6c8;
}

4
contracts/mainnet/connectors/1inch/main.sol
View File

@ -25,7 +25,7 @@ abstract contract OneInchResolver is Helpers, Events {
assembly {
sig := mload(add(_data, 32))
}
isOk = sig == oneInchSig;
isOk = sig == oneInchSwapSig || sig == oneInchUnoswapSig;
}
/**
@ -124,5 +124,5 @@ abstract contract OneInch is OneInchResolverHelpers {
}
contract ConnectV2OneInch is OneInch {
string public name = "1Inch-v1";
string public name = "1Inch-v1.1";
}

24
contracts/mainnet/connectors_old/1inch.sol
View File

@ -82,14 +82,21 @@ abstract contract OneHelpers is Stores, DSMath {
* @dev Return 1Inch Address
*/
function getOneInchAddress() internal pure returns (address) {
return 0x111111125434b319222CdBf8C261674aDB56F3ae;
return 0x11111112542D85B3EF69AE05771c2dCCff4fAa26;
}
/**
* @dev Return 1inch swap function sig
*/
function getOneInchSig() internal pure returns (bytes4) {
return 0x90411a32;
function getOneInchSwapSig() internal pure returns (bytes4) {
return 0x7c025200;
}
/**
* @dev Return 1inch swap function sig
*/
function getOneInchUnoswapSig() internal pure returns (bytes4) {
return 0x2e95b6c8;
}
function convert18ToDec(uint _dec, uint256 _amt) internal pure returns (uint256 amt) {
@ -224,7 +231,7 @@ abstract contract OneInchResolver is OneProtoResolver {
assembly {
sig := mload(add(_data, 32))
}
isOk = sig == getOneInchSig();
isOk = sig == getOneInchSwapSig() || sig == getOneInchUnoswapSig();
}
struct OneInchData {
@ -585,5 +592,12 @@ abstract contract OneInch is OneProto {
}
contract ConnectOne is OneInch {
string public name = "1inch-1proto-v1";
string public name = "1inch-1proto-v1.2";
/**
* @dev Connector Details
*/
function connectorID() public pure returns(uint _type, uint _id) {
(_type, _id) = (1, 98);
}
}