From 7690b22e8e026920b5ef40d1d0702bb5cdfdb924 Mon Sep 17 00:00:00 2001
From: andyk <kyzia.ru@gmail.com>
Date: Fri, 3 Jul 2020 12:15:30 +0300
Subject: [PATCH] repo cleanup -1

---
 contracts/fees/MockKyberProxy.sol             |   45 -
 contracts/fees/MockOneSplit.sol               |   63 -
 contracts/fees/OneSplitAdapter.sol            |   79 -
 contracts/fees/TokenDistributor.sol           |    6 +-
 .../IKyberNetworkProxyInterface.sol           |   23 -
 contracts/interfaces/IOneSplit.sol            |   60 -
 contracts/mocks/tokens/MockBAT.sol            |    9 -
 contracts/mocks/tokens/MockBUSD.sol           |    8 -
 contracts/mocks/tokens/MockDAI.sol            |    9 -
 contracts/mocks/tokens/MockKNC.sol            |    8 -
 contracts/mocks/tokens/MockLEND.sol           |    9 -
 contracts/mocks/tokens/MockLINK.sol           |    8 -
 contracts/mocks/tokens/MockMANA.sol           |    8 -
 contracts/mocks/tokens/MockMKR.sol            |    8 -
 contracts/mocks/tokens/MockREP.sol            |    8 -
 contracts/mocks/tokens/MockSNX.sol            |    8 -
 contracts/mocks/tokens/MockSUSD.sol           |    8 -
 contracts/mocks/tokens/MockTUSD.sol           |    8 -
 contracts/mocks/tokens/MockUNI_DAI_ETH.sol    |    8 -
 contracts/mocks/tokens/MockUNI_LEND_ETH.sol   |    8 -
 contracts/mocks/tokens/MockUNI_LINK_ETH.sol   |    8 -
 contracts/mocks/tokens/MockUNI_MKR_ETH.sol    |    8 -
 contracts/mocks/tokens/MockUNI_SETH_ETH.sol   |    8 -
 contracts/mocks/tokens/MockUNI_USDC_ETH.sol   |    8 -
 contracts/mocks/tokens/MockUSD.sol            |    8 -
 contracts/mocks/tokens/MockUSDC.sol           |    8 -
 contracts/mocks/tokens/MockUSDT.sol           |    8 -
 contracts/mocks/tokens/MockWBTC.sol           |    8 -
 contracts/mocks/tokens/MockZRX.sol            |    8 -
 docker-compose.yml                            |   11 -
 helpers/contracts-helpers.ts                  |   42 +-
 helpers/types.ts                              |    2 -
 package.json                                  |    1 -
 tasks/deployments/deploy-Example.ts           |   23 -
 tasks/migrations/dev-deployment.ts            |   18 -
 test/__setup.spec.ts                          |   26 +-
 test/atoken-transfer.spec.ts                  |    2 +-
 types/ATokenFactory.ts                        |    2 +-
 types/AaveProtocolTestHelpersFactory.ts       |    2 +-
 types/Example.d.ts                            |   53 -
 types/ExampleFactory.ts                       |   71 -
 types/GenericLogicFactory.ts                  |    2 +-
 types/IKyberNetworkProxyInterface.d.ts        |  186 --
 types/IKyberNetworkProxyInterfaceFactory.ts   |  199 --
 types/IOneSplit.d.ts                          |  294 ---
 types/IOneSplitFactory.ts                     |  334 ----
 types/IOneSplitView.d.ts                      |  210 --
 types/IOneSplitViewFactory.ts                 |  258 ---
 types/IVariableDebtToken.d.ts                 |   10 +
 types/IVariableDebtTokenFactory.ts            |   19 +
 types/Ierc20Burnable.d.ts                     |   74 -
 types/Ierc20BurnableFactory.ts                |   50 -
 types/Ierc20Mintable.d.ts                     |   54 -
 types/Ierc20MintableBurnable.d.ts             |  204 --
 types/Ierc20MintableBurnableFactory.ts        |  250 ---
 types/Ierc20MintableFactory.ts                |   32 -
 types/LendingPoolConfiguratorFactory.ts       |    2 +-
 types/LendingPoolCore.d.ts                    | 1408 --------------
 types/LendingPoolCoreFactory.ts               | 1698 ----------------
 types/LendingPoolDataProvider.d.ts            |  448 -----
 types/LendingPoolDataProviderFactory.ts       |  505 -----
 types/LendingPoolFactory.ts                   |    2 +-
 types/LendingPoolLiquidationManagerFactory.ts |    2 +-
 types/LendingPoolParametersProvider.d.ts      |  105 -
 types/LendingPoolParametersProviderFactory.ts |  103 -
 types/MockAggregatorBase.d.ts                 |   62 -
 types/MockAggregatorBaseFactory.ts            |   98 -
 types/MockAggregatorBat.d.ts                  |   62 -
 types/MockAggregatorBatFactory.ts             |   98 -
 types/MockAggregatorBusd.d.ts                 |   62 -
 types/MockAggregatorBusdFactory.ts            |   98 -
 types/MockAggregatorDai.d.ts                  |   62 -
 types/MockAggregatorDaiFactory.ts             |   98 -
 types/MockAggregatorKnc.d.ts                  |   62 -
 types/MockAggregatorKncFactory.ts             |   98 -
 types/MockAggregatorLend.d.ts                 |   62 -
 types/MockAggregatorLendFactory.ts            |   98 -
 types/MockAggregatorLink.d.ts                 |   62 -
 types/MockAggregatorLinkFactory.ts            |   98 -
 types/MockAggregatorMana.d.ts                 |   62 -
 types/MockAggregatorManaFactory.ts            |   98 -
 types/MockAggregatorMkr.d.ts                  |   62 -
 types/MockAggregatorMkrFactory.ts             |   98 -
 types/MockAggregatorRep.d.ts                  |   62 -
 types/MockAggregatorRepFactory.ts             |   98 -
 types/MockAggregatorSnx.d.ts                  |   62 -
 types/MockAggregatorSnxFactory.ts             |   98 -
 types/MockAggregatorSusd.d.ts                 |   62 -
 types/MockAggregatorSusdFactory.ts            |   98 -
 types/MockAggregatorTusd.d.ts                 |   62 -
 types/MockAggregatorTusdFactory.ts            |   98 -
 types/MockAggregatorUniDaiEth.d.ts            |   67 -
 types/MockAggregatorUniDaiEthFactory.ts       |  102 -
 types/MockAggregatorUniLendEth.d.ts           |   67 -
 types/MockAggregatorUniLendEthFactory.ts      |  102 -
 types/MockAggregatorUniLinkEth.d.ts           |   67 -
 types/MockAggregatorUniLinkEthFactory.ts      |  102 -
 types/MockAggregatorUniMkrEth.d.ts            |   67 -
 types/MockAggregatorUniMkrEthFactory.ts       |  102 -
 types/MockAggregatorUniSethEth.d.ts           |   67 -
 types/MockAggregatorUniSethEthFactory.ts      |  102 -
 types/MockAggregatorUniUsdcEth.d.ts           |   67 -
 types/MockAggregatorUniUsdcEthFactory.ts      |  102 -
 types/MockAggregatorUsd.d.ts                  |   62 -
 types/MockAggregatorUsdFactory.ts             |   98 -
 types/MockAggregatorUsdc.d.ts                 |   62 -
 types/MockAggregatorUsdcFactory.ts            |   98 -
 types/MockAggregatorUsdt.d.ts                 |   62 -
 types/MockAggregatorUsdtFactory.ts            |   98 -
 types/MockAggregatorWbtc.d.ts                 |   62 -
 types/MockAggregatorWbtcFactory.ts            |   98 -
 types/MockAggregatorZrx.d.ts                  |   62 -
 types/MockAggregatorZrxFactory.ts             |   98 -
 types/MockBat.d.ts                            |  233 ---
 types/MockBatFactory.ts                       |  329 ----
 types/MockBusd.d.ts                           |  233 ---
 types/MockBusdFactory.ts                      |  329 ----
 types/MockDai.d.ts                            |  233 ---
 types/MockDaiFactory.ts                       |  329 ----
 types/MockKnc.d.ts                            |  233 ---
 types/MockKncFactory.ts                       |  329 ----
 types/MockKyberProxy.d.ts                     |  105 -
 types/MockKyberProxyFactory.ts                |  124 --
 types/MockLend.d.ts                           |  233 ---
 types/MockLendFactory.ts                      |  329 ----
 types/MockLendingPoolCore.d.ts                | 1414 --------------
 types/MockLendingPoolCoreFactory.ts           | 1711 -----------------
 types/MockLink.d.ts                           |  233 ---
 types/MockLinkFactory.ts                      |  329 ----
 types/MockMana.d.ts                           |  233 ---
 types/MockManaFactory.ts                      |  329 ----
 types/MockMkr.d.ts                            |  233 ---
 types/MockMkrFactory.ts                       |  329 ----
 types/MockOneSplit.d.ts                       |  305 ---
 types/MockOneSplitFactory.ts                  |  385 ----
 types/MockRep.d.ts                            |  233 ---
 types/MockRepFactory.ts                       |  329 ----
 types/MockSnx.d.ts                            |  233 ---
 types/MockSnxFactory.ts                       |  329 ----
 types/MockSusd.d.ts                           |  233 ---
 types/MockSusdFactory.ts                      |  329 ----
 types/MockTusd.d.ts                           |  233 ---
 types/MockTusdFactory.ts                      |  329 ----
 types/MockUniDaiEth.d.ts                      |  236 ---
 types/MockUniDaiEthFactory.ts                 |  329 ----
 types/MockUniLendEth.d.ts                     |  236 ---
 types/MockUniLendEthFactory.ts                |  329 ----
 types/MockUniLinkEth.d.ts                     |  236 ---
 types/MockUniLinkEthFactory.ts                |  329 ----
 types/MockUniMkrEth.d.ts                      |  236 ---
 types/MockUniMkrEthFactory.ts                 |  329 ----
 types/MockUniSethEth.d.ts                     |  236 ---
 types/MockUniSethEthFactory.ts                |  329 ----
 types/MockUniUsdcEth.d.ts                     |  236 ---
 types/MockUniUsdcEthFactory.ts                |  329 ----
 types/MockUsd.d.ts                            |  233 ---
 types/MockUsdFactory.ts                       |  329 ----
 types/MockUsdc.d.ts                           |  233 ---
 types/MockUsdcFactory.ts                      |  329 ----
 types/MockUsdt.d.ts                           |  233 ---
 types/MockUsdtFactory.ts                      |  329 ----
 types/MockWbtc.d.ts                           |  233 ---
 types/MockWbtcFactory.ts                      |  329 ----
 types/MockZrx.d.ts                            |  233 ---
 types/MockZrxFactory.ts                       |  329 ----
 types/OneSplitAdapter.d.ts                    |  120 --
 types/OneSplitAdapterFactory.ts               |  154 --
 types/ReserveLogicFactory.ts                  |    2 +-
 types/StableDebtTokenFactory.ts               |    2 +-
 types/TokenDistributor.d.ts                   |    8 -
 types/TokenDistributorFactory.ts              |   15 +-
 types/VariableDebtToken.d.ts                  |   10 +
 types/VariableDebtTokenFactory.ts             |   21 +-
 types/WalletBalanceProviderFactory.ts         |    2 +-
 174 files changed, 97 insertions(+), 28284 deletions(-)
 delete mode 100644 contracts/fees/MockKyberProxy.sol
 delete mode 100644 contracts/fees/MockOneSplit.sol
 delete mode 100644 contracts/fees/OneSplitAdapter.sol
 delete mode 100644 contracts/interfaces/IKyberNetworkProxyInterface.sol
 delete mode 100644 contracts/interfaces/IOneSplit.sol
 delete mode 100644 contracts/mocks/tokens/MockBAT.sol
 delete mode 100644 contracts/mocks/tokens/MockBUSD.sol
 delete mode 100644 contracts/mocks/tokens/MockDAI.sol
 delete mode 100644 contracts/mocks/tokens/MockKNC.sol
 delete mode 100644 contracts/mocks/tokens/MockLEND.sol
 delete mode 100644 contracts/mocks/tokens/MockLINK.sol
 delete mode 100644 contracts/mocks/tokens/MockMANA.sol
 delete mode 100644 contracts/mocks/tokens/MockMKR.sol
 delete mode 100644 contracts/mocks/tokens/MockREP.sol
 delete mode 100644 contracts/mocks/tokens/MockSNX.sol
 delete mode 100644 contracts/mocks/tokens/MockSUSD.sol
 delete mode 100644 contracts/mocks/tokens/MockTUSD.sol
 delete mode 100644 contracts/mocks/tokens/MockUNI_DAI_ETH.sol
 delete mode 100644 contracts/mocks/tokens/MockUNI_LEND_ETH.sol
 delete mode 100644 contracts/mocks/tokens/MockUNI_LINK_ETH.sol
 delete mode 100644 contracts/mocks/tokens/MockUNI_MKR_ETH.sol
 delete mode 100644 contracts/mocks/tokens/MockUNI_SETH_ETH.sol
 delete mode 100644 contracts/mocks/tokens/MockUNI_USDC_ETH.sol
 delete mode 100644 contracts/mocks/tokens/MockUSD.sol
 delete mode 100644 contracts/mocks/tokens/MockUSDC.sol
 delete mode 100644 contracts/mocks/tokens/MockUSDT.sol
 delete mode 100644 contracts/mocks/tokens/MockWBTC.sol
 delete mode 100644 contracts/mocks/tokens/MockZRX.sol
 delete mode 100644 tasks/deployments/deploy-Example.ts
 delete mode 100644 tasks/migrations/dev-deployment.ts
 delete mode 100644 types/Example.d.ts
 delete mode 100644 types/ExampleFactory.ts
 delete mode 100644 types/IKyberNetworkProxyInterface.d.ts
 delete mode 100644 types/IKyberNetworkProxyInterfaceFactory.ts
 delete mode 100644 types/IOneSplit.d.ts
 delete mode 100644 types/IOneSplitFactory.ts
 delete mode 100644 types/IOneSplitView.d.ts
 delete mode 100644 types/IOneSplitViewFactory.ts
 delete mode 100644 types/Ierc20Burnable.d.ts
 delete mode 100644 types/Ierc20BurnableFactory.ts
 delete mode 100644 types/Ierc20Mintable.d.ts
 delete mode 100644 types/Ierc20MintableBurnable.d.ts
 delete mode 100644 types/Ierc20MintableBurnableFactory.ts
 delete mode 100644 types/Ierc20MintableFactory.ts
 delete mode 100644 types/LendingPoolCore.d.ts
 delete mode 100644 types/LendingPoolCoreFactory.ts
 delete mode 100644 types/LendingPoolDataProvider.d.ts
 delete mode 100644 types/LendingPoolDataProviderFactory.ts
 delete mode 100644 types/LendingPoolParametersProvider.d.ts
 delete mode 100644 types/LendingPoolParametersProviderFactory.ts
 delete mode 100644 types/MockAggregatorBase.d.ts
 delete mode 100644 types/MockAggregatorBaseFactory.ts
 delete mode 100644 types/MockAggregatorBat.d.ts
 delete mode 100644 types/MockAggregatorBatFactory.ts
 delete mode 100644 types/MockAggregatorBusd.d.ts
 delete mode 100644 types/MockAggregatorBusdFactory.ts
 delete mode 100644 types/MockAggregatorDai.d.ts
 delete mode 100644 types/MockAggregatorDaiFactory.ts
 delete mode 100644 types/MockAggregatorKnc.d.ts
 delete mode 100644 types/MockAggregatorKncFactory.ts
 delete mode 100644 types/MockAggregatorLend.d.ts
 delete mode 100644 types/MockAggregatorLendFactory.ts
 delete mode 100644 types/MockAggregatorLink.d.ts
 delete mode 100644 types/MockAggregatorLinkFactory.ts
 delete mode 100644 types/MockAggregatorMana.d.ts
 delete mode 100644 types/MockAggregatorManaFactory.ts
 delete mode 100644 types/MockAggregatorMkr.d.ts
 delete mode 100644 types/MockAggregatorMkrFactory.ts
 delete mode 100644 types/MockAggregatorRep.d.ts
 delete mode 100644 types/MockAggregatorRepFactory.ts
 delete mode 100644 types/MockAggregatorSnx.d.ts
 delete mode 100644 types/MockAggregatorSnxFactory.ts
 delete mode 100644 types/MockAggregatorSusd.d.ts
 delete mode 100644 types/MockAggregatorSusdFactory.ts
 delete mode 100644 types/MockAggregatorTusd.d.ts
 delete mode 100644 types/MockAggregatorTusdFactory.ts
 delete mode 100644 types/MockAggregatorUniDaiEth.d.ts
 delete mode 100644 types/MockAggregatorUniDaiEthFactory.ts
 delete mode 100644 types/MockAggregatorUniLendEth.d.ts
 delete mode 100644 types/MockAggregatorUniLendEthFactory.ts
 delete mode 100644 types/MockAggregatorUniLinkEth.d.ts
 delete mode 100644 types/MockAggregatorUniLinkEthFactory.ts
 delete mode 100644 types/MockAggregatorUniMkrEth.d.ts
 delete mode 100644 types/MockAggregatorUniMkrEthFactory.ts
 delete mode 100644 types/MockAggregatorUniSethEth.d.ts
 delete mode 100644 types/MockAggregatorUniSethEthFactory.ts
 delete mode 100644 types/MockAggregatorUniUsdcEth.d.ts
 delete mode 100644 types/MockAggregatorUniUsdcEthFactory.ts
 delete mode 100644 types/MockAggregatorUsd.d.ts
 delete mode 100644 types/MockAggregatorUsdFactory.ts
 delete mode 100644 types/MockAggregatorUsdc.d.ts
 delete mode 100644 types/MockAggregatorUsdcFactory.ts
 delete mode 100644 types/MockAggregatorUsdt.d.ts
 delete mode 100644 types/MockAggregatorUsdtFactory.ts
 delete mode 100644 types/MockAggregatorWbtc.d.ts
 delete mode 100644 types/MockAggregatorWbtcFactory.ts
 delete mode 100644 types/MockAggregatorZrx.d.ts
 delete mode 100644 types/MockAggregatorZrxFactory.ts
 delete mode 100644 types/MockBat.d.ts
 delete mode 100644 types/MockBatFactory.ts
 delete mode 100644 types/MockBusd.d.ts
 delete mode 100644 types/MockBusdFactory.ts
 delete mode 100644 types/MockDai.d.ts
 delete mode 100644 types/MockDaiFactory.ts
 delete mode 100644 types/MockKnc.d.ts
 delete mode 100644 types/MockKncFactory.ts
 delete mode 100644 types/MockKyberProxy.d.ts
 delete mode 100644 types/MockKyberProxyFactory.ts
 delete mode 100644 types/MockLend.d.ts
 delete mode 100644 types/MockLendFactory.ts
 delete mode 100644 types/MockLendingPoolCore.d.ts
 delete mode 100644 types/MockLendingPoolCoreFactory.ts
 delete mode 100644 types/MockLink.d.ts
 delete mode 100644 types/MockLinkFactory.ts
 delete mode 100644 types/MockMana.d.ts
 delete mode 100644 types/MockManaFactory.ts
 delete mode 100644 types/MockMkr.d.ts
 delete mode 100644 types/MockMkrFactory.ts
 delete mode 100644 types/MockOneSplit.d.ts
 delete mode 100644 types/MockOneSplitFactory.ts
 delete mode 100644 types/MockRep.d.ts
 delete mode 100644 types/MockRepFactory.ts
 delete mode 100644 types/MockSnx.d.ts
 delete mode 100644 types/MockSnxFactory.ts
 delete mode 100644 types/MockSusd.d.ts
 delete mode 100644 types/MockSusdFactory.ts
 delete mode 100644 types/MockTusd.d.ts
 delete mode 100644 types/MockTusdFactory.ts
 delete mode 100644 types/MockUniDaiEth.d.ts
 delete mode 100644 types/MockUniDaiEthFactory.ts
 delete mode 100644 types/MockUniLendEth.d.ts
 delete mode 100644 types/MockUniLendEthFactory.ts
 delete mode 100644 types/MockUniLinkEth.d.ts
 delete mode 100644 types/MockUniLinkEthFactory.ts
 delete mode 100644 types/MockUniMkrEth.d.ts
 delete mode 100644 types/MockUniMkrEthFactory.ts
 delete mode 100644 types/MockUniSethEth.d.ts
 delete mode 100644 types/MockUniSethEthFactory.ts
 delete mode 100644 types/MockUniUsdcEth.d.ts
 delete mode 100644 types/MockUniUsdcEthFactory.ts
 delete mode 100644 types/MockUsd.d.ts
 delete mode 100644 types/MockUsdFactory.ts
 delete mode 100644 types/MockUsdc.d.ts
 delete mode 100644 types/MockUsdcFactory.ts
 delete mode 100644 types/MockUsdt.d.ts
 delete mode 100644 types/MockUsdtFactory.ts
 delete mode 100644 types/MockWbtc.d.ts
 delete mode 100644 types/MockWbtcFactory.ts
 delete mode 100644 types/MockZrx.d.ts
 delete mode 100644 types/MockZrxFactory.ts
 delete mode 100644 types/OneSplitAdapter.d.ts
 delete mode 100644 types/OneSplitAdapterFactory.ts

diff --git a/contracts/fees/MockKyberProxy.sol b/contracts/fees/MockKyberProxy.sol
deleted file mode 100644
index 5b96650b..00000000
--- a/contracts/fees/MockKyberProxy.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
-
-import "../mocks/tokens/MintableERC20.sol";
-import "../libraries/EthAddressLib.sol";
-
-/// @title MockKyberProxy
-/// @author Aave
-/// @notice Mock contract to simulate the behaviour of the Kyber DEX
-/// - Receives ETH/tokens
-/// - Mints the tokenToBurn
-/// - Sends back the tokenToBurn
-contract MockKyberProxy {
-    using SafeERC20 for IERC20;
-    using SafeERC20 for MintableERC20;
-
-    /// @notice The token which the msg.sender of tradeWithHint will burn
-    MintableERC20 public tokenToBurn;
-
-    constructor(MintableERC20 _tokenToBurn) public {
-        tokenToBurn = _tokenToBurn;
-    }
-
-    /// @notice Simulates the function with the same name on the Kyber Proxy contract
-    function tradeWithHint(
-        IERC20 _fromToken,
-        uint256 _amount,
-        IERC20 _toToken,
-        address _receiver,
-        uint256 _maxAmount,
-        uint minConversionRate,
-        address _referral,
-        bytes calldata _filtering
-    ) external payable returns(uint256) {
-        require(tokenToBurn.mint(1 ether), "TRADE_WITH_HINT. Reverted mint()");
-        if (address(_fromToken) != EthAddressLib.ethAddress()) {
-            _fromToken.safeTransferFrom(msg.sender, address(this), _amount);
-        }
-        tokenToBurn.safeTransfer(msg.sender, 1 ether);
-        return 1 ether;
-    }
-}
\ No newline at end of file
diff --git a/contracts/fees/MockOneSplit.sol b/contracts/fees/MockOneSplit.sol
deleted file mode 100644
index 51e4a02b..00000000
--- a/contracts/fees/MockOneSplit.sol
+++ /dev/null
@@ -1,63 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
-
-import "../libraries/EthAddressLib.sol";
-import "../mocks/tokens/MintableERC20.sol";
-
-import "../interfaces/IOneSplit.sol";
-
-contract MockOneSplit is IOneSplit {
-    using SafeERC20 for IERC20;
-    using SafeERC20 for MintableERC20;
-
-    MintableERC20 public tokenToBurn;
-
-    constructor(MintableERC20 _tokenToBurn) public {
-        tokenToBurn = _tokenToBurn;
-    }
-
-    function getExpectedReturn(
-        IERC20 fromToken,
-        IERC20 toToken,
-        uint256 amount,
-        uint256 parts,
-        uint256 disableFlags // 1 - Uniswap, 2 - Kyber, 4 - Bancor, 8 - Oasis, 16 - Compound, 32 - Fulcrum, 64 - Chai, 128 - Aave, 256 - SmartToken, 1024 - bDAI
-    )
-        public
-        override
-        view
-        returns(
-            uint256 returnAmount,
-            uint256[] memory distribution // [Uniswap, Kyber, Bancor, Oasis]
-        ) {
-        return (0, new uint256[](0));
-    }
-
-    function swap(
-        IERC20 fromToken,
-        IERC20 toToken,
-        uint256 amount,
-        uint256 minReturn,
-        uint256[] memory distribution, // [Uniswap, Kyber, Bancor, Oasis]
-        uint256 disableFlags // 16 - Compound, 32 - Fulcrum, 64 - Chai, 128 - Aave, 256 - SmartToken, 1024 - bDAI
-    ) public override payable {
-    }
-
-    function goodSwap(
-        IERC20 fromToken,
-        IERC20 toToken,
-        uint256 amount,
-        uint256 minReturn,
-        uint256 parts,
-        uint256 disableFlags
-    ) public override payable {
-        require(tokenToBurn.mint(10000 ether), "TRADE_WITH_HINT. Reverted mint()");
-        if (address(fromToken) != EthAddressLib.ethAddress()) {
-            fromToken.safeTransferFrom(msg.sender, address(this), amount);
-        }
-        tokenToBurn.safeTransfer(msg.sender, 10000 ether);
-    }
-}
\ No newline at end of file
diff --git a/contracts/fees/OneSplitAdapter.sol b/contracts/fees/OneSplitAdapter.sol
deleted file mode 100644
index b4773ac3..00000000
--- a/contracts/fees/OneSplitAdapter.sol
+++ /dev/null
@@ -1,79 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-import "@openzeppelin/contracts/math/SafeMath.sol";
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-
-import "../interfaces/IOneSplit.sol";
-import "../interfaces/IPriceOracleGetter.sol";
-import "../interfaces/IExchangeAdapter.sol";
-
-/// @title OneSplitAdapter
-/// @author Aave
-/// @notice Implements the logic to exchange assets through 1Split
-/// The hardcoded parameters are:
-/// 0x1814222fa8c8c1C1bf380e3BBFBd9De8657Da476: ONE_SPLIT. The address of the 1Split exchange
-/// 0x76B47460d7F7c5222cFb6b6A75615ab10895DDe4: AAVE_PRICES_PROVIDER. Contract providing prices of the assets
-///     in the Aave protocol, in token/ETH.
-/// 512 : MULTI_PATH_ETH_FLAG. By using this flag on OneSplit, the swap sequence will introduce a step to ETH
-///     in the middle, resulting in a sequence like FROM-to-ETH -> ETH-to-TO.
-///     This is optimal for cases where the pair FROM/TO is not liquid enough in the
-///     underlying exchanges used by OneSplit, reducing this way the slippage.
-/// 10: SPLIT_PARTS. It defines in how many chunks the amount to swap will be splitted to then
-///     divide the chunks amongst the underlying exchanges.
-///     For example, using 10 as SPLIT_PARTS and having 4 underlying exchanges on 1Split,
-///     the division amongst could look like [4,4,0,2].
-
-contract OneSplitAdapter is IExchangeAdapter {
-    using SafeMath for uint256;
-
-    event OneSplitAdapterSetup(address oneSplit, address priceOracle, uint256 splitParts);
-
-    constructor() public {
-        emit OneSplitAdapterSetup(0x1814222fa8c8c1C1bf380e3BBFBd9De8657Da476, 0x76B47460d7F7c5222cFb6b6A75615ab10895DDe4, 10);
-    }
-
-    /// @notice "Infinite" approval for all the tokens initialized
-    /// @param _tokens the list of token addresses to approve
-    function approveExchange(IERC20[] calldata _tokens) external override {
-        for (uint256 i = 0; i < _tokens.length; i++) {
-            if (address(_tokens[i]) != EthAddressLib.ethAddress()) {
-                _tokens[i].safeApprove(0x1814222fa8c8c1C1bf380e3BBFBd9De8657Da476, UintConstants.maxUintMinus1());
-            }
-        }
-    }
-
-    /// @notice Exchanges _amount of _from token (or ETH) to _to token (or ETH)
-    /// - Uses EthAddressLib.ethAddress() as the reference on 1Split of ETH
-    /// @param _from The asset to exchange from
-    /// @param _to The asset to exchange to
-    /// @param _amount The amount to exchange
-    /// @param _maxSlippage Max slippage acceptable, taken into account after the goodSwap()
-    function exchange(address _from, address _to, uint256 _amount, uint256 _maxSlippage) external override returns(uint256) {
-        uint256 _value = (_from == EthAddressLib.ethAddress()) ? _amount : 0;
-
-        uint256 _fromAssetPriceInWei = IPriceOracleGetter(0x76B47460d7F7c5222cFb6b6A75615ab10895DDe4).getAssetPrice(_from);
-        uint256 _toAssetPriceInWei = IPriceOracleGetter(0x76B47460d7F7c5222cFb6b6A75615ab10895DDe4).getAssetPrice(_to);
-        uint256 _toBalanceBefore = IERC20(_to).balanceOf(address(this));
-
-        IOneSplit(0x1814222fa8c8c1C1bf380e3BBFBd9De8657Da476).goodSwap{value: _value}(
-            IERC20(_from),
-            IERC20(_to),
-            _amount,
-            0,
-            10,
-            512
-        );
-
-        uint256 _toReceivedAmount = IERC20(_to).balanceOf(address(this)).sub(_toBalanceBefore);
-
-        require(
-            (_toAssetPriceInWei.mul(_toReceivedAmount).mul(100))
-                .div(_fromAssetPriceInWei.mul(_amount)) >= (100 - _maxSlippage),
-            "INVALID_SLIPPAGE"
-        );
-
-        emit Exchange(_from, _to, 0x1814222fa8c8c1C1bf380e3BBFBd9De8657Da476, _amount, _toReceivedAmount);
-        return _toReceivedAmount;
-    }
-}
\ No newline at end of file
diff --git a/contracts/fees/TokenDistributor.sol b/contracts/fees/TokenDistributor.sol
index 0c6f6bbd..9c8f121c 100644
--- a/contracts/fees/TokenDistributor.sol
+++ b/contracts/fees/TokenDistributor.sol
@@ -8,7 +8,6 @@ import "@openzeppelin/contracts/token/ERC20/ERC20Burnable.sol";
 import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 
 import "../libraries/openzeppelin-upgradeability/VersionedInitializable.sol";
-import "../interfaces/IKyberNetworkProxyInterface.sol";
 import "../interfaces/IExchangeAdapter.sol";
 import "../libraries/EthAddressLib.sol";
 
@@ -57,9 +56,6 @@ contract TokenDistributor is ReentrancyGuard, VersionedInitializable {
     /// @notice Instead of using 100 for percentages, higher base to have more precision in the distribution
     uint256 public constant DISTRIBUTION_BASE = 10000;
 
-   /// @notice DEPRECATED
-    IKyberNetworkProxyInterface public kyberProxy;
-
     /// @notice The address of the token to burn (LEND token)
     address public tokenToBurn;
 
@@ -215,4 +211,4 @@ contract TokenDistributor is ReentrancyGuard, VersionedInitializable {
         return IMPLEMENTATION_REVISION;
     }
 
-}
\ No newline at end of file
+}
diff --git a/contracts/interfaces/IKyberNetworkProxyInterface.sol b/contracts/interfaces/IKyberNetworkProxyInterface.sol
deleted file mode 100644
index 761f35c0..00000000
--- a/contracts/interfaces/IKyberNetworkProxyInterface.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-
-interface IKyberNetworkProxyInterface {
-    function maxGasPrice() external view returns(uint);
-    function getUserCapInWei(address user) external view returns(uint);
-    function getUserCapInTokenWei(address user, IERC20 token) external view returns(uint);
-    function enabled() external view returns(bool);
-    function info(bytes32 id) external view returns(uint);
-    function getExpectedRate(IERC20 src, IERC20 dest, uint srcQty)
-        external view returns (uint expectedRate, uint slippageRate);
-    function tradeWithHint(
-        IERC20 src,
-        uint srcAmount,
-        IERC20 dest,
-        address destAddress,
-        uint maxDestAmount,
-        uint minConversionRate,
-        address walletId,
-        bytes calldata hint) external payable returns(uint);
-}
\ No newline at end of file
diff --git a/contracts/interfaces/IOneSplit.sol b/contracts/interfaces/IOneSplit.sol
deleted file mode 100644
index 34fdb862..00000000
--- a/contracts/interfaces/IOneSplit.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-
-
-abstract contract IOneSplitView {
-    // disableFlags = FLAG_UNISWAP + FLAG_KYBER + ...
-    uint256 public constant FLAG_UNISWAP = 0x01;
-    uint256 public constant FLAG_KYBER = 0x02;
-    uint256 public constant FLAG_KYBER_UNISWAP_RESERVE = 0x100000000; // Turned off by default
-    uint256 public constant FLAG_KYBER_OASIS_RESERVE = 0x200000000; // Turned off by default
-    uint256 public constant FLAG_KYBER_BANCOR_RESERVE = 0x400000000; // Turned off by default
-    uint256 public constant FLAG_BANCOR = 0x04;
-    uint256 public constant FLAG_OASIS = 0x08;
-    uint256 public constant FLAG_COMPOUND = 0x10;
-    uint256 public constant FLAG_FULCRUM = 0x20;
-    uint256 public constant FLAG_CHAI = 0x40;
-    uint256 public constant FLAG_AAVE = 0x80;
-    uint256 public constant FLAG_SMART_TOKEN = 0x100;
-    uint256 public constant FLAG_MULTI_PATH_ETH = 0x200; // Turned off by default
-    uint256 public constant FLAG_BDAI = 0x400;
-    uint256 public constant FLAG_IEARN = 0x800;
-
-    function getExpectedReturn(
-        IERC20 fromToken,
-        IERC20 toToken,
-        uint256 amount,
-        uint256 parts,
-        uint256 disableFlags // 1 - Uniswap, 2 - Kyber, 4 - Bancor, 8 - Oasis, 16 - Compound, 32 - Fulcrum, 64 - Chai, 128 - Aave, 256 - SmartToken, 1024 - bDAI
-    )
-        public
-        virtual
-        view
-        returns(
-            uint256 returnAmount,
-            uint256[] memory distribution // [Uniswap, Kyber, Bancor, Oasis]
-        );
-}
-
-
-abstract contract IOneSplit is IOneSplitView {
-    function swap(
-        IERC20 fromToken,
-        IERC20 toToken,
-        uint256 amount,
-        uint256 minReturn,
-        uint256[] memory distribution, // [Uniswap, Kyber, Bancor, Oasis]
-        uint256 disableFlags // 16 - Compound, 32 - Fulcrum, 64 - Chai, 128 - Aave, 256 - SmartToken, 1024 - bDAI
-    ) public virtual payable;
-
-    function goodSwap(
-        IERC20 fromToken,
-        IERC20 toToken,
-        uint256 amount,
-        uint256 minReturn,
-        uint256 parts,
-        uint256 disableFlags // 1 - Uniswap, 2 - Kyber, 4 - Bancor, 8 - Oasis, 16 - Compound, 32 - Fulcrum, 64 - Chai, 128 - Aave, 256 - SmartToken, 1024 - bDAI
-    ) public virtual payable;
-}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockBAT.sol b/contracts/mocks/tokens/MockBAT.sol
deleted file mode 100644
index 65121471..00000000
--- a/contracts/mocks/tokens/MockBAT.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-
-contract MockBAT is MintableERC20("BAT", "Basic Attention Token", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockBUSD.sol b/contracts/mocks/tokens/MockBUSD.sol
deleted file mode 100644
index 61fb8650..00000000
--- a/contracts/mocks/tokens/MockBUSD.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockBUSD is MintableERC20("BUSD", "Binance USD", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockDAI.sol b/contracts/mocks/tokens/MockDAI.sol
deleted file mode 100644
index bbbc0a5e..00000000
--- a/contracts/mocks/tokens/MockDAI.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-
-contract MockDAI is MintableERC20("DAI", "DAI", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockKNC.sol b/contracts/mocks/tokens/MockKNC.sol
deleted file mode 100644
index c06f3dbe..00000000
--- a/contracts/mocks/tokens/MockKNC.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockKNC is MintableERC20("KNC", "Kyber Network", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockLEND.sol b/contracts/mocks/tokens/MockLEND.sol
deleted file mode 100644
index 97e8c683..00000000
--- a/contracts/mocks/tokens/MockLEND.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-
-contract MockLEND is MintableERC20("LEND", "LEND", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockLINK.sol b/contracts/mocks/tokens/MockLINK.sol
deleted file mode 100644
index 3904807c..00000000
--- a/contracts/mocks/tokens/MockLINK.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockLINK is MintableERC20("LINK", "ChainLink", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockMANA.sol b/contracts/mocks/tokens/MockMANA.sol
deleted file mode 100644
index e76cfdea..00000000
--- a/contracts/mocks/tokens/MockMANA.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockMANA is MintableERC20("MANA", "Decentraland", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockMKR.sol b/contracts/mocks/tokens/MockMKR.sol
deleted file mode 100644
index bacb4e10..00000000
--- a/contracts/mocks/tokens/MockMKR.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockMKR is MintableERC20("MKR", "Maker", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockREP.sol b/contracts/mocks/tokens/MockREP.sol
deleted file mode 100644
index 78550e04..00000000
--- a/contracts/mocks/tokens/MockREP.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockREP is MintableERC20("REP", "Augur", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockSNX.sol b/contracts/mocks/tokens/MockSNX.sol
deleted file mode 100644
index f1b554f1..00000000
--- a/contracts/mocks/tokens/MockSNX.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockSNX is MintableERC20("SNX", "SNX", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockSUSD.sol b/contracts/mocks/tokens/MockSUSD.sol
deleted file mode 100644
index c273d723..00000000
--- a/contracts/mocks/tokens/MockSUSD.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockSUSD is MintableERC20("SUSD", "Synthetix USD", 6) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockTUSD.sol b/contracts/mocks/tokens/MockTUSD.sol
deleted file mode 100644
index d2368fe7..00000000
--- a/contracts/mocks/tokens/MockTUSD.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockTUSD is MintableERC20("TUSD", "TrueUSD", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockUNI_DAI_ETH.sol b/contracts/mocks/tokens/MockUNI_DAI_ETH.sol
deleted file mode 100644
index fdf56713..00000000
--- a/contracts/mocks/tokens/MockUNI_DAI_ETH.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockUNI_DAI_ETH is MintableERC20("UNI_DAI_ETH", "UNI_DAI_ETH", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockUNI_LEND_ETH.sol b/contracts/mocks/tokens/MockUNI_LEND_ETH.sol
deleted file mode 100644
index 9eda60d6..00000000
--- a/contracts/mocks/tokens/MockUNI_LEND_ETH.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockUNI_LEND_ETH is MintableERC20("UNI_LEND_ETH", "UNI_LEND_ETH", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockUNI_LINK_ETH.sol b/contracts/mocks/tokens/MockUNI_LINK_ETH.sol
deleted file mode 100644
index 08cd3ffc..00000000
--- a/contracts/mocks/tokens/MockUNI_LINK_ETH.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockUNI_LINK_ETH is MintableERC20("UNI_LINK_ETH", "UNI_LINK_ETH", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockUNI_MKR_ETH.sol b/contracts/mocks/tokens/MockUNI_MKR_ETH.sol
deleted file mode 100644
index e32c4da6..00000000
--- a/contracts/mocks/tokens/MockUNI_MKR_ETH.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockUNI_MKR_ETH is MintableERC20("UNI_MKR_ETH", "UNI_MKR_ETH", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockUNI_SETH_ETH.sol b/contracts/mocks/tokens/MockUNI_SETH_ETH.sol
deleted file mode 100644
index dd9d3bd5..00000000
--- a/contracts/mocks/tokens/MockUNI_SETH_ETH.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockUNI_SETH_ETH is MintableERC20("UNI_SETH_ETH", "UNI_SETH_ETH", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockUNI_USDC_ETH.sol b/contracts/mocks/tokens/MockUNI_USDC_ETH.sol
deleted file mode 100644
index a563d16e..00000000
--- a/contracts/mocks/tokens/MockUNI_USDC_ETH.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockUNI_USDC_ETH is MintableERC20("UNI_USDC_ETH", "UNI_USDC_ETH", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockUSD.sol b/contracts/mocks/tokens/MockUSD.sol
deleted file mode 100644
index 7fe5407e..00000000
--- a/contracts/mocks/tokens/MockUSD.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockUSD is MintableERC20("USD", "USD", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockUSDC.sol b/contracts/mocks/tokens/MockUSDC.sol
deleted file mode 100644
index 58a487f8..00000000
--- a/contracts/mocks/tokens/MockUSDC.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockUSDC is MintableERC20("USDC", "USD Coin", 6) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockUSDT.sol b/contracts/mocks/tokens/MockUSDT.sol
deleted file mode 100644
index 6cbb8685..00000000
--- a/contracts/mocks/tokens/MockUSDT.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockUSDT is MintableERC20("USDT", "USDT Coin", 6) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockWBTC.sol b/contracts/mocks/tokens/MockWBTC.sol
deleted file mode 100644
index d5a7b4ee..00000000
--- a/contracts/mocks/tokens/MockWBTC.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockWBTC is MintableERC20("WBTC", "WBTC Coin", 18) {}
\ No newline at end of file
diff --git a/contracts/mocks/tokens/MockZRX.sol b/contracts/mocks/tokens/MockZRX.sol
deleted file mode 100644
index 13098d7c..00000000
--- a/contracts/mocks/tokens/MockZRX.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: agpl-3.0
-pragma solidity ^0.6.8;
-
-
-import "./MintableERC20.sol";
-
-
-contract MockZRX is MintableERC20("ZRX", "0x Coin", 18) {}
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 7cd07817..f85d24d2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,16 +6,5 @@ services:
       context: ./
     working_dir: /src
     command: npm run run-env
-    depends_on:
-      - ganache
     volumes:
       - ./:/src
-
-  ganache:
-    image: trufflesuite/ganache-cli:latest
-    command: [
-      "ganache-cli",
-      "--gasLimit", "10000000",
-      "--mnemonic", "fox sight canyon orphan hotel grow hedgehog build bless august weather swarm",
-      "--hardfork", "istanbul"
-    ]
\ No newline at end of file
diff --git a/helpers/contracts-helpers.ts b/helpers/contracts-helpers.ts
index ac30a2c7..be8a2267 100644
--- a/helpers/contracts-helpers.ts
+++ b/helpers/contracts-helpers.ts
@@ -10,7 +10,6 @@ import {
   iParamsPerNetwork,
   iParamsPerPool,
 } from "./types";
-import {Example} from "../types/Example";
 import {LendingPoolAddressesProvider} from "../types/LendingPoolAddressesProvider";
 import {MintableErc20} from "../types/MintableErc20";
 import {LendingPoolAddressesProviderRegistry} from "../types/LendingPoolAddressesProviderRegistry";
@@ -24,8 +23,6 @@ import {MockAggregator} from "../types/MockAggregator";
 import {LendingRateOracle} from "../types/LendingRateOracle";
 import {DefaultReserveInterestRateStrategy} from "../types/DefaultReserveInterestRateStrategy";
 import {LendingPoolLiquidationManager} from "../types/LendingPoolLiquidationManager";
-import {MockOneSplit} from "../types/MockOneSplit";
-import {OneSplitAdapter} from "../types/OneSplitAdapter";
 import {TokenDistributor} from "../types/TokenDistributor";
 import {InitializableAdminUpgradeabilityProxy} from "../types/InitializableAdminUpgradeabilityProxy";
 import {MockFlashLoanReceiver} from "../types/MockFlashLoanReceiver";
@@ -111,9 +108,6 @@ const getContract = async <ContractType extends Contract>(
 ): Promise<ContractType> =>
   (await BRE.ethers.getContractAt(contractName, address)) as ContractType;
 
-export const deployExampleContract = async () =>
-  await deployContract<Example>(eContractid.Example, []);
-
 export const deployLendingPoolAddressesProvider = async () =>
   await deployContract<LendingPoolAddressesProvider>(
     eContractid.LendingPoolAddressesProvider,
@@ -162,14 +156,14 @@ export const linkLibrariesToArtifact = async(artifact: Artifact) => {
     [eContractid.UserLogic]: userLogic.address,
     [eContractid.ReserveLogic]: reserveLogic.address,
   });
-  
+
   const genericLogicFactory = await BRE.ethers.getContractFactory(
     genericLogicArtifact.abi,
     linkedGenericLogicByteCode
   );
-  
+
   const genericLogic = await (await genericLogicFactory.deploy()).deployed();
-  
+
   const validationLogicArtifact = await readArtifact(
     BRE.config.paths.artifacts,
     eContractid.ValidationLogic
@@ -180,15 +174,15 @@ export const linkLibrariesToArtifact = async(artifact: Artifact) => {
     [eContractid.ReserveLogic]: reserveLogic.address,
     [eContractid.GenericLogic]: genericLogic.address,
   });
-  
+
   const validationLogicFactory = await BRE.ethers.getContractFactory(
     validationLogicArtifact.abi,
     linkedValidationLogicByteCode
   );
-  
+
   const validationLogic = await (await validationLogicFactory.deploy()).deployed();
 
- 
+
 
   const linkedBytecode = linkBytecode(artifact, {
     [eContractid.CoreLibrary]: coreLibrary.address,
@@ -211,12 +205,12 @@ export const deployLendingPool = async () => {
     BRE.config.paths.artifacts,
     eContractid.LendingPool
   );
- 
+
   const factory = await linkLibrariesToArtifact(lendingPoolArtifact);
 
   const lendingPool = await factory.deploy();
   return (await lendingPool.deployed()) as LendingPool;
-  
+
 }
 
 
@@ -244,7 +238,7 @@ export const deployLendingPoolLiquidationManager = async () => {
     BRE.config.paths.artifacts,
     eContractid.LendingPoolLiquidationManager
   );
- 
+
   const factory = await linkLibrariesToArtifact(liquidationManagerArtifact);
 
   const liquidationManager = await factory.deploy();
@@ -278,12 +272,6 @@ export const deployWalletBalancerProvider = async (
     [addressesProvider]
   );
 
-export const deployMockOneSplit = async (tokenToBurn: tEthereumAddress) =>
-  await deployContract<MockOneSplit>(eContractid.MockOneSplit, [tokenToBurn]);
-
-export const deployOneSplitAdapter = async () =>
-  await deployContract<OneSplitAdapter>(eContractid.OneSplitAdapter, []);
-
 export const deployAaveProtocolTestHelpers = async (
   addressesProvider: tEthereumAddress
 ) =>
@@ -317,7 +305,7 @@ export const deployDefaultReserveInterestRateStrategy = async ([
   string,
   string,
   string
-]) => 
+]) =>
   await deployContract<DefaultReserveInterestRateStrategy>(
     eContractid.DefaultReserveInterestRateStrategy,
     [
@@ -386,12 +374,12 @@ export const deployDefaultReserveInterestRateStrategy = async ([
         underlyingAsset,
         addressesProvider
       );
-  
+
       return token;
-  
+
     }
-  
-  
+
+
 export const getLendingPoolAddressesProvider = async (
   address?: tEthereumAddress
 ) => {
@@ -428,7 +416,7 @@ export const getLendingPool = async (address?: tEthereumAddress) => {
     BRE.config.paths.artifacts,
     eContractid.LendingPool
   );
- 
+
 
   const factory = await linkLibrariesToArtifact(lendingPoolArtifact);
 
diff --git a/helpers/types.ts b/helpers/types.ts
index 91646ef8..a02fc297 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -33,8 +33,6 @@ export enum eContractid {
   ChainlinkProxyPriceProvider = "ChainlinkProxyPriceProvider",
   DefaultReserveInterestRateStrategy = "DefaultReserveInterestRateStrategy",
   LendingPoolLiquidationManager = "LendingPoolLiquidationManager",
-  MockOneSplit = "MockOneSplit",
-  OneSplitAdapter = "OneSplitAdapter",
   TokenDistributor = "TokenDistributor",
   InitializableAdminUpgradeabilityProxy = "InitializableAdminUpgradeabilityProxy",
   MockFlashLoanReceiver = "MockFlashLoanReceiver",
diff --git a/package.json b/package.json
index 9ec3236d..495caa3e 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,6 @@
     "chai-bignumber": "3.0.0",
     "ethereum-waffle": "2.5.1",
     "ethers": "4.0.47",
-    "ganache-cli": "6.9.1",
     "husky": "^4.2.5",
     "lowdb": "1.0.0",
     "prettier": "^2.0.5",
diff --git a/tasks/deployments/deploy-Example.ts b/tasks/deployments/deploy-Example.ts
deleted file mode 100644
index 6c1f8cc0..00000000
--- a/tasks/deployments/deploy-Example.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { task } from "@nomiclabs/buidler/config";
-import { eContractid } from "../../helpers/types";
-import {
-  registerContractInJsonDb,
-  deployExampleContract,
-} from "../../helpers/contracts-helpers";
-
-const { Example } = eContractid;
-
-task(`deploy-${Example}`, `Deploys the ${Example} contract`).setAction(
-  async ({}, localBRE) => {
-    await localBRE.run("set-bre");
-
-    console.log(`Deploying ${Example} ...\n`);
-
-    const example = await deployExampleContract();
-    await example.deployTransaction.wait();
-
-    await registerContractInJsonDb(`${Example}`, example);
-
-    return example;
-  }
-);
diff --git a/tasks/migrations/dev-deployment.ts b/tasks/migrations/dev-deployment.ts
deleted file mode 100644
index c118ebb9..00000000
--- a/tasks/migrations/dev-deployment.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { task } from "@nomiclabs/buidler/config";
-import { eContractid } from "../../helpers/types";
-import { expect } from "chai";
-import { BuidlerRuntimeEnvironment } from "@nomiclabs/buidler/types";
-import { Example } from "../../types/Example";
-
-task("dev-deployment", "Deployment in buidlerevm").setAction(
-  async (_, localBRE) => {
-    const BRE: BuidlerRuntimeEnvironment = await localBRE.run("set-bre");
-
-    const example = (await BRE.run(`deploy-${eContractid.Example}`)) as Example;
-
-    expect((await example.test()).toString()).to.equal(
-      "5",
-      "INVALID_TEST_VALUE"
-    );
-  }
-);
diff --git a/test/__setup.spec.ts b/test/__setup.spec.ts
index a7efc386..0bb8586e 100644
--- a/test/__setup.spec.ts
+++ b/test/__setup.spec.ts
@@ -14,8 +14,6 @@ import {
   deployLendingRateOracle,
   deployDefaultReserveInterestRateStrategy,
   deployLendingPoolLiquidationManager,
-  deployMockOneSplit,
-  deployOneSplitAdapter,
   deployTokenDistributor,
   deployInitializableAdminUpgradeabilityProxy,
   deployMockFlashLoanReceiver,
@@ -64,7 +62,7 @@ import { initializeMakeSuite } from './helpers/make-suite';
 const deployAllMockTokens = async (deployer: Signer) => {
   const tokens: {[symbol: string]: MockContract | MintableErc20} = {};
 
-  
+
   const protoConfigData = getReservesConfigByPool(AavePools.proto);
   const secondaryConfigData = getReservesConfigByPool(AavePools.secondary);
 
@@ -72,11 +70,11 @@ const deployAllMockTokens = async (deployer: Signer) => {
   for (const tokenSymbol of Object.keys(TokenContractId)) {
 
     if (tokenSymbol !== "ETH") {
-      
+
       let decimals = 18;
-      
+
       let configData = (<any>protoConfigData)[tokenSymbol];
-      
+
       if(!configData){
         configData = (<any>secondaryConfigData)[tokenSymbol]
       }
@@ -84,7 +82,7 @@ const deployAllMockTokens = async (deployer: Signer) => {
       if(!configData){
         decimals = 18;
       }
-    
+
       tokens[tokenSymbol] = await deployMintableErc20([
         tokenSymbol,
         tokenSymbol,
@@ -215,7 +213,7 @@ const initReserves = async (
       string,
       string
     ][])[assetAddressIndex];
-    
+
     const {isActive: reserveInitialized} = await lendingPool.getReserveConfigurationData(
       tokenAddress
     );
@@ -271,9 +269,9 @@ const initReserves = async (
         lendingPoolAddressesProvider.address
       ]
       )
-    
+
       console.log(`Debt tokens for ${assetSymbol}: stable ${stableDebtToken.address} variable ${variableDebtToken.address}`)
-    
+
       if (process.env.POOL === AavePools.secondary) {
         if (assetSymbol.search("UNI") === -1) {
           assetSymbol = `Uni${assetSymbol}`;
@@ -433,7 +431,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
     lendingPoolConfiguratorProxy.address
   );
 
-  
+
   const lendingPoolImpl = await deployLendingPool();
 
   console.log("Deployed lending pool, address:", lendingPoolImpl.address)
@@ -446,7 +444,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
   const address = await addressesProvider.getLendingPool()
   console.log("Address is ", address)
   const lendingPoolProxy = await getLendingPool(
-    address    
+    address
   );
 
   console.log("implementation set, address:", lendingPoolProxy.address)
@@ -591,15 +589,13 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
     lendingPoolManager
   );
 
-  await deployMockOneSplit(tokensAddressesWithoutUsd.LEND);
-  const oneSplitAdapter = await deployOneSplitAdapter();
   const tokenDistributorImpl = await deployTokenDistributor();
   const tokenDistributorProxy = await deployInitializableAdminUpgradeabilityProxy();
   const implementationParams = tokenDistributorImpl.interface.functions.initialize.encode(
     [
       ZERO_ADDRESS,
       tokensAddressesWithoutUsd.LEND,
-      oneSplitAdapter.address,
+      '0x0000000000000000000000000000000000000000', // TODO: finish removal
       receivers,
       percentages,
       Object.values(tokensAddressesWithoutUsd),
diff --git a/test/atoken-transfer.spec.ts b/test/atoken-transfer.spec.ts
index 80e3aef9..ab9b20bf 100644
--- a/test/atoken-transfer.spec.ts
+++ b/test/atoken-transfer.spec.ts
@@ -175,7 +175,7 @@ makeSuite("AToken: Transfer", (testEnv: TestEnv) => {
     const {users, pool, aDai, dai} = testEnv;
     await pool
       .connect(users[1].signer)
-      .repay(MOCK_ETH_ADDRESS, MAX_UINT_AMOUNT, users[1].address, {
+      .repay(MOCK_ETH_ADDRESS, MAX_UINT_AMOUNT, users[1].address, users[1].address, {
         value: ethers.utils.parseEther("1"),
       });
 
diff --git a/types/ATokenFactory.ts b/types/ATokenFactory.ts
index 71caf9fb..7232a234 100644
--- a/types/ATokenFactory.ts
+++ b/types/ATokenFactory.ts
@@ -841,4 +841,4 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x60806040523480156200001157600080fd5b506040516200255a3803806200255a833981810160405260a08110156200003757600080fd5b8151602083015160408085015160608601805192519496939591949391820192846401000000008211156200006b57600080fd5b9083019060208201858111156200008157600080fd5b82516401000000008111828201881017156200009c57600080fd5b82525081516020918201929091019080838360005b83811015620000cb578181015183820152602001620000b1565b50505050905090810190601f168015620000f95780820380516001836020036101000a031916815260200191505b50604052602001805160405193929190846401000000008211156200011d57600080fd5b9083019060208201858111156200013357600080fd5b82516401000000008111828201881017156200014e57600080fd5b82525081516020918201929091019080838360005b838110156200017d57818101518382015260200162000163565b50505050905090810190601f168015620001ab5780820380516001836020036101000a031916815260200191505b50604052505082518391508290620001cb906003906020850190620002eb565b508051620001e1906004906020840190620002eb565b50506005805460ff191660121790555062000205836001600160e01b03620002d516565b600a80546001600160a01b0319166001600160a01b03878116919091179182905560408051630261bf8b60e01b815290519290911691630261bf8b91600480820192602092909190829003018186803b1580156200026257600080fd5b505afa15801562000277573d6000803e3d6000fd5b505050506040513d60208110156200028e57600080fd5b5051600b80546001600160a01b0319166001600160a01b0392831617905560058054610100600160a81b031916610100969092169590950217909355506200039092505050565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200032e57805160ff19168380011785556200035e565b828001600101855582156200035e579182015b828111156200035e57825182559160200191906001019062000341565b506200036c92915062000370565b5090565b6200038d91905b808211156200036c576000815560010162000377565b90565b6121ba80620003a06000396000f3fe608060405234801561001057600080fd5b50600436106101735760003560e01c80635eae177c116100de578063a9059cbb11610097578063db006a7511610071578063db006a75146104f3578063dd62ed3e14610510578063ee9907a41461053e578063f866c3191461056457610173565b8063a9059cbb14610499578063c634dfaa146104c5578063d0fc81d2146104eb57610173565b80635eae177c146103df57806370a082311461040b57806389d1a0fc1461043157806394362e8b1461043957806395d89b4114610465578063a457c2d71461046d57610173565b806323b872dd1161013057806323b872dd146102c3578063313ce567146102f9578063325a9b131461031757806339509351146103455780633edb7cb814610371578063445e80101461039d57610173565b806306fdde0314610178578063095ea7b3146101f55780630e49072d1461023557806312c87c2d1461025d57806318160ddd146102835780631d51e7cf1461029d575b600080fd5b61018061059a565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101ba5781810151838201526020016101a2565b50505050905090810190601f1680156101e75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102216004803603604081101561020b57600080fd5b506001600160a01b038135169060200135610631565b604080519115158252519081900360200190f35b61025b6004803603602081101561024b57600080fd5b50356001600160a01b031661064f565b005b61025b6004803603602081101561027357600080fd5b50356001600160a01b031661065c565b61028b6106fb565b60408051918252519081900360200190f35b61028b600480360360208110156102b357600080fd5b50356001600160a01b03166107bd565b610221600480360360608110156102d957600080fd5b506001600160a01b038135811691602081013590911690604001356107dc565b610301610869565b6040805160ff9092168252519081900360200190f35b61025b6004803603604081101561032d57600080fd5b506001600160a01b0381358116916020013516610872565b6102216004803603604081101561035b57600080fd5b506001600160a01b0381351690602001356108d8565b61025b6004803603604081101561038757600080fd5b506001600160a01b03813516906020013561092c565b6103c3600480360360208110156103b357600080fd5b50356001600160a01b0316610a21565b604080516001600160a01b039092168252519081900360200190f35b610221600480360360408110156103f557600080fd5b506001600160a01b038135169060200135610a3f565b61028b6004803603602081101561042157600080fd5b50356001600160a01b0316610ada565b6103c3610b8d565b61025b6004803603604081101561044f57600080fd5b506001600160a01b038135169060200135610ba1565b610180610c76565b6102216004803603604081101561048357600080fd5b506001600160a01b038135169060200135610cd7565b610221600480360360408110156104af57600080fd5b506001600160a01b038135169060200135610d45565b61028b600480360360208110156104db57600080fd5b50356001600160a01b0316610d59565b61028b610d64565b61025b6004803603602081101561050957600080fd5b5035610d6a565b61028b6004803603604081101561052657600080fd5b506001600160a01b0381358116916020013516610fa4565b61028b6004803603602081101561055457600080fd5b50356001600160a01b0316610fcf565b61025b6004803603606081101561057a57600080fd5b506001600160a01b03813581169160208101359091169060400135610fea565b60038054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106265780601f106105fb57610100808354040283529160200191610626565b820191906000526020600020905b81548152906001019060200180831161060957829003601f168201915b505050505090505b90565b600061064561063e611043565b8484611047565b5060015b92915050565b6106593382611133565b50565b6001600160a01b0381163314156106a45760405162461bcd60e51b8152600401808060200182810382526025815260200180611f806025913960400191505060405180910390fd5b3360008181526009602052604080822080546001600160a01b0319166001600160a01b03861690811790915590519092917fc2d6a42a9d5273283f73009a07aacfb043f2f91173a8d9d33b504afe898db08b91a350565b600080610706611322565b90508061071757600091505061062e565b600b546005546040805163d15e005360e01b81526001600160a01b036101009093048316600482015290516107b7936107b293169163d15e0053916024808301926020929190829003018186803b15801561077157600080fd5b505afa158015610785573d6000803e3d6000fd5b505050506040513d602081101561079b57600080fd5b50516107a684611328565b9063ffffffff61133e16565b611389565b91505090565b6001600160a01b0381166000908152600860205260409020545b919050565b60006107e98484846113a2565b61085f846107f5611043565b61085a85604051806060016040528060288152602001611fc6602891396001600160a01b038a16600090815260016020526040812090610833611043565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61141116565b611047565b5060019392505050565b60055460ff1690565b6001600160a01b038281166000908152600960205260409020541633146108ca5760405162461bcd60e51b815260040180806020018281038252603a81526020018061214b603a913960400191505060405180910390fd5b6108d48282611133565b5050565b60006106456108e5611043565b8461085a85600160006108f6611043565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6114a816565b600b546001600160a01b031633146109755760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b600080600061098385611502565b935093509350506109958583866115f3565b61099f858561172a565b60006109b1848663ffffffff61183216565b6109c1576109be86611874565b90505b856001600160a01b03167f90e5d3d68ec162d9c7de393037a3ede04dd44f68e051bf2ace4a73c299dbc4db8685846109f957856109fc565b60005b60408051938452602084019290925282820152519081900360600190a2505050505050565b6001600160a01b039081166000908152600760205260409020541690565b600b54600554604080516376e9d61560e01b81526101009092046001600160a01b039081166004840152858116602484015260448301859052905160009391909116916376e9d615916064808301926020929190829003018186803b158015610aa757600080fd5b505afa158015610abb573d6000803e3d6000fd5b505050506040513d6020811015610ad157600080fd5b50519392505050565b600080610ae683611926565b6001600160a01b03841660009081526008602052604090205490915081158015610b0e575080155b15610b1e576000925050506107d7565b6001600160a01b0384811660009081526007602052604090205416610b6f57610b6681610b5a86610b55868463ffffffff6114a816565b611941565b9063ffffffff61183216565b925050506107d7565b610b66610b8082610b5a8785611941565b839063ffffffff6114a816565b60055461010090046001600160a01b031681565b600b546001600160a01b03163314610bea5760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b600080610bf684611502565b935093505050610c1a84610c1385856114a890919063ffffffff16565b60006115f3565b610c2484846119f6565b604080518481526020810184905280820183905290516001600160a01b038616917fbe7799898ca2d813ff902b487c1b434ab45b47edd8f38b77ad5e99aae8341b7a919081900360600190a250505050565b60048054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106265780601f106105fb57610100808354040283529160200191610626565b6000610645610ce4611043565b8461085a856040518060600160405280602581526020016121266025913960016000610d0e611043565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61141116565b6000610645610d52611043565b84846113a2565b600061064982611926565b60001981565b60008111610dbf576040805162461bcd60e51b815260206004820181905260248201527f416d6f756e7420746f2072656465656d206e6565647320746f206265203e2030604482015290519081900360640190fd5b6000806000610dcd33611502565b91955093509150849050600019811415610de45750825b83811115610e235760405162461bcd60e51b8152600401808060200182810382526032815260200180611f066032913960400191505060405180910390fd5b610e2d3382610a3f565b610e7e576040805162461bcd60e51b815260206004820152601b60248201527f5472616e736665722063616e6e6f7420626520616c6c6f7765642e0000000000604482015290519081900360640190fd5b610e893384836115f3565b610e93338261172a565b6000610ea5858363ffffffff61183216565b610eb557610eb233611874565b90505b600b546005546001600160a01b0391821691639895e3d8916101009004163385610ee58a8263ffffffff61183216565b6040518563ffffffff1660e01b815260040180856001600160a01b03166001600160a01b03168152602001846001600160a01b03166001600160a01b03168152602001838152602001828152602001945050505050600060405180830381600087803b158015610f5457600080fd5b505af1158015610f68573d6000803e3d6000fd5b50505050336001600160a01b03167fbd5034ffbd47e4e72a94baa2cdb74c6fad73cb3bcdc13036b72ec8306f5a76468386846109f957866109fc565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b031660009081526006602052604090205490565b600b546001600160a01b031633146110335760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b61103e838383611af2565b505050565b3390565b6001600160a01b03831661108c5760405162461bcd60e51b81526004018080602001828103825260248152602001806120d06024913960400191505060405180910390fd5b6001600160a01b0382166110d15760405162461bcd60e51b8152600401808060200182810382526022815260200180611f386022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0380831660009081526007602052604090205481169082168114156111905760405162461bcd60e51b815260040180806020018281038252602a815260200180611fee602a913960400191505060405180910390fd5b60008060008061119f87611502565b9350935093509350600083116111e65760405162461bcd60e51b81526004018080602001828103825260428152602001806120186042913960600191505060405180910390fd5b6001600160a01b0385161561120157611201876000866115f3565b866001600160a01b0316866001600160a01b0316141561128d576001600160a01b038716600081815260076020908152604080832080546001600160a01b03191690558051878152918201869052818101859052519192917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a73487355949181900360600190a350505050506108d4565b6001600160a01b03878116600090815260076020526040812080546001600160a01b031916928916929092179091556112c990889085906115f3565b604080518481526020810184905280820183905290516001600160a01b0380891692908a16917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a73487355949181900360600190a350505050505050565b60025490565b600061064982633b9aca0063ffffffff611c2116565b60006113826b033b2e3c9fd0803ce8000000611376611363868663ffffffff611c2116565b6b019d971e4fe8401e74000000906114a8565b9063ffffffff611c7a16565b9392505050565b6000631dcd6500611382633b9aca0061137683866114a8565b82816113ae8282610a3f565b6113ff576040805162461bcd60e51b815260206004820152601b60248201527f5472616e736665722063616e6e6f7420626520616c6c6f7765642e0000000000604482015290519081900360640190fd5b61140a858585611af2565b5050505050565b600081848411156114a05760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561146557818101518382015260200161144d565b50505050905090810190601f1680156114925780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015611382576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600080600080600061151386611926565b9050600061152482610b5a89610ada565b905061153087826119f6565b600b546005546040805163d15e005360e01b81526101009092046001600160a01b0390811660048401529051600093919091169163d15e0053916024808301926020929190829003018186803b15801561158957600080fd5b505afa15801561159d573d6000803e3d6000fd5b505050506040513d60208110156115b357600080fd5b50516001600160a01b03891660009081526006602052604090208190559050826115e3818463ffffffff6114a816565b9099909850919650945092505050565b6001600160a01b038084166000908152600760205260409020541680611619575061103e565b60008061162583611502565b6001600160a01b038716600090815260086020526040902054919550935061165b9250869150610b5a908863ffffffff6114a816565b6001600160a01b038085166000908152600860209081526040808320949094556007905291909120541680156116ce576001600160a01b0381166000908152600860205260409020546116b4908463ffffffff6114a816565b6001600160a01b0382166000908152600860205260409020555b60408051848152602081018490528082018890526060810187905290516001600160a01b038616917f70ff8cf632603e2bfd1afb7e4061acce53d95356b1be9726b99fa22ba733b01f919081900360800190a250505050505050565b6001600160a01b03821661176f5760405162461bcd60e51b815260040180806020018281038252602181526020018061208a6021913960400191505060405180910390fd5b61177b8260008361103e565b6117be81604051806060016040528060228152602001611ee4602291396001600160a01b038516600090815260208190526040902054919063ffffffff61141116565b6001600160a01b0383166000908152602081905260409020556002546117ea908263ffffffff61183216565b6002556040805182815290516000916001600160a01b038516917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9181900360200190a35050565b600061138283836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250611411565b6001600160a01b038116600081815260076020908152604080832080546001600160a01b03191690558051838152918201839052818101839052519192839290917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a7348735594919081900360600190a36001600160a01b03821660009081526008602052604090205461191e57506001600160a01b03811660009081526006602052604081205560016107d7565b5060006107d7565b6001600160a01b031660009081526020819052604090205490565b6001600160a01b03808316600090815260066020908152604080832054600b54600554835163d15e005360e01b81526101009091048716600482015292519495611382956107b29593946119ea94939092169263d15e00539260248082019391829003018186803b1580156119b557600080fd5b505afa1580156119c9573d6000803e3d6000fd5b505050506040513d60208110156119df57600080fd5b50516107a687611328565b9063ffffffff611cbc16565b6001600160a01b038216611a51576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b611a5d6000838361103e565b600254611a70908263ffffffff6114a816565b6002556001600160a01b038216600090815260208190526040902054611a9c908263ffffffff6114a816565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b60008111611b315760405162461bcd60e51b815260040180806020018281038252603081526020018061205a6030913960400191505060405180910390fd5b6000806000611b3f86611502565b93509350935050600080611b5287611502565b935093505050611b638885886115f3565b611b7787610c13848963ffffffff6114a816565b611b82888888611cf4565b6000611b94868863ffffffff61183216565b611ba457611ba189611874565b90505b876001600160a01b0316896001600160a01b03167f89a178eaa27e0cd201bd795ca8ff716ac0df9618494510ca79771cfc66ffcde889888786611be75789611bea565b60005b60408051948552602085019390935283830191909152606083015260808201879052519081900360a00190a3505050505050505050565b600082611c3057506000610649565b82820282848281611c3d57fe5b04146113825760405162461bcd60e51b8152600401808060200182810382526021815260200180611fa56021913960400191505060405180910390fd5b600061138283836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611e5b565b600060028204611cec83611376611cdf876b033b2e3c9fd0803ce8000000611c21565b849063ffffffff6114a816565b949350505050565b6001600160a01b038316611d395760405162461bcd60e51b81526004018080602001828103825260258152602001806120ab6025913960400191505060405180910390fd5b6001600160a01b038216611d7e5760405162461bcd60e51b8152600401808060200182810382526023815260200180611ec16023913960400191505060405180910390fd5b611d8983838361103e565b611dcc81604051806060016040528060268152602001611f5a602691396001600160a01b038616600090815260208190526040902054919063ffffffff61141116565b6001600160a01b038085166000908152602081905260408082209390935590841681522054611e01908263ffffffff6114a816565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b60008183611eaa5760405162461bcd60e51b815260206004820181815283516024840152835190928392604490910191908501908083836000831561146557818101518382015260200161144d565b506000838581611eb657fe5b049594505050505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a206275726e20616d6f756e7420657863656564732062616c616e6365557365722063616e6e6f742072656465656d206d6f7265207468616e2074686520617661696c61626c652062616c616e636545524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e6365557365722063616e6e6f74206769766520616c6c6f77616e636520746f2068696d73656c66536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f7745524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e6365496e74657265737420697320616c7265616479207265646972656374656420746f207468652075736572496e7465726573742073747265616d2063616e206f6e6c79206265207265646972656374656420696620746865726520697320612076616c69642062616c616e63655472616e7366657272656420616d6f756e74206e6565647320746f2062652067726561746572207468616e207a65726f45524332303a206275726e2066726f6d20746865207a65726f206164647265737345524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f20616464726573735468652063616c6c6572206f6620746869732066756e6374696f6e206d7573742062652061206c656e64696e6720706f6f6c45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726f43616c6c6572206973206e6f7420616c6c6f77656420746f2072656469726563742074686520696e746572657374206f66207468652075736572a264697066735822122019873305020cbc01aa77bbb897e23d81612ce64a19cddc5032e3ae3b0086ac6564736f6c63430006080033";
+  "0x60806040523480156200001157600080fd5b506040516200255a3803806200255a833981810160405260a08110156200003757600080fd5b8151602083015160408085015160608601805192519496939591949391820192846401000000008211156200006b57600080fd5b9083019060208201858111156200008157600080fd5b82516401000000008111828201881017156200009c57600080fd5b82525081516020918201929091019080838360005b83811015620000cb578181015183820152602001620000b1565b50505050905090810190601f168015620000f95780820380516001836020036101000a031916815260200191505b50604052602001805160405193929190846401000000008211156200011d57600080fd5b9083019060208201858111156200013357600080fd5b82516401000000008111828201881017156200014e57600080fd5b82525081516020918201929091019080838360005b838110156200017d57818101518382015260200162000163565b50505050905090810190601f168015620001ab5780820380516001836020036101000a031916815260200191505b50604052505082518391508290620001cb906003906020850190620002eb565b508051620001e1906004906020840190620002eb565b50506005805460ff191660121790555062000205836001600160e01b03620002d516565b600a80546001600160a01b0319166001600160a01b03878116919091179182905560408051630261bf8b60e01b815290519290911691630261bf8b91600480820192602092909190829003018186803b1580156200026257600080fd5b505afa15801562000277573d6000803e3d6000fd5b505050506040513d60208110156200028e57600080fd5b5051600b80546001600160a01b0319166001600160a01b0392831617905560058054610100600160a81b031916610100969092169590950217909355506200039092505050565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200032e57805160ff19168380011785556200035e565b828001600101855582156200035e579182015b828111156200035e57825182559160200191906001019062000341565b506200036c92915062000370565b5090565b6200038d91905b808211156200036c576000815560010162000377565b90565b6121ba80620003a06000396000f3fe608060405234801561001057600080fd5b50600436106101735760003560e01c80635eae177c116100de578063a9059cbb11610097578063db006a7511610071578063db006a75146104f3578063dd62ed3e14610510578063ee9907a41461053e578063f866c3191461056457610173565b8063a9059cbb14610499578063c634dfaa146104c5578063d0fc81d2146104eb57610173565b80635eae177c146103df57806370a082311461040b57806389d1a0fc1461043157806394362e8b1461043957806395d89b4114610465578063a457c2d71461046d57610173565b806323b872dd1161013057806323b872dd146102c3578063313ce567146102f9578063325a9b131461031757806339509351146103455780633edb7cb814610371578063445e80101461039d57610173565b806306fdde0314610178578063095ea7b3146101f55780630e49072d1461023557806312c87c2d1461025d57806318160ddd146102835780631d51e7cf1461029d575b600080fd5b61018061059a565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101ba5781810151838201526020016101a2565b50505050905090810190601f1680156101e75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102216004803603604081101561020b57600080fd5b506001600160a01b038135169060200135610631565b604080519115158252519081900360200190f35b61025b6004803603602081101561024b57600080fd5b50356001600160a01b031661064f565b005b61025b6004803603602081101561027357600080fd5b50356001600160a01b031661065c565b61028b6106fb565b60408051918252519081900360200190f35b61028b600480360360208110156102b357600080fd5b50356001600160a01b03166107bd565b610221600480360360608110156102d957600080fd5b506001600160a01b038135811691602081013590911690604001356107dc565b610301610869565b6040805160ff9092168252519081900360200190f35b61025b6004803603604081101561032d57600080fd5b506001600160a01b0381358116916020013516610872565b6102216004803603604081101561035b57600080fd5b506001600160a01b0381351690602001356108d8565b61025b6004803603604081101561038757600080fd5b506001600160a01b03813516906020013561092c565b6103c3600480360360208110156103b357600080fd5b50356001600160a01b0316610a21565b604080516001600160a01b039092168252519081900360200190f35b610221600480360360408110156103f557600080fd5b506001600160a01b038135169060200135610a3f565b61028b6004803603602081101561042157600080fd5b50356001600160a01b0316610ada565b6103c3610b8d565b61025b6004803603604081101561044f57600080fd5b506001600160a01b038135169060200135610ba1565b610180610c76565b6102216004803603604081101561048357600080fd5b506001600160a01b038135169060200135610cd7565b610221600480360360408110156104af57600080fd5b506001600160a01b038135169060200135610d45565b61028b600480360360208110156104db57600080fd5b50356001600160a01b0316610d59565b61028b610d64565b61025b6004803603602081101561050957600080fd5b5035610d6a565b61028b6004803603604081101561052657600080fd5b506001600160a01b0381358116916020013516610fa4565b61028b6004803603602081101561055457600080fd5b50356001600160a01b0316610fcf565b61025b6004803603606081101561057a57600080fd5b506001600160a01b03813581169160208101359091169060400135610fea565b60038054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106265780601f106105fb57610100808354040283529160200191610626565b820191906000526020600020905b81548152906001019060200180831161060957829003601f168201915b505050505090505b90565b600061064561063e611043565b8484611047565b5060015b92915050565b6106593382611133565b50565b6001600160a01b0381163314156106a45760405162461bcd60e51b8152600401808060200182810382526025815260200180611f806025913960400191505060405180910390fd5b3360008181526009602052604080822080546001600160a01b0319166001600160a01b03861690811790915590519092917fc2d6a42a9d5273283f73009a07aacfb043f2f91173a8d9d33b504afe898db08b91a350565b600080610706611322565b90508061071757600091505061062e565b600b546005546040805163d15e005360e01b81526001600160a01b036101009093048316600482015290516107b7936107b293169163d15e0053916024808301926020929190829003018186803b15801561077157600080fd5b505afa158015610785573d6000803e3d6000fd5b505050506040513d602081101561079b57600080fd5b50516107a684611328565b9063ffffffff61133e16565b611389565b91505090565b6001600160a01b0381166000908152600860205260409020545b919050565b60006107e98484846113a2565b61085f846107f5611043565b61085a85604051806060016040528060288152602001611fc6602891396001600160a01b038a16600090815260016020526040812090610833611043565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61141116565b611047565b5060019392505050565b60055460ff1690565b6001600160a01b038281166000908152600960205260409020541633146108ca5760405162461bcd60e51b815260040180806020018281038252603a81526020018061214b603a913960400191505060405180910390fd5b6108d48282611133565b5050565b60006106456108e5611043565b8461085a85600160006108f6611043565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6114a816565b600b546001600160a01b031633146109755760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b600080600061098385611502565b935093509350506109958583866115f3565b61099f858561172a565b60006109b1848663ffffffff61183216565b6109c1576109be86611874565b90505b856001600160a01b03167f90e5d3d68ec162d9c7de393037a3ede04dd44f68e051bf2ace4a73c299dbc4db8685846109f957856109fc565b60005b60408051938452602084019290925282820152519081900360600190a2505050505050565b6001600160a01b039081166000908152600760205260409020541690565b600b54600554604080516376e9d61560e01b81526101009092046001600160a01b039081166004840152858116602484015260448301859052905160009391909116916376e9d615916064808301926020929190829003018186803b158015610aa757600080fd5b505afa158015610abb573d6000803e3d6000fd5b505050506040513d6020811015610ad157600080fd5b50519392505050565b600080610ae683611926565b6001600160a01b03841660009081526008602052604090205490915081158015610b0e575080155b15610b1e576000925050506107d7565b6001600160a01b0384811660009081526007602052604090205416610b6f57610b6681610b5a86610b55868463ffffffff6114a816565b611941565b9063ffffffff61183216565b925050506107d7565b610b66610b8082610b5a8785611941565b839063ffffffff6114a816565b60055461010090046001600160a01b031681565b600b546001600160a01b03163314610bea5760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b600080610bf684611502565b935093505050610c1a84610c1385856114a890919063ffffffff16565b60006115f3565b610c2484846119f6565b604080518481526020810184905280820183905290516001600160a01b038616917fbe7799898ca2d813ff902b487c1b434ab45b47edd8f38b77ad5e99aae8341b7a919081900360600190a250505050565b60048054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106265780601f106105fb57610100808354040283529160200191610626565b6000610645610ce4611043565b8461085a856040518060600160405280602581526020016121266025913960016000610d0e611043565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61141116565b6000610645610d52611043565b84846113a2565b600061064982611926565b60001981565b60008111610dbf576040805162461bcd60e51b815260206004820181905260248201527f416d6f756e7420746f2072656465656d206e6565647320746f206265203e2030604482015290519081900360640190fd5b6000806000610dcd33611502565b91955093509150849050600019811415610de45750825b83811115610e235760405162461bcd60e51b8152600401808060200182810382526032815260200180611f066032913960400191505060405180910390fd5b610e2d3382610a3f565b610e7e576040805162461bcd60e51b815260206004820152601b60248201527f5472616e736665722063616e6e6f7420626520616c6c6f7765642e0000000000604482015290519081900360640190fd5b610e893384836115f3565b610e93338261172a565b6000610ea5858363ffffffff61183216565b610eb557610eb233611874565b90505b600b546005546001600160a01b0391821691639895e3d8916101009004163385610ee58a8263ffffffff61183216565b6040518563ffffffff1660e01b815260040180856001600160a01b03166001600160a01b03168152602001846001600160a01b03166001600160a01b03168152602001838152602001828152602001945050505050600060405180830381600087803b158015610f5457600080fd5b505af1158015610f68573d6000803e3d6000fd5b50505050336001600160a01b03167fbd5034ffbd47e4e72a94baa2cdb74c6fad73cb3bcdc13036b72ec8306f5a76468386846109f957866109fc565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b031660009081526006602052604090205490565b600b546001600160a01b031633146110335760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b61103e838383611af2565b505050565b3390565b6001600160a01b03831661108c5760405162461bcd60e51b81526004018080602001828103825260248152602001806120d06024913960400191505060405180910390fd5b6001600160a01b0382166110d15760405162461bcd60e51b8152600401808060200182810382526022815260200180611f386022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0380831660009081526007602052604090205481169082168114156111905760405162461bcd60e51b815260040180806020018281038252602a815260200180611fee602a913960400191505060405180910390fd5b60008060008061119f87611502565b9350935093509350600083116111e65760405162461bcd60e51b81526004018080602001828103825260428152602001806120186042913960600191505060405180910390fd5b6001600160a01b0385161561120157611201876000866115f3565b866001600160a01b0316866001600160a01b0316141561128d576001600160a01b038716600081815260076020908152604080832080546001600160a01b03191690558051878152918201869052818101859052519192917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a73487355949181900360600190a350505050506108d4565b6001600160a01b03878116600090815260076020526040812080546001600160a01b031916928916929092179091556112c990889085906115f3565b604080518481526020810184905280820183905290516001600160a01b0380891692908a16917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a73487355949181900360600190a350505050505050565b60025490565b600061064982633b9aca0063ffffffff611c2116565b60006113826b033b2e3c9fd0803ce8000000611376611363868663ffffffff611c2116565b6b019d971e4fe8401e74000000906114a8565b9063ffffffff611c7a16565b9392505050565b6000631dcd6500611382633b9aca0061137683866114a8565b82816113ae8282610a3f565b6113ff576040805162461bcd60e51b815260206004820152601b60248201527f5472616e736665722063616e6e6f7420626520616c6c6f7765642e0000000000604482015290519081900360640190fd5b61140a858585611af2565b5050505050565b600081848411156114a05760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561146557818101518382015260200161144d565b50505050905090810190601f1680156114925780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015611382576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600080600080600061151386611926565b9050600061152482610b5a89610ada565b905061153087826119f6565b600b546005546040805163d15e005360e01b81526101009092046001600160a01b0390811660048401529051600093919091169163d15e0053916024808301926020929190829003018186803b15801561158957600080fd5b505afa15801561159d573d6000803e3d6000fd5b505050506040513d60208110156115b357600080fd5b50516001600160a01b03891660009081526006602052604090208190559050826115e3818463ffffffff6114a816565b9099909850919650945092505050565b6001600160a01b038084166000908152600760205260409020541680611619575061103e565b60008061162583611502565b6001600160a01b038716600090815260086020526040902054919550935061165b9250869150610b5a908863ffffffff6114a816565b6001600160a01b038085166000908152600860209081526040808320949094556007905291909120541680156116ce576001600160a01b0381166000908152600860205260409020546116b4908463ffffffff6114a816565b6001600160a01b0382166000908152600860205260409020555b60408051848152602081018490528082018890526060810187905290516001600160a01b038616917f70ff8cf632603e2bfd1afb7e4061acce53d95356b1be9726b99fa22ba733b01f919081900360800190a250505050505050565b6001600160a01b03821661176f5760405162461bcd60e51b815260040180806020018281038252602181526020018061208a6021913960400191505060405180910390fd5b61177b8260008361103e565b6117be81604051806060016040528060228152602001611ee4602291396001600160a01b038516600090815260208190526040902054919063ffffffff61141116565b6001600160a01b0383166000908152602081905260409020556002546117ea908263ffffffff61183216565b6002556040805182815290516000916001600160a01b038516917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9181900360200190a35050565b600061138283836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250611411565b6001600160a01b038116600081815260076020908152604080832080546001600160a01b03191690558051838152918201839052818101839052519192839290917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a7348735594919081900360600190a36001600160a01b03821660009081526008602052604090205461191e57506001600160a01b03811660009081526006602052604081205560016107d7565b5060006107d7565b6001600160a01b031660009081526020819052604090205490565b6001600160a01b03808316600090815260066020908152604080832054600b54600554835163d15e005360e01b81526101009091048716600482015292519495611382956107b29593946119ea94939092169263d15e00539260248082019391829003018186803b1580156119b557600080fd5b505afa1580156119c9573d6000803e3d6000fd5b505050506040513d60208110156119df57600080fd5b50516107a687611328565b9063ffffffff611cbc16565b6001600160a01b038216611a51576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b611a5d6000838361103e565b600254611a70908263ffffffff6114a816565b6002556001600160a01b038216600090815260208190526040902054611a9c908263ffffffff6114a816565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b60008111611b315760405162461bcd60e51b815260040180806020018281038252603081526020018061205a6030913960400191505060405180910390fd5b6000806000611b3f86611502565b93509350935050600080611b5287611502565b935093505050611b638885886115f3565b611b7787610c13848963ffffffff6114a816565b611b82888888611cf4565b6000611b94868863ffffffff61183216565b611ba457611ba189611874565b90505b876001600160a01b0316896001600160a01b03167f89a178eaa27e0cd201bd795ca8ff716ac0df9618494510ca79771cfc66ffcde889888786611be75789611bea565b60005b60408051948552602085019390935283830191909152606083015260808201879052519081900360a00190a3505050505050505050565b600082611c3057506000610649565b82820282848281611c3d57fe5b04146113825760405162461bcd60e51b8152600401808060200182810382526021815260200180611fa56021913960400191505060405180910390fd5b600061138283836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611e5b565b600060028204611cec83611376611cdf876b033b2e3c9fd0803ce8000000611c21565b849063ffffffff6114a816565b949350505050565b6001600160a01b038316611d395760405162461bcd60e51b81526004018080602001828103825260258152602001806120ab6025913960400191505060405180910390fd5b6001600160a01b038216611d7e5760405162461bcd60e51b8152600401808060200182810382526023815260200180611ec16023913960400191505060405180910390fd5b611d8983838361103e565b611dcc81604051806060016040528060268152602001611f5a602691396001600160a01b038616600090815260208190526040902054919063ffffffff61141116565b6001600160a01b038085166000908152602081905260408082209390935590841681522054611e01908263ffffffff6114a816565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b60008183611eaa5760405162461bcd60e51b815260206004820181815283516024840152835190928392604490910191908501908083836000831561146557818101518382015260200161144d565b506000838581611eb657fe5b049594505050505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a206275726e20616d6f756e7420657863656564732062616c616e6365557365722063616e6e6f742072656465656d206d6f7265207468616e2074686520617661696c61626c652062616c616e636545524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e6365557365722063616e6e6f74206769766520616c6c6f77616e636520746f2068696d73656c66536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f7745524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e6365496e74657265737420697320616c7265616479207265646972656374656420746f207468652075736572496e7465726573742073747265616d2063616e206f6e6c79206265207265646972656374656420696620746865726520697320612076616c69642062616c616e63655472616e7366657272656420616d6f756e74206e6565647320746f2062652067726561746572207468616e207a65726f45524332303a206275726e2066726f6d20746865207a65726f206164647265737345524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f20616464726573735468652063616c6c6572206f6620746869732066756e6374696f6e206d7573742062652061206c656e64696e6720706f6f6c45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726f43616c6c6572206973206e6f7420616c6c6f77656420746f2072656469726563742074686520696e746572657374206f66207468652075736572a2646970667358221220f59dad91f902c51c86450f254392611219e74e5de6a35d6ee1be8a8f7574cedd64736f6c63430006080033";
diff --git a/types/AaveProtocolTestHelpersFactory.ts b/types/AaveProtocolTestHelpersFactory.ts
index 70fc4a73..26c3b956 100644
--- a/types/AaveProtocolTestHelpersFactory.ts
+++ b/types/AaveProtocolTestHelpersFactory.ts
@@ -123,4 +123,4 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x60a060405234801561001057600080fd5b50604051610a4a380380610a4a83398101604081905261002f91610044565b60601b6001600160601b031916608052610072565b600060208284031215610055578081fd5b81516001600160a01b038116811461006b578182fd5b9392505050565b60805160601c6109b3610097600039806083528060ab528061035f52506109b36000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630542975c14610046578063b316ff8914610064578063f561ae4114610079575b600080fd5b61004e610081565b60405161005b919061085f565b60405180910390f35b61006c6100a5565b60405161005b9190610873565b61006c610359565b7f000000000000000000000000000000000000000000000000000000000000000081565b606060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561010257600080fd5b505afa158015610116573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061013a9190610650565b90506060816001600160a01b0316630902f1ac6040518163ffffffff1660e01b815260040160006040518083038186803b15801561017757600080fd5b505afa15801561018b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526101b39190810190610672565b90506060815167ffffffffffffffff811180156101cf57600080fd5b5060405190808252806020026020018201604052801561020957816020015b6101f661061b565b8152602001906001900390816101ee5790505b50905060005b825181101561035157604051806040016040528084838151811061022f57fe5b60200260200101516001600160a01b031673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee6001600160a01b0316146102f05784838151811061026f57fe5b60200260200101516001600160a01b03166395d89b416040518163ffffffff1660e01b815260040160006040518083038186803b1580156102af57600080fd5b505afa1580156102c3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526102eb919081019061071d565b61030d565b6040518060400160405280600381526020016208aa8960eb1b8152505b815260200184838151811061031e57fe5b60200260200101516001600160a01b031681525082828151811061033e57fe5b602090810291909101015260010161020f565b509250505090565b606060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103b657600080fd5b505afa1580156103ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ee9190610650565b90506060816001600160a01b0316630902f1ac6040518163ffffffff1660e01b815260040160006040518083038186803b15801561042b57600080fd5b505afa15801561043f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104679190810190610672565b90506060815167ffffffffffffffff8111801561048357600080fd5b506040519080825280602002602001820160405280156104bd57816020015b6104aa61061b565b8152602001906001900390816104a25790505b50905060005b8251811015610351576000846001600160a01b0316633e1501418584815181106104e957fe5b60200260200101516040518263ffffffff1660e01b815260040161050d919061085f565b6101406040518083038186803b15801561052657600080fd5b505afa15801561053a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061055e91906107a9565b50505050509450505050506040518060400160405280826001600160a01b03166395d89b416040518163ffffffff1660e01b815260040160006040518083038186803b1580156105ad57600080fd5b505afa1580156105c1573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526105e9919081019061071d565b8152602001826001600160a01b031681525083838151811061060757fe5b6020908102919091010152506001016104c3565b60408051808201909152606081526000602082015290565b80516001600160a01b038116811461064a57600080fd5b92915050565b600060208284031215610661578081fd5b61066b8383610633565b9392505050565b60006020808385031215610684578182fd5b825167ffffffffffffffff8082111561069b578384fd5b81850186601f8201126106ac578485fd5b80519250818311156106bc578485fd5b83830291506106cc84830161090c565b8381528481019082860184840187018a10156106e6578788fd5b8794505b85851015610710576106fc8a82610633565b8352600194909401939186019186016106ea565b5098975050505050505050565b60006020828403121561072e578081fd5b815167ffffffffffffffff80821115610745578283fd5b81840185601f820112610756578384fd5b8051925081831115610766578384fd5b610779601f8401601f191660200161090c565b915082825285602084830101111561078f578384fd5b6107a083602084016020840161093c565b50949350505050565b6000806000806000806000806000806101408b8d0312156107c8578586fd5b8a51995060208b0151985060408b015197506107e78c60608d01610633565b96506107f68c60808d01610633565b955060a08b01516108068161096c565b60c08c01519095506108178161096c565b60e08c01519094506108288161096c565b6101008c015190935061083a8161096c565b6101208c015190925061084c8161096c565b809150509295989b9194979a5092959850565b6001600160a01b0391909116815260200190565b60208082528251828201819052600091906040908185019080840286018301878501865b838110156108fe57888303603f190185528151805187855280516108bd818a8801610933565b6108ca82828d860161093c565b928a01516001600160a01b0316958a01959095525094870194601f93909301601f1916929092019190860190600101610897565b509098975050505050505050565b60405181810167ffffffffffffffff8111828210171561092b57600080fd5b604052919050565b90815260200190565b60005b8381101561095757818101518382015260200161093f565b83811115610966576000848401525b50505050565b801515811461097a57600080fd5b5056fea26469706673582212208890c0585884c02ec7a65336c8d44641e2cdee255a694e2599af11771ae7494b64736f6c63430006080033";
+  "0x60a060405234801561001057600080fd5b50604051610a4a380380610a4a83398101604081905261002f91610044565b60601b6001600160601b031916608052610072565b600060208284031215610055578081fd5b81516001600160a01b038116811461006b578182fd5b9392505050565b60805160601c6109b3610097600039806083528060ab528061035f52506109b36000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630542975c14610046578063b316ff8914610064578063f561ae4114610079575b600080fd5b61004e610081565b60405161005b919061085f565b60405180910390f35b61006c6100a5565b60405161005b9190610873565b61006c610359565b7f000000000000000000000000000000000000000000000000000000000000000081565b606060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561010257600080fd5b505afa158015610116573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061013a9190610650565b90506060816001600160a01b0316630902f1ac6040518163ffffffff1660e01b815260040160006040518083038186803b15801561017757600080fd5b505afa15801561018b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526101b39190810190610672565b90506060815167ffffffffffffffff811180156101cf57600080fd5b5060405190808252806020026020018201604052801561020957816020015b6101f661061b565b8152602001906001900390816101ee5790505b50905060005b825181101561035157604051806040016040528084838151811061022f57fe5b60200260200101516001600160a01b031673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee6001600160a01b0316146102f05784838151811061026f57fe5b60200260200101516001600160a01b03166395d89b416040518163ffffffff1660e01b815260040160006040518083038186803b1580156102af57600080fd5b505afa1580156102c3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526102eb919081019061071d565b61030d565b6040518060400160405280600381526020016208aa8960eb1b8152505b815260200184838151811061031e57fe5b60200260200101516001600160a01b031681525082828151811061033e57fe5b602090810291909101015260010161020f565b509250505090565b606060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103b657600080fd5b505afa1580156103ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ee9190610650565b90506060816001600160a01b0316630902f1ac6040518163ffffffff1660e01b815260040160006040518083038186803b15801561042b57600080fd5b505afa15801561043f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104679190810190610672565b90506060815167ffffffffffffffff8111801561048357600080fd5b506040519080825280602002602001820160405280156104bd57816020015b6104aa61061b565b8152602001906001900390816104a25790505b50905060005b8251811015610351576000846001600160a01b0316633e1501418584815181106104e957fe5b60200260200101516040518263ffffffff1660e01b815260040161050d919061085f565b6101406040518083038186803b15801561052657600080fd5b505afa15801561053a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061055e91906107a9565b50505050509450505050506040518060400160405280826001600160a01b03166395d89b416040518163ffffffff1660e01b815260040160006040518083038186803b1580156105ad57600080fd5b505afa1580156105c1573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526105e9919081019061071d565b8152602001826001600160a01b031681525083838151811061060757fe5b6020908102919091010152506001016104c3565b60408051808201909152606081526000602082015290565b80516001600160a01b038116811461064a57600080fd5b92915050565b600060208284031215610661578081fd5b61066b8383610633565b9392505050565b60006020808385031215610684578182fd5b825167ffffffffffffffff8082111561069b578384fd5b81850186601f8201126106ac578485fd5b80519250818311156106bc578485fd5b83830291506106cc84830161090c565b8381528481019082860184840187018a10156106e6578788fd5b8794505b85851015610710576106fc8a82610633565b8352600194909401939186019186016106ea565b5098975050505050505050565b60006020828403121561072e578081fd5b815167ffffffffffffffff80821115610745578283fd5b81840185601f820112610756578384fd5b8051925081831115610766578384fd5b610779601f8401601f191660200161090c565b915082825285602084830101111561078f578384fd5b6107a083602084016020840161093c565b50949350505050565b6000806000806000806000806000806101408b8d0312156107c8578586fd5b8a51995060208b0151985060408b015197506107e78c60608d01610633565b96506107f68c60808d01610633565b955060a08b01516108068161096c565b60c08c01519095506108178161096c565b60e08c01519094506108288161096c565b6101008c015190935061083a8161096c565b6101208c015190925061084c8161096c565b809150509295989b9194979a5092959850565b6001600160a01b0391909116815260200190565b60208082528251828201819052600091906040908185019080840286018301878501865b838110156108fe57888303603f190185528151805187855280516108bd818a8801610933565b6108ca82828d860161093c565b928a01516001600160a01b0316958a01959095525094870194601f93909301601f1916929092019190860190600101610897565b509098975050505050505050565b60405181810167ffffffffffffffff8111828210171561092b57600080fd5b604052919050565b90815260200190565b60005b8381101561095757818101518382015260200161093f565b83811115610966576000848401525b50505050565b801515811461097a57600080fd5b5056fea264697066735822122009d3e2e8de21d7e0e5d19997ae6eb1fa1a18a654e8b4059dc9e9b79eabdab45f64736f6c63430006080033";
diff --git a/types/Example.d.ts b/types/Example.d.ts
deleted file mode 100644
index 9ac05376..00000000
--- a/types/Example.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface ExampleInterface extends Interface {
-  functions: {
-    _n: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    test: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {};
-}
-
-export class Example extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): Example;
-  attach(addressOrName: string): Example;
-  deployed(): Promise<Example>;
-
-  on(event: EventFilter | string, listener: Listener): Example;
-  once(event: EventFilter | string, listener: Listener): Example;
-  addListener(eventName: EventFilter | string, listener: Listener): Example;
-  removeAllListeners(eventName: EventFilter | string): Example;
-  removeListener(eventName: any, listener: Listener): Example;
-
-  interface: ExampleInterface;
-
-  functions: {
-    _n(): Promise<BigNumber>;
-
-    test(): Promise<BigNumber>;
-  };
-
-  _n(): Promise<BigNumber>;
-
-  test(): Promise<BigNumber>;
-
-  filters: {};
-
-  estimate: {
-    _n(): Promise<BigNumber>;
-
-    test(): Promise<BigNumber>;
-  };
-}
diff --git a/types/ExampleFactory.ts b/types/ExampleFactory.ts
deleted file mode 100644
index 14abe647..00000000
--- a/types/ExampleFactory.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { Example } from "./Example";
-
-export class ExampleFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<Example> {
-    return super.deploy(overrides) as Promise<Example>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): Example {
-    return super.attach(address) as Example;
-  }
-  connect(signer: Signer): ExampleFactory {
-    return super.connect(signer) as ExampleFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Example {
-    return new Contract(address, _abi, signerOrProvider) as Example;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    inputs: [],
-    name: "_n",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "test",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "n",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x6080604052348015600f57600080fd5b5060056000556097806100236000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c80631aadff81146037578063f8a8fd6d14604f575b600080fd5b603d6055565b60408051918252519081900360200190f35b603d605b565b60005481565b6000549056fea2646970667358221220db729e656432d2a44942aae506cff90eea05978605f6847ecdf717665d7a04e664736f6c63430006080033";
diff --git a/types/GenericLogicFactory.ts b/types/GenericLogicFactory.ts
index 19618c94..c7507f30 100644
--- a/types/GenericLogicFactory.ts
+++ b/types/GenericLogicFactory.ts
@@ -89,4 +89,4 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x610fc8610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80634d9afd5e1461005b578063901d711414610114578063ab8bb39314610211578063c3525c2814610261575b600080fd5b610100600480360360e081101561007157600080fd5b6001600160a01b0382358116926020810135909116916040820135916060810135916080820135919081019060c0810160a08201356401000000008111156100b857600080fd5b8201836020820111156100ca57600080fd5b803590602001918460208302840111640100000000831117156100ec57600080fd5b9193509150356001600160a01b0316610269565b604080519115158252519081900360200190f35b6101de600480360360a081101561012a57600080fd5b6001600160a01b03823516916020810135916040820135919081019060808101606082013564010000000081111561016157600080fd5b82018360208201111561017357600080fd5b8035906020019184602083028401116401000000008311171561019557600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550505090356001600160a01b031691506104ca9050565b604080519687526020870195909552858501939093526060850191909152608084015260a0830152519081900360c00190f35b61024f600480360360a081101561022757600080fd5b50803590602081013590604081013590606081013590608001356001600160a01b0316610ac6565b60408051918252519081900360200190f35b61024f610bb1565b6000610273610e74565b6001600160a01b038a166000908152602088905260409020600c0154600160d01b900460ff1615806102c957506001600160a01b03808a16600090815260208881526040808320938e168352929052205460ff16155b156102d85760019150506104be565b6103198988888888808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152508a92506104ca915050565b5060808601525060608401526040830181905260208301919091526103425760019150506104be565b61040e8760008c6001600160a01b03166001600160a01b0316815260200190815260200160002060080154600a0a6104028a866001600160a01b031663b3596f078f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156103ca57600080fd5b505afa1580156103de573d6000803e3d6000fd5b505050506040513d60208110156103f457600080fd5b50519063ffffffff610bbd16565b9063ffffffff610c1f16565b60c0820181905260208201516104299163ffffffff610c6116565b60e0820181905261043e5760009150506104be565b6104898160e001516104026104648460a001518560c00151610bbd90919063ffffffff16565b6080850151602086015161047d9163ffffffff610bbd16565b9063ffffffff610c6116565b610100820181905260e0820151604083015160608401516000936104af93929190610ca3565b670de0b6b3a764000010925050505b98975050505050505050565b6000806000806000806104db610ed0565b60006101008201525b885181610100015110156109fe57888161010001518151811061050357fe5b60200260200101518161020001906001600160a01b031690816001600160a01b03168152505060008b60008361020001516001600160a01b03166001600160a01b0316815260200190815260200160002090508060090160009054906101000a90046001600160a01b03166001600160a01b03166370a082318e6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156105c357600080fd5b505afa1580156105d7573d6000803e3d6000fd5b505050506040513d60208110156105ed57600080fd5b810190808051906020019092919050505082604001818152505080600a0160009054906101000a90046001600160a01b03166001600160a01b03166370a082318e6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561067457600080fd5b505afa158015610688573d6000803e3d6000fd5b505050506040513d602081101561069e57600080fd5b810190808051906020019092919050505082606001818152505061076581600b0160009054906101000a90046001600160a01b03166001600160a01b03166370a082318f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561072857600080fd5b505afa15801561073c573d6000803e3d6000fd5b505050506040513d602081101561075257600080fd5b505160608401519063ffffffff610cf216565b6060830152604082015115801561077e57506060820151155b1561078957506109ed565b8060080154600a0a826020018181525050886001600160a01b031663b3596f078b846101000151815181106107ba57fe5b60200260200101516040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561080857600080fd5b505afa15801561081c573d6000803e3d6000fd5b505050506040513d602081101561083257600080fd5b50518252604082015115610965576000610865836020015161040285604001518660000151610bbd90919063ffffffff16565b600c830154909150600160d01b900460ff1680156108dd57508b60008f6001600160a01b03166001600160a01b0316815260200190815260200160002060008c856101000151815181106108b557fe5b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff165b15610963576101408301516108f8908263ffffffff610cf216565b610140840152600582015461092a9061091890839063ffffffff610bbd16565b6101a08501519063ffffffff610cf216565b6101a0840152600682015461095c9061094a90839063ffffffff610bbd16565b6101c08501519063ffffffff610cf216565b6101c08401525b505b6060820151156109eb576109a7610995836020015161040285606001518660000151610bbd90919063ffffffff16565b6101608401519063ffffffff610cf216565b6101608301526020820151825160e08401516109e4926109d29290916104029163ffffffff610bbd16565b6101808401519063ffffffff610cf216565b6101808301525b505b6101008101805160010190526104e4565b600081610140015111610a12576000610a2d565b6101408101516101a0820151610a2d9163ffffffff610c1f16565b6101a0820152610140810151610a44576000610a5f565b6101408101516101c0820151610a5f9163ffffffff610c1f16565b6101c08201819052610140820151610160830151610180840151610a8293610ca3565b61012082018190526101408201516101608301516101808401516101a08501516101c090950151929a50909850965091945090925090509550955095509550955095565b600080610ade6064610402898763ffffffff610bbd16565b905085811015610af2576000915050610ba8565b610b12610b05878763ffffffff610cf216565b829063ffffffff610c6116565b60408051630e563a7d60e41b81523360048201526024810183905290519192506000916001600160a01b0386169163e563a7d0916044808301926020929190829003018186803b158015610b6557600080fd5b505afa158015610b79573d6000803e3d6000fd5b505050506040513d6020811015610b8f57600080fd5b50519050610ba3828263ffffffff610c6116565b925050505b95945050505050565b670de0b6b3a764000081565b600082610bcc57506000610c19565b82820282848281610bd957fe5b0414610c165760405162461bcd60e51b8152600401808060200182810382526021815260200180610f726021913960400191505060405180910390fd5b90505b92915050565b6000610c1683836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250610d4c565b6000610c1683836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610dee565b600083610cb35750600019610cea565b610ce7610cc6858563ffffffff610cf216565b610cdb6064610402898763ffffffff610bbd16565b9063ffffffff610e4816565b90505b949350505050565b600082820183811015610c16576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b60008183610dd85760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610d9d578181015183820152602001610d85565b50505050905090810190601f168015610dca5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b506000838581610de457fe5b0495945050505050565b60008184841115610e405760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610d9d578181015183820152602001610d85565b505050900390565b600060028204610cea83610402610e6787670de0b6b3a7640000610bbd565b849063ffffffff610cf216565b604051806101600160405280600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000151581525090565b60405180610260016040528060008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160001515815260200160006001600160a01b03168152602001600015158152602001600015158152509056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77a2646970667358221220e105d7aa0805a19fc16ee1209199001591380dfc79ed4361e75776f15ce7bbdd64736f6c63430006080033";
+  "0x610fc8610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80634d9afd5e1461005b578063901d711414610114578063ab8bb39314610211578063c3525c2814610261575b600080fd5b610100600480360360e081101561007157600080fd5b6001600160a01b0382358116926020810135909116916040820135916060810135916080820135919081019060c0810160a08201356401000000008111156100b857600080fd5b8201836020820111156100ca57600080fd5b803590602001918460208302840111640100000000831117156100ec57600080fd5b9193509150356001600160a01b0316610269565b604080519115158252519081900360200190f35b6101de600480360360a081101561012a57600080fd5b6001600160a01b03823516916020810135916040820135919081019060808101606082013564010000000081111561016157600080fd5b82018360208201111561017357600080fd5b8035906020019184602083028401116401000000008311171561019557600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550505090356001600160a01b031691506104ca9050565b604080519687526020870195909552858501939093526060850191909152608084015260a0830152519081900360c00190f35b61024f600480360360a081101561022757600080fd5b50803590602081013590604081013590606081013590608001356001600160a01b0316610ac6565b60408051918252519081900360200190f35b61024f610bb1565b6000610273610e74565b6001600160a01b038a166000908152602088905260409020600c0154600160d01b900460ff1615806102c957506001600160a01b03808a16600090815260208881526040808320938e168352929052205460ff16155b156102d85760019150506104be565b6103198988888888808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152508a92506104ca915050565b5060808601525060608401526040830181905260208301919091526103425760019150506104be565b61040e8760008c6001600160a01b03166001600160a01b0316815260200190815260200160002060080154600a0a6104028a866001600160a01b031663b3596f078f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156103ca57600080fd5b505afa1580156103de573d6000803e3d6000fd5b505050506040513d60208110156103f457600080fd5b50519063ffffffff610bbd16565b9063ffffffff610c1f16565b60c0820181905260208201516104299163ffffffff610c6116565b60e0820181905261043e5760009150506104be565b6104898160e001516104026104648460a001518560c00151610bbd90919063ffffffff16565b6080850151602086015161047d9163ffffffff610bbd16565b9063ffffffff610c6116565b610100820181905260e0820151604083015160608401516000936104af93929190610ca3565b670de0b6b3a764000010925050505b98975050505050505050565b6000806000806000806104db610ed0565b60006101008201525b885181610100015110156109fe57888161010001518151811061050357fe5b60200260200101518161020001906001600160a01b031690816001600160a01b03168152505060008b60008361020001516001600160a01b03166001600160a01b0316815260200190815260200160002090508060090160009054906101000a90046001600160a01b03166001600160a01b03166370a082318e6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156105c357600080fd5b505afa1580156105d7573d6000803e3d6000fd5b505050506040513d60208110156105ed57600080fd5b810190808051906020019092919050505082604001818152505080600a0160009054906101000a90046001600160a01b03166001600160a01b03166370a082318e6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561067457600080fd5b505afa158015610688573d6000803e3d6000fd5b505050506040513d602081101561069e57600080fd5b810190808051906020019092919050505082606001818152505061076581600b0160009054906101000a90046001600160a01b03166001600160a01b03166370a082318f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561072857600080fd5b505afa15801561073c573d6000803e3d6000fd5b505050506040513d602081101561075257600080fd5b505160608401519063ffffffff610cf216565b6060830152604082015115801561077e57506060820151155b1561078957506109ed565b8060080154600a0a826020018181525050886001600160a01b031663b3596f078b846101000151815181106107ba57fe5b60200260200101516040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561080857600080fd5b505afa15801561081c573d6000803e3d6000fd5b505050506040513d602081101561083257600080fd5b50518252604082015115610965576000610865836020015161040285604001518660000151610bbd90919063ffffffff16565b600c830154909150600160d01b900460ff1680156108dd57508b60008f6001600160a01b03166001600160a01b0316815260200190815260200160002060008c856101000151815181106108b557fe5b6020908102919091018101516001600160a01b031682528101919091526040016000205460ff165b15610963576101408301516108f8908263ffffffff610cf216565b610140840152600582015461092a9061091890839063ffffffff610bbd16565b6101a08501519063ffffffff610cf216565b6101a0840152600682015461095c9061094a90839063ffffffff610bbd16565b6101c08501519063ffffffff610cf216565b6101c08401525b505b6060820151156109eb576109a7610995836020015161040285606001518660000151610bbd90919063ffffffff16565b6101608401519063ffffffff610cf216565b6101608301526020820151825160e08401516109e4926109d29290916104029163ffffffff610bbd16565b6101808401519063ffffffff610cf216565b6101808301525b505b6101008101805160010190526104e4565b600081610140015111610a12576000610a2d565b6101408101516101a0820151610a2d9163ffffffff610c1f16565b6101a0820152610140810151610a44576000610a5f565b6101408101516101c0820151610a5f9163ffffffff610c1f16565b6101c08201819052610140820151610160830151610180840151610a8293610ca3565b61012082018190526101408201516101608301516101808401516101a08501516101c090950151929a50909850965091945090925090509550955095509550955095565b600080610ade6064610402898763ffffffff610bbd16565b905085811015610af2576000915050610ba8565b610b12610b05878763ffffffff610cf216565b829063ffffffff610c6116565b60408051630e563a7d60e41b81523360048201526024810183905290519192506000916001600160a01b0386169163e563a7d0916044808301926020929190829003018186803b158015610b6557600080fd5b505afa158015610b79573d6000803e3d6000fd5b505050506040513d6020811015610b8f57600080fd5b50519050610ba3828263ffffffff610c6116565b925050505b95945050505050565b670de0b6b3a764000081565b600082610bcc57506000610c19565b82820282848281610bd957fe5b0414610c165760405162461bcd60e51b8152600401808060200182810382526021815260200180610f726021913960400191505060405180910390fd5b90505b92915050565b6000610c1683836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250610d4c565b6000610c1683836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610dee565b600083610cb35750600019610cea565b610ce7610cc6858563ffffffff610cf216565b610cdb6064610402898763ffffffff610bbd16565b9063ffffffff610e4816565b90505b949350505050565b600082820183811015610c16576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b60008183610dd85760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610d9d578181015183820152602001610d85565b50505050905090810190601f168015610dca5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b506000838581610de457fe5b0495945050505050565b60008184841115610e405760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610d9d578181015183820152602001610d85565b505050900390565b600060028204610cea83610402610e6787670de0b6b3a7640000610bbd565b849063ffffffff610cf216565b604051806101600160405280600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000151581525090565b60405180610260016040528060008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160001515815260200160006001600160a01b03168152602001600015158152602001600015158152509056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77a2646970667358221220bff163f2434dbc3a9a83a4de15ee6d0b35b5f636fafcd6f1e815eb7ed9bdca7764736f6c63430006080033";
diff --git a/types/IKyberNetworkProxyInterface.d.ts b/types/IKyberNetworkProxyInterface.d.ts
deleted file mode 100644
index e149d2c1..00000000
--- a/types/IKyberNetworkProxyInterface.d.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface IKyberNetworkProxyInterfaceInterface extends Interface {
-  functions: {
-    enabled: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    getExpectedRate: TypedFunctionDescription<{
-      encode([src, dest, srcQty]: [string, string, BigNumberish]): string;
-    }>;
-
-    getUserCapInTokenWei: TypedFunctionDescription<{
-      encode([user, token]: [string, string]): string;
-    }>;
-
-    getUserCapInWei: TypedFunctionDescription<{
-      encode([user]: [string]): string;
-    }>;
-
-    info: TypedFunctionDescription<{ encode([id]: [Arrayish]): string }>;
-
-    maxGasPrice: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    tradeWithHint: TypedFunctionDescription<{
-      encode([
-        src,
-        srcAmount,
-        dest,
-        destAddress,
-        maxDestAmount,
-        minConversionRate,
-        walletId,
-        hint
-      ]: [
-        string,
-        BigNumberish,
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        string,
-        Arrayish
-      ]): string;
-    }>;
-  };
-
-  events: {};
-}
-
-export class IKyberNetworkProxyInterface extends Contract {
-  connect(
-    signerOrProvider: Signer | Provider | string
-  ): IKyberNetworkProxyInterface;
-  attach(addressOrName: string): IKyberNetworkProxyInterface;
-  deployed(): Promise<IKyberNetworkProxyInterface>;
-
-  on(
-    event: EventFilter | string,
-    listener: Listener
-  ): IKyberNetworkProxyInterface;
-  once(
-    event: EventFilter | string,
-    listener: Listener
-  ): IKyberNetworkProxyInterface;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): IKyberNetworkProxyInterface;
-  removeAllListeners(
-    eventName: EventFilter | string
-  ): IKyberNetworkProxyInterface;
-  removeListener(
-    eventName: any,
-    listener: Listener
-  ): IKyberNetworkProxyInterface;
-
-  interface: IKyberNetworkProxyInterfaceInterface;
-
-  functions: {
-    enabled(): Promise<boolean>;
-
-    getExpectedRate(
-      src: string,
-      dest: string,
-      srcQty: BigNumberish
-    ): Promise<{
-      expectedRate: BigNumber;
-      slippageRate: BigNumber;
-      0: BigNumber;
-      1: BigNumber;
-    }>;
-
-    getUserCapInTokenWei(user: string, token: string): Promise<BigNumber>;
-
-    getUserCapInWei(user: string): Promise<BigNumber>;
-
-    info(id: Arrayish): Promise<BigNumber>;
-
-    maxGasPrice(): Promise<BigNumber>;
-
-    tradeWithHint(
-      src: string,
-      srcAmount: BigNumberish,
-      dest: string,
-      destAddress: string,
-      maxDestAmount: BigNumberish,
-      minConversionRate: BigNumberish,
-      walletId: string,
-      hint: Arrayish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  enabled(): Promise<boolean>;
-
-  getExpectedRate(
-    src: string,
-    dest: string,
-    srcQty: BigNumberish
-  ): Promise<{
-    expectedRate: BigNumber;
-    slippageRate: BigNumber;
-    0: BigNumber;
-    1: BigNumber;
-  }>;
-
-  getUserCapInTokenWei(user: string, token: string): Promise<BigNumber>;
-
-  getUserCapInWei(user: string): Promise<BigNumber>;
-
-  info(id: Arrayish): Promise<BigNumber>;
-
-  maxGasPrice(): Promise<BigNumber>;
-
-  tradeWithHint(
-    src: string,
-    srcAmount: BigNumberish,
-    dest: string,
-    destAddress: string,
-    maxDestAmount: BigNumberish,
-    minConversionRate: BigNumberish,
-    walletId: string,
-    hint: Arrayish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {};
-
-  estimate: {
-    enabled(): Promise<BigNumber>;
-
-    getExpectedRate(
-      src: string,
-      dest: string,
-      srcQty: BigNumberish
-    ): Promise<BigNumber>;
-
-    getUserCapInTokenWei(user: string, token: string): Promise<BigNumber>;
-
-    getUserCapInWei(user: string): Promise<BigNumber>;
-
-    info(id: Arrayish): Promise<BigNumber>;
-
-    maxGasPrice(): Promise<BigNumber>;
-
-    tradeWithHint(
-      src: string,
-      srcAmount: BigNumberish,
-      dest: string,
-      destAddress: string,
-      maxDestAmount: BigNumberish,
-      minConversionRate: BigNumberish,
-      walletId: string,
-      hint: Arrayish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/IKyberNetworkProxyInterfaceFactory.ts b/types/IKyberNetworkProxyInterfaceFactory.ts
deleted file mode 100644
index 22d8d676..00000000
--- a/types/IKyberNetworkProxyInterfaceFactory.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-
-import { IKyberNetworkProxyInterface } from "./IKyberNetworkProxyInterface";
-
-export class IKyberNetworkProxyInterfaceFactory {
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): IKyberNetworkProxyInterface {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as IKyberNetworkProxyInterface;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [],
-    name: "enabled",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "src",
-        type: "address"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "dest",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "srcQty",
-        type: "uint256"
-      }
-    ],
-    name: "getExpectedRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "expectedRate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "slippageRate",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "user",
-        type: "address"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "token",
-        type: "address"
-      }
-    ],
-    name: "getUserCapInTokenWei",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "user",
-        type: "address"
-      }
-    ],
-    name: "getUserCapInWei",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "id",
-        type: "bytes32"
-      }
-    ],
-    name: "info",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "maxGasPrice",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "src",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "srcAmount",
-        type: "uint256"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "dest",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "destAddress",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "maxDestAmount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "minConversionRate",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "walletId",
-        type: "address"
-      },
-      {
-        internalType: "bytes",
-        name: "hint",
-        type: "bytes"
-      }
-    ],
-    name: "tradeWithHint",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "payable",
-    type: "function"
-  }
-];
diff --git a/types/IOneSplit.d.ts b/types/IOneSplit.d.ts
deleted file mode 100644
index 093474e3..00000000
--- a/types/IOneSplit.d.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface IOneSplitInterface extends Interface {
-  functions: {
-    FLAG_AAVE: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_BANCOR: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_BDAI: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_CHAI: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_COMPOUND: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_FULCRUM: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_IEARN: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_KYBER: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_KYBER_BANCOR_RESERVE: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    FLAG_KYBER_OASIS_RESERVE: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    FLAG_KYBER_UNISWAP_RESERVE: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    FLAG_MULTI_PATH_ETH: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_OASIS: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_SMART_TOKEN: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_UNISWAP: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    getExpectedReturn: TypedFunctionDescription<{
-      encode([fromToken, toToken, amount, parts, disableFlags]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-
-    goodSwap: TypedFunctionDescription<{
-      encode([fromToken, toToken, amount, minReturn, parts, disableFlags]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-
-    swap: TypedFunctionDescription<{
-      encode([
-        fromToken,
-        toToken,
-        amount,
-        minReturn,
-        distribution,
-        disableFlags
-      ]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish[],
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {};
-}
-
-export class IOneSplit extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): IOneSplit;
-  attach(addressOrName: string): IOneSplit;
-  deployed(): Promise<IOneSplit>;
-
-  on(event: EventFilter | string, listener: Listener): IOneSplit;
-  once(event: EventFilter | string, listener: Listener): IOneSplit;
-  addListener(eventName: EventFilter | string, listener: Listener): IOneSplit;
-  removeAllListeners(eventName: EventFilter | string): IOneSplit;
-  removeListener(eventName: any, listener: Listener): IOneSplit;
-
-  interface: IOneSplitInterface;
-
-  functions: {
-    FLAG_AAVE(): Promise<BigNumber>;
-
-    FLAG_BANCOR(): Promise<BigNumber>;
-
-    FLAG_BDAI(): Promise<BigNumber>;
-
-    FLAG_CHAI(): Promise<BigNumber>;
-
-    FLAG_COMPOUND(): Promise<BigNumber>;
-
-    FLAG_FULCRUM(): Promise<BigNumber>;
-
-    FLAG_IEARN(): Promise<BigNumber>;
-
-    FLAG_KYBER(): Promise<BigNumber>;
-
-    FLAG_KYBER_BANCOR_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_OASIS_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_UNISWAP_RESERVE(): Promise<BigNumber>;
-
-    FLAG_MULTI_PATH_ETH(): Promise<BigNumber>;
-
-    FLAG_OASIS(): Promise<BigNumber>;
-
-    FLAG_SMART_TOKEN(): Promise<BigNumber>;
-
-    FLAG_UNISWAP(): Promise<BigNumber>;
-
-    getExpectedReturn(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish
-    ): Promise<{
-      returnAmount: BigNumber;
-      distribution: BigNumber[];
-      0: BigNumber;
-      1: BigNumber[];
-    }>;
-
-    goodSwap(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      minReturn: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    swap(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      minReturn: BigNumberish,
-      distribution: BigNumberish[],
-      disableFlags: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  FLAG_AAVE(): Promise<BigNumber>;
-
-  FLAG_BANCOR(): Promise<BigNumber>;
-
-  FLAG_BDAI(): Promise<BigNumber>;
-
-  FLAG_CHAI(): Promise<BigNumber>;
-
-  FLAG_COMPOUND(): Promise<BigNumber>;
-
-  FLAG_FULCRUM(): Promise<BigNumber>;
-
-  FLAG_IEARN(): Promise<BigNumber>;
-
-  FLAG_KYBER(): Promise<BigNumber>;
-
-  FLAG_KYBER_BANCOR_RESERVE(): Promise<BigNumber>;
-
-  FLAG_KYBER_OASIS_RESERVE(): Promise<BigNumber>;
-
-  FLAG_KYBER_UNISWAP_RESERVE(): Promise<BigNumber>;
-
-  FLAG_MULTI_PATH_ETH(): Promise<BigNumber>;
-
-  FLAG_OASIS(): Promise<BigNumber>;
-
-  FLAG_SMART_TOKEN(): Promise<BigNumber>;
-
-  FLAG_UNISWAP(): Promise<BigNumber>;
-
-  getExpectedReturn(
-    fromToken: string,
-    toToken: string,
-    amount: BigNumberish,
-    parts: BigNumberish,
-    disableFlags: BigNumberish
-  ): Promise<{
-    returnAmount: BigNumber;
-    distribution: BigNumber[];
-    0: BigNumber;
-    1: BigNumber[];
-  }>;
-
-  goodSwap(
-    fromToken: string,
-    toToken: string,
-    amount: BigNumberish,
-    minReturn: BigNumberish,
-    parts: BigNumberish,
-    disableFlags: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  swap(
-    fromToken: string,
-    toToken: string,
-    amount: BigNumberish,
-    minReturn: BigNumberish,
-    distribution: BigNumberish[],
-    disableFlags: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {};
-
-  estimate: {
-    FLAG_AAVE(): Promise<BigNumber>;
-
-    FLAG_BANCOR(): Promise<BigNumber>;
-
-    FLAG_BDAI(): Promise<BigNumber>;
-
-    FLAG_CHAI(): Promise<BigNumber>;
-
-    FLAG_COMPOUND(): Promise<BigNumber>;
-
-    FLAG_FULCRUM(): Promise<BigNumber>;
-
-    FLAG_IEARN(): Promise<BigNumber>;
-
-    FLAG_KYBER(): Promise<BigNumber>;
-
-    FLAG_KYBER_BANCOR_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_OASIS_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_UNISWAP_RESERVE(): Promise<BigNumber>;
-
-    FLAG_MULTI_PATH_ETH(): Promise<BigNumber>;
-
-    FLAG_OASIS(): Promise<BigNumber>;
-
-    FLAG_SMART_TOKEN(): Promise<BigNumber>;
-
-    FLAG_UNISWAP(): Promise<BigNumber>;
-
-    getExpectedReturn(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish
-    ): Promise<BigNumber>;
-
-    goodSwap(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      minReturn: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish
-    ): Promise<BigNumber>;
-
-    swap(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      minReturn: BigNumberish,
-      distribution: BigNumberish[],
-      disableFlags: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/IOneSplitFactory.ts b/types/IOneSplitFactory.ts
deleted file mode 100644
index a8083faa..00000000
--- a/types/IOneSplitFactory.ts
+++ /dev/null
@@ -1,334 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-
-import { IOneSplit } from "./IOneSplit";
-
-export class IOneSplitFactory {
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): IOneSplit {
-    return new Contract(address, _abi, signerOrProvider) as IOneSplit;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [],
-    name: "FLAG_AAVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_BANCOR",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_BDAI",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_CHAI",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_COMPOUND",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_FULCRUM",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_IEARN",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER_BANCOR_RESERVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER_OASIS_RESERVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER_UNISWAP_RESERVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_MULTI_PATH_ETH",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_OASIS",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_SMART_TOKEN",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_UNISWAP",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "fromToken",
-        type: "address"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "toToken",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "parts",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "disableFlags",
-        type: "uint256"
-      }
-    ],
-    name: "getExpectedReturn",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "returnAmount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256[]",
-        name: "distribution",
-        type: "uint256[]"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "fromToken",
-        type: "address"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "toToken",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "minReturn",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "parts",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "disableFlags",
-        type: "uint256"
-      }
-    ],
-    name: "goodSwap",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "fromToken",
-        type: "address"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "toToken",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "minReturn",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256[]",
-        name: "distribution",
-        type: "uint256[]"
-      },
-      {
-        internalType: "uint256",
-        name: "disableFlags",
-        type: "uint256"
-      }
-    ],
-    name: "swap",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  }
-];
diff --git a/types/IOneSplitView.d.ts b/types/IOneSplitView.d.ts
deleted file mode 100644
index 5c76003d..00000000
--- a/types/IOneSplitView.d.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface IOneSplitViewInterface extends Interface {
-  functions: {
-    FLAG_AAVE: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_BANCOR: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_BDAI: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_CHAI: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_COMPOUND: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_FULCRUM: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_IEARN: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_KYBER: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_KYBER_BANCOR_RESERVE: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    FLAG_KYBER_OASIS_RESERVE: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    FLAG_KYBER_UNISWAP_RESERVE: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    FLAG_MULTI_PATH_ETH: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_OASIS: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_SMART_TOKEN: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_UNISWAP: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    getExpectedReturn: TypedFunctionDescription<{
-      encode([fromToken, toToken, amount, parts, disableFlags]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {};
-}
-
-export class IOneSplitView extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): IOneSplitView;
-  attach(addressOrName: string): IOneSplitView;
-  deployed(): Promise<IOneSplitView>;
-
-  on(event: EventFilter | string, listener: Listener): IOneSplitView;
-  once(event: EventFilter | string, listener: Listener): IOneSplitView;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): IOneSplitView;
-  removeAllListeners(eventName: EventFilter | string): IOneSplitView;
-  removeListener(eventName: any, listener: Listener): IOneSplitView;
-
-  interface: IOneSplitViewInterface;
-
-  functions: {
-    FLAG_AAVE(): Promise<BigNumber>;
-
-    FLAG_BANCOR(): Promise<BigNumber>;
-
-    FLAG_BDAI(): Promise<BigNumber>;
-
-    FLAG_CHAI(): Promise<BigNumber>;
-
-    FLAG_COMPOUND(): Promise<BigNumber>;
-
-    FLAG_FULCRUM(): Promise<BigNumber>;
-
-    FLAG_IEARN(): Promise<BigNumber>;
-
-    FLAG_KYBER(): Promise<BigNumber>;
-
-    FLAG_KYBER_BANCOR_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_OASIS_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_UNISWAP_RESERVE(): Promise<BigNumber>;
-
-    FLAG_MULTI_PATH_ETH(): Promise<BigNumber>;
-
-    FLAG_OASIS(): Promise<BigNumber>;
-
-    FLAG_SMART_TOKEN(): Promise<BigNumber>;
-
-    FLAG_UNISWAP(): Promise<BigNumber>;
-
-    getExpectedReturn(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish
-    ): Promise<{
-      returnAmount: BigNumber;
-      distribution: BigNumber[];
-      0: BigNumber;
-      1: BigNumber[];
-    }>;
-  };
-
-  FLAG_AAVE(): Promise<BigNumber>;
-
-  FLAG_BANCOR(): Promise<BigNumber>;
-
-  FLAG_BDAI(): Promise<BigNumber>;
-
-  FLAG_CHAI(): Promise<BigNumber>;
-
-  FLAG_COMPOUND(): Promise<BigNumber>;
-
-  FLAG_FULCRUM(): Promise<BigNumber>;
-
-  FLAG_IEARN(): Promise<BigNumber>;
-
-  FLAG_KYBER(): Promise<BigNumber>;
-
-  FLAG_KYBER_BANCOR_RESERVE(): Promise<BigNumber>;
-
-  FLAG_KYBER_OASIS_RESERVE(): Promise<BigNumber>;
-
-  FLAG_KYBER_UNISWAP_RESERVE(): Promise<BigNumber>;
-
-  FLAG_MULTI_PATH_ETH(): Promise<BigNumber>;
-
-  FLAG_OASIS(): Promise<BigNumber>;
-
-  FLAG_SMART_TOKEN(): Promise<BigNumber>;
-
-  FLAG_UNISWAP(): Promise<BigNumber>;
-
-  getExpectedReturn(
-    fromToken: string,
-    toToken: string,
-    amount: BigNumberish,
-    parts: BigNumberish,
-    disableFlags: BigNumberish
-  ): Promise<{
-    returnAmount: BigNumber;
-    distribution: BigNumber[];
-    0: BigNumber;
-    1: BigNumber[];
-  }>;
-
-  filters: {};
-
-  estimate: {
-    FLAG_AAVE(): Promise<BigNumber>;
-
-    FLAG_BANCOR(): Promise<BigNumber>;
-
-    FLAG_BDAI(): Promise<BigNumber>;
-
-    FLAG_CHAI(): Promise<BigNumber>;
-
-    FLAG_COMPOUND(): Promise<BigNumber>;
-
-    FLAG_FULCRUM(): Promise<BigNumber>;
-
-    FLAG_IEARN(): Promise<BigNumber>;
-
-    FLAG_KYBER(): Promise<BigNumber>;
-
-    FLAG_KYBER_BANCOR_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_OASIS_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_UNISWAP_RESERVE(): Promise<BigNumber>;
-
-    FLAG_MULTI_PATH_ETH(): Promise<BigNumber>;
-
-    FLAG_OASIS(): Promise<BigNumber>;
-
-    FLAG_SMART_TOKEN(): Promise<BigNumber>;
-
-    FLAG_UNISWAP(): Promise<BigNumber>;
-
-    getExpectedReturn(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/IOneSplitViewFactory.ts b/types/IOneSplitViewFactory.ts
deleted file mode 100644
index addc32ce..00000000
--- a/types/IOneSplitViewFactory.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-
-import { IOneSplitView } from "./IOneSplitView";
-
-export class IOneSplitViewFactory {
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): IOneSplitView {
-    return new Contract(address, _abi, signerOrProvider) as IOneSplitView;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [],
-    name: "FLAG_AAVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_BANCOR",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_BDAI",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_CHAI",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_COMPOUND",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_FULCRUM",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_IEARN",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER_BANCOR_RESERVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER_OASIS_RESERVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER_UNISWAP_RESERVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_MULTI_PATH_ETH",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_OASIS",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_SMART_TOKEN",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_UNISWAP",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "fromToken",
-        type: "address"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "toToken",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "parts",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "disableFlags",
-        type: "uint256"
-      }
-    ],
-    name: "getExpectedReturn",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "returnAmount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256[]",
-        name: "distribution",
-        type: "uint256[]"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
diff --git a/types/IVariableDebtToken.d.ts b/types/IVariableDebtToken.d.ts
index 20c6df47..c72a866a 100644
--- a/types/IVariableDebtToken.d.ts
+++ b/types/IVariableDebtToken.d.ts
@@ -16,6 +16,10 @@ interface IVariableDebtTokenInterface extends Interface {
       encode([_account, _amount]: [string, BigNumberish]): string;
     }>;
 
+    getUserIndex: TypedFunctionDescription<{
+      encode([_account]: [string]): string;
+    }>;
+
     mint: TypedFunctionDescription<{
       encode([account, amount]: [string, BigNumberish]): string;
     }>;
@@ -47,6 +51,8 @@ export class IVariableDebtToken extends Contract {
       overrides?: TransactionOverrides
     ): Promise<ContractTransaction>;
 
+    getUserIndex(_account: string): Promise<BigNumber>;
+
     mint(
       account: string,
       amount: BigNumberish,
@@ -60,6 +66,8 @@ export class IVariableDebtToken extends Contract {
     overrides?: TransactionOverrides
   ): Promise<ContractTransaction>;
 
+  getUserIndex(_account: string): Promise<BigNumber>;
+
   mint(
     account: string,
     amount: BigNumberish,
@@ -71,6 +79,8 @@ export class IVariableDebtToken extends Contract {
   estimate: {
     burn(_account: string, _amount: BigNumberish): Promise<BigNumber>;
 
+    getUserIndex(_account: string): Promise<BigNumber>;
+
     mint(account: string, amount: BigNumberish): Promise<BigNumber>;
   };
 }
diff --git a/types/IVariableDebtTokenFactory.ts b/types/IVariableDebtTokenFactory.ts
index b002efc9..5fb0c43d 100644
--- a/types/IVariableDebtTokenFactory.ts
+++ b/types/IVariableDebtTokenFactory.ts
@@ -34,6 +34,25 @@ const _abi = [
     stateMutability: "nonpayable",
     type: "function"
   },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "_account",
+        type: "address"
+      }
+    ],
+    name: "getUserIndex",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [
       {
diff --git a/types/Ierc20Burnable.d.ts b/types/Ierc20Burnable.d.ts
deleted file mode 100644
index da2a827f..00000000
--- a/types/Ierc20Burnable.d.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface Ierc20BurnableInterface extends Interface {
-  functions: {
-    burn: TypedFunctionDescription<{
-      encode([amount]: [BigNumberish]): string;
-    }>;
-
-    burnFrom: TypedFunctionDescription<{
-      encode([account, amount]: [string, BigNumberish]): string;
-    }>;
-  };
-
-  events: {};
-}
-
-export class Ierc20Burnable extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): Ierc20Burnable;
-  attach(addressOrName: string): Ierc20Burnable;
-  deployed(): Promise<Ierc20Burnable>;
-
-  on(event: EventFilter | string, listener: Listener): Ierc20Burnable;
-  once(event: EventFilter | string, listener: Listener): Ierc20Burnable;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): Ierc20Burnable;
-  removeAllListeners(eventName: EventFilter | string): Ierc20Burnable;
-  removeListener(eventName: any, listener: Listener): Ierc20Burnable;
-
-  interface: Ierc20BurnableInterface;
-
-  functions: {
-    burn(
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    burnFrom(
-      account: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  burn(
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  burnFrom(
-    account: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {};
-
-  estimate: {
-    burn(amount: BigNumberish): Promise<BigNumber>;
-
-    burnFrom(account: string, amount: BigNumberish): Promise<BigNumber>;
-  };
-}
diff --git a/types/Ierc20BurnableFactory.ts b/types/Ierc20BurnableFactory.ts
deleted file mode 100644
index 68564b55..00000000
--- a/types/Ierc20BurnableFactory.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-
-import { Ierc20Burnable } from "./Ierc20Burnable";
-
-export class Ierc20BurnableFactory {
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Ierc20Burnable {
-    return new Contract(address, _abi, signerOrProvider) as Ierc20Burnable;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "burn",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "burnFrom",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
diff --git a/types/Ierc20Mintable.d.ts b/types/Ierc20Mintable.d.ts
deleted file mode 100644
index fc36105e..00000000
--- a/types/Ierc20Mintable.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface Ierc20MintableInterface extends Interface {
-  functions: {
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-  };
-
-  events: {};
-}
-
-export class Ierc20Mintable extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): Ierc20Mintable;
-  attach(addressOrName: string): Ierc20Mintable;
-  deployed(): Promise<Ierc20Mintable>;
-
-  on(event: EventFilter | string, listener: Listener): Ierc20Mintable;
-  once(event: EventFilter | string, listener: Listener): Ierc20Mintable;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): Ierc20Mintable;
-  removeAllListeners(eventName: EventFilter | string): Ierc20Mintable;
-  removeListener(eventName: any, listener: Listener): Ierc20Mintable;
-
-  interface: Ierc20MintableInterface;
-
-  functions: {
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {};
-
-  estimate: {
-    mint(value: BigNumberish): Promise<BigNumber>;
-  };
-}
diff --git a/types/Ierc20MintableBurnable.d.ts b/types/Ierc20MintableBurnable.d.ts
deleted file mode 100644
index 8660b903..00000000
--- a/types/Ierc20MintableBurnable.d.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface Ierc20MintableBurnableInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    burn: TypedFunctionDescription<{
-      encode([amount]: [BigNumberish]): string;
-    }>;
-
-    burnFrom: TypedFunctionDescription<{
-      encode([account, amount]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class Ierc20MintableBurnable extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): Ierc20MintableBurnable;
-  attach(addressOrName: string): Ierc20MintableBurnable;
-  deployed(): Promise<Ierc20MintableBurnable>;
-
-  on(event: EventFilter | string, listener: Listener): Ierc20MintableBurnable;
-  once(event: EventFilter | string, listener: Listener): Ierc20MintableBurnable;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): Ierc20MintableBurnable;
-  removeAllListeners(eventName: EventFilter | string): Ierc20MintableBurnable;
-  removeListener(eventName: any, listener: Listener): Ierc20MintableBurnable;
-
-  interface: Ierc20MintableBurnableInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    burn(
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    burnFrom(
-      account: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  burn(
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  burnFrom(
-    account: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    burn(amount: BigNumberish): Promise<BigNumber>;
-
-    burnFrom(account: string, amount: BigNumberish): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/Ierc20MintableBurnableFactory.ts b/types/Ierc20MintableBurnableFactory.ts
deleted file mode 100644
index 57bb0afc..00000000
--- a/types/Ierc20MintableBurnableFactory.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-
-import { Ierc20MintableBurnable } from "./Ierc20MintableBurnable";
-
-export class Ierc20MintableBurnableFactory {
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Ierc20MintableBurnable {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as Ierc20MintableBurnable;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "burn",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "burnFrom",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
diff --git a/types/Ierc20MintableFactory.ts b/types/Ierc20MintableFactory.ts
deleted file mode 100644
index 0ea3964f..00000000
--- a/types/Ierc20MintableFactory.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-
-import { Ierc20Mintable } from "./Ierc20Mintable";
-
-export class Ierc20MintableFactory {
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Ierc20Mintable {
-    return new Contract(address, _abi, signerOrProvider) as Ierc20Mintable;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
diff --git a/types/LendingPoolConfiguratorFactory.ts b/types/LendingPoolConfiguratorFactory.ts
index 0a4556e5..e9931f40 100644
--- a/types/LendingPoolConfiguratorFactory.ts
+++ b/types/LendingPoolConfiguratorFactory.ts
@@ -670,4 +670,4 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x60806040526000805534801561001457600080fd5b50615192806100246000396000f3fe60806040523480156200001157600080fd5b5060043610620001485760003560e01c8063a5bc826c11620000bd578063d466016f116200007b578063d466016f1462000530578063e8ae2f5b146200055f578063eede87c11462000588578063ef1f937314620005b9578063f53a251514620005e25762000148565b8063a5bc826c1462000451578063a8dc0f45146200048c578063b75d6f3414620004b5578063bf34418314620004de578063c4d66de814620005075762000148565b806366bbd928116200010b57806366bbd928146200038857806370fb84f414620003b75780637aca76eb14620003e65780637af635a6146200040f57806380e17d87146200042b5762000148565b80631133c0f7146200014d5780631d2118f914620002b35780633443a14b14620002e45780633e72a45414620003135780635dd9a189146200033c575b600080fd5b620002b1600480360360e08110156200016557600080fd5b6001600160a01b038235169190810190604081016020820135600160201b8111156200019057600080fd5b820183602082011115620001a357600080fd5b803590602001918460018302840111600160201b83111715620001c557600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295949360208101935035915050600160201b8111156200021857600080fd5b8201836020820111156200022b57600080fd5b803590602001918460018302840111600160201b831117156200024d57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550506001600160a01b03833581169450602084013581169360ff6040820135169350606001351690506200060b565b005b620002b160048036036040811015620002cb57600080fd5b506001600160a01b038135811691602001351662000965565b620002b160048036036040811015620002fc57600080fd5b506001600160a01b03813516906020013562000b4d565b620002b1600480360360208110156200032b57600080fd5b50356001600160a01b031662000d33565b620002b1600480360360a08110156200035457600080fd5b506001600160a01b03813581169160ff60208201351691604082013581169160608101358216916080909101351662000ff3565b620002b160048036036040811015620003a057600080fd5b506001600160a01b03813516906020013562001426565b620002b160048036036040811015620003cf57600080fd5b506001600160a01b0381351690602001356200160c565b620002b160048036036020811015620003fe57600080fd5b50356001600160a01b0316620017f2565b62000419620019c7565b60408051918252519081900360200190f35b62000435620019cc565b604080516001600160a01b039092168252519081900360200190f35b620002b1600480360360808110156200046957600080fd5b506001600160a01b038135169060208101359060408101359060600135620019db565b620002b160048036036020811015620004a457600080fd5b50356001600160a01b031662001bd9565b620002b160048036036020811015620004cd57600080fd5b50356001600160a01b031662001db3565b620002b160048036036020811015620004f657600080fd5b50356001600160a01b031662001f88565b620002b1600480360360208110156200051f57600080fd5b50356001600160a01b03166200215d565b620002b1600480360360408110156200054857600080fd5b506001600160a01b0381351690602001356200221f565b620002b1600480360360208110156200057757600080fd5b50356001600160a01b031662002405565b620002b160048036036040811015620005a057600080fd5b506001600160a01b0381351690602001351515620025d3565b620002b160048036036020811015620005d157600080fd5b50356001600160a01b0316620027c2565b620002b160048036036020811015620005fa57600080fd5b50356001600160a01b031662002995565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200065057600080fd5b505afa15801562000665573d6000803e3d6000fd5b505050506040513d60208110156200067c57600080fd5b50516001600160a01b031614620006c55760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b6034546040516000916001600160a01b031690899085908a908a90620006eb9062002b73565b6001600160a01b038087168252851660208083019190915260ff8516604083015260a06060830181815285519184019190915284519091608084019160c085019187019080838360005b838110156200074f57818101518382015260200162000735565b50505050905090810190601f1680156200077d5780820380516001836020036101000a031916815260200191505b50838103825284518152845160209182019186019080838360005b83811015620007b257818101518382015260200162000798565b50505050905090810190601f168015620007e05780820380516001836020036101000a031916815260200191505b50975050505050505050604051809103906000f08015801562000807573d6000803e3d6000fd5b509050603460009054906101000a90046001600160a01b03166001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156200085957600080fd5b505afa1580156200086e573d6000803e3d6000fd5b505050506040513d60208110156200088557600080fd5b5051604080516309eab60f60e01b81526001600160a01b038b8116600483015284811660248301528881166044830152878116606483015260ff8716608483015285811660a4830152915191909216916309eab60f9160c480830192600092919082900301818387803b158015620008fc57600080fd5b505af115801562000911573d6000803e3d6000fd5b5050604080516001600160a01b03868116825291518286169450918c1692507f1d9fcd0dc935b4778d5af97f55c4d7b2553257382f1ef25c412114c8eeebd88e919081900360200190a35050505050505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b158015620009aa57600080fd5b505afa158015620009bf573d6000803e3d6000fd5b505050506040513d6020811015620009d657600080fd5b50516001600160a01b03161462000a1f5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562000a6557600080fd5b505afa15801562000a7a573d6000803e3d6000fd5b505050506040513d602081101562000a9157600080fd5b505160408051631d2118f960e01b81526001600160a01b0386811660048301528581166024830152915192935090831691631d2118f99160448082019260009290919082900301818387803b15801562000aea57600080fd5b505af115801562000aff573d6000803e3d6000fd5b5050604080516001600160a01b0380881682528616602082015281517f5644b64ebb0ce18c4032248ca52f58355469092ff072866c3dcd8640e817d6a59450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562000b9257600080fd5b505afa15801562000ba7573d6000803e3d6000fd5b505050506040513d602081101562000bbe57600080fd5b50516001600160a01b03161462000c075760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562000c4d57600080fd5b505afa15801562000c62573d6000803e3d6000fd5b505050506040513d602081101562000c7957600080fd5b505160408051633443a14b60e01b81526001600160a01b03868116600483015260248201869052915192935090831691633443a14b9160448082019260009290919082900301818387803b15801562000cd157600080fd5b505af115801562000ce6573d6000803e3d6000fd5b5050604080516001600160a01b03871681526020810186905281517f437dd3b61b7c7eee7fc70515c8846482dfca92e2e1e02af5d638c5d4878d67149450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562000d7857600080fd5b505afa15801562000d8d573d6000803e3d6000fd5b505050506040513d602081101562000da457600080fd5b50516001600160a01b03161462000ded5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562000e3357600080fd5b505afa15801562000e48573d6000803e3d6000fd5b505050506040513d602081101562000e5f57600080fd5b5051604080516335ea6a7560e01b81526001600160a01b038581166004830152915192935060009283928392908616916335ea6a759160248082019261014092909190829003018186803b15801562000eb757600080fd5b505afa15801562000ecc573d6000803e3d6000fd5b505050506040513d61014081101562000ee457600080fd5b508051602082015160409092015190945090925090508215801562000f07575081155b801562000f12575080155b62000f4f5760405162461bcd60e51b815260040180806020018281038252602a81526020018062005133602a913960400191505060405180910390fd5b6040805163b736aaeb60e01b81526001600160a01b03878116600483015260006024830181905292519087169263b736aaeb926044808201939182900301818387803b15801562000f9f57600080fd5b505af115801562000fb4573d6000803e3d6000fd5b50506040516001600160a01b03881692507f6f60cf8bd0f218cabe1ea3150bd07b0b758c35c4cfdf7138017a283e65564d5e9150600090a25050505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200103857600080fd5b505afa1580156200104d573d6000803e3d6000fd5b505050506040513d60208110156200106457600080fd5b50516001600160a01b031614620010ad5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b6060856001600160a01b03166306fdde036040518163ffffffff1660e01b815260040160006040518083038186803b158015620010e957600080fd5b505afa158015620010fe573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260208110156200112857600080fd5b8101908080516040519392919084600160201b8211156200114857600080fd5b9083019060208201858111156200115e57600080fd5b8251600160201b8111828201881017156200117857600080fd5b82525081516020918201929091019080838360005b83811015620011a75781810151838201526020016200118d565b50505050905090810190601f168015620011d55780820380516001836020036101000a031916815260200191505b50604052505050604051602001808075020b0bb329024b73a32b932b9ba103132b0b934b733960551b81525060160182805190602001908083835b60208310620012315780518252601f19909201916020918201910162001210565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405160208183030381529060405290506060866001600160a01b03166395d89b416040518163ffffffff1660e01b815260040160006040518083038186803b158015620012a357600080fd5b505afa158015620012b8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526020811015620012e257600080fd5b8101908080516040519392919084600160201b8211156200130257600080fd5b9083019060208201858111156200131857600080fd5b8251600160201b8111828201881017156200133257600080fd5b82525081516020918201929091019080838360005b838110156200136157818101518382015260200162001347565b50505050905090810190601f1680156200138f5780820380516001836020036101000a031916815260200191505b506040525050506040516020018080606160f81b81525060010182805190602001908083835b60208310620013d65780518252601f199092019160209182019101620013b5565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405160208183030381529060405290506200141d87838387878b8b6200060b565b50505050505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200146b57600080fd5b505afa15801562001480573d6000803e3d6000fd5b505050506040513d60208110156200149757600080fd5b50516001600160a01b031614620014e05760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200152657600080fd5b505afa1580156200153b573d6000803e3d6000fd5b505050506040513d60208110156200155257600080fd5b505160408051630cd77b2560e31b81526001600160a01b038681166004830152602482018690529151929350908316916366bbd9289160448082019260009290919082900301818387803b158015620015aa57600080fd5b505af1158015620015bf573d6000803e3d6000fd5b5050604080516001600160a01b03871681526020810186905281517f2e73b7f1df792712003e6859f940c1e8711c3f1329474771fee71d2ec11631299450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200165157600080fd5b505afa15801562001666573d6000803e3d6000fd5b505050506040513d60208110156200167d57600080fd5b50516001600160a01b031614620016c65760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200170c57600080fd5b505afa15801562001721573d6000803e3d6000fd5b505050506040513d60208110156200173857600080fd5b505160408051631c3ee13d60e21b81526001600160a01b038681166004830152602482018690529151929350908316916370fb84f49160448082019260009290919082900301818387803b1580156200179057600080fd5b505af1158015620017a5573d6000803e3d6000fd5b5050604080516001600160a01b03871681526020810186905281517fe3ba662f7011e701056a43e8cf832242322eeff01453e7a72d01ec2af36d9aec9450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200183757600080fd5b505afa1580156200184c573d6000803e3d6000fd5b505050506040513d60208110156200186357600080fd5b50516001600160a01b031614620018ac5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b158015620018f257600080fd5b505afa15801562001907573d6000803e3d6000fd5b505050506040513d60208110156200191e57600080fd5b5051604080516325ba55f160e21b81526001600160a01b038581166004830152600160248301529151929350908316916396e957c49160448082019260009290919082900301818387803b1580156200197657600080fd5b505af11580156200198b573d6000803e3d6000fd5b50506040516001600160a01b03851692507fda5cdb66c77023db6abe5226a4d4a40c3b8e768012f4ff4e446f62f60127fc569150600090a25050565b600381565b6034546001600160a01b031681565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562001a2057600080fd5b505afa15801562001a35573d6000803e3d6000fd5b505050506040513d602081101562001a4c57600080fd5b50516001600160a01b03161462001a955760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562001adb57600080fd5b505afa15801562001af0573d6000803e3d6000fd5b505050506040513d602081101562001b0757600080fd5b50516040805163296f209b60e21b81526001600160a01b03888116600483015260248201889052604482018790526064820186905291519293509083169163a5bc826c9160848082019260009290919082900301818387803b15801562001b6d57600080fd5b505af115801562001b82573d6000803e3d6000fd5b5050604080518781526020810187905280820186905290516001600160a01b03891693507fdfe62f53e7707d64f99bca15d2bdf3facc4074bc047e7dec2ea130300e99274492509081900360600190a25050505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562001c1e57600080fd5b505afa15801562001c33573d6000803e3d6000fd5b505050506040513d602081101562001c4a57600080fd5b50516001600160a01b03161462001c935760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562001cd957600080fd5b505afa15801562001cee573d6000803e3d6000fd5b505050506040513d602081101562001d0557600080fd5b505160408051636ee365f960e01b81526001600160a01b038581166004830152600060248301819052604483018190529251939450841692636ee365f99260648084019391929182900301818387803b15801562001d6257600080fd5b505af115801562001d77573d6000803e3d6000fd5b50506040516001600160a01b03851692507fe9a7e5fd4fc8ea18e602350324bf48e8f05d12434af0ce0be05743e6a5fdcb9e9150600090a25050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562001df857600080fd5b505afa15801562001e0d573d6000803e3d6000fd5b505050506040513d602081101562001e2457600080fd5b50516001600160a01b03161462001e6d5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562001eb357600080fd5b505afa15801562001ec8573d6000803e3d6000fd5b505050506040513d602081101562001edf57600080fd5b50516040805163b736aaeb60e01b81526001600160a01b0385811660048301526001602483015291519293509083169163b736aaeb9160448082019260009290919082900301818387803b15801562001f3757600080fd5b505af115801562001f4c573d6000803e3d6000fd5b50506040516001600160a01b03851692507f35b80cd8ea3440e9a8454f116fa658b858da1b64c86c48451f4559cefcdfb56c9150600090a25050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562001fcd57600080fd5b505afa15801562001fe2573d6000803e3d6000fd5b505050506040513d602081101562001ff957600080fd5b50516001600160a01b031614620020425760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200208857600080fd5b505afa1580156200209d573d6000803e3d6000fd5b505050506040513d6020811015620020b457600080fd5b5051604080516339d9797960e11b81526001600160a01b038581166004830152600160248301529151929350908316916373b2f2f29160448082019260009290919082900301818387803b1580156200210c57600080fd5b505af115801562002121573d6000803e3d6000fd5b50506040516001600160a01b03851692507f8dee2b2f3e98319ae6347eda521788f73f4086c9be9a594942b370b137fb8cb19150600090a25050565b60006200216962002b68565b60015490915060ff16806200218357506200218362002b6d565b8062002190575060005481115b620021cd5760405162461bcd60e51b815260040180806020018281038252602e81526020018062005105602e913960400191505060405180910390fd5b60015460ff16158015620021ed576001805460ff19168117905560008290555b603480546001600160a01b0319166001600160a01b03851617905580156200221a576001805460ff191690555b505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200226457600080fd5b505afa15801562002279573d6000803e3d6000fd5b505050506040513d60208110156200229057600080fd5b50516001600160a01b031614620022d95760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200231f57600080fd5b505afa15801562002334573d6000803e3d6000fd5b505050506040513d60208110156200234b57600080fd5b50516040805163d466016f60e01b81526001600160a01b0386811660048301526024820186905291519293509083169163d466016f9160448082019260009290919082900301818387803b158015620023a357600080fd5b505af1158015620023b8573d6000803e3d6000fd5b5050604080516001600160a01b03871681526020810186905281517fda47540c7f7fd5a68c3285f3bb708f322424f948f41df6f51622fa24b39686649450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200244a57600080fd5b505afa1580156200245f573d6000803e3d6000fd5b505050506040513d60208110156200247657600080fd5b50516001600160a01b031614620024bf5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200250557600080fd5b505afa1580156200251a573d6000803e3d6000fd5b505050506040513d60208110156200253157600080fd5b50516040805163e8ae2f5b60e01b81526001600160a01b03858116600483015291519293509083169163e8ae2f5b9160248082019260009290919082900301818387803b1580156200258257600080fd5b505af115801562002597573d6000803e3d6000fd5b50506040516001600160a01b03851692507f9cc75e4cafc9a556a369bc53468649075680eb554d225d5918f199453824796d9150600090a25050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200261857600080fd5b505afa1580156200262d573d6000803e3d6000fd5b505050506040513d60208110156200264457600080fd5b50516001600160a01b0316146200268d5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b158015620026d357600080fd5b505afa158015620026e8573d6000803e3d6000fd5b505050506040513d6020811015620026ff57600080fd5b505160408051636ee365f960e01b81526001600160a01b038681166004830152851515602483015260016044830152915192935090831691636ee365f99160648082019260009290919082900301818387803b1580156200275f57600080fd5b505af115801562002774573d6000803e3d6000fd5b5050604080516001600160a01b0387168152851515602082015281517fab2f7f9e5ca2772fafa94f355c1842a80ae6b9e41f83083098d81f67d7a0b5089450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200280757600080fd5b505afa1580156200281c573d6000803e3d6000fd5b505050506040513d60208110156200283357600080fd5b50516001600160a01b0316146200287c5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b158015620028c257600080fd5b505afa158015620028d7573d6000803e3d6000fd5b505050506040513d6020811015620028ee57600080fd5b5051604080516325ba55f160e21b81526001600160a01b03858116600483015260006024830181905292519394508416926396e957c49260448084019391929182900301818387803b1580156200294457600080fd5b505af115801562002959573d6000803e3d6000fd5b50506040516001600160a01b03851692507f995959c2ceab6ce20e8cd89c904e449fd3e21918a0f420c9ec9340595585526b9150600090a25050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b158015620029da57600080fd5b505afa158015620029ef573d6000803e3d6000fd5b505050506040513d602081101562002a0657600080fd5b50516001600160a01b03161462002a4f5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562002a9557600080fd5b505afa15801562002aaa573d6000803e3d6000fd5b505050506040513d602081101562002ac157600080fd5b5051604080516339d9797960e11b81526001600160a01b03858116600483015260006024830181905292519394508416926373b2f2f29260448084019391929182900301818387803b15801562002b1757600080fd5b505af115801562002b2c573d6000803e3d6000fd5b50506040516001600160a01b03851692507f8bbf35441ac2c607ddecadd3d8ee58636d32f217fad201fb2655581502dd84e39150600090a25050565b600390565b303b1590565b61255a8062002b828339019056fe60806040523480156200001157600080fd5b506040516200255a3803806200255a833981810160405260a08110156200003757600080fd5b8151602083015160408085015160608601805192519496939591949391820192846401000000008211156200006b57600080fd5b9083019060208201858111156200008157600080fd5b82516401000000008111828201881017156200009c57600080fd5b82525081516020918201929091019080838360005b83811015620000cb578181015183820152602001620000b1565b50505050905090810190601f168015620000f95780820380516001836020036101000a031916815260200191505b50604052602001805160405193929190846401000000008211156200011d57600080fd5b9083019060208201858111156200013357600080fd5b82516401000000008111828201881017156200014e57600080fd5b82525081516020918201929091019080838360005b838110156200017d57818101518382015260200162000163565b50505050905090810190601f168015620001ab5780820380516001836020036101000a031916815260200191505b50604052505082518391508290620001cb906003906020850190620002eb565b508051620001e1906004906020840190620002eb565b50506005805460ff191660121790555062000205836001600160e01b03620002d516565b600a80546001600160a01b0319166001600160a01b03878116919091179182905560408051630261bf8b60e01b815290519290911691630261bf8b91600480820192602092909190829003018186803b1580156200026257600080fd5b505afa15801562000277573d6000803e3d6000fd5b505050506040513d60208110156200028e57600080fd5b5051600b80546001600160a01b0319166001600160a01b0392831617905560058054610100600160a81b031916610100969092169590950217909355506200039092505050565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200032e57805160ff19168380011785556200035e565b828001600101855582156200035e579182015b828111156200035e57825182559160200191906001019062000341565b506200036c92915062000370565b5090565b6200038d91905b808211156200036c576000815560010162000377565b90565b6121ba80620003a06000396000f3fe608060405234801561001057600080fd5b50600436106101735760003560e01c80635eae177c116100de578063a9059cbb11610097578063db006a7511610071578063db006a75146104f3578063dd62ed3e14610510578063ee9907a41461053e578063f866c3191461056457610173565b8063a9059cbb14610499578063c634dfaa146104c5578063d0fc81d2146104eb57610173565b80635eae177c146103df57806370a082311461040b57806389d1a0fc1461043157806394362e8b1461043957806395d89b4114610465578063a457c2d71461046d57610173565b806323b872dd1161013057806323b872dd146102c3578063313ce567146102f9578063325a9b131461031757806339509351146103455780633edb7cb814610371578063445e80101461039d57610173565b806306fdde0314610178578063095ea7b3146101f55780630e49072d1461023557806312c87c2d1461025d57806318160ddd146102835780631d51e7cf1461029d575b600080fd5b61018061059a565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101ba5781810151838201526020016101a2565b50505050905090810190601f1680156101e75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102216004803603604081101561020b57600080fd5b506001600160a01b038135169060200135610631565b604080519115158252519081900360200190f35b61025b6004803603602081101561024b57600080fd5b50356001600160a01b031661064f565b005b61025b6004803603602081101561027357600080fd5b50356001600160a01b031661065c565b61028b6106fb565b60408051918252519081900360200190f35b61028b600480360360208110156102b357600080fd5b50356001600160a01b03166107bd565b610221600480360360608110156102d957600080fd5b506001600160a01b038135811691602081013590911690604001356107dc565b610301610869565b6040805160ff9092168252519081900360200190f35b61025b6004803603604081101561032d57600080fd5b506001600160a01b0381358116916020013516610872565b6102216004803603604081101561035b57600080fd5b506001600160a01b0381351690602001356108d8565b61025b6004803603604081101561038757600080fd5b506001600160a01b03813516906020013561092c565b6103c3600480360360208110156103b357600080fd5b50356001600160a01b0316610a21565b604080516001600160a01b039092168252519081900360200190f35b610221600480360360408110156103f557600080fd5b506001600160a01b038135169060200135610a3f565b61028b6004803603602081101561042157600080fd5b50356001600160a01b0316610ada565b6103c3610b8d565b61025b6004803603604081101561044f57600080fd5b506001600160a01b038135169060200135610ba1565b610180610c76565b6102216004803603604081101561048357600080fd5b506001600160a01b038135169060200135610cd7565b610221600480360360408110156104af57600080fd5b506001600160a01b038135169060200135610d45565b61028b600480360360208110156104db57600080fd5b50356001600160a01b0316610d59565b61028b610d64565b61025b6004803603602081101561050957600080fd5b5035610d6a565b61028b6004803603604081101561052657600080fd5b506001600160a01b0381358116916020013516610fa4565b61028b6004803603602081101561055457600080fd5b50356001600160a01b0316610fcf565b61025b6004803603606081101561057a57600080fd5b506001600160a01b03813581169160208101359091169060400135610fea565b60038054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106265780601f106105fb57610100808354040283529160200191610626565b820191906000526020600020905b81548152906001019060200180831161060957829003601f168201915b505050505090505b90565b600061064561063e611043565b8484611047565b5060015b92915050565b6106593382611133565b50565b6001600160a01b0381163314156106a45760405162461bcd60e51b8152600401808060200182810382526025815260200180611f806025913960400191505060405180910390fd5b3360008181526009602052604080822080546001600160a01b0319166001600160a01b03861690811790915590519092917fc2d6a42a9d5273283f73009a07aacfb043f2f91173a8d9d33b504afe898db08b91a350565b600080610706611322565b90508061071757600091505061062e565b600b546005546040805163d15e005360e01b81526001600160a01b036101009093048316600482015290516107b7936107b293169163d15e0053916024808301926020929190829003018186803b15801561077157600080fd5b505afa158015610785573d6000803e3d6000fd5b505050506040513d602081101561079b57600080fd5b50516107a684611328565b9063ffffffff61133e16565b611389565b91505090565b6001600160a01b0381166000908152600860205260409020545b919050565b60006107e98484846113a2565b61085f846107f5611043565b61085a85604051806060016040528060288152602001611fc6602891396001600160a01b038a16600090815260016020526040812090610833611043565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61141116565b611047565b5060019392505050565b60055460ff1690565b6001600160a01b038281166000908152600960205260409020541633146108ca5760405162461bcd60e51b815260040180806020018281038252603a81526020018061214b603a913960400191505060405180910390fd5b6108d48282611133565b5050565b60006106456108e5611043565b8461085a85600160006108f6611043565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6114a816565b600b546001600160a01b031633146109755760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b600080600061098385611502565b935093509350506109958583866115f3565b61099f858561172a565b60006109b1848663ffffffff61183216565b6109c1576109be86611874565b90505b856001600160a01b03167f90e5d3d68ec162d9c7de393037a3ede04dd44f68e051bf2ace4a73c299dbc4db8685846109f957856109fc565b60005b60408051938452602084019290925282820152519081900360600190a2505050505050565b6001600160a01b039081166000908152600760205260409020541690565b600b54600554604080516376e9d61560e01b81526101009092046001600160a01b039081166004840152858116602484015260448301859052905160009391909116916376e9d615916064808301926020929190829003018186803b158015610aa757600080fd5b505afa158015610abb573d6000803e3d6000fd5b505050506040513d6020811015610ad157600080fd5b50519392505050565b600080610ae683611926565b6001600160a01b03841660009081526008602052604090205490915081158015610b0e575080155b15610b1e576000925050506107d7565b6001600160a01b0384811660009081526007602052604090205416610b6f57610b6681610b5a86610b55868463ffffffff6114a816565b611941565b9063ffffffff61183216565b925050506107d7565b610b66610b8082610b5a8785611941565b839063ffffffff6114a816565b60055461010090046001600160a01b031681565b600b546001600160a01b03163314610bea5760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b600080610bf684611502565b935093505050610c1a84610c1385856114a890919063ffffffff16565b60006115f3565b610c2484846119f6565b604080518481526020810184905280820183905290516001600160a01b038616917fbe7799898ca2d813ff902b487c1b434ab45b47edd8f38b77ad5e99aae8341b7a919081900360600190a250505050565b60048054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106265780601f106105fb57610100808354040283529160200191610626565b6000610645610ce4611043565b8461085a856040518060600160405280602581526020016121266025913960016000610d0e611043565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61141116565b6000610645610d52611043565b84846113a2565b600061064982611926565b60001981565b60008111610dbf576040805162461bcd60e51b815260206004820181905260248201527f416d6f756e7420746f2072656465656d206e6565647320746f206265203e2030604482015290519081900360640190fd5b6000806000610dcd33611502565b91955093509150849050600019811415610de45750825b83811115610e235760405162461bcd60e51b8152600401808060200182810382526032815260200180611f066032913960400191505060405180910390fd5b610e2d3382610a3f565b610e7e576040805162461bcd60e51b815260206004820152601b60248201527f5472616e736665722063616e6e6f7420626520616c6c6f7765642e0000000000604482015290519081900360640190fd5b610e893384836115f3565b610e93338261172a565b6000610ea5858363ffffffff61183216565b610eb557610eb233611874565b90505b600b546005546001600160a01b0391821691639895e3d8916101009004163385610ee58a8263ffffffff61183216565b6040518563ffffffff1660e01b815260040180856001600160a01b03166001600160a01b03168152602001846001600160a01b03166001600160a01b03168152602001838152602001828152602001945050505050600060405180830381600087803b158015610f5457600080fd5b505af1158015610f68573d6000803e3d6000fd5b50505050336001600160a01b03167fbd5034ffbd47e4e72a94baa2cdb74c6fad73cb3bcdc13036b72ec8306f5a76468386846109f957866109fc565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b031660009081526006602052604090205490565b600b546001600160a01b031633146110335760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b61103e838383611af2565b505050565b3390565b6001600160a01b03831661108c5760405162461bcd60e51b81526004018080602001828103825260248152602001806120d06024913960400191505060405180910390fd5b6001600160a01b0382166110d15760405162461bcd60e51b8152600401808060200182810382526022815260200180611f386022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0380831660009081526007602052604090205481169082168114156111905760405162461bcd60e51b815260040180806020018281038252602a815260200180611fee602a913960400191505060405180910390fd5b60008060008061119f87611502565b9350935093509350600083116111e65760405162461bcd60e51b81526004018080602001828103825260428152602001806120186042913960600191505060405180910390fd5b6001600160a01b0385161561120157611201876000866115f3565b866001600160a01b0316866001600160a01b0316141561128d576001600160a01b038716600081815260076020908152604080832080546001600160a01b03191690558051878152918201869052818101859052519192917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a73487355949181900360600190a350505050506108d4565b6001600160a01b03878116600090815260076020526040812080546001600160a01b031916928916929092179091556112c990889085906115f3565b604080518481526020810184905280820183905290516001600160a01b0380891692908a16917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a73487355949181900360600190a350505050505050565b60025490565b600061064982633b9aca0063ffffffff611c2116565b60006113826b033b2e3c9fd0803ce8000000611376611363868663ffffffff611c2116565b6b019d971e4fe8401e74000000906114a8565b9063ffffffff611c7a16565b9392505050565b6000631dcd6500611382633b9aca0061137683866114a8565b82816113ae8282610a3f565b6113ff576040805162461bcd60e51b815260206004820152601b60248201527f5472616e736665722063616e6e6f7420626520616c6c6f7765642e0000000000604482015290519081900360640190fd5b61140a858585611af2565b5050505050565b600081848411156114a05760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561146557818101518382015260200161144d565b50505050905090810190601f1680156114925780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015611382576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600080600080600061151386611926565b9050600061152482610b5a89610ada565b905061153087826119f6565b600b546005546040805163d15e005360e01b81526101009092046001600160a01b0390811660048401529051600093919091169163d15e0053916024808301926020929190829003018186803b15801561158957600080fd5b505afa15801561159d573d6000803e3d6000fd5b505050506040513d60208110156115b357600080fd5b50516001600160a01b03891660009081526006602052604090208190559050826115e3818463ffffffff6114a816565b9099909850919650945092505050565b6001600160a01b038084166000908152600760205260409020541680611619575061103e565b60008061162583611502565b6001600160a01b038716600090815260086020526040902054919550935061165b9250869150610b5a908863ffffffff6114a816565b6001600160a01b038085166000908152600860209081526040808320949094556007905291909120541680156116ce576001600160a01b0381166000908152600860205260409020546116b4908463ffffffff6114a816565b6001600160a01b0382166000908152600860205260409020555b60408051848152602081018490528082018890526060810187905290516001600160a01b038616917f70ff8cf632603e2bfd1afb7e4061acce53d95356b1be9726b99fa22ba733b01f919081900360800190a250505050505050565b6001600160a01b03821661176f5760405162461bcd60e51b815260040180806020018281038252602181526020018061208a6021913960400191505060405180910390fd5b61177b8260008361103e565b6117be81604051806060016040528060228152602001611ee4602291396001600160a01b038516600090815260208190526040902054919063ffffffff61141116565b6001600160a01b0383166000908152602081905260409020556002546117ea908263ffffffff61183216565b6002556040805182815290516000916001600160a01b038516917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9181900360200190a35050565b600061138283836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250611411565b6001600160a01b038116600081815260076020908152604080832080546001600160a01b03191690558051838152918201839052818101839052519192839290917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a7348735594919081900360600190a36001600160a01b03821660009081526008602052604090205461191e57506001600160a01b03811660009081526006602052604081205560016107d7565b5060006107d7565b6001600160a01b031660009081526020819052604090205490565b6001600160a01b03808316600090815260066020908152604080832054600b54600554835163d15e005360e01b81526101009091048716600482015292519495611382956107b29593946119ea94939092169263d15e00539260248082019391829003018186803b1580156119b557600080fd5b505afa1580156119c9573d6000803e3d6000fd5b505050506040513d60208110156119df57600080fd5b50516107a687611328565b9063ffffffff611cbc16565b6001600160a01b038216611a51576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b611a5d6000838361103e565b600254611a70908263ffffffff6114a816565b6002556001600160a01b038216600090815260208190526040902054611a9c908263ffffffff6114a816565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b60008111611b315760405162461bcd60e51b815260040180806020018281038252603081526020018061205a6030913960400191505060405180910390fd5b6000806000611b3f86611502565b93509350935050600080611b5287611502565b935093505050611b638885886115f3565b611b7787610c13848963ffffffff6114a816565b611b82888888611cf4565b6000611b94868863ffffffff61183216565b611ba457611ba189611874565b90505b876001600160a01b0316896001600160a01b03167f89a178eaa27e0cd201bd795ca8ff716ac0df9618494510ca79771cfc66ffcde889888786611be75789611bea565b60005b60408051948552602085019390935283830191909152606083015260808201879052519081900360a00190a3505050505050505050565b600082611c3057506000610649565b82820282848281611c3d57fe5b04146113825760405162461bcd60e51b8152600401808060200182810382526021815260200180611fa56021913960400191505060405180910390fd5b600061138283836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611e5b565b600060028204611cec83611376611cdf876b033b2e3c9fd0803ce8000000611c21565b849063ffffffff6114a816565b949350505050565b6001600160a01b038316611d395760405162461bcd60e51b81526004018080602001828103825260258152602001806120ab6025913960400191505060405180910390fd5b6001600160a01b038216611d7e5760405162461bcd60e51b8152600401808060200182810382526023815260200180611ec16023913960400191505060405180910390fd5b611d8983838361103e565b611dcc81604051806060016040528060268152602001611f5a602691396001600160a01b038616600090815260208190526040902054919063ffffffff61141116565b6001600160a01b038085166000908152602081905260408082209390935590841681522054611e01908263ffffffff6114a816565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b60008183611eaa5760405162461bcd60e51b815260206004820181815283516024840152835190928392604490910191908501908083836000831561146557818101518382015260200161144d565b506000838581611eb657fe5b049594505050505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a206275726e20616d6f756e7420657863656564732062616c616e6365557365722063616e6e6f742072656465656d206d6f7265207468616e2074686520617661696c61626c652062616c616e636545524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e6365557365722063616e6e6f74206769766520616c6c6f77616e636520746f2068696d73656c66536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f7745524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e6365496e74657265737420697320616c7265616479207265646972656374656420746f207468652075736572496e7465726573742073747265616d2063616e206f6e6c79206265207265646972656374656420696620746865726520697320612076616c69642062616c616e63655472616e7366657272656420616d6f756e74206e6565647320746f2062652067726561746572207468616e207a65726f45524332303a206275726e2066726f6d20746865207a65726f206164647265737345524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f20616464726573735468652063616c6c6572206f6620746869732066756e6374696f6e206d7573742062652061206c656e64696e6720706f6f6c45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726f43616c6c6572206973206e6f7420616c6c6f77656420746f2072656469726563742074686520696e746572657374206f66207468652075736572a264697066735822122019873305020cbc01aa77bbb897e23d81612ce64a19cddc5032e3ae3b0086ac6564736f6c634300060800335468652063616c6c6572206d7573742062652061206c656e64696e6720706f6f6c206d616e61676572436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564546865206c6971756964697479206f66207468652072657365727665206e6565647320746f2062652030a26469706673582212201048936da14a066ae066e469351afdefa900f6355d33b13a8bd9d77ae95501a364736f6c63430006080033";
+  "0x60806040526000805534801561001457600080fd5b50615192806100246000396000f3fe60806040523480156200001157600080fd5b5060043610620001485760003560e01c8063a5bc826c11620000bd578063d466016f116200007b578063d466016f1462000530578063e8ae2f5b146200055f578063eede87c11462000588578063ef1f937314620005b9578063f53a251514620005e25762000148565b8063a5bc826c1462000451578063a8dc0f45146200048c578063b75d6f3414620004b5578063bf34418314620004de578063c4d66de814620005075762000148565b806366bbd928116200010b57806366bbd928146200038857806370fb84f414620003b75780637aca76eb14620003e65780637af635a6146200040f57806380e17d87146200042b5762000148565b80631133c0f7146200014d5780631d2118f914620002b35780633443a14b14620002e45780633e72a45414620003135780635dd9a189146200033c575b600080fd5b620002b1600480360360e08110156200016557600080fd5b6001600160a01b038235169190810190604081016020820135600160201b8111156200019057600080fd5b820183602082011115620001a357600080fd5b803590602001918460018302840111600160201b83111715620001c557600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295949360208101935035915050600160201b8111156200021857600080fd5b8201836020820111156200022b57600080fd5b803590602001918460018302840111600160201b831117156200024d57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550506001600160a01b03833581169450602084013581169360ff6040820135169350606001351690506200060b565b005b620002b160048036036040811015620002cb57600080fd5b506001600160a01b038135811691602001351662000965565b620002b160048036036040811015620002fc57600080fd5b506001600160a01b03813516906020013562000b4d565b620002b1600480360360208110156200032b57600080fd5b50356001600160a01b031662000d33565b620002b1600480360360a08110156200035457600080fd5b506001600160a01b03813581169160ff60208201351691604082013581169160608101358216916080909101351662000ff3565b620002b160048036036040811015620003a057600080fd5b506001600160a01b03813516906020013562001426565b620002b160048036036040811015620003cf57600080fd5b506001600160a01b0381351690602001356200160c565b620002b160048036036020811015620003fe57600080fd5b50356001600160a01b0316620017f2565b62000419620019c7565b60408051918252519081900360200190f35b62000435620019cc565b604080516001600160a01b039092168252519081900360200190f35b620002b1600480360360808110156200046957600080fd5b506001600160a01b038135169060208101359060408101359060600135620019db565b620002b160048036036020811015620004a457600080fd5b50356001600160a01b031662001bd9565b620002b160048036036020811015620004cd57600080fd5b50356001600160a01b031662001db3565b620002b160048036036020811015620004f657600080fd5b50356001600160a01b031662001f88565b620002b1600480360360208110156200051f57600080fd5b50356001600160a01b03166200215d565b620002b1600480360360408110156200054857600080fd5b506001600160a01b0381351690602001356200221f565b620002b1600480360360208110156200057757600080fd5b50356001600160a01b031662002405565b620002b160048036036040811015620005a057600080fd5b506001600160a01b0381351690602001351515620025d3565b620002b160048036036020811015620005d157600080fd5b50356001600160a01b0316620027c2565b620002b160048036036020811015620005fa57600080fd5b50356001600160a01b031662002995565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200065057600080fd5b505afa15801562000665573d6000803e3d6000fd5b505050506040513d60208110156200067c57600080fd5b50516001600160a01b031614620006c55760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b6034546040516000916001600160a01b031690899085908a908a90620006eb9062002b73565b6001600160a01b038087168252851660208083019190915260ff8516604083015260a06060830181815285519184019190915284519091608084019160c085019187019080838360005b838110156200074f57818101518382015260200162000735565b50505050905090810190601f1680156200077d5780820380516001836020036101000a031916815260200191505b50838103825284518152845160209182019186019080838360005b83811015620007b257818101518382015260200162000798565b50505050905090810190601f168015620007e05780820380516001836020036101000a031916815260200191505b50975050505050505050604051809103906000f08015801562000807573d6000803e3d6000fd5b509050603460009054906101000a90046001600160a01b03166001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156200085957600080fd5b505afa1580156200086e573d6000803e3d6000fd5b505050506040513d60208110156200088557600080fd5b5051604080516309eab60f60e01b81526001600160a01b038b8116600483015284811660248301528881166044830152878116606483015260ff8716608483015285811660a4830152915191909216916309eab60f9160c480830192600092919082900301818387803b158015620008fc57600080fd5b505af115801562000911573d6000803e3d6000fd5b5050604080516001600160a01b03868116825291518286169450918c1692507f1d9fcd0dc935b4778d5af97f55c4d7b2553257382f1ef25c412114c8eeebd88e919081900360200190a35050505050505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b158015620009aa57600080fd5b505afa158015620009bf573d6000803e3d6000fd5b505050506040513d6020811015620009d657600080fd5b50516001600160a01b03161462000a1f5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562000a6557600080fd5b505afa15801562000a7a573d6000803e3d6000fd5b505050506040513d602081101562000a9157600080fd5b505160408051631d2118f960e01b81526001600160a01b0386811660048301528581166024830152915192935090831691631d2118f99160448082019260009290919082900301818387803b15801562000aea57600080fd5b505af115801562000aff573d6000803e3d6000fd5b5050604080516001600160a01b0380881682528616602082015281517f5644b64ebb0ce18c4032248ca52f58355469092ff072866c3dcd8640e817d6a59450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562000b9257600080fd5b505afa15801562000ba7573d6000803e3d6000fd5b505050506040513d602081101562000bbe57600080fd5b50516001600160a01b03161462000c075760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562000c4d57600080fd5b505afa15801562000c62573d6000803e3d6000fd5b505050506040513d602081101562000c7957600080fd5b505160408051633443a14b60e01b81526001600160a01b03868116600483015260248201869052915192935090831691633443a14b9160448082019260009290919082900301818387803b15801562000cd157600080fd5b505af115801562000ce6573d6000803e3d6000fd5b5050604080516001600160a01b03871681526020810186905281517f437dd3b61b7c7eee7fc70515c8846482dfca92e2e1e02af5d638c5d4878d67149450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562000d7857600080fd5b505afa15801562000d8d573d6000803e3d6000fd5b505050506040513d602081101562000da457600080fd5b50516001600160a01b03161462000ded5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562000e3357600080fd5b505afa15801562000e48573d6000803e3d6000fd5b505050506040513d602081101562000e5f57600080fd5b5051604080516335ea6a7560e01b81526001600160a01b038581166004830152915192935060009283928392908616916335ea6a759160248082019261014092909190829003018186803b15801562000eb757600080fd5b505afa15801562000ecc573d6000803e3d6000fd5b505050506040513d61014081101562000ee457600080fd5b508051602082015160409092015190945090925090508215801562000f07575081155b801562000f12575080155b62000f4f5760405162461bcd60e51b815260040180806020018281038252602a81526020018062005133602a913960400191505060405180910390fd5b6040805163b736aaeb60e01b81526001600160a01b03878116600483015260006024830181905292519087169263b736aaeb926044808201939182900301818387803b15801562000f9f57600080fd5b505af115801562000fb4573d6000803e3d6000fd5b50506040516001600160a01b03881692507f6f60cf8bd0f218cabe1ea3150bd07b0b758c35c4cfdf7138017a283e65564d5e9150600090a25050505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200103857600080fd5b505afa1580156200104d573d6000803e3d6000fd5b505050506040513d60208110156200106457600080fd5b50516001600160a01b031614620010ad5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b6060856001600160a01b03166306fdde036040518163ffffffff1660e01b815260040160006040518083038186803b158015620010e957600080fd5b505afa158015620010fe573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260208110156200112857600080fd5b8101908080516040519392919084600160201b8211156200114857600080fd5b9083019060208201858111156200115e57600080fd5b8251600160201b8111828201881017156200117857600080fd5b82525081516020918201929091019080838360005b83811015620011a75781810151838201526020016200118d565b50505050905090810190601f168015620011d55780820380516001836020036101000a031916815260200191505b50604052505050604051602001808075020b0bb329024b73a32b932b9ba103132b0b934b733960551b81525060160182805190602001908083835b60208310620012315780518252601f19909201916020918201910162001210565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405160208183030381529060405290506060866001600160a01b03166395d89b416040518163ffffffff1660e01b815260040160006040518083038186803b158015620012a357600080fd5b505afa158015620012b8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526020811015620012e257600080fd5b8101908080516040519392919084600160201b8211156200130257600080fd5b9083019060208201858111156200131857600080fd5b8251600160201b8111828201881017156200133257600080fd5b82525081516020918201929091019080838360005b838110156200136157818101518382015260200162001347565b50505050905090810190601f1680156200138f5780820380516001836020036101000a031916815260200191505b506040525050506040516020018080606160f81b81525060010182805190602001908083835b60208310620013d65780518252601f199092019160209182019101620013b5565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405160208183030381529060405290506200141d87838387878b8b6200060b565b50505050505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200146b57600080fd5b505afa15801562001480573d6000803e3d6000fd5b505050506040513d60208110156200149757600080fd5b50516001600160a01b031614620014e05760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200152657600080fd5b505afa1580156200153b573d6000803e3d6000fd5b505050506040513d60208110156200155257600080fd5b505160408051630cd77b2560e31b81526001600160a01b038681166004830152602482018690529151929350908316916366bbd9289160448082019260009290919082900301818387803b158015620015aa57600080fd5b505af1158015620015bf573d6000803e3d6000fd5b5050604080516001600160a01b03871681526020810186905281517f2e73b7f1df792712003e6859f940c1e8711c3f1329474771fee71d2ec11631299450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200165157600080fd5b505afa15801562001666573d6000803e3d6000fd5b505050506040513d60208110156200167d57600080fd5b50516001600160a01b031614620016c65760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200170c57600080fd5b505afa15801562001721573d6000803e3d6000fd5b505050506040513d60208110156200173857600080fd5b505160408051631c3ee13d60e21b81526001600160a01b038681166004830152602482018690529151929350908316916370fb84f49160448082019260009290919082900301818387803b1580156200179057600080fd5b505af1158015620017a5573d6000803e3d6000fd5b5050604080516001600160a01b03871681526020810186905281517fe3ba662f7011e701056a43e8cf832242322eeff01453e7a72d01ec2af36d9aec9450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200183757600080fd5b505afa1580156200184c573d6000803e3d6000fd5b505050506040513d60208110156200186357600080fd5b50516001600160a01b031614620018ac5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b158015620018f257600080fd5b505afa15801562001907573d6000803e3d6000fd5b505050506040513d60208110156200191e57600080fd5b5051604080516325ba55f160e21b81526001600160a01b038581166004830152600160248301529151929350908316916396e957c49160448082019260009290919082900301818387803b1580156200197657600080fd5b505af11580156200198b573d6000803e3d6000fd5b50506040516001600160a01b03851692507fda5cdb66c77023db6abe5226a4d4a40c3b8e768012f4ff4e446f62f60127fc569150600090a25050565b600381565b6034546001600160a01b031681565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562001a2057600080fd5b505afa15801562001a35573d6000803e3d6000fd5b505050506040513d602081101562001a4c57600080fd5b50516001600160a01b03161462001a955760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562001adb57600080fd5b505afa15801562001af0573d6000803e3d6000fd5b505050506040513d602081101562001b0757600080fd5b50516040805163296f209b60e21b81526001600160a01b03888116600483015260248201889052604482018790526064820186905291519293509083169163a5bc826c9160848082019260009290919082900301818387803b15801562001b6d57600080fd5b505af115801562001b82573d6000803e3d6000fd5b5050604080518781526020810187905280820186905290516001600160a01b03891693507fdfe62f53e7707d64f99bca15d2bdf3facc4074bc047e7dec2ea130300e99274492509081900360600190a25050505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562001c1e57600080fd5b505afa15801562001c33573d6000803e3d6000fd5b505050506040513d602081101562001c4a57600080fd5b50516001600160a01b03161462001c935760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562001cd957600080fd5b505afa15801562001cee573d6000803e3d6000fd5b505050506040513d602081101562001d0557600080fd5b505160408051636ee365f960e01b81526001600160a01b038581166004830152600060248301819052604483018190529251939450841692636ee365f99260648084019391929182900301818387803b15801562001d6257600080fd5b505af115801562001d77573d6000803e3d6000fd5b50506040516001600160a01b03851692507fe9a7e5fd4fc8ea18e602350324bf48e8f05d12434af0ce0be05743e6a5fdcb9e9150600090a25050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562001df857600080fd5b505afa15801562001e0d573d6000803e3d6000fd5b505050506040513d602081101562001e2457600080fd5b50516001600160a01b03161462001e6d5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562001eb357600080fd5b505afa15801562001ec8573d6000803e3d6000fd5b505050506040513d602081101562001edf57600080fd5b50516040805163b736aaeb60e01b81526001600160a01b0385811660048301526001602483015291519293509083169163b736aaeb9160448082019260009290919082900301818387803b15801562001f3757600080fd5b505af115801562001f4c573d6000803e3d6000fd5b50506040516001600160a01b03851692507f35b80cd8ea3440e9a8454f116fa658b858da1b64c86c48451f4559cefcdfb56c9150600090a25050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b15801562001fcd57600080fd5b505afa15801562001fe2573d6000803e3d6000fd5b505050506040513d602081101562001ff957600080fd5b50516001600160a01b031614620020425760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200208857600080fd5b505afa1580156200209d573d6000803e3d6000fd5b505050506040513d6020811015620020b457600080fd5b5051604080516339d9797960e11b81526001600160a01b038581166004830152600160248301529151929350908316916373b2f2f29160448082019260009290919082900301818387803b1580156200210c57600080fd5b505af115801562002121573d6000803e3d6000fd5b50506040516001600160a01b03851692507f8dee2b2f3e98319ae6347eda521788f73f4086c9be9a594942b370b137fb8cb19150600090a25050565b60006200216962002b68565b60015490915060ff16806200218357506200218362002b6d565b8062002190575060005481115b620021cd5760405162461bcd60e51b815260040180806020018281038252602e81526020018062005105602e913960400191505060405180910390fd5b60015460ff16158015620021ed576001805460ff19168117905560008290555b603480546001600160a01b0319166001600160a01b03851617905580156200221a576001805460ff191690555b505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200226457600080fd5b505afa15801562002279573d6000803e3d6000fd5b505050506040513d60208110156200229057600080fd5b50516001600160a01b031614620022d95760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200231f57600080fd5b505afa15801562002334573d6000803e3d6000fd5b505050506040513d60208110156200234b57600080fd5b50516040805163d466016f60e01b81526001600160a01b0386811660048301526024820186905291519293509083169163d466016f9160448082019260009290919082900301818387803b158015620023a357600080fd5b505af1158015620023b8573d6000803e3d6000fd5b5050604080516001600160a01b03871681526020810186905281517fda47540c7f7fd5a68c3285f3bb708f322424f948f41df6f51622fa24b39686649450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200244a57600080fd5b505afa1580156200245f573d6000803e3d6000fd5b505050506040513d60208110156200247657600080fd5b50516001600160a01b031614620024bf5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b1580156200250557600080fd5b505afa1580156200251a573d6000803e3d6000fd5b505050506040513d60208110156200253157600080fd5b50516040805163e8ae2f5b60e01b81526001600160a01b03858116600483015291519293509083169163e8ae2f5b9160248082019260009290919082900301818387803b1580156200258257600080fd5b505af115801562002597573d6000803e3d6000fd5b50506040516001600160a01b03851692507f9cc75e4cafc9a556a369bc53468649075680eb554d225d5918f199453824796d9150600090a25050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200261857600080fd5b505afa1580156200262d573d6000803e3d6000fd5b505050506040513d60208110156200264457600080fd5b50516001600160a01b0316146200268d5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b158015620026d357600080fd5b505afa158015620026e8573d6000803e3d6000fd5b505050506040513d6020811015620026ff57600080fd5b505160408051636ee365f960e01b81526001600160a01b038681166004830152851515602483015260016044830152915192935090831691636ee365f99160648082019260009290919082900301818387803b1580156200275f57600080fd5b505af115801562002774573d6000803e3d6000fd5b5050604080516001600160a01b0387168152851515602082015281517fab2f7f9e5ca2772fafa94f355c1842a80ae6b9e41f83083098d81f67d7a0b5089450908190039091019150a1505050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b1580156200280757600080fd5b505afa1580156200281c573d6000803e3d6000fd5b505050506040513d60208110156200283357600080fd5b50516001600160a01b0316146200287c5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b158015620028c257600080fd5b505afa158015620028d7573d6000803e3d6000fd5b505050506040513d6020811015620028ee57600080fd5b5051604080516325ba55f160e21b81526001600160a01b03858116600483015260006024830181905292519394508416926396e957c49260448084019391929182900301818387803b1580156200294457600080fd5b505af115801562002959573d6000803e3d6000fd5b50506040516001600160a01b03851692507f995959c2ceab6ce20e8cd89c904e449fd3e21918a0f420c9ec9340595585526b9150600090a25050565b603454604080516333128d5960e01b8152905133926001600160a01b0316916333128d59916004808301926020929190829003018186803b158015620029da57600080fd5b505afa158015620029ef573d6000803e3d6000fd5b505050506040513d602081101562002a0657600080fd5b50516001600160a01b03161462002a4f5760405162461bcd60e51b8152600401808060200182810382526029815260200180620050dc6029913960400191505060405180910390fd5b60345460408051630261bf8b60e01b815290516000926001600160a01b031691630261bf8b916004808301926020929190829003018186803b15801562002a9557600080fd5b505afa15801562002aaa573d6000803e3d6000fd5b505050506040513d602081101562002ac157600080fd5b5051604080516339d9797960e11b81526001600160a01b03858116600483015260006024830181905292519394508416926373b2f2f29260448084019391929182900301818387803b15801562002b1757600080fd5b505af115801562002b2c573d6000803e3d6000fd5b50506040516001600160a01b03851692507f8bbf35441ac2c607ddecadd3d8ee58636d32f217fad201fb2655581502dd84e39150600090a25050565b600390565b303b1590565b61255a8062002b828339019056fe60806040523480156200001157600080fd5b506040516200255a3803806200255a833981810160405260a08110156200003757600080fd5b8151602083015160408085015160608601805192519496939591949391820192846401000000008211156200006b57600080fd5b9083019060208201858111156200008157600080fd5b82516401000000008111828201881017156200009c57600080fd5b82525081516020918201929091019080838360005b83811015620000cb578181015183820152602001620000b1565b50505050905090810190601f168015620000f95780820380516001836020036101000a031916815260200191505b50604052602001805160405193929190846401000000008211156200011d57600080fd5b9083019060208201858111156200013357600080fd5b82516401000000008111828201881017156200014e57600080fd5b82525081516020918201929091019080838360005b838110156200017d57818101518382015260200162000163565b50505050905090810190601f168015620001ab5780820380516001836020036101000a031916815260200191505b50604052505082518391508290620001cb906003906020850190620002eb565b508051620001e1906004906020840190620002eb565b50506005805460ff191660121790555062000205836001600160e01b03620002d516565b600a80546001600160a01b0319166001600160a01b03878116919091179182905560408051630261bf8b60e01b815290519290911691630261bf8b91600480820192602092909190829003018186803b1580156200026257600080fd5b505afa15801562000277573d6000803e3d6000fd5b505050506040513d60208110156200028e57600080fd5b5051600b80546001600160a01b0319166001600160a01b0392831617905560058054610100600160a81b031916610100969092169590950217909355506200039092505050565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200032e57805160ff19168380011785556200035e565b828001600101855582156200035e579182015b828111156200035e57825182559160200191906001019062000341565b506200036c92915062000370565b5090565b6200038d91905b808211156200036c576000815560010162000377565b90565b6121ba80620003a06000396000f3fe608060405234801561001057600080fd5b50600436106101735760003560e01c80635eae177c116100de578063a9059cbb11610097578063db006a7511610071578063db006a75146104f3578063dd62ed3e14610510578063ee9907a41461053e578063f866c3191461056457610173565b8063a9059cbb14610499578063c634dfaa146104c5578063d0fc81d2146104eb57610173565b80635eae177c146103df57806370a082311461040b57806389d1a0fc1461043157806394362e8b1461043957806395d89b4114610465578063a457c2d71461046d57610173565b806323b872dd1161013057806323b872dd146102c3578063313ce567146102f9578063325a9b131461031757806339509351146103455780633edb7cb814610371578063445e80101461039d57610173565b806306fdde0314610178578063095ea7b3146101f55780630e49072d1461023557806312c87c2d1461025d57806318160ddd146102835780631d51e7cf1461029d575b600080fd5b61018061059a565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101ba5781810151838201526020016101a2565b50505050905090810190601f1680156101e75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102216004803603604081101561020b57600080fd5b506001600160a01b038135169060200135610631565b604080519115158252519081900360200190f35b61025b6004803603602081101561024b57600080fd5b50356001600160a01b031661064f565b005b61025b6004803603602081101561027357600080fd5b50356001600160a01b031661065c565b61028b6106fb565b60408051918252519081900360200190f35b61028b600480360360208110156102b357600080fd5b50356001600160a01b03166107bd565b610221600480360360608110156102d957600080fd5b506001600160a01b038135811691602081013590911690604001356107dc565b610301610869565b6040805160ff9092168252519081900360200190f35b61025b6004803603604081101561032d57600080fd5b506001600160a01b0381358116916020013516610872565b6102216004803603604081101561035b57600080fd5b506001600160a01b0381351690602001356108d8565b61025b6004803603604081101561038757600080fd5b506001600160a01b03813516906020013561092c565b6103c3600480360360208110156103b357600080fd5b50356001600160a01b0316610a21565b604080516001600160a01b039092168252519081900360200190f35b610221600480360360408110156103f557600080fd5b506001600160a01b038135169060200135610a3f565b61028b6004803603602081101561042157600080fd5b50356001600160a01b0316610ada565b6103c3610b8d565b61025b6004803603604081101561044f57600080fd5b506001600160a01b038135169060200135610ba1565b610180610c76565b6102216004803603604081101561048357600080fd5b506001600160a01b038135169060200135610cd7565b610221600480360360408110156104af57600080fd5b506001600160a01b038135169060200135610d45565b61028b600480360360208110156104db57600080fd5b50356001600160a01b0316610d59565b61028b610d64565b61025b6004803603602081101561050957600080fd5b5035610d6a565b61028b6004803603604081101561052657600080fd5b506001600160a01b0381358116916020013516610fa4565b61028b6004803603602081101561055457600080fd5b50356001600160a01b0316610fcf565b61025b6004803603606081101561057a57600080fd5b506001600160a01b03813581169160208101359091169060400135610fea565b60038054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106265780601f106105fb57610100808354040283529160200191610626565b820191906000526020600020905b81548152906001019060200180831161060957829003601f168201915b505050505090505b90565b600061064561063e611043565b8484611047565b5060015b92915050565b6106593382611133565b50565b6001600160a01b0381163314156106a45760405162461bcd60e51b8152600401808060200182810382526025815260200180611f806025913960400191505060405180910390fd5b3360008181526009602052604080822080546001600160a01b0319166001600160a01b03861690811790915590519092917fc2d6a42a9d5273283f73009a07aacfb043f2f91173a8d9d33b504afe898db08b91a350565b600080610706611322565b90508061071757600091505061062e565b600b546005546040805163d15e005360e01b81526001600160a01b036101009093048316600482015290516107b7936107b293169163d15e0053916024808301926020929190829003018186803b15801561077157600080fd5b505afa158015610785573d6000803e3d6000fd5b505050506040513d602081101561079b57600080fd5b50516107a684611328565b9063ffffffff61133e16565b611389565b91505090565b6001600160a01b0381166000908152600860205260409020545b919050565b60006107e98484846113a2565b61085f846107f5611043565b61085a85604051806060016040528060288152602001611fc6602891396001600160a01b038a16600090815260016020526040812090610833611043565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61141116565b611047565b5060019392505050565b60055460ff1690565b6001600160a01b038281166000908152600960205260409020541633146108ca5760405162461bcd60e51b815260040180806020018281038252603a81526020018061214b603a913960400191505060405180910390fd5b6108d48282611133565b5050565b60006106456108e5611043565b8461085a85600160006108f6611043565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6114a816565b600b546001600160a01b031633146109755760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b600080600061098385611502565b935093509350506109958583866115f3565b61099f858561172a565b60006109b1848663ffffffff61183216565b6109c1576109be86611874565b90505b856001600160a01b03167f90e5d3d68ec162d9c7de393037a3ede04dd44f68e051bf2ace4a73c299dbc4db8685846109f957856109fc565b60005b60408051938452602084019290925282820152519081900360600190a2505050505050565b6001600160a01b039081166000908152600760205260409020541690565b600b54600554604080516376e9d61560e01b81526101009092046001600160a01b039081166004840152858116602484015260448301859052905160009391909116916376e9d615916064808301926020929190829003018186803b158015610aa757600080fd5b505afa158015610abb573d6000803e3d6000fd5b505050506040513d6020811015610ad157600080fd5b50519392505050565b600080610ae683611926565b6001600160a01b03841660009081526008602052604090205490915081158015610b0e575080155b15610b1e576000925050506107d7565b6001600160a01b0384811660009081526007602052604090205416610b6f57610b6681610b5a86610b55868463ffffffff6114a816565b611941565b9063ffffffff61183216565b925050506107d7565b610b66610b8082610b5a8785611941565b839063ffffffff6114a816565b60055461010090046001600160a01b031681565b600b546001600160a01b03163314610bea5760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b600080610bf684611502565b935093505050610c1a84610c1385856114a890919063ffffffff16565b60006115f3565b610c2484846119f6565b604080518481526020810184905280820183905290516001600160a01b038616917fbe7799898ca2d813ff902b487c1b434ab45b47edd8f38b77ad5e99aae8341b7a919081900360600190a250505050565b60048054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156106265780601f106105fb57610100808354040283529160200191610626565b6000610645610ce4611043565b8461085a856040518060600160405280602581526020016121266025913960016000610d0e611043565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61141116565b6000610645610d52611043565b84846113a2565b600061064982611926565b60001981565b60008111610dbf576040805162461bcd60e51b815260206004820181905260248201527f416d6f756e7420746f2072656465656d206e6565647320746f206265203e2030604482015290519081900360640190fd5b6000806000610dcd33611502565b91955093509150849050600019811415610de45750825b83811115610e235760405162461bcd60e51b8152600401808060200182810382526032815260200180611f066032913960400191505060405180910390fd5b610e2d3382610a3f565b610e7e576040805162461bcd60e51b815260206004820152601b60248201527f5472616e736665722063616e6e6f7420626520616c6c6f7765642e0000000000604482015290519081900360640190fd5b610e893384836115f3565b610e93338261172a565b6000610ea5858363ffffffff61183216565b610eb557610eb233611874565b90505b600b546005546001600160a01b0391821691639895e3d8916101009004163385610ee58a8263ffffffff61183216565b6040518563ffffffff1660e01b815260040180856001600160a01b03166001600160a01b03168152602001846001600160a01b03166001600160a01b03168152602001838152602001828152602001945050505050600060405180830381600087803b158015610f5457600080fd5b505af1158015610f68573d6000803e3d6000fd5b50505050336001600160a01b03167fbd5034ffbd47e4e72a94baa2cdb74c6fad73cb3bcdc13036b72ec8306f5a76468386846109f957866109fc565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b031660009081526006602052604090205490565b600b546001600160a01b031633146110335760405162461bcd60e51b81526004018080602001828103825260328152602001806120f46032913960400191505060405180910390fd5b61103e838383611af2565b505050565b3390565b6001600160a01b03831661108c5760405162461bcd60e51b81526004018080602001828103825260248152602001806120d06024913960400191505060405180910390fd5b6001600160a01b0382166110d15760405162461bcd60e51b8152600401808060200182810382526022815260200180611f386022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0380831660009081526007602052604090205481169082168114156111905760405162461bcd60e51b815260040180806020018281038252602a815260200180611fee602a913960400191505060405180910390fd5b60008060008061119f87611502565b9350935093509350600083116111e65760405162461bcd60e51b81526004018080602001828103825260428152602001806120186042913960600191505060405180910390fd5b6001600160a01b0385161561120157611201876000866115f3565b866001600160a01b0316866001600160a01b0316141561128d576001600160a01b038716600081815260076020908152604080832080546001600160a01b03191690558051878152918201869052818101859052519192917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a73487355949181900360600190a350505050506108d4565b6001600160a01b03878116600090815260076020526040812080546001600160a01b031916928916929092179091556112c990889085906115f3565b604080518481526020810184905280820183905290516001600160a01b0380891692908a16917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a73487355949181900360600190a350505050505050565b60025490565b600061064982633b9aca0063ffffffff611c2116565b60006113826b033b2e3c9fd0803ce8000000611376611363868663ffffffff611c2116565b6b019d971e4fe8401e74000000906114a8565b9063ffffffff611c7a16565b9392505050565b6000631dcd6500611382633b9aca0061137683866114a8565b82816113ae8282610a3f565b6113ff576040805162461bcd60e51b815260206004820152601b60248201527f5472616e736665722063616e6e6f7420626520616c6c6f7765642e0000000000604482015290519081900360640190fd5b61140a858585611af2565b5050505050565b600081848411156114a05760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561146557818101518382015260200161144d565b50505050905090810190601f1680156114925780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015611382576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600080600080600061151386611926565b9050600061152482610b5a89610ada565b905061153087826119f6565b600b546005546040805163d15e005360e01b81526101009092046001600160a01b0390811660048401529051600093919091169163d15e0053916024808301926020929190829003018186803b15801561158957600080fd5b505afa15801561159d573d6000803e3d6000fd5b505050506040513d60208110156115b357600080fd5b50516001600160a01b03891660009081526006602052604090208190559050826115e3818463ffffffff6114a816565b9099909850919650945092505050565b6001600160a01b038084166000908152600760205260409020541680611619575061103e565b60008061162583611502565b6001600160a01b038716600090815260086020526040902054919550935061165b9250869150610b5a908863ffffffff6114a816565b6001600160a01b038085166000908152600860209081526040808320949094556007905291909120541680156116ce576001600160a01b0381166000908152600860205260409020546116b4908463ffffffff6114a816565b6001600160a01b0382166000908152600860205260409020555b60408051848152602081018490528082018890526060810187905290516001600160a01b038616917f70ff8cf632603e2bfd1afb7e4061acce53d95356b1be9726b99fa22ba733b01f919081900360800190a250505050505050565b6001600160a01b03821661176f5760405162461bcd60e51b815260040180806020018281038252602181526020018061208a6021913960400191505060405180910390fd5b61177b8260008361103e565b6117be81604051806060016040528060228152602001611ee4602291396001600160a01b038516600090815260208190526040902054919063ffffffff61141116565b6001600160a01b0383166000908152602081905260409020556002546117ea908263ffffffff61183216565b6002556040805182815290516000916001600160a01b038516917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9181900360200190a35050565b600061138283836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250611411565b6001600160a01b038116600081815260076020908152604080832080546001600160a01b03191690558051838152918201839052818101839052519192839290917f5e3cad45b1fe24159d1cb39788d82d0f69cc15770aa96fba1d3d1a7348735594919081900360600190a36001600160a01b03821660009081526008602052604090205461191e57506001600160a01b03811660009081526006602052604081205560016107d7565b5060006107d7565b6001600160a01b031660009081526020819052604090205490565b6001600160a01b03808316600090815260066020908152604080832054600b54600554835163d15e005360e01b81526101009091048716600482015292519495611382956107b29593946119ea94939092169263d15e00539260248082019391829003018186803b1580156119b557600080fd5b505afa1580156119c9573d6000803e3d6000fd5b505050506040513d60208110156119df57600080fd5b50516107a687611328565b9063ffffffff611cbc16565b6001600160a01b038216611a51576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b611a5d6000838361103e565b600254611a70908263ffffffff6114a816565b6002556001600160a01b038216600090815260208190526040902054611a9c908263ffffffff6114a816565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b60008111611b315760405162461bcd60e51b815260040180806020018281038252603081526020018061205a6030913960400191505060405180910390fd5b6000806000611b3f86611502565b93509350935050600080611b5287611502565b935093505050611b638885886115f3565b611b7787610c13848963ffffffff6114a816565b611b82888888611cf4565b6000611b94868863ffffffff61183216565b611ba457611ba189611874565b90505b876001600160a01b0316896001600160a01b03167f89a178eaa27e0cd201bd795ca8ff716ac0df9618494510ca79771cfc66ffcde889888786611be75789611bea565b60005b60408051948552602085019390935283830191909152606083015260808201879052519081900360a00190a3505050505050505050565b600082611c3057506000610649565b82820282848281611c3d57fe5b04146113825760405162461bcd60e51b8152600401808060200182810382526021815260200180611fa56021913960400191505060405180910390fd5b600061138283836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611e5b565b600060028204611cec83611376611cdf876b033b2e3c9fd0803ce8000000611c21565b849063ffffffff6114a816565b949350505050565b6001600160a01b038316611d395760405162461bcd60e51b81526004018080602001828103825260258152602001806120ab6025913960400191505060405180910390fd5b6001600160a01b038216611d7e5760405162461bcd60e51b8152600401808060200182810382526023815260200180611ec16023913960400191505060405180910390fd5b611d8983838361103e565b611dcc81604051806060016040528060268152602001611f5a602691396001600160a01b038616600090815260208190526040902054919063ffffffff61141116565b6001600160a01b038085166000908152602081905260408082209390935590841681522054611e01908263ffffffff6114a816565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b60008183611eaa5760405162461bcd60e51b815260206004820181815283516024840152835190928392604490910191908501908083836000831561146557818101518382015260200161144d565b506000838581611eb657fe5b049594505050505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a206275726e20616d6f756e7420657863656564732062616c616e6365557365722063616e6e6f742072656465656d206d6f7265207468616e2074686520617661696c61626c652062616c616e636545524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e6365557365722063616e6e6f74206769766520616c6c6f77616e636520746f2068696d73656c66536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f7745524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e6365496e74657265737420697320616c7265616479207265646972656374656420746f207468652075736572496e7465726573742073747265616d2063616e206f6e6c79206265207265646972656374656420696620746865726520697320612076616c69642062616c616e63655472616e7366657272656420616d6f756e74206e6565647320746f2062652067726561746572207468616e207a65726f45524332303a206275726e2066726f6d20746865207a65726f206164647265737345524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f20616464726573735468652063616c6c6572206f6620746869732066756e6374696f6e206d7573742062652061206c656e64696e6720706f6f6c45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726f43616c6c6572206973206e6f7420616c6c6f77656420746f2072656469726563742074686520696e746572657374206f66207468652075736572a2646970667358221220f59dad91f902c51c86450f254392611219e74e5de6a35d6ee1be8a8f7574cedd64736f6c634300060800335468652063616c6c6572206d7573742062652061206c656e64696e6720706f6f6c206d616e61676572436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564546865206c6971756964697479206f66207468652072657365727665206e6565647320746f2062652030a26469706673582212200973a60953aff150ca6487c3c1a4e818eb0d133f6152206e6c4351e296a718db64736f6c63430006080033";
diff --git a/types/LendingPoolCore.d.ts b/types/LendingPoolCore.d.ts
deleted file mode 100644
index 74f2637e..00000000
--- a/types/LendingPoolCore.d.ts
+++ /dev/null
@@ -1,1408 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface LendingPoolCoreInterface extends Interface {
-  functions: {
-    activateReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    addressesProvider: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    deactivateReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    disableBorrowingOnReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    disableReserveAsCollateral: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    disableReserveStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    enableBorrowingOnReserve: TypedFunctionDescription<{
-      encode([_reserve, _stableBorrowRateEnabled]: [string, boolean]): string;
-    }>;
-
-    enableReserveAsCollateral: TypedFunctionDescription<{
-      encode([
-        _reserve,
-        _baseLTVasCollateral,
-        _liquidationThreshold,
-        _liquidationBonus
-      ]: [string, BigNumberish, BigNumberish, BigNumberish]): string;
-    }>;
-
-    enableReserveStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    freezeReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveATokenAddress: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveAvailableLiquidity: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveConfiguration: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveCurrentAverageStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveCurrentLiquidityRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveCurrentStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveCurrentVariableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveDecimals: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveInterestRateStrategyAddress: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveIsActive: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveIsFreezed: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveIsStableBorrowRateEnabled: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveLastUpdate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveLiquidationBonus: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveLiquidationThreshold: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveLiquidityCumulativeIndex: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveNormalizedIncome: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveTotalBorrows: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveTotalBorrowsStable: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveTotalBorrowsVariable: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveTotalLiquidity: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveUtilizationRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveVariableBorrowsCumulativeIndex: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserves: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    getUserBasicReserveData: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserBorrowBalances: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserCurrentBorrowRateMode: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserCurrentStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserLastUpdate: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserOriginationFee: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserUnderlyingAssetBalance: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserVariableBorrowCumulativeIndex: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    initReserve: TypedFunctionDescription<{
-      encode([
-        _reserve,
-        _aTokenAddress,
-        _decimals,
-        _interestRateStrategyAddress
-      ]: [string, string, BigNumberish, string]): string;
-    }>;
-
-    initialize: TypedFunctionDescription<{
-      encode([_addressesProvider]: [string]): string;
-    }>;
-
-    isReserveBorrowingEnabled: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    isReserveUsageAsCollateralEnabled: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    isUserAllowedToBorrowAtStable: TypedFunctionDescription<{
-      encode([_reserve, _user, _amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-
-    isUserUseReserveAsCollateralEnabled: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    lendingPoolAddress: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    liquidateFee: TypedFunctionDescription<{
-      encode([_token, _amount, _destination]: [
-        string,
-        BigNumberish,
-        string
-      ]): string;
-    }>;
-
-    refreshConfiguration: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    removeLastAddedReserve: TypedFunctionDescription<{
-      encode([_reserveToRemove]: [string]): string;
-    }>;
-
-    reservesList: TypedFunctionDescription<{
-      encode([]: [BigNumberish]): string;
-    }>;
-
-    setReserveBaseLTVasCollateral: TypedFunctionDescription<{
-      encode([_reserve, _ltv]: [string, BigNumberish]): string;
-    }>;
-
-    setReserveDecimals: TypedFunctionDescription<{
-      encode([_reserve, _decimals]: [string, BigNumberish]): string;
-    }>;
-
-    setReserveInterestRateStrategyAddress: TypedFunctionDescription<{
-      encode([_reserve, _rateStrategyAddress]: [string, string]): string;
-    }>;
-
-    setReserveLiquidationBonus: TypedFunctionDescription<{
-      encode([_reserve, _bonus]: [string, BigNumberish]): string;
-    }>;
-
-    setReserveLiquidationThreshold: TypedFunctionDescription<{
-      encode([_reserve, _threshold]: [string, BigNumberish]): string;
-    }>;
-
-    setUserUseReserveAsCollateral: TypedFunctionDescription<{
-      encode([_reserve, _user, _useAsCollateral]: [
-        string,
-        string,
-        boolean
-      ]): string;
-    }>;
-
-    transferToFeeCollectionAddress: TypedFunctionDescription<{
-      encode([_token, _user, _amount, _destination]: [
-        string,
-        string,
-        BigNumberish,
-        string
-      ]): string;
-    }>;
-
-    transferToReserve: TypedFunctionDescription<{
-      encode([_reserve, _user, _amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-
-    transferToUser: TypedFunctionDescription<{
-      encode([_reserve, _user, _amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-
-    unfreezeReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    updateStateOnBorrow: TypedFunctionDescription<{
-      encode([_reserve, _user, _amountBorrowed, _borrowFee, _rateMode]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-
-    updateStateOnDeposit: TypedFunctionDescription<{
-      encode([_reserve, _user, _amount, _isFirstDeposit]: [
-        string,
-        string,
-        BigNumberish,
-        boolean
-      ]): string;
-    }>;
-
-    updateStateOnFlashLoan: TypedFunctionDescription<{
-      encode([_reserve, _availableLiquidityBefore, _income, _protocolFee]: [
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-
-    updateStateOnLiquidation: TypedFunctionDescription<{
-      encode([
-        _principalReserve,
-        _collateralReserve,
-        _user,
-        _amountToLiquidate,
-        _collateralToLiquidate,
-        _feeLiquidated,
-        _liquidatedCollateralForFee,
-        _balanceIncrease,
-        _liquidatorReceivesAToken
-      ]: [
-        string,
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        boolean
-      ]): string;
-    }>;
-
-    updateStateOnRebalance: TypedFunctionDescription<{
-      encode([_reserve, _user, _balanceIncrease]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-
-    updateStateOnRedeem: TypedFunctionDescription<{
-      encode([_reserve, _user, _amountRedeemed, _userRedeemedEverything]: [
-        string,
-        string,
-        BigNumberish,
-        boolean
-      ]): string;
-    }>;
-
-    updateStateOnRepay: TypedFunctionDescription<{
-      encode([
-        _reserve,
-        _user,
-        _paybackAmountMinusFees,
-        _originationFeeRepaid,
-        _balanceIncrease,
-        _repaidWholeLoan
-      ]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        boolean
-      ]): string;
-    }>;
-
-    updateStateOnSwapRate: TypedFunctionDescription<{
-      encode([
-        _reserve,
-        _user,
-        _principalBorrowBalance,
-        _compoundedBorrowBalance,
-        _balanceIncrease,
-        _currentRateMode
-      ]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    ReserveDataUpdated: TypedEventDescription<{
-      encodeTopics([
-        reserve,
-        liquidityRate,
-        stableBorrowRate,
-        averageStableBorrowRate,
-        variableBorrowRate,
-        liquidityIndex,
-        variableBorrowIndex
-      ]: [string | null, null, null, null, null, null, null]): string[];
-    }>;
-
-    ReserveUpdated: TypedEventDescription<{
-      encodeTopics([
-        reserve,
-        liquidityRate,
-        stableBorrowRate,
-        variableBorrowRate,
-        liquidityIndex,
-        variableBorrowIndex
-      ]: [string | null, null, null, null, null, null]): string[];
-    }>;
-  };
-}
-
-export class LendingPoolCore extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): LendingPoolCore;
-  attach(addressOrName: string): LendingPoolCore;
-  deployed(): Promise<LendingPoolCore>;
-
-  on(event: EventFilter | string, listener: Listener): LendingPoolCore;
-  once(event: EventFilter | string, listener: Listener): LendingPoolCore;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): LendingPoolCore;
-  removeAllListeners(eventName: EventFilter | string): LendingPoolCore;
-  removeListener(eventName: any, listener: Listener): LendingPoolCore;
-
-  interface: LendingPoolCoreInterface;
-
-  functions: {
-    activateReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    addressesProvider(): Promise<string>;
-
-    deactivateReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    disableBorrowingOnReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    disableReserveAsCollateral(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    disableReserveStableBorrowRate(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    enableBorrowingOnReserve(
-      _reserve: string,
-      _stableBorrowRateEnabled: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    enableReserveAsCollateral(
-      _reserve: string,
-      _baseLTVasCollateral: BigNumberish,
-      _liquidationThreshold: BigNumberish,
-      _liquidationBonus: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    enableReserveStableBorrowRate(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    freezeReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    getReserveATokenAddress(_reserve: string): Promise<string>;
-
-    getReserveAvailableLiquidity(_reserve: string): Promise<BigNumber>;
-
-    getReserveConfiguration(
-      _reserve: string
-    ): Promise<{
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-      3: boolean;
-    }>;
-
-    getReserveCurrentAverageStableBorrowRate(
-      _reserve: string
-    ): Promise<BigNumber>;
-
-    getReserveCurrentLiquidityRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentVariableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveDecimals(_reserve: string): Promise<BigNumber>;
-
-    getReserveInterestRateStrategyAddress(_reserve: string): Promise<string>;
-
-    getReserveIsActive(_reserve: string): Promise<boolean>;
-
-    getReserveIsFreezed(_reserve: string): Promise<boolean>;
-
-    getReserveIsStableBorrowRateEnabled(_reserve: string): Promise<boolean>;
-
-    getReserveLastUpdate(_reserve: string): Promise<number>;
-
-    getReserveLiquidationBonus(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidationThreshold(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidityCumulativeIndex(_reserve: string): Promise<BigNumber>;
-
-    getReserveNormalizedIncome(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrows(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrowsStable(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrowsVariable(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalLiquidity(_reserve: string): Promise<BigNumber>;
-
-    getReserveUtilizationRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveVariableBorrowsCumulativeIndex(
-      _reserve: string
-    ): Promise<BigNumber>;
-
-    getReserves(): Promise<string[]>;
-
-    getUserBasicReserveData(
-      _reserve: string,
-      _user: string
-    ): Promise<{
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-      3: boolean;
-    }>;
-
-    getUserBorrowBalances(
-      _reserve: string,
-      _user: string
-    ): Promise<{
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-    }>;
-
-    getUserCurrentBorrowRateMode(
-      _reserve: string,
-      _user: string
-    ): Promise<number>;
-
-    getUserCurrentStableBorrowRate(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserLastUpdate(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserOriginationFee(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserUnderlyingAssetBalance(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserVariableBorrowCumulativeIndex(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    initReserve(
-      _reserve: string,
-      _aTokenAddress: string,
-      _decimals: BigNumberish,
-      _interestRateStrategyAddress: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    initialize(
-      _addressesProvider: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    isReserveBorrowingEnabled(_reserve: string): Promise<boolean>;
-
-    isReserveUsageAsCollateralEnabled(_reserve: string): Promise<boolean>;
-
-    isUserAllowedToBorrowAtStable(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<boolean>;
-
-    isUserUseReserveAsCollateralEnabled(
-      _reserve: string,
-      _user: string
-    ): Promise<boolean>;
-
-    lendingPoolAddress(): Promise<string>;
-
-    liquidateFee(
-      _token: string,
-      _amount: BigNumberish,
-      _destination: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    refreshConfiguration(
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    removeLastAddedReserve(
-      _reserveToRemove: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    reservesList(arg0: BigNumberish): Promise<string>;
-
-    setReserveBaseLTVasCollateral(
-      _reserve: string,
-      _ltv: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setReserveDecimals(
-      _reserve: string,
-      _decimals: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setReserveInterestRateStrategyAddress(
-      _reserve: string,
-      _rateStrategyAddress: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setReserveLiquidationBonus(
-      _reserve: string,
-      _bonus: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setReserveLiquidationThreshold(
-      _reserve: string,
-      _threshold: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setUserUseReserveAsCollateral(
-      _reserve: string,
-      _user: string,
-      _useAsCollateral: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferToFeeCollectionAddress(
-      _token: string,
-      _user: string,
-      _amount: BigNumberish,
-      _destination: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferToReserve(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferToUser(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    unfreezeReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnBorrow(
-      _reserve: string,
-      _user: string,
-      _amountBorrowed: BigNumberish,
-      _borrowFee: BigNumberish,
-      _rateMode: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnDeposit(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish,
-      _isFirstDeposit: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnFlashLoan(
-      _reserve: string,
-      _availableLiquidityBefore: BigNumberish,
-      _income: BigNumberish,
-      _protocolFee: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnLiquidation(
-      _principalReserve: string,
-      _collateralReserve: string,
-      _user: string,
-      _amountToLiquidate: BigNumberish,
-      _collateralToLiquidate: BigNumberish,
-      _feeLiquidated: BigNumberish,
-      _liquidatedCollateralForFee: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _liquidatorReceivesAToken: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnRebalance(
-      _reserve: string,
-      _user: string,
-      _balanceIncrease: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnRedeem(
-      _reserve: string,
-      _user: string,
-      _amountRedeemed: BigNumberish,
-      _userRedeemedEverything: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnRepay(
-      _reserve: string,
-      _user: string,
-      _paybackAmountMinusFees: BigNumberish,
-      _originationFeeRepaid: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _repaidWholeLoan: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnSwapRate(
-      _reserve: string,
-      _user: string,
-      _principalBorrowBalance: BigNumberish,
-      _compoundedBorrowBalance: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _currentRateMode: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  activateReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  addressesProvider(): Promise<string>;
-
-  deactivateReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  disableBorrowingOnReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  disableReserveAsCollateral(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  disableReserveStableBorrowRate(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  enableBorrowingOnReserve(
-    _reserve: string,
-    _stableBorrowRateEnabled: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  enableReserveAsCollateral(
-    _reserve: string,
-    _baseLTVasCollateral: BigNumberish,
-    _liquidationThreshold: BigNumberish,
-    _liquidationBonus: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  enableReserveStableBorrowRate(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  freezeReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  getReserveATokenAddress(_reserve: string): Promise<string>;
-
-  getReserveAvailableLiquidity(_reserve: string): Promise<BigNumber>;
-
-  getReserveConfiguration(
-    _reserve: string
-  ): Promise<{
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-    3: boolean;
-  }>;
-
-  getReserveCurrentAverageStableBorrowRate(
-    _reserve: string
-  ): Promise<BigNumber>;
-
-  getReserveCurrentLiquidityRate(_reserve: string): Promise<BigNumber>;
-
-  getReserveCurrentStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-  getReserveCurrentVariableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-  getReserveDecimals(_reserve: string): Promise<BigNumber>;
-
-  getReserveInterestRateStrategyAddress(_reserve: string): Promise<string>;
-
-  getReserveIsActive(_reserve: string): Promise<boolean>;
-
-  getReserveIsFreezed(_reserve: string): Promise<boolean>;
-
-  getReserveIsStableBorrowRateEnabled(_reserve: string): Promise<boolean>;
-
-  getReserveLastUpdate(_reserve: string): Promise<number>;
-
-  getReserveLiquidationBonus(_reserve: string): Promise<BigNumber>;
-
-  getReserveLiquidationThreshold(_reserve: string): Promise<BigNumber>;
-
-  getReserveLiquidityCumulativeIndex(_reserve: string): Promise<BigNumber>;
-
-  getReserveNormalizedIncome(_reserve: string): Promise<BigNumber>;
-
-  getReserveTotalBorrows(_reserve: string): Promise<BigNumber>;
-
-  getReserveTotalBorrowsStable(_reserve: string): Promise<BigNumber>;
-
-  getReserveTotalBorrowsVariable(_reserve: string): Promise<BigNumber>;
-
-  getReserveTotalLiquidity(_reserve: string): Promise<BigNumber>;
-
-  getReserveUtilizationRate(_reserve: string): Promise<BigNumber>;
-
-  getReserveVariableBorrowsCumulativeIndex(
-    _reserve: string
-  ): Promise<BigNumber>;
-
-  getReserves(): Promise<string[]>;
-
-  getUserBasicReserveData(
-    _reserve: string,
-    _user: string
-  ): Promise<{
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-    3: boolean;
-  }>;
-
-  getUserBorrowBalances(
-    _reserve: string,
-    _user: string
-  ): Promise<{
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-  }>;
-
-  getUserCurrentBorrowRateMode(
-    _reserve: string,
-    _user: string
-  ): Promise<number>;
-
-  getUserCurrentStableBorrowRate(
-    _reserve: string,
-    _user: string
-  ): Promise<BigNumber>;
-
-  getUserLastUpdate(_reserve: string, _user: string): Promise<BigNumber>;
-
-  getUserOriginationFee(_reserve: string, _user: string): Promise<BigNumber>;
-
-  getUserUnderlyingAssetBalance(
-    _reserve: string,
-    _user: string
-  ): Promise<BigNumber>;
-
-  getUserVariableBorrowCumulativeIndex(
-    _reserve: string,
-    _user: string
-  ): Promise<BigNumber>;
-
-  initReserve(
-    _reserve: string,
-    _aTokenAddress: string,
-    _decimals: BigNumberish,
-    _interestRateStrategyAddress: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  initialize(
-    _addressesProvider: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  isReserveBorrowingEnabled(_reserve: string): Promise<boolean>;
-
-  isReserveUsageAsCollateralEnabled(_reserve: string): Promise<boolean>;
-
-  isUserAllowedToBorrowAtStable(
-    _reserve: string,
-    _user: string,
-    _amount: BigNumberish
-  ): Promise<boolean>;
-
-  isUserUseReserveAsCollateralEnabled(
-    _reserve: string,
-    _user: string
-  ): Promise<boolean>;
-
-  lendingPoolAddress(): Promise<string>;
-
-  liquidateFee(
-    _token: string,
-    _amount: BigNumberish,
-    _destination: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  refreshConfiguration(
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  removeLastAddedReserve(
-    _reserveToRemove: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  reservesList(arg0: BigNumberish): Promise<string>;
-
-  setReserveBaseLTVasCollateral(
-    _reserve: string,
-    _ltv: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setReserveDecimals(
-    _reserve: string,
-    _decimals: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setReserveInterestRateStrategyAddress(
-    _reserve: string,
-    _rateStrategyAddress: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setReserveLiquidationBonus(
-    _reserve: string,
-    _bonus: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setReserveLiquidationThreshold(
-    _reserve: string,
-    _threshold: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setUserUseReserveAsCollateral(
-    _reserve: string,
-    _user: string,
-    _useAsCollateral: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferToFeeCollectionAddress(
-    _token: string,
-    _user: string,
-    _amount: BigNumberish,
-    _destination: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferToReserve(
-    _reserve: string,
-    _user: string,
-    _amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferToUser(
-    _reserve: string,
-    _user: string,
-    _amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  unfreezeReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnBorrow(
-    _reserve: string,
-    _user: string,
-    _amountBorrowed: BigNumberish,
-    _borrowFee: BigNumberish,
-    _rateMode: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnDeposit(
-    _reserve: string,
-    _user: string,
-    _amount: BigNumberish,
-    _isFirstDeposit: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnFlashLoan(
-    _reserve: string,
-    _availableLiquidityBefore: BigNumberish,
-    _income: BigNumberish,
-    _protocolFee: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnLiquidation(
-    _principalReserve: string,
-    _collateralReserve: string,
-    _user: string,
-    _amountToLiquidate: BigNumberish,
-    _collateralToLiquidate: BigNumberish,
-    _feeLiquidated: BigNumberish,
-    _liquidatedCollateralForFee: BigNumberish,
-    _balanceIncrease: BigNumberish,
-    _liquidatorReceivesAToken: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnRebalance(
-    _reserve: string,
-    _user: string,
-    _balanceIncrease: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnRedeem(
-    _reserve: string,
-    _user: string,
-    _amountRedeemed: BigNumberish,
-    _userRedeemedEverything: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnRepay(
-    _reserve: string,
-    _user: string,
-    _paybackAmountMinusFees: BigNumberish,
-    _originationFeeRepaid: BigNumberish,
-    _balanceIncrease: BigNumberish,
-    _repaidWholeLoan: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnSwapRate(
-    _reserve: string,
-    _user: string,
-    _principalBorrowBalance: BigNumberish,
-    _compoundedBorrowBalance: BigNumberish,
-    _balanceIncrease: BigNumberish,
-    _currentRateMode: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    ReserveDataUpdated(
-      reserve: string | null,
-      liquidityRate: null,
-      stableBorrowRate: null,
-      averageStableBorrowRate: null,
-      variableBorrowRate: null,
-      liquidityIndex: null,
-      variableBorrowIndex: null
-    ): EventFilter;
-
-    ReserveUpdated(
-      reserve: string | null,
-      liquidityRate: null,
-      stableBorrowRate: null,
-      variableBorrowRate: null,
-      liquidityIndex: null,
-      variableBorrowIndex: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    activateReserve(_reserve: string): Promise<BigNumber>;
-
-    addressesProvider(): Promise<BigNumber>;
-
-    deactivateReserve(_reserve: string): Promise<BigNumber>;
-
-    disableBorrowingOnReserve(_reserve: string): Promise<BigNumber>;
-
-    disableReserveAsCollateral(_reserve: string): Promise<BigNumber>;
-
-    disableReserveStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    enableBorrowingOnReserve(
-      _reserve: string,
-      _stableBorrowRateEnabled: boolean
-    ): Promise<BigNumber>;
-
-    enableReserveAsCollateral(
-      _reserve: string,
-      _baseLTVasCollateral: BigNumberish,
-      _liquidationThreshold: BigNumberish,
-      _liquidationBonus: BigNumberish
-    ): Promise<BigNumber>;
-
-    enableReserveStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    freezeReserve(_reserve: string): Promise<BigNumber>;
-
-    getReserveATokenAddress(_reserve: string): Promise<BigNumber>;
-
-    getReserveAvailableLiquidity(_reserve: string): Promise<BigNumber>;
-
-    getReserveConfiguration(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentAverageStableBorrowRate(
-      _reserve: string
-    ): Promise<BigNumber>;
-
-    getReserveCurrentLiquidityRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentVariableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveDecimals(_reserve: string): Promise<BigNumber>;
-
-    getReserveInterestRateStrategyAddress(_reserve: string): Promise<BigNumber>;
-
-    getReserveIsActive(_reserve: string): Promise<BigNumber>;
-
-    getReserveIsFreezed(_reserve: string): Promise<BigNumber>;
-
-    getReserveIsStableBorrowRateEnabled(_reserve: string): Promise<BigNumber>;
-
-    getReserveLastUpdate(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidationBonus(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidationThreshold(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidityCumulativeIndex(_reserve: string): Promise<BigNumber>;
-
-    getReserveNormalizedIncome(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrows(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrowsStable(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrowsVariable(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalLiquidity(_reserve: string): Promise<BigNumber>;
-
-    getReserveUtilizationRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveVariableBorrowsCumulativeIndex(
-      _reserve: string
-    ): Promise<BigNumber>;
-
-    getReserves(): Promise<BigNumber>;
-
-    getUserBasicReserveData(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserBorrowBalances(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserCurrentBorrowRateMode(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserCurrentStableBorrowRate(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserLastUpdate(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserOriginationFee(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserUnderlyingAssetBalance(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserVariableBorrowCumulativeIndex(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    initReserve(
-      _reserve: string,
-      _aTokenAddress: string,
-      _decimals: BigNumberish,
-      _interestRateStrategyAddress: string
-    ): Promise<BigNumber>;
-
-    initialize(_addressesProvider: string): Promise<BigNumber>;
-
-    isReserveBorrowingEnabled(_reserve: string): Promise<BigNumber>;
-
-    isReserveUsageAsCollateralEnabled(_reserve: string): Promise<BigNumber>;
-
-    isUserAllowedToBorrowAtStable(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<BigNumber>;
-
-    isUserUseReserveAsCollateralEnabled(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    lendingPoolAddress(): Promise<BigNumber>;
-
-    liquidateFee(
-      _token: string,
-      _amount: BigNumberish,
-      _destination: string
-    ): Promise<BigNumber>;
-
-    refreshConfiguration(): Promise<BigNumber>;
-
-    removeLastAddedReserve(_reserveToRemove: string): Promise<BigNumber>;
-
-    reservesList(arg0: BigNumberish): Promise<BigNumber>;
-
-    setReserveBaseLTVasCollateral(
-      _reserve: string,
-      _ltv: BigNumberish
-    ): Promise<BigNumber>;
-
-    setReserveDecimals(
-      _reserve: string,
-      _decimals: BigNumberish
-    ): Promise<BigNumber>;
-
-    setReserveInterestRateStrategyAddress(
-      _reserve: string,
-      _rateStrategyAddress: string
-    ): Promise<BigNumber>;
-
-    setReserveLiquidationBonus(
-      _reserve: string,
-      _bonus: BigNumberish
-    ): Promise<BigNumber>;
-
-    setReserveLiquidationThreshold(
-      _reserve: string,
-      _threshold: BigNumberish
-    ): Promise<BigNumber>;
-
-    setUserUseReserveAsCollateral(
-      _reserve: string,
-      _user: string,
-      _useAsCollateral: boolean
-    ): Promise<BigNumber>;
-
-    transferToFeeCollectionAddress(
-      _token: string,
-      _user: string,
-      _amount: BigNumberish,
-      _destination: string
-    ): Promise<BigNumber>;
-
-    transferToReserve(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<BigNumber>;
-
-    transferToUser(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<BigNumber>;
-
-    unfreezeReserve(_reserve: string): Promise<BigNumber>;
-
-    updateStateOnBorrow(
-      _reserve: string,
-      _user: string,
-      _amountBorrowed: BigNumberish,
-      _borrowFee: BigNumberish,
-      _rateMode: BigNumberish
-    ): Promise<BigNumber>;
-
-    updateStateOnDeposit(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish,
-      _isFirstDeposit: boolean
-    ): Promise<BigNumber>;
-
-    updateStateOnFlashLoan(
-      _reserve: string,
-      _availableLiquidityBefore: BigNumberish,
-      _income: BigNumberish,
-      _protocolFee: BigNumberish
-    ): Promise<BigNumber>;
-
-    updateStateOnLiquidation(
-      _principalReserve: string,
-      _collateralReserve: string,
-      _user: string,
-      _amountToLiquidate: BigNumberish,
-      _collateralToLiquidate: BigNumberish,
-      _feeLiquidated: BigNumberish,
-      _liquidatedCollateralForFee: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _liquidatorReceivesAToken: boolean
-    ): Promise<BigNumber>;
-
-    updateStateOnRebalance(
-      _reserve: string,
-      _user: string,
-      _balanceIncrease: BigNumberish
-    ): Promise<BigNumber>;
-
-    updateStateOnRedeem(
-      _reserve: string,
-      _user: string,
-      _amountRedeemed: BigNumberish,
-      _userRedeemedEverything: boolean
-    ): Promise<BigNumber>;
-
-    updateStateOnRepay(
-      _reserve: string,
-      _user: string,
-      _paybackAmountMinusFees: BigNumberish,
-      _originationFeeRepaid: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _repaidWholeLoan: boolean
-    ): Promise<BigNumber>;
-
-    updateStateOnSwapRate(
-      _reserve: string,
-      _user: string,
-      _principalBorrowBalance: BigNumberish,
-      _compoundedBorrowBalance: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _currentRateMode: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/LendingPoolCoreFactory.ts b/types/LendingPoolCoreFactory.ts
deleted file mode 100644
index bfa06307..00000000
--- a/types/LendingPoolCoreFactory.ts
+++ /dev/null
@@ -1,1698 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { LendingPoolCore } from "./LendingPoolCore";
-
-export class LendingPoolCoreFactory extends ContractFactory {
-  constructor(
-    linkLibraryAddresses: LendingPoolCoreLibraryAddresses,
-    signer?: Signer
-  ) {
-    super(
-      _abi,
-      LendingPoolCoreFactory.linkBytecode(linkLibraryAddresses),
-      signer
-    );
-  }
-
-  static linkBytecode(
-    linkLibraryAddresses: LendingPoolCoreLibraryAddresses
-  ): string {
-    let linkedBytecode = _bytecode;
-
-    linkedBytecode = linkedBytecode.replace(
-      new RegExp("__\\$2ec35834968386f54fa313129cf94664e4\\$__", "g"),
-      linkLibraryAddresses["__$2ec35834968386f54fa313129cf94664e4$__"]
-        .replace(/^0x/, "")
-        .toLowerCase()
-    );
-
-    return linkedBytecode;
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<LendingPoolCore> {
-    return super.deploy(overrides) as Promise<LendingPoolCore>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): LendingPoolCore {
-    return super.attach(address) as LendingPoolCore;
-  }
-  connect(signer: Signer): LendingPoolCoreFactory {
-    return super.connect(signer) as LendingPoolCoreFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): LendingPoolCore {
-    return new Contract(address, _abi, signerOrProvider) as LendingPoolCore;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "reserve",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "liquidityRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "stableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "averageStableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "variableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "liquidityIndex",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "variableBorrowIndex",
-        type: "uint256"
-      }
-    ],
-    name: "ReserveDataUpdated",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "reserve",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "liquidityRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "stableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "variableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "liquidityIndex",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "variableBorrowIndex",
-        type: "uint256"
-      }
-    ],
-    name: "ReserveUpdated",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "activateReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "addressesProvider",
-    outputs: [
-      {
-        internalType: "contract LendingPoolAddressesProvider",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "deactivateReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "disableBorrowingOnReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "disableReserveAsCollateral",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "disableReserveStableBorrowRate",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "bool",
-        name: "_stableBorrowRateEnabled",
-        type: "bool"
-      }
-    ],
-    name: "enableBorrowingOnReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_baseLTVasCollateral",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_liquidationThreshold",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_liquidationBonus",
-        type: "uint256"
-      }
-    ],
-    name: "enableReserveAsCollateral",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "enableReserveStableBorrowRate",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "freezeReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveATokenAddress",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveAvailableLiquidity",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveConfiguration",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveCurrentAverageStableBorrowRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveCurrentLiquidityRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveCurrentStableBorrowRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveCurrentVariableBorrowRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveDecimals",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveInterestRateStrategyAddress",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveIsActive",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveIsFreezed",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveIsStableBorrowRateEnabled",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveLastUpdate",
-    outputs: [
-      {
-        internalType: "uint40",
-        name: "timestamp",
-        type: "uint40"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveLiquidationBonus",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveLiquidationThreshold",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveLiquidityCumulativeIndex",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveNormalizedIncome",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveTotalBorrows",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveTotalBorrowsStable",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveTotalBorrowsVariable",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveTotalLiquidity",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveUtilizationRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveVariableBorrowsCumulativeIndex",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "getReserves",
-    outputs: [
-      {
-        internalType: "address[]",
-        name: "",
-        type: "address[]"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserBasicReserveData",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserBorrowBalances",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserCurrentBorrowRateMode",
-    outputs: [
-      {
-        internalType: "enum CoreLibrary.InterestRateMode",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserCurrentStableBorrowRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserLastUpdate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserOriginationFee",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserUnderlyingAssetBalance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserVariableBorrowCumulativeIndex",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_aTokenAddress",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_decimals",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "_interestRateStrategyAddress",
-        type: "address"
-      }
-    ],
-    name: "initReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract LendingPoolAddressesProvider",
-        name: "_addressesProvider",
-        type: "address"
-      }
-    ],
-    name: "initialize",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "isReserveBorrowingEnabled",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "isReserveUsageAsCollateralEnabled",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      }
-    ],
-    name: "isUserAllowedToBorrowAtStable",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "isUserUseReserveAsCollateralEnabled",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "lendingPoolAddress",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_token",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "_destination",
-        type: "address"
-      }
-    ],
-    name: "liquidateFee",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "refreshConfiguration",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserveToRemove",
-        type: "address"
-      }
-    ],
-    name: "removeLastAddedReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    name: "reservesList",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_ltv",
-        type: "uint256"
-      }
-    ],
-    name: "setReserveBaseLTVasCollateral",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_decimals",
-        type: "uint256"
-      }
-    ],
-    name: "setReserveDecimals",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_rateStrategyAddress",
-        type: "address"
-      }
-    ],
-    name: "setReserveInterestRateStrategyAddress",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_bonus",
-        type: "uint256"
-      }
-    ],
-    name: "setReserveLiquidationBonus",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_threshold",
-        type: "uint256"
-      }
-    ],
-    name: "setReserveLiquidationThreshold",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "bool",
-        name: "_useAsCollateral",
-        type: "bool"
-      }
-    ],
-    name: "setUserUseReserveAsCollateral",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_token",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "_destination",
-        type: "address"
-      }
-    ],
-    name: "transferToFeeCollectionAddress",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address payable",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferToReserve",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address payable",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferToUser",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "unfreezeReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amountBorrowed",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_borrowFee",
-        type: "uint256"
-      },
-      {
-        internalType: "enum CoreLibrary.InterestRateMode",
-        name: "_rateMode",
-        type: "uint8"
-      }
-    ],
-    name: "updateStateOnBorrow",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "_isFirstDeposit",
-        type: "bool"
-      }
-    ],
-    name: "updateStateOnDeposit",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_availableLiquidityBefore",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_income",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_protocolFee",
-        type: "uint256"
-      }
-    ],
-    name: "updateStateOnFlashLoan",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_principalReserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_collateralReserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amountToLiquidate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_collateralToLiquidate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_feeLiquidated",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_liquidatedCollateralForFee",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_balanceIncrease",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "_liquidatorReceivesAToken",
-        type: "bool"
-      }
-    ],
-    name: "updateStateOnLiquidation",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_balanceIncrease",
-        type: "uint256"
-      }
-    ],
-    name: "updateStateOnRebalance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amountRedeemed",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "_userRedeemedEverything",
-        type: "bool"
-      }
-    ],
-    name: "updateStateOnRedeem",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_paybackAmountMinusFees",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_originationFeeRepaid",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_balanceIncrease",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "_repaidWholeLoan",
-        type: "bool"
-      }
-    ],
-    name: "updateStateOnRepay",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_principalBorrowBalance",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_compoundedBorrowBalance",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_balanceIncrease",
-        type: "uint256"
-      },
-      {
-        internalType: "enum CoreLibrary.InterestRateMode",
-        name: "_currentRateMode",
-        type: "uint8"
-      }
-    ],
-    name: "updateStateOnSwapRate",
-    outputs: [
-      {
-        internalType: "enum CoreLibrary.InterestRateMode",
-        name: "",
-        type: "uint8"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    stateMutability: "payable",
-    type: "receive"
-  }
-];
-
-const _bytecode =
-  "0x60806040526000805534801561001457600080fd5b506158c180620000256000396000f3fe6080604052600436106104145760003560e01c8063a2353fdc1161021e578063d15e005311610123578063e8ae2f5b116100ab578063f61483111161007a578063f6148311146113ad578063f6ea8d7614611431578063fa51854c1461146c578063fa93b2a5146114b1578063feab31ac146114f45761045f565b8063e8ae2f5b146112d9578063eede87c11461130c578063ef1f937314611347578063f054ab461461137a5761045f565b8063dae4c4e7116100f2578063dae4c4e7146111c2578063e10076ad146111f5578063e2174d8614611230578063e240301914611273578063e6d18190146112a65761045f565b8063d15e0053146110ea578063d3ae26b31461111d578063d466016f14611132578063da12d96f1461116b5761045f565b8063bd7fd79a116101a6578063c540148e11610175578063c540148e14611000578063c72c4d1014611033578063c76a6c9c14611048578063c7d142371461107b578063d06e2ec1146110b75761045f565b8063bd7fd79a14610f34578063bfacad8414610f67578063c33cfd9014610f9a578063c4d66de814610fcd5761045f565b8063afcdbea3116101ed578063afcdbea314610e05578063b701d09314610e50578063b75d6f3414610e83578063b8c0f74514610eb6578063bcd6ffa414610ee95761045f565b8063a2353fdc14610d17578063a5bc826c14610d4a578063a8dc0f4514610d8f578063af825b0714610dc25761045f565b80635cf2e656116103245780637aca76eb116102ac578063906c0a411161027b578063906c0a4114610bea57806398bd473714610c1d5780639e3c4f3b14610c505780639e67484814610c8b5780639fb8afcd14610cbe5761045f565b80637aca76eb14610b1b5780637f90fec514610b4e57806388079d8814610b815780638f385c2214610bb45761045f565b806366d103f3116102f357806366d103f3146109ce57806368beb4d614610a095780636ae1441614610a745780636fffab0c14610aa757806370fb84f414610ae25761045f565b80635cf2e656146108f25780635fc526ff14610925578063646810831461098057806366bbd928146109955761045f565b80633443a14b116103a757806345330a401161037657806345330a40146107cc57806346bc0f28146108155780634a08accb146108485780634f1446091461087b5780634fe7a6e5146108c85761045f565b80633443a14b146106a557806334b3beee146106de57806337ac6fe41461072d5780633e72a454146107995761045f565b806318f9bbae116103e357806318f9bbae146105a25780631ca19f19146105d55780631d2118f91461063457806328fcf4d31461066f5761045f565b806305075d6e146104645780630902f1ac146104ab57806309ac29531461051057806318a4dbca146105555761045f565b3661045f576104223361152f565b61045d5760405162461bcd60e51b81526004018080602001828103825260368152602001806155f06036913960400191505060405180910390fd5b005b600080fd5b34801561047057600080fd5b506104976004803603602081101561048757600080fd5b50356001600160a01b031661156d565b604080519115158252519081900360200190f35b3480156104b757600080fd5b506104c0611595565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156104fc5781810151838201526020016104e4565b505050509050019250505060405180910390f35b34801561051c57600080fd5b5061045d6004803603608081101561053357600080fd5b506001600160a01b0381351690602081013590604081013590606001356115f7565b34801561056157600080fd5b506105906004803603604081101561057857600080fd5b506001600160a01b03813581169160200135166116c5565b60408051918252519081900360200190f35b3480156105ae57600080fd5b50610497600480360360208110156105c557600080fd5b50356001600160a01b0316611758565b3480156105e157600080fd5b50610610600480360360408110156105f857600080fd5b506001600160a01b0381358116916020013516611780565b6040518082600281111561062057fe5b60ff16815260200191505060405180910390f35b34801561064057600080fd5b5061045d6004803603604081101561065757600080fd5b506001600160a01b03813581169160200135166117d5565b61045d6004803603606081101561068557600080fd5b506001600160a01b038135811691602081013590911690604001356118bb565b3480156106b157600080fd5b5061045d600480360360408110156106c857600080fd5b506001600160a01b038135169060200135611a86565b3480156106ea57600080fd5b506107116004803603602081101561070157600080fd5b50356001600160a01b0316611b5a565b604080516001600160a01b039092168252519081900360200190f35b34801561073957600080fd5b50610780600480360360a081101561075057600080fd5b5080356001600160a01b03908116916020810135909116906040810135906060810135906080013560ff16611b7b565b6040805192835260208301919091528051918290030190f35b3480156107a557600080fd5b5061045d600480360360208110156107bc57600080fd5b50356001600160a01b0316611c1b565b3480156107d857600080fd5b5061045d600480360360808110156107ef57600080fd5b506001600160a01b03813581169160208101358216916040820135916060013516611cf7565b34801561082157600080fd5b506105906004803603602081101561083857600080fd5b50356001600160a01b0316611e51565b34801561085457600080fd5b506104976004803603602081101561086b57600080fd5b50356001600160a01b0316611e6f565b34801561088757600080fd5b506108ae6004803603602081101561089e57600080fd5b50356001600160a01b0316611e97565b6040805164ffffffffff9092168252519081900360200190f35b3480156108d457600080fd5b50610711600480360360208110156108eb57600080fd5b5035611ec3565b3480156108fe57600080fd5b506104976004803603602081101561091557600080fd5b50356001600160a01b0316611eea565b34801561093157600080fd5b506109586004803603602081101561094857600080fd5b50356001600160a01b0316611f12565b6040805194855260208501939093528383019190915215156060830152519081900360800190f35b34801561098c57600080fd5b5061045d611f50565b3480156109a157600080fd5b5061045d600480360360408110156109b857600080fd5b506001600160a01b03813516906020013561200f565b3480156109da57600080fd5b50610590600480360360408110156109f157600080fd5b506001600160a01b03813581169160200135166120e3565b348015610a1557600080fd5b5061045d6004803603610120811015610a2d57600080fd5b506001600160a01b03813581169160208101358216916040820135169060608101359060808101359060a08101359060c08101359060e08101359061010001351515612119565b348015610a8057600080fd5b5061071160048036036020811015610a9757600080fd5b50356001600160a01b03166121bb565b348015610ab357600080fd5b5061059060048036036040811015610aca57600080fd5b506001600160a01b03813581169160200135166121dc565b348015610aee57600080fd5b5061045d60048036036040811015610b0557600080fd5b506001600160a01b03813516906020013561220b565b348015610b2757600080fd5b5061045d60048036036020811015610b3e57600080fd5b50356001600160a01b03166122df565b348015610b5a57600080fd5b5061059060048036036020811015610b7157600080fd5b50356001600160a01b03166123c1565b348015610b8d57600080fd5b5061059060048036036020811015610ba457600080fd5b50356001600160a01b03166123df565b61045d60048036036060811015610bca57600080fd5b506001600160a01b03813581169160208101359160409091013516612507565b348015610bf657600080fd5b5061059060048036036020811015610c0d57600080fd5b50356001600160a01b031661261d565b348015610c2957600080fd5b5061059060048036036020811015610c4057600080fd5b50356001600160a01b03166126cd565b348015610c5c57600080fd5b5061049760048036036040811015610c7357600080fd5b506001600160a01b03813581169160200135166126eb565b348015610c9757600080fd5b5061049760048036036020811015610cae57600080fd5b50356001600160a01b0316612724565b348015610cca57600080fd5b50610cf960048036036040811015610ce157600080fd5b506001600160a01b038135811691602001351661274c565b60408051938452602084019290925282820152519081900360600190f35b348015610d2357600080fd5b5061059060048036036020811015610d3a57600080fd5b50356001600160a01b03166127d7565b348015610d5657600080fd5b5061045d60048036036080811015610d6d57600080fd5b506001600160a01b0381351690602081013590604081013590606001356127f5565b348015610d9b57600080fd5b5061045d60048036036020811015610db257600080fd5b50356001600160a01b0316612943565b348015610dce57600080fd5b5061059060048036036060811015610de557600080fd5b506001600160a01b03813581169160208101359091169060400135612a72565b348015610e1157600080fd5b5061045d60048036036080811015610e2857600080fd5b506001600160a01b038135811691602081013590911690604081013590606001351515612b12565b348015610e5c57600080fd5b5061059060048036036020811015610e7357600080fd5b50356001600160a01b0316612b9a565b348015610e8f57600080fd5b5061045d60048036036020811015610ea657600080fd5b50356001600160a01b0316612bb8565b348015610ec257600080fd5b5061045d60048036036020811015610ed957600080fd5b50356001600160a01b0316612ceb565b348015610ef557600080fd5b5061045d60048036036080811015610f0c57600080fd5b506001600160a01b038135811691602081013590911690604081013590606001351515612dc7565b348015610f4057600080fd5b5061059060048036036020811015610f5757600080fd5b50356001600160a01b0316612e4f565b348015610f7357600080fd5b5061059060048036036020811015610f8a57600080fd5b50356001600160a01b0316612e6a565b348015610fa657600080fd5b5061059060048036036020811015610fbd57600080fd5b50356001600160a01b0316612ed4565b348015610fd957600080fd5b5061045d60048036036020811015610ff057600080fd5b50356001600160a01b0316612f0d565b34801561100c57600080fd5b506105906004803603602081101561102357600080fd5b50356001600160a01b0316612fcc565b34801561103f57600080fd5b50610711612fea565b34801561105457600080fd5b506105906004803603602081101561106b57600080fd5b50356001600160a01b0316612ff9565b61045d6004803603608081101561109157600080fd5b506001600160a01b03813581169160208101358216916040820135916060013516613017565b3480156110c357600080fd5b5061045d600480360360208110156110da57600080fd5b50356001600160a01b03166131c9565b3480156110f657600080fd5b506105906004803603602081101561110d57600080fd5b50356001600160a01b03166133ce565b34801561112957600080fd5b506107116133ef565b34801561113e57600080fd5b5061045d6004803603604081101561115557600080fd5b506001600160a01b0381351690602001356133fe565b34801561117757600080fd5b5061045d600480360360c081101561118e57600080fd5b506001600160a01b03813581169160208101359091169060408101359060608101359060808101359060a0013515156134d2565b3480156111ce57600080fd5b5061045d600480360360208110156111e557600080fd5b50356001600160a01b0316613541565b34801561120157600080fd5b506109586004803603604081101561121857600080fd5b506001600160a01b0381358116916020013516613623565b34801561123c57600080fd5b506104976004803603606081101561125357600080fd5b506001600160a01b038135811691602081013590911690604001356136d0565b34801561127f57600080fd5b506105906004803603602081101561129657600080fd5b50356001600160a01b0316613766565b3480156112b257600080fd5b50610590600480360360208110156112c957600080fd5b50356001600160a01b031661380a565b3480156112e557600080fd5b5061045d600480360360208110156112fc57600080fd5b50356001600160a01b031661382b565b34801561131857600080fd5b5061045d6004803603604081101561132f57600080fd5b506001600160a01b0381351690602001351515613946565b34801561135357600080fd5b5061045d6004803603602081101561136a57600080fd5b50356001600160a01b0316613a7d565b34801561138657600080fd5b506105906004803603602081101561139d57600080fd5b50356001600160a01b0316613b59565b3480156113b957600080fd5b50611406600480360360c08110156113d057600080fd5b5080356001600160a01b039081169160208101359091169060408101359060608101359060808101359060a0013560ff16613b77565b6040518083600281111561141657fe5b60ff1681526020018281526020019250505060405180910390f35b34801561143d57600080fd5b506105906004803603604081101561145457600080fd5b506001600160a01b0381358116916020013516613c09565b34801561147857600080fd5b5061045d6004803603606081101561148f57600080fd5b506001600160a01b038135811691602081013590911690604001351515613c38565b3480156114bd57600080fd5b5061045d600480360360608110156114d457600080fd5b506001600160a01b03813581169160208101359091169060400135613cca565b34801561150057600080fd5b506105906004803603604081101561151757600080fd5b506001600160a01b0381358116916020013516613df1565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47081811480159061156357508115155b925050505b919050565b6001600160a01b03166000908152603660205260409020600d0154600160e01b900460ff1690565b606060388054806020026020016040519081016040528092919081815260200182805480156115ed57602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116115cf575b5050505050905090565b6034546001600160a01b031633146116405760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b61164a8482613e20565b6001600160a01b038416600090815260366020526040902061166b90613f5d565b60006116866116798661380a565b859063ffffffff613ff516565b6001600160a01b03861660009081526036602052604090209091506116b290828563ffffffff61404f16565b6116be858460006140ad565b5050505050565b6001600160a01b038083166000908152603660209081526040808320600c015481516370a0823160e01b8152868616600482015291519394169283926370a082319260248082019391829003018186803b15801561172257600080fd5b505afa158015611736573d6000803e3d6000fd5b505050506040513d602081101561174c57600080fd5b50519150505b92915050565b6001600160a01b03166000908152603660205260409020600d0154600160d01b900460ff1690565b6001600160a01b038082166000908152603760209081526040808320938616835292905290812080546117b7576000915050611752565b60008160030154116117ca5760026117cd565b60015b949350505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561181957600080fd5b505afa15801561182d573d6000803e3d6000fd5b505050506040513d602081101561184357600080fd5b50516001600160a01b03161461188a5760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b039182166000908152603660205260409020600d0180546001600160a01b03191691909216179055565b6034546001600160a01b031633146119045760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b61190c614252565b6001600160a01b0316836001600160a01b0316146119815734156119615760405162461bcd60e51b81526004018080602001828103825260328152602001806156866032913960400191505060405180910390fd5b61197c6001600160a01b03841683308463ffffffff61426a16565b611a81565b803410156119c05760405162461bcd60e51b81526004018080602001828103825260358152602001806155bb6035913960400191505060405180910390fd5b80341115611a815760006119da348363ffffffff6142c416565b6040519091506000906001600160a01b0385169061c35090859084818181858888f193505050503d8060008114611a2d576040519150601f19603f3d011682016040523d82523d6000602084013e611a32565b606091505b50509050806116be576040805162461bcd60e51b8152602060048201526016602482015275151c985b9cd9995c881bd9881155120819985a5b195960521b604482015290519081900360640190fd5b505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015611aca57600080fd5b505afa158015611ade573d6000803e3d6000fd5b505050506040513d6020811015611af457600080fd5b50516001600160a01b031614611b3b5760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b03909116600090815260366020526040902060090155565b6001600160a01b039081166000908152603660205260409020600c01541690565b60345460009081906001600160a01b03163314611bc95760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b600080611bd6898961274c565b9250509150611be9898984848b8a614306565b611bf7898989848a8a614335565b611c03896000896140ad565b611c0d898961445a565b999098509650505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015611c5f57600080fd5b505afa158015611c73573d6000803e3d6000fd5b505050506040513d6020811015611c8957600080fd5b50516001600160a01b031614611cd05760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60e01b19169055565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015611d3b57600080fd5b505afa158015611d4f573d6000803e3d6000fd5b505050506040513d6020811015611d6557600080fd5b50516001600160a01b031614611dac5760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b0380851660009081526036602052604080822081516304dda73560e21b8152600481019190915286841660248201526044810186905292841660648401525173__$2ec35834968386f54fa313129cf94664e4$__926313769cd4926084808301939192829003018186803b158015611e2a57600080fd5b505af4158015611e3e573d6000803e3d6000fd5b50505050611e4b846144ec565b50505050565b6001600160a01b031660009081526036602052604090206006015490565b6001600160a01b03166000908152603660205260409020600d0154600160e81b900460ff1690565b6001600160a01b03166000908152603660205260409020600d0154600160a01b900464ffffffffff1690565b60388181548110611ed057fe5b6000918252602090912001546001600160a01b0316905081565b6001600160a01b03166000908152603660205260409020600d0154600160c81b900460ff1690565b6001600160a01b03166000908152603660205260409020600b81015460088201546009830154600d909301549193909291600160d01b900460ff1690565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015611f9457600080fd5b505afa158015611fa8573d6000803e3d6000fd5b505050506040513d6020811015611fbe57600080fd5b50516001600160a01b0316146120055760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b61200d614590565b565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561205357600080fd5b505afa158015612067573d6000803e3d6000fd5b505050506040513d602081101561207d57600080fd5b50516001600160a01b0316146120c45760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b039091166000908152603660205260409020600b0155565b6001600160a01b0390811660009081526037602090815260408083209490931682529290925290206004015464ffffffffff1690565b6034546001600160a01b031633146121625760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b61216e8988888561462b565b612177886146e4565b6121848988888786614708565b612190898760006140ad565b806121b0576121b08860006121ab888763ffffffff613ff516565b6140ad565b505050505050505050565b6001600160a01b039081166000908152603660205260409020600d01541690565b6001600160a01b0380821660009081526037602090815260408083209386168352929052206003015492915050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561224f57600080fd5b505afa158015612263573d6000803e3d6000fd5b505050506040513d602081101561227957600080fd5b50516001600160a01b0316146122c05760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b039091166000908152603660205260409020600a0155565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561232357600080fd5b505afa158015612337573d6000803e3d6000fd5b505050506040513d602081101561234d57600080fd5b50516001600160a01b0316146123945760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60e81b1916600160e81b179055565b6001600160a01b031660009081526036602052604090206002015490565b6001600160a01b0380821660009081526036602090815260408083206035548251631b0c55dd60e11b815292519495919486949190921692633618abba9260048083019392829003018186803b15801561243857600080fd5b505afa15801561244c573d6000803e3d6000fd5b505050506040513d602081101561246257600080fd5b505160058301549091506124fc57806001600160a01b031663bb85c0bb856040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156124c657600080fd5b505afa1580156124da573d6000803e3d6000fd5b505050506040513d60208110156124f057600080fd5b50519250611568915050565b506005015492915050565b6034546001600160a01b031633146125505760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b80341561258e5760405162461bcd60e51b81526004018080602001828103825260368152602001806155356036913960400191505060405180910390fd5b612596614252565b6001600160a01b0316846001600160a01b0316146125cd576125c86001600160a01b038516828563ffffffff6147ba16565b611e4b565b6040516000906001600160a01b0383169061c35090869084818181858888f193505050503d8060008114611a2d576040519150601f19603f3d011682016040523d82523d6000602084013e611a32565b6001600160a01b038116600090815260366020526040812060048101546126c35780600d0160009054906101000a90046001600160a01b03166001600160a01b03166334762ca56040518163ffffffff1660e01b815260040160206040518083038186803b15801561268e57600080fd5b505afa1580156126a2573d6000803e3d6000fd5b505050506040513d60208110156126b857600080fd5b505191506115689050565b6004015492915050565b6001600160a01b031660009081526036602052604090206003015490565b6001600160a01b03908116600090815260376020908152604080832094909316825292909252902060040154600160281b900460ff1690565b6001600160a01b03166000908152603660205260409020600d0154600160d81b900460ff1690565b6001600160a01b038082166000908152603760209081526040808320938616835292905290812080548291829161278d5750600092508291508190506127d0565b80546001600160a01b03871660009081526036602052604081206127b290849061480c565b905081816127c6818363ffffffff6142c416565b9550955095505050505b9250925092565b6001600160a01b03166000908152603660205260409020600b015490565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561283957600080fd5b505afa15801561284d573d6000803e3d6000fd5b505050506040513d602081101561286357600080fd5b50516001600160a01b0316146128aa5760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b038416600090815260366020526040808220815163126ee27360e11b81526004810191909152602481018690526044810185905260648101849052905173__$2ec35834968386f54fa313129cf94664e4$__926324ddc4e69260848082019391829003018186803b15801561292557600080fd5b505af4158015612939573d6000803e3d6000fd5b5050505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561298757600080fd5b505afa15801561299b573d6000803e3d6000fd5b505050506040513d60208110156129b157600080fd5b50516001600160a01b0316146129f85760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b03811660009081526036602052604080822081516372efab5360e11b81526004810191909152905173__$2ec35834968386f54fa313129cf94664e4$__9263e5df56a69260248082019391829003018186803b158015612a5e57600080fd5b505af41580156116be573d6000803e3d6000fd5b6034546000906001600160a01b03163314612abe5760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b612ac98484846148fe565b612ad484848461494e565b612ae0846000806140ad565b506001600160a01b038083166000908152603760209081526040808320938716835292905220600301545b9392505050565b6034546001600160a01b03163314612b5b5760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b6001600160a01b0384166000908152603660205260409020612b7c90613f5d565b612b88846000846140ad565b8015611e4b57611e4b84846000613c38565b6001600160a01b031660009081526036602052604090206007015490565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612bfc57600080fd5b505afa158015612c10573d6000803e3d6000fd5b505050506040513d6020811015612c2657600080fd5b50516001600160a01b031614612c6d5760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b0381166000908152603660205260409020805415801590612c99575060008160070154115b612cd45760405162461bcd60e51b815260040180806020018281038252602481526020018061577e6024913960400191505060405180910390fd5b600d01805460ff60e01b1916600160e01b17905550565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612d2f57600080fd5b505afa158015612d43573d6000803e3d6000fd5b505050506040513d6020811015612d5957600080fd5b50516001600160a01b031614612da05760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60d81b19169055565b6034546001600160a01b03163314612e105760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b6001600160a01b0384166000908152603660205260409020612e3190613f5d565b612e3d848360006140ad565b8015611e4b57611e4b84846001613c38565b6001600160a01b031660009081526036602052604090205490565b6001600160a01b038116600090815260366020526040812081612e8c826149b7565b905080612e9e57600092505050611568565b6000612ea985613766565b9050612ecb612ebe828463ffffffff613ff516565b839063ffffffff6149d416565b95945050505050565b6001600160a01b0381166000908152603660205260408120612b0b612ef8826149b7565b612f0185613766565b9063ffffffff613ff516565b6000612f17614a10565b60015490915060ff1680612f2e5750612f2e614a15565b80612f3a575060005481115b612f755760405162461bcd60e51b815260040180806020018281038252602e8152602001806157e7602e913960400191505060405180910390fd5b60015460ff16158015612f94576001805460ff19168117905560008290555b603580546001600160a01b0319166001600160a01b038516179055612fb7614590565b8015611a81576001805460ff19169055505050565b6001600160a01b031660009081526036602052604090206001015490565b6035546001600160a01b031681565b6001600160a01b03166000908152603660205260409020600a015490565b6034546001600160a01b031633146130605760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b80613069614252565b6001600160a01b0316856001600160a01b0316146130de5734156130be5760405162461bcd60e51b815260040180806020018281038252605f8152602001806156b8605f913960600191505060405180910390fd5b6130d96001600160a01b03861685838663ffffffff61426a16565b6116be565b8234101561311d5760405162461bcd60e51b81526004018080602001828103825260358152602001806155bb6035913960400191505060405180910390fd5b6040516000906001600160a01b0383169061c35090869084818181858888f193505050503d806000811461316d576040519150601f19603f3d011682016040523d82523d6000602084013e613172565b606091505b50509050806131c1576040805162461bcd60e51b8152602060048201526016602482015275151c985b9cd9995c881bd9881155120819985a5b195960521b604482015290519081900360640190fd5b505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561320d57600080fd5b505afa158015613221573d6000803e3d6000fd5b505050506040513d602081101561323757600080fd5b50516001600160a01b03161461327e5760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6038805460009190600019810190811061329457fe5b6000918252602090912001546001600160a01b039081169150821681146132ec5760405162461bcd60e51b815260040180806020018281038252603d815260200180615649603d913960400191505060405180910390fd5b6132f58161380a565b156133315760405162461bcd60e51b81526004018080602001828103825260308152602001806157176030913960400191505060405180910390fd5b6001600160a01b0381166000908152603660205260408120600d81018054600c830180546001600160a01b0319169055600b8301849055838355600783018490556008830184905560098301849055600a90920192909255600168ff00ffff000000000160a01b031916905560388054806133a857fe5b600082815260209020810160001990810180546001600160a01b03191690550190555050565b6001600160a01b0381166000908152603660205260408120612b0b81614a1b565b6034546001600160a01b031681565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561344257600080fd5b505afa158015613456573d6000803e3d6000fd5b505050506040513d602081101561346c57600080fd5b50516001600160a01b0316146134b35760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b03909116600090815260366020526040902060080155565b6034546001600160a01b0316331461351b5760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b61352786868685614a49565b613535868686868686614ab0565b6131c1868560006140ad565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561358557600080fd5b505afa158015613599573d6000803e3d6000fd5b505050506040513d60208110156135af57600080fd5b50516001600160a01b0316146135f65760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60d81b1916600160d81b179055565b6001600160a01b03808316600081815260366020908152604080832094861683526037825280832093835292905290812090918291829182918261366789896116c5565b8254909150613694576004909101549095506000945084935060ff600160281b9091041691506136c79050565b806136a5838563ffffffff61480c16565b6002840154600490940154919850965091945050600160281b900460ff169150505b92959194509250565b6001600160a01b038381166000818152603660209081526040808320948716835260378252808320938352929052908120600d830154919291600160d81b900460ff1661372257600092505050612b0b565b6004810154600160281b900460ff1615806137495750600d820154600160d01b900460ff16155b8061375c575061375986866116c5565b84115b9695505050505050565b600080613771614252565b6001600160a01b0316836001600160a01b03161415613791575047611752565b604080516370a0823160e01b815230600482015290516001600160a01b038516916370a08231916024808301926020929190829003018186803b1580156137d757600080fd5b505afa1580156137eb573d6000803e3d6000fd5b505050506040513d602081101561380157600080fd5b50519392505050565b6001600160a01b0381166000908152603660205260408120611752906149b7565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561386f57600080fd5b505afa158015613883573d6000803e3d6000fd5b505050506040513d602081101561389957600080fd5b50516001600160a01b0316146138e05760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b038116600090815260366020526040808220815163041e0b2d60e51b81526004810191909152905173__$2ec35834968386f54fa313129cf94664e4$__926383c165a09260248082019391829003018186803b158015612a5e57600080fd5b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561398a57600080fd5b505afa15801561399e573d6000803e3d6000fd5b505050506040513d60208110156139b457600080fd5b50516001600160a01b0316146139fb5760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b0382166000908152603660205260408082208151637b1dd5df60e11b815260048101919091528315156024820152905173__$2ec35834968386f54fa313129cf94664e4$__9263f63babbe9260448082019391829003018186803b158015613a6957600080fd5b505af41580156131c1573d6000803e3d6000fd5b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015613ac157600080fd5b505afa158015613ad5573d6000803e3d6000fd5b505050506040513d6020811015613aeb57600080fd5b50516001600160a01b031614613b325760405162461bcd60e51b81526004018080602001828103825260378152602001806157476037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60e81b19169055565b6001600160a01b031660009081526036602052604090206009015490565b60345460009081906001600160a01b03163314613bc55760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b613bd28888888887614b2d565b6000613be089898787614c2c565b9050613bee896000806140ad565b80613bf98a8a61445a565b9250925050965096945050505050565b6001600160a01b0380821660009081526037602090815260408083209386168352929052206001015492915050565b6034546001600160a01b03163314613c815760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b6001600160a01b0391821660009081526037602090815260408083209590941682529390935291206004018054911515600160281b0265ff000000000019909216919091179055565b6034546001600160a01b03163314613d135760405162461bcd60e51b815260040180806020018281038252602a815260200180615815602a913960400191505060405180910390fd5b613d1b614252565b6001600160a01b0316836001600160a01b031614613d4d5761197c6001600160a01b038416838363ffffffff6147ba16565b6040516000906001600160a01b0384169061c35090849084818181858888f193505050503d8060008114613d9d576040519150601f19603f3d011682016040523d82523d6000602084013e613da2565b606091505b5050905080611e4b576040805162461bcd60e51b8152602060048201526016602482015275151c985b9cd9995c881bd9881155120819985a5b195960521b604482015290519081900360640190fd5b6001600160a01b0380821660009081526037602090815260408083209386168352929052206002015492915050565b60355460408051637744894b60e11b815290516000926001600160a01b03169163ee891296916004808301926020929190829003018186803b158015613e6557600080fd5b505afa158015613e79573d6000803e3d6000fd5b505050506040513d6020811015613e8f57600080fd5b50519050613e9b614252565b6001600160a01b0316836001600160a01b031614613ecd5761197c6001600160a01b038416828463ffffffff6147ba16565b6040516000906001600160a01b0383169084908381818185875af1925050503d8060008114613f18576040519150601f19603f3d011682016040523d82523d6000602084013e613f1d565b606091505b5050905080611e4b5760405162461bcd60e51b81526004018080602001828103825260248152602001806157c36024913960400191505060405180910390fd5b6000613f68826149b7565b90508015613ff1576001820154600d830154600091613f9491600160a01b900464ffffffffff16614d2a565b8354909150613faa90829063ffffffff614d7516565b83556004830154600d840154600091613fd091600160a01b900464ffffffffff16614dad565b9050613fe9846007015482614d7590919063ffffffff16565b600785015550505b5050565b600082820183811015612b0b576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600061407261405d84614dfc565b61406684614dfc565b9063ffffffff6149d416565b9050600061408e614081614e12565b839063ffffffff613ff516565b85549091506140a490829063ffffffff614d7516565b90945550505050565b6001600160a01b0380841660009081526036602052604081206006810154600d820154919390929182918291166357e37af0896140fd896140f18c612f0185613766565b9063ffffffff6142c416565b88600201548960030154896040518663ffffffff1660e01b815260040180866001600160a01b03166001600160a01b031681526020018581526020018481526020018381526020018281526020019550505050505060606040518083038186803b15801561416a57600080fd5b505afa15801561417e573d6000803e3d6000fd5b505050506040513d606081101561419457600080fd5b50805160208083015160409384015160018a0184905560058a0182905560048a01819055600d8a01805464ffffffffff4216600160a01b0264ffffffffff60a01b19909116179055895460078b015486518681529485018490528487018b905260608501839052608085019190915260a0840152935192965094509192506001600160a01b038a16917f131cf1f61e39fd78f61f07d78533f5b6c13629c80ef6965983e92c72efbaa4a4919081900360c00190a25050505050505050565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee90565b604080516001600160a01b0380861660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b179052611e4b908590614e22565b6000612b0b83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250614fda565b6001600160a01b038616600090815260366020526040902061432790613f5d565b6131c1868686868686615071565b6001600160a01b038087166000818152603660209081526040808320948a1683526037825280832093835292905220600183600281111561437257fe5b141561438e576005820154600382015560006001820155614405565b600283600281111561439c57fe5b14156143b8576000600382015560078201546001820155614405565b6040805162461bcd60e51b815260206004820152601860248201527f496e76616c696420626f72726f772072617465206d6f64650000000000000000604482015290519081900360640190fd5b805461441d908690612f01908963ffffffff613ff516565b81556002810154614434908563ffffffff613ff516565b6002820155600401805464ffffffffff19164264ffffffffff1617905550505050505050565b6000806144678484611780565b9050600081600281111561447757fe5b1415614487576000915050611752565b600181600281111561449557fe5b146144bb576001600160a01b0384166000908152603660205260409020600401546117cd565b50506001600160a01b0390811660009081526037602090815260408083209490931682529290925290206003015490565b6000805b60385481101561453957826001600160a01b03166038828154811061451157fe5b6000918252602090912001546001600160a01b0316141561453157600191505b6001016144f0565b5080613ff157603880546001810182556000919091527f38395c5dceade9603479b177b68959049485df8aa97b39f3533039af5f4561990180546001600160a01b0384166001600160a01b03199091161790555050565b603560009054906101000a90046001600160a01b03166001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156145de57600080fd5b505afa1580156145f2573d6000803e3d6000fd5b505050506040513d602081101561460857600080fd5b5051603480546001600160a01b0319166001600160a01b03909216919091179055565b6001600160a01b0380851660008181526036602090815260408083209488168352603782528083209383529290522061466382613f5d565b600061466f8787611780565b905060015b81600281111561468057fe5b14156146bb57600382015461469e908490869063ffffffff6151cd16565b60038201546146b6908490879063ffffffff61523d16565b6146db565b6146cb838563ffffffff61534816565b6146db838663ffffffff61536916565b50505050505050565b6001600160a01b038116600090815260366020526040902061470590613f5d565b50565b6001600160a01b03808516600090815260376020908152604080832093891683529281528282206036909152919020815461474f9086906140f1908663ffffffff613ff516565b8255600261475d8888611780565b600281111561476857fe5b141561477957600781015460018301555b831561479a576002820154614794908563ffffffff6142c416565b60028301555b50600401805464ffffffffff19164264ffffffffff161790555050505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b179052611a81908490614e22565b815460009061481d57506000611752565b600061482c8460000154614dfc565b60038501549091506000908190156148605760038601546004870154614859919064ffffffffff16614dad565b90506148a2565b61489f8660010154614066876007015461489389600401548a600d0160149054906101000a900464ffffffffff16614dad565b9063ffffffff614d7516565b90505b6148ba6148b5848363ffffffff614d7516565b6153c1565b86549092508214156148f557600486015464ffffffffff1642146148f55785546148eb90600163ffffffff613ff516565b9350505050611752565b50949350505050565b6001600160a01b0380841660008181526036602090815260408083209487168352603782528083209383529290522061493682613f5d565b60038101546116be908390859063ffffffff6151cd16565b6001600160a01b03808316600090815260376020908152604080832093871683529281528282206036909152919020815461498f908463ffffffff613ff516565b8255600501546003820155600401805464ffffffffff19164264ffffffffff16179055505050565b600061175282600301548360020154613ff590919063ffffffff16565b6000600282046117cd83614a046149f7876b033b2e3c9fd0803ce80000006153da565b849063ffffffff613ff516565b9063ffffffff61543316565b600790565b303b1590565b600080612b0b8360000154614893856001015486600d0160149054906101000a900464ffffffffff16614d2a565b6001600160a01b03808516600081815260366020908152604080832094881683526037825280832093835292905290812090614a858787611780565b6001600160a01b0388166000908152603660205260409020909150614aa990613f5d565b6001614674565b6001600160a01b038087166000818152603660209081526040808320948a16835260378252808320938352929052208054614af79087906140f1908763ffffffff613ff516565b8155600782015460018201558215614b185760006003820181905560018201555b6002810154614434908663ffffffff6142c416565b6001600160a01b03808616600081815260366020908152604080832094891683526037825280832093835292905220614b6582613f5d565b6001836002811115614b7357fe5b1415614ba5576003810154614b8f83878363ffffffff61523d16565b614b9f838663ffffffff61534816565b506146db565b6002836002811115614bb357fe5b1415614bdf576005820154614bce838763ffffffff61536916565b614b9f83868363ffffffff6151cd16565b6040805162461bcd60e51b815260206004820152601a60248201527f496e76616c69642072617465206d6f6465207265636569766564000000000000604482015290519081900360640190fd5b6001600160a01b03808416600090815260376020908152604080832093881683529281528282206036909152918120909190826002856002811115614c6d57fe5b1415614c8e5750600581015460038301556000600183810191909155614cf2565b6001856002811115614c9c57fe5b1415614cbb575060006003830155600781015460018301556002614cf2565b60405162461bcd60e51b815260040180806020018281038252602381526020018061583f6023913960400191505060405180910390fd5b8254614d04908763ffffffff613ff516565b83556004909201805464ffffffffff19164264ffffffffff161790555095945050505050565b600080614d444264ffffffffff851663ffffffff6142c416565b90506000614d5861405d6301e13380614dfc565b9050612ecb614d65614e12565b612f01878463ffffffff614d7516565b6000612b0b6b033b2e3c9fd0803ce8000000614a04614d9a868663ffffffff6153da16565b6b019d971e4fe8401e7400000090613ff5565b600080614dc74264ffffffffff851663ffffffff6142c416565b90506000614ddf856301e1338063ffffffff61543316565b9050612ecb82614df06149f7614e12565b9063ffffffff61547516565b600061175282633b9aca0063ffffffff6153da16565b6b033b2e3c9fd0803ce800000090565b614e34826001600160a01b031661152f565b614e85576040805162461bcd60e51b815260206004820152601f60248201527f5361666545524332303a2063616c6c20746f206e6f6e2d636f6e747261637400604482015290519081900360640190fd5b60006060836001600160a01b0316836040518082805190602001908083835b60208310614ec35780518252601f199092019160209182019101614ea4565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114614f25576040519150601f19603f3d011682016040523d82523d6000602084013e614f2a565b606091505b509150915081614f81576040805162461bcd60e51b815260206004820181905260248201527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564604482015290519081900360640190fd5b805115611e4b57808060200190516020811015614f9d57600080fd5b5051611e4b5760405162461bcd60e51b815260040180806020018281038252602a815260200180615862602a913960400191505060405180910390fd5b600081848411156150695760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561502e578181015183820152602001615016565b50505050905090810190601f16801561505b5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600061507d8787611780565b6001600160a01b038816600090815260366020526040902090915060018260028111156150a657fe5b14156150ef576001600160a01b038088166000908152603760209081526040808320938c1683529290522060038101546150e9908390899063ffffffff61523d16565b50615113565b60028260028111156150fd57fe5b141561511357615113818763ffffffff61536916565b600061512985612f01898963ffffffff613ff516565b9050600184600281111561513957fe5b141561515c576005820154615157908390839063ffffffff6151cd16565b6121b0565b600284600281111561516a57fe5b141561518057615157828263ffffffff61534816565b6040805162461bcd60e51b815260206004820152601c60248201527f496e76616c6964206e657720626f72726f772072617465206d6f646500000000604482015290519081900360640190fd5b60028301546151e2818463ffffffff613ff516565b600285015560006151f68361489386614dfc565b9050600061520b866006015461489385614dfc565b905061522d61521d8760020154614dfc565b614066848463ffffffff613ff516565b8660060181905550505050505050565b8183600201541015615296576040805162461bcd60e51b815260206004820152601a60248201527f496e76616c696420616d6f756e7420746f206465637265617365000000000000604482015290519081900360640190fd5b60028301546152ab818463ffffffff6142c416565b600285018190556152c3575060006006840155611a81565b60006152d28361489386614dfc565b905060006152e7866006015461489385614dfc565b9050818110156153285760405162461bcd60e51b81526004018080602001828103825260238152602001806156266023913960400191505060405180910390fd5b61522d6153388760020154614dfc565b614066838563ffffffff6142c416565b600382015461535d908263ffffffff613ff516565b82600301819055505050565b80826003015410156153ac5760405162461bcd60e51b815260040180806020018281038252605081526020018061556b6050913960600191505060405180910390fd5b600382015461535d908263ffffffff6142c416565b6000631dcd6500612b0b633b9aca00614a048386613ff5565b6000826153e957506000611752565b828202828482816153f657fe5b0414612b0b5760405162461bcd60e51b81526004018080602001828103825260218152602001806157a26021913960400191505060405180910390fd5b6000612b0b83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f0000000000008152506154cf565b600060028206615491576b033b2e3c9fd0803ce8000000615493565b825b90506002820491505b8115611752576154ac8384614d75565b925060028206156154c4576154c18184614d75565b90505b60028204915061549c565b6000818361551e5760405162461bcd60e51b815260206004820181815283516024840152835190928392604490910191908501908083836000831561502e578181015183820152602001615016565b50600083858161552a57fe5b049594505050505056fe466565206c69717569646174696f6e20646f6573206e6f74207265717569726520616e79207472616e73666572206f662076616c756554686520616d6f756e742074686174206973206265696e6720737562747261637465642066726f6d20746865207661726961626c6520746f74616c20626f72726f777320697320696e636f727265637454686520616d6f756e7420616e64207468652076616c75652073656e7420746f206465706f73697420646f206e6f74206d617463684f6e6c7920636f6e7472616374732063616e2073656e6420657468657220746f20746865204c656e64696e6720706f6f6c20636f726554686520616d6f756e747320746f20737562747261637420646f6e2774206d6174636852657365727665206265696e672072656d6f76656420697320646966666572656e74207468616e20746865207265736572766520726571756573746564557365722069732073656e64696e672045544820616c6f6e67207769746820746865204552433230207472616e736665722e557365722069732073656e64696e672045544820616c6f6e67207769746820746865204552433230207472616e736665722e20436865636b207468652076616c756520617474726962757465206f6620746865207472616e73616374696f6e43616e6e6f742072656d6f7665206120726573657276652077697468206c6971756964697479206465706f73697465645468652063616c6c6572206d7573742062652061206c656e64696e6720706f6f6c20636f6e666967757261746f7220636f6e74726163745265736572766520686173206e6f74206265656e20696e697469616c697a656420796574536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f775472616e7366657220746f20746f6b656e206469737472696275746f72206661696c6564436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a65645468652063616c6c6572206d7573742062652061206c656e64696e6720706f6f6c20636f6e7472616374496e76616c696420696e7465726573742072617465206d6f64652072656365697665645361666545524332303a204552433230206f7065726174696f6e20646964206e6f742073756363656564a264697066735822122085ecebc0b6ea7654d4fd399b74f9b075839bf5fe9c23bda63907b987cbec1fe264736f6c63430006080033";
-
-export interface LendingPoolCoreLibraryAddresses {
-  ["__$2ec35834968386f54fa313129cf94664e4$__"]: string;
-}
diff --git a/types/LendingPoolDataProvider.d.ts b/types/LendingPoolDataProvider.d.ts
deleted file mode 100644
index 234e254b..00000000
--- a/types/LendingPoolDataProvider.d.ts
+++ /dev/null
@@ -1,448 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface LendingPoolDataProviderInterface extends Interface {
-  functions: {
-    DATA_PROVIDER_REVISION: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    HEALTH_FACTOR_LIQUIDATION_THRESHOLD: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    addressesProvider: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    balanceDecreaseAllowed: TypedFunctionDescription<{
-      encode([_reserve, _user, _amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-
-    calculateCollateralNeededInETH: TypedFunctionDescription<{
-      encode([
-        _reserve,
-        _amount,
-        _fee,
-        _userCurrentBorrowBalanceTH,
-        _userCurrentFeesETH,
-        _userCurrentLtv
-      ]: [
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-
-    calculateUserGlobalData: TypedFunctionDescription<{
-      encode([_user]: [string]): string;
-    }>;
-
-    core: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    getHealthFactorLiquidationThreshold: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    getReserveConfigurationData: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveData: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getUserAccountData: TypedFunctionDescription<{
-      encode([_user]: [string]): string;
-    }>;
-
-    getUserReserveData: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    initialize: TypedFunctionDescription<{
-      encode([_addressesProvider]: [string]): string;
-    }>;
-  };
-
-  events: {};
-}
-
-export class LendingPoolDataProvider extends Contract {
-  connect(
-    signerOrProvider: Signer | Provider | string
-  ): LendingPoolDataProvider;
-  attach(addressOrName: string): LendingPoolDataProvider;
-  deployed(): Promise<LendingPoolDataProvider>;
-
-  on(event: EventFilter | string, listener: Listener): LendingPoolDataProvider;
-  once(
-    event: EventFilter | string,
-    listener: Listener
-  ): LendingPoolDataProvider;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): LendingPoolDataProvider;
-  removeAllListeners(eventName: EventFilter | string): LendingPoolDataProvider;
-  removeListener(eventName: any, listener: Listener): LendingPoolDataProvider;
-
-  interface: LendingPoolDataProviderInterface;
-
-  functions: {
-    DATA_PROVIDER_REVISION(): Promise<BigNumber>;
-
-    HEALTH_FACTOR_LIQUIDATION_THRESHOLD(): Promise<BigNumber>;
-
-    addressesProvider(): Promise<string>;
-
-    balanceDecreaseAllowed(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<boolean>;
-
-    calculateCollateralNeededInETH(
-      _reserve: string,
-      _amount: BigNumberish,
-      _fee: BigNumberish,
-      _userCurrentBorrowBalanceTH: BigNumberish,
-      _userCurrentFeesETH: BigNumberish,
-      _userCurrentLtv: BigNumberish
-    ): Promise<BigNumber>;
-
-    calculateUserGlobalData(
-      _user: string
-    ): Promise<{
-      totalLiquidityBalanceETH: BigNumber;
-      totalCollateralBalanceETH: BigNumber;
-      totalBorrowBalanceETH: BigNumber;
-      totalFeesETH: BigNumber;
-      currentLtv: BigNumber;
-      currentLiquidationThreshold: BigNumber;
-      healthFactor: BigNumber;
-      healthFactorBelowThreshold: boolean;
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-      3: BigNumber;
-      4: BigNumber;
-      5: BigNumber;
-      6: BigNumber;
-      7: boolean;
-    }>;
-
-    core(): Promise<string>;
-
-    getHealthFactorLiquidationThreshold(): Promise<BigNumber>;
-
-    getReserveConfigurationData(
-      _reserve: string
-    ): Promise<{
-      ltv: BigNumber;
-      liquidationThreshold: BigNumber;
-      liquidationBonus: BigNumber;
-      rateStrategyAddress: string;
-      usageAsCollateralEnabled: boolean;
-      borrowingEnabled: boolean;
-      stableBorrowRateEnabled: boolean;
-      isActive: boolean;
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-      3: string;
-      4: boolean;
-      5: boolean;
-      6: boolean;
-      7: boolean;
-    }>;
-
-    getReserveData(
-      _reserve: string
-    ): Promise<{
-      totalLiquidity: BigNumber;
-      availableLiquidity: BigNumber;
-      totalBorrowsStable: BigNumber;
-      totalBorrowsVariable: BigNumber;
-      liquidityRate: BigNumber;
-      variableBorrowRate: BigNumber;
-      stableBorrowRate: BigNumber;
-      averageStableBorrowRate: BigNumber;
-      utilizationRate: BigNumber;
-      liquidityIndex: BigNumber;
-      variableBorrowIndex: BigNumber;
-      aTokenAddress: string;
-      lastUpdateTimestamp: number;
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-      3: BigNumber;
-      4: BigNumber;
-      5: BigNumber;
-      6: BigNumber;
-      7: BigNumber;
-      8: BigNumber;
-      9: BigNumber;
-      10: BigNumber;
-      11: string;
-      12: number;
-    }>;
-
-    getUserAccountData(
-      _user: string
-    ): Promise<{
-      totalLiquidityETH: BigNumber;
-      totalCollateralETH: BigNumber;
-      totalBorrowsETH: BigNumber;
-      totalFeesETH: BigNumber;
-      availableBorrowsETH: BigNumber;
-      currentLiquidationThreshold: BigNumber;
-      ltv: BigNumber;
-      healthFactor: BigNumber;
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-      3: BigNumber;
-      4: BigNumber;
-      5: BigNumber;
-      6: BigNumber;
-      7: BigNumber;
-    }>;
-
-    getUserReserveData(
-      _reserve: string,
-      _user: string
-    ): Promise<{
-      currentATokenBalance: BigNumber;
-      currentBorrowBalance: BigNumber;
-      principalBorrowBalance: BigNumber;
-      borrowRateMode: BigNumber;
-      borrowRate: BigNumber;
-      liquidityRate: BigNumber;
-      originationFee: BigNumber;
-      variableBorrowIndex: BigNumber;
-      lastUpdateTimestamp: BigNumber;
-      usageAsCollateralEnabled: boolean;
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-      3: BigNumber;
-      4: BigNumber;
-      5: BigNumber;
-      6: BigNumber;
-      7: BigNumber;
-      8: BigNumber;
-      9: boolean;
-    }>;
-
-    initialize(
-      _addressesProvider: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  DATA_PROVIDER_REVISION(): Promise<BigNumber>;
-
-  HEALTH_FACTOR_LIQUIDATION_THRESHOLD(): Promise<BigNumber>;
-
-  addressesProvider(): Promise<string>;
-
-  balanceDecreaseAllowed(
-    _reserve: string,
-    _user: string,
-    _amount: BigNumberish
-  ): Promise<boolean>;
-
-  calculateCollateralNeededInETH(
-    _reserve: string,
-    _amount: BigNumberish,
-    _fee: BigNumberish,
-    _userCurrentBorrowBalanceTH: BigNumberish,
-    _userCurrentFeesETH: BigNumberish,
-    _userCurrentLtv: BigNumberish
-  ): Promise<BigNumber>;
-
-  calculateUserGlobalData(
-    _user: string
-  ): Promise<{
-    totalLiquidityBalanceETH: BigNumber;
-    totalCollateralBalanceETH: BigNumber;
-    totalBorrowBalanceETH: BigNumber;
-    totalFeesETH: BigNumber;
-    currentLtv: BigNumber;
-    currentLiquidationThreshold: BigNumber;
-    healthFactor: BigNumber;
-    healthFactorBelowThreshold: boolean;
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-    3: BigNumber;
-    4: BigNumber;
-    5: BigNumber;
-    6: BigNumber;
-    7: boolean;
-  }>;
-
-  core(): Promise<string>;
-
-  getHealthFactorLiquidationThreshold(): Promise<BigNumber>;
-
-  getReserveConfigurationData(
-    _reserve: string
-  ): Promise<{
-    ltv: BigNumber;
-    liquidationThreshold: BigNumber;
-    liquidationBonus: BigNumber;
-    rateStrategyAddress: string;
-    usageAsCollateralEnabled: boolean;
-    borrowingEnabled: boolean;
-    stableBorrowRateEnabled: boolean;
-    isActive: boolean;
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-    3: string;
-    4: boolean;
-    5: boolean;
-    6: boolean;
-    7: boolean;
-  }>;
-
-  getReserveData(
-    _reserve: string
-  ): Promise<{
-    totalLiquidity: BigNumber;
-    availableLiquidity: BigNumber;
-    totalBorrowsStable: BigNumber;
-    totalBorrowsVariable: BigNumber;
-    liquidityRate: BigNumber;
-    variableBorrowRate: BigNumber;
-    stableBorrowRate: BigNumber;
-    averageStableBorrowRate: BigNumber;
-    utilizationRate: BigNumber;
-    liquidityIndex: BigNumber;
-    variableBorrowIndex: BigNumber;
-    aTokenAddress: string;
-    lastUpdateTimestamp: number;
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-    3: BigNumber;
-    4: BigNumber;
-    5: BigNumber;
-    6: BigNumber;
-    7: BigNumber;
-    8: BigNumber;
-    9: BigNumber;
-    10: BigNumber;
-    11: string;
-    12: number;
-  }>;
-
-  getUserAccountData(
-    _user: string
-  ): Promise<{
-    totalLiquidityETH: BigNumber;
-    totalCollateralETH: BigNumber;
-    totalBorrowsETH: BigNumber;
-    totalFeesETH: BigNumber;
-    availableBorrowsETH: BigNumber;
-    currentLiquidationThreshold: BigNumber;
-    ltv: BigNumber;
-    healthFactor: BigNumber;
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-    3: BigNumber;
-    4: BigNumber;
-    5: BigNumber;
-    6: BigNumber;
-    7: BigNumber;
-  }>;
-
-  getUserReserveData(
-    _reserve: string,
-    _user: string
-  ): Promise<{
-    currentATokenBalance: BigNumber;
-    currentBorrowBalance: BigNumber;
-    principalBorrowBalance: BigNumber;
-    borrowRateMode: BigNumber;
-    borrowRate: BigNumber;
-    liquidityRate: BigNumber;
-    originationFee: BigNumber;
-    variableBorrowIndex: BigNumber;
-    lastUpdateTimestamp: BigNumber;
-    usageAsCollateralEnabled: boolean;
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-    3: BigNumber;
-    4: BigNumber;
-    5: BigNumber;
-    6: BigNumber;
-    7: BigNumber;
-    8: BigNumber;
-    9: boolean;
-  }>;
-
-  initialize(
-    _addressesProvider: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {};
-
-  estimate: {
-    DATA_PROVIDER_REVISION(): Promise<BigNumber>;
-
-    HEALTH_FACTOR_LIQUIDATION_THRESHOLD(): Promise<BigNumber>;
-
-    addressesProvider(): Promise<BigNumber>;
-
-    balanceDecreaseAllowed(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<BigNumber>;
-
-    calculateCollateralNeededInETH(
-      _reserve: string,
-      _amount: BigNumberish,
-      _fee: BigNumberish,
-      _userCurrentBorrowBalanceTH: BigNumberish,
-      _userCurrentFeesETH: BigNumberish,
-      _userCurrentLtv: BigNumberish
-    ): Promise<BigNumber>;
-
-    calculateUserGlobalData(_user: string): Promise<BigNumber>;
-
-    core(): Promise<BigNumber>;
-
-    getHealthFactorLiquidationThreshold(): Promise<BigNumber>;
-
-    getReserveConfigurationData(_reserve: string): Promise<BigNumber>;
-
-    getReserveData(_reserve: string): Promise<BigNumber>;
-
-    getUserAccountData(_user: string): Promise<BigNumber>;
-
-    getUserReserveData(_reserve: string, _user: string): Promise<BigNumber>;
-
-    initialize(_addressesProvider: string): Promise<BigNumber>;
-  };
-}
diff --git a/types/LendingPoolDataProviderFactory.ts b/types/LendingPoolDataProviderFactory.ts
deleted file mode 100644
index ac967199..00000000
--- a/types/LendingPoolDataProviderFactory.ts
+++ /dev/null
@@ -1,505 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { LendingPoolDataProvider } from "./LendingPoolDataProvider";
-
-export class LendingPoolDataProviderFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<LendingPoolDataProvider> {
-    return super.deploy(overrides) as Promise<LendingPoolDataProvider>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): LendingPoolDataProvider {
-    return super.attach(address) as LendingPoolDataProvider;
-  }
-  connect(signer: Signer): LendingPoolDataProviderFactory {
-    return super.connect(signer) as LendingPoolDataProviderFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): LendingPoolDataProvider {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as LendingPoolDataProvider;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [],
-    name: "DATA_PROVIDER_REVISION",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "HEALTH_FACTOR_LIQUIDATION_THRESHOLD",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "addressesProvider",
-    outputs: [
-      {
-        internalType: "contract LendingPoolAddressesProvider",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      }
-    ],
-    name: "balanceDecreaseAllowed",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_fee",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_userCurrentBorrowBalanceTH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_userCurrentFeesETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_userCurrentLtv",
-        type: "uint256"
-      }
-    ],
-    name: "calculateCollateralNeededInETH",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "calculateUserGlobalData",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "totalLiquidityBalanceETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "totalCollateralBalanceETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "totalBorrowBalanceETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "totalFeesETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "currentLtv",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "currentLiquidationThreshold",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "healthFactor",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "healthFactorBelowThreshold",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "core",
-    outputs: [
-      {
-        internalType: "contract LendingPoolCore",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "getHealthFactorLiquidationThreshold",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "pure",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveConfigurationData",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "ltv",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "liquidationThreshold",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "liquidationBonus",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "rateStrategyAddress",
-        type: "address"
-      },
-      {
-        internalType: "bool",
-        name: "usageAsCollateralEnabled",
-        type: "bool"
-      },
-      {
-        internalType: "bool",
-        name: "borrowingEnabled",
-        type: "bool"
-      },
-      {
-        internalType: "bool",
-        name: "stableBorrowRateEnabled",
-        type: "bool"
-      },
-      {
-        internalType: "bool",
-        name: "isActive",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveData",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "totalLiquidity",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "availableLiquidity",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "totalBorrowsStable",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "totalBorrowsVariable",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "liquidityRate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "variableBorrowRate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "stableBorrowRate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "averageStableBorrowRate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "utilizationRate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "liquidityIndex",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "variableBorrowIndex",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "aTokenAddress",
-        type: "address"
-      },
-      {
-        internalType: "uint40",
-        name: "lastUpdateTimestamp",
-        type: "uint40"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserAccountData",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "totalLiquidityETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "totalCollateralETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "totalBorrowsETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "totalFeesETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "availableBorrowsETH",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "currentLiquidationThreshold",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "ltv",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "healthFactor",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserReserveData",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "currentATokenBalance",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "currentBorrowBalance",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "principalBorrowBalance",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "borrowRateMode",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "borrowRate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "liquidityRate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "originationFee",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "variableBorrowIndex",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "lastUpdateTimestamp",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "usageAsCollateralEnabled",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract LendingPoolAddressesProvider",
-        name: "_addressesProvider",
-        type: "address"
-      }
-    ],
-    name: "initialize",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x60806040526000805534801561001457600080fd5b50612a01806100246000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c806376e9d6151161008c578063c3525c2811610066578063c3525c28146103e4578063c4d66de8146103ec578063c72c4d1014610414578063f2f4eb2614610438576100cf565b806376e9d6151461032b5780638daf609f14610375578063bf92857c1461037d576100cf565b806312737c33146100d457806328dd2d011461012a5780632c6d0e9b146101aa57806335ea6a75146102135780633e150141146102ae5780633e44bee814610323575b600080fd5b610118600480360360c08110156100ea57600080fd5b506001600160a01b038135169060208101359060408101359060608101359060808101359060a00135610440565b60408051918252519081900360200190f35b6101586004803603604081101561014057600080fd5b506001600160a01b0381358116916020013516610633565b604080519a8b5260208b0199909952898901979097526060890195909552608088019390935260a087019190915260c086015260e0850152610100840152151561012083015251908190036101400190f35b6101d0600480360360208110156101c057600080fd5b50356001600160a01b0316610e1e565b604080519889526020890197909752878701959095526060870193909352608086019190915260a085015260c0840152151560e083015251908190036101000190f35b6102396004803603602081101561022957600080fd5b50356001600160a01b03166113c8565b604080519d8e5260208e019c909c528c8c019a909a5260608c019890985260808b019690965260a08a019490945260c089019290925260e08801526101008701526101208601526101408501526001600160a01b031661016084015264ffffffffff1661018083015251908190036101a00190f35b6102d4600480360360208110156102c457600080fd5b50356001600160a01b0316611c6f565b604080519889526020890197909752878701959095526001600160a01b0390931660608701529015156080860152151560a0850152151560c0840152151560e083015251908190036101000190f35b610118611fe2565b6103616004803603606081101561034157600080fd5b506001600160a01b03813581169160208101359091169060400135611fee565b604080519115158252519081900360200190f35b6101186122e9565b6103a36004803603602081101561039357600080fd5b50356001600160a01b03166122ee565b604080519889526020890197909752878701959095526060870193909352608086019190915260a085015260c084015260e083015251908190036101000190f35b61011861232f565b6104126004803603602081101561040257600080fd5b50356001600160a01b031661233b565b005b61041c612477565b604080516001600160a01b039092168252519081900360200190f35b61041c612486565b6034546040805163288d4ff760e21b81526001600160a01b03898116600483015291516000938493169163a2353fdc916024808301926020929190829003018186803b15801561048f57600080fd5b505afa1580156104a3573d6000803e3d6000fd5b505050506040513d60208110156104b957600080fd5b505160355460408051631f94a27560e31b815290519293506000926001600160a01b039092169163fca513a891600480820192602092909190829003018186803b15801561050657600080fd5b505afa15801561051a573d6000803e3d6000fd5b505050506040513d602081101561053057600080fd5b5051905060006105eb600a84900a6105df6105518c8c63ffffffff61249516565b856001600160a01b031663b3596f078f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156105a757600080fd5b505afa1580156105bb573d6000803e3d6000fd5b505050506040513d60208110156105d157600080fd5b50519063ffffffff6124f816565b9063ffffffff61255116565b90506000610624866105df60646106188661060c8e8e63ffffffff61249516565b9063ffffffff61249516565b9063ffffffff6124f816565b9b9a5050505050505050505050565b600080600080600080600080600080603460009054906101000a90046001600160a01b03166001600160a01b03166334b3beee8d6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156106ad57600080fd5b505afa1580156106c1573d6000803e3d6000fd5b505050506040513d60208110156106d757600080fd5b5051604080516370a0823160e01b81526001600160a01b038e81166004830152915191909216916370a08231916024808301926020929190829003018186803b15801561072357600080fd5b505afa158015610737573d6000803e3d6000fd5b505050506040513d602081101561074d57600080fd5b810190808051906020019092919050505099506000603460009054906101000a90046001600160a01b03166001600160a01b0316631ca19f198e8e6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060206040518083038186803b1580156107e757600080fd5b505afa1580156107fb573d6000803e3d6000fd5b505050506040513d602081101561081157600080fd5b81019080805190602001909291905050509050603460009054906101000a90046001600160a01b03166001600160a01b0316639fb8afcd8e8e6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060606040518083038186803b1580156108a957600080fd5b505afa1580156108bd573d6000803e3d6000fd5b505050506040513d60608110156108d357600080fd5b5080516020909101519a50985060018160028111156108ee57fe5b14156109ac57603460009054906101000a90046001600160a01b03166001600160a01b0316636fffab0c8e8e6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060206040518083038186803b15801561097957600080fd5b505afa15801561098d573d6000803e3d6000fd5b505050506040513d60208110156109a357600080fd5b50519650610a5a565b60028160028111156109ba57fe5b1415610a5a57603460009054906101000a90046001600160a01b03166001600160a01b031663906c0a418e6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015610a2b57600080fd5b505afa158015610a3f573d6000803e3d6000fd5b505050506040513d6020811015610a5557600080fd5b505196505b806002811115610a6657fe5b9750603460009054906101000a90046001600160a01b03166001600160a01b031663c540148e8e6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015610ad357600080fd5b505afa158015610ae7573d6000803e3d6000fd5b505050506040513d6020811015610afd57600080fd5b81019080805190602001909291905050509550603460009054906101000a90046001600160a01b03166001600160a01b031663feab31ac8e8e6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060206040518083038186803b158015610b9557600080fd5b505afa158015610ba9573d6000803e3d6000fd5b505050506040513d6020811015610bbf57600080fd5b81019080805190602001909291905050509450603460009054906101000a90046001600160a01b03166001600160a01b031663f6ea8d768e8e6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060206040518083038186803b158015610c5757600080fd5b505afa158015610c6b573d6000803e3d6000fd5b505050506040513d6020811015610c8157600080fd5b81019080805190602001909291905050509350603460009054906101000a90046001600160a01b03166001600160a01b03166366d103f38e8e6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060206040518083038186803b158015610d1957600080fd5b505afa158015610d2d573d6000803e3d6000fd5b505050506040513d6020811015610d4357600080fd5b81019080805190602001909291905050509250603460009054906101000a90046001600160a01b03166001600160a01b0316639e3c4f3b8e8e6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060206040518083038186803b158015610ddb57600080fd5b505afa158015610def573d6000803e3d6000fd5b505050506040513d6020811015610e0557600080fd5b50519a9d999c50979a5095989497939650919450929091565b6000806000806000806000806000603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b158015610e7a57600080fd5b505afa158015610e8e573d6000803e3d6000fd5b505050506040513d6020811015610ea457600080fd5b50519050610eb06128b9565b60345460408051630240bc6b60e21b815290516060926001600160a01b031691630902f1ac916004808301926000929190829003018186803b158015610ef557600080fd5b505afa158015610f09573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526020811015610f3257600080fd5b8101908080516040519392919084640100000000821115610f5257600080fd5b908301906020820185811115610f6757600080fd5b8251866020820283011164010000000082111715610f8457600080fd5b82525081516020918201928201910280838360005b83811015610fb1578181015183820152602001610f99565b50505050905001604052505050905060008090505b815181101561135c57818181518110610fdb57fe5b60200260200101518361014001906001600160a01b031690816001600160a01b031681525050603460009054906101000a90046001600160a01b03166001600160a01b031663e10076ad8461014001518f6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060806040518083038186803b15801561108b57600080fd5b505afa15801561109f573d6000803e3d6000fd5b505050506040513d60808110156110b557600080fd5b5080516020820151604080840151606094850151151561012089015260e0880152928601529084018190521580156110ef57506060830151155b156110f957611354565b60345461014084015160408051635fc526ff60e01b81526001600160a01b03928316600482015290519190921691635fc526ff916024808301926080929190829003018186803b15801561114c57600080fd5b505afa158015611160573d6000803e3d6000fd5b505050506040513d608081101561117657600080fd5b508051602080830151604080850151606090950151151561010089015260c088019490945260a087015260808601829052600a9190910a85820152610140850151825163b3596f0760e01b81526001600160a01b03918216600482015292519087169263b3596f07926024808301939192829003018186803b1580156111fb57600080fd5b505afa15801561120f573d6000803e3d6000fd5b505050506040513d602081101561122557600080fd5b505183526040830151156112ec57600061125884602001516105df866040015187600001516124f890919063ffffffff16565b905061126a8d8263ffffffff61249516565b9c50836101000151801561128057508361012001515b156112ea576112958c8263ffffffff61249516565b9b506112be6112b18560a00151836124f890919063ffffffff16565b8a9063ffffffff61249516565b98506112e76112da8560c00151836124f890919063ffffffff16565b899063ffffffff61249516565b97505b505b6060830151156113545761132961131c84602001516105df866060015187600001516124f890919063ffffffff16565b8b9063ffffffff61249516565b99506113516112b184602001516105df86600001518760e001516124f890919063ffffffff16565b98505b600101610fc6565b5060008a1161136c57600061137c565b61137c878b63ffffffff61255116565b965060008a1161138d57600061139d565b61139d868b63ffffffff61255116565b95506113ab8a8a8a89612593565b9450670de0b6b3a764000085109350505050919395975091939597565b6000806000806000806000806000806000806000603460009054906101000a90046001600160a01b03166001600160a01b031663c33cfd908f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561144757600080fd5b505afa15801561145b573d6000803e3d6000fd5b505050506040513d602081101561147157600080fd5b81019080805190602001909291905050509c50603460009054906101000a90046001600160a01b03166001600160a01b031663e24030198f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156114ef57600080fd5b505afa158015611503573d6000803e3d6000fd5b505050506040513d602081101561151957600080fd5b81019080805190602001909291905050509b50603460009054906101000a90046001600160a01b03166001600160a01b0316637f90fec58f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561159757600080fd5b505afa1580156115ab573d6000803e3d6000fd5b505050506040513d60208110156115c157600080fd5b81019080805190602001909291905050509a50603460009054906101000a90046001600160a01b03166001600160a01b03166398bd47378f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561163f57600080fd5b505afa158015611653573d6000803e3d6000fd5b505050506040513d602081101561166957600080fd5b81019080805190602001909291905050509950603460009054906101000a90046001600160a01b03166001600160a01b031663c540148e8f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156116e757600080fd5b505afa1580156116fb573d6000803e3d6000fd5b505050506040513d602081101561171157600080fd5b81019080805190602001909291905050509850603460009054906101000a90046001600160a01b03166001600160a01b031663906c0a418f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561178f57600080fd5b505afa1580156117a3573d6000803e3d6000fd5b505050506040513d60208110156117b957600080fd5b81019080805190602001909291905050509750603460009054906101000a90046001600160a01b03166001600160a01b03166388079d888f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561183757600080fd5b505afa15801561184b573d6000803e3d6000fd5b505050506040513d602081101561186157600080fd5b81019080805190602001909291905050509650603460009054906101000a90046001600160a01b03166001600160a01b03166346bc0f288f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156118df57600080fd5b505afa1580156118f3573d6000803e3d6000fd5b505050506040513d602081101561190957600080fd5b81019080805190602001909291905050509550603460009054906101000a90046001600160a01b03166001600160a01b031663bfacad848f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561198757600080fd5b505afa15801561199b573d6000803e3d6000fd5b505050506040513d60208110156119b157600080fd5b81019080805190602001909291905050509450603460009054906101000a90046001600160a01b03166001600160a01b031663bd7fd79a8f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015611a2f57600080fd5b505afa158015611a43573d6000803e3d6000fd5b505050506040513d6020811015611a5957600080fd5b81019080805190602001909291905050509350603460009054906101000a90046001600160a01b03166001600160a01b031663b701d0938f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015611ad757600080fd5b505afa158015611aeb573d6000803e3d6000fd5b505050506040513d6020811015611b0157600080fd5b81019080805190602001909291905050509250603460009054906101000a90046001600160a01b03166001600160a01b03166334b3beee8f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015611b7f57600080fd5b505afa158015611b93573d6000803e3d6000fd5b505050506040513d6020811015611ba957600080fd5b81019080805190602001909291905050509150603460009054906101000a90046001600160a01b03166001600160a01b0316634f1446098f6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015611c2757600080fd5b505afa158015611c3b573d6000803e3d6000fd5b505050506040513d6020811015611c5157600080fd5b50519c9e9b9d50999b989a9799509597949693959294919390929190565b600080600080600080600080603460009054906101000a90046001600160a01b03166001600160a01b0316635fc526ff8a6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060806040518083038186803b158015611ce657600080fd5b505afa158015611cfa573d6000803e3d6000fd5b505050506040513d6080811015611d1057600080fd5b810190808051906020019092919080519060200190929190805190602001909291908051906020019092919050505090919250809650819950829a50505050603460009054906101000a90046001600160a01b03166001600160a01b0316639e6748488a6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015611dba57600080fd5b505afa158015611dce573d6000803e3d6000fd5b505050506040513d6020811015611de457600080fd5b505160345460408051632e79732b60e11b81526001600160a01b038d811660048301529151939550911691635cf2e65691602480820192602092909190829003018186803b158015611e3557600080fd5b505afa158015611e49573d6000803e3d6000fd5b505050506040513d6020811015611e5f57600080fd5b505160345460408051630283aeb760e11b81526001600160a01b038d8116600483015291519396509116916305075d6e91602480820192602092909190829003018186803b158015611eb057600080fd5b505afa158015611ec4573d6000803e3d6000fd5b505050506040513d6020811015611eda57600080fd5b5051603454604080516331da9b2760e21b81526001600160a01b038d81166004830152915193945091169163c76a6c9c91602480820192602092909190829003018186803b158015611f2b57600080fd5b505afa158015611f3f573d6000803e3d6000fd5b505050506040513d6020811015611f5557600080fd5b505160345460408051633570a20b60e11b81526001600160a01b038d811660048301529151939950911691636ae1441691602480820192602092909190829003018186803b158015611fa657600080fd5b505afa158015611fba573d6000803e3d6000fd5b505050506040513d6020811015611fd057600080fd5b50519799969850949695929491935091565b670de0b6b3a764000090565b6000611ff8612920565b60345460408051635fc526ff60e01b81526001600160a01b03888116600483015291519190921691635fc526ff916024808301926080929190829003018186803b15801561204557600080fd5b505afa158015612059573d6000803e3d6000fd5b505050506040513d608081101561206f57600080fd5b508051604082015160609092015115801561014085015260a0840192909252825280612119575060345460408051639e3c4f3b60e01b81526001600160a01b038881166004830152878116602483015291519190921691639e3c4f3b916044808301926020929190829003018186803b1580156120eb57600080fd5b505afa1580156120ff573d6000803e3d6000fd5b505050506040513d602081101561211557600080fd5b5051155b156121285760019150506122e2565b61213184610e1e565b505060808701525060608501526040840181905260208401919091521515905061215f5760019150506122e2565b60355460408051631f94a27560e31b815290516000926001600160a01b03169163fca513a8916004808301926020929190829003018186803b1580156121a457600080fd5b505afa1580156121b8573d6000803e3d6000fd5b505050506040513d60208110156121ce57600080fd5b505182516040805163b3596f0760e01b81526001600160a01b038a81166004830152915193945061223093600a9390930a926105df9289929087169163b3596f0791602480820192602092909190829003018186803b1580156105a757600080fd5b60c08301819052602083015161224b9163ffffffff6125e216565b60e08301819052612261576000925050506122e2565b6122ac8260e001516105df6122878560a001518660c001516124f890919063ffffffff16565b608086015160208701516122a09163ffffffff6124f816565b9063ffffffff6125e216565b610100830181905260e0830151604084015160608501516000936122d293929190612593565b670de0b6b3a76400001093505050505b9392505050565b600181565b60008060008060008060008061230389610e1e565b50959d50939b5091995097509094509250905061232287878785612624565b9350919395975091939597565b670de0b6b3a764000081565b6000612345612786565b60015490915060ff168061235c575061235c61278b565b80612368575060005481115b6123a35760405162461bcd60e51b815260040180806020018281038252602e81526020018061299e602e913960400191505060405180910390fd5b60015460ff161580156123c2576001805460ff19168117905560008290555b603580546001600160a01b0319166001600160a01b0385169081179091556040805163076b7fbb60e51b8152905163ed6ff76091600480820192602092909190829003018186803b15801561241657600080fd5b505afa15801561242a573d6000803e3d6000fd5b505050506040513d602081101561244057600080fd5b5051603480546001600160a01b0319166001600160a01b039092169190911790558015612472576001805460ff191690555b505050565b6035546001600160a01b031681565b6034546001600160a01b031681565b6000828201838110156124ef576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b90505b92915050565b600082612507575060006124f2565b8282028284828161251457fe5b04146124ef5760405162461bcd60e51b815260040180806020018281038252602181526020018061297d6021913960400191505060405180910390fd5b60006124ef83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250612791565b6000836125a357506000196125da565b6125d76125b6858563ffffffff61249516565b6125cb60646105df898763ffffffff6124f816565b9063ffffffff61283316565b90505b949350505050565b60006124ef83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f77000081525061285f565b60008061263c60646105df888663ffffffff6124f816565b9050848110156126505760009150506125da565b612670612663868663ffffffff61249516565b829063ffffffff6125e216565b90506000603560009054906101000a90046001600160a01b03166001600160a01b031663fbeefc3c6040518163ffffffff1660e01b815260040160206040518083038186803b1580156126c257600080fd5b505afa1580156126d6573d6000803e3d6000fd5b505050506040513d60208110156126ec57600080fd5b505160408051630e563a7d60e41b81523360048201526024810185905290516001600160a01b039092169163e563a7d091604480820192602092909190829003018186803b15801561273d57600080fd5b505afa158015612751573d6000803e3d6000fd5b505050506040513d602081101561276757600080fd5b5051905061277b828263ffffffff6125e216565b979650505050505050565b600190565b303b1590565b6000818361281d5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b838110156127e25781810151838201526020016127ca565b50505050905090810190601f16801561280f5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b50600083858161282957fe5b0495945050505050565b6000600282046125da836105df61285287670de0b6b3a76400006124f8565b849063ffffffff61249516565b600081848411156128b15760405162461bcd60e51b81526020600482018181528351602484015283519092839260449091019190850190808383600083156127e25781810151838201526020016127ca565b505050900390565b604051806101600160405280600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160001515815260200160001515815260200160006001600160a01b031681525090565b60405180610160016040528060008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600015158152509056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a26469706673582212204dec32370fdb6050034257123313969d8273ba205eaa127c7c6c9e207905a59564736f6c63430006080033";
diff --git a/types/LendingPoolFactory.ts b/types/LendingPoolFactory.ts
index 93d77c3e..9abc4b04 100644
--- a/types/LendingPoolFactory.ts
+++ b/types/LendingPoolFactory.ts
@@ -1348,7 +1348,7 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x6080604052600060015534801561001557600080fd5b5060016000556151728061002a6000396000f3fe6080604052600436106101fc5760003560e01c806373b2f2f21161010d578063c4d66de8116100a0578063d0fc81d21161006f578063d0fc81d214610afd578063d15e005314610b12578063d2d0e06614610b45578063d466016f14610b7b578063e8ae2f5b14610bb457610242565b8063c4d66de814610a31578063c72c4d1014610a64578063c858f5f914610a79578063cd11238214610ac257610242565b80639895e3d8116100dc5780639895e3d8146108fd578063a5bc826c14610946578063b736aaeb1461098b578063bf92857c146109c657610242565b806373b2f2f21461081b57806376e9d615146108565780638afaff02146108ad57806396e957c4146108c257610242565b80633e150141116101905780635a3b74b91161015f5780635a3b74b9146106585780635cffe9de1461069357806366bbd928146107665780636ee365f91461079f57806370fb84f4146107e257610242565b80633e1501411461051057806348ca1300146105a55780634fe7a6e5146105d8578063573ade811461061e57610242565b806328dd2d01116101cc57806328dd2d01146103845780633443a14b1461040857806335ea6a7514610441578063386497fd146104cb57610242565b8062a718a9146102475780630902f1ac1461028b57806309eab60f146102f05780631d2118f91461034957610242565b366102425761020a33610be7565b610240576040805162461bcd60e51b8152602060048201526002602482015261191960f11b604482015290519081900360640190fd5b005b600080fd5b610240600480360360a081101561025d57600080fd5b506001600160a01b038135811691602081013582169160408201351690606081013590608001351515610c23565b34801561029757600080fd5b506102a0610fea565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156102dc5781810151838201526020016102c4565b505050509050019250505060405180910390f35b3480156102fc57600080fd5b50610240600480360360c081101561031357600080fd5b506001600160a01b03813581169160208101358216916040820135811691606081013582169160808201359160a001351661104c565b34801561035557600080fd5b506102406004803603604081101561036c57600080fd5b506001600160a01b03813581169160200135166111b3565b34801561039057600080fd5b506103bf600480360360408110156103a757600080fd5b506001600160a01b0381358116916020013516611294565b60408051998a5260208a0198909852888801969096526060880194909452608087019290925260a086015260c085015260e0840152151561010083015251908190036101200190f35b34801561041457600080fd5b506102406004803603604081101561042b57600080fd5b506001600160a01b038135169060200135611438565b34801561044d57600080fd5b506104746004803603602081101561046457600080fd5b50356001600160a01b0316611507565b604080519a8b5260208b0199909952898901979097526060890195909552608088019390935260a087019190915260c086015260e085015261010084015264ffffffffff1661012083015251908190036101400190f35b3480156104d757600080fd5b506104fe600480360360208110156104ee57600080fd5b50356001600160a01b03166117f3565b60408051918252519081900360200190f35b34801561051c57600080fd5b506105436004803603602081101561053357600080fd5b50356001600160a01b031661181a565b604080519a8b5260208b0199909952898901979097526001600160a01b0395861660608a015293909416608088015290151560a0870152151560c086015290151560e08501521515610100840152151561012083015251908190036101400190f35b3480156105b157600080fd5b50610240600480360360208110156105c857600080fd5b50356001600160a01b0316611890565b3480156105e457600080fd5b50610602600480360360208110156105fb57600080fd5b503561193e565b604080516001600160a01b039092168252519081900360200190f35b6102406004803603608081101561063457600080fd5b506001600160a01b0381358116916020810135916040820135916060013516611965565b34801561066457600080fd5b506102406004803603604081101561067b57600080fd5b506001600160a01b0381351690602001351515611d2f565b34801561069f57600080fd5b50610240600480360360808110156106b657600080fd5b6001600160a01b038235811692602081013590911691604082013591908101906080810160608201356401000000008111156106f157600080fd5b82018360208201111561070357600080fd5b8035906020019184600183028401116401000000008311171561072557600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550611f95945050505050565b34801561077257600080fd5b506102406004803603604081101561078957600080fd5b506001600160a01b03813516906020013561243e565b3480156107ab57600080fd5b50610240600480360360608110156107c257600080fd5b506001600160a01b0381351690602081013515159060400135151561250d565b3480156107ee57600080fd5b506102406004803603604081101561080557600080fd5b506001600160a01b0381351690602001356126d2565b34801561082757600080fd5b506102406004803603604081101561083e57600080fd5b506001600160a01b03813516906020013515156127a1565b34801561086257600080fd5b506108996004803603606081101561087957600080fd5b506001600160a01b03813581169160208101359091169060400135612889565b604080519115158252519081900360200190f35b3480156108b957600080fd5b506104fe612a19565b3480156108ce57600080fd5b50610240600480360360408110156108e557600080fd5b506001600160a01b0381351690602001351515612a1e565b34801561090957600080fd5b506102406004803603608081101561092057600080fd5b506001600160a01b03813581169160208101359091169060408101359060600135612b06565b34801561095257600080fd5b506102406004803603608081101561096957600080fd5b506001600160a01b038135169060208101359060408101359060600135612ca2565b34801561099757600080fd5b50610240600480360360408110156109ae57600080fd5b506001600160a01b0381351690602001351515612deb565b3480156109d257600080fd5b506109f9600480360360208110156109e957600080fd5b50356001600160a01b0316612f35565b604080519788526020880196909652868601949094526060860192909252608085015260a084015260c0830152519081900360e00190f35b348015610a3d57600080fd5b5061024060048036036020811015610a5457600080fd5b50356001600160a01b0316613196565b348015610a7057600080fd5b506106026132db565b348015610a8557600080fd5b5061024060048036036080811015610a9c57600080fd5b5080356001600160a01b0316906020810135906040810135906060013561ffff166132ea565b348015610ace57600080fd5b5061024060048036036040811015610ae557600080fd5b506001600160a01b038135811691602001351661387c565b348015610b0957600080fd5b506104fe613932565b348015610b1e57600080fd5b506104fe60048036036020811015610b3557600080fd5b50356001600160a01b0316613938565b61024060048036036060811015610b5b57600080fd5b5080356001600160a01b0316906020810135906040013561ffff16613959565b348015610b8757600080fd5b5061024060048036036040811015610b9e57600080fd5b506001600160a01b038135169060200135613bc8565b348015610bc057600080fd5b5061024060048036036020811015610bd757600080fd5b50356001600160a01b0316613c97565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470818114801590610c1b57508115155b949350505050565b60026000541415610c69576040805162461bcd60e51b815260206004820152601f6024820152600080516020614f87833981519152604482015290519081900360640190fd5b6002600090815560355460408051632c1a75cd60e11b815290516001600160a01b0390921691635834eb9a91600480820192602092909190829003018186803b158015610cb557600080fd5b505afa158015610cc9573d6000803e3d6000fd5b505050506040513d6020811015610cdf57600080fd5b5051604080516001600160a01b038981166024830152888116604483015287811660648301526084820187905285151560a4808401919091528351808403909101815260c490920183526020820180516001600160e01b031662a718a960e01b17815292518251949550600094606094928716939282918083835b60208310610d795780518252601f199092019160209182019101610d5a565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d8060008114610dd9576040519150601f19603f3d011682016040523d82523d6000602084013e610dde565b606091505b509150915081610e1a576040805162461bcd60e51b81526020600482015260026024820152610c8d60f21b604482015290519081900360640190fd5b60006060828060200190516040811015610e3357600080fd5b815160208301805160405192949293830192919084640100000000821115610e5a57600080fd5b908301906020820185811115610e6f57600080fd5b8251640100000000811182820188101715610e8957600080fd5b82525081516020918201929091019080838360005b83811015610eb6578181015183820152602001610e9e565b50505050905090810190601f168015610ee35780820380516001836020036101000a031916815260200191505b506040525050509150915081600014610fd957806040516020018082805190602001908083835b60208310610f295780518252601f199092019160209182019101610f0a565b51815160209384036101000a60001901801990921691161790526040805192909401828103601f190183529384905262461bcd60e51b84526004840181815282516024860152825192965094508493604401925085019080838360005b83811015610f9e578181015183820152602001610f86565b50505050905090810190601f168015610fcb5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505060016000555050505050505050565b6060603980548060200260200160405190810160405280929190818152602001828054801561104257602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311611024575b5050505050905090565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561109057600080fd5b505afa1580156110a4573d6000803e3d6000fd5b505050506040513d60208110156110ba57600080fd5b50516001600160a01b0316146110fc576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b038087166000908152603760205260408082208151630b25f31560e01b815260048101919091528884166024820152878416604482015286841660648201526084810186905292841660a48401525173__$2ec35834968386f54fa313129cf94664e4$__92630b25f3159260c4808301939192829003018186803b15801561118a57600080fd5b505af415801561119e573d6000803e3d6000fd5b505050506111ab86613dc8565b505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b1580156111f757600080fd5b505afa15801561120b573d6000803e3d6000fd5b505050506040513d602081101561122157600080fd5b50516001600160a01b031614611263576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b039182166000908152603760205260409020600c0180546001600160a01b03191691909216179055565b6001600160a01b038083166000908152603760209081526040808320600981015482516370a0823160e01b815287871660048201529251949586958695869586958695869586958695939492909116926370a082319260248082019391829003018186803b15801561130557600080fd5b505afa158015611319573d6000803e3d6000fd5b505050506040513d602081101561132f57600080fd5b5051995061133d8b82613e6b565b909950975061134c8b82613f6e565b80975081985050508060010154935080600a0160009054906101000a90046001600160a01b03166001600160a01b031663e78c9b3b8c6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156113c857600080fd5b505afa1580156113dc573d6000803e3d6000fd5b505050506040513d60208110156113f257600080fd5b50516001600160a01b039b8c1660009081526038602090815260408083209f909e1682529d909d529a909b2054989b979a509598949793969495509093909260ff169150565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561147c57600080fd5b505afa158015611490573d6000803e3d6000fd5b505050506040513d60208110156114a657600080fd5b50516001600160a01b0316146114e8576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b03909116600090815260376020526040902060060155565b60008060008060008060008060008061151e614e7e565b506001600160a01b03808c16600081815260376020908152604091829020825161026081018452815481526001820154928101929092526002810154928201929092526003820154606082015260048201546080820152600582015460a0820152600682015460c0820152600782015460e0820152600882015461010082015260098201548416610120820152600a8201548416610140820152600b8201548416610160820152600c9091015492831661018082015264ffffffffff600160a01b8404166101a082015260ff600160c81b8404811615156101c0830152600160d01b8404811615156101e0830152600160d81b840481161515610200830152600160e01b840481161515610220830152600160e81b9093049092161515610240830152611651903063ffffffff61403a16565b8161014001516001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b15801561168f57600080fd5b505afa1580156116a3573d6000803e3d6000fd5b505050506040513d60208110156116b957600080fd5b5051610160830151604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b15801561170357600080fd5b505afa158015611717573d6000803e3d6000fd5b505050506040513d602081101561172d57600080fd5b50516020848101516040808701516060880151610140890151835163487b7e7960e11b815293519495929491936001600160a01b03909116926390f6fcf292600480840193829003018186803b15801561178657600080fd5b505afa15801561179a573d6000803e3d6000fd5b505050506040513d60208110156117b057600080fd5b810190808051906020019092919050505087600001518860800151896101a001519a509a509a509a509a509a509a509a509a509a50509193959799509193959799565b6001600160a01b0381166000908152603760205260408120611814906140e4565b92915050565b6001600160a01b039081166000908152603760205260409020600581015460068201546007830154600c840154600990940154929591949093808216939091169160ff600160d01b8304811692600160c81b8104821692600160d81b8204831692600160e01b8304811692600160e81b90041690565b600260005414156118d6576040805162461bcd60e51b815260206004820152601f6024820152600080516020614f87833981519152604482015290519081900360640190fd5b600260009081556001600160a01b038216808252603760209081526040808420338086526038845282862094865293909252832090929091819061191a9085613e6b565b9092509050611932848660008063ffffffff61412516565b50506001600055505050565b6039818154811061194b57fe5b6000918252602090912001546001600160a01b0316905081565b600260005414156119ab576040805162461bcd60e51b815260206004820152601f6024820152600080516020614f87833981519152604482015290519081900360640190fd5b60026000556119b8614f1a565b6001600160a01b038086166000818152603760209081526040808320948716835260388252808320938352929052206119f18483613e6b565b602085015283526000856002811115611a0657fe5b90506001816002811115611a1657fe5b14611a25578360200151611a28565b83515b60608501526000198714801590611a425750836060015187105b15611a4f57606084018790525b73__$69254465eb8f179ea24caa73cf68b23524$__63d454c1cc848a8a858a8a600001518b602001518c60600151346040518a63ffffffff1660e01b8152600401808a8152602001896001600160a01b03166001600160a01b03168152602001888152602001876002811115611ac157fe5b60ff168152602001866001600160a01b03166001600160a01b03168152602001858152602001848152602001838152602001828152602001995050505050505050505060006040518083038186803b158015611b1c57600080fd5b505af4158015611b30573d6000803e3d6000fd5b50505050611b3d83614455565b6001816002811115611b4b57fe5b1415611bcb57600a830154606085015160408051632770a7eb60e21b81526001600160a01b038981166004830152602482019390935290519190921691639dc29fac91604480830192600092919082900301818387803b158015611bae57600080fd5b505af1158015611bc2573d6000803e3d6000fd5b50505050611c41565b600b830154606085015160408051632770a7eb60e21b81526001600160a01b038981166004830152602482019390935290519190921691639dc29fac91604480830192600092919082900301818387803b158015611c2857600080fd5b505af1158015611c3c573d6000803e3d6000fd5b505050505b6060840151611c5b9084908a90600063ffffffff61412516565b6060840151611c7c906001600160a01b038a1690600063ffffffff6144ec16565b611c8e886001600160a01b0316614611565b15611cd0576000611cac85606001513461464790919063ffffffff16565b90508015611cce57611cce6001600160a01b038a16338363ffffffff61468916565b505b606084015160408051918252426020830152805133926001600160a01b0389811693908d16927f81cfb79463601de705d4cf6b8d69112983d76a685120e5e4d3581f30871b87fc9281900390910190a450506001600055505050505050565b60026000541415611d75576040805162461bcd60e51b815260206004820152601f6024820152600080516020614f87833981519152604482015290519081900360640190fd5b600260009081556001600160a01b038084168083526037602081815260408086203387526038808452828820958852948352958190206035548251631f94a27560e31b81529251919673__$69254465eb8f179ea24caa73cf68b23524$__9663d73dac72968a968d9691959294603994169263fca513a8926004808201939291829003018186803b158015611e0957600080fd5b505afa158015611e1d573d6000803e3d6000fd5b505050506040513d6020811015611e3357600080fd5b50516040516001600160e01b031960e089901b168152600481018781526001600160a01b0380881660248401526044830187905260648301869052831660a483015260c060848301908152845460c484018190529192909160e49091019085908015611ec857602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311611eaa575b505097505050505050505060006040518083038186803b158015611eeb57600080fd5b505af4158015611eff573d6000803e3d6000fd5b5050825460ff1916851580159190911784559150611f5390505760405133906001600160a01b038616907e058a56ea94653cdf4f152d227ace22d4c00ad99e2a43f58cb7d9e3feb295f290600090a3611f8a565b60405133906001600160a01b038616907f44c58d81365b66dd4b1a7f36c25aa97b8c71c361ee4937adc1a00000227db5dd90600090a35b505060016000555050565b60026000541415611fdb576040805162461bcd60e51b815260206004820152601f6024820152600080516020614f87833981519152604482015290519081900360640190fd5b6002600055611fe8614f57565b6001600160a01b038416600081815260376020526040902090612011903063ffffffff61403a16565b825261203661271061202a86600963ffffffff61470b16565b9063ffffffff61476416565b60608301819052612057906127109061202a90610bb863ffffffff61470b16565b6080830152815184111561209c5760405162461bcd60e51b8152600401808060200182810382526031815260200180614fa76031913960400191505060405180910390fd5b600082606001511180156120b4575060008260800151115b6120ef5760405162461bcd60e51b81526004018080602001828103825260328152602001806150e16032913960400191505060405180910390fd5b858061210b6001600160a01b038816828863ffffffff61468916565b816001600160a01b031663ee87255888888760600151896040518563ffffffff1660e01b815260040180856001600160a01b03166001600160a01b0316815260200184815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b8381101561219257818101518382015260200161217a565b50505050905090810190601f1680156121bf5780820380516001836020036101000a031916815260200191505b5095505050505050600060405180830381600087803b1580156121e157600080fd5b505af11580156121f5573d6000803e3d6000fd5b50600092506122169150506001600160a01b0389163063ffffffff61403a16565b60608601518651919250612230919063ffffffff6147a616565b811461226d5760405162461bcd60e51b815260040180806020018281038252603281526020018061503c6032913960400191505060405180910390fd5b8373__$5e6137a1b5a0a366e2874209b5abf71c10$__63a023726490918a88600001516122ab8a608001518b6060015161464790919063ffffffff16565b8a608001516040518663ffffffff1660e01b815260040180868152602001856001600160a01b03166001600160a01b031681526020018481526020018381526020018281526020019550505050505060006040518083038186803b15801561231257600080fd5b505af4158015612326573d6000803e3d6000fd5b505050506123c3603560009054906101000a90046001600160a01b03166001600160a01b031663ee8912966040518163ffffffff1660e01b815260040160206040518083038186803b15801561237b57600080fd5b505afa15801561238f573d6000803e3d6000fd5b505050506040513d60208110156123a557600080fd5b505160808701516001600160a01b038b16919063ffffffff61468916565b876001600160a01b0316896001600160a01b03167f5b8f46461c1dd69fb968f1a003acee221ea3e19540e350233b612ddb43433b558988606001518960800151426040518085815260200184815260200183815260200182815260200194505050505060405180910390a35050600160005550505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561248257600080fd5b505afa158015612496573d6000803e3d6000fd5b505050506040513d60208110156124ac57600080fd5b50516001600160a01b0316146124ee576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b03909116600090815260376020526040902060080155565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561255157600080fd5b505afa158015612565573d6000803e3d6000fd5b505050506040513d602081101561257b57600080fd5b50516001600160a01b0316146125bd576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b811561264e576001600160a01b0383166000908152603760205260408082208151637b1dd5df60e11b815260048101919091528315156024820152905173__$2ec35834968386f54fa313129cf94664e4$__9263f63babbe9260448082019391829003018186803b15801561263157600080fd5b505af4158015612645573d6000803e3d6000fd5b505050506126cd565b6001600160a01b03831660009081526037602052604080822081516372efab5360e11b81526004810191909152905173__$2ec35834968386f54fa313129cf94664e4$__9263e5df56a69260248082019391829003018186803b1580156126b457600080fd5b505af41580156126c8573d6000803e3d6000fd5b505050505b505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561271657600080fd5b505afa15801561272a573d6000803e3d6000fd5b505050506040513d602081101561274057600080fd5b50516001600160a01b031614612782576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b03909116600090815260376020526040902060070155565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b1580156127e557600080fd5b505afa1580156127f9573d6000803e3d6000fd5b505050506040513d602081101561280f57600080fd5b50516001600160a01b031614612851576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b039091166000908152603760205260409020600c018054911515600160d81b0260ff60d81b19909216919091179055565b600073__$7347ff53b2b46c21e26a37164ae7f6739f$__634d9afd5e858585603760386039603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b1580156128fc57600080fd5b505afa158015612910573d6000803e3d6000fd5b505050506040513d602081101561292657600080fd5b505160405160e089811b6001600160e01b03191682526001600160a01b0389811660048401908152898216602485015260448401899052606484018890526084840187905290841660c484015260a48301918252845460e4840181905290926101040190859080156129c157602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116129a3575b50509850505050505050505060206040518083038186803b1580156129e557600080fd5b505af41580156129f9573d6000803e3d6000fd5b505050506040513d6020811015612a0f57600080fd5b5051949350505050565b600281565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612a6257600080fd5b505afa158015612a76573d6000803e3d6000fd5b505050506040513d6020811015612a8c57600080fd5b50516001600160a01b031614612ace576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b039091166000908152603760205260409020600c018054911515600160e81b0260ff60e81b19909216919091179055565b60026000541415612b4c576040805162461bcd60e51b815260206004820152601f6024820152600080516020614f87833981519152604482015290519081900360640190fd5b600260009081556001600160a01b038086168083526037602090815260408085209388168552603882528085208386529091528084208151630d9e1f7160e11b81526004810185905260248101939093526044830187905290519293909273__$69254465eb8f179ea24caa73cf68b23524$__92631b3c3ee2926064808301939192829003018186803b158015612be257600080fd5b505af4158015612bf6573d6000803e3d6000fd5b505050508260001415612c0c57805460ff191681555b612c1582614455565b612c28828760008763ffffffff61412516565b612c426001600160a01b038716868663ffffffff61468916565b846001600160a01b0316866001600160a01b03167f9c4ed599cd8555b9c1e8cd7643240d7d71eb76b792948c49fcb4d411f7b6b3c68642604051808381526020018281526020019250505060405180910390a35050600160005550505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612ce657600080fd5b505afa158015612cfa573d6000803e3d6000fd5b505050506040513d6020811015612d1057600080fd5b50516001600160a01b031614612d52576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b038416600090815260376020526040808220815163126ee27360e11b81526004810191909152602481018690526044810185905260648101849052905173__$2ec35834968386f54fa313129cf94664e4$__926324ddc4e69260848082019391829003018186803b158015612dcd57600080fd5b505af4158015612de1573d6000803e3d6000fd5b5050505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612e2f57600080fd5b505afa158015612e43573d6000803e3d6000fd5b505050506040513d6020811015612e5957600080fd5b50516001600160a01b031614612e9b576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b038216600090815260376020526040902081612ecc57600c8101805460ff60e01b191690556126cd565b805415801590612ee0575060008160040154115b612f1b5760405162461bcd60e51b815260040180806020018281038252602481526020018061506e6024913960400191505060405180910390fd5b600c8101805460ff60e01b1916600160e01b179055505050565b600080600080600080600073__$7347ff53b2b46c21e26a37164ae7f6739f$__63901d711489603760386039603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b158015612faf57600080fd5b505afa158015612fc3573d6000803e3d6000fd5b505050506040513d6020811015612fd957600080fd5b50516040516001600160e01b031960e088901b1681526001600160a01b03808716600483019081526024830187905260448301869052908316608483015260a060648301908152845460a484018190529192909160c4909101908590801561306a57602002820191906000526020600020905b81546001600160a01b0316815260019091019060200180831161304c575b5050965050505050505060c06040518083038186803b15801561308c57600080fd5b505af41580156130a0573d6000803e3d6000fd5b505050506040513d60c08110156130b657600080fd5b5080516020808301516040808501516060860151608087015160a090970151603654845163ab8bb39360e01b8152600481018990526024810187905260448101859052606481018490526001600160a01b0390911660848201529351969e50939c50909a50949750939550935073__$7347ff53b2b46c21e26a37164ae7f6739f$__9263ab8bb3939260a48083019392829003018186803b15801561315a57600080fd5b505af415801561316e573d6000803e3d6000fd5b505050506040513d602081101561318457600080fd5b50519698959750939594919390925090565b60006131a0614800565b60025490915060ff16806131b757506131b7614805565b806131c3575060015481115b6131fe5760405162461bcd60e51b815260040180806020018281038252602e8152602001806150b3602e913960400191505060405180910390fd5b60025460ff1615801561321f576002805460ff191660019081179091558290555b603580546001600160a01b0319166001600160a01b03858116919091179182905560408051633efbbf0f60e21b81529051929091169163fbeefc3c91600480820192602092909190829003018186803b15801561327b57600080fd5b505afa15801561328f573d6000803e3d6000fd5b505050506040513d60208110156132a557600080fd5b5051603680546001600160a01b0319166001600160a01b0390921691909117905580156126cd576002805460ff19169055505050565b6035546001600160a01b031681565b60026000541415613330576040805162461bcd60e51b815260206004820152601f6024820152600080516020614f87833981519152604482015290519081900360640190fd5b600260009081556001600160a01b0380861680835260376020908152604080852033808752603884528287209487529383528186206036548351630e563a7d60e41b81526004810196909652602486018b9052925191969095909492169263e563a7d09260448082019391829003018186803b1580156133af57600080fd5b505afa1580156133c3573d6000803e3d6000fd5b505050506040513d60208110156133d957600080fd5b505160088401549091506000906134fc90600a0a61202a6134008a8663ffffffff6147a616565b603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b15801561344e57600080fd5b505afa158015613462573d6000803e3d6000fd5b505050506040513d602081101561347857600080fd5b50516040805163b3596f0760e01b81526001600160a01b038f811660048301529151919092169163b3596f07916024808301926020929190829003018186803b1580156134c457600080fd5b505afa1580156134d8573d6000803e3d6000fd5b505050506040513d60208110156134ee57600080fd5b50519063ffffffff61470b16565b905073__$69254465eb8f179ea24caa73cf68b23524$__634c20618285858b8b868c896019603760386039603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b15801561357557600080fd5b505afa158015613589573d6000803e3d6000fd5b505050506040513d602081101561359f57600080fd5b50516040516001600160e01b031960e08f901b168152600481018d8152602482018d90526001600160a01b03808d166044840152606483018c9052608483018b905260a483018a905260c4830189905260e48301889052610104830187905261012483018690528316610164830152610180610144830190815284546101848401819052919290916101a4909101908590801561366557602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311613647575b50509d505050505050505050505050505060006040518083038186803b15801561368e57600080fd5b505af41580156136a2573d6000803e3d6000fd5b505050506136af84614455565b60018660028111156136bd57fe5b60028111156136c857fe5b141561374c57600a840154600385015460408051630ab714fb60e11b8152336004820152602481018b90526044810192909252516001600160a01b039092169163156e29f69160648082019260009290919082900301818387803b15801561372f57600080fd5b505af1158015613743573d6000803e3d6000fd5b505050506137ba565b600b840154604080516340c10f1960e01b8152336004820152602481018a905290516001600160a01b03909216916340c10f199160448082019260009290919082900301818387803b1580156137a157600080fd5b505af11580156137b5573d6000803e3d6000fd5b505050505b60038401546137d2858a60008b63ffffffff61412516565b6137ec6001600160a01b038a16338a63ffffffff61468916565b61ffff8616336001600160a01b038b167fe002884724be85e729c98360169e709585b299ace6fbe12aa791d2fee6f652808b8b60018d600281111561382d57fe5b600281111561383857fe5b14613847578a60020154613849565b865b60408051938452602084019290925282820152426060830152519081900360800190a45050600160005550505050505050565b600260005414156138c2576040805162461bcd60e51b815260206004820152601f6024820152600080516020614f87833981519152604482015290519081900360640190fd5b600260009081556001600160a01b0380841680835260376020908152604080852093861685526038825280852092855291815292819020905162461bcd60e51b815260048101938452602f602482018190529293919282916044019061500d823960400191505060405180910390fd5b60001981565b6001600160a01b03811660009081526037602052604081206118149061480b565b6002600054141561399f576040805162461bcd60e51b815260206004820152601f6024820152600080516020614f87833981519152604482015290519081900360640190fd5b600260009081556001600160a01b0384168082526037602090815260408084203385526038835281852093855292909152808320815163664f158360e01b8152600481018490526024810187905291519293909273__$69254465eb8f179ea24caa73cf68b23524$__9263664f1583926044808301939192829003018186803b158015613a2b57600080fd5b505af4158015613a3f573d6000803e3d6000fd5b5050506009830154604080516370a0823160e01b815233600482015290516001600160a01b03909216925060009183916370a08231916024808301926020929190829003018186803b158015613a9457600080fd5b505afa158015613aa8573d6000803e3d6000fd5b505050506040513d6020811015613abe57600080fd5b5051159050613acc84614455565b613adf848888600063ffffffff61412516565b8015613af157825460ff191660011783555b604080516394362e8b60e01b81523360048201526024810188905290516001600160a01b038416916394362e8b91604480830192600092919082900301818387803b158015613b3f57600080fd5b505af1158015613b53573d6000803e3d6000fd5b50613b6d925050506001600160a01b0388168760016144ec565b60408051878152426020820152815161ffff88169233926001600160a01b038c16927fc12c57b1c73a2c3a2ea4613e9476abb3d8d146857aab7329e24243fb59710c82929181900390910190a4505060016000555050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015613c0c57600080fd5b505afa158015613c20573d6000803e3d6000fd5b505050506040513d6020811015613c3657600080fd5b50516001600160a01b031614613c78576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b03909116600090815260376020526040902060050155565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015613cdb57600080fd5b505afa158015613cef573d6000803e3d6000fd5b505050506040513d6020811015613d0557600080fd5b50516001600160a01b031614613d47576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b038116600090815260376020526040808220815163041e0b2d60e51b81526004810191909152905173__$2ec35834968386f54fa313129cf94664e4$__926383c165a09260248082019391829003018186803b158015613dad57600080fd5b505af4158015613dc1573d6000803e3d6000fd5b5050505050565b6000805b603954811015613e1557826001600160a01b031660398281548110613ded57fe5b6000918252602090912001546001600160a01b03161415613e0d57600191505b600101613dcc565b5080613e6757603980546001810182556000919091527fdc16fef70f8d5ddbc01ee3d903d1e69c18a3c7be080eb86a81e0578814ee58d30180546001600160a01b0319166001600160a01b0384161790555b5050565b600a810154604080516370a0823160e01b81526001600160a01b0385811660048301529151600093849316916370a08231916024808301926020929190829003018186803b158015613ebc57600080fd5b505afa158015613ed0573d6000803e3d6000fd5b505050506040513d6020811015613ee657600080fd5b5051600b840154604080516370a0823160e01b81526001600160a01b038881166004830152915191909216916370a08231916024808301926020929190829003018186803b158015613f3757600080fd5b505afa158015613f4b573d6000803e3d6000fd5b505050506040513d6020811015613f6157600080fd5b5051909590945092505050565b600a8101546040805163631a6fd560e11b81526001600160a01b03858116600483015291516000938493169163c634dfaa916024808301926020929190829003018186803b158015613fbf57600080fd5b505afa158015613fd3573d6000803e3d6000fd5b505050506040513d6020811015613fe957600080fd5b5051600b8401546040805163631a6fd560e11b81526001600160a01b0388811660048301529151919092169163c634dfaa916024808301926020929190829003018186803b158015613f3757600080fd5b600061404583614611565b1561405b57506001600160a01b03811631611814565b826001600160a01b03166370a08231836040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156140b157600080fd5b505afa1580156140c5573d6000803e3d6000fd5b505050506040513d60208110156140db57600080fd5b50519392505050565b60008061411e8360040154614112856002015486600c0160149054906101000a900464ffffffffff16614839565b9063ffffffff61489e16565b9392505050565b600a8401546040805163487b7e7960e11b815290516000926001600160a01b0316916390f6fcf2916004808301926020929190829003018186803b15801561416c57600080fd5b505afa158015614180573d6000803e3d6000fd5b505050506040513d602081101561419657600080fd5b5051905060006141b56001600160a01b0386163063ffffffff61403a16565b90506141c9856001600160a01b0316614611565b156141e1576141de813463ffffffff61464716565b90505b600c860154600090819081906001600160a01b03166357e37af08961421c89614210898d63ffffffff6147a616565b9063ffffffff61464716565b8c600a0160009054906101000a90046001600160a01b03166001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b15801561426c57600080fd5b505afa158015614280573d6000803e3d6000fd5b505050506040513d602081101561429657600080fd5b5051600b8e0154604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b1580156142df57600080fd5b505afa1580156142f3573d6000803e3d6000fd5b505050506040513d602081101561430957600080fd5b5051604080516001600160e01b031960e088901b1681526001600160a01b039095166004860152602485019390935260448401919091526064830152608482018990525160a4808301926060929190829003018186803b15801561436c57600080fd5b505afa158015614380573d6000803e3d6000fd5b505050506040513d606081101561439657600080fd5b50805160208083015160409384015160018e0184905560038e0182905560028e01819055600c8e01805464ffffffffff4216600160a01b0264ffffffffff60a01b199091161790558d5460048f015486518681529485018490528487018c905260608501839052608085019190915260a0840152935192965094509192506001600160a01b038a16917f131cf1f61e39fd78f61f07d78533f5b6c13629c80ef6965983e92c72efbaa4a4919081900360c00190a2505050505050505050565b6000614460826148d6565b90508015613e67576001820154600c83015460009161448c91600160a01b900464ffffffffff166149d6565b83549091506144a290829063ffffffff61489e16565b83556002830154600c8401546000916144c891600160a01b900464ffffffffff16614839565b90506144e184600401548261489e90919063ffffffff16565b600485015550505050565b816144f6576126cd565b6144ff83614611565b156145f657813410156145435760405162461bcd60e51b8152600401808060200182810382526035815260200180614fd86035913960400191505060405180910390fd5b80156145f15760003361455c348563ffffffff61464716565b60405161c35091906000818181858888f193505050503d806000811461459e576040519150601f19603f3d011682016040523d82523d6000602084013e6145a3565b606091505b50509050806145ef576040805162461bcd60e51b815260206004820152601360248201527211551217d514905394d1915497d19052531151606a1b604482015290519081900360640190fd5b505b6126cd565b6126cd6001600160a01b03841633308563ffffffff614a4216565b60006001600160a01b03821615806118145750506001600160a01b031673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee1490565b600061411e83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250614aa2565b80614693576126cd565b61469c83614611565b156146f1576040516000906001600160a01b0384169061c35090849084818181858888f193505050503d806000811461459e576040519150601f19603f3d011682016040523d82523d6000602084013e6145a3565b6126cd6001600160a01b038416838363ffffffff614afc16565b60008261471a57506000611814565b8282028284828161472757fe5b041461411e5760405162461bcd60e51b81526004018080602001828103825260218152602001806150926021913960400191505060405180910390fd5b600061411e83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250614b4e565b60008282018381101561411e576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600290565b303b1590565b60008061411e8360000154614112856001015486600c0160149054906101000a900464ffffffffff166149d6565b6000806148534264ffffffffff851663ffffffff61464716565b9050600061486b856301e1338063ffffffff61476416565b90506148958261488961487c614bb3565b849063ffffffff6147a616565b9063ffffffff614bc316565b95945050505050565b600061411e6b033b2e3c9fd0803ce800000061202a6148c3868663ffffffff61470b16565b6b019d971e4fe8401e74000000906147a6565b600061181482600b0160009054906101000a90046001600160a01b03166001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b15801561492b57600080fd5b505afa15801561493f573d6000803e3d6000fd5b505050506040513d602081101561495557600080fd5b5051600a840154604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b15801561499e57600080fd5b505afa1580156149b2573d6000803e3d6000fd5b505050506040513d60208110156149c857600080fd5b50519063ffffffff6147a616565b6000806149f04264ffffffffff851663ffffffff61464716565b90506000614a19614a046301e13380614c1d565b614a0d84614c1d565b9063ffffffff614c3316565b9050614895614a26614bb3565b614a36878463ffffffff61489e16565b9063ffffffff6147a616565b604080516001600160a01b0380861660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b179052614a9c908590614c56565b50505050565b60008184841115614af45760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610f9e578181015183820152602001610f86565b505050900390565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526126cd908490614c56565b60008183614b9d5760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610f9e578181015183820152602001610f86565b506000838581614ba957fe5b0495945050505050565b6b033b2e3c9fd0803ce800000090565b600060028206614bdf576b033b2e3c9fd0803ce8000000614be1565b825b90506002820491505b811561181457614bfa838461489e565b92506002820615614c1257614c0f818461489e565b90505b600282049150614bea565b600061181482633b9aca0063ffffffff61470b16565b600060028204610c1b8361202a61487c876b033b2e3c9fd0803ce800000061470b565b6060614cab826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b0316614d079092919063ffffffff16565b8051909150156126cd57808060200190516020811015614cca57600080fd5b50516126cd5760405162461bcd60e51b815260040180806020018281038252602a815260200180615113602a913960400191505060405180910390fd5b6060610c1b84846000856060614d1c85610be7565b614d6d576040805162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015290519081900360640190fd5b60006060866001600160a01b031685876040518082805190602001908083835b60208310614dac5780518252601f199092019160209182019101614d8d565b6001836020036101000a03801982511681845116808217855250505050505090500191505060006040518083038185875af1925050503d8060008114614e0e576040519150601f19603f3d011682016040523d82523d6000602084013e614e13565b606091505b50915091508115614e27579150610c1b9050565b805115614e375780518082602001fd5b60405162461bcd60e51b8152602060048201818152865160248401528651879391928392604401919085019080838360008315610f9e578181015183820152602001610f86565b6040805161026081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e08101829052610100810182905261012081018290526101408101829052610160810182905261018081018290526101a081018290526101c081018290526101e081018290526102008101829052610220810182905261024081019190915290565b6040518060e00160405280600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081525090565b6040518060a001604052806000815260200160008152602001600081526020016000815260200160008152509056fe5265656e7472616e637947756172643a207265656e7472616e742063616c6c005468657265206973206e6f7420656e6f756768206c697175696469747920617661696c61626c6520746f20626f72726f7754686520616d6f756e7420616e64207468652076616c75652073656e7420746f206465706f73697420646f206e6f74206d61746368496e746572657374207261746520726562616c616e636520636f6e646974696f6e732077657265206e6f74206d65745468652061637475616c2062616c616e6365206f66207468652070726f746f636f6c20697320696e636f6e73697374656e745265736572766520686173206e6f74206265656e20696e697469616c697a656420796574536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a65645468652072657175657374656420616d6f756e7420697320746f6f20736d616c6c20666f72206120466c6173684c6f616e2e5361666545524332303a204552433230206f7065726174696f6e20646964206e6f742073756363656564a2646970667358221220280e18aa50b3d32a7b0c06a15e30d49e16e0d3f3aeb382ebb1163de8764f879064736f6c63430006080033";
+  "0x6080604052600060015534801561001557600080fd5b5060016000556152498061002a6000396000f3fe6080604052600436106101fc5760003560e01c806373b2f2f21161010d578063c4d66de8116100a0578063d0fc81d21161006f578063d0fc81d214610afd578063d15e005314610b12578063d2d0e06614610b45578063d466016f14610b7b578063e8ae2f5b14610bb457610242565b8063c4d66de814610a31578063c72c4d1014610a64578063c858f5f914610a79578063cd11238214610ac257610242565b80639895e3d8116100dc5780639895e3d8146108fd578063a5bc826c14610946578063b736aaeb1461098b578063bf92857c146109c657610242565b806373b2f2f21461081b57806376e9d615146108565780638afaff02146108ad57806396e957c4146108c257610242565b80633e150141116101905780635a3b74b91161015f5780635a3b74b9146106585780635cffe9de1461069357806366bbd928146107665780636ee365f91461079f57806370fb84f4146107e257610242565b80633e1501411461051057806348ca1300146105a55780634fe7a6e5146105d8578063573ade811461061e57610242565b806328dd2d01116101cc57806328dd2d01146103845780633443a14b1461040857806335ea6a7514610441578063386497fd146104cb57610242565b8062a718a9146102475780630902f1ac1461028b57806309eab60f146102f05780631d2118f91461034957610242565b366102425761020a33610be7565b610240576040805162461bcd60e51b8152602060048201526002602482015261191960f11b604482015290519081900360640190fd5b005b600080fd5b610240600480360360a081101561025d57600080fd5b506001600160a01b038135811691602081013582169160408201351690606081013590608001351515610c23565b34801561029757600080fd5b506102a0610fea565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156102dc5781810151838201526020016102c4565b505050509050019250505060405180910390f35b3480156102fc57600080fd5b50610240600480360360c081101561031357600080fd5b506001600160a01b03813581169160208101358216916040820135811691606081013582169160808201359160a001351661104c565b34801561035557600080fd5b506102406004803603604081101561036c57600080fd5b506001600160a01b03813581169160200135166111b3565b34801561039057600080fd5b506103bf600480360360408110156103a757600080fd5b506001600160a01b0381358116916020013516611294565b60408051998a5260208a0198909852888801969096526060880194909452608087019290925260a086015260c085015260e0840152151561010083015251908190036101200190f35b34801561041457600080fd5b506102406004803603604081101561042b57600080fd5b506001600160a01b03813516906020013561150f565b34801561044d57600080fd5b506104746004803603602081101561046457600080fd5b50356001600160a01b03166115de565b604080519a8b5260208b0199909952898901979097526060890195909552608088019390935260a087019190915260c086015260e085015261010084015264ffffffffff1661012083015251908190036101400190f35b3480156104d757600080fd5b506104fe600480360360208110156104ee57600080fd5b50356001600160a01b03166118ca565b60408051918252519081900360200190f35b34801561051c57600080fd5b506105436004803603602081101561053357600080fd5b50356001600160a01b03166118f1565b604080519a8b5260208b0199909952898901979097526001600160a01b0395861660608a015293909416608088015290151560a0870152151560c086015290151560e08501521515610100840152151561012083015251908190036101400190f35b3480156105b157600080fd5b50610240600480360360208110156105c857600080fd5b50356001600160a01b0316611967565b3480156105e457600080fd5b50610602600480360360208110156105fb57600080fd5b5035611a15565b604080516001600160a01b039092168252519081900360200190f35b6102406004803603608081101561063457600080fd5b506001600160a01b0381358116916020810135916040820135916060013516611a3c565b34801561066457600080fd5b506102406004803603604081101561067b57600080fd5b506001600160a01b0381351690602001351515611e06565b34801561069f57600080fd5b50610240600480360360808110156106b657600080fd5b6001600160a01b038235811692602081013590911691604082013591908101906080810160608201356401000000008111156106f157600080fd5b82018360208201111561070357600080fd5b8035906020019184600183028401116401000000008311171561072557600080fd5b91908080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092955061206c945050505050565b34801561077257600080fd5b506102406004803603604081101561078957600080fd5b506001600160a01b038135169060200135612515565b3480156107ab57600080fd5b50610240600480360360608110156107c257600080fd5b506001600160a01b038135169060208101351515906040013515156125e4565b3480156107ee57600080fd5b506102406004803603604081101561080557600080fd5b506001600160a01b0381351690602001356127a9565b34801561082757600080fd5b506102406004803603604081101561083e57600080fd5b506001600160a01b0381351690602001351515612878565b34801561086257600080fd5b506108996004803603606081101561087957600080fd5b506001600160a01b03813581169160208101359091169060400135612960565b604080519115158252519081900360200190f35b3480156108b957600080fd5b506104fe612af0565b3480156108ce57600080fd5b50610240600480360360408110156108e557600080fd5b506001600160a01b0381351690602001351515612af5565b34801561090957600080fd5b506102406004803603608081101561092057600080fd5b506001600160a01b03813581169160208101359091169060408101359060600135612bdd565b34801561095257600080fd5b506102406004803603608081101561096957600080fd5b506001600160a01b038135169060208101359060408101359060600135612d79565b34801561099757600080fd5b50610240600480360360408110156109ae57600080fd5b506001600160a01b0381351690602001351515612ec2565b3480156109d257600080fd5b506109f9600480360360208110156109e957600080fd5b50356001600160a01b031661300c565b604080519788526020880196909652868601949094526060860192909252608085015260a084015260c0830152519081900360e00190f35b348015610a3d57600080fd5b5061024060048036036020811015610a5457600080fd5b50356001600160a01b031661326d565b348015610a7057600080fd5b506106026133b2565b348015610a8557600080fd5b5061024060048036036080811015610a9c57600080fd5b5080356001600160a01b0316906020810135906040810135906060013561ffff166133c1565b348015610ace57600080fd5b5061024060048036036040811015610ae557600080fd5b506001600160a01b0381358116916020013516613953565b348015610b0957600080fd5b506104fe613a09565b348015610b1e57600080fd5b506104fe60048036036020811015610b3557600080fd5b50356001600160a01b0316613a0f565b61024060048036036060811015610b5b57600080fd5b5080356001600160a01b0316906020810135906040013561ffff16613a30565b348015610b8757600080fd5b5061024060048036036040811015610b9e57600080fd5b506001600160a01b038135169060200135613c9f565b348015610bc057600080fd5b5061024060048036036020811015610bd757600080fd5b50356001600160a01b0316613d6e565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470818114801590610c1b57508115155b949350505050565b60026000541415610c69576040805162461bcd60e51b815260206004820152601f602482015260008051602061505e833981519152604482015290519081900360640190fd5b6002600090815560355460408051632c1a75cd60e11b815290516001600160a01b0390921691635834eb9a91600480820192602092909190829003018186803b158015610cb557600080fd5b505afa158015610cc9573d6000803e3d6000fd5b505050506040513d6020811015610cdf57600080fd5b5051604080516001600160a01b038981166024830152888116604483015287811660648301526084820187905285151560a4808401919091528351808403909101815260c490920183526020820180516001600160e01b031662a718a960e01b17815292518251949550600094606094928716939282918083835b60208310610d795780518252601f199092019160209182019101610d5a565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d8060008114610dd9576040519150601f19603f3d011682016040523d82523d6000602084013e610dde565b606091505b509150915081610e1a576040805162461bcd60e51b81526020600482015260026024820152610c8d60f21b604482015290519081900360640190fd5b60006060828060200190516040811015610e3357600080fd5b815160208301805160405192949293830192919084640100000000821115610e5a57600080fd5b908301906020820185811115610e6f57600080fd5b8251640100000000811182820188101715610e8957600080fd5b82525081516020918201929091019080838360005b83811015610eb6578181015183820152602001610e9e565b50505050905090810190601f168015610ee35780820380516001836020036101000a031916815260200191505b506040525050509150915081600014610fd957806040516020018082805190602001908083835b60208310610f295780518252601f199092019160209182019101610f0a565b51815160209384036101000a60001901801990921691161790526040805192909401828103601f190183529384905262461bcd60e51b84526004840181815282516024860152825192965094508493604401925085019080838360005b83811015610f9e578181015183820152602001610f86565b50505050905090810190601f168015610fcb5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505060016000555050505050505050565b6060603980548060200260200160405190810160405280929190818152602001828054801561104257602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311611024575b5050505050905090565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561109057600080fd5b505afa1580156110a4573d6000803e3d6000fd5b505050506040513d60208110156110ba57600080fd5b50516001600160a01b0316146110fc576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b038087166000908152603760205260408082208151630b25f31560e01b815260048101919091528884166024820152878416604482015286841660648201526084810186905292841660a48401525173__$2ec35834968386f54fa313129cf94664e4$__92630b25f3159260c4808301939192829003018186803b15801561118a57600080fd5b505af415801561119e573d6000803e3d6000fd5b505050506111ab86613e9f565b505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b1580156111f757600080fd5b505afa15801561120b573d6000803e3d6000fd5b505050506040513d602081101561122157600080fd5b50516001600160a01b031614611263576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b039182166000908152603760205260409020600c0180546001600160a01b03191691909216179055565b6001600160a01b038083166000908152603760209081526040808320600981015482516370a0823160e01b815287871660048201529251949586958695869586958695869586958695939492909116926370a082319260248082019391829003018186803b15801561130557600080fd5b505afa158015611319573d6000803e3d6000fd5b505050506040513d602081101561132f57600080fd5b5051995061133d8b82613f42565b909950975061134c8b82614045565b80975081985050508060010154935080600a0160009054906101000a90046001600160a01b03166001600160a01b031663e78c9b3b8c6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156113c857600080fd5b505afa1580156113dc573d6000803e3d6000fd5b505050506040513d60208110156113f257600080fd5b81019080805190602001909291905050509450603860008c6001600160a01b03166001600160a01b0316815260200190815260200160002060008d6001600160a01b03166001600160a01b0316815260200190815260200160002060000160009054906101000a900460ff16915080600b0160009054906101000a90046001600160a01b03166001600160a01b031663ee9907a48c6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156114cd57600080fd5b505afa1580156114e1573d6000803e3d6000fd5b505050506040513d60208110156114f757600080fd5b5051999c989b50969950949793969295509093919050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561155357600080fd5b505afa158015611567573d6000803e3d6000fd5b505050506040513d602081101561157d57600080fd5b50516001600160a01b0316146115bf576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b03909116600090815260376020526040902060060155565b6000806000806000806000806000806115f5614f55565b506001600160a01b03808c16600081815260376020908152604091829020825161026081018452815481526001820154928101929092526002810154928201929092526003820154606082015260048201546080820152600582015460a0820152600682015460c0820152600782015460e0820152600882015461010082015260098201548416610120820152600a8201548416610140820152600b8201548416610160820152600c9091015492831661018082015264ffffffffff600160a01b8404166101a082015260ff600160c81b8404811615156101c0830152600160d01b8404811615156101e0830152600160d81b840481161515610200830152600160e01b840481161515610220830152600160e81b9093049092161515610240830152611728903063ffffffff61411116565b8161014001516001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b15801561176657600080fd5b505afa15801561177a573d6000803e3d6000fd5b505050506040513d602081101561179057600080fd5b5051610160830151604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b1580156117da57600080fd5b505afa1580156117ee573d6000803e3d6000fd5b505050506040513d602081101561180457600080fd5b50516020848101516040808701516060880151610140890151835163487b7e7960e11b815293519495929491936001600160a01b03909116926390f6fcf292600480840193829003018186803b15801561185d57600080fd5b505afa158015611871573d6000803e3d6000fd5b505050506040513d602081101561188757600080fd5b810190808051906020019092919050505087600001518860800151896101a001519a509a509a509a509a509a509a509a509a509a50509193959799509193959799565b6001600160a01b03811660009081526037602052604081206118eb906141bb565b92915050565b6001600160a01b039081166000908152603760205260409020600581015460068201546007830154600c840154600990940154929591949093808216939091169160ff600160d01b8304811692600160c81b8104821692600160d81b8204831692600160e01b8304811692600160e81b90041690565b600260005414156119ad576040805162461bcd60e51b815260206004820152601f602482015260008051602061505e833981519152604482015290519081900360640190fd5b600260009081556001600160a01b03821680825260376020908152604080842033808652603884528286209486529390925283209092909181906119f19085613f42565b9092509050611a09848660008063ffffffff6141fc16565b50506001600055505050565b60398181548110611a2257fe5b6000918252602090912001546001600160a01b0316905081565b60026000541415611a82576040805162461bcd60e51b815260206004820152601f602482015260008051602061505e833981519152604482015290519081900360640190fd5b6002600055611a8f614ff1565b6001600160a01b03808616600081815260376020908152604080832094871683526038825280832093835292905220611ac88483613f42565b602085015283526000856002811115611add57fe5b90506001816002811115611aed57fe5b14611afc578360200151611aff565b83515b60608501526000198714801590611b195750836060015187105b15611b2657606084018790525b73__$69254465eb8f179ea24caa73cf68b23524$__63d454c1cc848a8a858a8a600001518b602001518c60600151346040518a63ffffffff1660e01b8152600401808a8152602001896001600160a01b03166001600160a01b03168152602001888152602001876002811115611b9857fe5b60ff168152602001866001600160a01b03166001600160a01b03168152602001858152602001848152602001838152602001828152602001995050505050505050505060006040518083038186803b158015611bf357600080fd5b505af4158015611c07573d6000803e3d6000fd5b50505050611c148361452c565b6001816002811115611c2257fe5b1415611ca257600a830154606085015160408051632770a7eb60e21b81526001600160a01b038981166004830152602482019390935290519190921691639dc29fac91604480830192600092919082900301818387803b158015611c8557600080fd5b505af1158015611c99573d6000803e3d6000fd5b50505050611d18565b600b830154606085015160408051632770a7eb60e21b81526001600160a01b038981166004830152602482019390935290519190921691639dc29fac91604480830192600092919082900301818387803b158015611cff57600080fd5b505af1158015611d13573d6000803e3d6000fd5b505050505b6060840151611d329084908a90600063ffffffff6141fc16565b6060840151611d53906001600160a01b038a1690600063ffffffff6145c316565b611d65886001600160a01b03166146e8565b15611da7576000611d8385606001513461471e90919063ffffffff16565b90508015611da557611da56001600160a01b038a16338363ffffffff61476016565b505b606084015160408051918252426020830152805133926001600160a01b0389811693908d16927f81cfb79463601de705d4cf6b8d69112983d76a685120e5e4d3581f30871b87fc9281900390910190a450506001600055505050505050565b60026000541415611e4c576040805162461bcd60e51b815260206004820152601f602482015260008051602061505e833981519152604482015290519081900360640190fd5b600260009081556001600160a01b038084168083526037602081815260408086203387526038808452828820958852948352958190206035548251631f94a27560e31b81529251919673__$69254465eb8f179ea24caa73cf68b23524$__9663d73dac72968a968d9691959294603994169263fca513a8926004808201939291829003018186803b158015611ee057600080fd5b505afa158015611ef4573d6000803e3d6000fd5b505050506040513d6020811015611f0a57600080fd5b50516040516001600160e01b031960e089901b168152600481018781526001600160a01b0380881660248401526044830187905260648301869052831660a483015260c060848301908152845460c484018190529192909160e49091019085908015611f9f57602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311611f81575b505097505050505050505060006040518083038186803b158015611fc257600080fd5b505af4158015611fd6573d6000803e3d6000fd5b5050825460ff191685158015919091178455915061202a90505760405133906001600160a01b038616907e058a56ea94653cdf4f152d227ace22d4c00ad99e2a43f58cb7d9e3feb295f290600090a3612061565b60405133906001600160a01b038616907f44c58d81365b66dd4b1a7f36c25aa97b8c71c361ee4937adc1a00000227db5dd90600090a35b505060016000555050565b600260005414156120b2576040805162461bcd60e51b815260206004820152601f602482015260008051602061505e833981519152604482015290519081900360640190fd5b60026000556120bf61502e565b6001600160a01b0384166000818152603760205260409020906120e8903063ffffffff61411116565b825261210d61271061210186600963ffffffff6147e216565b9063ffffffff61483b16565b6060830181905261212e906127109061210190610bb863ffffffff6147e216565b608083015281518411156121735760405162461bcd60e51b815260040180806020018281038252603181526020018061507e6031913960400191505060405180910390fd5b6000826060015111801561218b575060008260800151115b6121c65760405162461bcd60e51b81526004018080602001828103825260328152602001806151b86032913960400191505060405180910390fd5b85806121e26001600160a01b038816828863ffffffff61476016565b816001600160a01b031663ee87255888888760600151896040518563ffffffff1660e01b815260040180856001600160a01b03166001600160a01b0316815260200184815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b83811015612269578181015183820152602001612251565b50505050905090810190601f1680156122965780820380516001836020036101000a031916815260200191505b5095505050505050600060405180830381600087803b1580156122b857600080fd5b505af11580156122cc573d6000803e3d6000fd5b50600092506122ed9150506001600160a01b0389163063ffffffff61411116565b60608601518651919250612307919063ffffffff61487d16565b81146123445760405162461bcd60e51b81526004018080602001828103825260328152602001806151136032913960400191505060405180910390fd5b8373__$5e6137a1b5a0a366e2874209b5abf71c10$__63a023726490918a88600001516123828a608001518b6060015161471e90919063ffffffff16565b8a608001516040518663ffffffff1660e01b815260040180868152602001856001600160a01b03166001600160a01b031681526020018481526020018381526020018281526020019550505050505060006040518083038186803b1580156123e957600080fd5b505af41580156123fd573d6000803e3d6000fd5b5050505061249a603560009054906101000a90046001600160a01b03166001600160a01b031663ee8912966040518163ffffffff1660e01b815260040160206040518083038186803b15801561245257600080fd5b505afa158015612466573d6000803e3d6000fd5b505050506040513d602081101561247c57600080fd5b505160808701516001600160a01b038b16919063ffffffff61476016565b876001600160a01b0316896001600160a01b03167f5b8f46461c1dd69fb968f1a003acee221ea3e19540e350233b612ddb43433b558988606001518960800151426040518085815260200184815260200183815260200182815260200194505050505060405180910390a35050600160005550505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561255957600080fd5b505afa15801561256d573d6000803e3d6000fd5b505050506040513d602081101561258357600080fd5b50516001600160a01b0316146125c5576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b03909116600090815260376020526040902060080155565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561262857600080fd5b505afa15801561263c573d6000803e3d6000fd5b505050506040513d602081101561265257600080fd5b50516001600160a01b031614612694576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b8115612725576001600160a01b0383166000908152603760205260408082208151637b1dd5df60e11b815260048101919091528315156024820152905173__$2ec35834968386f54fa313129cf94664e4$__9263f63babbe9260448082019391829003018186803b15801561270857600080fd5b505af415801561271c573d6000803e3d6000fd5b505050506127a4565b6001600160a01b03831660009081526037602052604080822081516372efab5360e11b81526004810191909152905173__$2ec35834968386f54fa313129cf94664e4$__9263e5df56a69260248082019391829003018186803b15801561278b57600080fd5b505af415801561279f573d6000803e3d6000fd5b505050505b505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b1580156127ed57600080fd5b505afa158015612801573d6000803e3d6000fd5b505050506040513d602081101561281757600080fd5b50516001600160a01b031614612859576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b03909116600090815260376020526040902060070155565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b1580156128bc57600080fd5b505afa1580156128d0573d6000803e3d6000fd5b505050506040513d60208110156128e657600080fd5b50516001600160a01b031614612928576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b039091166000908152603760205260409020600c018054911515600160d81b0260ff60d81b19909216919091179055565b600073__$7347ff53b2b46c21e26a37164ae7f6739f$__634d9afd5e858585603760386039603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b1580156129d357600080fd5b505afa1580156129e7573d6000803e3d6000fd5b505050506040513d60208110156129fd57600080fd5b505160405160e089811b6001600160e01b03191682526001600160a01b0389811660048401908152898216602485015260448401899052606484018890526084840187905290841660c484015260a48301918252845460e484018190529092610104019085908015612a9857602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311612a7a575b50509850505050505050505060206040518083038186803b158015612abc57600080fd5b505af4158015612ad0573d6000803e3d6000fd5b505050506040513d6020811015612ae657600080fd5b5051949350505050565b600281565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612b3957600080fd5b505afa158015612b4d573d6000803e3d6000fd5b505050506040513d6020811015612b6357600080fd5b50516001600160a01b031614612ba5576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b039091166000908152603760205260409020600c018054911515600160e81b0260ff60e81b19909216919091179055565b60026000541415612c23576040805162461bcd60e51b815260206004820152601f602482015260008051602061505e833981519152604482015290519081900360640190fd5b600260009081556001600160a01b038086168083526037602090815260408085209388168552603882528085208386529091528084208151630d9e1f7160e11b81526004810185905260248101939093526044830187905290519293909273__$69254465eb8f179ea24caa73cf68b23524$__92631b3c3ee2926064808301939192829003018186803b158015612cb957600080fd5b505af4158015612ccd573d6000803e3d6000fd5b505050508260001415612ce357805460ff191681555b612cec8261452c565b612cff828760008763ffffffff6141fc16565b612d196001600160a01b038716868663ffffffff61476016565b846001600160a01b0316866001600160a01b03167f9c4ed599cd8555b9c1e8cd7643240d7d71eb76b792948c49fcb4d411f7b6b3c68642604051808381526020018281526020019250505060405180910390a35050600160005550505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612dbd57600080fd5b505afa158015612dd1573d6000803e3d6000fd5b505050506040513d6020811015612de757600080fd5b50516001600160a01b031614612e29576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b038416600090815260376020526040808220815163126ee27360e11b81526004810191909152602481018690526044810185905260648101849052905173__$2ec35834968386f54fa313129cf94664e4$__926324ddc4e69260848082019391829003018186803b158015612ea457600080fd5b505af4158015612eb8573d6000803e3d6000fd5b5050505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612f0657600080fd5b505afa158015612f1a573d6000803e3d6000fd5b505050506040513d6020811015612f3057600080fd5b50516001600160a01b031614612f72576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b038216600090815260376020526040902081612fa357600c8101805460ff60e01b191690556127a4565b805415801590612fb7575060008160040154115b612ff25760405162461bcd60e51b81526004018080602001828103825260248152602001806151456024913960400191505060405180910390fd5b600c8101805460ff60e01b1916600160e01b179055505050565b600080600080600080600073__$7347ff53b2b46c21e26a37164ae7f6739f$__63901d711489603760386039603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b15801561308657600080fd5b505afa15801561309a573d6000803e3d6000fd5b505050506040513d60208110156130b057600080fd5b50516040516001600160e01b031960e088901b1681526001600160a01b03808716600483019081526024830187905260448301869052908316608483015260a060648301908152845460a484018190529192909160c4909101908590801561314157602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311613123575b5050965050505050505060c06040518083038186803b15801561316357600080fd5b505af4158015613177573d6000803e3d6000fd5b505050506040513d60c081101561318d57600080fd5b5080516020808301516040808501516060860151608087015160a090970151603654845163ab8bb39360e01b8152600481018990526024810187905260448101859052606481018490526001600160a01b0390911660848201529351969e50939c50909a50949750939550935073__$7347ff53b2b46c21e26a37164ae7f6739f$__9263ab8bb3939260a48083019392829003018186803b15801561323157600080fd5b505af4158015613245573d6000803e3d6000fd5b505050506040513d602081101561325b57600080fd5b50519698959750939594919390925090565b60006132776148d7565b60025490915060ff168061328e575061328e6148dc565b8061329a575060015481115b6132d55760405162461bcd60e51b815260040180806020018281038252602e81526020018061518a602e913960400191505060405180910390fd5b60025460ff161580156132f6576002805460ff191660019081179091558290555b603580546001600160a01b0319166001600160a01b03858116919091179182905560408051633efbbf0f60e21b81529051929091169163fbeefc3c91600480820192602092909190829003018186803b15801561335257600080fd5b505afa158015613366573d6000803e3d6000fd5b505050506040513d602081101561337c57600080fd5b5051603680546001600160a01b0319166001600160a01b0390921691909117905580156127a4576002805460ff19169055505050565b6035546001600160a01b031681565b60026000541415613407576040805162461bcd60e51b815260206004820152601f602482015260008051602061505e833981519152604482015290519081900360640190fd5b600260009081556001600160a01b0380861680835260376020908152604080852033808752603884528287209487529383528186206036548351630e563a7d60e41b81526004810196909652602486018b9052925191969095909492169263e563a7d09260448082019391829003018186803b15801561348657600080fd5b505afa15801561349a573d6000803e3d6000fd5b505050506040513d60208110156134b057600080fd5b505160088401549091506000906135d390600a0a6121016134d78a8663ffffffff61487d16565b603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b15801561352557600080fd5b505afa158015613539573d6000803e3d6000fd5b505050506040513d602081101561354f57600080fd5b50516040805163b3596f0760e01b81526001600160a01b038f811660048301529151919092169163b3596f07916024808301926020929190829003018186803b15801561359b57600080fd5b505afa1580156135af573d6000803e3d6000fd5b505050506040513d60208110156135c557600080fd5b50519063ffffffff6147e216565b905073__$69254465eb8f179ea24caa73cf68b23524$__634c20618285858b8b868c896019603760386039603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b15801561364c57600080fd5b505afa158015613660573d6000803e3d6000fd5b505050506040513d602081101561367657600080fd5b50516040516001600160e01b031960e08f901b168152600481018d8152602482018d90526001600160a01b03808d166044840152606483018c9052608483018b905260a483018a905260c4830189905260e48301889052610104830187905261012483018690528316610164830152610180610144830190815284546101848401819052919290916101a4909101908590801561373c57602002820191906000526020600020905b81546001600160a01b0316815260019091019060200180831161371e575b50509d505050505050505050505050505060006040518083038186803b15801561376557600080fd5b505af4158015613779573d6000803e3d6000fd5b505050506137868461452c565b600186600281111561379457fe5b600281111561379f57fe5b141561382357600a840154600385015460408051630ab714fb60e11b8152336004820152602481018b90526044810192909252516001600160a01b039092169163156e29f69160648082019260009290919082900301818387803b15801561380657600080fd5b505af115801561381a573d6000803e3d6000fd5b50505050613891565b600b840154604080516340c10f1960e01b8152336004820152602481018a905290516001600160a01b03909216916340c10f199160448082019260009290919082900301818387803b15801561387857600080fd5b505af115801561388c573d6000803e3d6000fd5b505050505b60038401546138a9858a60008b63ffffffff6141fc16565b6138c36001600160a01b038a16338a63ffffffff61476016565b61ffff8616336001600160a01b038b167fe002884724be85e729c98360169e709585b299ace6fbe12aa791d2fee6f652808b8b60018d600281111561390457fe5b600281111561390f57fe5b1461391e578a60020154613920565b865b60408051938452602084019290925282820152426060830152519081900360800190a45050600160005550505050505050565b60026000541415613999576040805162461bcd60e51b815260206004820152601f602482015260008051602061505e833981519152604482015290519081900360640190fd5b600260009081556001600160a01b0380841680835260376020908152604080852093861685526038825280852092855291815292819020905162461bcd60e51b815260048101938452602f60248201819052929391928291604401906150e4823960400191505060405180910390fd5b60001981565b6001600160a01b03811660009081526037602052604081206118eb906148e2565b60026000541415613a76576040805162461bcd60e51b815260206004820152601f602482015260008051602061505e833981519152604482015290519081900360640190fd5b600260009081556001600160a01b0384168082526037602090815260408084203385526038835281852093855292909152808320815163664f158360e01b8152600481018490526024810187905291519293909273__$69254465eb8f179ea24caa73cf68b23524$__9263664f1583926044808301939192829003018186803b158015613b0257600080fd5b505af4158015613b16573d6000803e3d6000fd5b5050506009830154604080516370a0823160e01b815233600482015290516001600160a01b03909216925060009183916370a08231916024808301926020929190829003018186803b158015613b6b57600080fd5b505afa158015613b7f573d6000803e3d6000fd5b505050506040513d6020811015613b9557600080fd5b5051159050613ba38461452c565b613bb6848888600063ffffffff6141fc16565b8015613bc857825460ff191660011783555b604080516394362e8b60e01b81523360048201526024810188905290516001600160a01b038416916394362e8b91604480830192600092919082900301818387803b158015613c1657600080fd5b505af1158015613c2a573d6000803e3d6000fd5b50613c44925050506001600160a01b0388168760016145c3565b60408051878152426020820152815161ffff88169233926001600160a01b038c16927fc12c57b1c73a2c3a2ea4613e9476abb3d8d146857aab7329e24243fb59710c82929181900390910190a4505060016000555050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015613ce357600080fd5b505afa158015613cf7573d6000803e3d6000fd5b505050506040513d6020811015613d0d57600080fd5b50516001600160a01b031614613d4f576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b03909116600090815260376020526040902060050155565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015613db257600080fd5b505afa158015613dc6573d6000803e3d6000fd5b505050506040513d6020811015613ddc57600080fd5b50516001600160a01b031614613e1e576040805162461bcd60e51b8152602060048201526002602482015261033360f41b604482015290519081900360640190fd5b6001600160a01b038116600090815260376020526040808220815163041e0b2d60e51b81526004810191909152905173__$2ec35834968386f54fa313129cf94664e4$__926383c165a09260248082019391829003018186803b158015613e8457600080fd5b505af4158015613e98573d6000803e3d6000fd5b5050505050565b6000805b603954811015613eec57826001600160a01b031660398281548110613ec457fe5b6000918252602090912001546001600160a01b03161415613ee457600191505b600101613ea3565b5080613f3e57603980546001810182556000919091527fdc16fef70f8d5ddbc01ee3d903d1e69c18a3c7be080eb86a81e0578814ee58d30180546001600160a01b0319166001600160a01b0384161790555b5050565b600a810154604080516370a0823160e01b81526001600160a01b0385811660048301529151600093849316916370a08231916024808301926020929190829003018186803b158015613f9357600080fd5b505afa158015613fa7573d6000803e3d6000fd5b505050506040513d6020811015613fbd57600080fd5b5051600b840154604080516370a0823160e01b81526001600160a01b038881166004830152915191909216916370a08231916024808301926020929190829003018186803b15801561400e57600080fd5b505afa158015614022573d6000803e3d6000fd5b505050506040513d602081101561403857600080fd5b5051909590945092505050565b600a8101546040805163631a6fd560e11b81526001600160a01b03858116600483015291516000938493169163c634dfaa916024808301926020929190829003018186803b15801561409657600080fd5b505afa1580156140aa573d6000803e3d6000fd5b505050506040513d60208110156140c057600080fd5b5051600b8401546040805163631a6fd560e11b81526001600160a01b0388811660048301529151919092169163c634dfaa916024808301926020929190829003018186803b15801561400e57600080fd5b600061411c836146e8565b1561413257506001600160a01b038116316118eb565b826001600160a01b03166370a08231836040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561418857600080fd5b505afa15801561419c573d6000803e3d6000fd5b505050506040513d60208110156141b257600080fd5b50519392505050565b6000806141f583600401546141e9856002015486600c0160149054906101000a900464ffffffffff16614910565b9063ffffffff61497516565b9392505050565b600a8401546040805163487b7e7960e11b815290516000926001600160a01b0316916390f6fcf2916004808301926020929190829003018186803b15801561424357600080fd5b505afa158015614257573d6000803e3d6000fd5b505050506040513d602081101561426d57600080fd5b50519050600061428c6001600160a01b0386163063ffffffff61411116565b90506142a0856001600160a01b03166146e8565b156142b8576142b5813463ffffffff61471e16565b90505b600c860154600090819081906001600160a01b03166357e37af0896142f3896142e7898d63ffffffff61487d16565b9063ffffffff61471e16565b8c600a0160009054906101000a90046001600160a01b03166001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b15801561434357600080fd5b505afa158015614357573d6000803e3d6000fd5b505050506040513d602081101561436d57600080fd5b5051600b8e0154604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b1580156143b657600080fd5b505afa1580156143ca573d6000803e3d6000fd5b505050506040513d60208110156143e057600080fd5b5051604080516001600160e01b031960e088901b1681526001600160a01b039095166004860152602485019390935260448401919091526064830152608482018990525160a4808301926060929190829003018186803b15801561444357600080fd5b505afa158015614457573d6000803e3d6000fd5b505050506040513d606081101561446d57600080fd5b50805160208083015160409384015160018e0184905560038e0182905560028e01819055600c8e01805464ffffffffff4216600160a01b0264ffffffffff60a01b199091161790558d5460048f015486518681529485018490528487018c905260608501839052608085019190915260a0840152935192965094509192506001600160a01b038a16917f131cf1f61e39fd78f61f07d78533f5b6c13629c80ef6965983e92c72efbaa4a4919081900360c00190a2505050505050505050565b6000614537826149ad565b90508015613f3e576001820154600c83015460009161456391600160a01b900464ffffffffff16614aad565b835490915061457990829063ffffffff61497516565b83556002830154600c84015460009161459f91600160a01b900464ffffffffff16614910565b90506145b884600401548261497590919063ffffffff16565b600485015550505050565b816145cd576127a4565b6145d6836146e8565b156146cd578134101561461a5760405162461bcd60e51b81526004018080602001828103825260358152602001806150af6035913960400191505060405180910390fd5b80156146c857600033614633348563ffffffff61471e16565b60405161c35091906000818181858888f193505050503d8060008114614675576040519150601f19603f3d011682016040523d82523d6000602084013e61467a565b606091505b50509050806146c6576040805162461bcd60e51b815260206004820152601360248201527211551217d514905394d1915497d19052531151606a1b604482015290519081900360640190fd5b505b6127a4565b6127a46001600160a01b03841633308563ffffffff614b1916565b60006001600160a01b03821615806118eb5750506001600160a01b031673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee1490565b60006141f583836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250614b79565b8061476a576127a4565b614773836146e8565b156147c8576040516000906001600160a01b0384169061c35090849084818181858888f193505050503d8060008114614675576040519150601f19603f3d011682016040523d82523d6000602084013e61467a565b6127a46001600160a01b038416838363ffffffff614bd316565b6000826147f1575060006118eb565b828202828482816147fe57fe5b04146141f55760405162461bcd60e51b81526004018080602001828103825260218152602001806151696021913960400191505060405180910390fd5b60006141f583836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250614c25565b6000828201838110156141f5576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600290565b303b1590565b6000806141f583600001546141e9856001015486600c0160149054906101000a900464ffffffffff16614aad565b60008061492a4264ffffffffff851663ffffffff61471e16565b90506000614942856301e1338063ffffffff61483b16565b905061496c82614960614953614c8a565b849063ffffffff61487d16565b9063ffffffff614c9a16565b95945050505050565b60006141f56b033b2e3c9fd0803ce800000061210161499a868663ffffffff6147e216565b6b019d971e4fe8401e740000009061487d565b60006118eb82600b0160009054906101000a90046001600160a01b03166001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b158015614a0257600080fd5b505afa158015614a16573d6000803e3d6000fd5b505050506040513d6020811015614a2c57600080fd5b5051600a840154604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b158015614a7557600080fd5b505afa158015614a89573d6000803e3d6000fd5b505050506040513d6020811015614a9f57600080fd5b50519063ffffffff61487d16565b600080614ac74264ffffffffff851663ffffffff61471e16565b90506000614af0614adb6301e13380614cf4565b614ae484614cf4565b9063ffffffff614d0a16565b905061496c614afd614c8a565b614b0d878463ffffffff61497516565b9063ffffffff61487d16565b604080516001600160a01b0380861660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b179052614b73908590614d2d565b50505050565b60008184841115614bcb5760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610f9e578181015183820152602001610f86565b505050900390565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526127a4908490614d2d565b60008183614c745760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610f9e578181015183820152602001610f86565b506000838581614c8057fe5b0495945050505050565b6b033b2e3c9fd0803ce800000090565b600060028206614cb6576b033b2e3c9fd0803ce8000000614cb8565b825b90506002820491505b81156118eb57614cd18384614975565b92506002820615614ce957614ce68184614975565b90505b600282049150614cc1565b60006118eb82633b9aca0063ffffffff6147e216565b600060028204610c1b83612101614953876b033b2e3c9fd0803ce80000006147e2565b6060614d82826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b0316614dde9092919063ffffffff16565b8051909150156127a457808060200190516020811015614da157600080fd5b50516127a45760405162461bcd60e51b815260040180806020018281038252602a8152602001806151ea602a913960400191505060405180910390fd5b6060610c1b84846000856060614df385610be7565b614e44576040805162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015290519081900360640190fd5b60006060866001600160a01b031685876040518082805190602001908083835b60208310614e835780518252601f199092019160209182019101614e64565b6001836020036101000a03801982511681845116808217855250505050505090500191505060006040518083038185875af1925050503d8060008114614ee5576040519150601f19603f3d011682016040523d82523d6000602084013e614eea565b606091505b50915091508115614efe579150610c1b9050565b805115614f0e5780518082602001fd5b60405162461bcd60e51b8152602060048201818152865160248401528651879391928392604401919085019080838360008315610f9e578181015183820152602001610f86565b6040805161026081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e08101829052610100810182905261012081018290526101408101829052610160810182905261018081018290526101a081018290526101c081018290526101e081018290526102008101829052610220810182905261024081019190915290565b6040518060e00160405280600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081525090565b6040518060a001604052806000815260200160008152602001600081526020016000815260200160008152509056fe5265656e7472616e637947756172643a207265656e7472616e742063616c6c005468657265206973206e6f7420656e6f756768206c697175696469747920617661696c61626c6520746f20626f72726f7754686520616d6f756e7420616e64207468652076616c75652073656e7420746f206465706f73697420646f206e6f74206d61746368496e746572657374207261746520726562616c616e636520636f6e646974696f6e732077657265206e6f74206d65745468652061637475616c2062616c616e6365206f66207468652070726f746f636f6c20697320696e636f6e73697374656e745265736572766520686173206e6f74206265656e20696e697469616c697a656420796574536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a65645468652072657175657374656420616d6f756e7420697320746f6f20736d616c6c20666f72206120466c6173684c6f616e2e5361666545524332303a204552433230206f7065726174696f6e20646964206e6f742073756363656564a2646970667358221220b489b939086f1142c4335ffc9c414620d79ea70a90963f34bb383a11e7c6820064736f6c63430006080033";
 
 export interface LendingPoolLibraryAddresses {
   ["__$2ec35834968386f54fa313129cf94664e4$__"]: string;
diff --git a/types/LendingPoolLiquidationManagerFactory.ts b/types/LendingPoolLiquidationManagerFactory.ts
index 6f997de1..0ae98ac5 100644
--- a/types/LendingPoolLiquidationManagerFactory.ts
+++ b/types/LendingPoolLiquidationManagerFactory.ts
@@ -252,7 +252,7 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x6080604052600060015534801561001557600080fd5b50600160005561178d8061002a6000396000f3fe6080604052600436106100335760003560e01c8062a718a9146100385780634fe7a6e5146100fb578063c72c4d1014610141575b600080fd5b61007c600480360360a081101561004e57600080fd5b506001600160a01b038135811691602081013582169160408201351690606081013590608001351515610156565b6040518083815260200180602001828103825283818151815260200191508051906020019080838360005b838110156100bf5781810151838201526020016100a7565b50505050905090810190601f1680156100ec5780820380516001836020036101000a031916815260200191505b50935050505060405180910390f35b34801561010757600080fd5b506101256004803603602081101561011e57600080fd5b5035610a06565b604080516001600160a01b039092168252519081900360200190f35b34801561014d57600080fd5b50610125610a2d565b6001600160a01b038481166000818152603760209081526040808320948a1680845281842033855260388452828520958552949092528083209183528220919360609390929091906101a6611551565b73__$7347ff53b2b46c21e26a37164ae7f6739f$__63901d711433603760386039603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b15801561021557600080fd5b505afa158015610229573d6000803e3d6000fd5b505050506040513d602081101561023f57600080fd5b50516040516001600160e01b031960e088901b1681526001600160a01b03808716600483019081526024830187905260448301869052908316608483015260a060648301908152845460a484018190529192909160c490910190859080156102d057602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116102b2575b5050965050505050505060c06040518083038186803b1580156102f257600080fd5b505af4158015610306573d6000803e3d6000fd5b505050506040513d60c081101561031c57600080fd5b5060a001516101c08201819052670de0b6b3a764000011610360576004604051806060016040528060288152602001611706602891399650965050505050506109fc565b8b6001600160a01b03166370a082318b6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156103b657600080fd5b505afa1580156103ca573d6000803e3d6000fd5b505050506040513d60208110156103e057600080fd5b505180825261042f5760016040518060400160405280601f81526020017f496e76616c696420636f6c6c61746572616c20746f206c6971756964617465008152509650965050505050506109fc565b600c840154600160d01b900460ff16801561044b5750815460ff165b151561020082018190526104825760026040518060600160405280602a81526020016116b2602a91399650965050505050506109fc565b61048c8a86610a3c565b60208301819052151590506104c45760036040518060600160405280602a815260200161172e602a91399650965050505050506109fc565b6104ed60646104e160328460200151610b3f90919063ffffffff16565b9063ffffffff610ba116565b6060820181905289116105005788610506565b80606001515b81608001818152505061052584868e8e85608001518660000151610be3565b6101a083018190526101808301919091526080820151111561054d576101a081015160808201525b876105a857600061056d6001600160a01b038e163063ffffffff610e6016565b90508161018001518110156105a657600560405180606001604052806033815260200161167f60339139975097505050505050506109fc565b505b6101808101516040805163f15e3b2160e01b8152600481018790526001600160a01b038f166024820152604481019290925289151560648301525173__$5e6137a1b5a0a366e2874209b5abf71c10$__9163f15e3b21916084808301926000929190829003018186803b15801561061e57600080fd5b505af4158015610632573d6000803e3d6000fd5b50505060098501546001600160a01b03166101e08301525087156106d2576101e08101516101808201516040805163f866c31960e01b81526001600160a01b038e8116600483015233602483015260448201939093529051919092169163f866c31991606480830192600092919082900301818387803b1580156106b557600080fd5b505af11580156106c9573d6000803e3d6000fd5b50505050610776565b806101e001516001600160a01b0316633edb7cb88b8361018001516040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050600060405180830381600087803b15801561073c57600080fd5b505af1158015610750573d6000803e3d6000fd5b50505061018082015161077691506001600160a01b038e1690339063ffffffff610f0a16565b6080810151610797906001600160a01b038d1690600163ffffffff610fe816565b6101008101511561092e57806101e001516001600160a01b0316633edb7cb88b8361012001516040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050600060405180830381600087803b15801561080c57600080fd5b505af1158015610820573d6000803e3d6000fd5b505050506108be603560009054906101000a90046001600160a01b03166001600160a01b031663ee8912966040518163ffffffff1660e01b815260040160206040518083038186803b15801561087557600080fd5b505afa158015610889573d6000803e3d6000fd5b505050506040513d602081101561089f57600080fd5b50516101208301516001600160a01b038f16919063ffffffff610f0a16565b896001600160a01b03168b6001600160a01b03168d6001600160a01b03167f36ca8b16d61dc13b1062adff83e3778ab92d14f9e35bfe9fd1283e02b13fb0a18461010001518561012001514260405180848152602001838152602001828152602001935050505060405180910390a45b896001600160a01b03168b6001600160a01b03168d6001600160a01b03167f56864757fd5b1fc9f38f5f3a981cd8ae512ce41b902cf73fc506ee369c6bc23784608001518561018001518660400151338f4260405180878152602001868152602001858152602001846001600160a01b03166001600160a01b0316815260200183151515158152602001828152602001965050505050505060405180910390a46000604051806040016040528060098152602001684e6f206572726f727360b81b8152509650965050505050505b9550959350505050565b60398181548110610a1357fe5b6000918252602090912001546001600160a01b0316905081565b6035546001600160a01b031681565b600a810154604080516370a0823160e01b81526001600160a01b0385811660048301529151600093849316916370a08231916024808301926020929190829003018186803b158015610a8d57600080fd5b505afa158015610aa1573d6000803e3d6000fd5b505050506040513d6020811015610ab757600080fd5b5051600b840154604080516370a0823160e01b81526001600160a01b038881166004830152915191909216916370a08231916024808301926020929190829003018186803b158015610b0857600080fd5b505afa158015610b1c573d6000803e3d6000fd5b505050506040513d6020811015610b3257600080fd5b5051909590945092505050565b600082610b4e57506000610b9b565b82820282848281610b5b57fe5b0414610b985760405162461bcd60e51b815260040180806020018281038252602181526020018061165e6021913960400191505060405180910390fd5b90505b92915050565b6000610b9883836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f0000000000008152506110ba565b60355460408051631f94a27560e31b81529051600092839283926001600160a01b039092169163fca513a891600480820192602092909190829003018186803b158015610c2f57600080fd5b505afa158015610c43573d6000803e3d6000fd5b505050506040513d6020811015610c5957600080fd5b50519050610c656115eb565b816001600160a01b031663b3596f07896040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015610cbb57600080fd5b505afa158015610ccf573d6000803e3d6000fd5b505050506040513d6020811015610ce557600080fd5b5051604080830191909152805163b3596f0760e01b81526001600160a01b03898116600483015291519184169163b3596f0791602480820192602092909190829003018186803b158015610d3857600080fd5b505afa158015610d4c573d6000803e3d6000fd5b505050506040513d6020811015610d6257600080fd5b5051606082015260078a0154602082018190526008808b015460a08401819052908c015460c08401526040830151610de0926064926104e192610dd491610db29190600a0a63ffffffff610b3f16565b6104e18760c00151600a0a610dd48e8a60600151610b3f90919063ffffffff16565b9063ffffffff610b3f16565b60808201819052851015610e4857849350610e4181602001516104e16064610dd4610e1f8660c00151600a0a8760600151610b3f90919063ffffffff16565b6104e18760a00151600a0a610dd48c8a60400151610b3f90919063ffffffff16565b9250610e53565b806080015193508592505b5050965096945050505050565b6000610e6b8361115c565b15610e8157506001600160a01b03811631610b9b565b826001600160a01b03166370a08231836040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015610ed757600080fd5b505afa158015610eeb573d6000803e3d6000fd5b505050506040513d6020811015610f0157600080fd5b50519050610b9b565b80610f1457610fe3565b610f1d8361115c565b15610fc9576040516000906001600160a01b0384169061c35090849084818181858888f193505050503d8060008114610f72576040519150601f19603f3d011682016040523d82523d6000602084013e610f77565b606091505b5050905080610fc3576040805162461bcd60e51b815260206004820152601360248201527211551217d514905394d1915497d19052531151606a1b604482015290519081900360640190fd5b50610fe3565b610fe36001600160a01b038416838363ffffffff61119516565b505050565b81610ff257610fe3565b610ffb8361115c565b1561109f578134101561103f5760405162461bcd60e51b81526004018080602001828103825260358152602001806116296035913960400191505060405180910390fd5b801561109a57600033611058348563ffffffff6111e716565b60405161c35091906000818181858888f193505050503d8060008114610f72576040519150601f19603f3d011682016040523d82523d6000602084013e610f77565b610fe3565b610fe36001600160a01b03841633308563ffffffff61122916565b600081836111465760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561110b5781810151838201526020016110f3565b50505050905090810190601f1680156111385780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b50600083858161115257fe5b0495945050505050565b60006001600160a01b0382161580610b9b57506001600160a01b03821673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee1492915050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b179052610fe3908490611289565b6000610b9883836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f77000081525061133a565b604080516001600160a01b0380861660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b179052611283908590611289565b50505050565b60606112de826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166113949092919063ffffffff16565b805190915015610fe3578080602001905160208110156112fd57600080fd5b5051610fe35760405162461bcd60e51b815260040180806020018281038252602a8152602001806116dc602a913960400191505060405180910390fd5b6000818484111561138c5760405162461bcd60e51b815260206004820181815283516024840152835190928392604490910191908501908083836000831561110b5781810151838201526020016110f3565b505050900390565b60606113a384846000856113ab565b949350505050565b60606113b685611518565b611407576040805162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015290519081900360640190fd5b60006060866001600160a01b031685876040518082805190602001908083835b602083106114465780518252601f199092019160209182019101611427565b6001836020036101000a03801982511681845116808217855250505050505090500191505060006040518083038185875af1925050503d80600081146114a8576040519150601f19603f3d011682016040523d82523d6000602084013e6114ad565b606091505b509150915081156114c15791506113a39050565b8051156114d15780518082602001fd5b60405162461bcd60e51b815260206004820181815286516024840152865187939192839260440191908501908083836000831561110b5781810151838201526020016110f3565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4708181148015906113a3575050151592915050565b60405180610220016040528060008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600060028111156115b057fe5b81526020016000815260200160008152602001600081526020016000815260200160006001600160a01b031681526020016000151581525090565b6040518060e0016040528060008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152509056fe54686520616d6f756e7420616e64207468652076616c75652073656e7420746f206465706f73697420646f206e6f74206d61746368536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f7754686572652069736e277420656e6f756768206c697175696469747920617661696c61626c6520746f206c697175696461746554686520636f6c6c61746572616c2063686f73656e2063616e6e6f74206265206c6971756964617465645361666545524332303a204552433230206f7065726174696f6e20646964206e6f7420737563636565644865616c746820666163746f72206973206e6f742062656c6f7720746865207468726573686f6c645573657220646964206e6f7420626f72726f7720746865207370656369666965642063757272656e6379a264697066735822122074a8ccc848a4413a7fb89450bab7ee651ec1e519c50f0036dc330f94fc35481264736f6c63430006080033";
+  "0x6080604052600060015534801561001557600080fd5b50600160005561178d8061002a6000396000f3fe6080604052600436106100335760003560e01c8062a718a9146100385780634fe7a6e5146100fb578063c72c4d1014610141575b600080fd5b61007c600480360360a081101561004e57600080fd5b506001600160a01b038135811691602081013582169160408201351690606081013590608001351515610156565b6040518083815260200180602001828103825283818151815260200191508051906020019080838360005b838110156100bf5781810151838201526020016100a7565b50505050905090810190601f1680156100ec5780820380516001836020036101000a031916815260200191505b50935050505060405180910390f35b34801561010757600080fd5b506101256004803603602081101561011e57600080fd5b5035610a06565b604080516001600160a01b039092168252519081900360200190f35b34801561014d57600080fd5b50610125610a2d565b6001600160a01b038481166000818152603760209081526040808320948a1680845281842033855260388452828520958552949092528083209183528220919360609390929091906101a6611551565b73__$7347ff53b2b46c21e26a37164ae7f6739f$__63901d711433603760386039603560009054906101000a90046001600160a01b03166001600160a01b031663fca513a86040518163ffffffff1660e01b815260040160206040518083038186803b15801561021557600080fd5b505afa158015610229573d6000803e3d6000fd5b505050506040513d602081101561023f57600080fd5b50516040516001600160e01b031960e088901b1681526001600160a01b03808716600483019081526024830187905260448301869052908316608483015260a060648301908152845460a484018190529192909160c490910190859080156102d057602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116102b2575b5050965050505050505060c06040518083038186803b1580156102f257600080fd5b505af4158015610306573d6000803e3d6000fd5b505050506040513d60c081101561031c57600080fd5b5060a001516101c08201819052670de0b6b3a764000011610360576004604051806060016040528060288152602001611706602891399650965050505050506109fc565b8b6001600160a01b03166370a082318b6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156103b657600080fd5b505afa1580156103ca573d6000803e3d6000fd5b505050506040513d60208110156103e057600080fd5b505180825261042f5760016040518060400160405280601f81526020017f496e76616c696420636f6c6c61746572616c20746f206c6971756964617465008152509650965050505050506109fc565b600c840154600160d01b900460ff16801561044b5750815460ff165b151561020082018190526104825760026040518060600160405280602a81526020016116b2602a91399650965050505050506109fc565b61048c8a86610a3c565b60208301819052151590506104c45760036040518060600160405280602a815260200161172e602a91399650965050505050506109fc565b6104ed60646104e160328460200151610b3f90919063ffffffff16565b9063ffffffff610ba116565b6060820181905289116105005788610506565b80606001515b81608001818152505061052584868e8e85608001518660000151610be3565b6101a083018190526101808301919091526080820151111561054d576101a081015160808201525b876105a857600061056d6001600160a01b038e163063ffffffff610e6016565b90508161018001518110156105a657600560405180606001604052806033815260200161167f60339139975097505050505050506109fc565b505b6101808101516040805163f15e3b2160e01b8152600481018790526001600160a01b038f166024820152604481019290925289151560648301525173__$5e6137a1b5a0a366e2874209b5abf71c10$__9163f15e3b21916084808301926000929190829003018186803b15801561061e57600080fd5b505af4158015610632573d6000803e3d6000fd5b50505060098501546001600160a01b03166101e08301525087156106d2576101e08101516101808201516040805163f866c31960e01b81526001600160a01b038e8116600483015233602483015260448201939093529051919092169163f866c31991606480830192600092919082900301818387803b1580156106b557600080fd5b505af11580156106c9573d6000803e3d6000fd5b50505050610776565b806101e001516001600160a01b0316633edb7cb88b8361018001516040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050600060405180830381600087803b15801561073c57600080fd5b505af1158015610750573d6000803e3d6000fd5b50505061018082015161077691506001600160a01b038e1690339063ffffffff610f0a16565b6080810151610797906001600160a01b038d1690600163ffffffff610fe816565b6101008101511561092e57806101e001516001600160a01b0316633edb7cb88b8361012001516040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050600060405180830381600087803b15801561080c57600080fd5b505af1158015610820573d6000803e3d6000fd5b505050506108be603560009054906101000a90046001600160a01b03166001600160a01b031663ee8912966040518163ffffffff1660e01b815260040160206040518083038186803b15801561087557600080fd5b505afa158015610889573d6000803e3d6000fd5b505050506040513d602081101561089f57600080fd5b50516101208301516001600160a01b038f16919063ffffffff610f0a16565b896001600160a01b03168b6001600160a01b03168d6001600160a01b03167f36ca8b16d61dc13b1062adff83e3778ab92d14f9e35bfe9fd1283e02b13fb0a18461010001518561012001514260405180848152602001838152602001828152602001935050505060405180910390a45b896001600160a01b03168b6001600160a01b03168d6001600160a01b03167f56864757fd5b1fc9f38f5f3a981cd8ae512ce41b902cf73fc506ee369c6bc23784608001518561018001518660400151338f4260405180878152602001868152602001858152602001846001600160a01b03166001600160a01b0316815260200183151515158152602001828152602001965050505050505060405180910390a46000604051806040016040528060098152602001684e6f206572726f727360b81b8152509650965050505050505b9550959350505050565b60398181548110610a1357fe5b6000918252602090912001546001600160a01b0316905081565b6035546001600160a01b031681565b600a810154604080516370a0823160e01b81526001600160a01b0385811660048301529151600093849316916370a08231916024808301926020929190829003018186803b158015610a8d57600080fd5b505afa158015610aa1573d6000803e3d6000fd5b505050506040513d6020811015610ab757600080fd5b5051600b840154604080516370a0823160e01b81526001600160a01b038881166004830152915191909216916370a08231916024808301926020929190829003018186803b158015610b0857600080fd5b505afa158015610b1c573d6000803e3d6000fd5b505050506040513d6020811015610b3257600080fd5b5051909590945092505050565b600082610b4e57506000610b9b565b82820282848281610b5b57fe5b0414610b985760405162461bcd60e51b815260040180806020018281038252602181526020018061165e6021913960400191505060405180910390fd5b90505b92915050565b6000610b9883836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f0000000000008152506110ba565b60355460408051631f94a27560e31b81529051600092839283926001600160a01b039092169163fca513a891600480820192602092909190829003018186803b158015610c2f57600080fd5b505afa158015610c43573d6000803e3d6000fd5b505050506040513d6020811015610c5957600080fd5b50519050610c656115eb565b816001600160a01b031663b3596f07896040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015610cbb57600080fd5b505afa158015610ccf573d6000803e3d6000fd5b505050506040513d6020811015610ce557600080fd5b5051604080830191909152805163b3596f0760e01b81526001600160a01b03898116600483015291519184169163b3596f0791602480820192602092909190829003018186803b158015610d3857600080fd5b505afa158015610d4c573d6000803e3d6000fd5b505050506040513d6020811015610d6257600080fd5b5051606082015260078a0154602082018190526008808b015460a08401819052908c015460c08401526040830151610de0926064926104e192610dd491610db29190600a0a63ffffffff610b3f16565b6104e18760c00151600a0a610dd48e8a60600151610b3f90919063ffffffff16565b9063ffffffff610b3f16565b60808201819052851015610e4857849350610e4181602001516104e16064610dd4610e1f8660c00151600a0a8760600151610b3f90919063ffffffff16565b6104e18760a00151600a0a610dd48c8a60400151610b3f90919063ffffffff16565b9250610e53565b806080015193508592505b5050965096945050505050565b6000610e6b8361115c565b15610e8157506001600160a01b03811631610b9b565b826001600160a01b03166370a08231836040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015610ed757600080fd5b505afa158015610eeb573d6000803e3d6000fd5b505050506040513d6020811015610f0157600080fd5b50519050610b9b565b80610f1457610fe3565b610f1d8361115c565b15610fc9576040516000906001600160a01b0384169061c35090849084818181858888f193505050503d8060008114610f72576040519150601f19603f3d011682016040523d82523d6000602084013e610f77565b606091505b5050905080610fc3576040805162461bcd60e51b815260206004820152601360248201527211551217d514905394d1915497d19052531151606a1b604482015290519081900360640190fd5b50610fe3565b610fe36001600160a01b038416838363ffffffff61119516565b505050565b81610ff257610fe3565b610ffb8361115c565b1561109f578134101561103f5760405162461bcd60e51b81526004018080602001828103825260358152602001806116296035913960400191505060405180910390fd5b801561109a57600033611058348563ffffffff6111e716565b60405161c35091906000818181858888f193505050503d8060008114610f72576040519150601f19603f3d011682016040523d82523d6000602084013e610f77565b610fe3565b610fe36001600160a01b03841633308563ffffffff61122916565b600081836111465760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561110b5781810151838201526020016110f3565b50505050905090810190601f1680156111385780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b50600083858161115257fe5b0495945050505050565b60006001600160a01b0382161580610b9b57506001600160a01b03821673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee1492915050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b179052610fe3908490611289565b6000610b9883836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f77000081525061133a565b604080516001600160a01b0380861660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b179052611283908590611289565b50505050565b60606112de826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166113949092919063ffffffff16565b805190915015610fe3578080602001905160208110156112fd57600080fd5b5051610fe35760405162461bcd60e51b815260040180806020018281038252602a8152602001806116dc602a913960400191505060405180910390fd5b6000818484111561138c5760405162461bcd60e51b815260206004820181815283516024840152835190928392604490910191908501908083836000831561110b5781810151838201526020016110f3565b505050900390565b60606113a384846000856113ab565b949350505050565b60606113b685611518565b611407576040805162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015290519081900360640190fd5b60006060866001600160a01b031685876040518082805190602001908083835b602083106114465780518252601f199092019160209182019101611427565b6001836020036101000a03801982511681845116808217855250505050505090500191505060006040518083038185875af1925050503d80600081146114a8576040519150601f19603f3d011682016040523d82523d6000602084013e6114ad565b606091505b509150915081156114c15791506113a39050565b8051156114d15780518082602001fd5b60405162461bcd60e51b815260206004820181815286516024840152865187939192839260440191908501908083836000831561110b5781810151838201526020016110f3565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4708181148015906113a3575050151592915050565b60405180610220016040528060008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152602001600060028111156115b057fe5b81526020016000815260200160008152602001600081526020016000815260200160006001600160a01b031681526020016000151581525090565b6040518060e0016040528060008152602001600081526020016000815260200160008152602001600081526020016000815260200160008152509056fe54686520616d6f756e7420616e64207468652076616c75652073656e7420746f206465706f73697420646f206e6f74206d61746368536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f7754686572652069736e277420656e6f756768206c697175696469747920617661696c61626c6520746f206c697175696461746554686520636f6c6c61746572616c2063686f73656e2063616e6e6f74206265206c6971756964617465645361666545524332303a204552433230206f7065726174696f6e20646964206e6f7420737563636565644865616c746820666163746f72206973206e6f742062656c6f7720746865207468726573686f6c645573657220646964206e6f7420626f72726f7720746865207370656369666965642063757272656e6379a2646970667358221220d68aa05f09356a6cbc388737efa5304914606b87c1e16fd7a083fbf0388d385264736f6c63430006080033";
 
 export interface LendingPoolLiquidationManagerLibraryAddresses {
   ["__$7347ff53b2b46c21e26a37164ae7f6739f$__"]: string;
diff --git a/types/LendingPoolParametersProvider.d.ts b/types/LendingPoolParametersProvider.d.ts
deleted file mode 100644
index 39f69167..00000000
--- a/types/LendingPoolParametersProvider.d.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface LendingPoolParametersProviderInterface extends Interface {
-  functions: {
-    getFlashLoanFeesInBips: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    getMaxStableRateBorrowSizePercent: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    getRebalanceDownRateDelta: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    initialize: TypedFunctionDescription<{
-      encode([_addressesProvider]: [string]): string;
-    }>;
-  };
-
-  events: {};
-}
-
-export class LendingPoolParametersProvider extends Contract {
-  connect(
-    signerOrProvider: Signer | Provider | string
-  ): LendingPoolParametersProvider;
-  attach(addressOrName: string): LendingPoolParametersProvider;
-  deployed(): Promise<LendingPoolParametersProvider>;
-
-  on(
-    event: EventFilter | string,
-    listener: Listener
-  ): LendingPoolParametersProvider;
-  once(
-    event: EventFilter | string,
-    listener: Listener
-  ): LendingPoolParametersProvider;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): LendingPoolParametersProvider;
-  removeAllListeners(
-    eventName: EventFilter | string
-  ): LendingPoolParametersProvider;
-  removeListener(
-    eventName: any,
-    listener: Listener
-  ): LendingPoolParametersProvider;
-
-  interface: LendingPoolParametersProviderInterface;
-
-  functions: {
-    getFlashLoanFeesInBips(): Promise<{
-      0: BigNumber;
-      1: BigNumber;
-    }>;
-
-    getMaxStableRateBorrowSizePercent(): Promise<BigNumber>;
-
-    getRebalanceDownRateDelta(): Promise<BigNumber>;
-
-    initialize(
-      _addressesProvider: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  getFlashLoanFeesInBips(): Promise<{
-    0: BigNumber;
-    1: BigNumber;
-  }>;
-
-  getMaxStableRateBorrowSizePercent(): Promise<BigNumber>;
-
-  getRebalanceDownRateDelta(): Promise<BigNumber>;
-
-  initialize(
-    _addressesProvider: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {};
-
-  estimate: {
-    getFlashLoanFeesInBips(): Promise<BigNumber>;
-
-    getMaxStableRateBorrowSizePercent(): Promise<BigNumber>;
-
-    getRebalanceDownRateDelta(): Promise<BigNumber>;
-
-    initialize(_addressesProvider: string): Promise<BigNumber>;
-  };
-}
diff --git a/types/LendingPoolParametersProviderFactory.ts b/types/LendingPoolParametersProviderFactory.ts
deleted file mode 100644
index 5076787a..00000000
--- a/types/LendingPoolParametersProviderFactory.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { LendingPoolParametersProvider } from "./LendingPoolParametersProvider";
-
-export class LendingPoolParametersProviderFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    overrides?: TransactionOverrides
-  ): Promise<LendingPoolParametersProvider> {
-    return super.deploy(overrides) as Promise<LendingPoolParametersProvider>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): LendingPoolParametersProvider {
-    return super.attach(address) as LendingPoolParametersProvider;
-  }
-  connect(signer: Signer): LendingPoolParametersProviderFactory {
-    return super.connect(signer) as LendingPoolParametersProviderFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): LendingPoolParametersProvider {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as LendingPoolParametersProvider;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [],
-    name: "getFlashLoanFeesInBips",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "pure",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "getMaxStableRateBorrowSizePercent",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "pure",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "getRebalanceDownRateDelta",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "pure",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_addressesProvider",
-        type: "address"
-      }
-    ],
-    name: "initialize",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x60806040526000805534801561001457600080fd5b506101e5806100246000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806346f4f8d114610051578063586feb401461006b578063c4d66de81461008c578063d6b725ac146100b4575b600080fd5b6100596100bc565b60408051918252519081900360200190f35b6100736100cb565b6040805192835260208301919091528051918290030190f35b6100b2600480360360208110156100a257600080fd5b50356001600160a01b03166100d4565b005b610059610171565b6aa56fa5b99019a5c800000090565b6009610bb89091565b60006100de610176565b60015490915060ff16806100f557506100f561017b565b80610101575060005481115b61013c5760405162461bcd60e51b815260040180806020018281038252602e815260200180610182602e913960400191505060405180910390fd5b60015460ff1615801561015b576001805460ff19168117905560008290555b801561016c576001805460ff191690555b505050565b601990565b600290565b303b159056fe436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564a264697066735822122063901128b8eb0844da98c6440cfb4a178fa19b719b954c9bf24df1d1abd1811064736f6c63430006080033";
diff --git a/types/MockAggregatorBase.d.ts b/types/MockAggregatorBase.d.ts
deleted file mode 100644
index 0eccdd79..00000000
--- a/types/MockAggregatorBase.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorBaseInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorBase extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorBase;
-  attach(addressOrName: string): MockAggregatorBase;
-  deployed(): Promise<MockAggregatorBase>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorBase;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorBase;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorBase;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorBase;
-  removeListener(eventName: any, listener: Listener): MockAggregatorBase;
-
-  interface: MockAggregatorBaseInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorBaseFactory.ts b/types/MockAggregatorBaseFactory.ts
deleted file mode 100644
index 53de1c08..00000000
--- a/types/MockAggregatorBaseFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorBase } from "./MockAggregatorBase";
-
-export class MockAggregatorBaseFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorBase> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorBase
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorBase {
-    return super.attach(address) as MockAggregatorBase;
-  }
-  connect(signer: Signer): MockAggregatorBaseFactory {
-    return super.connect(signer) as MockAggregatorBaseFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorBase {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorBase;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101003803806101008339818101604052602081101561003357600080fd5b5051600081815560408051428152905183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f919081900360200190a35060818061007f6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220060be671455ecf17204969f30e34b79826d0c5978aa24f70ee045096a697a9a764736f6c63430006080033";
diff --git a/types/MockAggregatorBat.d.ts b/types/MockAggregatorBat.d.ts
deleted file mode 100644
index 1bd4b55f..00000000
--- a/types/MockAggregatorBat.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorBatInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorBat extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorBat;
-  attach(addressOrName: string): MockAggregatorBat;
-  deployed(): Promise<MockAggregatorBat>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorBat;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorBat;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorBat;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorBat;
-  removeListener(eventName: any, listener: Listener): MockAggregatorBat;
-
-  interface: MockAggregatorBatInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorBatFactory.ts b/types/MockAggregatorBatFactory.ts
deleted file mode 100644
index 019b55ea..00000000
--- a/types/MockAggregatorBatFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorBat } from "./MockAggregatorBat";
-
-export class MockAggregatorBatFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorBat> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorBat
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorBat {
-    return super.attach(address) as MockAggregatorBat;
-  }
-  connect(signer: Signer): MockAggregatorBatFactory {
-    return super.connect(signer) as MockAggregatorBatFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorBat {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorBat;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea264697066735822122067d1fc92dfb4035995fc56942a8fac11af7dd9f3a19251990effa2c9b6e9e8ab64736f6c63430006080033";
diff --git a/types/MockAggregatorBusd.d.ts b/types/MockAggregatorBusd.d.ts
deleted file mode 100644
index bb5ce792..00000000
--- a/types/MockAggregatorBusd.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorBusdInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorBusd extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorBusd;
-  attach(addressOrName: string): MockAggregatorBusd;
-  deployed(): Promise<MockAggregatorBusd>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorBusd;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorBusd;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorBusd;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorBusd;
-  removeListener(eventName: any, listener: Listener): MockAggregatorBusd;
-
-  interface: MockAggregatorBusdInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorBusdFactory.ts b/types/MockAggregatorBusdFactory.ts
deleted file mode 100644
index b03b158a..00000000
--- a/types/MockAggregatorBusdFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorBusd } from "./MockAggregatorBusd";
-
-export class MockAggregatorBusdFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorBusd> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorBusd
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorBusd {
-    return super.attach(address) as MockAggregatorBusd;
-  }
-  connect(signer: Signer): MockAggregatorBusdFactory {
-    return super.connect(signer) as MockAggregatorBusdFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorBusd {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorBusd;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212201f1bc6664c0ae2c54149c6ff1b532f7c023d4323052eec4d7e5668bb18caf4ad64736f6c63430006080033";
diff --git a/types/MockAggregatorDai.d.ts b/types/MockAggregatorDai.d.ts
deleted file mode 100644
index 7df0861e..00000000
--- a/types/MockAggregatorDai.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorDaiInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorDai extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorDai;
-  attach(addressOrName: string): MockAggregatorDai;
-  deployed(): Promise<MockAggregatorDai>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorDai;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorDai;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorDai;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorDai;
-  removeListener(eventName: any, listener: Listener): MockAggregatorDai;
-
-  interface: MockAggregatorDaiInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorDaiFactory.ts b/types/MockAggregatorDaiFactory.ts
deleted file mode 100644
index c35104df..00000000
--- a/types/MockAggregatorDaiFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorDai } from "./MockAggregatorDai";
-
-export class MockAggregatorDaiFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorDai> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorDai
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorDai {
-    return super.attach(address) as MockAggregatorDai;
-  }
-  connect(signer: Signer): MockAggregatorDaiFactory {
-    return super.connect(signer) as MockAggregatorDaiFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorDai {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorDai;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220bc460a71c6f5f56df369342d0898d38ca6d1be268930ce0e8c567cd7620b901364736f6c63430006080033";
diff --git a/types/MockAggregatorKnc.d.ts b/types/MockAggregatorKnc.d.ts
deleted file mode 100644
index ae1775cc..00000000
--- a/types/MockAggregatorKnc.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorKncInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorKnc extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorKnc;
-  attach(addressOrName: string): MockAggregatorKnc;
-  deployed(): Promise<MockAggregatorKnc>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorKnc;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorKnc;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorKnc;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorKnc;
-  removeListener(eventName: any, listener: Listener): MockAggregatorKnc;
-
-  interface: MockAggregatorKncInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorKncFactory.ts b/types/MockAggregatorKncFactory.ts
deleted file mode 100644
index 8dd1a865..00000000
--- a/types/MockAggregatorKncFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorKnc } from "./MockAggregatorKnc";
-
-export class MockAggregatorKncFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorKnc> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorKnc
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorKnc {
-    return super.attach(address) as MockAggregatorKnc;
-  }
-  connect(signer: Signer): MockAggregatorKncFactory {
-    return super.connect(signer) as MockAggregatorKncFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorKnc {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorKnc;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212207e4193c6d3a7b272f2a1e7e5919a1edd6c2af8c0b6c73078ae651be5282994c164736f6c63430006080033";
diff --git a/types/MockAggregatorLend.d.ts b/types/MockAggregatorLend.d.ts
deleted file mode 100644
index afa361cc..00000000
--- a/types/MockAggregatorLend.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorLendInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorLend extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorLend;
-  attach(addressOrName: string): MockAggregatorLend;
-  deployed(): Promise<MockAggregatorLend>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorLend;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorLend;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorLend;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorLend;
-  removeListener(eventName: any, listener: Listener): MockAggregatorLend;
-
-  interface: MockAggregatorLendInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorLendFactory.ts b/types/MockAggregatorLendFactory.ts
deleted file mode 100644
index 1a713b00..00000000
--- a/types/MockAggregatorLendFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorLend } from "./MockAggregatorLend";
-
-export class MockAggregatorLendFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorLend> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorLend
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorLend {
-    return super.attach(address) as MockAggregatorLend;
-  }
-  connect(signer: Signer): MockAggregatorLendFactory {
-    return super.connect(signer) as MockAggregatorLendFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorLend {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorLend;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212201e824ba62d5f29376dee29e5a3a6929bcbd951f7cb75d88c5f4a5f736096ccd164736f6c63430006080033";
diff --git a/types/MockAggregatorLink.d.ts b/types/MockAggregatorLink.d.ts
deleted file mode 100644
index eccc9349..00000000
--- a/types/MockAggregatorLink.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorLinkInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorLink extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorLink;
-  attach(addressOrName: string): MockAggregatorLink;
-  deployed(): Promise<MockAggregatorLink>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorLink;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorLink;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorLink;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorLink;
-  removeListener(eventName: any, listener: Listener): MockAggregatorLink;
-
-  interface: MockAggregatorLinkInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorLinkFactory.ts b/types/MockAggregatorLinkFactory.ts
deleted file mode 100644
index 9371faf1..00000000
--- a/types/MockAggregatorLinkFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorLink } from "./MockAggregatorLink";
-
-export class MockAggregatorLinkFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorLink> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorLink
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorLink {
-    return super.attach(address) as MockAggregatorLink;
-  }
-  connect(signer: Signer): MockAggregatorLinkFactory {
-    return super.connect(signer) as MockAggregatorLinkFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorLink {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorLink;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212200820bb3fa0b8e5bd17658d500240b157ab200a944908b2d378035e34f0430d5864736f6c63430006080033";
diff --git a/types/MockAggregatorMana.d.ts b/types/MockAggregatorMana.d.ts
deleted file mode 100644
index af2844d5..00000000
--- a/types/MockAggregatorMana.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorManaInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorMana extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorMana;
-  attach(addressOrName: string): MockAggregatorMana;
-  deployed(): Promise<MockAggregatorMana>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorMana;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorMana;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorMana;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorMana;
-  removeListener(eventName: any, listener: Listener): MockAggregatorMana;
-
-  interface: MockAggregatorManaInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorManaFactory.ts b/types/MockAggregatorManaFactory.ts
deleted file mode 100644
index 54d9c9ac..00000000
--- a/types/MockAggregatorManaFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorMana } from "./MockAggregatorMana";
-
-export class MockAggregatorManaFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorMana> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorMana
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorMana {
-    return super.attach(address) as MockAggregatorMana;
-  }
-  connect(signer: Signer): MockAggregatorManaFactory {
-    return super.connect(signer) as MockAggregatorManaFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorMana {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorMana;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220e7b3306e2bb66e9e9a3d7344a5e19e7f07bde990d057682c0c76fe83c2727a9964736f6c63430006080033";
diff --git a/types/MockAggregatorMkr.d.ts b/types/MockAggregatorMkr.d.ts
deleted file mode 100644
index d21fad3f..00000000
--- a/types/MockAggregatorMkr.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorMkrInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorMkr extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorMkr;
-  attach(addressOrName: string): MockAggregatorMkr;
-  deployed(): Promise<MockAggregatorMkr>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorMkr;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorMkr;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorMkr;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorMkr;
-  removeListener(eventName: any, listener: Listener): MockAggregatorMkr;
-
-  interface: MockAggregatorMkrInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorMkrFactory.ts b/types/MockAggregatorMkrFactory.ts
deleted file mode 100644
index b72ef8db..00000000
--- a/types/MockAggregatorMkrFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorMkr } from "./MockAggregatorMkr";
-
-export class MockAggregatorMkrFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorMkr> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorMkr
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorMkr {
-    return super.attach(address) as MockAggregatorMkr;
-  }
-  connect(signer: Signer): MockAggregatorMkrFactory {
-    return super.connect(signer) as MockAggregatorMkrFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorMkr {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorMkr;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea264697066735822122051a88c2198cb6692898abde3f0f1baf8d6b7c52201611c0a4c04453635130b6b64736f6c63430006080033";
diff --git a/types/MockAggregatorRep.d.ts b/types/MockAggregatorRep.d.ts
deleted file mode 100644
index 5c833414..00000000
--- a/types/MockAggregatorRep.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorRepInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorRep extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorRep;
-  attach(addressOrName: string): MockAggregatorRep;
-  deployed(): Promise<MockAggregatorRep>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorRep;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorRep;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorRep;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorRep;
-  removeListener(eventName: any, listener: Listener): MockAggregatorRep;
-
-  interface: MockAggregatorRepInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorRepFactory.ts b/types/MockAggregatorRepFactory.ts
deleted file mode 100644
index 89c91e4d..00000000
--- a/types/MockAggregatorRepFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorRep } from "./MockAggregatorRep";
-
-export class MockAggregatorRepFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorRep> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorRep
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorRep {
-    return super.attach(address) as MockAggregatorRep;
-  }
-  connect(signer: Signer): MockAggregatorRepFactory {
-    return super.connect(signer) as MockAggregatorRepFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorRep {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorRep;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212205451c4b8cfbf9ded926cae2fa4db4a7f379ad06e935193895ac984bd9c8a44f464736f6c63430006080033";
diff --git a/types/MockAggregatorSnx.d.ts b/types/MockAggregatorSnx.d.ts
deleted file mode 100644
index 11d14f3a..00000000
--- a/types/MockAggregatorSnx.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorSnxInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorSnx extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorSnx;
-  attach(addressOrName: string): MockAggregatorSnx;
-  deployed(): Promise<MockAggregatorSnx>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorSnx;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorSnx;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorSnx;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorSnx;
-  removeListener(eventName: any, listener: Listener): MockAggregatorSnx;
-
-  interface: MockAggregatorSnxInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorSnxFactory.ts b/types/MockAggregatorSnxFactory.ts
deleted file mode 100644
index 6c2c9c0c..00000000
--- a/types/MockAggregatorSnxFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorSnx } from "./MockAggregatorSnx";
-
-export class MockAggregatorSnxFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorSnx> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorSnx
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorSnx {
-    return super.attach(address) as MockAggregatorSnx;
-  }
-  connect(signer: Signer): MockAggregatorSnxFactory {
-    return super.connect(signer) as MockAggregatorSnxFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorSnx {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorSnx;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea264697066735822122007bc29efab04b7548967f8ac1fb485a5f910968a04f5f02e3c409e43be252d9764736f6c63430006080033";
diff --git a/types/MockAggregatorSusd.d.ts b/types/MockAggregatorSusd.d.ts
deleted file mode 100644
index 0ed4a814..00000000
--- a/types/MockAggregatorSusd.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorSusdInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorSusd extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorSusd;
-  attach(addressOrName: string): MockAggregatorSusd;
-  deployed(): Promise<MockAggregatorSusd>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorSusd;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorSusd;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorSusd;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorSusd;
-  removeListener(eventName: any, listener: Listener): MockAggregatorSusd;
-
-  interface: MockAggregatorSusdInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorSusdFactory.ts b/types/MockAggregatorSusdFactory.ts
deleted file mode 100644
index 2ae106b8..00000000
--- a/types/MockAggregatorSusdFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorSusd } from "./MockAggregatorSusd";
-
-export class MockAggregatorSusdFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorSusd> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorSusd
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorSusd {
-    return super.attach(address) as MockAggregatorSusd;
-  }
-  connect(signer: Signer): MockAggregatorSusdFactory {
-    return super.connect(signer) as MockAggregatorSusdFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorSusd {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorSusd;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220396214f66cc6dae4ac4df2de75d412cda13649370d678f01f1f162f304264e5c64736f6c63430006080033";
diff --git a/types/MockAggregatorTusd.d.ts b/types/MockAggregatorTusd.d.ts
deleted file mode 100644
index 688a0567..00000000
--- a/types/MockAggregatorTusd.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorTusdInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorTusd extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorTusd;
-  attach(addressOrName: string): MockAggregatorTusd;
-  deployed(): Promise<MockAggregatorTusd>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorTusd;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorTusd;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorTusd;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorTusd;
-  removeListener(eventName: any, listener: Listener): MockAggregatorTusd;
-
-  interface: MockAggregatorTusdInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorTusdFactory.ts b/types/MockAggregatorTusdFactory.ts
deleted file mode 100644
index d137b843..00000000
--- a/types/MockAggregatorTusdFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorTusd } from "./MockAggregatorTusd";
-
-export class MockAggregatorTusdFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorTusd> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorTusd
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorTusd {
-    return super.attach(address) as MockAggregatorTusd;
-  }
-  connect(signer: Signer): MockAggregatorTusdFactory {
-    return super.connect(signer) as MockAggregatorTusdFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorTusd {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorTusd;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212207f5bd9b60d1d2fb1c740da91ebaab40eba25d0e8c0dffb88ae5c5706d5a50dff64736f6c63430006080033";
diff --git a/types/MockAggregatorUniDaiEth.d.ts b/types/MockAggregatorUniDaiEth.d.ts
deleted file mode 100644
index b4d2f34d..00000000
--- a/types/MockAggregatorUniDaiEth.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorUniDaiEthInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorUniDaiEth extends Contract {
-  connect(
-    signerOrProvider: Signer | Provider | string
-  ): MockAggregatorUniDaiEth;
-  attach(addressOrName: string): MockAggregatorUniDaiEth;
-  deployed(): Promise<MockAggregatorUniDaiEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorUniDaiEth;
-  once(
-    event: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniDaiEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniDaiEth;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorUniDaiEth;
-  removeListener(eventName: any, listener: Listener): MockAggregatorUniDaiEth;
-
-  interface: MockAggregatorUniDaiEthInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorUniDaiEthFactory.ts b/types/MockAggregatorUniDaiEthFactory.ts
deleted file mode 100644
index 6b1cde46..00000000
--- a/types/MockAggregatorUniDaiEthFactory.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorUniDaiEth } from "./MockAggregatorUniDaiEth";
-
-export class MockAggregatorUniDaiEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorUniDaiEth> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorUniDaiEth
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorUniDaiEth {
-    return super.attach(address) as MockAggregatorUniDaiEth;
-  }
-  connect(signer: Signer): MockAggregatorUniDaiEthFactory {
-    return super.connect(signer) as MockAggregatorUniDaiEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorUniDaiEth {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as MockAggregatorUniDaiEth;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220ca9e7e837206f25a56d62db3aae4fc49a3e0ed327373cc7ef1b4a8135e04b94d64736f6c63430006080033";
diff --git a/types/MockAggregatorUniLendEth.d.ts b/types/MockAggregatorUniLendEth.d.ts
deleted file mode 100644
index 2eaf62ab..00000000
--- a/types/MockAggregatorUniLendEth.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorUniLendEthInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorUniLendEth extends Contract {
-  connect(
-    signerOrProvider: Signer | Provider | string
-  ): MockAggregatorUniLendEth;
-  attach(addressOrName: string): MockAggregatorUniLendEth;
-  deployed(): Promise<MockAggregatorUniLendEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorUniLendEth;
-  once(
-    event: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniLendEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniLendEth;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorUniLendEth;
-  removeListener(eventName: any, listener: Listener): MockAggregatorUniLendEth;
-
-  interface: MockAggregatorUniLendEthInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorUniLendEthFactory.ts b/types/MockAggregatorUniLendEthFactory.ts
deleted file mode 100644
index 53af6405..00000000
--- a/types/MockAggregatorUniLendEthFactory.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorUniLendEth } from "./MockAggregatorUniLendEth";
-
-export class MockAggregatorUniLendEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorUniLendEth> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorUniLendEth
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorUniLendEth {
-    return super.attach(address) as MockAggregatorUniLendEth;
-  }
-  connect(signer: Signer): MockAggregatorUniLendEthFactory {
-    return super.connect(signer) as MockAggregatorUniLendEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorUniLendEth {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as MockAggregatorUniLendEth;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212202cd94c803b45c9921e61b7e529507ff5a46911bf92147594a184752785dd9b5f64736f6c63430006080033";
diff --git a/types/MockAggregatorUniLinkEth.d.ts b/types/MockAggregatorUniLinkEth.d.ts
deleted file mode 100644
index 337cca86..00000000
--- a/types/MockAggregatorUniLinkEth.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorUniLinkEthInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorUniLinkEth extends Contract {
-  connect(
-    signerOrProvider: Signer | Provider | string
-  ): MockAggregatorUniLinkEth;
-  attach(addressOrName: string): MockAggregatorUniLinkEth;
-  deployed(): Promise<MockAggregatorUniLinkEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorUniLinkEth;
-  once(
-    event: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniLinkEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniLinkEth;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorUniLinkEth;
-  removeListener(eventName: any, listener: Listener): MockAggregatorUniLinkEth;
-
-  interface: MockAggregatorUniLinkEthInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorUniLinkEthFactory.ts b/types/MockAggregatorUniLinkEthFactory.ts
deleted file mode 100644
index cc1b44eb..00000000
--- a/types/MockAggregatorUniLinkEthFactory.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorUniLinkEth } from "./MockAggregatorUniLinkEth";
-
-export class MockAggregatorUniLinkEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorUniLinkEth> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorUniLinkEth
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorUniLinkEth {
-    return super.attach(address) as MockAggregatorUniLinkEth;
-  }
-  connect(signer: Signer): MockAggregatorUniLinkEthFactory {
-    return super.connect(signer) as MockAggregatorUniLinkEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorUniLinkEth {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as MockAggregatorUniLinkEth;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220fa715ec3aad02e0fd561be2b226d91f615ba8269690fbf2c624f5610ef7a0a7464736f6c63430006080033";
diff --git a/types/MockAggregatorUniMkrEth.d.ts b/types/MockAggregatorUniMkrEth.d.ts
deleted file mode 100644
index 7e6b13c2..00000000
--- a/types/MockAggregatorUniMkrEth.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorUniMkrEthInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorUniMkrEth extends Contract {
-  connect(
-    signerOrProvider: Signer | Provider | string
-  ): MockAggregatorUniMkrEth;
-  attach(addressOrName: string): MockAggregatorUniMkrEth;
-  deployed(): Promise<MockAggregatorUniMkrEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorUniMkrEth;
-  once(
-    event: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniMkrEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniMkrEth;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorUniMkrEth;
-  removeListener(eventName: any, listener: Listener): MockAggregatorUniMkrEth;
-
-  interface: MockAggregatorUniMkrEthInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorUniMkrEthFactory.ts b/types/MockAggregatorUniMkrEthFactory.ts
deleted file mode 100644
index b5f2c3e9..00000000
--- a/types/MockAggregatorUniMkrEthFactory.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorUniMkrEth } from "./MockAggregatorUniMkrEth";
-
-export class MockAggregatorUniMkrEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorUniMkrEth> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorUniMkrEth
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorUniMkrEth {
-    return super.attach(address) as MockAggregatorUniMkrEth;
-  }
-  connect(signer: Signer): MockAggregatorUniMkrEthFactory {
-    return super.connect(signer) as MockAggregatorUniMkrEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorUniMkrEth {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as MockAggregatorUniMkrEth;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220abf8bc4ec473889426cc620b5807dad5ca0183f6f27ac1e6b0cb65215ac6a46164736f6c63430006080033";
diff --git a/types/MockAggregatorUniSethEth.d.ts b/types/MockAggregatorUniSethEth.d.ts
deleted file mode 100644
index 3e01499c..00000000
--- a/types/MockAggregatorUniSethEth.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorUniSethEthInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorUniSethEth extends Contract {
-  connect(
-    signerOrProvider: Signer | Provider | string
-  ): MockAggregatorUniSethEth;
-  attach(addressOrName: string): MockAggregatorUniSethEth;
-  deployed(): Promise<MockAggregatorUniSethEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorUniSethEth;
-  once(
-    event: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniSethEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniSethEth;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorUniSethEth;
-  removeListener(eventName: any, listener: Listener): MockAggregatorUniSethEth;
-
-  interface: MockAggregatorUniSethEthInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorUniSethEthFactory.ts b/types/MockAggregatorUniSethEthFactory.ts
deleted file mode 100644
index 71815fcb..00000000
--- a/types/MockAggregatorUniSethEthFactory.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorUniSethEth } from "./MockAggregatorUniSethEth";
-
-export class MockAggregatorUniSethEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorUniSethEth> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorUniSethEth
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorUniSethEth {
-    return super.attach(address) as MockAggregatorUniSethEth;
-  }
-  connect(signer: Signer): MockAggregatorUniSethEthFactory {
-    return super.connect(signer) as MockAggregatorUniSethEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorUniSethEth {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as MockAggregatorUniSethEth;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212208b07eebb75d27ac2e2a7c4abf0ca885abe8ca170052598567ded0cb201fa393c64736f6c63430006080033";
diff --git a/types/MockAggregatorUniUsdcEth.d.ts b/types/MockAggregatorUniUsdcEth.d.ts
deleted file mode 100644
index b04b1e68..00000000
--- a/types/MockAggregatorUniUsdcEth.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorUniUsdcEthInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorUniUsdcEth extends Contract {
-  connect(
-    signerOrProvider: Signer | Provider | string
-  ): MockAggregatorUniUsdcEth;
-  attach(addressOrName: string): MockAggregatorUniUsdcEth;
-  deployed(): Promise<MockAggregatorUniUsdcEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorUniUsdcEth;
-  once(
-    event: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniUsdcEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUniUsdcEth;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorUniUsdcEth;
-  removeListener(eventName: any, listener: Listener): MockAggregatorUniUsdcEth;
-
-  interface: MockAggregatorUniUsdcEthInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorUniUsdcEthFactory.ts b/types/MockAggregatorUniUsdcEthFactory.ts
deleted file mode 100644
index 7b2e1376..00000000
--- a/types/MockAggregatorUniUsdcEthFactory.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorUniUsdcEth } from "./MockAggregatorUniUsdcEth";
-
-export class MockAggregatorUniUsdcEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorUniUsdcEth> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorUniUsdcEth
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorUniUsdcEth {
-    return super.attach(address) as MockAggregatorUniUsdcEth;
-  }
-  connect(signer: Signer): MockAggregatorUniUsdcEthFactory {
-    return super.connect(signer) as MockAggregatorUniUsdcEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorUniUsdcEth {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as MockAggregatorUniUsdcEth;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212207b5e291e8ee45269d7da3ffbcde11e1e7aa111accc3860a61ba11cf7f5b1537c64736f6c63430006080033";
diff --git a/types/MockAggregatorUsd.d.ts b/types/MockAggregatorUsd.d.ts
deleted file mode 100644
index 59fdc243..00000000
--- a/types/MockAggregatorUsd.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorUsdInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorUsd extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorUsd;
-  attach(addressOrName: string): MockAggregatorUsd;
-  deployed(): Promise<MockAggregatorUsd>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorUsd;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorUsd;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUsd;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorUsd;
-  removeListener(eventName: any, listener: Listener): MockAggregatorUsd;
-
-  interface: MockAggregatorUsdInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorUsdFactory.ts b/types/MockAggregatorUsdFactory.ts
deleted file mode 100644
index 6292edbc..00000000
--- a/types/MockAggregatorUsdFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorUsd } from "./MockAggregatorUsd";
-
-export class MockAggregatorUsdFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorUsd> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorUsd
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorUsd {
-    return super.attach(address) as MockAggregatorUsd;
-  }
-  connect(signer: Signer): MockAggregatorUsdFactory {
-    return super.connect(signer) as MockAggregatorUsdFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorUsd {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorUsd;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220cb5c993248f4342cf40f7bbb24442b022562eaff82fda810c453624d5d0219a064736f6c63430006080033";
diff --git a/types/MockAggregatorUsdc.d.ts b/types/MockAggregatorUsdc.d.ts
deleted file mode 100644
index 06e94b13..00000000
--- a/types/MockAggregatorUsdc.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorUsdcInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorUsdc extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorUsdc;
-  attach(addressOrName: string): MockAggregatorUsdc;
-  deployed(): Promise<MockAggregatorUsdc>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorUsdc;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorUsdc;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUsdc;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorUsdc;
-  removeListener(eventName: any, listener: Listener): MockAggregatorUsdc;
-
-  interface: MockAggregatorUsdcInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorUsdcFactory.ts b/types/MockAggregatorUsdcFactory.ts
deleted file mode 100644
index 64be4067..00000000
--- a/types/MockAggregatorUsdcFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorUsdc } from "./MockAggregatorUsdc";
-
-export class MockAggregatorUsdcFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorUsdc> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorUsdc
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorUsdc {
-    return super.attach(address) as MockAggregatorUsdc;
-  }
-  connect(signer: Signer): MockAggregatorUsdcFactory {
-    return super.connect(signer) as MockAggregatorUsdcFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorUsdc {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorUsdc;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea26469706673582212207e0f1f2e3dd25f21390c9d6570efbeef685fd04deb69739a738caf0b76f69e4364736f6c63430006080033";
diff --git a/types/MockAggregatorUsdt.d.ts b/types/MockAggregatorUsdt.d.ts
deleted file mode 100644
index 6915a80b..00000000
--- a/types/MockAggregatorUsdt.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorUsdtInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorUsdt extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorUsdt;
-  attach(addressOrName: string): MockAggregatorUsdt;
-  deployed(): Promise<MockAggregatorUsdt>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorUsdt;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorUsdt;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorUsdt;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorUsdt;
-  removeListener(eventName: any, listener: Listener): MockAggregatorUsdt;
-
-  interface: MockAggregatorUsdtInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorUsdtFactory.ts b/types/MockAggregatorUsdtFactory.ts
deleted file mode 100644
index d45035a2..00000000
--- a/types/MockAggregatorUsdtFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorUsdt } from "./MockAggregatorUsdt";
-
-export class MockAggregatorUsdtFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorUsdt> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorUsdt
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorUsdt {
-    return super.attach(address) as MockAggregatorUsdt;
-  }
-  connect(signer: Signer): MockAggregatorUsdtFactory {
-    return super.connect(signer) as MockAggregatorUsdtFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorUsdt {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorUsdt;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220ff69adca6a02f40ad3cce7511dae9b05d9ca200542516300e4831201703d838a64736f6c63430006080033";
diff --git a/types/MockAggregatorWbtc.d.ts b/types/MockAggregatorWbtc.d.ts
deleted file mode 100644
index 45420b02..00000000
--- a/types/MockAggregatorWbtc.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorWbtcInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorWbtc extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorWbtc;
-  attach(addressOrName: string): MockAggregatorWbtc;
-  deployed(): Promise<MockAggregatorWbtc>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorWbtc;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorWbtc;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorWbtc;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorWbtc;
-  removeListener(eventName: any, listener: Listener): MockAggregatorWbtc;
-
-  interface: MockAggregatorWbtcInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorWbtcFactory.ts b/types/MockAggregatorWbtcFactory.ts
deleted file mode 100644
index 5cf07aac..00000000
--- a/types/MockAggregatorWbtcFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorWbtc } from "./MockAggregatorWbtc";
-
-export class MockAggregatorWbtcFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorWbtc> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorWbtc
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorWbtc {
-    return super.attach(address) as MockAggregatorWbtc;
-  }
-  connect(signer: Signer): MockAggregatorWbtcFactory {
-    return super.connect(signer) as MockAggregatorWbtcFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorWbtc {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorWbtc;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220d04d858e564e9146e058acc517c8cd10ec96da2fd6644019d09878f36c509fd564736f6c63430006080033";
diff --git a/types/MockAggregatorZrx.d.ts b/types/MockAggregatorZrx.d.ts
deleted file mode 100644
index bf9bd50f..00000000
--- a/types/MockAggregatorZrx.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockAggregatorZrxInterface extends Interface {
-  functions: {
-    latestAnswer: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {
-    AnswerUpdated: TypedEventDescription<{
-      encodeTopics([current, roundId, timestamp]: [
-        BigNumberish | null,
-        BigNumberish | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockAggregatorZrx extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockAggregatorZrx;
-  attach(addressOrName: string): MockAggregatorZrx;
-  deployed(): Promise<MockAggregatorZrx>;
-
-  on(event: EventFilter | string, listener: Listener): MockAggregatorZrx;
-  once(event: EventFilter | string, listener: Listener): MockAggregatorZrx;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockAggregatorZrx;
-  removeAllListeners(eventName: EventFilter | string): MockAggregatorZrx;
-  removeListener(eventName: any, listener: Listener): MockAggregatorZrx;
-
-  interface: MockAggregatorZrxInterface;
-
-  functions: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-
-  latestAnswer(): Promise<BigNumber>;
-
-  filters: {
-    AnswerUpdated(
-      current: BigNumberish | null,
-      roundId: BigNumberish | null,
-      timestamp: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    latestAnswer(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockAggregatorZrxFactory.ts b/types/MockAggregatorZrxFactory.ts
deleted file mode 100644
index 2d9d7b5f..00000000
--- a/types/MockAggregatorZrxFactory.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-import { BigNumberish } from "ethers/utils";
-
-import { TransactionOverrides } from ".";
-import { MockAggregatorZrx } from "./MockAggregatorZrx";
-
-export class MockAggregatorZrxFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<MockAggregatorZrx> {
-    return super.deploy(_initialAnswer, overrides) as Promise<
-      MockAggregatorZrx
-    >;
-  }
-  getDeployTransaction(
-    _initialAnswer: BigNumberish,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_initialAnswer, overrides);
-  }
-  attach(address: string): MockAggregatorZrx {
-    return super.attach(address) as MockAggregatorZrx;
-  }
-  connect(signer: Signer): MockAggregatorZrxFactory {
-    return super.connect(signer) as MockAggregatorZrxFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockAggregatorZrx {
-    return new Contract(address, _abi, signerOrProvider) as MockAggregatorZrx;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "int256",
-        name: "_initialAnswer",
-        type: "int256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "int256",
-        name: "current",
-        type: "int256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "roundId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    name: "AnswerUpdated",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "latestAnswer",
-    outputs: [
-      {
-        internalType: "int256",
-        name: "",
-        type: "int256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516101033803806101038339818101604052602081101561003357600080fd5b5051600081815560408051428152905183929183917f0559884fd3a460db3073b7fc896cc77986f16e378210ded43186175bf646fc5f9181900360200190a350506081806100826000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c806350d25bcd14602d575b600080fd5b60336045565b60408051918252519081900360200190f35b6000549056fea2646970667358221220b3b36b1466563d2296ad3911021352eba21919c06775a8d54892854f5d944bf664736f6c63430006080033";
diff --git a/types/MockBat.d.ts b/types/MockBat.d.ts
deleted file mode 100644
index e4a32da3..00000000
--- a/types/MockBat.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockBatInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockBat extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockBat;
-  attach(addressOrName: string): MockBat;
-  deployed(): Promise<MockBat>;
-
-  on(event: EventFilter | string, listener: Listener): MockBat;
-  once(event: EventFilter | string, listener: Listener): MockBat;
-  addListener(eventName: EventFilter | string, listener: Listener): MockBat;
-  removeAllListeners(eventName: EventFilter | string): MockBat;
-  removeListener(eventName: any, listener: Listener): MockBat;
-
-  interface: MockBatInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockBatFactory.ts b/types/MockBatFactory.ts
deleted file mode 100644
index bb87d53b..00000000
--- a/types/MockBatFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockBat } from "./MockBat";
-
-export class MockBatFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockBat> {
-    return super.deploy(overrides) as Promise<MockBat>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockBat {
-    return super.attach(address) as MockBat;
-  }
-  connect(signer: Signer): MockBatFactory {
-    return super.connect(signer) as MockBatFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockBat {
-    return new Contract(address, _abi, signerOrProvider) as MockBat;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600381526020016210905560ea1b8152506040518060400160405280601581526020017f426173696320417474656e74696f6e20546f6b656e000000000000000000000081525060128282816003908051906020019061007d9291906100d1565b5080516100919060049060208401906100d1565b50506005805460ff19166012179055506100b3816001600160e01b036100bb16565b50505061016c565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061011257805160ff191683800117855561013f565b8280016001018555821561013f579182015b8281111561013f578251825591602001919060010190610124565b5061014b92915061014f565b5090565b61016991905b8082111561014b5760008155600101610155565b90565b610b488061017b6000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa264697066735822122058088e6b0bfc820b3ea55c0eb21e66293ba88009a4f22dec2fd53857c7b1fd4864736f6c63430006080033";
diff --git a/types/MockBusd.d.ts b/types/MockBusd.d.ts
deleted file mode 100644
index 7fd0893d..00000000
--- a/types/MockBusd.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockBusdInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockBusd extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockBusd;
-  attach(addressOrName: string): MockBusd;
-  deployed(): Promise<MockBusd>;
-
-  on(event: EventFilter | string, listener: Listener): MockBusd;
-  once(event: EventFilter | string, listener: Listener): MockBusd;
-  addListener(eventName: EventFilter | string, listener: Listener): MockBusd;
-  removeAllListeners(eventName: EventFilter | string): MockBusd;
-  removeListener(eventName: any, listener: Listener): MockBusd;
-
-  interface: MockBusdInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockBusdFactory.ts b/types/MockBusdFactory.ts
deleted file mode 100644
index 6fa64642..00000000
--- a/types/MockBusdFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockBusd } from "./MockBusd";
-
-export class MockBusdFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockBusd> {
-    return super.deploy(overrides) as Promise<MockBusd>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockBusd {
-    return super.attach(address) as MockBusd;
-  }
-  connect(signer: Signer): MockBusdFactory {
-    return super.connect(signer) as MockBusdFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockBusd {
-    return new Contract(address, _abi, signerOrProvider) as MockBusd;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b5060405180604001604052806004815260200163109554d160e21b8152506040518060400160405280600b81526020016a109a5b985b98d9481554d160aa1b81525060128282816003908051906020019061006c9291906100c0565b5080516100809060049060208401906100c0565b50506005805460ff19166012179055506100a2816001600160e01b036100aa16565b50505061015b565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010157805160ff191683800117855561012e565b8280016001018555821561012e579182015b8281111561012e578251825591602001919060010190610113565b5061013a92915061013e565b5090565b61015891905b8082111561013a5760008155600101610144565b90565b610b488061016a6000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa264697066735822122024d80e3caaf1ca2556e34d848da29075805a6272f5971d08288f57a00ca4a3ab64736f6c63430006080033";
diff --git a/types/MockDai.d.ts b/types/MockDai.d.ts
deleted file mode 100644
index 859f5f3d..00000000
--- a/types/MockDai.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockDaiInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockDai extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockDai;
-  attach(addressOrName: string): MockDai;
-  deployed(): Promise<MockDai>;
-
-  on(event: EventFilter | string, listener: Listener): MockDai;
-  once(event: EventFilter | string, listener: Listener): MockDai;
-  addListener(eventName: EventFilter | string, listener: Listener): MockDai;
-  removeAllListeners(eventName: EventFilter | string): MockDai;
-  removeListener(eventName: any, listener: Listener): MockDai;
-
-  interface: MockDaiInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockDaiFactory.ts b/types/MockDaiFactory.ts
deleted file mode 100644
index e83f1d83..00000000
--- a/types/MockDaiFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockDai } from "./MockDai";
-
-export class MockDaiFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockDai> {
-    return super.deploy(overrides) as Promise<MockDai>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockDai {
-    return super.attach(address) as MockDai;
-  }
-  connect(signer: Signer): MockDaiFactory {
-    return super.connect(signer) as MockDaiFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockDai {
-    return new Contract(address, _abi, signerOrProvider) as MockDai;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600381526020016244414960e81b8152506040518060400160405280600381526020016244414960e81b8152506012828281600390805190602001906100639291906100b7565b5080516100779060049060208401906100b7565b50506005805460ff1916601217905550610099816001600160e01b036100a116565b505050610152565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100f857805160ff1916838001178555610125565b82800160010185558215610125579182015b8281111561012557825182559160200191906001019061010a565b50610131929150610135565b5090565b61014f91905b80821115610131576000815560010161013b565b90565b610b48806101616000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa26469706673582212208dc8b7355217fa70a49c3dcd2a7ff32cc29730917b14ff706bc7b77624c48d4664736f6c63430006080033";
diff --git a/types/MockKnc.d.ts b/types/MockKnc.d.ts
deleted file mode 100644
index 0c9fd4da..00000000
--- a/types/MockKnc.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockKncInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockKnc extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockKnc;
-  attach(addressOrName: string): MockKnc;
-  deployed(): Promise<MockKnc>;
-
-  on(event: EventFilter | string, listener: Listener): MockKnc;
-  once(event: EventFilter | string, listener: Listener): MockKnc;
-  addListener(eventName: EventFilter | string, listener: Listener): MockKnc;
-  removeAllListeners(eventName: EventFilter | string): MockKnc;
-  removeListener(eventName: any, listener: Listener): MockKnc;
-
-  interface: MockKncInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockKncFactory.ts b/types/MockKncFactory.ts
deleted file mode 100644
index aa6df198..00000000
--- a/types/MockKncFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockKnc } from "./MockKnc";
-
-export class MockKncFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockKnc> {
-    return super.deploy(overrides) as Promise<MockKnc>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockKnc {
-    return super.attach(address) as MockKnc;
-  }
-  connect(signer: Signer): MockKncFactory {
-    return super.connect(signer) as MockKncFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockKnc {
-    return new Contract(address, _abi, signerOrProvider) as MockKnc;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060038152602001624b4e4360e81b8152506040518060400160405280600d81526020016c4b79626572204e6574776f726b60981b81525060128282816003908051906020019061006d9291906100c1565b5080516100819060049060208401906100c1565b50506005805460ff19166012179055506100a3816001600160e01b036100ab16565b50505061015c565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010257805160ff191683800117855561012f565b8280016001018555821561012f579182015b8281111561012f578251825591602001919060010190610114565b5061013b92915061013f565b5090565b61015991905b8082111561013b5760008155600101610145565b90565b610b488061016b6000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa264697066735822122074bb0be046fe5e7631223f0a741b2c125024cf422d454fea02c598f654c755e664736f6c63430006080033";
diff --git a/types/MockKyberProxy.d.ts b/types/MockKyberProxy.d.ts
deleted file mode 100644
index 2b8d762f..00000000
--- a/types/MockKyberProxy.d.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockKyberProxyInterface extends Interface {
-  functions: {
-    tokenToBurn: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    tradeWithHint: TypedFunctionDescription<{
-      encode([
-        _fromToken,
-        _amount,
-        _toToken,
-        _receiver,
-        _maxAmount,
-        minConversionRate,
-        _referral,
-        _filtering
-      ]: [
-        string,
-        BigNumberish,
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        string,
-        Arrayish
-      ]): string;
-    }>;
-  };
-
-  events: {};
-}
-
-export class MockKyberProxy extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockKyberProxy;
-  attach(addressOrName: string): MockKyberProxy;
-  deployed(): Promise<MockKyberProxy>;
-
-  on(event: EventFilter | string, listener: Listener): MockKyberProxy;
-  once(event: EventFilter | string, listener: Listener): MockKyberProxy;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockKyberProxy;
-  removeAllListeners(eventName: EventFilter | string): MockKyberProxy;
-  removeListener(eventName: any, listener: Listener): MockKyberProxy;
-
-  interface: MockKyberProxyInterface;
-
-  functions: {
-    tokenToBurn(): Promise<string>;
-
-    tradeWithHint(
-      _fromToken: string,
-      _amount: BigNumberish,
-      _toToken: string,
-      _receiver: string,
-      _maxAmount: BigNumberish,
-      minConversionRate: BigNumberish,
-      _referral: string,
-      _filtering: Arrayish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  tokenToBurn(): Promise<string>;
-
-  tradeWithHint(
-    _fromToken: string,
-    _amount: BigNumberish,
-    _toToken: string,
-    _receiver: string,
-    _maxAmount: BigNumberish,
-    minConversionRate: BigNumberish,
-    _referral: string,
-    _filtering: Arrayish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {};
-
-  estimate: {
-    tokenToBurn(): Promise<BigNumber>;
-
-    tradeWithHint(
-      _fromToken: string,
-      _amount: BigNumberish,
-      _toToken: string,
-      _receiver: string,
-      _maxAmount: BigNumberish,
-      minConversionRate: BigNumberish,
-      _referral: string,
-      _filtering: Arrayish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockKyberProxyFactory.ts b/types/MockKyberProxyFactory.ts
deleted file mode 100644
index f40dea97..00000000
--- a/types/MockKyberProxyFactory.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockKyberProxy } from "./MockKyberProxy";
-
-export class MockKyberProxyFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _tokenToBurn: string,
-    overrides?: TransactionOverrides
-  ): Promise<MockKyberProxy> {
-    return super.deploy(_tokenToBurn, overrides) as Promise<MockKyberProxy>;
-  }
-  getDeployTransaction(
-    _tokenToBurn: string,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_tokenToBurn, overrides);
-  }
-  attach(address: string): MockKyberProxy {
-    return super.attach(address) as MockKyberProxy;
-  }
-  connect(signer: Signer): MockKyberProxyFactory {
-    return super.connect(signer) as MockKyberProxyFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockKyberProxy {
-    return new Contract(address, _abi, signerOrProvider) as MockKyberProxy;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "contract MintableERC20",
-        name: "_tokenToBurn",
-        type: "address"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    inputs: [],
-    name: "tokenToBurn",
-    outputs: [
-      {
-        internalType: "contract MintableERC20",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "_fromToken",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "_toToken",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_receiver",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_maxAmount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "minConversionRate",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "_referral",
-        type: "address"
-      },
-      {
-        internalType: "bytes",
-        name: "_filtering",
-        type: "bytes"
-      }
-    ],
-    name: "tradeWithHint",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "payable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040516106b53803806106b58339818101604052602081101561003357600080fd5b5051600080546001600160a01b039092166001600160a01b0319909216919091179055610650806100656000396000f3fe6080604052600436106100295760003560e01c806329589f611461002e5780634f1b86eb146100ec575b600080fd5b6100da600480360361010081101561004557600080fd5b6001600160a01b0382358116926020810135926040820135831692606083013581169260808101359260a08201359260c0830135169190810190610100810160e082013564010000000081111561009b57600080fd5b8201836020820111156100ad57600080fd5b803590602001918460018302840111640100000000831117156100cf57600080fd5b50909250905061011d565b60408051918252519081900360200190f35b3480156100f857600080fd5b50610101610266565b604080516001600160a01b039092168252519081900360200190f35b600080546040805163140e25ad60e31b8152670de0b6b3a7640000600482015290516001600160a01b039092169163a0712d689160248082019260209290919082900301818787803b15801561017257600080fd5b505af1158015610186573d6000803e3d6000fd5b505050506040513d602081101561019c57600080fd5b50516101ef576040805162461bcd60e51b815260206004820181905260248201527f54524144455f574954485f48494e542e205265766572746564206d696e742829604482015290519081900360640190fd5b6101f7610275565b6001600160a01b03168a6001600160a01b03161461022a5761022a6001600160a01b038b1633308c63ffffffff61028d16565b60005461024f906001600160a01b031633670de0b6b3a764000063ffffffff6102ed16565b50670de0b6b3a76400009998505050505050505050565b6000546001600160a01b031681565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee90565b604080516001600160a01b0380861660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b1790526102e7908590610344565b50505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b17905261033f908490610344565b505050565b6060610399826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166103f59092919063ffffffff16565b80519091501561033f578080602001905160208110156103b857600080fd5b505161033f5760405162461bcd60e51b815260040180806020018281038252602a8152602001806105f1602a913960400191505060405180910390fd5b6060610404848460008561040c565b949350505050565b6060610417856105b7565b610468576040805162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015290519081900360640190fd5b60006060866001600160a01b031685876040518082805190602001908083835b602083106104a75780518252601f199092019160209182019101610488565b6001836020036101000a03801982511681845116808217855250505050505090500191505060006040518083038185875af1925050503d8060008114610509576040519150601f19603f3d011682016040523d82523d6000602084013e61050e565b606091505b509150915081156105225791506104049050565b8051156105325780518082602001fd5b8360405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561057c578181015183820152602001610564565b50505050905090810190601f1680156105a95780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47081811480159061040457505015159291505056fe5361666545524332303a204552433230206f7065726174696f6e20646964206e6f742073756363656564a264697066735822122099f447de7dc340bb9fad6029140c928c6fde2d7c3b3f7bb83714a93e38cb1f2f64736f6c63430006080033";
diff --git a/types/MockLend.d.ts b/types/MockLend.d.ts
deleted file mode 100644
index 1c0f6008..00000000
--- a/types/MockLend.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockLendInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockLend extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockLend;
-  attach(addressOrName: string): MockLend;
-  deployed(): Promise<MockLend>;
-
-  on(event: EventFilter | string, listener: Listener): MockLend;
-  once(event: EventFilter | string, listener: Listener): MockLend;
-  addListener(eventName: EventFilter | string, listener: Listener): MockLend;
-  removeAllListeners(eventName: EventFilter | string): MockLend;
-  removeListener(eventName: any, listener: Listener): MockLend;
-
-  interface: MockLendInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockLendFactory.ts b/types/MockLendFactory.ts
deleted file mode 100644
index 8b9ee0fe..00000000
--- a/types/MockLendFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockLend } from "./MockLend";
-
-export class MockLendFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockLend> {
-    return super.deploy(overrides) as Promise<MockLend>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockLend {
-    return super.attach(address) as MockLend;
-  }
-  connect(signer: Signer): MockLendFactory {
-    return super.connect(signer) as MockLendFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockLend {
-    return new Contract(address, _abi, signerOrProvider) as MockLend;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060048152602001631311539160e21b815250604051806040016040528060048152602001631311539160e21b8152506012828281600390805190602001906100659291906100b9565b5080516100799060049060208401906100b9565b50506005805460ff191660121790555061009b816001600160e01b036100a316565b505050610154565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100fa57805160ff1916838001178555610127565b82800160010185558215610127579182015b8281111561012757825182559160200191906001019061010c565b50610133929150610137565b5090565b61015191905b80821115610133576000815560010161013d565b90565b610b48806101636000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa2646970667358221220545b74b04d903fa7e5eb0ab303757e8abe9b5d8818e080de5fa7183b5b8ad71c64736f6c63430006080033";
diff --git a/types/MockLendingPoolCore.d.ts b/types/MockLendingPoolCore.d.ts
deleted file mode 100644
index 5907f44a..00000000
--- a/types/MockLendingPoolCore.d.ts
+++ /dev/null
@@ -1,1414 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockLendingPoolCoreInterface extends Interface {
-  functions: {
-    activateReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    addressesProvider: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    deactivateReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    disableBorrowingOnReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    disableReserveAsCollateral: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    disableReserveStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    enableBorrowingOnReserve: TypedFunctionDescription<{
-      encode([_reserve, _stableBorrowRateEnabled]: [string, boolean]): string;
-    }>;
-
-    enableReserveAsCollateral: TypedFunctionDescription<{
-      encode([
-        _reserve,
-        _baseLTVasCollateral,
-        _liquidationThreshold,
-        _liquidationBonus
-      ]: [string, BigNumberish, BigNumberish, BigNumberish]): string;
-    }>;
-
-    enableReserveStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    freezeReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveATokenAddress: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveAvailableLiquidity: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveConfiguration: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveCurrentAverageStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveCurrentLiquidityRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveCurrentStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveCurrentVariableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveDecimals: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveInterestRateStrategyAddress: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveIsActive: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveIsFreezed: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveIsStableBorrowRateEnabled: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveLastUpdate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveLiquidationBonus: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveLiquidationThreshold: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveLiquidityCumulativeIndex: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveNormalizedIncome: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveTotalBorrows: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveTotalBorrowsStable: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveTotalBorrowsVariable: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveTotalLiquidity: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveUtilizationRate: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserveVariableBorrowsCumulativeIndex: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    getReserves: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    getUserBasicReserveData: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserBorrowBalances: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserCurrentBorrowRateMode: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserCurrentStableBorrowRate: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserLastUpdate: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserOriginationFee: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserUnderlyingAssetBalance: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    getUserVariableBorrowCumulativeIndex: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    initReserve: TypedFunctionDescription<{
-      encode([
-        _reserve,
-        _aTokenAddress,
-        _decimals,
-        _interestRateStrategyAddress
-      ]: [string, string, BigNumberish, string]): string;
-    }>;
-
-    initialize: TypedFunctionDescription<{
-      encode([_addressesProvider]: [string]): string;
-    }>;
-
-    isReserveBorrowingEnabled: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    isReserveUsageAsCollateralEnabled: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    isUserAllowedToBorrowAtStable: TypedFunctionDescription<{
-      encode([_reserve, _user, _amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-
-    isUserUseReserveAsCollateralEnabled: TypedFunctionDescription<{
-      encode([_reserve, _user]: [string, string]): string;
-    }>;
-
-    lendingPoolAddress: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    liquidateFee: TypedFunctionDescription<{
-      encode([_token, _amount, _destination]: [
-        string,
-        BigNumberish,
-        string
-      ]): string;
-    }>;
-
-    refreshConfiguration: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    removeLastAddedReserve: TypedFunctionDescription<{
-      encode([_reserveToRemove]: [string]): string;
-    }>;
-
-    reservesList: TypedFunctionDescription<{
-      encode([]: [BigNumberish]): string;
-    }>;
-
-    setReserveBaseLTVasCollateral: TypedFunctionDescription<{
-      encode([_reserve, _ltv]: [string, BigNumberish]): string;
-    }>;
-
-    setReserveDecimals: TypedFunctionDescription<{
-      encode([_reserve, _decimals]: [string, BigNumberish]): string;
-    }>;
-
-    setReserveInterestRateStrategyAddress: TypedFunctionDescription<{
-      encode([_reserve, _rateStrategyAddress]: [string, string]): string;
-    }>;
-
-    setReserveLiquidationBonus: TypedFunctionDescription<{
-      encode([_reserve, _bonus]: [string, BigNumberish]): string;
-    }>;
-
-    setReserveLiquidationThreshold: TypedFunctionDescription<{
-      encode([_reserve, _threshold]: [string, BigNumberish]): string;
-    }>;
-
-    setUserUseReserveAsCollateral: TypedFunctionDescription<{
-      encode([_reserve, _user, _useAsCollateral]: [
-        string,
-        string,
-        boolean
-      ]): string;
-    }>;
-
-    transferToFeeCollectionAddress: TypedFunctionDescription<{
-      encode([_token, _user, _amount, _destination]: [
-        string,
-        string,
-        BigNumberish,
-        string
-      ]): string;
-    }>;
-
-    transferToReserve: TypedFunctionDescription<{
-      encode([_reserve, _user, _amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-
-    transferToUser: TypedFunctionDescription<{
-      encode([_reserve, _user, _amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-
-    unfreezeReserve: TypedFunctionDescription<{
-      encode([_reserve]: [string]): string;
-    }>;
-
-    updateStateOnBorrow: TypedFunctionDescription<{
-      encode([_reserve, _user, _amountBorrowed, _borrowFee, _rateMode]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-
-    updateStateOnDeposit: TypedFunctionDescription<{
-      encode([_reserve, _user, _amount, _isFirstDeposit]: [
-        string,
-        string,
-        BigNumberish,
-        boolean
-      ]): string;
-    }>;
-
-    updateStateOnFlashLoan: TypedFunctionDescription<{
-      encode([_reserve, _availableLiquidityBefore, _income, _protocolFee]: [
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-
-    updateStateOnLiquidation: TypedFunctionDescription<{
-      encode([
-        _principalReserve,
-        _collateralReserve,
-        _user,
-        _amountToLiquidate,
-        _collateralToLiquidate,
-        _feeLiquidated,
-        _liquidatedCollateralForFee,
-        _balanceIncrease,
-        _liquidatorReceivesAToken
-      ]: [
-        string,
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        boolean
-      ]): string;
-    }>;
-
-    updateStateOnRebalance: TypedFunctionDescription<{
-      encode([_reserve, _user, _balanceIncrease]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-
-    updateStateOnRedeem: TypedFunctionDescription<{
-      encode([_reserve, _user, _amountRedeemed, _userRedeemedEverything]: [
-        string,
-        string,
-        BigNumberish,
-        boolean
-      ]): string;
-    }>;
-
-    updateStateOnRepay: TypedFunctionDescription<{
-      encode([
-        _reserve,
-        _user,
-        _paybackAmountMinusFees,
-        _originationFeeRepaid,
-        _balanceIncrease,
-        _repaidWholeLoan
-      ]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        boolean
-      ]): string;
-    }>;
-
-    updateStateOnSwapRate: TypedFunctionDescription<{
-      encode([
-        _reserve,
-        _user,
-        _principalBorrowBalance,
-        _compoundedBorrowBalance,
-        _balanceIncrease,
-        _currentRateMode
-      ]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    ReserveDataUpdated: TypedEventDescription<{
-      encodeTopics([
-        reserve,
-        liquidityRate,
-        stableBorrowRate,
-        averageStableBorrowRate,
-        variableBorrowRate,
-        liquidityIndex,
-        variableBorrowIndex
-      ]: [string | null, null, null, null, null, null, null]): string[];
-    }>;
-
-    ReserveUpdated: TypedEventDescription<{
-      encodeTopics([
-        reserve,
-        liquidityRate,
-        stableBorrowRate,
-        variableBorrowRate,
-        liquidityIndex,
-        variableBorrowIndex
-      ]: [string | null, null, null, null, null, null]): string[];
-    }>;
-
-    ReserveUpdatedFromMock: TypedEventDescription<{
-      encodeTopics([revision]: [BigNumberish | null]): string[];
-    }>;
-  };
-}
-
-export class MockLendingPoolCore extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockLendingPoolCore;
-  attach(addressOrName: string): MockLendingPoolCore;
-  deployed(): Promise<MockLendingPoolCore>;
-
-  on(event: EventFilter | string, listener: Listener): MockLendingPoolCore;
-  once(event: EventFilter | string, listener: Listener): MockLendingPoolCore;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockLendingPoolCore;
-  removeAllListeners(eventName: EventFilter | string): MockLendingPoolCore;
-  removeListener(eventName: any, listener: Listener): MockLendingPoolCore;
-
-  interface: MockLendingPoolCoreInterface;
-
-  functions: {
-    activateReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    addressesProvider(): Promise<string>;
-
-    deactivateReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    disableBorrowingOnReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    disableReserveAsCollateral(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    disableReserveStableBorrowRate(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    enableBorrowingOnReserve(
-      _reserve: string,
-      _stableBorrowRateEnabled: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    enableReserveAsCollateral(
-      _reserve: string,
-      _baseLTVasCollateral: BigNumberish,
-      _liquidationThreshold: BigNumberish,
-      _liquidationBonus: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    enableReserveStableBorrowRate(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    freezeReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    getReserveATokenAddress(_reserve: string): Promise<string>;
-
-    getReserveAvailableLiquidity(_reserve: string): Promise<BigNumber>;
-
-    getReserveConfiguration(
-      _reserve: string
-    ): Promise<{
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-      3: boolean;
-    }>;
-
-    getReserveCurrentAverageStableBorrowRate(
-      _reserve: string
-    ): Promise<BigNumber>;
-
-    getReserveCurrentLiquidityRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentVariableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveDecimals(_reserve: string): Promise<BigNumber>;
-
-    getReserveInterestRateStrategyAddress(_reserve: string): Promise<string>;
-
-    getReserveIsActive(_reserve: string): Promise<boolean>;
-
-    getReserveIsFreezed(_reserve: string): Promise<boolean>;
-
-    getReserveIsStableBorrowRateEnabled(_reserve: string): Promise<boolean>;
-
-    getReserveLastUpdate(_reserve: string): Promise<number>;
-
-    getReserveLiquidationBonus(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidationThreshold(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidityCumulativeIndex(_reserve: string): Promise<BigNumber>;
-
-    getReserveNormalizedIncome(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrows(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrowsStable(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrowsVariable(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalLiquidity(_reserve: string): Promise<BigNumber>;
-
-    getReserveUtilizationRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveVariableBorrowsCumulativeIndex(
-      _reserve: string
-    ): Promise<BigNumber>;
-
-    getReserves(): Promise<string[]>;
-
-    getUserBasicReserveData(
-      _reserve: string,
-      _user: string
-    ): Promise<{
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-      3: boolean;
-    }>;
-
-    getUserBorrowBalances(
-      _reserve: string,
-      _user: string
-    ): Promise<{
-      0: BigNumber;
-      1: BigNumber;
-      2: BigNumber;
-    }>;
-
-    getUserCurrentBorrowRateMode(
-      _reserve: string,
-      _user: string
-    ): Promise<number>;
-
-    getUserCurrentStableBorrowRate(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserLastUpdate(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserOriginationFee(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserUnderlyingAssetBalance(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserVariableBorrowCumulativeIndex(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    initReserve(
-      _reserve: string,
-      _aTokenAddress: string,
-      _decimals: BigNumberish,
-      _interestRateStrategyAddress: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    initialize(
-      _addressesProvider: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    isReserveBorrowingEnabled(_reserve: string): Promise<boolean>;
-
-    isReserveUsageAsCollateralEnabled(_reserve: string): Promise<boolean>;
-
-    isUserAllowedToBorrowAtStable(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<boolean>;
-
-    isUserUseReserveAsCollateralEnabled(
-      _reserve: string,
-      _user: string
-    ): Promise<boolean>;
-
-    lendingPoolAddress(): Promise<string>;
-
-    liquidateFee(
-      _token: string,
-      _amount: BigNumberish,
-      _destination: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    refreshConfiguration(
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    removeLastAddedReserve(
-      _reserveToRemove: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    reservesList(arg0: BigNumberish): Promise<string>;
-
-    setReserveBaseLTVasCollateral(
-      _reserve: string,
-      _ltv: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setReserveDecimals(
-      _reserve: string,
-      _decimals: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setReserveInterestRateStrategyAddress(
-      _reserve: string,
-      _rateStrategyAddress: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setReserveLiquidationBonus(
-      _reserve: string,
-      _bonus: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setReserveLiquidationThreshold(
-      _reserve: string,
-      _threshold: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    setUserUseReserveAsCollateral(
-      _reserve: string,
-      _user: string,
-      _useAsCollateral: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferToFeeCollectionAddress(
-      _token: string,
-      _user: string,
-      _amount: BigNumberish,
-      _destination: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferToReserve(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferToUser(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    unfreezeReserve(
-      _reserve: string,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnBorrow(
-      _reserve: string,
-      _user: string,
-      _amountBorrowed: BigNumberish,
-      _borrowFee: BigNumberish,
-      _rateMode: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnDeposit(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish,
-      _isFirstDeposit: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnFlashLoan(
-      _reserve: string,
-      _availableLiquidityBefore: BigNumberish,
-      _income: BigNumberish,
-      _protocolFee: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnLiquidation(
-      _principalReserve: string,
-      _collateralReserve: string,
-      _user: string,
-      _amountToLiquidate: BigNumberish,
-      _collateralToLiquidate: BigNumberish,
-      _feeLiquidated: BigNumberish,
-      _liquidatedCollateralForFee: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _liquidatorReceivesAToken: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnRebalance(
-      _reserve: string,
-      _user: string,
-      _balanceIncrease: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnRedeem(
-      _reserve: string,
-      _user: string,
-      _amountRedeemed: BigNumberish,
-      _userRedeemedEverything: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnRepay(
-      _reserve: string,
-      _user: string,
-      _paybackAmountMinusFees: BigNumberish,
-      _originationFeeRepaid: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _repaidWholeLoan: boolean,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    updateStateOnSwapRate(
-      _reserve: string,
-      _user: string,
-      _principalBorrowBalance: BigNumberish,
-      _compoundedBorrowBalance: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _currentRateMode: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  activateReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  addressesProvider(): Promise<string>;
-
-  deactivateReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  disableBorrowingOnReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  disableReserveAsCollateral(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  disableReserveStableBorrowRate(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  enableBorrowingOnReserve(
-    _reserve: string,
-    _stableBorrowRateEnabled: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  enableReserveAsCollateral(
-    _reserve: string,
-    _baseLTVasCollateral: BigNumberish,
-    _liquidationThreshold: BigNumberish,
-    _liquidationBonus: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  enableReserveStableBorrowRate(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  freezeReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  getReserveATokenAddress(_reserve: string): Promise<string>;
-
-  getReserveAvailableLiquidity(_reserve: string): Promise<BigNumber>;
-
-  getReserveConfiguration(
-    _reserve: string
-  ): Promise<{
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-    3: boolean;
-  }>;
-
-  getReserveCurrentAverageStableBorrowRate(
-    _reserve: string
-  ): Promise<BigNumber>;
-
-  getReserveCurrentLiquidityRate(_reserve: string): Promise<BigNumber>;
-
-  getReserveCurrentStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-  getReserveCurrentVariableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-  getReserveDecimals(_reserve: string): Promise<BigNumber>;
-
-  getReserveInterestRateStrategyAddress(_reserve: string): Promise<string>;
-
-  getReserveIsActive(_reserve: string): Promise<boolean>;
-
-  getReserveIsFreezed(_reserve: string): Promise<boolean>;
-
-  getReserveIsStableBorrowRateEnabled(_reserve: string): Promise<boolean>;
-
-  getReserveLastUpdate(_reserve: string): Promise<number>;
-
-  getReserveLiquidationBonus(_reserve: string): Promise<BigNumber>;
-
-  getReserveLiquidationThreshold(_reserve: string): Promise<BigNumber>;
-
-  getReserveLiquidityCumulativeIndex(_reserve: string): Promise<BigNumber>;
-
-  getReserveNormalizedIncome(_reserve: string): Promise<BigNumber>;
-
-  getReserveTotalBorrows(_reserve: string): Promise<BigNumber>;
-
-  getReserveTotalBorrowsStable(_reserve: string): Promise<BigNumber>;
-
-  getReserveTotalBorrowsVariable(_reserve: string): Promise<BigNumber>;
-
-  getReserveTotalLiquidity(_reserve: string): Promise<BigNumber>;
-
-  getReserveUtilizationRate(_reserve: string): Promise<BigNumber>;
-
-  getReserveVariableBorrowsCumulativeIndex(
-    _reserve: string
-  ): Promise<BigNumber>;
-
-  getReserves(): Promise<string[]>;
-
-  getUserBasicReserveData(
-    _reserve: string,
-    _user: string
-  ): Promise<{
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-    3: boolean;
-  }>;
-
-  getUserBorrowBalances(
-    _reserve: string,
-    _user: string
-  ): Promise<{
-    0: BigNumber;
-    1: BigNumber;
-    2: BigNumber;
-  }>;
-
-  getUserCurrentBorrowRateMode(
-    _reserve: string,
-    _user: string
-  ): Promise<number>;
-
-  getUserCurrentStableBorrowRate(
-    _reserve: string,
-    _user: string
-  ): Promise<BigNumber>;
-
-  getUserLastUpdate(_reserve: string, _user: string): Promise<BigNumber>;
-
-  getUserOriginationFee(_reserve: string, _user: string): Promise<BigNumber>;
-
-  getUserUnderlyingAssetBalance(
-    _reserve: string,
-    _user: string
-  ): Promise<BigNumber>;
-
-  getUserVariableBorrowCumulativeIndex(
-    _reserve: string,
-    _user: string
-  ): Promise<BigNumber>;
-
-  initReserve(
-    _reserve: string,
-    _aTokenAddress: string,
-    _decimals: BigNumberish,
-    _interestRateStrategyAddress: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  initialize(
-    _addressesProvider: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  isReserveBorrowingEnabled(_reserve: string): Promise<boolean>;
-
-  isReserveUsageAsCollateralEnabled(_reserve: string): Promise<boolean>;
-
-  isUserAllowedToBorrowAtStable(
-    _reserve: string,
-    _user: string,
-    _amount: BigNumberish
-  ): Promise<boolean>;
-
-  isUserUseReserveAsCollateralEnabled(
-    _reserve: string,
-    _user: string
-  ): Promise<boolean>;
-
-  lendingPoolAddress(): Promise<string>;
-
-  liquidateFee(
-    _token: string,
-    _amount: BigNumberish,
-    _destination: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  refreshConfiguration(
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  removeLastAddedReserve(
-    _reserveToRemove: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  reservesList(arg0: BigNumberish): Promise<string>;
-
-  setReserveBaseLTVasCollateral(
-    _reserve: string,
-    _ltv: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setReserveDecimals(
-    _reserve: string,
-    _decimals: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setReserveInterestRateStrategyAddress(
-    _reserve: string,
-    _rateStrategyAddress: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setReserveLiquidationBonus(
-    _reserve: string,
-    _bonus: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setReserveLiquidationThreshold(
-    _reserve: string,
-    _threshold: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  setUserUseReserveAsCollateral(
-    _reserve: string,
-    _user: string,
-    _useAsCollateral: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferToFeeCollectionAddress(
-    _token: string,
-    _user: string,
-    _amount: BigNumberish,
-    _destination: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferToReserve(
-    _reserve: string,
-    _user: string,
-    _amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferToUser(
-    _reserve: string,
-    _user: string,
-    _amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  unfreezeReserve(
-    _reserve: string,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnBorrow(
-    _reserve: string,
-    _user: string,
-    _amountBorrowed: BigNumberish,
-    _borrowFee: BigNumberish,
-    _rateMode: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnDeposit(
-    _reserve: string,
-    _user: string,
-    _amount: BigNumberish,
-    _isFirstDeposit: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnFlashLoan(
-    _reserve: string,
-    _availableLiquidityBefore: BigNumberish,
-    _income: BigNumberish,
-    _protocolFee: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnLiquidation(
-    _principalReserve: string,
-    _collateralReserve: string,
-    _user: string,
-    _amountToLiquidate: BigNumberish,
-    _collateralToLiquidate: BigNumberish,
-    _feeLiquidated: BigNumberish,
-    _liquidatedCollateralForFee: BigNumberish,
-    _balanceIncrease: BigNumberish,
-    _liquidatorReceivesAToken: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnRebalance(
-    _reserve: string,
-    _user: string,
-    _balanceIncrease: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnRedeem(
-    _reserve: string,
-    _user: string,
-    _amountRedeemed: BigNumberish,
-    _userRedeemedEverything: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnRepay(
-    _reserve: string,
-    _user: string,
-    _paybackAmountMinusFees: BigNumberish,
-    _originationFeeRepaid: BigNumberish,
-    _balanceIncrease: BigNumberish,
-    _repaidWholeLoan: boolean,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  updateStateOnSwapRate(
-    _reserve: string,
-    _user: string,
-    _principalBorrowBalance: BigNumberish,
-    _compoundedBorrowBalance: BigNumberish,
-    _balanceIncrease: BigNumberish,
-    _currentRateMode: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    ReserveDataUpdated(
-      reserve: string | null,
-      liquidityRate: null,
-      stableBorrowRate: null,
-      averageStableBorrowRate: null,
-      variableBorrowRate: null,
-      liquidityIndex: null,
-      variableBorrowIndex: null
-    ): EventFilter;
-
-    ReserveUpdated(
-      reserve: string | null,
-      liquidityRate: null,
-      stableBorrowRate: null,
-      variableBorrowRate: null,
-      liquidityIndex: null,
-      variableBorrowIndex: null
-    ): EventFilter;
-
-    ReserveUpdatedFromMock(revision: BigNumberish | null): EventFilter;
-  };
-
-  estimate: {
-    activateReserve(_reserve: string): Promise<BigNumber>;
-
-    addressesProvider(): Promise<BigNumber>;
-
-    deactivateReserve(_reserve: string): Promise<BigNumber>;
-
-    disableBorrowingOnReserve(_reserve: string): Promise<BigNumber>;
-
-    disableReserveAsCollateral(_reserve: string): Promise<BigNumber>;
-
-    disableReserveStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    enableBorrowingOnReserve(
-      _reserve: string,
-      _stableBorrowRateEnabled: boolean
-    ): Promise<BigNumber>;
-
-    enableReserveAsCollateral(
-      _reserve: string,
-      _baseLTVasCollateral: BigNumberish,
-      _liquidationThreshold: BigNumberish,
-      _liquidationBonus: BigNumberish
-    ): Promise<BigNumber>;
-
-    enableReserveStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    freezeReserve(_reserve: string): Promise<BigNumber>;
-
-    getReserveATokenAddress(_reserve: string): Promise<BigNumber>;
-
-    getReserveAvailableLiquidity(_reserve: string): Promise<BigNumber>;
-
-    getReserveConfiguration(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentAverageStableBorrowRate(
-      _reserve: string
-    ): Promise<BigNumber>;
-
-    getReserveCurrentLiquidityRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentStableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveCurrentVariableBorrowRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveDecimals(_reserve: string): Promise<BigNumber>;
-
-    getReserveInterestRateStrategyAddress(_reserve: string): Promise<BigNumber>;
-
-    getReserveIsActive(_reserve: string): Promise<BigNumber>;
-
-    getReserveIsFreezed(_reserve: string): Promise<BigNumber>;
-
-    getReserveIsStableBorrowRateEnabled(_reserve: string): Promise<BigNumber>;
-
-    getReserveLastUpdate(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidationBonus(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidationThreshold(_reserve: string): Promise<BigNumber>;
-
-    getReserveLiquidityCumulativeIndex(_reserve: string): Promise<BigNumber>;
-
-    getReserveNormalizedIncome(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrows(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrowsStable(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalBorrowsVariable(_reserve: string): Promise<BigNumber>;
-
-    getReserveTotalLiquidity(_reserve: string): Promise<BigNumber>;
-
-    getReserveUtilizationRate(_reserve: string): Promise<BigNumber>;
-
-    getReserveVariableBorrowsCumulativeIndex(
-      _reserve: string
-    ): Promise<BigNumber>;
-
-    getReserves(): Promise<BigNumber>;
-
-    getUserBasicReserveData(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserBorrowBalances(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserCurrentBorrowRateMode(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserCurrentStableBorrowRate(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserLastUpdate(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserOriginationFee(_reserve: string, _user: string): Promise<BigNumber>;
-
-    getUserUnderlyingAssetBalance(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    getUserVariableBorrowCumulativeIndex(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    initReserve(
-      _reserve: string,
-      _aTokenAddress: string,
-      _decimals: BigNumberish,
-      _interestRateStrategyAddress: string
-    ): Promise<BigNumber>;
-
-    initialize(_addressesProvider: string): Promise<BigNumber>;
-
-    isReserveBorrowingEnabled(_reserve: string): Promise<BigNumber>;
-
-    isReserveUsageAsCollateralEnabled(_reserve: string): Promise<BigNumber>;
-
-    isUserAllowedToBorrowAtStable(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<BigNumber>;
-
-    isUserUseReserveAsCollateralEnabled(
-      _reserve: string,
-      _user: string
-    ): Promise<BigNumber>;
-
-    lendingPoolAddress(): Promise<BigNumber>;
-
-    liquidateFee(
-      _token: string,
-      _amount: BigNumberish,
-      _destination: string
-    ): Promise<BigNumber>;
-
-    refreshConfiguration(): Promise<BigNumber>;
-
-    removeLastAddedReserve(_reserveToRemove: string): Promise<BigNumber>;
-
-    reservesList(arg0: BigNumberish): Promise<BigNumber>;
-
-    setReserveBaseLTVasCollateral(
-      _reserve: string,
-      _ltv: BigNumberish
-    ): Promise<BigNumber>;
-
-    setReserveDecimals(
-      _reserve: string,
-      _decimals: BigNumberish
-    ): Promise<BigNumber>;
-
-    setReserveInterestRateStrategyAddress(
-      _reserve: string,
-      _rateStrategyAddress: string
-    ): Promise<BigNumber>;
-
-    setReserveLiquidationBonus(
-      _reserve: string,
-      _bonus: BigNumberish
-    ): Promise<BigNumber>;
-
-    setReserveLiquidationThreshold(
-      _reserve: string,
-      _threshold: BigNumberish
-    ): Promise<BigNumber>;
-
-    setUserUseReserveAsCollateral(
-      _reserve: string,
-      _user: string,
-      _useAsCollateral: boolean
-    ): Promise<BigNumber>;
-
-    transferToFeeCollectionAddress(
-      _token: string,
-      _user: string,
-      _amount: BigNumberish,
-      _destination: string
-    ): Promise<BigNumber>;
-
-    transferToReserve(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<BigNumber>;
-
-    transferToUser(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish
-    ): Promise<BigNumber>;
-
-    unfreezeReserve(_reserve: string): Promise<BigNumber>;
-
-    updateStateOnBorrow(
-      _reserve: string,
-      _user: string,
-      _amountBorrowed: BigNumberish,
-      _borrowFee: BigNumberish,
-      _rateMode: BigNumberish
-    ): Promise<BigNumber>;
-
-    updateStateOnDeposit(
-      _reserve: string,
-      _user: string,
-      _amount: BigNumberish,
-      _isFirstDeposit: boolean
-    ): Promise<BigNumber>;
-
-    updateStateOnFlashLoan(
-      _reserve: string,
-      _availableLiquidityBefore: BigNumberish,
-      _income: BigNumberish,
-      _protocolFee: BigNumberish
-    ): Promise<BigNumber>;
-
-    updateStateOnLiquidation(
-      _principalReserve: string,
-      _collateralReserve: string,
-      _user: string,
-      _amountToLiquidate: BigNumberish,
-      _collateralToLiquidate: BigNumberish,
-      _feeLiquidated: BigNumberish,
-      _liquidatedCollateralForFee: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _liquidatorReceivesAToken: boolean
-    ): Promise<BigNumber>;
-
-    updateStateOnRebalance(
-      _reserve: string,
-      _user: string,
-      _balanceIncrease: BigNumberish
-    ): Promise<BigNumber>;
-
-    updateStateOnRedeem(
-      _reserve: string,
-      _user: string,
-      _amountRedeemed: BigNumberish,
-      _userRedeemedEverything: boolean
-    ): Promise<BigNumber>;
-
-    updateStateOnRepay(
-      _reserve: string,
-      _user: string,
-      _paybackAmountMinusFees: BigNumberish,
-      _originationFeeRepaid: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _repaidWholeLoan: boolean
-    ): Promise<BigNumber>;
-
-    updateStateOnSwapRate(
-      _reserve: string,
-      _user: string,
-      _principalBorrowBalance: BigNumberish,
-      _compoundedBorrowBalance: BigNumberish,
-      _balanceIncrease: BigNumberish,
-      _currentRateMode: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockLendingPoolCoreFactory.ts b/types/MockLendingPoolCoreFactory.ts
deleted file mode 100644
index 21f83388..00000000
--- a/types/MockLendingPoolCoreFactory.ts
+++ /dev/null
@@ -1,1711 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockLendingPoolCore } from "./MockLendingPoolCore";
-
-export class MockLendingPoolCoreFactory extends ContractFactory {
-  constructor(
-    linkLibraryAddresses: MockLendingPoolCoreLibraryAddresses,
-    signer?: Signer
-  ) {
-    super(
-      _abi,
-      MockLendingPoolCoreFactory.linkBytecode(linkLibraryAddresses),
-      signer
-    );
-  }
-
-  static linkBytecode(
-    linkLibraryAddresses: MockLendingPoolCoreLibraryAddresses
-  ): string {
-    let linkedBytecode = _bytecode;
-
-    linkedBytecode = linkedBytecode.replace(
-      new RegExp("__\\$2ec35834968386f54fa313129cf94664e4\\$__", "g"),
-      linkLibraryAddresses["__$2ec35834968386f54fa313129cf94664e4$__"]
-        .replace(/^0x/, "")
-        .toLowerCase()
-    );
-
-    return linkedBytecode;
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockLendingPoolCore> {
-    return super.deploy(overrides) as Promise<MockLendingPoolCore>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockLendingPoolCore {
-    return super.attach(address) as MockLendingPoolCore;
-  }
-  connect(signer: Signer): MockLendingPoolCoreFactory {
-    return super.connect(signer) as MockLendingPoolCoreFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockLendingPoolCore {
-    return new Contract(address, _abi, signerOrProvider) as MockLendingPoolCore;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "reserve",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "liquidityRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "stableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "averageStableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "variableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "liquidityIndex",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "variableBorrowIndex",
-        type: "uint256"
-      }
-    ],
-    name: "ReserveDataUpdated",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "reserve",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "liquidityRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "stableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "variableBorrowRate",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "liquidityIndex",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "variableBorrowIndex",
-        type: "uint256"
-      }
-    ],
-    name: "ReserveUpdated",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "revision",
-        type: "uint256"
-      }
-    ],
-    name: "ReserveUpdatedFromMock",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "activateReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "addressesProvider",
-    outputs: [
-      {
-        internalType: "contract LendingPoolAddressesProvider",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "deactivateReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "disableBorrowingOnReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "disableReserveAsCollateral",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "disableReserveStableBorrowRate",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "bool",
-        name: "_stableBorrowRateEnabled",
-        type: "bool"
-      }
-    ],
-    name: "enableBorrowingOnReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_baseLTVasCollateral",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_liquidationThreshold",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_liquidationBonus",
-        type: "uint256"
-      }
-    ],
-    name: "enableReserveAsCollateral",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "enableReserveStableBorrowRate",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "freezeReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveATokenAddress",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveAvailableLiquidity",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveConfiguration",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveCurrentAverageStableBorrowRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveCurrentLiquidityRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveCurrentStableBorrowRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveCurrentVariableBorrowRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveDecimals",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveInterestRateStrategyAddress",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveIsActive",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveIsFreezed",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveIsStableBorrowRateEnabled",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveLastUpdate",
-    outputs: [
-      {
-        internalType: "uint40",
-        name: "timestamp",
-        type: "uint40"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveLiquidationBonus",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveLiquidationThreshold",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveLiquidityCumulativeIndex",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveNormalizedIncome",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveTotalBorrows",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveTotalBorrowsStable",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveTotalBorrowsVariable",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveTotalLiquidity",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveUtilizationRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "getReserveVariableBorrowsCumulativeIndex",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "getReserves",
-    outputs: [
-      {
-        internalType: "address[]",
-        name: "",
-        type: "address[]"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserBasicReserveData",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserBorrowBalances",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserCurrentBorrowRateMode",
-    outputs: [
-      {
-        internalType: "enum CoreLibrary.InterestRateMode",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserCurrentStableBorrowRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserLastUpdate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserOriginationFee",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserUnderlyingAssetBalance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "getUserVariableBorrowCumulativeIndex",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_aTokenAddress",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_decimals",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "_interestRateStrategyAddress",
-        type: "address"
-      }
-    ],
-    name: "initReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract LendingPoolAddressesProvider",
-        name: "_addressesProvider",
-        type: "address"
-      }
-    ],
-    name: "initialize",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "isReserveBorrowingEnabled",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "isReserveUsageAsCollateralEnabled",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      }
-    ],
-    name: "isUserAllowedToBorrowAtStable",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      }
-    ],
-    name: "isUserUseReserveAsCollateralEnabled",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "lendingPoolAddress",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_token",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "_destination",
-        type: "address"
-      }
-    ],
-    name: "liquidateFee",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "refreshConfiguration",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserveToRemove",
-        type: "address"
-      }
-    ],
-    name: "removeLastAddedReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    name: "reservesList",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_ltv",
-        type: "uint256"
-      }
-    ],
-    name: "setReserveBaseLTVasCollateral",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_decimals",
-        type: "uint256"
-      }
-    ],
-    name: "setReserveDecimals",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_rateStrategyAddress",
-        type: "address"
-      }
-    ],
-    name: "setReserveInterestRateStrategyAddress",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_bonus",
-        type: "uint256"
-      }
-    ],
-    name: "setReserveLiquidationBonus",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_threshold",
-        type: "uint256"
-      }
-    ],
-    name: "setReserveLiquidationThreshold",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "bool",
-        name: "_useAsCollateral",
-        type: "bool"
-      }
-    ],
-    name: "setUserUseReserveAsCollateral",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_token",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      },
-      {
-        internalType: "address",
-        name: "_destination",
-        type: "address"
-      }
-    ],
-    name: "transferToFeeCollectionAddress",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address payable",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferToReserve",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address payable",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferToUser",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      }
-    ],
-    name: "unfreezeReserve",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amountBorrowed",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_borrowFee",
-        type: "uint256"
-      },
-      {
-        internalType: "enum CoreLibrary.InterestRateMode",
-        name: "_rateMode",
-        type: "uint8"
-      }
-    ],
-    name: "updateStateOnBorrow",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "_isFirstDeposit",
-        type: "bool"
-      }
-    ],
-    name: "updateStateOnDeposit",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_availableLiquidityBefore",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_income",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_protocolFee",
-        type: "uint256"
-      }
-    ],
-    name: "updateStateOnFlashLoan",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_principalReserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_collateralReserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amountToLiquidate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_collateralToLiquidate",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_feeLiquidated",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_liquidatedCollateralForFee",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_balanceIncrease",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "_liquidatorReceivesAToken",
-        type: "bool"
-      }
-    ],
-    name: "updateStateOnLiquidation",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_balanceIncrease",
-        type: "uint256"
-      }
-    ],
-    name: "updateStateOnRebalance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amountRedeemed",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "_userRedeemedEverything",
-        type: "bool"
-      }
-    ],
-    name: "updateStateOnRedeem",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_paybackAmountMinusFees",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_originationFeeRepaid",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_balanceIncrease",
-        type: "uint256"
-      },
-      {
-        internalType: "bool",
-        name: "_repaidWholeLoan",
-        type: "bool"
-      }
-    ],
-    name: "updateStateOnRepay",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_reserve",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_user",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_principalBorrowBalance",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_compoundedBorrowBalance",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_balanceIncrease",
-        type: "uint256"
-      },
-      {
-        internalType: "enum CoreLibrary.InterestRateMode",
-        name: "_currentRateMode",
-        type: "uint8"
-      }
-    ],
-    name: "updateStateOnSwapRate",
-    outputs: [
-      {
-        internalType: "enum CoreLibrary.InterestRateMode",
-        name: "",
-        type: "uint8"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    stateMutability: "payable",
-    type: "receive"
-  }
-];
-
-const _bytecode =
-  "0x60806040526000805534801561001457600080fd5b5061590280620000256000396000f3fe6080604052600436106104145760003560e01c8063a2353fdc1161021e578063d15e005311610123578063e8ae2f5b116100ab578063f61483111161007a578063f6148311146113ad578063f6ea8d7614611431578063fa51854c1461146c578063fa93b2a5146114b1578063feab31ac146114f45761045f565b8063e8ae2f5b146112d9578063eede87c11461130c578063ef1f937314611347578063f054ab461461137a5761045f565b8063dae4c4e7116100f2578063dae4c4e7146111c2578063e10076ad146111f5578063e2174d8614611230578063e240301914611273578063e6d18190146112a65761045f565b8063d15e0053146110ea578063d3ae26b31461111d578063d466016f14611132578063da12d96f1461116b5761045f565b8063bd7fd79a116101a6578063c540148e11610175578063c540148e14611000578063c72c4d1014611033578063c76a6c9c14611048578063c7d142371461107b578063d06e2ec1146110b75761045f565b8063bd7fd79a14610f34578063bfacad8414610f67578063c33cfd9014610f9a578063c4d66de814610fcd5761045f565b8063afcdbea3116101ed578063afcdbea314610e05578063b701d09314610e50578063b75d6f3414610e83578063b8c0f74514610eb6578063bcd6ffa414610ee95761045f565b8063a2353fdc14610d17578063a5bc826c14610d4a578063a8dc0f4514610d8f578063af825b0714610dc25761045f565b80635cf2e656116103245780637aca76eb116102ac578063906c0a411161027b578063906c0a4114610bea57806398bd473714610c1d5780639e3c4f3b14610c505780639e67484814610c8b5780639fb8afcd14610cbe5761045f565b80637aca76eb14610b1b5780637f90fec514610b4e57806388079d8814610b815780638f385c2214610bb45761045f565b806366d103f3116102f357806366d103f3146109ce57806368beb4d614610a095780636ae1441614610a745780636fffab0c14610aa757806370fb84f414610ae25761045f565b80635cf2e656146108f25780635fc526ff14610925578063646810831461098057806366bbd928146109955761045f565b80633443a14b116103a757806345330a401161037657806345330a40146107cc57806346bc0f28146108155780634a08accb146108485780634f1446091461087b5780634fe7a6e5146108c85761045f565b80633443a14b146106a557806334b3beee146106de57806337ac6fe41461072d5780633e72a454146107995761045f565b806318f9bbae116103e357806318f9bbae146105a25780631ca19f19146105d55780631d2118f91461063457806328fcf4d31461066f5761045f565b806305075d6e146104645780630902f1ac146104ab57806309ac29531461051057806318a4dbca146105555761045f565b3661045f576104223361152f565b61045d5760405162461bcd60e51b81526004018080602001828103825260368152602001806156316036913960400191505060405180910390fd5b005b600080fd5b34801561047057600080fd5b506104976004803603602081101561048757600080fd5b50356001600160a01b031661156d565b604080519115158252519081900360200190f35b3480156104b757600080fd5b506104c0611595565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156104fc5781810151838201526020016104e4565b505050509050019250505060405180910390f35b34801561051c57600080fd5b5061045d6004803603608081101561053357600080fd5b506001600160a01b0381351690602081013590604081013590606001356115f7565b34801561056157600080fd5b506105906004803603604081101561057857600080fd5b506001600160a01b03813581169160200135166116c5565b60408051918252519081900360200190f35b3480156105ae57600080fd5b50610497600480360360208110156105c557600080fd5b50356001600160a01b0316611758565b3480156105e157600080fd5b50610610600480360360408110156105f857600080fd5b506001600160a01b0381358116916020013516611780565b6040518082600281111561062057fe5b60ff16815260200191505060405180910390f35b34801561064057600080fd5b5061045d6004803603604081101561065757600080fd5b506001600160a01b03813581169160200135166117d5565b61045d6004803603606081101561068557600080fd5b506001600160a01b038135811691602081013590911690604001356118bb565b3480156106b157600080fd5b5061045d600480360360408110156106c857600080fd5b506001600160a01b038135169060200135611a86565b3480156106ea57600080fd5b506107116004803603602081101561070157600080fd5b50356001600160a01b0316611b5a565b604080516001600160a01b039092168252519081900360200190f35b34801561073957600080fd5b50610780600480360360a081101561075057600080fd5b5080356001600160a01b03908116916020810135909116906040810135906060810135906080013560ff16611b7b565b6040805192835260208301919091528051918290030190f35b3480156107a557600080fd5b5061045d600480360360208110156107bc57600080fd5b50356001600160a01b0316611c1b565b3480156107d857600080fd5b5061045d600480360360808110156107ef57600080fd5b506001600160a01b03813581169160208101358216916040820135916060013516611cf7565b34801561082157600080fd5b506105906004803603602081101561083857600080fd5b50356001600160a01b0316611e51565b34801561085457600080fd5b506104976004803603602081101561086b57600080fd5b50356001600160a01b0316611e6f565b34801561088757600080fd5b506108ae6004803603602081101561089e57600080fd5b50356001600160a01b0316611e97565b6040805164ffffffffff9092168252519081900360200190f35b3480156108d457600080fd5b50610711600480360360208110156108eb57600080fd5b5035611ec3565b3480156108fe57600080fd5b506104976004803603602081101561091557600080fd5b50356001600160a01b0316611eea565b34801561093157600080fd5b506109586004803603602081101561094857600080fd5b50356001600160a01b0316611f12565b6040805194855260208501939093528383019190915215156060830152519081900360800190f35b34801561098c57600080fd5b5061045d611f50565b3480156109a157600080fd5b5061045d600480360360408110156109b857600080fd5b506001600160a01b03813516906020013561200f565b3480156109da57600080fd5b50610590600480360360408110156109f157600080fd5b506001600160a01b03813581169160200135166120e3565b348015610a1557600080fd5b5061045d6004803603610120811015610a2d57600080fd5b506001600160a01b03813581169160208101358216916040820135169060608101359060808101359060a08101359060c08101359060e08101359061010001351515612119565b348015610a8057600080fd5b5061071160048036036020811015610a9757600080fd5b50356001600160a01b03166121bb565b348015610ab357600080fd5b5061059060048036036040811015610aca57600080fd5b506001600160a01b03813581169160200135166121dc565b348015610aee57600080fd5b5061045d60048036036040811015610b0557600080fd5b506001600160a01b03813516906020013561220b565b348015610b2757600080fd5b5061045d60048036036020811015610b3e57600080fd5b50356001600160a01b03166122df565b348015610b5a57600080fd5b5061059060048036036020811015610b7157600080fd5b50356001600160a01b03166123c1565b348015610b8d57600080fd5b5061059060048036036020811015610ba457600080fd5b50356001600160a01b03166123df565b61045d60048036036060811015610bca57600080fd5b506001600160a01b03813581169160208101359160409091013516612507565b348015610bf657600080fd5b5061059060048036036020811015610c0d57600080fd5b50356001600160a01b031661261d565b348015610c2957600080fd5b5061059060048036036020811015610c4057600080fd5b50356001600160a01b03166126cd565b348015610c5c57600080fd5b5061049760048036036040811015610c7357600080fd5b506001600160a01b03813581169160200135166126eb565b348015610c9757600080fd5b5061049760048036036020811015610cae57600080fd5b50356001600160a01b0316612724565b348015610cca57600080fd5b50610cf960048036036040811015610ce157600080fd5b506001600160a01b038135811691602001351661274c565b60408051938452602084019290925282820152519081900360600190f35b348015610d2357600080fd5b5061059060048036036020811015610d3a57600080fd5b50356001600160a01b03166127d7565b348015610d5657600080fd5b5061045d60048036036080811015610d6d57600080fd5b506001600160a01b0381351690602081013590604081013590606001356127f5565b348015610d9b57600080fd5b5061045d60048036036020811015610db257600080fd5b50356001600160a01b0316612943565b348015610dce57600080fd5b5061059060048036036060811015610de557600080fd5b506001600160a01b03813581169160208101359091169060400135612a72565b348015610e1157600080fd5b5061045d60048036036080811015610e2857600080fd5b506001600160a01b038135811691602081013590911690604081013590606001351515612b12565b348015610e5c57600080fd5b5061059060048036036020811015610e7357600080fd5b50356001600160a01b0316612b9a565b348015610e8f57600080fd5b5061045d60048036036020811015610ea657600080fd5b50356001600160a01b0316612bb8565b348015610ec257600080fd5b5061045d60048036036020811015610ed957600080fd5b50356001600160a01b0316612ceb565b348015610ef557600080fd5b5061045d60048036036080811015610f0c57600080fd5b506001600160a01b038135811691602081013590911690604081013590606001351515612dc7565b348015610f4057600080fd5b5061059060048036036020811015610f5757600080fd5b50356001600160a01b0316612e4f565b348015610f7357600080fd5b5061059060048036036020811015610f8a57600080fd5b50356001600160a01b0316612e6a565b348015610fa657600080fd5b5061059060048036036020811015610fbd57600080fd5b50356001600160a01b0316612ed4565b348015610fd957600080fd5b5061045d60048036036020811015610ff057600080fd5b50356001600160a01b0316612f0d565b34801561100c57600080fd5b506105906004803603602081101561102357600080fd5b50356001600160a01b0316612fcc565b34801561103f57600080fd5b50610711612fea565b34801561105457600080fd5b506105906004803603602081101561106b57600080fd5b50356001600160a01b0316612ff9565b61045d6004803603608081101561109157600080fd5b506001600160a01b03813581169160208101358216916040820135916060013516613017565b3480156110c357600080fd5b5061045d600480360360208110156110da57600080fd5b50356001600160a01b03166131c9565b3480156110f657600080fd5b506105906004803603602081101561110d57600080fd5b50356001600160a01b03166133ce565b34801561112957600080fd5b506107116133ef565b34801561113e57600080fd5b5061045d6004803603604081101561115557600080fd5b506001600160a01b0381351690602001356133fe565b34801561117757600080fd5b5061045d600480360360c081101561118e57600080fd5b506001600160a01b03813581169160208101359091169060408101359060608101359060808101359060a0013515156134d2565b3480156111ce57600080fd5b5061045d600480360360208110156111e557600080fd5b50356001600160a01b0316613541565b34801561120157600080fd5b506109586004803603604081101561121857600080fd5b506001600160a01b0381358116916020013516613623565b34801561123c57600080fd5b506104976004803603606081101561125357600080fd5b506001600160a01b038135811691602081013590911690604001356136d0565b34801561127f57600080fd5b506105906004803603602081101561129657600080fd5b50356001600160a01b0316613766565b3480156112b257600080fd5b50610590600480360360208110156112c957600080fd5b50356001600160a01b031661380a565b3480156112e557600080fd5b5061045d600480360360208110156112fc57600080fd5b50356001600160a01b031661382b565b34801561131857600080fd5b5061045d6004803603604081101561132f57600080fd5b506001600160a01b0381351690602001351515613946565b34801561135357600080fd5b5061045d6004803603602081101561136a57600080fd5b50356001600160a01b0316613a7d565b34801561138657600080fd5b506105906004803603602081101561139d57600080fd5b50356001600160a01b0316613b59565b3480156113b957600080fd5b50611406600480360360c08110156113d057600080fd5b5080356001600160a01b039081169160208101359091169060408101359060608101359060808101359060a0013560ff16613b77565b6040518083600281111561141657fe5b60ff1681526020018281526020019250505060405180910390f35b34801561143d57600080fd5b506105906004803603604081101561145457600080fd5b506001600160a01b0381358116916020013516613c09565b34801561147857600080fd5b5061045d6004803603606081101561148f57600080fd5b506001600160a01b038135811691602081013590911690604001351515613c38565b3480156114bd57600080fd5b5061045d600480360360608110156114d457600080fd5b506001600160a01b03813581169160208101359091169060400135613cca565b34801561150057600080fd5b506105906004803603604081101561151757600080fd5b506001600160a01b0381358116916020013516613df1565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47081811480159061156357508115155b925050505b919050565b6001600160a01b03166000908152603660205260409020600d0154600160e01b900460ff1690565b606060388054806020026020016040519081016040528092919081815260200182805480156115ed57602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116115cf575b5050505050905090565b6034546001600160a01b031633146116405760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b61164a8482613e20565b6001600160a01b038416600090815260366020526040902061166b90613f5d565b60006116866116798661380a565b859063ffffffff613ff516565b6001600160a01b03861660009081526036602052604090209091506116b290828563ffffffff61404f16565b6116be858460006140ad565b5050505050565b6001600160a01b038083166000908152603660209081526040808320600c015481516370a0823160e01b8152868616600482015291519394169283926370a082319260248082019391829003018186803b15801561172257600080fd5b505afa158015611736573d6000803e3d6000fd5b505050506040513d602081101561174c57600080fd5b50519150505b92915050565b6001600160a01b03166000908152603660205260409020600d0154600160d01b900460ff1690565b6001600160a01b038082166000908152603760209081526040808320938616835292905290812080546117b7576000915050611752565b60008160030154116117ca5760026117cd565b60015b949350505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561181957600080fd5b505afa15801561182d573d6000803e3d6000fd5b505050506040513d602081101561184357600080fd5b50516001600160a01b03161461188a5760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b039182166000908152603660205260409020600d0180546001600160a01b03191691909216179055565b6034546001600160a01b031633146119045760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b61190c6140ee565b6001600160a01b0316836001600160a01b0316146119815734156119615760405162461bcd60e51b81526004018080602001828103825260328152602001806156c76032913960400191505060405180910390fd5b61197c6001600160a01b03841683308463ffffffff61410616565b611a81565b803410156119c05760405162461bcd60e51b81526004018080602001828103825260358152602001806155fc6035913960400191505060405180910390fd5b80341115611a815760006119da348363ffffffff61416016565b6040519091506000906001600160a01b0385169061c35090859084818181858888f193505050503d8060008114611a2d576040519150601f19603f3d011682016040523d82523d6000602084013e611a32565b606091505b50509050806116be576040805162461bcd60e51b8152602060048201526016602482015275151c985b9cd9995c881bd9881155120819985a5b195960521b604482015290519081900360640190fd5b505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015611aca57600080fd5b505afa158015611ade573d6000803e3d6000fd5b505050506040513d6020811015611af457600080fd5b50516001600160a01b031614611b3b5760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b03909116600090815260366020526040902060090155565b6001600160a01b039081166000908152603660205260409020600c01541690565b60345460009081906001600160a01b03163314611bc95760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b600080611bd6898961274c565b9250509150611be9898984848b8a6141a2565b611bf7898989848a8a6141d1565b611c03896000896140ad565b611c0d89896142f6565b999098509650505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015611c5f57600080fd5b505afa158015611c73573d6000803e3d6000fd5b505050506040513d6020811015611c8957600080fd5b50516001600160a01b031614611cd05760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60e01b19169055565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015611d3b57600080fd5b505afa158015611d4f573d6000803e3d6000fd5b505050506040513d6020811015611d6557600080fd5b50516001600160a01b031614611dac5760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b0380851660009081526036602052604080822081516304dda73560e21b8152600481019190915286841660248201526044810186905292841660648401525173__$2ec35834968386f54fa313129cf94664e4$__926313769cd4926084808301939192829003018186803b158015611e2a57600080fd5b505af4158015611e3e573d6000803e3d6000fd5b50505050611e4b84614388565b50505050565b6001600160a01b031660009081526036602052604090206006015490565b6001600160a01b03166000908152603660205260409020600d0154600160e81b900460ff1690565b6001600160a01b03166000908152603660205260409020600d0154600160a01b900464ffffffffff1690565b60388181548110611ed057fe5b6000918252602090912001546001600160a01b0316905081565b6001600160a01b03166000908152603660205260409020600d0154600160c81b900460ff1690565b6001600160a01b03166000908152603660205260409020600b81015460088201546009830154600d909301549193909291600160d01b900460ff1690565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015611f9457600080fd5b505afa158015611fa8573d6000803e3d6000fd5b505050506040513d6020811015611fbe57600080fd5b50516001600160a01b0316146120055760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b61200d61442c565b565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561205357600080fd5b505afa158015612067573d6000803e3d6000fd5b505050506040513d602081101561207d57600080fd5b50516001600160a01b0316146120c45760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b039091166000908152603660205260409020600b0155565b6001600160a01b0390811660009081526037602090815260408083209490931682529290925290206004015464ffffffffff1690565b6034546001600160a01b031633146121625760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b61216e898888856144c7565b61217788614580565b61218489888887866145a4565b612190898760006140ad565b806121b0576121b08860006121ab888763ffffffff613ff516565b6140ad565b505050505050505050565b6001600160a01b039081166000908152603660205260409020600d01541690565b6001600160a01b0380821660009081526037602090815260408083209386168352929052206003015492915050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561224f57600080fd5b505afa158015612263573d6000803e3d6000fd5b505050506040513d602081101561227957600080fd5b50516001600160a01b0316146122c05760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b039091166000908152603660205260409020600a0155565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561232357600080fd5b505afa158015612337573d6000803e3d6000fd5b505050506040513d602081101561234d57600080fd5b50516001600160a01b0316146123945760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60e81b1916600160e81b179055565b6001600160a01b031660009081526036602052604090206002015490565b6001600160a01b0380821660009081526036602090815260408083206035548251631b0c55dd60e11b815292519495919486949190921692633618abba9260048083019392829003018186803b15801561243857600080fd5b505afa15801561244c573d6000803e3d6000fd5b505050506040513d602081101561246257600080fd5b505160058301549091506124fc57806001600160a01b031663bb85c0bb856040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156124c657600080fd5b505afa1580156124da573d6000803e3d6000fd5b505050506040513d60208110156124f057600080fd5b50519250611568915050565b506005015492915050565b6034546001600160a01b031633146125505760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b80341561258e5760405162461bcd60e51b81526004018080602001828103825260368152602001806155766036913960400191505060405180910390fd5b6125966140ee565b6001600160a01b0316846001600160a01b0316146125cd576125c86001600160a01b038516828563ffffffff61466216565b611e4b565b6040516000906001600160a01b0383169061c35090869084818181858888f193505050503d8060008114611a2d576040519150601f19603f3d011682016040523d82523d6000602084013e611a32565b6001600160a01b038116600090815260366020526040812060048101546126c35780600d0160009054906101000a90046001600160a01b03166001600160a01b03166334762ca56040518163ffffffff1660e01b815260040160206040518083038186803b15801561268e57600080fd5b505afa1580156126a2573d6000803e3d6000fd5b505050506040513d60208110156126b857600080fd5b505191506115689050565b6004015492915050565b6001600160a01b031660009081526036602052604090206003015490565b6001600160a01b03908116600090815260376020908152604080832094909316825292909252902060040154600160281b900460ff1690565b6001600160a01b03166000908152603660205260409020600d0154600160d81b900460ff1690565b6001600160a01b038082166000908152603760209081526040808320938616835292905290812080548291829161278d5750600092508291508190506127d0565b80546001600160a01b03871660009081526036602052604081206127b29084906146b4565b905081816127c6818363ffffffff61416016565b9550955095505050505b9250925092565b6001600160a01b03166000908152603660205260409020600b015490565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561283957600080fd5b505afa15801561284d573d6000803e3d6000fd5b505050506040513d602081101561286357600080fd5b50516001600160a01b0316146128aa5760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b038416600090815260366020526040808220815163126ee27360e11b81526004810191909152602481018690526044810185905260648101849052905173__$2ec35834968386f54fa313129cf94664e4$__926324ddc4e69260848082019391829003018186803b15801561292557600080fd5b505af4158015612939573d6000803e3d6000fd5b5050505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561298757600080fd5b505afa15801561299b573d6000803e3d6000fd5b505050506040513d60208110156129b157600080fd5b50516001600160a01b0316146129f85760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b03811660009081526036602052604080822081516372efab5360e11b81526004810191909152905173__$2ec35834968386f54fa313129cf94664e4$__9263e5df56a69260248082019391829003018186803b158015612a5e57600080fd5b505af41580156116be573d6000803e3d6000fd5b6034546000906001600160a01b03163314612abe5760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b612ac98484846147a6565b612ad48484846147f6565b612ae0846000806140ad565b506001600160a01b038083166000908152603760209081526040808320938716835292905220600301545b9392505050565b6034546001600160a01b03163314612b5b5760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b6001600160a01b0384166000908152603660205260409020612b7c90613f5d565b612b88846000846140ad565b8015611e4b57611e4b84846000613c38565b6001600160a01b031660009081526036602052604090206007015490565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612bfc57600080fd5b505afa158015612c10573d6000803e3d6000fd5b505050506040513d6020811015612c2657600080fd5b50516001600160a01b031614612c6d5760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b0381166000908152603660205260409020805415801590612c99575060008160070154115b612cd45760405162461bcd60e51b81526004018080602001828103825260248152602001806157bf6024913960400191505060405180910390fd5b600d01805460ff60e01b1916600160e01b17905550565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015612d2f57600080fd5b505afa158015612d43573d6000803e3d6000fd5b505050506040513d6020811015612d5957600080fd5b50516001600160a01b031614612da05760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60d81b19169055565b6034546001600160a01b03163314612e105760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b6001600160a01b0384166000908152603660205260409020612e3190613f5d565b612e3d848360006140ad565b8015611e4b57611e4b84846001613c38565b6001600160a01b031660009081526036602052604090205490565b6001600160a01b038116600090815260366020526040812081612e8c8261485f565b905080612e9e57600092505050611568565b6000612ea985613766565b9050612ecb612ebe828463ffffffff613ff516565b839063ffffffff61487c16565b95945050505050565b6001600160a01b0381166000908152603660205260408120612b0b612ef88261485f565b612f0185613766565b9063ffffffff613ff516565b6000612f176148b8565b60015490915060ff1680612f2e5750612f2e6148bd565b80612f3a575060005481115b612f755760405162461bcd60e51b815260040180806020018281038252602e815260200180615828602e913960400191505060405180910390fd5b60015460ff16158015612f94576001805460ff19168117905560008290555b603580546001600160a01b0319166001600160a01b038516179055612fb761442c565b8015611a81576001805460ff19169055505050565b6001600160a01b031660009081526036602052604090206001015490565b6035546001600160a01b031681565b6001600160a01b03166000908152603660205260409020600a015490565b6034546001600160a01b031633146130605760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b806130696140ee565b6001600160a01b0316856001600160a01b0316146130de5734156130be5760405162461bcd60e51b815260040180806020018281038252605f8152602001806156f9605f913960600191505060405180910390fd5b6130d96001600160a01b03861685838663ffffffff61410616565b6116be565b8234101561311d5760405162461bcd60e51b81526004018080602001828103825260358152602001806155fc6035913960400191505060405180910390fd5b6040516000906001600160a01b0383169061c35090869084818181858888f193505050503d806000811461316d576040519150601f19603f3d011682016040523d82523d6000602084013e613172565b606091505b50509050806131c1576040805162461bcd60e51b8152602060048201526016602482015275151c985b9cd9995c881bd9881155120819985a5b195960521b604482015290519081900360640190fd5b505050505050565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561320d57600080fd5b505afa158015613221573d6000803e3d6000fd5b505050506040513d602081101561323757600080fd5b50516001600160a01b03161461327e5760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6038805460009190600019810190811061329457fe5b6000918252602090912001546001600160a01b039081169150821681146132ec5760405162461bcd60e51b815260040180806020018281038252603d81526020018061568a603d913960400191505060405180910390fd5b6132f58161380a565b156133315760405162461bcd60e51b81526004018080602001828103825260308152602001806157586030913960400191505060405180910390fd5b6001600160a01b0381166000908152603660205260408120600d81018054600c830180546001600160a01b0319169055600b8301849055838355600783018490556008830184905560098301849055600a90920192909255600168ff00ffff000000000160a01b031916905560388054806133a857fe5b600082815260209020810160001990810180546001600160a01b03191690550190555050565b6001600160a01b0381166000908152603660205260408120612b0b816148c3565b6034546001600160a01b031681565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561344257600080fd5b505afa158015613456573d6000803e3d6000fd5b505050506040513d602081101561346c57600080fd5b50516001600160a01b0316146134b35760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b03909116600090815260366020526040902060080155565b6034546001600160a01b0316331461351b5760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b613527868686856148f1565b613535868686868686614958565b6131c1868560006140ad565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561358557600080fd5b505afa158015613599573d6000803e3d6000fd5b505050506040513d60208110156135af57600080fd5b50516001600160a01b0316146135f65760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60d81b1916600160d81b179055565b6001600160a01b03808316600081815260366020908152604080832094861683526037825280832093835292905290812090918291829182918261366789896116c5565b8254909150613694576004909101549095506000945084935060ff600160281b9091041691506136c79050565b806136a5838563ffffffff6146b416565b6002840154600490940154919850965091945050600160281b900460ff169150505b92959194509250565b6001600160a01b038381166000818152603660209081526040808320948716835260378252808320938352929052908120600d830154919291600160d81b900460ff1661372257600092505050612b0b565b6004810154600160281b900460ff1615806137495750600d820154600160d01b900460ff16155b8061375c575061375986866116c5565b84115b9695505050505050565b6000806137716140ee565b6001600160a01b0316836001600160a01b03161415613791575047611752565b604080516370a0823160e01b815230600482015290516001600160a01b038516916370a08231916024808301926020929190829003018186803b1580156137d757600080fd5b505afa1580156137eb573d6000803e3d6000fd5b505050506040513d602081101561380157600080fd5b50519392505050565b6001600160a01b03811660009081526036602052604081206117529061485f565b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561386f57600080fd5b505afa158015613883573d6000803e3d6000fd5b505050506040513d602081101561389957600080fd5b50516001600160a01b0316146138e05760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b038116600090815260366020526040808220815163041e0b2d60e51b81526004810191909152905173__$2ec35834968386f54fa313129cf94664e4$__926383c165a09260248082019391829003018186803b158015612a5e57600080fd5b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b15801561398a57600080fd5b505afa15801561399e573d6000803e3d6000fd5b505050506040513d60208110156139b457600080fd5b50516001600160a01b0316146139fb5760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b0382166000908152603660205260408082208151637b1dd5df60e11b815260048101919091528315156024820152905173__$2ec35834968386f54fa313129cf94664e4$__9263f63babbe9260448082019391829003018186803b158015613a6957600080fd5b505af41580156131c1573d6000803e3d6000fd5b603554604080516385c858b160e01b8152905133926001600160a01b0316916385c858b1916004808301926020929190829003018186803b158015613ac157600080fd5b505afa158015613ad5573d6000803e3d6000fd5b505050506040513d6020811015613aeb57600080fd5b50516001600160a01b031614613b325760405162461bcd60e51b81526004018080602001828103825260378152602001806157886037913960400191505060405180910390fd5b6001600160a01b03166000908152603660205260409020600d01805460ff60e81b19169055565b6001600160a01b031660009081526036602052604090206009015490565b60345460009081906001600160a01b03163314613bc55760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b613bd288888888876149d5565b6000613be089898787614ad4565b9050613bee896000806140ad565b80613bf98a8a6142f6565b9250925050965096945050505050565b6001600160a01b0380821660009081526037602090815260408083209386168352929052206001015492915050565b6034546001600160a01b03163314613c815760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b6001600160a01b0391821660009081526037602090815260408083209590941682529390935291206004018054911515600160281b0265ff000000000019909216919091179055565b6034546001600160a01b03163314613d135760405162461bcd60e51b815260040180806020018281038252602a815260200180615856602a913960400191505060405180910390fd5b613d1b6140ee565b6001600160a01b0316836001600160a01b031614613d4d5761197c6001600160a01b038416838363ffffffff61466216565b6040516000906001600160a01b0384169061c35090849084818181858888f193505050503d8060008114613d9d576040519150601f19603f3d011682016040523d82523d6000602084013e613da2565b606091505b5050905080611e4b576040805162461bcd60e51b8152602060048201526016602482015275151c985b9cd9995c881bd9881155120819985a5b195960521b604482015290519081900360640190fd5b6001600160a01b0380821660009081526037602090815260408083209386168352929052206002015492915050565b60355460408051637744894b60e11b815290516000926001600160a01b03169163ee891296916004808301926020929190829003018186803b158015613e6557600080fd5b505afa158015613e79573d6000803e3d6000fd5b505050506040513d6020811015613e8f57600080fd5b50519050613e9b6140ee565b6001600160a01b0316836001600160a01b031614613ecd5761197c6001600160a01b038416828463ffffffff61466216565b6040516000906001600160a01b0383169084908381818185875af1925050503d8060008114613f18576040519150601f19603f3d011682016040523d82523d6000602084013e613f1d565b606091505b5050905080611e4b5760405162461bcd60e51b81526004018080602001828103825260248152602001806158046024913960400191505060405180910390fd5b6000613f688261485f565b90508015613ff1576001820154600d830154600091613f9491600160a01b900464ffffffffff16614bd2565b8354909150613faa90829063ffffffff614c1d16565b83556004830154600d840154600091613fd091600160a01b900464ffffffffff16614c55565b9050613fe9846007015482614c1d90919063ffffffff16565b600785015550505b5050565b600082820183811015612b0b576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600061407261405d84614ca4565b61406684614ca4565b9063ffffffff61487c16565b9050600061408e614081614cba565b839063ffffffff613ff516565b85549091506140a490829063ffffffff614c1d16565b90945550505050565b6140b8838383614cca565b6140c06148b8565b6040517fb362f715591e6551ba78917a287fa286eed1ded21d619b267911b67f595af1c990600090a2505050565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee90565b604080516001600160a01b0380861660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b179052611e4b908590614e63565b6000612b0b83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f77000081525061501b565b6001600160a01b03861660009081526036602052604090206141c390613f5d565b6131c18686868686866150b2565b6001600160a01b038087166000818152603660209081526040808320948a1683526037825280832093835292905220600183600281111561420e57fe5b141561422a5760058201546003820155600060018201556142a1565b600283600281111561423857fe5b14156142545760006003820155600782015460018201556142a1565b6040805162461bcd60e51b815260206004820152601860248201527f496e76616c696420626f72726f772072617465206d6f64650000000000000000604482015290519081900360640190fd5b80546142b9908690612f01908963ffffffff613ff516565b815560028101546142d0908563ffffffff613ff516565b6002820155600401805464ffffffffff19164264ffffffffff1617905550505050505050565b6000806143038484611780565b9050600081600281111561431357fe5b1415614323576000915050611752565b600181600281111561433157fe5b14614357576001600160a01b0384166000908152603660205260409020600401546117cd565b50506001600160a01b0390811660009081526037602090815260408083209490931682529290925290206003015490565b6000805b6038548110156143d557826001600160a01b0316603882815481106143ad57fe5b6000918252602090912001546001600160a01b031614156143cd57600191505b60010161438c565b5080613ff157603880546001810182556000919091527f38395c5dceade9603479b177b68959049485df8aa97b39f3533039af5f4561990180546001600160a01b0384166001600160a01b03199091161790555050565b603560009054906101000a90046001600160a01b03166001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561447a57600080fd5b505afa15801561448e573d6000803e3d6000fd5b505050506040513d60208110156144a457600080fd5b5051603480546001600160a01b0319166001600160a01b03909216919091179055565b6001600160a01b038085166000818152603660209081526040808320948816835260378252808320938352929052206144ff82613f5d565b600061450b8787611780565b905060015b81600281111561451c57fe5b141561455757600382015461453a908490869063ffffffff61520e16565b6003820154614552908490879063ffffffff61527e16565b614577565b614567838563ffffffff61538916565b614577838663ffffffff6153aa16565b50505050505050565b6001600160a01b03811660009081526036602052604090206145a190613f5d565b50565b6001600160a01b0380851660009081526037602090815260408083209389168352928152828220603690915291902081546145f79086906145eb908663ffffffff613ff516565b9063ffffffff61416016565b825560026146058888611780565b600281111561461057fe5b141561462157600781015460018301555b831561464257600282015461463c908563ffffffff61416016565b60028301555b50600401805464ffffffffff19164264ffffffffff161790555050505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b179052611a81908490614e63565b81546000906146c557506000611752565b60006146d48460000154614ca4565b60038501549091506000908190156147085760038601546004870154614701919064ffffffffff16614c55565b905061474a565b6147478660010154614066876007015461473b89600401548a600d0160149054906101000a900464ffffffffff16614c55565b9063ffffffff614c1d16565b90505b61476261475d848363ffffffff614c1d16565b615402565b865490925082141561479d57600486015464ffffffffff16421461479d57855461479390600163ffffffff613ff516565b9350505050611752565b50949350505050565b6001600160a01b038084166000818152603660209081526040808320948716835260378252808320938352929052206147de82613f5d565b60038101546116be908390859063ffffffff61520e16565b6001600160a01b038083166000908152603760209081526040808320938716835292815282822060369091529190208154614837908463ffffffff613ff516565b8255600501546003820155600401805464ffffffffff19164264ffffffffff16179055505050565b600061175282600301548360020154613ff590919063ffffffff16565b6000600282046117cd836148ac61489f876b033b2e3c9fd0803ce800000061541b565b849063ffffffff613ff516565b9063ffffffff61547416565b600890565b303b1590565b600080612b0b836000015461473b856001015486600d0160149054906101000a900464ffffffffff16614bd2565b6001600160a01b0380851660008181526036602090815260408083209488168352603782528083209383529290529081209061492d8787611780565b6001600160a01b038816600090815260366020526040902090915061495190613f5d565b6001614510565b6001600160a01b038087166000818152603660209081526040808320948a1683526037825280832093835292905220805461499f9087906145eb908763ffffffff613ff516565b81556007820154600182015582156149c05760006003820181905560018201555b60028101546142d0908663ffffffff61416016565b6001600160a01b03808616600081815260366020908152604080832094891683526037825280832093835292905220614a0d82613f5d565b6001836002811115614a1b57fe5b1415614a4d576003810154614a3783878363ffffffff61527e16565b614a47838663ffffffff61538916565b50614577565b6002836002811115614a5b57fe5b1415614a87576005820154614a76838763ffffffff6153aa16565b614a4783868363ffffffff61520e16565b6040805162461bcd60e51b815260206004820152601a60248201527f496e76616c69642072617465206d6f6465207265636569766564000000000000604482015290519081900360640190fd5b6001600160a01b03808416600090815260376020908152604080832093881683529281528282206036909152918120909190826002856002811115614b1557fe5b1415614b365750600581015460038301556000600183810191909155614b9a565b6001856002811115614b4457fe5b1415614b63575060006003830155600781015460018301556002614b9a565b60405162461bcd60e51b81526004018080602001828103825260238152602001806158806023913960400191505060405180910390fd5b8254614bac908763ffffffff613ff516565b83556004909201805464ffffffffff19164264ffffffffff161790555095945050505050565b600080614bec4264ffffffffff851663ffffffff61416016565b90506000614c0061405d6301e13380614ca4565b9050612ecb614c0d614cba565b612f01878463ffffffff614c1d16565b6000612b0b6b033b2e3c9fd0803ce80000006148ac614c42868663ffffffff61541b16565b6b019d971e4fe8401e7400000090613ff5565b600080614c6f4264ffffffffff851663ffffffff61416016565b90506000614c87856301e1338063ffffffff61547416565b9050612ecb82614c9861489f614cba565b9063ffffffff6154b616565b600061175282633b9aca0063ffffffff61541b16565b6b033b2e3c9fd0803ce800000090565b6001600160a01b0380841660009081526036602052604081206006810154600d820154919390929182918291166357e37af089614d0e896145eb8c612f0185613766565b88600201548960030154896040518663ffffffff1660e01b815260040180866001600160a01b03166001600160a01b031681526020018581526020018481526020018381526020018281526020019550505050505060606040518083038186803b158015614d7b57600080fd5b505afa158015614d8f573d6000803e3d6000fd5b505050506040513d6060811015614da557600080fd5b50805160208083015160409384015160018a0184905560058a0182905560048a01819055600d8a01805464ffffffffff4216600160a01b0264ffffffffff60a01b19909116179055895460078b015486518681529485018490528487018b905260608501839052608085019190915260a0840152935192965094509192506001600160a01b038a16917f131cf1f61e39fd78f61f07d78533f5b6c13629c80ef6965983e92c72efbaa4a4919081900360c00190a25050505050505050565b614e75826001600160a01b031661152f565b614ec6576040805162461bcd60e51b815260206004820152601f60248201527f5361666545524332303a2063616c6c20746f206e6f6e2d636f6e747261637400604482015290519081900360640190fd5b60006060836001600160a01b0316836040518082805190602001908083835b60208310614f045780518252601f199092019160209182019101614ee5565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114614f66576040519150601f19603f3d011682016040523d82523d6000602084013e614f6b565b606091505b509150915081614fc2576040805162461bcd60e51b815260206004820181905260248201527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564604482015290519081900360640190fd5b805115611e4b57808060200190516020811015614fde57600080fd5b5051611e4b5760405162461bcd60e51b815260040180806020018281038252602a8152602001806158a3602a913960400191505060405180910390fd5b600081848411156150aa5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561506f578181015183820152602001615057565b50505050905090810190601f16801561509c5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b60006150be8787611780565b6001600160a01b038816600090815260366020526040902090915060018260028111156150e757fe5b1415615130576001600160a01b038088166000908152603760209081526040808320938c16835292905220600381015461512a908390899063ffffffff61527e16565b50615154565b600282600281111561513e57fe5b141561515457615154818763ffffffff6153aa16565b600061516a85612f01898963ffffffff613ff516565b9050600184600281111561517a57fe5b141561519d576005820154615198908390839063ffffffff61520e16565b6121b0565b60028460028111156151ab57fe5b14156151c157615198828263ffffffff61538916565b6040805162461bcd60e51b815260206004820152601c60248201527f496e76616c6964206e657720626f72726f772072617465206d6f646500000000604482015290519081900360640190fd5b6002830154615223818463ffffffff613ff516565b600285015560006152378361473b86614ca4565b9050600061524c866006015461473b85614ca4565b905061526e61525e8760020154614ca4565b614066848463ffffffff613ff516565b8660060181905550505050505050565b81836002015410156152d7576040805162461bcd60e51b815260206004820152601a60248201527f496e76616c696420616d6f756e7420746f206465637265617365000000000000604482015290519081900360640190fd5b60028301546152ec818463ffffffff61416016565b60028501819055615304575060006006840155611a81565b60006153138361473b86614ca4565b90506000615328866006015461473b85614ca4565b9050818110156153695760405162461bcd60e51b81526004018080602001828103825260238152602001806156676023913960400191505060405180910390fd5b61526e6153798760020154614ca4565b614066838563ffffffff61416016565b600382015461539e908263ffffffff613ff516565b82600301819055505050565b80826003015410156153ed5760405162461bcd60e51b81526004018080602001828103825260508152602001806155ac6050913960600191505060405180910390fd5b600382015461539e908263ffffffff61416016565b6000631dcd6500612b0b633b9aca006148ac8386613ff5565b60008261542a57506000611752565b8282028284828161543757fe5b0414612b0b5760405162461bcd60e51b81526004018080602001828103825260218152602001806157e36021913960400191505060405180910390fd5b6000612b0b83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250615510565b6000600282066154d2576b033b2e3c9fd0803ce80000006154d4565b825b90506002820491505b8115611752576154ed8384614c1d565b92506002820615615505576155028184614c1d565b90505b6002820491506154dd565b6000818361555f5760405162461bcd60e51b815260206004820181815283516024840152835190928392604490910191908501908083836000831561506f578181015183820152602001615057565b50600083858161556b57fe5b049594505050505056fe466565206c69717569646174696f6e20646f6573206e6f74207265717569726520616e79207472616e73666572206f662076616c756554686520616d6f756e742074686174206973206265696e6720737562747261637465642066726f6d20746865207661726961626c6520746f74616c20626f72726f777320697320696e636f727265637454686520616d6f756e7420616e64207468652076616c75652073656e7420746f206465706f73697420646f206e6f74206d617463684f6e6c7920636f6e7472616374732063616e2073656e6420657468657220746f20746865204c656e64696e6720706f6f6c20636f726554686520616d6f756e747320746f20737562747261637420646f6e2774206d6174636852657365727665206265696e672072656d6f76656420697320646966666572656e74207468616e20746865207265736572766520726571756573746564557365722069732073656e64696e672045544820616c6f6e67207769746820746865204552433230207472616e736665722e557365722069732073656e64696e672045544820616c6f6e67207769746820746865204552433230207472616e736665722e20436865636b207468652076616c756520617474726962757465206f6620746865207472616e73616374696f6e43616e6e6f742072656d6f7665206120726573657276652077697468206c6971756964697479206465706f73697465645468652063616c6c6572206d7573742062652061206c656e64696e6720706f6f6c20636f6e666967757261746f7220636f6e74726163745265736572766520686173206e6f74206265656e20696e697469616c697a656420796574536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f775472616e7366657220746f20746f6b656e206469737472696275746f72206661696c6564436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a65645468652063616c6c6572206d7573742062652061206c656e64696e6720706f6f6c20636f6e7472616374496e76616c696420696e7465726573742072617465206d6f64652072656365697665645361666545524332303a204552433230206f7065726174696f6e20646964206e6f742073756363656564a264697066735822122061087e8417c9de55b31ff397b5e6c643ead8ef7d55813c166da8501d4f1d57b464736f6c63430006080033";
-
-export interface MockLendingPoolCoreLibraryAddresses {
-  ["__$2ec35834968386f54fa313129cf94664e4$__"]: string;
-}
diff --git a/types/MockLink.d.ts b/types/MockLink.d.ts
deleted file mode 100644
index 0319fc42..00000000
--- a/types/MockLink.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockLinkInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockLink extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockLink;
-  attach(addressOrName: string): MockLink;
-  deployed(): Promise<MockLink>;
-
-  on(event: EventFilter | string, listener: Listener): MockLink;
-  once(event: EventFilter | string, listener: Listener): MockLink;
-  addListener(eventName: EventFilter | string, listener: Listener): MockLink;
-  removeAllListeners(eventName: EventFilter | string): MockLink;
-  removeListener(eventName: any, listener: Listener): MockLink;
-
-  interface: MockLinkInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockLinkFactory.ts b/types/MockLinkFactory.ts
deleted file mode 100644
index 1e6dcf4e..00000000
--- a/types/MockLinkFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockLink } from "./MockLink";
-
-export class MockLinkFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockLink> {
-    return super.deploy(overrides) as Promise<MockLink>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockLink {
-    return super.attach(address) as MockLink;
-  }
-  connect(signer: Signer): MockLinkFactory {
-    return super.connect(signer) as MockLinkFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockLink {
-    return new Contract(address, _abi, signerOrProvider) as MockLink;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060048152602001634c494e4b60e01b81525060405180604001604052806009815260200168436861696e4c696e6b60b81b81525060128282816003908051906020019061006a9291906100be565b50805161007e9060049060208401906100be565b50506005805460ff19166012179055506100a0816001600160e01b036100a816565b505050610159565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100ff57805160ff191683800117855561012c565b8280016001018555821561012c579182015b8281111561012c578251825591602001919060010190610111565b5061013892915061013c565b5090565b61015691905b808211156101385760008155600101610142565b90565b610b48806101686000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa26469706673582212206dd7a8b3f09fbae395ba1de91774c69ce83a21bc9865cf5daa39d13e586172ba64736f6c63430006080033";
diff --git a/types/MockMana.d.ts b/types/MockMana.d.ts
deleted file mode 100644
index 7d35d9fc..00000000
--- a/types/MockMana.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockManaInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockMana extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockMana;
-  attach(addressOrName: string): MockMana;
-  deployed(): Promise<MockMana>;
-
-  on(event: EventFilter | string, listener: Listener): MockMana;
-  once(event: EventFilter | string, listener: Listener): MockMana;
-  addListener(eventName: EventFilter | string, listener: Listener): MockMana;
-  removeAllListeners(eventName: EventFilter | string): MockMana;
-  removeListener(eventName: any, listener: Listener): MockMana;
-
-  interface: MockManaInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockManaFactory.ts b/types/MockManaFactory.ts
deleted file mode 100644
index a24d585b..00000000
--- a/types/MockManaFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockMana } from "./MockMana";
-
-export class MockManaFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockMana> {
-    return super.deploy(overrides) as Promise<MockMana>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockMana {
-    return super.attach(address) as MockMana;
-  }
-  connect(signer: Signer): MockManaFactory {
-    return super.connect(signer) as MockManaFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockMana {
-    return new Contract(address, _abi, signerOrProvider) as MockMana;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060048152602001634d414e4160e01b8152506040518060400160405280600c81526020016b111958d95b9d1c985b185b9960a21b81525060128282816003908051906020019061006d9291906100c1565b5080516100819060049060208401906100c1565b50506005805460ff19166012179055506100a3816001600160e01b036100ab16565b50505061015c565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010257805160ff191683800117855561012f565b8280016001018555821561012f579182015b8281111561012f578251825591602001919060010190610114565b5061013b92915061013f565b5090565b61015991905b8082111561013b5760008155600101610145565b90565b610b488061016b6000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa2646970667358221220e1bbcc111aa7bc9123721a96c69d245adb1a77fef6de6403a270e48e6bb375ec64736f6c63430006080033";
diff --git a/types/MockMkr.d.ts b/types/MockMkr.d.ts
deleted file mode 100644
index af0af084..00000000
--- a/types/MockMkr.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockMkrInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockMkr extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockMkr;
-  attach(addressOrName: string): MockMkr;
-  deployed(): Promise<MockMkr>;
-
-  on(event: EventFilter | string, listener: Listener): MockMkr;
-  once(event: EventFilter | string, listener: Listener): MockMkr;
-  addListener(eventName: EventFilter | string, listener: Listener): MockMkr;
-  removeAllListeners(eventName: EventFilter | string): MockMkr;
-  removeListener(eventName: any, listener: Listener): MockMkr;
-
-  interface: MockMkrInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockMkrFactory.ts b/types/MockMkrFactory.ts
deleted file mode 100644
index c1cc520a..00000000
--- a/types/MockMkrFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockMkr } from "./MockMkr";
-
-export class MockMkrFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockMkr> {
-    return super.deploy(overrides) as Promise<MockMkr>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockMkr {
-    return super.attach(address) as MockMkr;
-  }
-  connect(signer: Signer): MockMkrFactory {
-    return super.connect(signer) as MockMkrFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockMkr {
-    return new Contract(address, _abi, signerOrProvider) as MockMkr;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600381526020016226a5a960e91b8152506040518060400160405280600581526020016426b0b5b2b960d91b8152506012828281600390805190602001906100659291906100b9565b5080516100799060049060208401906100b9565b50506005805460ff191660121790555061009b816001600160e01b036100a316565b505050610154565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100fa57805160ff1916838001178555610127565b82800160010185558215610127579182015b8281111561012757825182559160200191906001019061010c565b50610133929150610137565b5090565b61015191905b80821115610133576000815560010161013d565b90565b610b48806101636000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa2646970667358221220811ddf04b005f383509182446dee15d73ea182bbef7758060fd4f77ae781170764736f6c63430006080033";
diff --git a/types/MockOneSplit.d.ts b/types/MockOneSplit.d.ts
deleted file mode 100644
index bc77a2bd..00000000
--- a/types/MockOneSplit.d.ts
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockOneSplitInterface extends Interface {
-  functions: {
-    FLAG_AAVE: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_BANCOR: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_BDAI: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_CHAI: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_COMPOUND: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_FULCRUM: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_IEARN: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_KYBER: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_KYBER_BANCOR_RESERVE: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    FLAG_KYBER_OASIS_RESERVE: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    FLAG_KYBER_UNISWAP_RESERVE: TypedFunctionDescription<{
-      encode([]: []): string;
-    }>;
-
-    FLAG_MULTI_PATH_ETH: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_OASIS: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_SMART_TOKEN: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    FLAG_UNISWAP: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    getExpectedReturn: TypedFunctionDescription<{
-      encode([fromToken, toToken, amount, parts, disableFlags]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-
-    goodSwap: TypedFunctionDescription<{
-      encode([fromToken, toToken, amount, minReturn, parts, disableFlags]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-
-    swap: TypedFunctionDescription<{
-      encode([
-        fromToken,
-        toToken,
-        amount,
-        minReturn,
-        distribution,
-        disableFlags
-      ]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish,
-        BigNumberish[],
-        BigNumberish
-      ]): string;
-    }>;
-
-    tokenToBurn: TypedFunctionDescription<{ encode([]: []): string }>;
-  };
-
-  events: {};
-}
-
-export class MockOneSplit extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockOneSplit;
-  attach(addressOrName: string): MockOneSplit;
-  deployed(): Promise<MockOneSplit>;
-
-  on(event: EventFilter | string, listener: Listener): MockOneSplit;
-  once(event: EventFilter | string, listener: Listener): MockOneSplit;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockOneSplit;
-  removeAllListeners(eventName: EventFilter | string): MockOneSplit;
-  removeListener(eventName: any, listener: Listener): MockOneSplit;
-
-  interface: MockOneSplitInterface;
-
-  functions: {
-    FLAG_AAVE(): Promise<BigNumber>;
-
-    FLAG_BANCOR(): Promise<BigNumber>;
-
-    FLAG_BDAI(): Promise<BigNumber>;
-
-    FLAG_CHAI(): Promise<BigNumber>;
-
-    FLAG_COMPOUND(): Promise<BigNumber>;
-
-    FLAG_FULCRUM(): Promise<BigNumber>;
-
-    FLAG_IEARN(): Promise<BigNumber>;
-
-    FLAG_KYBER(): Promise<BigNumber>;
-
-    FLAG_KYBER_BANCOR_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_OASIS_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_UNISWAP_RESERVE(): Promise<BigNumber>;
-
-    FLAG_MULTI_PATH_ETH(): Promise<BigNumber>;
-
-    FLAG_OASIS(): Promise<BigNumber>;
-
-    FLAG_SMART_TOKEN(): Promise<BigNumber>;
-
-    FLAG_UNISWAP(): Promise<BigNumber>;
-
-    getExpectedReturn(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish
-    ): Promise<{
-      returnAmount: BigNumber;
-      distribution: BigNumber[];
-      0: BigNumber;
-      1: BigNumber[];
-    }>;
-
-    goodSwap(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      minReturn: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    swap(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      minReturn: BigNumberish,
-      distribution: BigNumberish[],
-      disableFlags: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    tokenToBurn(): Promise<string>;
-  };
-
-  FLAG_AAVE(): Promise<BigNumber>;
-
-  FLAG_BANCOR(): Promise<BigNumber>;
-
-  FLAG_BDAI(): Promise<BigNumber>;
-
-  FLAG_CHAI(): Promise<BigNumber>;
-
-  FLAG_COMPOUND(): Promise<BigNumber>;
-
-  FLAG_FULCRUM(): Promise<BigNumber>;
-
-  FLAG_IEARN(): Promise<BigNumber>;
-
-  FLAG_KYBER(): Promise<BigNumber>;
-
-  FLAG_KYBER_BANCOR_RESERVE(): Promise<BigNumber>;
-
-  FLAG_KYBER_OASIS_RESERVE(): Promise<BigNumber>;
-
-  FLAG_KYBER_UNISWAP_RESERVE(): Promise<BigNumber>;
-
-  FLAG_MULTI_PATH_ETH(): Promise<BigNumber>;
-
-  FLAG_OASIS(): Promise<BigNumber>;
-
-  FLAG_SMART_TOKEN(): Promise<BigNumber>;
-
-  FLAG_UNISWAP(): Promise<BigNumber>;
-
-  getExpectedReturn(
-    fromToken: string,
-    toToken: string,
-    amount: BigNumberish,
-    parts: BigNumberish,
-    disableFlags: BigNumberish
-  ): Promise<{
-    returnAmount: BigNumber;
-    distribution: BigNumber[];
-    0: BigNumber;
-    1: BigNumber[];
-  }>;
-
-  goodSwap(
-    fromToken: string,
-    toToken: string,
-    amount: BigNumberish,
-    minReturn: BigNumberish,
-    parts: BigNumberish,
-    disableFlags: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  swap(
-    fromToken: string,
-    toToken: string,
-    amount: BigNumberish,
-    minReturn: BigNumberish,
-    distribution: BigNumberish[],
-    disableFlags: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  tokenToBurn(): Promise<string>;
-
-  filters: {};
-
-  estimate: {
-    FLAG_AAVE(): Promise<BigNumber>;
-
-    FLAG_BANCOR(): Promise<BigNumber>;
-
-    FLAG_BDAI(): Promise<BigNumber>;
-
-    FLAG_CHAI(): Promise<BigNumber>;
-
-    FLAG_COMPOUND(): Promise<BigNumber>;
-
-    FLAG_FULCRUM(): Promise<BigNumber>;
-
-    FLAG_IEARN(): Promise<BigNumber>;
-
-    FLAG_KYBER(): Promise<BigNumber>;
-
-    FLAG_KYBER_BANCOR_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_OASIS_RESERVE(): Promise<BigNumber>;
-
-    FLAG_KYBER_UNISWAP_RESERVE(): Promise<BigNumber>;
-
-    FLAG_MULTI_PATH_ETH(): Promise<BigNumber>;
-
-    FLAG_OASIS(): Promise<BigNumber>;
-
-    FLAG_SMART_TOKEN(): Promise<BigNumber>;
-
-    FLAG_UNISWAP(): Promise<BigNumber>;
-
-    getExpectedReturn(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish
-    ): Promise<BigNumber>;
-
-    goodSwap(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      minReturn: BigNumberish,
-      parts: BigNumberish,
-      disableFlags: BigNumberish
-    ): Promise<BigNumber>;
-
-    swap(
-      fromToken: string,
-      toToken: string,
-      amount: BigNumberish,
-      minReturn: BigNumberish,
-      distribution: BigNumberish[],
-      disableFlags: BigNumberish
-    ): Promise<BigNumber>;
-
-    tokenToBurn(): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockOneSplitFactory.ts b/types/MockOneSplitFactory.ts
deleted file mode 100644
index 168d5411..00000000
--- a/types/MockOneSplitFactory.ts
+++ /dev/null
@@ -1,385 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockOneSplit } from "./MockOneSplit";
-
-export class MockOneSplitFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(
-    _tokenToBurn: string,
-    overrides?: TransactionOverrides
-  ): Promise<MockOneSplit> {
-    return super.deploy(_tokenToBurn, overrides) as Promise<MockOneSplit>;
-  }
-  getDeployTransaction(
-    _tokenToBurn: string,
-    overrides?: TransactionOverrides
-  ): UnsignedTransaction {
-    return super.getDeployTransaction(_tokenToBurn, overrides);
-  }
-  attach(address: string): MockOneSplit {
-    return super.attach(address) as MockOneSplit;
-  }
-  connect(signer: Signer): MockOneSplitFactory {
-    return super.connect(signer) as MockOneSplitFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockOneSplit {
-    return new Contract(address, _abi, signerOrProvider) as MockOneSplit;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "contract MintableERC20",
-        name: "_tokenToBurn",
-        type: "address"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    inputs: [],
-    name: "FLAG_AAVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_BANCOR",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_BDAI",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_CHAI",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_COMPOUND",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_FULCRUM",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_IEARN",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER_BANCOR_RESERVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER_OASIS_RESERVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_KYBER_UNISWAP_RESERVE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_MULTI_PATH_ETH",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_OASIS",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_SMART_TOKEN",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "FLAG_UNISWAP",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "fromToken",
-        type: "address"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "toToken",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "parts",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "disableFlags",
-        type: "uint256"
-      }
-    ],
-    name: "getExpectedReturn",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "returnAmount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256[]",
-        name: "distribution",
-        type: "uint256[]"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "fromToken",
-        type: "address"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "toToken",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "minReturn",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "parts",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "disableFlags",
-        type: "uint256"
-      }
-    ],
-    name: "goodSwap",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "fromToken",
-        type: "address"
-      },
-      {
-        internalType: "contract IERC20",
-        name: "toToken",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "minReturn",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256[]",
-        name: "distribution",
-        type: "uint256[]"
-      },
-      {
-        internalType: "uint256",
-        name: "disableFlags",
-        type: "uint256"
-      }
-    ],
-    name: "swap",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "tokenToBurn",
-    outputs: [
-      {
-        internalType: "contract MintableERC20",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051610a5a380380610a5a8339818101604052602081101561003357600080fd5b5051600080546001600160a01b039092166001600160a01b03199092169190911790556109f5806100656000396000f3fe6080604052600436106101145760003560e01c806373eb69d4116100a0578063ceb5411511610064578063ceb5411514610337578063df9116631461034c578063e2a7515e14610361578063eb16df2a1461042b578063f64a9a491461044057610114565b806373eb69d4146102ce57806383366577146102e357806383a0118f146102f85780638c6c11f21461030d578063a9d3589f1461032257610114565b80634f1b86eb116100e75780634f1b86eb1461021457806358886253146102455780635cfcee281461025a5780636b9589aa1461026f578063702bf8fa146102b957610114565b8063085e2c5b1461011957806311c0c0f7146101c35780633c1a62dc146101ea5780634c914a4e146101ff575b600080fd5b34801561012557600080fd5b50610168600480360360a081101561013c57600080fd5b506001600160a01b03813581169160208101359091169060408101359060608101359060800135610455565b6040518083815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156101ae578181015183820152602001610196565b50505050905001935050505060405180910390f35b3480156101cf57600080fd5b506101d8610471565b60408051918252519081900360200190f35b3480156101f657600080fd5b506101d8610477565b34801561020b57600080fd5b506101d861047c565b34801561022057600080fd5b50610229610481565b604080516001600160a01b039092168252519081900360200190f35b34801561025157600080fd5b506101d8610490565b34801561026657600080fd5b506101d8610496565b6102b7600480360360c081101561028557600080fd5b506001600160a01b03813581169160208101359091169060408101359060608101359060808101359060a0013561049b565b005b3480156102c557600080fd5b506101d86105da565b3480156102da57600080fd5b506101d86105e3565b3480156102ef57600080fd5b506101d86105e9565b34801561030457600080fd5b506101d86105ee565b34801561031957600080fd5b506101d86105f4565b34801561032e57600080fd5b506101d86105f9565b34801561034357600080fd5b506101d8610602565b34801561035857600080fd5b506101d8610607565b6102b7600480360360c081101561037757600080fd5b6001600160a01b03823581169260208101359091169160408201359160608101359181019060a0810160808201356401000000008111156103b757600080fd5b8201836020820111156103c957600080fd5b803590602001918460208302840111640100000000831117156103eb57600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955050913592506105d2915050565b34801561043757600080fd5b506101d8610610565b34801561044c57600080fd5b506101d8610615565b5050604080516000808252602082019092529094909350915050565b61010081565b602081565b604081565b6000546001600160a01b031681565b61020081565b601081565b600080546040805163140e25ad60e31b815269021e19e0c9bab2400000600482015290516001600160a01b039092169263a0712d68926024808401936020939083900390910190829087803b1580156104f357600080fd5b505af1158015610507573d6000803e3d6000fd5b505050506040513d602081101561051d57600080fd5b5051610570576040805162461bcd60e51b815260206004820181905260248201527f54524144455f574954485f48494e542e205265766572746564206d696e742829604482015290519081900360640190fd5b61057861061a565b6001600160a01b0316866001600160a01b0316146105ab576105ab6001600160a01b03871633308763ffffffff61063216565b6000546105d2906001600160a01b03163369021e19e0c9bab240000063ffffffff61069216565b505050505050565b64010000000081565b61080081565b608081565b61040081565b600881565b64040000000081565b600281565b64020000000081565b600181565b600481565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee90565b604080516001600160a01b0380861660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b17905261068c9085906106e9565b50505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526106e49084906106e9565b505050565b606061073e826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b031661079a9092919063ffffffff16565b8051909150156106e45780806020019051602081101561075d57600080fd5b50516106e45760405162461bcd60e51b815260040180806020018281038252602a815260200180610996602a913960400191505060405180910390fd5b60606107a984846000856107b1565b949350505050565b60606107bc8561095c565b61080d576040805162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015290519081900360640190fd5b60006060866001600160a01b031685876040518082805190602001908083835b6020831061084c5780518252601f19909201916020918201910161082d565b6001836020036101000a03801982511681845116808217855250505050505090500191505060006040518083038185875af1925050503d80600081146108ae576040519150601f19603f3d011682016040523d82523d6000602084013e6108b3565b606091505b509150915081156108c75791506107a99050565b8051156108d75780518082602001fd5b8360405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610921578181015183820152602001610909565b50505050905090810190601f16801561094e5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4708181148015906107a957505015159291505056fe5361666545524332303a204552433230206f7065726174696f6e20646964206e6f742073756363656564a264697066735822122062ea6b3c5f1672aa383ca4ed52aaf9a3f7d0c8b99d1b5928b39bdf248c5474e964736f6c63430006080033";
diff --git a/types/MockRep.d.ts b/types/MockRep.d.ts
deleted file mode 100644
index 09e5beba..00000000
--- a/types/MockRep.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockRepInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockRep extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockRep;
-  attach(addressOrName: string): MockRep;
-  deployed(): Promise<MockRep>;
-
-  on(event: EventFilter | string, listener: Listener): MockRep;
-  once(event: EventFilter | string, listener: Listener): MockRep;
-  addListener(eventName: EventFilter | string, listener: Listener): MockRep;
-  removeAllListeners(eventName: EventFilter | string): MockRep;
-  removeListener(eventName: any, listener: Listener): MockRep;
-
-  interface: MockRepInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockRepFactory.ts b/types/MockRepFactory.ts
deleted file mode 100644
index a1e84cf9..00000000
--- a/types/MockRepFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockRep } from "./MockRep";
-
-export class MockRepFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockRep> {
-    return super.deploy(overrides) as Promise<MockRep>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockRep {
-    return super.attach(address) as MockRep;
-  }
-  connect(signer: Signer): MockRepFactory {
-    return super.connect(signer) as MockRepFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockRep {
-    return new Contract(address, _abi, signerOrProvider) as MockRep;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600381526020016205245560ec1b8152506040518060400160405280600581526020016420bab3bab960d91b8152506012828281600390805190602001906100659291906100b9565b5080516100799060049060208401906100b9565b50506005805460ff191660121790555061009b816001600160e01b036100a316565b505050610154565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100fa57805160ff1916838001178555610127565b82800160010185558215610127579182015b8281111561012757825182559160200191906001019061010c565b50610133929150610137565b5090565b61015191905b80821115610133576000815560010161013d565b90565b610b48806101636000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa26469706673582212200afa55a2b247b77ca913048713e6ef107ad13fb45ca5c406442a99ddbf8409fc64736f6c63430006080033";
diff --git a/types/MockSnx.d.ts b/types/MockSnx.d.ts
deleted file mode 100644
index 4aaedacf..00000000
--- a/types/MockSnx.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockSnxInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockSnx extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockSnx;
-  attach(addressOrName: string): MockSnx;
-  deployed(): Promise<MockSnx>;
-
-  on(event: EventFilter | string, listener: Listener): MockSnx;
-  once(event: EventFilter | string, listener: Listener): MockSnx;
-  addListener(eventName: EventFilter | string, listener: Listener): MockSnx;
-  removeAllListeners(eventName: EventFilter | string): MockSnx;
-  removeListener(eventName: any, listener: Listener): MockSnx;
-
-  interface: MockSnxInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockSnxFactory.ts b/types/MockSnxFactory.ts
deleted file mode 100644
index c80cd0e4..00000000
--- a/types/MockSnxFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockSnx } from "./MockSnx";
-
-export class MockSnxFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockSnx> {
-    return super.deploy(overrides) as Promise<MockSnx>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockSnx {
-    return super.attach(address) as MockSnx;
-  }
-  connect(signer: Signer): MockSnxFactory {
-    return super.connect(signer) as MockSnxFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockSnx {
-    return new Contract(address, _abi, signerOrProvider) as MockSnx;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060038152602001620a69cb60eb1b815250604051806040016040528060038152602001620a69cb60eb1b8152506012828281600390805190602001906100639291906100b7565b5080516100779060049060208401906100b7565b50506005805460ff1916601217905550610099816001600160e01b036100a116565b505050610152565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100f857805160ff1916838001178555610125565b82800160010185558215610125579182015b8281111561012557825182559160200191906001019061010a565b50610131929150610135565b5090565b61014f91905b80821115610131576000815560010161013b565b90565b610b48806101616000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa26469706673582212206b5a772b92d404a5eee02b1a7a5a349368e2286123429493173382009b86ad4964736f6c63430006080033";
diff --git a/types/MockSusd.d.ts b/types/MockSusd.d.ts
deleted file mode 100644
index 59bcc42e..00000000
--- a/types/MockSusd.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockSusdInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockSusd extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockSusd;
-  attach(addressOrName: string): MockSusd;
-  deployed(): Promise<MockSusd>;
-
-  on(event: EventFilter | string, listener: Listener): MockSusd;
-  once(event: EventFilter | string, listener: Listener): MockSusd;
-  addListener(eventName: EventFilter | string, listener: Listener): MockSusd;
-  removeAllListeners(eventName: EventFilter | string): MockSusd;
-  removeListener(eventName: any, listener: Listener): MockSusd;
-
-  interface: MockSusdInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockSusdFactory.ts b/types/MockSusdFactory.ts
deleted file mode 100644
index 2f9d0f7a..00000000
--- a/types/MockSusdFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockSusd } from "./MockSusd";
-
-export class MockSusdFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockSusd> {
-    return super.deploy(overrides) as Promise<MockSusd>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockSusd {
-    return super.attach(address) as MockSusd;
-  }
-  connect(signer: Signer): MockSusdFactory {
-    return super.connect(signer) as MockSusdFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockSusd {
-    return new Contract(address, _abi, signerOrProvider) as MockSusd;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600481526020016314d554d160e21b8152506040518060400160405280600d81526020016c14de5b9d1a195d1a5e081554d1609a1b81525060068282816003908051906020019061006e9291906100c2565b5080516100829060049060208401906100c2565b50506005805460ff19166012179055506100a4816001600160e01b036100ac16565b50505061015d565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010357805160ff1916838001178555610130565b82800160010185558215610130579182015b82811115610130578251825591602001919060010190610115565b5061013c929150610140565b5090565b61015a91905b8082111561013c5760008155600101610146565b90565b610b488061016c6000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa26469706673582212201294b6b8230849df7afff618470548765ae7c8b27bdc6346099024a643a63ae264736f6c63430006080033";
diff --git a/types/MockTusd.d.ts b/types/MockTusd.d.ts
deleted file mode 100644
index 1fd3c8ba..00000000
--- a/types/MockTusd.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockTusdInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockTusd extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockTusd;
-  attach(addressOrName: string): MockTusd;
-  deployed(): Promise<MockTusd>;
-
-  on(event: EventFilter | string, listener: Listener): MockTusd;
-  once(event: EventFilter | string, listener: Listener): MockTusd;
-  addListener(eventName: EventFilter | string, listener: Listener): MockTusd;
-  removeAllListeners(eventName: EventFilter | string): MockTusd;
-  removeListener(eventName: any, listener: Listener): MockTusd;
-
-  interface: MockTusdInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockTusdFactory.ts b/types/MockTusdFactory.ts
deleted file mode 100644
index f08537b5..00000000
--- a/types/MockTusdFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockTusd } from "./MockTusd";
-
-export class MockTusdFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockTusd> {
-    return super.deploy(overrides) as Promise<MockTusd>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockTusd {
-    return super.attach(address) as MockTusd;
-  }
-  connect(signer: Signer): MockTusdFactory {
-    return super.connect(signer) as MockTusdFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockTusd {
-    return new Contract(address, _abi, signerOrProvider) as MockTusd;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b5060405180604001604052806004815260200163151554d160e21b81525060405180604001604052806007815260200166151c9d595554d160ca1b8152506012828281600390805190602001906100689291906100bc565b50805161007c9060049060208401906100bc565b50506005805460ff191660121790555061009e816001600160e01b036100a616565b505050610157565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100fd57805160ff191683800117855561012a565b8280016001018555821561012a579182015b8281111561012a57825182559160200191906001019061010f565b5061013692915061013a565b5090565b61015491905b808211156101365760008155600101610140565b90565b610b48806101666000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa264697066735822122023be4a26ffef0669c2efce89dceacd370989ca1747f1e302aadb7a0607534cc564736f6c63430006080033";
diff --git a/types/MockUniDaiEth.d.ts b/types/MockUniDaiEth.d.ts
deleted file mode 100644
index 3a4afcac..00000000
--- a/types/MockUniDaiEth.d.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockUniDaiEthInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockUniDaiEth extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockUniDaiEth;
-  attach(addressOrName: string): MockUniDaiEth;
-  deployed(): Promise<MockUniDaiEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockUniDaiEth;
-  once(event: EventFilter | string, listener: Listener): MockUniDaiEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockUniDaiEth;
-  removeAllListeners(eventName: EventFilter | string): MockUniDaiEth;
-  removeListener(eventName: any, listener: Listener): MockUniDaiEth;
-
-  interface: MockUniDaiEthInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockUniDaiEthFactory.ts b/types/MockUniDaiEthFactory.ts
deleted file mode 100644
index 1ba24f4c..00000000
--- a/types/MockUniDaiEthFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockUniDaiEth } from "./MockUniDaiEth";
-
-export class MockUniDaiEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockUniDaiEth> {
-    return super.deploy(overrides) as Promise<MockUniDaiEth>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockUniDaiEth {
-    return super.attach(address) as MockUniDaiEth;
-  }
-  connect(signer: Signer): MockUniDaiEthFactory {
-    return super.connect(signer) as MockUniDaiEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockUniDaiEth {
-    return new Contract(address, _abi, signerOrProvider) as MockUniDaiEth;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600b81526020016a0aa9c92be888292be8aa8960ab1b8152506040518060400160405280600b81526020016a0aa9c92be888292be8aa8960ab1b8152506012828281600390805190602001906100739291906100c7565b5080516100879060049060208401906100c7565b50506005805460ff19166012179055506100a9816001600160e01b036100b116565b505050610162565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010857805160ff1916838001178555610135565b82800160010185558215610135579182015b8281111561013557825182559160200191906001019061011a565b50610141929150610145565b5090565b61015f91905b80821115610141576000815560010161014b565b90565b610b48806101716000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa26469706673582212202143d7a4ad1625fc4e7e31685bc912fd1ddde6d009d79f8b6f3d29e72636ffe564736f6c63430006080033";
diff --git a/types/MockUniLendEth.d.ts b/types/MockUniLendEth.d.ts
deleted file mode 100644
index 6a534425..00000000
--- a/types/MockUniLendEth.d.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockUniLendEthInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockUniLendEth extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockUniLendEth;
-  attach(addressOrName: string): MockUniLendEth;
-  deployed(): Promise<MockUniLendEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockUniLendEth;
-  once(event: EventFilter | string, listener: Listener): MockUniLendEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockUniLendEth;
-  removeAllListeners(eventName: EventFilter | string): MockUniLendEth;
-  removeListener(eventName: any, listener: Listener): MockUniLendEth;
-
-  interface: MockUniLendEthInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockUniLendEthFactory.ts b/types/MockUniLendEthFactory.ts
deleted file mode 100644
index 98c749ac..00000000
--- a/types/MockUniLendEthFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockUniLendEth } from "./MockUniLendEth";
-
-export class MockUniLendEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockUniLendEth> {
-    return super.deploy(overrides) as Promise<MockUniLendEth>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockUniLendEth {
-    return super.attach(address) as MockUniLendEth;
-  }
-  connect(signer: Signer): MockUniLendEthFactory {
-    return super.connect(signer) as MockUniLendEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockUniLendEth {
-    return new Contract(address, _abi, signerOrProvider) as MockUniLendEth;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600c81526020016b0aa9c92be988a9c88be8aa8960a31b8152506040518060400160405280600c81526020016b0aa9c92be988a9c88be8aa8960a31b8152506012828281600390805190602001906100759291906100c9565b5080516100899060049060208401906100c9565b50506005805460ff19166012179055506100ab816001600160e01b036100b316565b505050610164565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010a57805160ff1916838001178555610137565b82800160010185558215610137579182015b8281111561013757825182559160200191906001019061011c565b50610143929150610147565b5090565b61016191905b80821115610143576000815560010161014d565b90565b610b48806101736000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa26469706673582212204ecc3534f4b4d96c6c5c8d9f174fc8ed1c3ca8640cf1772349665707d06f013464736f6c63430006080033";
diff --git a/types/MockUniLinkEth.d.ts b/types/MockUniLinkEth.d.ts
deleted file mode 100644
index db40fc24..00000000
--- a/types/MockUniLinkEth.d.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockUniLinkEthInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockUniLinkEth extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockUniLinkEth;
-  attach(addressOrName: string): MockUniLinkEth;
-  deployed(): Promise<MockUniLinkEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockUniLinkEth;
-  once(event: EventFilter | string, listener: Listener): MockUniLinkEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockUniLinkEth;
-  removeAllListeners(eventName: EventFilter | string): MockUniLinkEth;
-  removeListener(eventName: any, listener: Listener): MockUniLinkEth;
-
-  interface: MockUniLinkEthInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockUniLinkEthFactory.ts b/types/MockUniLinkEthFactory.ts
deleted file mode 100644
index 90f45ec6..00000000
--- a/types/MockUniLinkEthFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockUniLinkEth } from "./MockUniLinkEth";
-
-export class MockUniLinkEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockUniLinkEth> {
-    return super.deploy(overrides) as Promise<MockUniLinkEth>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockUniLinkEth {
-    return super.attach(address) as MockUniLinkEth;
-  }
-  connect(signer: Signer): MockUniLinkEthFactory {
-    return super.connect(signer) as MockUniLinkEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockUniLinkEth {
-    return new Contract(address, _abi, signerOrProvider) as MockUniLinkEth;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600c81526020016b0aa9c92be98929c96be8aa8960a31b8152506040518060400160405280600c81526020016b0aa9c92be98929c96be8aa8960a31b8152506012828281600390805190602001906100759291906100c9565b5080516100899060049060208401906100c9565b50506005805460ff19166012179055506100ab816001600160e01b036100b316565b505050610164565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010a57805160ff1916838001178555610137565b82800160010185558215610137579182015b8281111561013757825182559160200191906001019061011c565b50610143929150610147565b5090565b61016191905b80821115610143576000815560010161014d565b90565b610b48806101736000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa264697066735822122076834433044fd4e58c92e6724404c01251bf4aa79725b108619fb98f8ed8273e64736f6c63430006080033";
diff --git a/types/MockUniMkrEth.d.ts b/types/MockUniMkrEth.d.ts
deleted file mode 100644
index e2ed440e..00000000
--- a/types/MockUniMkrEth.d.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockUniMkrEthInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockUniMkrEth extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockUniMkrEth;
-  attach(addressOrName: string): MockUniMkrEth;
-  deployed(): Promise<MockUniMkrEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockUniMkrEth;
-  once(event: EventFilter | string, listener: Listener): MockUniMkrEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockUniMkrEth;
-  removeAllListeners(eventName: EventFilter | string): MockUniMkrEth;
-  removeListener(eventName: any, listener: Listener): MockUniMkrEth;
-
-  interface: MockUniMkrEthInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockUniMkrEthFactory.ts b/types/MockUniMkrEthFactory.ts
deleted file mode 100644
index 4a01fe26..00000000
--- a/types/MockUniMkrEthFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockUniMkrEth } from "./MockUniMkrEth";
-
-export class MockUniMkrEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockUniMkrEth> {
-    return super.deploy(overrides) as Promise<MockUniMkrEth>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockUniMkrEth {
-    return super.attach(address) as MockUniMkrEth;
-  }
-  connect(signer: Signer): MockUniMkrEthFactory {
-    return super.connect(signer) as MockUniMkrEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockUniMkrEth {
-    return new Contract(address, _abi, signerOrProvider) as MockUniMkrEth;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600b81526020016a0aa9c92be9a96a4be8aa8960ab1b8152506040518060400160405280600b81526020016a0aa9c92be9a96a4be8aa8960ab1b8152506012828281600390805190602001906100739291906100c7565b5080516100879060049060208401906100c7565b50506005805460ff19166012179055506100a9816001600160e01b036100b116565b505050610162565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010857805160ff1916838001178555610135565b82800160010185558215610135579182015b8281111561013557825182559160200191906001019061011a565b50610141929150610145565b5090565b61015f91905b80821115610141576000815560010161014b565b90565b610b48806101716000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa2646970667358221220d74e9be787aa8f46ee15734f687a8167856521ca7a9e46a20bc17bd9a88d4a2c64736f6c63430006080033";
diff --git a/types/MockUniSethEth.d.ts b/types/MockUniSethEth.d.ts
deleted file mode 100644
index 11004e1c..00000000
--- a/types/MockUniSethEth.d.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockUniSethEthInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockUniSethEth extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockUniSethEth;
-  attach(addressOrName: string): MockUniSethEth;
-  deployed(): Promise<MockUniSethEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockUniSethEth;
-  once(event: EventFilter | string, listener: Listener): MockUniSethEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockUniSethEth;
-  removeAllListeners(eventName: EventFilter | string): MockUniSethEth;
-  removeListener(eventName: any, listener: Listener): MockUniSethEth;
-
-  interface: MockUniSethEthInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockUniSethEthFactory.ts b/types/MockUniSethEthFactory.ts
deleted file mode 100644
index 438a15d7..00000000
--- a/types/MockUniSethEthFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockUniSethEth } from "./MockUniSethEth";
-
-export class MockUniSethEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockUniSethEth> {
-    return super.deploy(overrides) as Promise<MockUniSethEth>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockUniSethEth {
-    return super.attach(address) as MockUniSethEth;
-  }
-  connect(signer: Signer): MockUniSethEthFactory {
-    return super.connect(signer) as MockUniSethEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockUniSethEth {
-    return new Contract(address, _abi, signerOrProvider) as MockUniSethEth;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600c81526020016b0aa9c92bea68aa890be8aa8960a31b8152506040518060400160405280600c81526020016b0aa9c92bea68aa890be8aa8960a31b8152506012828281600390805190602001906100759291906100c9565b5080516100899060049060208401906100c9565b50506005805460ff19166012179055506100ab816001600160e01b036100b316565b505050610164565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010a57805160ff1916838001178555610137565b82800160010185558215610137579182015b8281111561013757825182559160200191906001019061011c565b50610143929150610147565b5090565b61016191905b80821115610143576000815560010161014d565b90565b610b48806101736000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa26469706673582212205c9efe695aa90a3f94a7df7e0136e61b13e849092972adb58623b79ff9efde0464736f6c63430006080033";
diff --git a/types/MockUniUsdcEth.d.ts b/types/MockUniUsdcEth.d.ts
deleted file mode 100644
index a1e57914..00000000
--- a/types/MockUniUsdcEth.d.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockUniUsdcEthInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockUniUsdcEth extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockUniUsdcEth;
-  attach(addressOrName: string): MockUniUsdcEth;
-  deployed(): Promise<MockUniUsdcEth>;
-
-  on(event: EventFilter | string, listener: Listener): MockUniUsdcEth;
-  once(event: EventFilter | string, listener: Listener): MockUniUsdcEth;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): MockUniUsdcEth;
-  removeAllListeners(eventName: EventFilter | string): MockUniUsdcEth;
-  removeListener(eventName: any, listener: Listener): MockUniUsdcEth;
-
-  interface: MockUniUsdcEthInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockUniUsdcEthFactory.ts b/types/MockUniUsdcEthFactory.ts
deleted file mode 100644
index fad6ce6a..00000000
--- a/types/MockUniUsdcEthFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockUniUsdcEth } from "./MockUniUsdcEth";
-
-export class MockUniUsdcEthFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockUniUsdcEth> {
-    return super.deploy(overrides) as Promise<MockUniUsdcEth>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockUniUsdcEth {
-    return super.attach(address) as MockUniUsdcEth;
-  }
-  connect(signer: Signer): MockUniUsdcEthFactory {
-    return super.connect(signer) as MockUniUsdcEthFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockUniUsdcEth {
-    return new Contract(address, _abi, signerOrProvider) as MockUniUsdcEth;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b506040518060400160405280600c81526020016b0aa9c92beaaa68886be8aa8960a31b8152506040518060400160405280600c81526020016b0aa9c92beaaa68886be8aa8960a31b8152506012828281600390805190602001906100759291906100c9565b5080516100899060049060208401906100c9565b50506005805460ff19166012179055506100ab816001600160e01b036100b316565b505050610164565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010a57805160ff1916838001178555610137565b82800160010185558215610137579182015b8281111561013757825182559160200191906001019061011c565b50610143929150610147565b5090565b61016191905b80821115610143576000815560010161014d565b90565b610b48806101736000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa264697066735822122029e386a1293ee397ed9a47aebc6db6249e67292fe00203654c627e65c5ff9cf264736f6c63430006080033";
diff --git a/types/MockUsd.d.ts b/types/MockUsd.d.ts
deleted file mode 100644
index e5852074..00000000
--- a/types/MockUsd.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockUsdInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockUsd extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockUsd;
-  attach(addressOrName: string): MockUsd;
-  deployed(): Promise<MockUsd>;
-
-  on(event: EventFilter | string, listener: Listener): MockUsd;
-  once(event: EventFilter | string, listener: Listener): MockUsd;
-  addListener(eventName: EventFilter | string, listener: Listener): MockUsd;
-  removeAllListeners(eventName: EventFilter | string): MockUsd;
-  removeListener(eventName: any, listener: Listener): MockUsd;
-
-  interface: MockUsdInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockUsdFactory.ts b/types/MockUsdFactory.ts
deleted file mode 100644
index 92b31634..00000000
--- a/types/MockUsdFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockUsd } from "./MockUsd";
-
-export class MockUsdFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockUsd> {
-    return super.deploy(overrides) as Promise<MockUsd>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockUsd {
-    return super.attach(address) as MockUsd;
-  }
-  connect(signer: Signer): MockUsdFactory {
-    return super.connect(signer) as MockUsdFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockUsd {
-    return new Contract(address, _abi, signerOrProvider) as MockUsd;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060038152602001621554d160ea1b815250604051806040016040528060038152602001621554d160ea1b8152506012828281600390805190602001906100639291906100b7565b5080516100779060049060208401906100b7565b50506005805460ff1916601217905550610099816001600160e01b036100a116565b505050610152565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100f857805160ff1916838001178555610125565b82800160010185558215610125579182015b8281111561012557825182559160200191906001019061010a565b50610131929150610135565b5090565b61014f91905b80821115610131576000815560010161013b565b90565b610b48806101616000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa2646970667358221220a0de2869d88f9e5c9f44a1d51059643e3ccd0a59d4d46ce4d2f5554ddfbd5bfc64736f6c63430006080033";
diff --git a/types/MockUsdc.d.ts b/types/MockUsdc.d.ts
deleted file mode 100644
index d3696d8e..00000000
--- a/types/MockUsdc.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockUsdcInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockUsdc extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockUsdc;
-  attach(addressOrName: string): MockUsdc;
-  deployed(): Promise<MockUsdc>;
-
-  on(event: EventFilter | string, listener: Listener): MockUsdc;
-  once(event: EventFilter | string, listener: Listener): MockUsdc;
-  addListener(eventName: EventFilter | string, listener: Listener): MockUsdc;
-  removeAllListeners(eventName: EventFilter | string): MockUsdc;
-  removeListener(eventName: any, listener: Listener): MockUsdc;
-
-  interface: MockUsdcInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockUsdcFactory.ts b/types/MockUsdcFactory.ts
deleted file mode 100644
index a2c34441..00000000
--- a/types/MockUsdcFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockUsdc } from "./MockUsdc";
-
-export class MockUsdcFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockUsdc> {
-    return super.deploy(overrides) as Promise<MockUsdc>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockUsdc {
-    return super.attach(address) as MockUsdc;
-  }
-  connect(signer: Signer): MockUsdcFactory {
-    return super.connect(signer) as MockUsdcFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockUsdc {
-    return new Contract(address, _abi, signerOrProvider) as MockUsdc;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060048152602001635553444360e01b815250604051806040016040528060088152602001672aa9a21021b7b4b760c11b8152506006828281600390805190602001906100699291906100bd565b50805161007d9060049060208401906100bd565b50506005805460ff191660121790555061009f816001600160e01b036100a716565b505050610158565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100fe57805160ff191683800117855561012b565b8280016001018555821561012b579182015b8281111561012b578251825591602001919060010190610110565b5061013792915061013b565b5090565b61015591905b808211156101375760008155600101610141565b90565b610b48806101676000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa2646970667358221220978aad16b0662b2de8146d390c47b15e11b2905ed2d2e8b3d93e5288583f734f64736f6c63430006080033";
diff --git a/types/MockUsdt.d.ts b/types/MockUsdt.d.ts
deleted file mode 100644
index 48620e86..00000000
--- a/types/MockUsdt.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockUsdtInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockUsdt extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockUsdt;
-  attach(addressOrName: string): MockUsdt;
-  deployed(): Promise<MockUsdt>;
-
-  on(event: EventFilter | string, listener: Listener): MockUsdt;
-  once(event: EventFilter | string, listener: Listener): MockUsdt;
-  addListener(eventName: EventFilter | string, listener: Listener): MockUsdt;
-  removeAllListeners(eventName: EventFilter | string): MockUsdt;
-  removeListener(eventName: any, listener: Listener): MockUsdt;
-
-  interface: MockUsdtInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockUsdtFactory.ts b/types/MockUsdtFactory.ts
deleted file mode 100644
index b0803c48..00000000
--- a/types/MockUsdtFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockUsdt } from "./MockUsdt";
-
-export class MockUsdtFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockUsdt> {
-    return super.deploy(overrides) as Promise<MockUsdt>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockUsdt {
-    return super.attach(address) as MockUsdt;
-  }
-  connect(signer: Signer): MockUsdtFactory {
-    return super.connect(signer) as MockUsdtFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockUsdt {
-    return new Contract(address, _abi, signerOrProvider) as MockUsdt;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060048152602001631554d11560e21b815250604051806040016040528060098152602001682aa9a22a1021b7b4b760b91b81525060068282816003908051906020019061006a9291906100be565b50805161007e9060049060208401906100be565b50506005805460ff19166012179055506100a0816001600160e01b036100a816565b505050610159565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100ff57805160ff191683800117855561012c565b8280016001018555821561012c579182015b8281111561012c578251825591602001919060010190610111565b5061013892915061013c565b5090565b61015691905b808211156101385760008155600101610142565b90565b610b48806101686000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa2646970667358221220f44842a74d61e3d8af36d0db2adb44c66786d2bc414d056b043ec574447b012a64736f6c63430006080033";
diff --git a/types/MockWbtc.d.ts b/types/MockWbtc.d.ts
deleted file mode 100644
index d755bdf0..00000000
--- a/types/MockWbtc.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockWbtcInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockWbtc extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockWbtc;
-  attach(addressOrName: string): MockWbtc;
-  deployed(): Promise<MockWbtc>;
-
-  on(event: EventFilter | string, listener: Listener): MockWbtc;
-  once(event: EventFilter | string, listener: Listener): MockWbtc;
-  addListener(eventName: EventFilter | string, listener: Listener): MockWbtc;
-  removeAllListeners(eventName: EventFilter | string): MockWbtc;
-  removeListener(eventName: any, listener: Listener): MockWbtc;
-
-  interface: MockWbtcInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockWbtcFactory.ts b/types/MockWbtcFactory.ts
deleted file mode 100644
index f23d023d..00000000
--- a/types/MockWbtcFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockWbtc } from "./MockWbtc";
-
-export class MockWbtcFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockWbtc> {
-    return super.deploy(overrides) as Promise<MockWbtc>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockWbtc {
-    return super.attach(address) as MockWbtc;
-  }
-  connect(signer: Signer): MockWbtcFactory {
-    return super.connect(signer) as MockWbtcFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockWbtc {
-    return new Contract(address, _abi, signerOrProvider) as MockWbtc;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060048152602001635742544360e01b815250604051806040016040528060098152602001682ba12a219021b7b4b760b91b81525060128282816003908051906020019061006a9291906100be565b50805161007e9060049060208401906100be565b50506005805460ff19166012179055506100a0816001600160e01b036100a816565b505050610159565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100ff57805160ff191683800117855561012c565b8280016001018555821561012c579182015b8281111561012c578251825591602001919060010190610111565b5061013892915061013c565b5090565b61015691905b808211156101385760008155600101610142565b90565b610b48806101686000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa2646970667358221220a21cbda9a530789a8dff8e4d2d1d56a2bfdfe1a07adb80d2141a588c1f9db51d64736f6c63430006080033";
diff --git a/types/MockZrx.d.ts b/types/MockZrx.d.ts
deleted file mode 100644
index 2d82a687..00000000
--- a/types/MockZrx.d.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface MockZrxInterface extends Interface {
-  functions: {
-    allowance: TypedFunctionDescription<{
-      encode([owner, spender]: [string, string]): string;
-    }>;
-
-    approve: TypedFunctionDescription<{
-      encode([spender, amount]: [string, BigNumberish]): string;
-    }>;
-
-    balanceOf: TypedFunctionDescription<{
-      encode([account]: [string]): string;
-    }>;
-
-    decimals: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    decreaseAllowance: TypedFunctionDescription<{
-      encode([spender, subtractedValue]: [string, BigNumberish]): string;
-    }>;
-
-    increaseAllowance: TypedFunctionDescription<{
-      encode([spender, addedValue]: [string, BigNumberish]): string;
-    }>;
-
-    mint: TypedFunctionDescription<{ encode([value]: [BigNumberish]): string }>;
-
-    name: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    symbol: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    totalSupply: TypedFunctionDescription<{ encode([]: []): string }>;
-
-    transfer: TypedFunctionDescription<{
-      encode([recipient, amount]: [string, BigNumberish]): string;
-    }>;
-
-    transferFrom: TypedFunctionDescription<{
-      encode([sender, recipient, amount]: [
-        string,
-        string,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Approval: TypedEventDescription<{
-      encodeTopics([owner, spender, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-
-    Transfer: TypedEventDescription<{
-      encodeTopics([from, to, value]: [
-        string | null,
-        string | null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class MockZrx extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): MockZrx;
-  attach(addressOrName: string): MockZrx;
-  deployed(): Promise<MockZrx>;
-
-  on(event: EventFilter | string, listener: Listener): MockZrx;
-  once(event: EventFilter | string, listener: Listener): MockZrx;
-  addListener(eventName: EventFilter | string, listener: Listener): MockZrx;
-  removeAllListeners(eventName: EventFilter | string): MockZrx;
-  removeListener(eventName: any, listener: Listener): MockZrx;
-
-  interface: MockZrxInterface;
-
-  functions: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<number>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    mint(
-      value: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    name(): Promise<string>;
-
-    symbol(): Promise<string>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  allowance(owner: string, spender: string): Promise<BigNumber>;
-
-  approve(
-    spender: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  balanceOf(account: string): Promise<BigNumber>;
-
-  decimals(): Promise<number>;
-
-  decreaseAllowance(
-    spender: string,
-    subtractedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  increaseAllowance(
-    spender: string,
-    addedValue: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  mint(
-    value: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  name(): Promise<string>;
-
-  symbol(): Promise<string>;
-
-  totalSupply(): Promise<BigNumber>;
-
-  transfer(
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  transferFrom(
-    sender: string,
-    recipient: string,
-    amount: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Approval(
-      owner: string | null,
-      spender: string | null,
-      value: null
-    ): EventFilter;
-
-    Transfer(from: string | null, to: string | null, value: null): EventFilter;
-  };
-
-  estimate: {
-    allowance(owner: string, spender: string): Promise<BigNumber>;
-
-    approve(spender: string, amount: BigNumberish): Promise<BigNumber>;
-
-    balanceOf(account: string): Promise<BigNumber>;
-
-    decimals(): Promise<BigNumber>;
-
-    decreaseAllowance(
-      spender: string,
-      subtractedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    increaseAllowance(
-      spender: string,
-      addedValue: BigNumberish
-    ): Promise<BigNumber>;
-
-    mint(value: BigNumberish): Promise<BigNumber>;
-
-    name(): Promise<BigNumber>;
-
-    symbol(): Promise<BigNumber>;
-
-    totalSupply(): Promise<BigNumber>;
-
-    transfer(recipient: string, amount: BigNumberish): Promise<BigNumber>;
-
-    transferFrom(
-      sender: string,
-      recipient: string,
-      amount: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/MockZrxFactory.ts b/types/MockZrxFactory.ts
deleted file mode 100644
index b53406a4..00000000
--- a/types/MockZrxFactory.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { MockZrx } from "./MockZrx";
-
-export class MockZrxFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<MockZrx> {
-    return super.deploy(overrides) as Promise<MockZrx>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): MockZrx {
-    return super.attach(address) as MockZrx;
-  }
-  connect(signer: Signer): MockZrxFactory {
-    return super.connect(signer) as MockZrxFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MockZrx {
-    return new Contract(address, _abi, signerOrProvider) as MockZrx;
-  }
-}
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Approval",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "Transfer",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      }
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "approve",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "account",
-        type: "address"
-      }
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint8",
-        name: "",
-        type: "uint8"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "subtractedValue",
-        type: "uint256"
-      }
-    ],
-    name: "decreaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "addedValue",
-        type: "uint256"
-      }
-    ],
-    name: "increaseAllowance",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      }
-    ],
-    name: "mint",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "recipient",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b50604051806040016040528060038152602001620b4a4b60eb1b81525060405180604001604052806007815260200166183c1021b7b4b760c91b8152506012828281600390805190602001906100679291906100bb565b50805161007b9060049060208401906100bb565b50506005805460ff191660121790555061009d816001600160e01b036100a516565b505050610156565b6005805460ff191660ff92909216919091179055565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100fc57805160ff1916838001178555610129565b82800160010185558215610129579182015b8281111561012957825182559160200191906001019061010e565b50610135929150610139565b5090565b61015391905b80821115610135576000815560010161013f565b90565b610b48806101656000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806370a082311161007157806370a082311461021057806395d89b4114610236578063a0712d681461023e578063a457c2d71461025b578063a9059cbb14610287578063dd62ed3e146102b3576100b4565b806306fdde03146100b9578063095ea7b31461013657806318160ddd1461017657806323b872dd14610190578063313ce567146101c657806339509351146101e4575b600080fd5b6100c16102e1565b6040805160208082528351818301528351919283929083019185019080838360005b838110156100fb5781810151838201526020016100e3565b50505050905090810190601f1680156101285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101626004803603604081101561014c57600080fd5b506001600160a01b038135169060200135610377565b604080519115158252519081900360200190f35b61017e610394565b60408051918252519081900360200190f35b610162600480360360608110156101a657600080fd5b506001600160a01b0381358116916020810135909116906040013561039a565b6101ce610427565b6040805160ff9092168252519081900360200190f35b610162600480360360408110156101fa57600080fd5b506001600160a01b038135169060200135610430565b61017e6004803603602081101561022657600080fd5b50356001600160a01b0316610484565b6100c161049f565b6101626004803603602081101561025457600080fd5b5035610500565b6101626004803603604081101561027157600080fd5b506001600160a01b038135169060200135610514565b6101626004803603604081101561029d57600080fd5b506001600160a01b038135169060200135610582565b61017e600480360360408110156102c957600080fd5b506001600160a01b0381358116916020013516610596565b60038054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b5050505050905090565b600061038b6103846105c1565b84846105c5565b50600192915050565b60025490565b60006103a78484846106b1565b61041d846103b36105c1565b61041885604051806060016040528060288152602001610a7d602891396001600160a01b038a166000908152600160205260408120906103f16105c1565b6001600160a01b03168152602081019190915260400160002054919063ffffffff61081816565b6105c5565b5060019392505050565b60055460ff1690565b600061038b61043d6105c1565b84610418856001600061044e6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918c16815292529020549063ffffffff6108af16565b6001600160a01b031660009081526020819052604090205490565b60048054604080516020601f600260001961010060018816150201909516949094049384018190048102820181019092528281526060939092909183018282801561036d5780601f106103425761010080835404028352916020019161036d565b600061050c3383610910565b506001919050565b600061038b6105216105c1565b8461041885604051806060016040528060258152602001610aee602591396001600061054b6105c1565b6001600160a01b03908116825260208083019390935260409182016000908120918d1681529252902054919063ffffffff61081816565b600061038b61058f6105c1565b84846106b1565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b3390565b6001600160a01b03831661060a5760405162461bcd60e51b8152600401808060200182810382526024815260200180610aca6024913960400191505060405180910390fd5b6001600160a01b03821661064f5760405162461bcd60e51b8152600401808060200182810382526022815260200180610a356022913960400191505060405180910390fd5b6001600160a01b03808416600081815260016020908152604080832094871680845294825291829020859055815185815291517f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259281900390910190a3505050565b6001600160a01b0383166106f65760405162461bcd60e51b8152600401808060200182810382526025815260200180610aa56025913960400191505060405180910390fd5b6001600160a01b03821661073b5760405162461bcd60e51b8152600401808060200182810382526023815260200180610a126023913960400191505060405180910390fd5b610746838383610a0c565b61078981604051806060016040528060268152602001610a57602691396001600160a01b038616600090815260208190526040902054919063ffffffff61081816565b6001600160a01b0380851660009081526020819052604080822093909355908416815220546107be908263ffffffff6108af16565b6001600160a01b038084166000818152602081815260409182902094909455805185815290519193928716927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92918290030190a3505050565b600081848411156108a75760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561086c578181015183820152602001610854565b50505050905090810190601f1680156108995780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600082820183811015610909576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b9392505050565b6001600160a01b03821661096b576040805162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015290519081900360640190fd5b61097760008383610a0c565b60025461098a908263ffffffff6108af16565b6002556001600160a01b0382166000908152602081905260409020546109b6908263ffffffff6108af16565b6001600160a01b0383166000818152602081815260408083209490945583518581529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35050565b50505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa264697066735822122078756f81a2e1b2f18a8597bfa5a8df537a906a0b1c3e2d3037e43154e4a05a0a64736f6c63430006080033";
diff --git a/types/OneSplitAdapter.d.ts b/types/OneSplitAdapter.d.ts
deleted file mode 100644
index 444d6e0f..00000000
--- a/types/OneSplitAdapter.d.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractTransaction, EventFilter, Signer } from "ethers";
-import { Listener, Provider } from "ethers/providers";
-import { Arrayish, BigNumber, BigNumberish, Interface } from "ethers/utils";
-import {
-  TransactionOverrides,
-  TypedEventDescription,
-  TypedFunctionDescription
-} from ".";
-
-interface OneSplitAdapterInterface extends Interface {
-  functions: {
-    approveExchange: TypedFunctionDescription<{
-      encode([_tokens]: [string[]]): string;
-    }>;
-
-    exchange: TypedFunctionDescription<{
-      encode([_from, _to, _amount, _maxSlippage]: [
-        string,
-        string,
-        BigNumberish,
-        BigNumberish
-      ]): string;
-    }>;
-  };
-
-  events: {
-    Exchange: TypedEventDescription<{
-      encodeTopics([from, to, platform, fromAmount, toAmount]: [
-        string | null,
-        string | null,
-        string | null,
-        null,
-        null
-      ]): string[];
-    }>;
-
-    OneSplitAdapterSetup: TypedEventDescription<{
-      encodeTopics([oneSplit, priceOracle, splitParts]: [
-        null,
-        null,
-        null
-      ]): string[];
-    }>;
-  };
-}
-
-export class OneSplitAdapter extends Contract {
-  connect(signerOrProvider: Signer | Provider | string): OneSplitAdapter;
-  attach(addressOrName: string): OneSplitAdapter;
-  deployed(): Promise<OneSplitAdapter>;
-
-  on(event: EventFilter | string, listener: Listener): OneSplitAdapter;
-  once(event: EventFilter | string, listener: Listener): OneSplitAdapter;
-  addListener(
-    eventName: EventFilter | string,
-    listener: Listener
-  ): OneSplitAdapter;
-  removeAllListeners(eventName: EventFilter | string): OneSplitAdapter;
-  removeListener(eventName: any, listener: Listener): OneSplitAdapter;
-
-  interface: OneSplitAdapterInterface;
-
-  functions: {
-    approveExchange(
-      _tokens: string[],
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-
-    exchange(
-      _from: string,
-      _to: string,
-      _amount: BigNumberish,
-      _maxSlippage: BigNumberish,
-      overrides?: TransactionOverrides
-    ): Promise<ContractTransaction>;
-  };
-
-  approveExchange(
-    _tokens: string[],
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  exchange(
-    _from: string,
-    _to: string,
-    _amount: BigNumberish,
-    _maxSlippage: BigNumberish,
-    overrides?: TransactionOverrides
-  ): Promise<ContractTransaction>;
-
-  filters: {
-    Exchange(
-      from: string | null,
-      to: string | null,
-      platform: string | null,
-      fromAmount: null,
-      toAmount: null
-    ): EventFilter;
-
-    OneSplitAdapterSetup(
-      oneSplit: null,
-      priceOracle: null,
-      splitParts: null
-    ): EventFilter;
-  };
-
-  estimate: {
-    approveExchange(_tokens: string[]): Promise<BigNumber>;
-
-    exchange(
-      _from: string,
-      _to: string,
-      _amount: BigNumberish,
-      _maxSlippage: BigNumberish
-    ): Promise<BigNumber>;
-  };
-}
diff --git a/types/OneSplitAdapterFactory.ts b/types/OneSplitAdapterFactory.ts
deleted file mode 100644
index 27c208d2..00000000
--- a/types/OneSplitAdapterFactory.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Generated by ts-generator ver. 0.0.8 */
-/* tslint:disable */
-
-import { Contract, ContractFactory, Signer } from "ethers";
-import { Provider } from "ethers/providers";
-import { UnsignedTransaction } from "ethers/utils/transaction";
-
-import { TransactionOverrides } from ".";
-import { OneSplitAdapter } from "./OneSplitAdapter";
-
-export class OneSplitAdapterFactory extends ContractFactory {
-  constructor(signer?: Signer) {
-    super(_abi, _bytecode, signer);
-  }
-
-  deploy(overrides?: TransactionOverrides): Promise<OneSplitAdapter> {
-    return super.deploy(overrides) as Promise<OneSplitAdapter>;
-  }
-  getDeployTransaction(overrides?: TransactionOverrides): UnsignedTransaction {
-    return super.getDeployTransaction(overrides);
-  }
-  attach(address: string): OneSplitAdapter {
-    return super.attach(address) as OneSplitAdapter;
-  }
-  connect(signer: Signer): OneSplitAdapterFactory {
-    return super.connect(signer) as OneSplitAdapterFactory;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): OneSplitAdapter {
-    return new Contract(address, _abi, signerOrProvider) as OneSplitAdapter;
-  }
-}
-
-const _abi = [
-  {
-    inputs: [],
-    stateMutability: "nonpayable",
-    type: "constructor"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "platform",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "fromAmount",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "toAmount",
-        type: "uint256"
-      }
-    ],
-    name: "Exchange",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "oneSplit",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "priceOracle",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "splitParts",
-        type: "uint256"
-      }
-    ],
-    name: "OneSplitAdapterSetup",
-    type: "event"
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20[]",
-        name: "_tokens",
-        type: "address[]"
-      }
-    ],
-    name: "approveExchange",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_from",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "_to",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "_amount",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "_maxSlippage",
-        type: "uint256"
-      }
-    ],
-    name: "exchange",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
-const _bytecode =
-  "0x608060405234801561001057600080fd5b5060408051731814222fa8c8c1c1bf380e3bbfbd9de8657da47681527376b47460d7f7c5222cfb6b6a75615ab10895dde46020820152600a8183015290517f8d2e03fe8af77d72ac9d334b8bc58153f47fc0c0ec0c926c1686754201cfdc5d9181900360600190a1610bc6806100876000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80630ed2fc951461003b57806393ed430914610089575b600080fd5b6100776004803603608081101561005157600080fd5b506001600160a01b038135811691602081013590911690604081013590606001356100fb565b60408051918252519081900360200190f35b6100f96004803603602081101561009f57600080fd5b8101906020810181356401000000008111156100ba57600080fd5b8201836020820111156100cc57600080fd5b803590602001918460208302840111640100000000831117156100ee57600080fd5b5090925090506104f4565b005b60008061010661059b565b6001600160a01b0316866001600160a01b031614610125576000610127565b835b6040805163b3596f0760e01b81526001600160a01b038916600482015290519192506000917376b47460d7f7c5222cfb6b6a75615ab10895dde49163b3596f07916024808301926020929190829003018186803b15801561018757600080fd5b505afa15801561019b573d6000803e3d6000fd5b505050506040513d60208110156101b157600080fd5b50516040805163b3596f0760e01b81526001600160a01b038916600482015290519192506000917376b47460d7f7c5222cfb6b6a75615ab10895dde49163b3596f07916024808301926020929190829003018186803b15801561021357600080fd5b505afa158015610227573d6000803e3d6000fd5b505050506040513d602081101561023d57600080fd5b5051604080516370a0823160e01b815230600482015290519192506000916001600160a01b038a16916370a08231916024808301926020929190829003018186803b15801561028b57600080fd5b505afa15801561029f573d6000803e3d6000fd5b505050506040513d60208110156102b557600080fd5b5051604080516335cac4d560e11b81526001600160a01b038c811660048301528b166024820152604481018a9052600060648201819052600a608483015261020060a48301529151929350731814222fa8c8c1c1bf380e3bbfbd9de8657da47692636b9589aa92889260c4808201939182900301818588803b15801561033a57600080fd5b505af115801561034e573d6000803e3d6000fd5b505050505060006103e7828a6001600160a01b03166370a08231306040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156103af57600080fd5b505afa1580156103c3573d6000803e3d6000fd5b505050506040513d60208110156103d957600080fd5b50519063ffffffff6105b316565b9050606487900361042e610401868b63ffffffff6105fe16565b6104226064610416888763ffffffff6105fe16565b9063ffffffff6105fe16565b9063ffffffff61065716565b1015610474576040805162461bcd60e51b815260206004820152601060248201526f494e56414c49445f534c49505041474560801b604482015290519081900360640190fd5b731814222fa8c8c1c1bf380e3bbfbd9de8657da4766001600160a01b0316896001600160a01b03168b6001600160a01b03167fa6fee24309b1d83d9ec7b9e4dbb73c6f882746efbfb26db7b7d9e9f2fb6dc95a8b85604051808381526020018281526020019250505060405180910390a49450505050505b949350505050565b60005b818110156105965761050761059b565b6001600160a01b031683838381811061051c57fe5b905060200201356001600160a01b03166001600160a01b03161461058e5761058e731814222fa8c8c1c1bf380e3bbfbd9de8657da47661055a610699565b85858581811061056657fe5b905060200201356001600160a01b03166001600160a01b031661069f9092919063ffffffff16565b6001016104f7565b505050565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee90565b60006105f583836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f7700008152506107b2565b90505b92915050565b60008261060d575060006105f8565b8282028284828161061a57fe5b04146105f55760405162461bcd60e51b8152600401808060200182810382526021815260200180610b106021913960400191505060405180910390fd5b60006105f583836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250610849565b60011990565b801580610725575060408051636eb1769f60e11b81523060048201526001600160a01b03848116602483015291519185169163dd62ed3e91604480820192602092909190829003018186803b1580156106f757600080fd5b505afa15801561070b573d6000803e3d6000fd5b505050506040513d602081101561072157600080fd5b5051155b6107605760405162461bcd60e51b8152600401808060200182810382526036815260200180610b5b6036913960400191505060405180910390fd5b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526105969084906108ae565b600081848411156108415760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b838110156108065781810151838201526020016107ee565b50505050905090810190601f1680156108335780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600081836108985760405162461bcd60e51b81526020600482018181528351602484015283519092839260449091019190850190808383600083156108065781810151838201526020016107ee565b5060008385816108a457fe5b0495945050505050565b6060610903826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b031661095f9092919063ffffffff16565b8051909150156105965780806020019051602081101561092257600080fd5b50516105965760405162461bcd60e51b815260040180806020018281038252602a815260200180610b31602a913960400191505060405180910390fd5b60606104ec8484600085606061097485610ad6565b6109c5576040805162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015290519081900360640190fd5b60006060866001600160a01b031685876040518082805190602001908083835b60208310610a045780518252601f1990920191602091820191016109e5565b6001836020036101000a03801982511681845116808217855250505050505090500191505060006040518083038185875af1925050503d8060008114610a66576040519150601f19603f3d011682016040523d82523d6000602084013e610a6b565b606091505b50915091508115610a7f5791506104ec9050565b805115610a8f5780518082602001fd5b60405162461bcd60e51b81526020600482018181528651602484015286518793919283926044019190850190808383600083156108065781810151838201526020016107ee565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4708181148015906104ec57505015159291505056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f775361666545524332303a204552433230206f7065726174696f6e20646964206e6f7420737563636565645361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f20746f206e6f6e2d7a65726f20616c6c6f77616e6365a26469706673582212208feab8b8969fcadba8a22d5b8ed1cc59039f86ba2611f214a3dec442aac4f39b64736f6c63430006080033";
diff --git a/types/ReserveLogicFactory.ts b/types/ReserveLogicFactory.ts
index e81a089c..7c6b1832 100644
--- a/types/ReserveLogicFactory.ts
+++ b/types/ReserveLogicFactory.ts
@@ -86,4 +86,4 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x610d9d610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80639ada2ceb14610071578063a0237264146100af578063d9c477cc146100fc578063e1219abf14610119578063f15e3b2114610145578063f77efa6e1461018c575b600080fd5b61009d6004803603604081101561008757600080fd5b50803590602001356001600160a01b03166101af565b60408051918252519081900360200190f35b8180156100bb57600080fd5b506100fa600480360360a08110156100d257600080fd5b508035906001600160a01b036020820135169060408101359060608101359060800135610214565b005b61009d6004803603602081101561011257600080fd5b5035610260565b61009d6004803603604081101561012f57600080fd5b50803590602001356001600160a01b03166102fe565b81801561015157600080fd5b506100fa6004803603608081101561016857600080fd5b508035906001600160a01b0360208201351690604081013590606001351515610338565b61009d600480360360408110156101a257600080fd5b5080359060200135610359565b6000806101bb84610377565b9050806101cc57600091505061020e565b60006101e76001600160a01b0385163063ffffffff61047716565b90506102096101fc828463ffffffff61052116565b839063ffffffff61057b16565b925050505b92915050565b61021d856105bf565b600061023861022b87610377565b859063ffffffff61052116565b905061024b86828563ffffffff61065716565b61025886868560006106b5565b505050505050565b60008160020154600014156102f25781600c0160009054906101000a90046001600160a01b03166001600160a01b03166334762ca56040518163ffffffff1660e01b815260040160206040518083038186803b1580156102bf57600080fd5b505afa1580156102d3573d6000803e3d6000fd5b505050506040513d60208110156102e957600080fd5b505190506102f9565b5060028101545b919050565b600061033161030c84610377565b6103256001600160a01b0385163063ffffffff61047716565b9063ffffffff61052116565b9392505050565b610341846105bf565b806103535761035384846000856106b5565b50505050565b60008260030154600014610371578260030154610331565b50919050565b600061020e82600b0160009054906101000a90046001600160a01b03166001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103cc57600080fd5b505afa1580156103e0573d6000803e3d6000fd5b505050506040513d60208110156103f657600080fd5b5051600a840154604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b15801561043f57600080fd5b505afa158015610453573d6000803e3d6000fd5b505050506040513d602081101561046957600080fd5b50519063ffffffff61052116565b6000610482836109e5565b1561049857506001600160a01b0381163161020e565b826001600160a01b03166370a08231836040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156104ee57600080fd5b505afa158015610502573d6000803e3d6000fd5b505050506040513d602081101561051857600080fd5b5051905061020e565b600082820183811015610331576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b6000600282046105b7836105ab61059e876b033b2e3c9fd0803ce8000000610a1b565b849063ffffffff61052116565b9063ffffffff610a7416565b949350505050565b60006105ca82610377565b90508015610653576001820154600c8301546000916105f691600160a01b900464ffffffffff16610ab6565b835490915061060c90829063ffffffff610b0116565b83556002830154600c84015460009161063291600160a01b900464ffffffffff16610b39565b905061064b846004015482610b0190919063ffffffff16565b600485015550505b5050565b600061067a61066584610b88565b61066e84610b88565b9063ffffffff61057b16565b90506000610696610689610b9e565b839063ffffffff61052116565b85549091506106ac90829063ffffffff610b0116565b90945550505050565b600a8401546040805163487b7e7960e11b815290516000926001600160a01b0316916390f6fcf2916004808301926020929190829003018186803b1580156106fc57600080fd5b505afa158015610710573d6000803e3d6000fd5b505050506040513d602081101561072657600080fd5b5051905060006107456001600160a01b0386163063ffffffff61047716565b9050610759856001600160a01b03166109e5565b156107715761076e813463ffffffff610bae16565b90505b600c860154600090819081906001600160a01b03166357e37af0896107ac896107a0898d63ffffffff61052116565b9063ffffffff610bae16565b8c600a0160009054906101000a90046001600160a01b03166001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b1580156107fc57600080fd5b505afa158015610810573d6000803e3d6000fd5b505050506040513d602081101561082657600080fd5b5051600b8e0154604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b15801561086f57600080fd5b505afa158015610883573d6000803e3d6000fd5b505050506040513d602081101561089957600080fd5b5051604080516001600160e01b031960e088901b1681526001600160a01b039095166004860152602485019390935260448401919091526064830152608482018990525160a4808301926060929190829003018186803b1580156108fc57600080fd5b505afa158015610910573d6000803e3d6000fd5b505050506040513d606081101561092657600080fd5b50805160208083015160409384015160018e0184905560038e0182905560028e01819055600c8e01805464ffffffffff4216600160a01b0264ffffffffff60a01b199091161790558d5460048f015486518681529485018490528487018c905260608501839052608085019190915260a0840152935192965094509192506001600160a01b038a16917f131cf1f61e39fd78f61f07d78533f5b6c13629c80ef6965983e92c72efbaa4a4919081900360c00190a2505050505050505050565b60006001600160a01b038216158061020e5750506001600160a01b031673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee1490565b600082610a2a5750600061020e565b82820282848281610a3757fe5b04146103315760405162461bcd60e51b8152600401808060200182810382526021815260200180610d476021913960400191505060405180910390fd5b600061033183836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250610bf0565b600080610ad04264ffffffffff851663ffffffff610bae16565b90506000610ae46106656301e13380610b88565b9050610209610af1610b9e565b610325878463ffffffff610b0116565b60006103316b033b2e3c9fd0803ce80000006105ab610b26868663ffffffff610a1b16565b6b019d971e4fe8401e7400000090610521565b600080610b534264ffffffffff851663ffffffff610bae16565b90506000610b6b856301e1338063ffffffff610a7416565b905061020982610b7c61059e610b9e565b9063ffffffff610c9216565b600061020e82633b9aca0063ffffffff610a1b16565b6b033b2e3c9fd0803ce800000090565b600061033183836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610cec565b60008183610c7c5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610c41578181015183820152602001610c29565b50505050905090810190601f168015610c6e5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b506000838581610c8857fe5b0495945050505050565b600060028206610cae576b033b2e3c9fd0803ce8000000610cb0565b825b90506002820491505b811561020e57610cc98384610b01565b92506002820615610ce157610cde8184610b01565b90505b600282049150610cb9565b60008184841115610d3e5760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610c41578181015183820152602001610c29565b50505090039056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77a26469706673582212208bcc7f96258c14fc14b8e22b0688a406ee82aa15b5771015acfa0ef33d17253964736f6c63430006080033";
+  "0x610d9d610026600b82828239805160001a60731461001957fe5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80639ada2ceb14610071578063a0237264146100af578063d9c477cc146100fc578063e1219abf14610119578063f15e3b2114610145578063f77efa6e1461018c575b600080fd5b61009d6004803603604081101561008757600080fd5b50803590602001356001600160a01b03166101af565b60408051918252519081900360200190f35b8180156100bb57600080fd5b506100fa600480360360a08110156100d257600080fd5b508035906001600160a01b036020820135169060408101359060608101359060800135610214565b005b61009d6004803603602081101561011257600080fd5b5035610260565b61009d6004803603604081101561012f57600080fd5b50803590602001356001600160a01b03166102fe565b81801561015157600080fd5b506100fa6004803603608081101561016857600080fd5b508035906001600160a01b0360208201351690604081013590606001351515610338565b61009d600480360360408110156101a257600080fd5b5080359060200135610359565b6000806101bb84610377565b9050806101cc57600091505061020e565b60006101e76001600160a01b0385163063ffffffff61047716565b90506102096101fc828463ffffffff61052116565b839063ffffffff61057b16565b925050505b92915050565b61021d856105bf565b600061023861022b87610377565b859063ffffffff61052116565b905061024b86828563ffffffff61065716565b61025886868560006106b5565b505050505050565b60008160020154600014156102f25781600c0160009054906101000a90046001600160a01b03166001600160a01b03166334762ca56040518163ffffffff1660e01b815260040160206040518083038186803b1580156102bf57600080fd5b505afa1580156102d3573d6000803e3d6000fd5b505050506040513d60208110156102e957600080fd5b505190506102f9565b5060028101545b919050565b600061033161030c84610377565b6103256001600160a01b0385163063ffffffff61047716565b9063ffffffff61052116565b9392505050565b610341846105bf565b806103535761035384846000856106b5565b50505050565b60008260030154600014610371578260030154610331565b50919050565b600061020e82600b0160009054906101000a90046001600160a01b03166001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103cc57600080fd5b505afa1580156103e0573d6000803e3d6000fd5b505050506040513d60208110156103f657600080fd5b5051600a840154604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b15801561043f57600080fd5b505afa158015610453573d6000803e3d6000fd5b505050506040513d602081101561046957600080fd5b50519063ffffffff61052116565b6000610482836109e5565b1561049857506001600160a01b0381163161020e565b826001600160a01b03166370a08231836040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156104ee57600080fd5b505afa158015610502573d6000803e3d6000fd5b505050506040513d602081101561051857600080fd5b5051905061020e565b600082820183811015610331576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b6000600282046105b7836105ab61059e876b033b2e3c9fd0803ce8000000610a1b565b849063ffffffff61052116565b9063ffffffff610a7416565b949350505050565b60006105ca82610377565b90508015610653576001820154600c8301546000916105f691600160a01b900464ffffffffff16610ab6565b835490915061060c90829063ffffffff610b0116565b83556002830154600c84015460009161063291600160a01b900464ffffffffff16610b39565b905061064b846004015482610b0190919063ffffffff16565b600485015550505b5050565b600061067a61066584610b88565b61066e84610b88565b9063ffffffff61057b16565b90506000610696610689610b9e565b839063ffffffff61052116565b85549091506106ac90829063ffffffff610b0116565b90945550505050565b600a8401546040805163487b7e7960e11b815290516000926001600160a01b0316916390f6fcf2916004808301926020929190829003018186803b1580156106fc57600080fd5b505afa158015610710573d6000803e3d6000fd5b505050506040513d602081101561072657600080fd5b5051905060006107456001600160a01b0386163063ffffffff61047716565b9050610759856001600160a01b03166109e5565b156107715761076e813463ffffffff610bae16565b90505b600c860154600090819081906001600160a01b03166357e37af0896107ac896107a0898d63ffffffff61052116565b9063ffffffff610bae16565b8c600a0160009054906101000a90046001600160a01b03166001600160a01b03166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b1580156107fc57600080fd5b505afa158015610810573d6000803e3d6000fd5b505050506040513d602081101561082657600080fd5b5051600b8e0154604080516318160ddd60e01b815290516001600160a01b03909216916318160ddd91600480820192602092909190829003018186803b15801561086f57600080fd5b505afa158015610883573d6000803e3d6000fd5b505050506040513d602081101561089957600080fd5b5051604080516001600160e01b031960e088901b1681526001600160a01b039095166004860152602485019390935260448401919091526064830152608482018990525160a4808301926060929190829003018186803b1580156108fc57600080fd5b505afa158015610910573d6000803e3d6000fd5b505050506040513d606081101561092657600080fd5b50805160208083015160409384015160018e0184905560038e0182905560028e01819055600c8e01805464ffffffffff4216600160a01b0264ffffffffff60a01b199091161790558d5460048f015486518681529485018490528487018c905260608501839052608085019190915260a0840152935192965094509192506001600160a01b038a16917f131cf1f61e39fd78f61f07d78533f5b6c13629c80ef6965983e92c72efbaa4a4919081900360c00190a2505050505050505050565b60006001600160a01b038216158061020e5750506001600160a01b031673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee1490565b600082610a2a5750600061020e565b82820282848281610a3757fe5b04146103315760405162461bcd60e51b8152600401808060200182810382526021815260200180610d476021913960400191505060405180910390fd5b600061033183836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250610bf0565b600080610ad04264ffffffffff851663ffffffff610bae16565b90506000610ae46106656301e13380610b88565b9050610209610af1610b9e565b610325878463ffffffff610b0116565b60006103316b033b2e3c9fd0803ce80000006105ab610b26868663ffffffff610a1b16565b6b019d971e4fe8401e7400000090610521565b600080610b534264ffffffffff851663ffffffff610bae16565b90506000610b6b856301e1338063ffffffff610a7416565b905061020982610b7c61059e610b9e565b9063ffffffff610c9216565b600061020e82633b9aca0063ffffffff610a1b16565b6b033b2e3c9fd0803ce800000090565b600061033183836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610cec565b60008183610c7c5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610c41578181015183820152602001610c29565b50505050905090810190601f168015610c6e5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b506000838581610c8857fe5b0495945050505050565b600060028206610cae576b033b2e3c9fd0803ce8000000610cb0565b825b90506002820491505b811561020e57610cc98384610b01565b92506002820615610ce157610cde8184610b01565b90505b600282049150610cb9565b60008184841115610d3e5760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610c41578181015183820152602001610c29565b50505090039056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77a2646970667358221220ed3ece68dd3a0183c83a653793720b8b252cddb566001e6f57a1369c40b88ee164736f6c63430006080033";
diff --git a/types/StableDebtTokenFactory.ts b/types/StableDebtTokenFactory.ts
index 5bf5b76a..3be41211 100644
--- a/types/StableDebtTokenFactory.ts
+++ b/types/StableDebtTokenFactory.ts
@@ -525,4 +525,4 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x608060405234801561001057600080fd5b506111d8806100206000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c806389d1a0fc116100a2578063a457c2d711610071578063a457c2d71461027a578063a9059cbb14610473578063c634dfaa1461049f578063dd62ed3e146104c5578063e78c9b3b146104f357610116565b806389d1a0fc1461041357806390f6fcf21461043757806395d89b411461043f5780639dc29fac1461044757610116565b806323b872dd116100e957806323b872dd14610226578063313ce5671461025c578063395093511461027a57806370a08231146102a657806381e75277146102cc57610116565b806306fdde031461011b578063095ea7b314610198578063156e29f6146101d857806318160ddd1461020c575b600080fd5b610123610519565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561015d578181015183820152602001610145565b50505050905090810190601f16801561018a5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101c4600480360360408110156101ae57600080fd5b506001600160a01b0381351690602001356105a6565b604080519115158252519081900360200190f35b61020a600480360360608110156101ee57600080fd5b506001600160a01b0381351690602081013590604001356105ee565b005b6102146107da565b60408051918252519081900360200190f35b6101c46004803603606081101561023c57600080fd5b506001600160a01b038135811691602081013590911690604001356107e0565b610264610828565b6040805160ff9092168252519081900360200190f35b6101c46004803603604081101561029057600080fd5b506001600160a01b038135169060200135610831565b610214600480360360208110156102bc57600080fd5b50356001600160a01b0316610880565b61020a600480360360a08110156102e257600080fd5b8101906020810181356401000000008111156102fd57600080fd5b82018360208201111561030f57600080fd5b8035906020019184600183028401116401000000008311171561033157600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929594936020810193503591505064010000000081111561038457600080fd5b82018360208201111561039657600080fd5b803590602001918460018302840111640100000000831117156103b857600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295505060ff8335169350506001600160a01b03602083013581169260400135169050610901565b61041b6109e6565b604080516001600160a01b039092168252519081900360200190f35b6102146109fa565b610123610a01565b61020a6004803603604081101561045d57600080fd5b506001600160a01b038135169060200135610a59565b6101c46004803603604081101561048957600080fd5b506001600160a01b0381351690602001356107e0565b610214600480360360208110156104b557600080fd5b50356001600160a01b0316610bac565b610214600480360360408110156104db57600080fd5b506001600160a01b0381358116916020013516610831565b6102146004803603602081101561050957600080fd5b50356001600160a01b0316610bc7565b60018054604080516020600284861615610100026000190190941693909304601f8101849004840282018401909252818152929183018282801561059e5780601f106105735761010080835404028352916020019161059e565b820191906000526020600020905b81548152906001019060200180831161058157829003601f168201915b505050505081565b6040805162461bcd60e51b81526020600482015260166024820152751054141493d5905317d393d517d4d5541413d495115160521b6044820152905160009181900360640190fd5b6004546001600160a01b031633146106375760405162461bcd60e51b81526004018080602001828103825260328152602001806111716032913960400191505060405180910390fd5b600080600061064586610be2565b925092509250600061066286600054610c3890919063ffffffff16565b9050600061066f87610c9b565b90506106e861068c610687868a63ffffffff610c3816565b610c9b565b6106dc61069f848a63ffffffff610cb116565b6106d06106ab89610c9b565b6001600160a01b038e166000908152600760205260409020549063ffffffff610cf716565b9063ffffffff610c3816565b9063ffffffff610d3016565b6001600160a01b0389166000908152600760205260409020908155600101805464ffffffffff19164264ffffffffff1617905561075761072783610c9b565b6106dc61073a898563ffffffff610cf716565b6106d0610748600054610c9b565b6006549063ffffffff610cf716565b6006556107648888610d60565b6001600160a01b0388166000818152600760209081526040918290205482519384529083018a9052828201889052606083018790526080830186905260a0830152517f94ba3ac5ed6fee7b49ed817c5ee964eed9bd5da6860344f95fc56997e920381d9181900360c00190a15050505050505050565b60005481565b6040805162461bcd60e51b81526020600482015260166024820152751514905394d1915497d393d517d4d5541413d495115160521b6044820152905160009181900360640190fd5b60035460ff1681565b6040805162461bcd60e51b815260206004820152601760248201527f414c4c4f57414e43455f4e4f545f535550504f525445440000000000000000006044820152905160009181900360640190fd5b6001600160a01b03811660009081526007602052604081208054600182015483916108b19164ffffffffff16610dbe565b90506108f96108f4826108e860056000896001600160a01b03166001600160a01b0316815260200190815260200160002054610c9b565b9063ffffffff610cf716565b610e16565b949350505050565b84516109149060019060208801906110b7565b5083516109289060029060208701906110b7565b506003805460ff191660ff851617610100600160a81b0319166101006001600160a01b03858116919091029190911790915560408051630261bf8b60e01b8152905191831691630261bf8b91600480820192602092909190829003018186803b15801561099457600080fd5b505afa1580156109a8573d6000803e3d6000fd5b505050506040513d60208110156109be57600080fd5b5051600480546001600160a01b0319166001600160a01b039092169190911790555050505050565b60035461010090046001600160a01b031681565b6006545b90565b6002805460408051602060018416156101000260001901909316849004601f8101849004840282018401909252818152929183018282801561059e5780601f106105735761010080835404028352916020019161059e565b6004546001600160a01b03163314610aa25760405162461bcd60e51b81526004018080602001828103825260328152602001806111716032913960400191505060405180910390fd5b6000806000610ab085610be2565b9250925092506000610acd85600054610e3690919063ffffffff16565b90506000610ada86610c9b565b905081610aeb576000600655610b42565b610b3e610af783610c9b565b6001600160a01b0389166000908152600760205260409020546106dc90610b24908563ffffffff610cf716565b610b32610748600054610c9b565b9063ffffffff610e3616565b6006555b610b4c8787610e78565b604080516001600160a01b038916815260208101889052808201879052606081018690526080810185905290517fecde08620c30706a4d7ba53e9163327f2e12a6cea2709dd6a9226fed28c2bb729181900360a00190a150505050505050565b6001600160a01b031660009081526005602052604090205490565b6001600160a01b031660009081526007602052604090205490565b6001600160a01b0381166000908152600560205260408120548190819081610c0d82610b3288610880565b9050610c198682610d60565b81610c2a818363ffffffff610c3816565b909790965090945092505050565b600082820183811015610c92576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b90505b92915050565b6000610c9582633b9aca0063ffffffff610eb616565b6000610c92670de0b6b3a7640000610ceb610cd2868663ffffffff610eb616565b6002670de0b6b3a76400005b049063ffffffff610c3816565b9063ffffffff610f0f16565b6000610c926b033b2e3c9fd0803ce8000000610ceb610d1c868663ffffffff610eb616565b60026b033b2e3c9fd0803ce8000000610cde565b6000600282046108f983610ceb610d53876b033b2e3c9fd0803ce8000000610eb6565b849063ffffffff610c3816565b600054610d73908263ffffffff610c3816565b60009081556001600160a01b038316815260056020526040902054610d9e908263ffffffff610c3816565b6001600160a01b0390921660009081526005602052604090209190915550565b600080610dd84264ffffffffff851663ffffffff610e3616565b90506000610df0856301e1338063ffffffff610f0f16565b9050610e0d82610e01610d53610f51565b9063ffffffff610f6116565b95945050505050565b6000631dcd6500610e2f633b9aca00610ceb8386610c38565b9392505050565b6000610c9283836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610fbb565b600054610e8b908263ffffffff610e3616565b60009081556001600160a01b038316815260056020526040902054610d9e908263ffffffff610e3616565b600082610ec557506000610c95565b82820282848281610ed257fe5b0414610c925760405162461bcd60e51b81526004018080602001828103825260218152602001806111506021913960400191505060405180910390fd5b6000610c9283836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611052565b6b033b2e3c9fd0803ce800000090565b600060028206610f7d576b033b2e3c9fd0803ce8000000610f7f565b825b90506002820491505b8115610c9557610f988384610cf7565b92506002820615610fb057610fad8184610cf7565b90505b600282049150610f88565b6000818484111561104a5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561100f578181015183820152602001610ff7565b50505050905090810190601f16801561103c5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600081836110a15760405162461bcd60e51b815260206004820181815283516024840152835190928392604490910191908501908083836000831561100f578181015183820152602001610ff7565b5060008385816110ad57fe5b0495945050505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106110f857805160ff1916838001178555611125565b82800160010185558215611125579182015b8281111561112557825182559160200191906001019061110a565b50611131929150611135565b5090565b6109fe91905b80821115611131576000815560010161113b56fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f775468652063616c6c6572206f6620746869732066756e6374696f6e206d7573742062652061206c656e64696e6720706f6f6ca26469706673582212209b3422d4d9471994ed0d319c43454dbf4a454745294f00bd56049d72e0c0f21164736f6c63430006080033";
+  "0x608060405234801561001057600080fd5b50611209806100206000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c806389d1a0fc116100a2578063a457c2d711610071578063a457c2d71461027a578063a9059cbb14610473578063c634dfaa1461049f578063dd62ed3e146104c5578063e78c9b3b146104f357610116565b806389d1a0fc1461041357806390f6fcf21461043757806395d89b411461043f5780639dc29fac1461044757610116565b806323b872dd116100e957806323b872dd14610226578063313ce5671461025c578063395093511461027a57806370a08231146102a657806381e75277146102cc57610116565b806306fdde031461011b578063095ea7b314610198578063156e29f6146101d857806318160ddd1461020c575b600080fd5b610123610519565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561015d578181015183820152602001610145565b50505050905090810190601f16801561018a5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101c4600480360360408110156101ae57600080fd5b506001600160a01b0381351690602001356105a6565b604080519115158252519081900360200190f35b61020a600480360360608110156101ee57600080fd5b506001600160a01b0381351690602081013590604001356105ee565b005b6102146107da565b60408051918252519081900360200190f35b6101c46004803603606081101561023c57600080fd5b506001600160a01b038135811691602081013590911690604001356107e0565b610264610828565b6040805160ff9092168252519081900360200190f35b6101c46004803603604081101561029057600080fd5b506001600160a01b038135169060200135610831565b610214600480360360208110156102bc57600080fd5b50356001600160a01b0316610880565b61020a600480360360a08110156102e257600080fd5b8101906020810181356401000000008111156102fd57600080fd5b82018360208201111561030f57600080fd5b8035906020019184600183028401116401000000008311171561033157600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929594936020810193503591505064010000000081111561038457600080fd5b82018360208201111561039657600080fd5b803590602001918460018302840111640100000000831117156103b857600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295505060ff8335169350506001600160a01b0360208301358116926040013516905061092a565b61041b610a0f565b604080516001600160a01b039092168252519081900360200190f35b610214610a23565b610123610a2a565b61020a6004803603604081101561045d57600080fd5b506001600160a01b038135169060200135610a82565b6101c46004803603604081101561048957600080fd5b506001600160a01b0381351690602001356107e0565b610214600480360360208110156104b557600080fd5b50356001600160a01b0316610bd5565b610214600480360360408110156104db57600080fd5b506001600160a01b0381358116916020013516610831565b6102146004803603602081101561050957600080fd5b50356001600160a01b0316610bf0565b60018054604080516020600284861615610100026000190190941693909304601f8101849004840282018401909252818152929183018282801561059e5780601f106105735761010080835404028352916020019161059e565b820191906000526020600020905b81548152906001019060200180831161058157829003601f168201915b505050505081565b6040805162461bcd60e51b81526020600482015260166024820152751054141493d5905317d393d517d4d5541413d495115160521b6044820152905160009181900360640190fd5b6004546001600160a01b031633146106375760405162461bcd60e51b81526004018080602001828103825260328152602001806111a26032913960400191505060405180910390fd5b600080600061064586610c0b565b925092509250600061066286600054610c6190919063ffffffff16565b9050600061066f87610cc4565b90506106e861068c610687868a63ffffffff610c6116565b610cc4565b6106dc61069f848a63ffffffff610cda16565b6106d06106ab89610cc4565b6001600160a01b038e166000908152600760205260409020549063ffffffff610d2016565b9063ffffffff610c6116565b9063ffffffff610d5916565b6001600160a01b0389166000908152600760205260409020908155600101805464ffffffffff19164264ffffffffff1617905561075761072783610cc4565b6106dc61073a898563ffffffff610d2016565b6106d0610748600054610cc4565b6006549063ffffffff610d2016565b6006556107648888610d91565b6001600160a01b0388166000818152600760209081526040918290205482519384529083018a9052828201889052606083018790526080830186905260a0830152517f94ba3ac5ed6fee7b49ed817c5ee964eed9bd5da6860344f95fc56997e920381d9181900360c00190a15050505050505050565b60005481565b6040805162461bcd60e51b81526020600482015260166024820152751514905394d1915497d393d517d4d5541413d495115160521b6044820152905160009181900360640190fd5b60035460ff1681565b6040805162461bcd60e51b815260206004820152601760248201527f414c4c4f57414e43455f4e4f545f535550504f525445440000000000000000006044820152905160009181900360640190fd5b6001600160a01b0381166000908152600560205260408120546108a557506000610925565b6001600160a01b0382166000908152600760205260408120805460018201549192916108d8919064ffffffffff16610def565b905061092061091b8261090f60056000896001600160a01b03166001600160a01b0316815260200190815260200160002054610cc4565b9063ffffffff610d2016565b610e47565b925050505b919050565b845161093d9060019060208801906110e8565b5083516109519060029060208701906110e8565b506003805460ff191660ff851617610100600160a81b0319166101006001600160a01b03858116919091029190911790915560408051630261bf8b60e01b8152905191831691630261bf8b91600480820192602092909190829003018186803b1580156109bd57600080fd5b505afa1580156109d1573d6000803e3d6000fd5b505050506040513d60208110156109e757600080fd5b5051600480546001600160a01b0319166001600160a01b039092169190911790555050505050565b60035461010090046001600160a01b031681565b6006545b90565b6002805460408051602060018416156101000260001901909316849004601f8101849004840282018401909252818152929183018282801561059e5780601f106105735761010080835404028352916020019161059e565b6004546001600160a01b03163314610acb5760405162461bcd60e51b81526004018080602001828103825260328152602001806111a26032913960400191505060405180910390fd5b6000806000610ad985610c0b565b9250925092506000610af685600054610e6790919063ffffffff16565b90506000610b0386610cc4565b905081610b14576000600655610b6b565b610b67610b2083610cc4565b6001600160a01b0389166000908152600760205260409020546106dc90610b4d908563ffffffff610d2016565b610b5b610748600054610cc4565b9063ffffffff610e6716565b6006555b610b758787610ea9565b604080516001600160a01b038916815260208101889052808201879052606081018690526080810185905290517fecde08620c30706a4d7ba53e9163327f2e12a6cea2709dd6a9226fed28c2bb729181900360a00190a150505050505050565b6001600160a01b031660009081526005602052604090205490565b6001600160a01b031660009081526007602052604090205490565b6001600160a01b0381166000908152600560205260408120548190819081610c3682610b5b88610880565b9050610c428682610d91565b81610c53818363ffffffff610c6116565b909790965090945092505050565b600082820183811015610cbb576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b90505b92915050565b6000610cbe82633b9aca0063ffffffff610ee716565b6000610cbb670de0b6b3a7640000610d14610cfb868663ffffffff610ee716565b6002670de0b6b3a76400005b049063ffffffff610c6116565b9063ffffffff610f4016565b6000610cbb6b033b2e3c9fd0803ce8000000610d14610d45868663ffffffff610ee716565b60026b033b2e3c9fd0803ce8000000610d07565b600060028204610d8983610d14610d7c876b033b2e3c9fd0803ce8000000610ee7565b849063ffffffff610c6116565b949350505050565b600054610da4908263ffffffff610c6116565b60009081556001600160a01b038316815260056020526040902054610dcf908263ffffffff610c6116565b6001600160a01b0390921660009081526005602052604090209190915550565b600080610e094264ffffffffff851663ffffffff610e6716565b90506000610e21856301e1338063ffffffff610f4016565b9050610e3e82610e32610d7c610f82565b9063ffffffff610f9216565b95945050505050565b6000631dcd6500610e60633b9aca00610d148386610c61565b9392505050565b6000610cbb83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610fec565b600054610ebc908263ffffffff610e6716565b60009081556001600160a01b038316815260056020526040902054610dcf908263ffffffff610e6716565b600082610ef657506000610cbe565b82820282848281610f0357fe5b0414610cbb5760405162461bcd60e51b81526004018080602001828103825260218152602001806111816021913960400191505060405180910390fd5b6000610cbb83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611083565b6b033b2e3c9fd0803ce800000090565b600060028206610fae576b033b2e3c9fd0803ce8000000610fb0565b825b90506002820491505b8115610cbe57610fc98384610d20565b92506002820615610fe157610fde8184610d20565b90505b600282049150610fb9565b6000818484111561107b5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015611040578181015183820152602001611028565b50505050905090810190601f16801561106d5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b600081836110d25760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315611040578181015183820152602001611028565b5060008385816110de57fe5b0495945050505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061112957805160ff1916838001178555611156565b82800160010185558215611156579182015b8281111561115657825182559160200191906001019061113b565b50611162929150611166565b5090565b610a2791905b80821115611162576000815560010161116c56fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f775468652063616c6c6572206f6620746869732066756e6374696f6e206d7573742062652061206c656e64696e6720706f6f6ca26469706673582212201d4dcbdeb278fec9d6b1301234044646914fb3c644717cfd7b552a0fc5bae53f64736f6c63430006080033";
diff --git a/types/TokenDistributor.d.ts b/types/TokenDistributor.d.ts
index c77d9eaf..54871b1b 100644
--- a/types/TokenDistributor.d.ts
+++ b/types/TokenDistributor.d.ts
@@ -59,8 +59,6 @@ interface TokenDistributorInterface extends Interface {
       ]: [string, string, string, string[], BigNumberish[], string[]]): string;
     }>;
 
-    kyberProxy: TypedFunctionDescription<{ encode([]: []): string }>;
-
     recipientBurn: TypedFunctionDescription<{ encode([]: []): string }>;
 
     tokenToBurn: TypedFunctionDescription<{ encode([]: []): string }>;
@@ -161,8 +159,6 @@ export class TokenDistributor extends Contract {
       overrides?: TransactionOverrides
     ): Promise<ContractTransaction>;
 
-    kyberProxy(): Promise<string>;
-
     recipientBurn(): Promise<string>;
 
     tokenToBurn(): Promise<string>;
@@ -221,8 +217,6 @@ export class TokenDistributor extends Contract {
     overrides?: TransactionOverrides
   ): Promise<ContractTransaction>;
 
-  kyberProxy(): Promise<string>;
-
   recipientBurn(): Promise<string>;
 
   tokenToBurn(): Promise<string>;
@@ -281,8 +275,6 @@ export class TokenDistributor extends Contract {
       _tokens: string[]
     ): Promise<BigNumber>;
 
-    kyberProxy(): Promise<BigNumber>;
-
     recipientBurn(): Promise<BigNumber>;
 
     tokenToBurn(): Promise<BigNumber>;
diff --git a/types/TokenDistributorFactory.ts b/types/TokenDistributorFactory.ts
index 08311707..27a7cf33 100644
--- a/types/TokenDistributorFactory.ts
+++ b/types/TokenDistributorFactory.ts
@@ -325,19 +325,6 @@ const _abi = [
     stateMutability: "nonpayable",
     type: "function"
   },
-  {
-    inputs: [],
-    name: "kyberProxy",
-    outputs: [
-      {
-        internalType: "contract IKyberNetworkProxyInterface",
-        name: "",
-        type: "address"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
   {
     inputs: [],
     name: "recipientBurn",
@@ -371,4 +358,4 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x6080604052600060015534801561001557600080fd5b506001600055611b6c8061002a6000396000f3fe6080604052600436106100f75760003560e01c80636138889b1161008a578063cc8cc9d811610059578063cc8cc9d8146105b8578063e5b5019a146106e8578063eed64c30146106fd578063f0eeed811461082d576100fe565b80636138889b146102725780637623bac5146103225780638c0c9a25146104f557806393ed43091461050a576100fe565b806323879bb1116100c657806323879bb11461021e5780632cbcda251461023357806340d58a4a146102485780634f1b86eb1461025d576100fe565b8063043c41d414610103578063135206581461012a5780631cced51b1461013f578063217ab806146101ed576100fe565b366100fe57005b600080fd5b34801561010f57600080fd5b50610118610842565b60408051918252519081900360200190f35b34801561013657600080fd5b50610118610848565b34801561014b57600080fd5b5061015461084e565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b83811015610198578181015183820152602001610180565b50505050905001838103825284818151815260200191508051906020019060200280838360005b838110156101d75781810151838201526020016101bf565b5050505090500194505050505060405180910390f35b3480156101f957600080fd5b5061020261090b565b604080516001600160a01b039092168252519081900360200190f35b34801561022a57600080fd5b5061011861091a565b34801561023f57600080fd5b5061020261091f565b34801561025457600080fd5b5061011861092e565b34801561026957600080fd5b50610202610933565b34801561027e57600080fd5b506103206004803603602081101561029557600080fd5b810190602081018135600160201b8111156102af57600080fd5b8201836020820111156102c157600080fd5b803590602001918460208302840111600160201b831117156102e257600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610942945050505050565b005b34801561032e57600080fd5b50610320600480360360c081101561034557600080fd5b6001600160a01b0382358116926020810135821692604082013590921691810190608081016060820135600160201b81111561038057600080fd5b82018360208201111561039257600080fd5b803590602001918460208302840111600160201b831117156103b357600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b81111561040257600080fd5b82018360208201111561041457600080fd5b803590602001918460208302840111600160201b8311171561043557600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b81111561048457600080fd5b82018360208201111561049657600080fd5b803590602001918460208302840111600160201b831117156104b757600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610a5b945050505050565b34801561050157600080fd5b50610202610b9a565b34801561051657600080fd5b506103206004803603602081101561052d57600080fd5b810190602081018135600160201b81111561054757600080fd5b82018360208201111561055957600080fd5b803590602001918460208302840111600160201b8311171561057a57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610bb2945050505050565b3480156105c457600080fd5b50610320600480360360408110156105db57600080fd5b810190602081018135600160201b8111156105f557600080fd5b82018360208201111561060757600080fd5b803590602001918460208302840111600160201b8311171561062857600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b81111561067757600080fd5b82018360208201111561068957600080fd5b803590602001918460208302840111600160201b831117156106aa57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610ce4945050505050565b3480156106f457600080fd5b50610118610d2d565b34801561070957600080fd5b506103206004803603604081101561072057600080fd5b810190602081018135600160201b81111561073a57600080fd5b82018360208201111561074c57600080fd5b803590602001918460208302840111600160201b8311171561076d57600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b8111156107bc57600080fd5b8201836020820111156107ce57600080fd5b803590602001918460208302840111600160201b831117156107ef57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610d33945050505050565b34801561083957600080fd5b50610202610e97565b60011981565b61271081565b60608060356000018054806020026020016040519081016040528092919081815260200182805480156108aa57602002820191906000526020600020905b81546001600160a01b0316815260019091019060200180831161088c575b50505050509150603560010180548060200260200160405190810160405280929190818152602001828054801561090057602002820191906000526020600020905b8154815260200190600101908083116108ec575b505050505090509091565b6039546001600160a01b031681565b600381565b603a546001600160a01b031681565b600181565b6038546001600160a01b031681565b60005b8151811015610a57576000610958610ea6565b6001600160a01b031683838151811061096d57fe5b60200260200101516001600160a01b0316141561098a5747610a20565b82828151811061099657fe5b60200260200101516001600160a01b03166370a08231306040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156109f357600080fd5b505afa158015610a07573d6000803e3d6000fd5b505050506040513d6020811015610a1d57600080fd5b50515b905060008111610a305750610a4f565b610a4d838381518110610a3f57fe5b602002602001015182610ebf565b505b600101610945565b5050565b6000610a6561131f565b60025490915060ff1680610a7c5750610a7c611324565b80610a88575060015481115b610ac35760405162461bcd60e51b815260040180806020018281038252602e815260200180611aa6602e913960400191505060405180910390fd5b60025460ff16158015610ae4576002805460ff191660019081179091558290555b603980546001600160a01b03808b166001600160a01b031992831617909255603880548a8416908316179055603a805492891692909116919091179055610b2b858561132a565b610b3483610bb2565b604080516001600160a01b03808a16825280891660208301528a168183015290517f99566d155bc7902033d8db6b0f091f12209d9651abdae3aad004632bd3e657b59181900360600190a18015610b90576002805460ff191690555b5050505050505050565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee81565b603a546040516020602482018181528451604484015284516000946001600160a01b0316936393ed430960e01b9387939283926064019180860191028083838b5b83811015610c0b578181015183820152602001610bf3565b5050505090500192505050604051602081830303815290604052906001600160e01b0319166020820180516001600160e01b0383818316178352505050506040518082805190602001908083835b60208310610c785780518252601f199092019160209182019101610c59565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d8060008114610cd8576040519150601f19603f3d011682016040523d82523d6000602084013e610cdd565b606091505b5050505050565b60005b8251811015610d2857610d20838281518110610cff57fe5b6020026020010151838381518110610d1357fe5b6020026020010151610ebf565b600101610ce7565b505050565b60001981565b60005b8251811015610d28576000610d49610ea6565b6001600160a01b0316848381518110610d5e57fe5b60200260200101516001600160a01b03161415610db157610dac6064610da0858581518110610d8957fe5b60200260200101514761148490919063ffffffff16565b9063ffffffff6114e616565b610e6e565b610e6e6064610da0858581518110610dc557fe5b6020026020010151878681518110610dd957fe5b60200260200101516001600160a01b03166370a08231306040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015610e3657600080fd5b505afa158015610e4a573d6000803e3d6000fd5b505050506040513d6020811015610e6057600080fd5b50519063ffffffff61148416565b905060008111610e7e5750610e8f565b610e8d848381518110610a3f57fe5b505b600101610d36565b6037546001600160a01b031681565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee5b90565b81610ec8611980565b604080516035805460606020820284018101855293830181815292939192849290918491840182828015610f2557602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311610f07575b5050505050815260200160018201805480602002602001604051908101604052809291908181526020018280548015610f7d57602002820191906000526020600020905b815481526020019060010190808311610f69575b505050505081525050905060008090505b815151811015610cdd576000610fca612710610da085602001518581518110610fb357fe5b60200260200101518861148490919063ffffffff16565b905080610fd75750611317565b825180516000919084908110610fe957fe5b60200260200101516001600160a01b03161461119757611007610ea6565b6001600160a01b0316846001600160a01b031614611059576110548360000151838151811061103257fe5b602002602001015182886001600160a01b03166115289092919063ffffffff16565b611118565b60008360000151838151811061106b57fe5b60200260200101516001600160a01b03168260405180600001905060006040518083038185875af1925050503d80600081146110c3576040519150601f19603f3d011682016040523d82523d6000602084013e6110c8565b606091505b5050905080611116576040805162461bcd60e51b81526020600482015260156024820152742932bb32b93a32b21022aa24103a3930b739b332b960591b604482015290519081900360640190fd5b505b7f60ce3cc2d133631eac66a476f14997a9fa682bd05a60dd993cf02285822d78d88360000151838151811061114957fe5b60200260200101518460200151848151811061116157fe5b602090810291909101810151604080516001600160a01b03909416845291830152818101849052519081900360600190a1611315565b60385481906001600160a01b0386811691161461130a57603a54603854604080516001600160a01b038981166024830152928316604482015260648101869052600a6084808301919091528251808303909101815260a490910182526020810180516001600160e01b0316630ed2fc9560e01b17815291518151600095606095169382918083835b6020831061123e5780518252601f19909201916020918201910161121f565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d806000811461129e576040519150601f19603f3d011682016040523d82523d6000602084013e6112a3565b606091505b5091509150816112ee576040805162461bcd60e51b81526020600482015260116024820152704552524f525f4f4e5f45584348414e474560781b604482015290519081900360640190fd5b80806020019051602081101561130357600080fd5b5051925050505b6113138161157a565b505b505b600101610f8e565b600390565b303b1590565b8051825114611380576040805162461bcd60e51b815260206004820152601d60248201527f4172726179206c656e677468732073686f756c6420626520657175616c000000604482015290519081900360640190fd5b60408051808201909152828152602080820183905283516035916113a891839187019061199a565b5060208281015180516113c192600185019201906119ff565b509050507fdc9f439f707945ade720b0154668dd64af0689fb88b40abdb0f0289156d23e9d8282604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b8381101561142c578181015183820152602001611414565b50505050905001838103825284818151815260200191508051906020019060200280838360005b8381101561146b578181015183820152602001611453565b5050505090500194505050505060405180910390a15050565b600082611493575060006114e0565b828202828482816114a057fe5b04146114dd5760405162461bcd60e51b8152600401808060200182810382526021815260200180611a856021913960400191505060405180910390fd5b90505b92915050565b60006114dd83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611670565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b179052610d28908490611712565b6038546039546040805163a9059cbb60e01b81526001600160a01b039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b1580156115d357600080fd5b505af11580156115e7573d6000803e3d6000fd5b505050506040513d60208110156115fd57600080fd5b505161163a5760405162461bcd60e51b8152600401808060200182810382526039815260200180611ad46039913960400191505060405180910390fd5b6040805182815290517fb90306ad06b2a6ff86ddc9327db583062895ef6540e62dc50add009db5b356eb9181900360200190a150565b600081836116fc5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b838110156116c15781810151838201526020016116a9565b50505050905090810190601f1680156116ee5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b50600083858161170857fe5b0495945050505050565b6060611767826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166117c39092919063ffffffff16565b805190915015610d285780806020019051602081101561178657600080fd5b5051610d285760405162461bcd60e51b815260040180806020018281038252602a815260200180611b0d602a913960400191505060405180910390fd5b60606117d284846000856117da565b949350505050565b60606117e585611947565b611836576040805162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015290519081900360640190fd5b60006060866001600160a01b031685876040518082805190602001908083835b602083106118755780518252601f199092019160209182019101611856565b6001836020036101000a03801982511681845116808217855250505050505090500191505060006040518083038185875af1925050503d80600081146118d7576040519150601f19603f3d011682016040523d82523d6000602084013e6118dc565b606091505b509150915081156118f05791506117d29050565b8051156119005780518082602001fd5b60405162461bcd60e51b81526020600482018181528651602484015286518793919283926044019190850190808383600083156116c15781810151838201526020016116a9565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4708181148015906117d2575050151592915050565b604051806040016040528060608152602001606081525090565b8280548282559060005260206000209081019282156119ef579160200282015b828111156119ef57825182546001600160a01b0319166001600160a01b039091161782556020909201916001909101906119ba565b506119fb929150611a46565b5090565b828054828255906000526020600020908101928215611a3a579160200282015b82811115611a3a578251825591602001919060010190611a1f565b506119fb929150611a6a565b610ebc91905b808211156119fb5780546001600160a01b0319168155600101611a4c565b610ebc91905b808211156119fb5760008155600101611a7056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564494e5445524e414c5f4255524e2e205265766572746564207472616e7366657220746f20726563697069656e744275726e20616464726573735361666545524332303a204552433230206f7065726174696f6e20646964206e6f742073756363656564a264697066735822122035a20ada772bf4f6780153fa9490a660ce1eb7d82735616c82f417f8e01a0dda64736f6c63430006080033";
+  "0x6080604052600060015534801561001557600080fd5b506001600055611b3d8061002a6000396000f3fe6080604052600436106100ec5760003560e01c80634f1b86eb1161008a57806393ed43091161005957806393ed4309146104ff578063cc8cc9d8146105ad578063e5b5019a146106dd578063eed64c30146106f2576100f3565b80634f1b86eb146102525780636138889b146102675780637623bac5146103175780638c0c9a25146104ea576100f3565b8063217ab806116100c6578063217ab806146101e257806323879bb1146102135780632cbcda251461022857806340d58a4a1461023d576100f3565b8063043c41d4146100f8578063135206581461011f5780631cced51b14610134576100f3565b366100f357005b600080fd5b34801561010457600080fd5b5061010d610822565b60408051918252519081900360200190f35b34801561012b57600080fd5b5061010d610828565b34801561014057600080fd5b5061014961082e565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b8381101561018d578181015183820152602001610175565b50505050905001838103825284818151815260200191508051906020019060200280838360005b838110156101cc5781810151838201526020016101b4565b5050505090500194505050505060405180910390f35b3480156101ee57600080fd5b506101f76108eb565b604080516001600160a01b039092168252519081900360200190f35b34801561021f57600080fd5b5061010d6108fa565b34801561023457600080fd5b506101f76108ff565b34801561024957600080fd5b5061010d61090e565b34801561025e57600080fd5b506101f7610913565b34801561027357600080fd5b506103156004803603602081101561028a57600080fd5b810190602081018135600160201b8111156102a457600080fd5b8201836020820111156102b657600080fd5b803590602001918460208302840111600160201b831117156102d757600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610922945050505050565b005b34801561032357600080fd5b50610315600480360360c081101561033a57600080fd5b6001600160a01b0382358116926020810135821692604082013590921691810190608081016060820135600160201b81111561037557600080fd5b82018360208201111561038757600080fd5b803590602001918460208302840111600160201b831117156103a857600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b8111156103f757600080fd5b82018360208201111561040957600080fd5b803590602001918460208302840111600160201b8311171561042a57600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b81111561047957600080fd5b82018360208201111561048b57600080fd5b803590602001918460208302840111600160201b831117156104ac57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610a3b945050505050565b3480156104f657600080fd5b506101f7610b7a565b34801561050b57600080fd5b506103156004803603602081101561052257600080fd5b810190602081018135600160201b81111561053c57600080fd5b82018360208201111561054e57600080fd5b803590602001918460208302840111600160201b8311171561056f57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610b92945050505050565b3480156105b957600080fd5b50610315600480360360408110156105d057600080fd5b810190602081018135600160201b8111156105ea57600080fd5b8201836020820111156105fc57600080fd5b803590602001918460208302840111600160201b8311171561061d57600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b81111561066c57600080fd5b82018360208201111561067e57600080fd5b803590602001918460208302840111600160201b8311171561069f57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610cc4945050505050565b3480156106e957600080fd5b5061010d610d0d565b3480156106fe57600080fd5b506103156004803603604081101561071557600080fd5b810190602081018135600160201b81111561072f57600080fd5b82018360208201111561074157600080fd5b803590602001918460208302840111600160201b8311171561076257600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b8111156107b157600080fd5b8201836020820111156107c357600080fd5b803590602001918460208302840111600160201b831117156107e457600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610d13945050505050565b60011981565b61271081565b606080603560000180548060200260200160405190810160405280929190818152602001828054801561088a57602002820191906000526020600020905b81546001600160a01b0316815260019091019060200180831161086c575b5050505050915060356001018054806020026020016040519081016040528092919081815260200182805480156108e057602002820191906000526020600020905b8154815260200190600101908083116108cc575b505050505090509091565b6038546001600160a01b031681565b600381565b6039546001600160a01b031681565b600181565b6037546001600160a01b031681565b60005b8151811015610a37576000610938610e77565b6001600160a01b031683838151811061094d57fe5b60200260200101516001600160a01b0316141561096a5747610a00565b82828151811061097657fe5b60200260200101516001600160a01b03166370a08231306040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156109d357600080fd5b505afa1580156109e7573d6000803e3d6000fd5b505050506040513d60208110156109fd57600080fd5b50515b905060008111610a105750610a2f565b610a2d838381518110610a1f57fe5b602002602001015182610e90565b505b600101610925565b5050565b6000610a456112f0565b60025490915060ff1680610a5c5750610a5c6112f5565b80610a68575060015481115b610aa35760405162461bcd60e51b815260040180806020018281038252602e815260200180611a77602e913960400191505060405180910390fd5b60025460ff16158015610ac4576002805460ff191660019081179091558290555b603880546001600160a01b03808b166001600160a01b031992831617909255603780548a84169083161790556039805492891692909116919091179055610b0b85856112fb565b610b1483610b92565b604080516001600160a01b03808a16825280891660208301528a168183015290517f99566d155bc7902033d8db6b0f091f12209d9651abdae3aad004632bd3e657b59181900360600190a18015610b70576002805460ff191690555b5050505050505050565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee81565b6039546040516020602482018181528451604484015284516000946001600160a01b0316936393ed430960e01b9387939283926064019180860191028083838b5b83811015610beb578181015183820152602001610bd3565b5050505090500192505050604051602081830303815290604052906001600160e01b0319166020820180516001600160e01b0383818316178352505050506040518082805190602001908083835b60208310610c585780518252601f199092019160209182019101610c39565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d8060008114610cb8576040519150601f19603f3d011682016040523d82523d6000602084013e610cbd565b606091505b5050505050565b60005b8251811015610d0857610d00838281518110610cdf57fe5b6020026020010151838381518110610cf357fe5b6020026020010151610e90565b600101610cc7565b505050565b60001981565b60005b8251811015610d08576000610d29610e77565b6001600160a01b0316848381518110610d3e57fe5b60200260200101516001600160a01b03161415610d9157610d8c6064610d80858581518110610d6957fe5b60200260200101514761145590919063ffffffff16565b9063ffffffff6114b716565b610e4e565b610e4e6064610d80858581518110610da557fe5b6020026020010151878681518110610db957fe5b60200260200101516001600160a01b03166370a08231306040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015610e1657600080fd5b505afa158015610e2a573d6000803e3d6000fd5b505050506040513d6020811015610e4057600080fd5b50519063ffffffff61145516565b905060008111610e5e5750610e6f565b610e6d848381518110610a1f57fe5b505b600101610d16565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee5b90565b81610e99611951565b604080516035805460606020820284018101855293830181815292939192849290918491840182828015610ef657602002820191906000526020600020905b81546001600160a01b03168152600190910190602001808311610ed8575b5050505050815260200160018201805480602002602001604051908101604052809291908181526020018280548015610f4e57602002820191906000526020600020905b815481526020019060010190808311610f3a575b505050505081525050905060008090505b815151811015610cbd576000610f9b612710610d8085602001518581518110610f8457fe5b60200260200101518861145590919063ffffffff16565b905080610fa857506112e8565b825180516000919084908110610fba57fe5b60200260200101516001600160a01b03161461116857610fd8610e77565b6001600160a01b0316846001600160a01b03161461102a576110258360000151838151811061100357fe5b602002602001015182886001600160a01b03166114f99092919063ffffffff16565b6110e9565b60008360000151838151811061103c57fe5b60200260200101516001600160a01b03168260405180600001905060006040518083038185875af1925050503d8060008114611094576040519150601f19603f3d011682016040523d82523d6000602084013e611099565b606091505b50509050806110e7576040805162461bcd60e51b81526020600482015260156024820152742932bb32b93a32b21022aa24103a3930b739b332b960591b604482015290519081900360640190fd5b505b7f60ce3cc2d133631eac66a476f14997a9fa682bd05a60dd993cf02285822d78d88360000151838151811061111a57fe5b60200260200101518460200151848151811061113257fe5b602090810291909101810151604080516001600160a01b03909416845291830152818101849052519081900360600190a16112e6565b60375481906001600160a01b038681169116146112db57603954603754604080516001600160a01b038981166024830152928316604482015260648101869052600a6084808301919091528251808303909101815260a490910182526020810180516001600160e01b0316630ed2fc9560e01b17815291518151600095606095169382918083835b6020831061120f5780518252601f1990920191602091820191016111f0565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d806000811461126f576040519150601f19603f3d011682016040523d82523d6000602084013e611274565b606091505b5091509150816112bf576040805162461bcd60e51b81526020600482015260116024820152704552524f525f4f4e5f45584348414e474560781b604482015290519081900360640190fd5b8080602001905160208110156112d457600080fd5b5051925050505b6112e48161154b565b505b505b600101610f5f565b600390565b303b1590565b8051825114611351576040805162461bcd60e51b815260206004820152601d60248201527f4172726179206c656e677468732073686f756c6420626520657175616c000000604482015290519081900360640190fd5b604080518082019091528281526020808201839052835160359161137991839187019061196b565b50602082810151805161139292600185019201906119d0565b509050507fdc9f439f707945ade720b0154668dd64af0689fb88b40abdb0f0289156d23e9d8282604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b838110156113fd5781810151838201526020016113e5565b50505050905001838103825284818151815260200191508051906020019060200280838360005b8381101561143c578181015183820152602001611424565b5050505090500194505050505060405180910390a15050565b600082611464575060006114b1565b8282028284828161147157fe5b04146114ae5760405162461bcd60e51b8152600401808060200182810382526021815260200180611a566021913960400191505060405180910390fd5b90505b92915050565b60006114ae83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611641565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b179052610d089084906116e3565b6037546038546040805163a9059cbb60e01b81526001600160a01b039283166004820152602481018590529051919092169163a9059cbb9160448083019260209291908290030181600087803b1580156115a457600080fd5b505af11580156115b8573d6000803e3d6000fd5b505050506040513d60208110156115ce57600080fd5b505161160b5760405162461bcd60e51b8152600401808060200182810382526039815260200180611aa56039913960400191505060405180910390fd5b6040805182815290517fb90306ad06b2a6ff86ddc9327db583062895ef6540e62dc50add009db5b356eb9181900360200190a150565b600081836116cd5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b8381101561169257818101518382015260200161167a565b50505050905090810190601f1680156116bf5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b5060008385816116d957fe5b0495945050505050565b6060611738826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166117949092919063ffffffff16565b805190915015610d085780806020019051602081101561175757600080fd5b5051610d085760405162461bcd60e51b815260040180806020018281038252602a815260200180611ade602a913960400191505060405180910390fd5b60606117a384846000856117ab565b949350505050565b60606117b685611918565b611807576040805162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015290519081900360640190fd5b60006060866001600160a01b031685876040518082805190602001908083835b602083106118465780518252601f199092019160209182019101611827565b6001836020036101000a03801982511681845116808217855250505050505090500191505060006040518083038185875af1925050503d80600081146118a8576040519150601f19603f3d011682016040523d82523d6000602084013e6118ad565b606091505b509150915081156118c15791506117a39050565b8051156118d15780518082602001fd5b60405162461bcd60e51b815260206004820181815286516024840152865187939192839260440191908501908083836000831561169257818101518382015260200161167a565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4708181148015906117a3575050151592915050565b604051806040016040528060608152602001606081525090565b8280548282559060005260206000209081019282156119c0579160200282015b828111156119c057825182546001600160a01b0319166001600160a01b0390911617825560209092019160019091019061198b565b506119cc929150611a17565b5090565b828054828255906000526020600020908101928215611a0b579160200282015b82811115611a0b5782518255916020019190600101906119f0565b506119cc929150611a3b565b610e8d91905b808211156119cc5780546001600160a01b0319168155600101611a1d565b610e8d91905b808211156119cc5760008155600101611a4156fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77436f6e747261637420696e7374616e63652068617320616c7265616479206265656e20696e697469616c697a6564494e5445524e414c5f4255524e2e205265766572746564207472616e7366657220746f20726563697069656e744275726e20616464726573735361666545524332303a204552433230206f7065726174696f6e20646964206e6f742073756363656564a2646970667358221220e20d3b8f737aa7807364c256c9a889dcb122806041d81aa2809c7466bcd0f08e64736f6c63430006080033";
diff --git a/types/VariableDebtToken.d.ts b/types/VariableDebtToken.d.ts
index 29a962db..b4d18248 100644
--- a/types/VariableDebtToken.d.ts
+++ b/types/VariableDebtToken.d.ts
@@ -34,6 +34,10 @@ interface VariableDebtTokenInterface extends Interface {
       encode([spender, subtractedValue]: [string, BigNumberish]): string;
     }>;
 
+    getUserIndex: TypedFunctionDescription<{
+      encode([_user]: [string]): string;
+    }>;
+
     increaseAllowance: TypedFunctionDescription<{
       encode([spender, addedValue]: [string, BigNumberish]): string;
     }>;
@@ -161,6 +165,8 @@ export class VariableDebtToken extends Contract {
       overrides?: TransactionOverrides
     ): Promise<ContractTransaction>;
 
+    getUserIndex(_user: string): Promise<BigNumber>;
+
     increaseAllowance(
       spender: string,
       addedValue: BigNumberish,
@@ -230,6 +236,8 @@ export class VariableDebtToken extends Contract {
     overrides?: TransactionOverrides
   ): Promise<ContractTransaction>;
 
+  getUserIndex(_user: string): Promise<BigNumber>;
+
   increaseAllowance(
     spender: string,
     addedValue: BigNumberish,
@@ -318,6 +326,8 @@ export class VariableDebtToken extends Contract {
       subtractedValue: BigNumberish
     ): Promise<BigNumber>;
 
+    getUserIndex(_user: string): Promise<BigNumber>;
+
     increaseAllowance(
       spender: string,
       addedValue: BigNumberish
diff --git a/types/VariableDebtTokenFactory.ts b/types/VariableDebtTokenFactory.ts
index 2c5d5b6a..5825ecd2 100644
--- a/types/VariableDebtTokenFactory.ts
+++ b/types/VariableDebtTokenFactory.ts
@@ -292,6 +292,25 @@ const _abi = [
     stateMutability: "nonpayable",
     type: "function"
   },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "_user",
+        type: "address"
+      }
+    ],
+    name: "getUserIndex",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [
       {
@@ -494,4 +513,4 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x608060405234801561001057600080fd5b50611108806100206000396000f3fe608060405234801561001057600080fd5b50600436106101005760003560e01c806381e7527711610097578063a457c2d711610066578063a457c2d714610230578063a9059cbb1461044f578063c634dfaa1461047b578063dd62ed3e146104a157610100565b806381e75277146102b057806389d1a0fc146103f757806395d89b411461041b5780639dc29fac1461042357610100565b8063313ce567116100d3578063313ce56714610212578063395093511461023057806340c10f191461025c57806370a082311461028a57610100565b806306fdde0314610105578063095ea7b31461018257806318160ddd146101c257806323b872dd146101dc575b600080fd5b61010d6104cf565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561014757818101518382015260200161012f565b50505050905090810190601f1680156101745780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101ae6004803603604081101561019857600080fd5b506001600160a01b03813516906020013561055c565b604080519115158252519081900360200190f35b6101ca6105a4565b60408051918252519081900360200190f35b6101ae600480360360608110156101f257600080fd5b506001600160a01b038135811691602081013590911690604001356105aa565b61021a6105f2565b6040805160ff9092168252519081900360200190f35b6101ae6004803603604081101561024657600080fd5b506001600160a01b0381351690602001356105fb565b6102886004803603604081101561027257600080fd5b506001600160a01b03813516906020013561064a565b005b6101ca600480360360208110156102a057600080fd5b50356001600160a01b031661074e565b610288600480360360a08110156102c657600080fd5b8101906020810181356401000000008111156102e157600080fd5b8201836020820111156102f357600080fd5b8035906020019184600183028401116401000000008311171561031557600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929594936020810193503591505064010000000081111561036857600080fd5b82018360208201111561037a57600080fd5b8035906020019184600183028401116401000000008311171561039c57600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295505060ff8335169350506001600160a01b03602083013581169260400135169050610813565b6103ff6108f8565b604080516001600160a01b039092168252519081900360200190f35b61010d61090c565b6102886004803603604081101561043957600080fd5b506001600160a01b038135169060200135610964565b6101ae6004803603604081101561046557600080fd5b506001600160a01b0381351690602001356105aa565b6101ca6004803603602081101561049157600080fd5b50356001600160a01b0316610a34565b6101ca600480360360408110156104b757600080fd5b506001600160a01b03813581169160200135166105fb565b60018054604080516020600284861615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156105545780601f1061052957610100808354040283529160200191610554565b820191906000526020600020905b81548152906001019060200180831161053757829003601f168201915b505050505081565b6040805162461bcd60e51b81526020600482015260166024820152751054141493d5905317d393d517d4d5541413d495115160521b6044820152905160009181900360640190fd5b60005481565b6040805162461bcd60e51b81526020600482015260166024820152751514905394d1915497d393d517d4d5541413d495115160521b6044820152905160009181900360640190fd5b60035460ff1681565b6040805162461bcd60e51b815260206004820152601760248201527f414c4c4f57414e43455f4e4f545f535550504f525445440000000000000000006044820152905160009181900360640190fd5b6004546001600160a01b031633146106935760405162461bcd60e51b81526004018080602001828103825260328152602001806110a16032913960400191505060405180910390fd5b6106c76040518060400160405280601381526020017226b4b73a34b733903732bb903232b13a17171760691b815250610a4f565b6000806000806106d686610b91565b93509350935093506106e88686610c9b565b604080516001600160a01b038816815260208101879052808201869052606081018590526080810184905260a0810183905290517f94ba3ac5ed6fee7b49ed817c5ee964eed9bd5da6860344f95fc56997e920381d9181900360c00190a1505050505050565b600480546003546040805163386497fd60e01b81526001600160a01b036101009093048316948101949094525160009361080d9361080893169163386497fd91602480820192602092909190829003018186803b1580156107ae57600080fd5b505afa1580156107c2573d6000803e3d6000fd5b505050506040513d60208110156107d857600080fd5b50516001600160a01b0385166000908152600560205260409020546107fc90610cf9565b9063ffffffff610d0f16565b610d5a565b92915050565b8451610826906001906020880190610fe4565b50835161083a906002906020870190610fe4565b506003805460ff191660ff851617610100600160a81b0319166101006001600160a01b03858116919091029190911790915560408051630261bf8b60e01b8152905191831691630261bf8b91600480820192602092909190829003018186803b1580156108a657600080fd5b505afa1580156108ba573d6000803e3d6000fd5b505050506040513d60208110156108d057600080fd5b5051600480546001600160a01b0319166001600160a01b039092169190911790555050505050565b60035461010090046001600160a01b031681565b6002805460408051602060018416156101000260001901909316849004601f810184900484028201840190925281815292918301828280156105545780601f1061052957610100808354040283529160200191610554565b6004546001600160a01b031633146109ad5760405162461bcd60e51b81526004018080602001828103825260328152602001806110a16032913960400191505060405180910390fd5b6000806000806109bc86610b91565b93509350935093506109ce8686610d73565b604080516001600160a01b038816815260208101879052808201869052606081018590526080810184905260a0810183905290517fc57f977ee00c44453a91f798753002bf12fca5f5ca2ee8db560720f51d4b0f629181900360c00190a1505050505050565b6001600160a01b031660009081526005602052604090205490565b6040516020602482018181528351604484015283516000936a636f6e736f6c652e6c6f67938693928392606401918501908083838a5b83811015610a9d578181015183820152602001610a85565b50505050905090810190601f168015610aca5780820380516001836020036101000a031916815260200191505b5060408051601f198184030181529181526020820180516001600160e01b031663104c13eb60e21b178152905182519295509350839250908083835b60208310610b255780518252601f199092019160209182019101610b06565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855afa9150503d8060008114610b85576040519150601f19603f3d011682016040523d82523d6000602084013e610b8a565b606091505b5050505050565b6001600160a01b03811660009081526005602052604081205481908190819081610bca82610bbe8961074e565b9063ffffffff610db116565b9050610bd68782610c9b565b600480546003546040805163386497fd60e01b81526101009092046001600160a01b0390811694830194909452516000939092169163386497fd91602480820192602092909190829003018186803b158015610c3157600080fd5b505afa158015610c45573d6000803e3d6000fd5b505050506040513d6020811015610c5b57600080fd5b50516001600160a01b0389166000908152600660205260409020819055905082610c8b818463ffffffff610df316565b9099909850919650945092505050565b600054610cae908263ffffffff610df316565b60009081556001600160a01b038316815260056020526040902054610cd9908263ffffffff610df316565b6001600160a01b0390921660009081526005602052604090209190915550565b600061080d82633b9aca0063ffffffff610e4d16565b6000610d536b033b2e3c9fd0803ce8000000610d47610d34868663ffffffff610e4d16565b6b019d971e4fe8401e7400000090610df3565b9063ffffffff610ea616565b9392505050565b6000631dcd6500610d53633b9aca00610d478386610df3565b600054610d86908263ffffffff610db116565b60009081556001600160a01b038316815260056020526040902054610cd9908263ffffffff610db116565b6000610d5383836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610ee8565b600082820183811015610d53576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600082610e5c5750600061080d565b82820282848281610e6957fe5b0414610d535760405162461bcd60e51b81526004018080602001828103825260218152602001806110806021913960400191505060405180910390fd5b6000610d5383836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250610f7f565b60008184841115610f775760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610f3c578181015183820152602001610f24565b50505050905090810190601f168015610f695780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b60008183610fce5760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610f3c578181015183820152602001610f24565b506000838581610fda57fe5b0495945050505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061102557805160ff1916838001178555611052565b82800160010185558215611052579182015b82811115611052578251825591602001919060010190611037565b5061105e929150611062565b5090565b61107c91905b8082111561105e5760008155600101611068565b9056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f775468652063616c6c6572206f6620746869732066756e6374696f6e206d7573742062652061206c656e64696e6720706f6f6ca26469706673582212204c2bf36af6a35e2546511ab6fb27daba24d543cbbcbdc6ce06967b9c721ad9c264736f6c63430006080033";
+  "0x608060405234801561001057600080fd5b5061100b806100206000396000f3fe608060405234801561001057600080fd5b506004361061010b5760003560e01c806381e75277116100a2578063a457c2d711610071578063a457c2d71461023b578063a9059cbb1461045a578063c634dfaa14610486578063dd62ed3e146104ac578063ee9907a4146104da5761010b565b806381e75277146102bb57806389d1a0fc1461040257806395d89b41146104265780639dc29fac1461042e5761010b565b8063313ce567116100de578063313ce5671461021d578063395093511461023b57806340c10f191461026757806370a08231146102955761010b565b806306fdde0314610110578063095ea7b31461018d57806318160ddd146101cd57806323b872dd146101e7575b600080fd5b610118610500565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561015257818101518382015260200161013a565b50505050905090810190601f16801561017f5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6101b9600480360360408110156101a357600080fd5b506001600160a01b03813516906020013561058d565b604080519115158252519081900360200190f35b6101d56105d5565b60408051918252519081900360200190f35b6101b9600480360360608110156101fd57600080fd5b506001600160a01b038135811691602081013590911690604001356105db565b610225610623565b6040805160ff9092168252519081900360200190f35b6101b96004803603604081101561025157600080fd5b506001600160a01b03813516906020013561062c565b6102936004803603604081101561027d57600080fd5b506001600160a01b03813516906020013561067b565b005b6101d5600480360360208110156102ab57600080fd5b50356001600160a01b031661074b565b610293600480360360a08110156102d157600080fd5b8101906020810181356401000000008111156102ec57600080fd5b8201836020820111156102fe57600080fd5b8035906020019184600183028401116401000000008311171561032057600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929594936020810193503591505064010000000081111561037357600080fd5b82018360208201111561038557600080fd5b803590602001918460018302840111640100000000831117156103a757600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295505060ff8335169350506001600160a01b03602083013581169260400135169050610834565b61040a610919565b604080516001600160a01b039092168252519081900360200190f35b61011861092d565b6102936004803603604081101561044457600080fd5b506001600160a01b038135169060200135610985565b6101b96004803603604081101561047057600080fd5b506001600160a01b0381351690602001356105db565b6101d56004803603602081101561049c57600080fd5b50356001600160a01b0316610a55565b6101d5600480360360408110156104c257600080fd5b506001600160a01b038135811691602001351661062c565b6101d5600480360360208110156104f057600080fd5b50356001600160a01b0316610a70565b60018054604080516020600284861615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156105855780601f1061055a57610100808354040283529160200191610585565b820191906000526020600020905b81548152906001019060200180831161056857829003601f168201915b505050505081565b6040805162461bcd60e51b81526020600482015260166024820152751054141493d5905317d393d517d4d5541413d495115160521b6044820152905160009181900360640190fd5b60005481565b6040805162461bcd60e51b81526020600482015260166024820152751514905394d1915497d393d517d4d5541413d495115160521b6044820152905160009181900360640190fd5b60035460ff1681565b6040805162461bcd60e51b815260206004820152601760248201527f414c4c4f57414e43455f4e4f545f535550504f525445440000000000000000006044820152905160009181900360640190fd5b6004546001600160a01b031633146106c45760405162461bcd60e51b8152600401808060200182810382526032815260200180610fa46032913960400191505060405180910390fd5b6000806000806106d386610a8b565b93509350935093506106e58686610b95565b604080516001600160a01b038816815260208101879052808201869052606081018590526080810184905260a0810183905290517f94ba3ac5ed6fee7b49ed817c5ee964eed9bd5da6860344f95fc56997e920381d9181900360c00190a1505050505050565b6001600160a01b0381166000908152600560205260408120546107705750600061082f565b600480546003546040805163386497fd60e01b81526101009092046001600160a01b03908116948301949094525161082c9361082793169163386497fd916024808301926020929190829003018186803b1580156107cd57600080fd5b505afa1580156107e1573d6000803e3d6000fd5b505050506040513d60208110156107f757600080fd5b50516001600160a01b03851660009081526005602052604090205461081b90610bf3565b9063ffffffff610c0916565b610c56565b90505b919050565b8451610847906001906020880190610ee7565b50835161085b906002906020870190610ee7565b506003805460ff191660ff851617610100600160a81b0319166101006001600160a01b03858116919091029190911790915560408051630261bf8b60e01b8152905191831691630261bf8b91600480820192602092909190829003018186803b1580156108c757600080fd5b505afa1580156108db573d6000803e3d6000fd5b505050506040513d60208110156108f157600080fd5b5051600480546001600160a01b0319166001600160a01b039092169190911790555050505050565b60035461010090046001600160a01b031681565b6002805460408051602060018416156101000260001901909316849004601f810184900484028201840190925281815292918301828280156105855780601f1061055a57610100808354040283529160200191610585565b6004546001600160a01b031633146109ce5760405162461bcd60e51b8152600401808060200182810382526032815260200180610fa46032913960400191505060405180910390fd5b6000806000806109dd86610a8b565b93509350935093506109ef8686610c76565b604080516001600160a01b038816815260208101879052808201869052606081018590526080810184905260a0810183905290517fc57f977ee00c44453a91f798753002bf12fca5f5ca2ee8db560720f51d4b0f629181900360c00190a1505050505050565b6001600160a01b031660009081526005602052604090205490565b6001600160a01b031660009081526006602052604090205490565b6001600160a01b03811660009081526005602052604081205481908190819081610ac482610ab88961074b565b9063ffffffff610cb416565b9050610ad08782610b95565b600480546003546040805163386497fd60e01b81526101009092046001600160a01b0390811694830194909452516000939092169163386497fd91602480820192602092909190829003018186803b158015610b2b57600080fd5b505afa158015610b3f573d6000803e3d6000fd5b505050506040513d6020811015610b5557600080fd5b50516001600160a01b0389166000908152600660205260409020819055905082610b85818463ffffffff610cf616565b9099909850919650945092505050565b600054610ba8908263ffffffff610cf616565b60009081556001600160a01b038316815260056020526040902054610bd3908263ffffffff610cf616565b6001600160a01b0390921660009081526005602052604090209190915550565b600061082c82633b9aca0063ffffffff610d5016565b6000610c4d6b033b2e3c9fd0803ce8000000610c41610c2e868663ffffffff610d5016565b6b019d971e4fe8401e7400000090610cf6565b9063ffffffff610da916565b90505b92915050565b6000631dcd6500610c6f633b9aca00610c418386610cf6565b9392505050565b600054610c89908263ffffffff610cb416565b60009081556001600160a01b038316815260056020526040902054610bd3908263ffffffff610cb416565b6000610c4d83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610deb565b600082820183811015610c4d576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b600082610d5f57506000610c50565b82820282848281610d6c57fe5b0414610c4d5760405162461bcd60e51b8152600401808060200182810382526021815260200180610f836021913960400191505060405180910390fd5b6000610c4d83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250610e82565b60008184841115610e7a5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610e3f578181015183820152602001610e27565b50505050905090810190601f168015610e6c5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b60008183610ed15760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315610e3f578181015183820152602001610e27565b506000838581610edd57fe5b0495945050505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610f2857805160ff1916838001178555610f55565b82800160010185558215610f55579182015b82811115610f55578251825591602001919060010190610f3a565b50610f61929150610f65565b5090565b610f7f91905b80821115610f615760008155600101610f6b565b9056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f775468652063616c6c6572206f6620746869732066756e6374696f6e206d7573742062652061206c656e64696e6720706f6f6ca264697066735822122029bd7abcbf9c44967a1623895fd186c70c4a855b25744176314c94445724c46964736f6c63430006080033";
diff --git a/types/WalletBalanceProviderFactory.ts b/types/WalletBalanceProviderFactory.ts
index 4d20cbb7..b1ce21ae 100644
--- a/types/WalletBalanceProviderFactory.ts
+++ b/types/WalletBalanceProviderFactory.ts
@@ -134,4 +134,4 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x608060405234801561001057600080fd5b5060405161099e38038061099e8339818101604052602081101561003357600080fd5b5051600080546001600160a01b039092166001600160a01b0319909216919091179055610939806100656000396000f3fe6080604052600436106100385760003560e01c80639e3c930914610083578063b59b28ef1461014f578063f7888aec146102d35761007e565b3661007e5761004633610320565b61007c576040805162461bcd60e51b8152602060048201526002602482015261191960f11b604482015290519081900360640190fd5b005b600080fd5b34801561008f57600080fd5b506100b6600480360360208110156100a657600080fd5b50356001600160a01b031661035c565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b838110156100fa5781810151838201526020016100e2565b50505050905001838103825284818151815260200191508051906020019060200280838360005b83811015610139578181015183820152602001610121565b5050505090500194505050505060405180910390f35b34801561015b57600080fd5b506102836004803603604081101561017257600080fd5b81019060208101813564010000000081111561018d57600080fd5b82018360208201111561019f57600080fd5b803590602001918460208302840111640100000000831117156101c157600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561021157600080fd5b82018360208201111561022357600080fd5b8035906020019184602083028401116401000000008311171561024557600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506106a9945050505050565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156102bf5781810151838201526020016102a7565b505050509050019250505060405180910390f35b3480156102df57600080fd5b5061030e600480360360408110156102f657600080fd5b506001600160a01b0381358116916020013516610841565b60408051918252519081900360200190f35b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47081811480159061035457508115155b949350505050565b60608060008060009054906101000a90046001600160a01b03166001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103ae57600080fd5b505afa1580156103c2573d6000803e3d6000fd5b505050506040513d60208110156103d857600080fd5b505160408051630240bc6b60e21b815290519192506060916001600160a01b03841691630902f1ac916004808301926000929190829003018186803b15801561042057600080fd5b505afa158015610434573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052602081101561045d57600080fd5b810190808051604051939291908464010000000082111561047d57600080fd5b90830190602082018581111561049257600080fd5b82518660208202830111640100000000821117156104af57600080fd5b82525081516020918201928201910280838360005b838110156104dc5781810151838201526020016104c4565b5050505090500160405250505090506060815167ffffffffffffffff8111801561050557600080fd5b5060405190808252806020026020018201604052801561052f578160200160208202803683370190505b50905060005b825181101561069d576000846001600160a01b0316633e15014185848151811061055b57fe5b60200260200101516040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b031681526020019150506101406040518083038186803b1580156105aa57600080fd5b505afa1580156105be573d6000803e3d6000fd5b505050506040513d6101408110156105d557600080fd5b5061010001519050806106025760008383815181106105f057fe5b60200260200101818152505050610695565b61060a6108eb565b6001600160a01b031684838151811061061f57fe5b60200260200101516001600160a01b03161461066f576106528885848151811061064557fe5b6020026020010151610841565b83838151811061065e57fe5b602002602001018181525050610693565b876001600160a01b03163183838151811061068657fe5b6020026020010181815250505b505b600101610535565b50909350915050915091565b606080825184510267ffffffffffffffff811180156106c757600080fd5b506040519080825280602002602001820160405280156106f1578160200160208202803683370190505b50905060005b84518110156108375760005b845181101561082e57845182026107186108eb565b6001600160a01b031686838151811061072d57fe5b60200260200101516001600160a01b031614156107815786838151811061075057fe5b60200260200101516001600160a01b031631848383018151811061077057fe5b602002602001018181525050610825565b6107a686838151811061079057fe5b60200260200101516001600160a01b0316610320565b6107e7576040805162461bcd60e51b815260206004820152600d60248201526c24a72b20a624a22faa27a5a2a760991b604482015290519081900360640190fd5b61080a8784815181106107f657fe5b602002602001015187848151811061064557fe5b848383018151811061081857fe5b6020026020010181815250505b50600101610703565b506001016106f7565b5090505b92915050565b6000610855826001600160a01b0316610320565b156108e357816001600160a01b03166370a08231846040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156108b057600080fd5b505afa1580156108c4573d6000803e3d6000fd5b505050506040513d60208110156108da57600080fd5b5051905061083b565b50600061083b565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee9056fea26469706673582212207285b910f911868636ce78fa21192b5ac0a86df35b25c04e8445ba9b97d183ea64736f6c63430006080033";
+  "0x608060405234801561001057600080fd5b5060405161099e38038061099e8339818101604052602081101561003357600080fd5b5051600080546001600160a01b039092166001600160a01b0319909216919091179055610939806100656000396000f3fe6080604052600436106100385760003560e01c80639e3c930914610083578063b59b28ef1461014f578063f7888aec146102d35761007e565b3661007e5761004633610320565b61007c576040805162461bcd60e51b8152602060048201526002602482015261191960f11b604482015290519081900360640190fd5b005b600080fd5b34801561008f57600080fd5b506100b6600480360360208110156100a657600080fd5b50356001600160a01b031661035c565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b838110156100fa5781810151838201526020016100e2565b50505050905001838103825284818151815260200191508051906020019060200280838360005b83811015610139578181015183820152602001610121565b5050505090500194505050505060405180910390f35b34801561015b57600080fd5b506102836004803603604081101561017257600080fd5b81019060208101813564010000000081111561018d57600080fd5b82018360208201111561019f57600080fd5b803590602001918460208302840111640100000000831117156101c157600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561021157600080fd5b82018360208201111561022357600080fd5b8035906020019184602083028401116401000000008311171561024557600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506106a9945050505050565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156102bf5781810151838201526020016102a7565b505050509050019250505060405180910390f35b3480156102df57600080fd5b5061030e600480360360408110156102f657600080fd5b506001600160a01b0381358116916020013516610841565b60408051918252519081900360200190f35b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47081811480159061035457508115155b949350505050565b60608060008060009054906101000a90046001600160a01b03166001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103ae57600080fd5b505afa1580156103c2573d6000803e3d6000fd5b505050506040513d60208110156103d857600080fd5b505160408051630240bc6b60e21b815290519192506060916001600160a01b03841691630902f1ac916004808301926000929190829003018186803b15801561042057600080fd5b505afa158015610434573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052602081101561045d57600080fd5b810190808051604051939291908464010000000082111561047d57600080fd5b90830190602082018581111561049257600080fd5b82518660208202830111640100000000821117156104af57600080fd5b82525081516020918201928201910280838360005b838110156104dc5781810151838201526020016104c4565b5050505090500160405250505090506060815167ffffffffffffffff8111801561050557600080fd5b5060405190808252806020026020018201604052801561052f578160200160208202803683370190505b50905060005b825181101561069d576000846001600160a01b0316633e15014185848151811061055b57fe5b60200260200101516040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b031681526020019150506101406040518083038186803b1580156105aa57600080fd5b505afa1580156105be573d6000803e3d6000fd5b505050506040513d6101408110156105d557600080fd5b5061010001519050806106025760008383815181106105f057fe5b60200260200101818152505050610695565b61060a6108eb565b6001600160a01b031684838151811061061f57fe5b60200260200101516001600160a01b03161461066f576106528885848151811061064557fe5b6020026020010151610841565b83838151811061065e57fe5b602002602001018181525050610693565b876001600160a01b03163183838151811061068657fe5b6020026020010181815250505b505b600101610535565b50909350915050915091565b606080825184510267ffffffffffffffff811180156106c757600080fd5b506040519080825280602002602001820160405280156106f1578160200160208202803683370190505b50905060005b84518110156108375760005b845181101561082e57845182026107186108eb565b6001600160a01b031686838151811061072d57fe5b60200260200101516001600160a01b031614156107815786838151811061075057fe5b60200260200101516001600160a01b031631848383018151811061077057fe5b602002602001018181525050610825565b6107a686838151811061079057fe5b60200260200101516001600160a01b0316610320565b6107e7576040805162461bcd60e51b815260206004820152600d60248201526c24a72b20a624a22faa27a5a2a760991b604482015290519081900360640190fd5b61080a8784815181106107f657fe5b602002602001015187848151811061064557fe5b848383018151811061081857fe5b6020026020010181815250505b50600101610703565b506001016106f7565b5090505b92915050565b6000610855826001600160a01b0316610320565b156108e357816001600160a01b03166370a08231846040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156108b057600080fd5b505afa1580156108c4573d6000803e3d6000fd5b505050506040513d60208110156108da57600080fd5b5051905061083b565b50600061083b565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee9056fea264697066735822122068dcc73a549db9d86197fbfb0b79ab7b0808561bf5bc5594c4219c337201e04864736f6c63430006080033";