From f17c35a2ef8fa3a8796868d54989fc7862165c16 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Thu, 23 Sep 2021 00:13:16 +0530 Subject: [PATCH 1/2] Added 1Inch arbitrum connector --- .../arbitrum/connectors/1inch/events.sol | 12 ++ .../arbitrum/connectors/1inch/helpers.sol | 23 ++++ .../arbitrum/connectors/1inch/interface.sol | 30 ++++ contracts/arbitrum/connectors/1inch/main.sol | 128 ++++++++++++++++++ 4 files changed, 193 insertions(+) create mode 100644 contracts/arbitrum/connectors/1inch/events.sol create mode 100644 contracts/arbitrum/connectors/1inch/helpers.sol create mode 100644 contracts/arbitrum/connectors/1inch/interface.sol create mode 100644 contracts/arbitrum/connectors/1inch/main.sol diff --git a/contracts/arbitrum/connectors/1inch/events.sol b/contracts/arbitrum/connectors/1inch/events.sol new file mode 100644 index 00000000..bec3b27a --- /dev/null +++ b/contracts/arbitrum/connectors/1inch/events.sol @@ -0,0 +1,12 @@ +pragma solidity ^0.7.0; + +contract Events { + event LogSell( + address indexed buyToken, + address indexed sellToken, + uint256 buyAmt, + uint256 sellAmt, + uint256 getId, + uint256 setId + ); +} \ No newline at end of file diff --git a/contracts/arbitrum/connectors/1inch/helpers.sol b/contracts/arbitrum/connectors/1inch/helpers.sol new file mode 100644 index 00000000..41cc4b0d --- /dev/null +++ b/contracts/arbitrum/connectors/1inch/helpers.sol @@ -0,0 +1,23 @@ +pragma solidity ^0.7.0; + +import { TokenInterface } from "../../common/interfaces.sol"; +import { DSMath } from "../../common/math.sol"; +import { Basic } from "../../common/basic.sol"; + + +abstract contract Helpers is DSMath, Basic { + /** + * @dev 1Inch Address + */ + address internal constant oneInchAddr = 0x11111112542D85B3EF69AE05771c2dCCff4fAa26; + + /** + * @dev 1inch swap function sig + */ + bytes4 internal constant oneInchSwapSig = 0x7c025200; + + /** + * @dev 1inch swap function sig + */ + bytes4 internal constant oneInchUnoswapSig = 0x2e95b6c8; +} \ No newline at end of file diff --git a/contracts/arbitrum/connectors/1inch/interface.sol b/contracts/arbitrum/connectors/1inch/interface.sol new file mode 100644 index 00000000..f35b9277 --- /dev/null +++ b/contracts/arbitrum/connectors/1inch/interface.sol @@ -0,0 +1,30 @@ +pragma solidity ^0.7.0; + +import { TokenInterface } from "../../common/interfaces.sol"; + +interface OneInchInterace { + function swap( + TokenInterface fromToken, + TokenInterface toToken, + uint256 fromTokenAmount, + uint256 minReturnAmount, + uint256 guaranteedAmount, + address payable referrer, + address[] calldata callAddresses, + bytes calldata callDataConcat, + uint256[] calldata starts, + uint256[] calldata gasLimitsAndValues + ) + external + payable + returns (uint256 returnAmount); +} + +struct OneInchData { + TokenInterface sellToken; + TokenInterface buyToken; + uint _sellAmt; + uint _buyAmt; + uint unitAmt; + bytes callData; +} \ No newline at end of file diff --git a/contracts/arbitrum/connectors/1inch/main.sol b/contracts/arbitrum/connectors/1inch/main.sol new file mode 100644 index 00000000..7adef93c --- /dev/null +++ b/contracts/arbitrum/connectors/1inch/main.sol @@ -0,0 +1,128 @@ +pragma solidity ^0.7.0; +pragma experimental ABIEncoderV2; + +/** + * @title 1Inch. + * @dev On-chain DEX Aggregator. + */ + +// import files from common directory +import { TokenInterface , MemoryInterface } from "../../common/interfaces.sol"; +import { Stores } from "../../common/stores.sol"; +import { OneInchInterace, OneInchData } from "./interface.sol"; +import { Helpers } from "./helpers.sol"; +import { Events } from "./events.sol"; + +abstract contract OneInchResolver is Helpers, Events { + /** + * @dev 1inch swap uses `.call()`. This function restrict it to call only swap/trade functionality + * @param callData - calldata to extract the first 4 bytes for checking function signature + */ + function checkOneInchSig(bytes memory callData) internal pure returns(bool isOk) { + bytes memory _data = callData; + bytes4 sig; + // solium-disable-next-line security/no-inline-assembly + assembly { + sig := mload(add(_data, 32)) + } + isOk = sig == oneInchSwapSig || sig == oneInchUnoswapSig; + } + + /** + * @dev 1inch API swap handler + * @param oneInchData - contains data returned from 1inch API. Struct defined in interfaces.sol + * @param ethAmt - Eth to swap for .value() + */ + function oneInchSwap( + OneInchData memory oneInchData, + uint ethAmt + ) internal returns (uint buyAmt) { + TokenInterface buyToken = oneInchData.buyToken; + (uint _buyDec, uint _sellDec) = getTokensDec(buyToken, oneInchData.sellToken); + uint _sellAmt18 = convertTo18(_sellDec, oneInchData._sellAmt); + uint _slippageAmt = convert18ToDec(_buyDec, wmul(oneInchData.unitAmt, _sellAmt18)); + + uint initalBal = getTokenBal(buyToken); + + // solium-disable-next-line security/no-call-value + (bool success, ) = oneInchAddr.call{value: ethAmt}(oneInchData.callData); + if (!success) revert("1Inch-swap-failed"); + + uint finalBal = getTokenBal(buyToken); + + buyAmt = sub(finalBal, initalBal); + + require(_slippageAmt <= buyAmt, "Too much slippage"); + } + +} + +abstract contract OneInchResolverHelpers is OneInchResolver { + + /** + * @dev Gets the swapping data from 1inch's API. + * @param oneInchData Struct with multiple swap data defined in interfaces.sol + * @param setId Set token amount at this ID in `InstaMemory` Contract. + */ + function _sell( + OneInchData memory oneInchData, + uint setId + ) internal returns (OneInchData memory) { + TokenInterface _sellAddr = oneInchData.sellToken; + + uint ethAmt; + if (address(_sellAddr) == ethAddr) { + ethAmt = oneInchData._sellAmt; + } else { + approve(TokenInterface(_sellAddr), oneInchAddr, oneInchData._sellAmt); + } + + require(checkOneInchSig(oneInchData.callData), "Not-swap-function"); + + oneInchData._buyAmt = oneInchSwap(oneInchData, ethAmt); + setUint(setId, oneInchData._buyAmt); + + return oneInchData; + + // emitLogSellThree(oneInchData, setId); + } +} + +abstract contract OneInch is OneInchResolverHelpers { + /** + * @dev Sell ETH/ERC20_Token using 1Inch. + * @notice Swap tokens from exchanges like kyber, 0x etc, with calculation done off-chain. + * @param buyAddr The address of the token to buy.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) + * @param sellAddr The address of the token to sell.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) + * @param sellAmt The amount of the token to sell. + * @param unitAmt The amount of buyAmt/sellAmt with slippage. + * @param callData Data from 1inch API. + * @param setId ID stores the amount of token brought. + */ + function sell( + address buyAddr, + address sellAddr, + uint sellAmt, + uint unitAmt, + bytes calldata callData, + uint setId + ) external payable returns (string memory _eventName, bytes memory _eventParam) { + OneInchData memory oneInchData = OneInchData({ + buyToken: TokenInterface(buyAddr), + sellToken: TokenInterface(sellAddr), + unitAmt: unitAmt, + callData: callData, + _sellAmt: sellAmt, + _buyAmt: 0 + }); + + oneInchData = _sell(oneInchData, setId); + + _eventName = "LogSell(address,address,uint256,uint256,uint256,uint256)"; + _eventParam = abi.encode(buyAddr, sellAddr, oneInchData._buyAmt, oneInchData._sellAmt, 0, setId); + } +} + +contract ConnectV2OneInchArbitrum is OneInch { + string public name = "1Inch-v1.0"; +} From 6bd10d6e0f10b6e54dab4f69f589d8103c72f0a0 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Thu, 23 Sep 2021 00:18:13 +0530 Subject: [PATCH 2/2] Added 1inch arbitrum connector address --- docs/connectors.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/connectors.json b/docs/connectors.json index 67b32d4d..4229a514 100644 --- a/docs/connectors.json +++ b/docs/connectors.json @@ -44,7 +44,8 @@ "BASIC-A": "0x9926955e0dd681dc303370c52f4ad0a4dd061687", "BASIC-B": "0xa9b99766e6c676cf1975c0d3166f96c0848ff5ad", "BASIC-C": "0x839c2d3ade63df5b0b8f3e57d5e145057ab41556", - "UNISWAP-V3-A": "0x3254Ce8f5b1c82431B8f21Df01918342215825C2" + "UNISWAP-V3-A": "0x3254Ce8f5b1c82431B8f21Df01918342215825C2", + "1INCH-A": "0xA4BF319968986D2352FA1c550D781bBFCCE3FcaB" } }, "mappings": {