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

Minor changes

Browse Source
This commit is contained in:
Thrilok Kumar 2020-08-15 01:51:26 +05:30
parent ad235465e2
commit 5eff1d37dc
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
contracts/connectors/1inch.sol
View File

@ -1,7 +1,6 @@
pragma solidity ^0.6.0; pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
// import files from common directory // import files from common directory
import { TokenInterface , MemoryInterface, EventInterface} from "../common/interfaces.sol"; import { TokenInterface , MemoryInterface, EventInterface} from "../common/interfaces.sol";
import { Stores } from "../common/stores.sol"; import { Stores } from "../common/stores.sol";
@ -26,25 +25,21 @@ interface OneInchInterace {
} }
interface OneProtoInterface { interface OneProtoInterface {
function swapWithReferral( function swap(
TokenInterface fromToken, TokenInterface fromToken,
TokenInterface destToken, TokenInterface destToken,
uint256 amount, uint256 amount,
uint256 minReturn, uint256 minReturn,
uint256[] calldata distribution, uint256[] calldata distribution,
uint256 flags, // See contants in IOneSplit.sol uint256 flags // See contants in IOneSplit.sol
address referral,
uint256 feePercent
) external payable returns(uint256); ) external payable returns(uint256);
function swapWithReferralMulti( function swapMulti(
TokenInterface[] calldata tokens, TokenInterface[] calldata tokens,
uint256 amount, uint256 amount,
uint256 minReturn, uint256 minReturn,
uint256[] calldata distribution, uint256[] calldata distribution,
uint256[] calldata flags, uint256[] calldata flags
address referral,
uint256 feePercent
) external payable returns(uint256 returnAmount); ) external payable returns(uint256 returnAmount);
function getExpectedReturn( function getExpectedReturn(
@ -62,13 +57,25 @@ interface OneProtoInterface {
); );
} }
interface OneProtoMappingInterface {
function oneProtoAddress() external view returns(address);
}
contract OneHelpers is Stores, DSMath { contract OneHelpers is Stores, DSMath {
/**
* @dev Return 1proto mapping Address
*/
function getOneProtoMappingAddress() internal pure returns (address payable) {
return 0x8d0287AFa7755BB5f2eFe686AA8d4F0A7BC4AE7F;
}
/** /**
* @dev Return 1proto Address * @dev Return 1proto Address
*/ */
function getOneProtoAddress() internal pure returns (address payable) { function getOneProtoAddress() internal view returns (address payable) {
return 0x50FDA034C0Ce7a8f7EFDAebDA7Aa7cA21CC1267e; return payable(OneProtoMappingInterface(getOneProtoMappingAddress()).oneProtoAddress());
} }
/** /**
@ -92,10 +99,6 @@ contract OneHelpers is Stores, DSMath {
return 0xf88309d7; return 0xf88309d7;
} }
function getReferralAddr() internal pure returns (address) {
return 0xa7615CD307F323172331865181DC8b80a2834324; // TODO - change address
}
function convert18ToDec(uint _dec, uint256 _amt) internal pure returns (uint256 amt) { function convert18ToDec(uint _dec, uint256 _amt) internal pure returns (uint256 amt) {
amt = (_amt / 10 ** (18 - _dec)); amt = (_amt / 10 ** (18 - _dec));
} }
@ -164,15 +167,13 @@ contract OneProtoResolver is OneHelpers {
uint initalBal = getTokenBal(_buyAddr); uint initalBal = getTokenBal(_buyAddr);
oneProtoContract.swapWithReferral.value(ethAmt)( oneProtoContract.swap.value(ethAmt)(
_sellAddr, _sellAddr,
_buyAddr, _buyAddr,
_sellAmt, _sellAmt,
_slippageAmt, _slippageAmt,
oneProtoData.distribution, oneProtoData.distribution,
oneProtoData.disableDexes, oneProtoData.disableDexes
getReferralAddr(),
0
); );
uint finalBal = getTokenBal(_buyAddr); uint finalBal = getTokenBal(_buyAddr);
@ -207,14 +208,12 @@ contract OneProtoResolver is OneHelpers {
} }
uint initalBal = getTokenBal(_buyAddr); uint initalBal = getTokenBal(_buyAddr);
oneSplitContract.swapWithReferralMulti.value(ethAmt)( oneSplitContract.swapMulti.value(ethAmt)(
convertToTokenInterface(oneProtoData.tokens), convertToTokenInterface(oneProtoData.tokens),
_sellAmt, _sellAmt,
_slippageAmt, _slippageAmt,
oneProtoData.distribution, oneProtoData.distribution,
oneProtoData.disableDexes, oneProtoData.disableDexes
getReferralAddr(),
0
); );
uint finalBal = getTokenBal(_buyAddr); uint finalBal = getTokenBal(_buyAddr);