From fd9eedf224991f02d01b2eb4057041087c3000ce Mon Sep 17 00:00:00 2001 From: gitpusha Date: Tue, 10 Nov 2020 17:06:48 +0100 Subject: [PATCH] chore: cleanup --- .../functions/InstaDapp/connectors/FConnectCompound.sol | 8 ++++---- .../connectors/FConnectGelatoProviderPayment.sol | 4 ++-- contracts/functions/InstaDapp/connectors/FInstaPoolV2.sol | 4 ++-- contracts/functions/gelato/FGelatoDebtBridge.sol | 4 ++-- .../connectors/IConnectGelatoProviderPayment.sol | 2 +- pre-compiles/IUniswapExchange.json | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contracts/functions/InstaDapp/connectors/FConnectCompound.sol b/contracts/functions/InstaDapp/connectors/FConnectCompound.sol index baf62da..eb9b019 100644 --- a/contracts/functions/InstaDapp/connectors/FConnectCompound.sol +++ b/contracts/functions/InstaDapp/connectors/FConnectCompound.sol @@ -6,7 +6,7 @@ import { } from "../../../interfaces/InstaDapp/connectors/IConnectCompound.sol"; function _encodeDepositCompound( - address _colToken, + address _token, uint256 _amt, uint256 _getId, uint256 _setId @@ -14,7 +14,7 @@ function _encodeDepositCompound( return abi.encodeWithSelector( IConnectCompound.deposit.selector, - _colToken, + _token, _amt, _getId, _setId @@ -22,7 +22,7 @@ function _encodeDepositCompound( } function _encodeBorrowCompound( - address _colToken, + address _token, uint256 _amt, uint256 _getId, uint256 _setId @@ -30,7 +30,7 @@ function _encodeBorrowCompound( return abi.encodeWithSelector( IConnectCompound.borrow.selector, - _colToken, + _token, _amt, _getId, _setId diff --git a/contracts/functions/InstaDapp/connectors/FConnectGelatoProviderPayment.sol b/contracts/functions/InstaDapp/connectors/FConnectGelatoProviderPayment.sol index 75dff3c..36a69f2 100644 --- a/contracts/functions/InstaDapp/connectors/FConnectGelatoProviderPayment.sol +++ b/contracts/functions/InstaDapp/connectors/FConnectGelatoProviderPayment.sol @@ -6,7 +6,7 @@ import { } from "../../../interfaces/InstaDapp/connectors/IConnectGelatoProviderPayment.sol"; function _encodePayGelatoProvider( - address _colToken, + address _token, uint256 _amt, uint256 _getId, uint256 _setId @@ -14,7 +14,7 @@ function _encodePayGelatoProvider( return abi.encodeWithSelector( IConnectGelatoProviderPayment.payProvider.selector, - _colToken, + _token, _amt, _getId, _setId diff --git a/contracts/functions/InstaDapp/connectors/FInstaPoolV2.sol b/contracts/functions/InstaDapp/connectors/FInstaPoolV2.sol index 4ffadb0..57ed662 100644 --- a/contracts/functions/InstaDapp/connectors/FInstaPoolV2.sol +++ b/contracts/functions/InstaDapp/connectors/FInstaPoolV2.sol @@ -6,7 +6,7 @@ import { } from "../../../interfaces/InstaDapp/connectors/IConnectInstaPoolV2.sol"; function _encodeFlashPayback( - address _colToken, + address _token, uint256 _amt, uint256 _getId, uint256 _setId @@ -14,7 +14,7 @@ function _encodeFlashPayback( return abi.encodeWithSelector( IConnectInstaPoolV2.flashPayback.selector, - _colToken, + _token, _amt, _getId, _setId diff --git a/contracts/functions/gelato/FGelatoDebtBridge.sol b/contracts/functions/gelato/FGelatoDebtBridge.sol index dadf0f0..5c6b8c9 100644 --- a/contracts/functions/gelato/FGelatoDebtBridge.sol +++ b/contracts/functions/gelato/FGelatoDebtBridge.sol @@ -57,14 +57,14 @@ function _wCalcDebtToRepay( ); } -function _getFlashLoanRoute(address _colTokenA, uint256 _wTokenADebtToMove) +function _getFlashLoanRoute(address _tokenA, uint256 _wTokenADebtToMove) view returns (uint256) { IInstaPoolResolver.RouteData memory rData = IInstaPoolResolver( INSTA_POOL_RESOLVER ) - .getTokenLimit(_colTokenA); + .getTokenLimit(_tokenA); if (rData.dydx > _wTokenADebtToMove) return 0; if (rData.maker > _wTokenADebtToMove) return 1; diff --git a/contracts/interfaces/InstaDapp/connectors/IConnectGelatoProviderPayment.sol b/contracts/interfaces/InstaDapp/connectors/IConnectGelatoProviderPayment.sol index d89249c..4a86aff 100644 --- a/contracts/interfaces/InstaDapp/connectors/IConnectGelatoProviderPayment.sol +++ b/contracts/interfaces/InstaDapp/connectors/IConnectGelatoProviderPayment.sol @@ -7,7 +7,7 @@ interface IConnectGelatoProviderPayment is ConnectorInterface { function setProvider(address _provider) external; function payProvider( - address _colToken, + address _token, uint256 _amt, uint256 _getId, uint256 _setId diff --git a/pre-compiles/IUniswapExchange.json b/pre-compiles/IUniswapExchange.json index 74f1c9d..7c47ffc 100644 --- a/pre-compiles/IUniswapExchange.json +++ b/pre-compiles/IUniswapExchange.json @@ -173,7 +173,7 @@ }, { "internalType": "uint256", - "name": "max_colTokens", + "name": "max_tokens", "type": "uint256" }, { @@ -275,7 +275,7 @@ }, { "internalType": "uint256", - "name": "min_colTokens_bought", + "name": "min_tokens_bought", "type": "uint256" }, {