From a4c808d7574386c49f95a08931a1835da9ab80f0 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Thu, 20 Aug 2020 18:21:28 +0300 Subject: [PATCH 01/30] New version: 1router --- .editorconfig | 14 + .eslintrc | 78 +- .github/workflows/test.yml | 45 + .gitignore | 8 +- .prettierignore | 0 .prettierrc | 4 - .solcover.js | 22 +- .solhint.json | 9 + .soliumignore | 4 - .soliumrc.json | 22 - .travis.yml | 19 - AaveRegistry.full.abi | 1 - AaveRegistry.full.bin | 1 - AaveRegistry.full.sol | 687 -- BalancerHelper.full.abi | 1 - BalancerHelper.full.bin | 1 - BalancerHelper.full.sol | 751 -- BancorFinder.full.abi | 1 - BancorFinder.full.bin | 1 - BancorFinder.full.sol | 635 -- CompoundRegistry.full.abi | 1 - CompoundRegistry.full.bin | 1 - CompoundRegistry.full.sol | 699 -- KyberReserves.md | 68 - LICENSE | 7 - OneSplit.full.abi | 1 - OneSplit.full.bin | 1 - OneSplit.full.sol | 7109 ----------------- OneSplitAudit.full.abi | 1 - OneSplitAudit.full.bin | 1 - OneSplitAudit.full.sol | 1250 --- OneSplitView.full.abi | 1 - OneSplitView.full.bin | 1 - OneSplitView.full.sol | 4807 ----------- README.md | 569 +- codechecks.yml | 2 + contracts/1inchProtocol-audit.pdf | Bin 187086 -> 0 bytes contracts/AaveRegistry.sol | 43 - contracts/BalancerHelper.sol | 40 - contracts/BancorFinder.sol | 101 - contracts/CompoundRegistry.sol | 43 - contracts/IOneRouter.sol | 122 + contracts/IOneSplit.sol | 177 - contracts/ISource.sol | 14 + contracts/Migrations.sol | 4 +- contracts/OneRouter.sol | 593 ++ contracts/OneRouterConstants.sol | 54 + contracts/OneSplit.sol | 316 - contracts/OneSplitAave.sol | 166 - contracts/OneSplitAudit.sol | 385 - contracts/OneSplitBase.sol | 2584 ------ contracts/OneSplitBdai.sol | 128 - contracts/OneSplitChai.sol | 116 - contracts/OneSplitCompound.sol | 170 - contracts/OneSplitDMM.sol | 214 - contracts/OneSplitFulcrum.sol | 220 - contracts/OneSplitIdle.sol | 171 - contracts/OneSplitIearn.sol | 187 - contracts/OneSplitMStable.sol | 176 - contracts/OneSplitMooniswapPoolToken.sol | 401 - contracts/OneSplitWeth.sol | 162 - contracts/UniversalERC20.sol | 116 - contracts/interface/IAaveRegistry.sol | 10 - contracts/interface/IAaveToken.sol | 17 - contracts/interface/IBalancerPool.sol | 39 - contracts/interface/IBalancerRegistry.sol | 67 - .../interface/IBancorContractRegistry.sol | 6 - .../interface/IBancorConverterRegistry.sol | 19 - contracts/interface/IBancorEtherToken.sol | 10 - contracts/interface/IBancorFinder.sol | 14 - contracts/interface/IBancorNetwork.sol | 18 - .../interface/IBancorNetworkPathFinder.sol | 11 - contracts/interface/IBdai.sol | 10 - contracts/interface/IChai.sol | 123 - contracts/interface/ICompound.sol | 29 - contracts/interface/ICompoundRegistry.sol | 10 - contracts/interface/IDForceSwap.sol | 9 - contracts/interface/IDMM.sol | 15 - contracts/interface/IFulcrum.sol | 20 - contracts/interface/IIdle.sol | 18 - contracts/interface/IIearn.sol | 14 - contracts/interface/IKyberHintHandler.sol | 27 - contracts/interface/IKyberNetworkContract.sol | 11 - contracts/interface/IKyberNetworkProxy.sol | 35 - contracts/interface/IKyberOasisReserve.sol | 6 - contracts/interface/IKyberStorage.sol | 10 - contracts/interface/IMStable.sol | 93 - contracts/interface/IOasisExchange.sol | 15 - contracts/interface/IShell.sol | 18 - contracts/interface/ISmartToken.sol | 9 - contracts/interface/ISmartTokenConverter.sol | 12 - contracts/interface/ISmartTokenFormula.sol | 20 - contracts/interface/ISmartTokenRegistry.sol | 8 - contracts/interface/IUniswapFactory.sol | 8 - contracts/interface/IUniswapV2Exchange.sol | 42 - contracts/interface/IUniswapV2Factory.sol | 8 - contracts/interface/IWETH.sol | 10 - contracts/interfaces/IAaveRegistry.sol | 10 + contracts/interfaces/IBalancer.sol | 70 + contracts/interfaces/ICompoundRegistry.sol | 11 + .../{interface => interfaces}/ICurve.sol | 8 +- contracts/interfaces/IKyber.sol | 63 + .../{interface => interfaces}/IMooniswap.sol | 34 +- .../IUniswapV1.sol} | 27 +- contracts/interfaces/IUniswapV2.sol | 17 + contracts/interfaces/IWETH.sol | 11 + contracts/libraries/Address2.sol | 31 + contracts/libraries/Algo.sol | 67 + contracts/{ => libraries}/BalancerLib.sol | 6 +- contracts/libraries/DynamicMemoryArray.sol | 39 + contracts/libraries/FlagsChecker.sol | 10 + contracts/libraries/RevertReason.sol | 11 + contracts/libraries/UniERC20.sol | 145 + contracts/sources/BalancerSource.sol | 179 + contracts/sources/CurveSource.sol | 363 + contracts/sources/KyberSource.sol | 227 + contracts/sources/MooniswapSource.sol | 83 + contracts/sources/UniswapV1Source.sol | 77 + contracts/sources/UniswapV2Source.sol | 140 + img/howitworks.png | Bin 18689 -> 0 bytes img/howtouseit.png | Bin 30867 -> 0 bytes migrations/1_initial_migration.js | 8 +- package.json | 37 +- scripts/coverage.sh | 3 - scripts/test.sh | 74 - solhint.json | 10 - test/OneRouter.js | 274 + test/OneSplit.js | 323 - truffle-config.js | 64 +- yarn.lock | 2315 ++---- 130 files changed, 3618 insertions(+), 25436 deletions(-) create mode 100644 .github/workflows/test.yml delete mode 100644 .prettierignore delete mode 100644 .prettierrc create mode 100644 .solhint.json delete mode 100644 .soliumignore delete mode 100644 .soliumrc.json delete mode 100644 .travis.yml delete mode 100644 AaveRegistry.full.abi delete mode 100644 AaveRegistry.full.bin delete mode 100644 AaveRegistry.full.sol delete mode 100644 BalancerHelper.full.abi delete mode 100644 BalancerHelper.full.bin delete mode 100644 BalancerHelper.full.sol delete mode 100644 BancorFinder.full.abi delete mode 100644 BancorFinder.full.bin delete mode 100644 BancorFinder.full.sol delete mode 100644 CompoundRegistry.full.abi delete mode 100644 CompoundRegistry.full.bin delete mode 100644 CompoundRegistry.full.sol delete mode 100644 KyberReserves.md delete mode 100644 LICENSE delete mode 100644 OneSplit.full.abi delete mode 100644 OneSplit.full.bin delete mode 100644 OneSplit.full.sol delete mode 100644 OneSplitAudit.full.abi delete mode 100644 OneSplitAudit.full.bin delete mode 100644 OneSplitAudit.full.sol delete mode 100644 OneSplitView.full.abi delete mode 100644 OneSplitView.full.bin delete mode 100644 OneSplitView.full.sol create mode 100644 codechecks.yml delete mode 100644 contracts/1inchProtocol-audit.pdf delete mode 100644 contracts/AaveRegistry.sol delete mode 100644 contracts/BalancerHelper.sol delete mode 100644 contracts/BancorFinder.sol delete mode 100644 contracts/CompoundRegistry.sol create mode 100644 contracts/IOneRouter.sol delete mode 100644 contracts/IOneSplit.sol create mode 100644 contracts/ISource.sol create mode 100644 contracts/OneRouter.sol create mode 100644 contracts/OneRouterConstants.sol delete mode 100644 contracts/OneSplit.sol delete mode 100644 contracts/OneSplitAave.sol delete mode 100644 contracts/OneSplitAudit.sol delete mode 100644 contracts/OneSplitBase.sol delete mode 100644 contracts/OneSplitBdai.sol delete mode 100644 contracts/OneSplitChai.sol delete mode 100644 contracts/OneSplitCompound.sol delete mode 100644 contracts/OneSplitDMM.sol delete mode 100644 contracts/OneSplitFulcrum.sol delete mode 100644 contracts/OneSplitIdle.sol delete mode 100644 contracts/OneSplitIearn.sol delete mode 100644 contracts/OneSplitMStable.sol delete mode 100644 contracts/OneSplitMooniswapPoolToken.sol delete mode 100644 contracts/OneSplitWeth.sol delete mode 100644 contracts/UniversalERC20.sol delete mode 100644 contracts/interface/IAaveRegistry.sol delete mode 100644 contracts/interface/IAaveToken.sol delete mode 100644 contracts/interface/IBalancerPool.sol delete mode 100644 contracts/interface/IBalancerRegistry.sol delete mode 100644 contracts/interface/IBancorContractRegistry.sol delete mode 100644 contracts/interface/IBancorConverterRegistry.sol delete mode 100644 contracts/interface/IBancorEtherToken.sol delete mode 100644 contracts/interface/IBancorFinder.sol delete mode 100644 contracts/interface/IBancorNetwork.sol delete mode 100644 contracts/interface/IBancorNetworkPathFinder.sol delete mode 100644 contracts/interface/IBdai.sol delete mode 100644 contracts/interface/IChai.sol delete mode 100644 contracts/interface/ICompound.sol delete mode 100644 contracts/interface/ICompoundRegistry.sol delete mode 100644 contracts/interface/IDForceSwap.sol delete mode 100644 contracts/interface/IDMM.sol delete mode 100644 contracts/interface/IFulcrum.sol delete mode 100644 contracts/interface/IIdle.sol delete mode 100644 contracts/interface/IIearn.sol delete mode 100644 contracts/interface/IKyberHintHandler.sol delete mode 100644 contracts/interface/IKyberNetworkContract.sol delete mode 100644 contracts/interface/IKyberNetworkProxy.sol delete mode 100644 contracts/interface/IKyberOasisReserve.sol delete mode 100644 contracts/interface/IKyberStorage.sol delete mode 100644 contracts/interface/IMStable.sol delete mode 100644 contracts/interface/IOasisExchange.sol delete mode 100644 contracts/interface/IShell.sol delete mode 100644 contracts/interface/ISmartToken.sol delete mode 100644 contracts/interface/ISmartTokenConverter.sol delete mode 100644 contracts/interface/ISmartTokenFormula.sol delete mode 100644 contracts/interface/ISmartTokenRegistry.sol delete mode 100644 contracts/interface/IUniswapFactory.sol delete mode 100644 contracts/interface/IUniswapV2Exchange.sol delete mode 100644 contracts/interface/IUniswapV2Factory.sol delete mode 100644 contracts/interface/IWETH.sol create mode 100644 contracts/interfaces/IAaveRegistry.sol create mode 100644 contracts/interfaces/IBalancer.sol create mode 100644 contracts/interfaces/ICompoundRegistry.sol rename contracts/{interface => interfaces}/ICurve.sol (91%) create mode 100644 contracts/interfaces/IKyber.sol rename contracts/{interface => interfaces}/IMooniswap.sol (63%) rename contracts/{interface/IUniswapExchange.sol => interfaces/IUniswapV1.sol} (50%) create mode 100644 contracts/interfaces/IUniswapV2.sol create mode 100644 contracts/interfaces/IWETH.sol create mode 100644 contracts/libraries/Address2.sol create mode 100644 contracts/libraries/Algo.sol rename contracts/{ => libraries}/BalancerLib.sol (99%) create mode 100644 contracts/libraries/DynamicMemoryArray.sol create mode 100644 contracts/libraries/FlagsChecker.sol create mode 100644 contracts/libraries/RevertReason.sol create mode 100644 contracts/libraries/UniERC20.sol create mode 100644 contracts/sources/BalancerSource.sol create mode 100644 contracts/sources/CurveSource.sol create mode 100644 contracts/sources/KyberSource.sol create mode 100644 contracts/sources/MooniswapSource.sol create mode 100644 contracts/sources/UniswapV1Source.sol create mode 100644 contracts/sources/UniswapV2Source.sol delete mode 100644 img/howitworks.png delete mode 100644 img/howtouseit.png delete mode 100755 scripts/coverage.sh delete mode 100755 scripts/test.sh delete mode 100644 solhint.json create mode 100644 test/OneRouter.js delete mode 100644 test/OneSplit.js diff --git a/.editorconfig b/.editorconfig index b585a76..12cfb44 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,6 +8,20 @@ indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true +[*.yml] +charset = utf-8 +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.yaml] +charset = utf-8 +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + [*.md] max_line_length = off trim_trailing_whitespace = false diff --git a/.eslintrc b/.eslintrc index 7bca649..5138a68 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,52 +1,52 @@ { "extends" : [ - "standard", - "plugin:promise/recommended" + "standard", + "plugin:promise/recommended" ], "plugins": [ - "promise" + "promise" ], "env": { - "browser" : true, - "node" : true, - "mocha" : true, - "jest" : true + "browser" : true, + "node" : true, + "mocha" : true, + "jest" : true }, "globals" : { - "artifacts": false, - "contract": false, - "assert": false, - "web3": false + "artifacts": false, + "contract": false, + "assert": false, + "web3": false }, "rules": { - // Strict mode - "strict": [2, "global"], + // Strict mode + "strict": [2, "global"], - // Code style - "indent": [2, 4], - "quotes": [2, "single"], - "semi": ["error", "always"], - "space-before-function-paren": ["error", "always"], - "no-use-before-define": 0, - "no-unused-expressions": "off", - "eqeqeq": [2, "smart"], - "dot-notation": [2, {"allowKeywords": true, "allowPattern": ""}], - "no-redeclare": [2, {"builtinGlobals": true}], - "no-trailing-spaces": [2, { "skipBlankLines": true }], - "eol-last": 1, - "comma-spacing": [2, {"before": false, "after": true}], - "camelcase": [2, {"properties": "always"}], - "no-mixed-spaces-and-tabs": [2, "smart-tabs"], - "comma-dangle": [1, "always-multiline"], - "no-dupe-args": 2, - "no-dupe-keys": 2, - "no-debugger": 0, - "no-undef": 2, - "object-curly-spacing": [2, "always"], - "max-len": [2, 200, 2], - "generator-star-spacing": ["error", "before"], - "promise/avoid-new": 0, - "promise/always-return": 0 + // Code style + "indent": [2, 4], + "quotes": [2, "single"], + "semi": ["error", "always"], + "space-before-function-paren": ["error", "always"], + "no-use-before-define": 0, + "no-unused-expressions": "off", + "eqeqeq": [2, "smart"], + "dot-notation": [2, {"allowKeywords": true, "allowPattern": ""}], + "no-redeclare": [2, {"builtinGlobals": true}], + "no-trailing-spaces": [2, { "skipBlankLines": true }], + "eol-last": 1, + "comma-spacing": [2, {"before": false, "after": true}], + "camelcase": [2, {"properties": "always"}], + "no-mixed-spaces-and-tabs": [2, "smart-tabs"], + "comma-dangle": [1, "always-multiline"], + "no-dupe-args": 2, + "no-dupe-keys": 2, + "no-debugger": 0, + "no-undef": 2, + "object-curly-spacing": [2, "always"], + "max-len": [2, 200, 2], + "generator-star-spacing": ["error", "before"], + "promise/avoid-new": 0, + "promise/always-return": 0 } - } \ No newline at end of file +} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..8d9c777 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,45 @@ +name: CI + +on: + push: + branches: [ master ] + pull_request: + +jobs: + test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - uses: actions/setup-node@v1 + with: + node-version: '12.x' + + - run: npm install -g yarn + + - id: yarn-cache + run: echo "::set-output name=dir::$(yarn cache dir)" + + - uses: actions/cache@v1 + with: + path: ${{ steps.yarn-cache.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-yarn- + + - run: | + echo "repo_token: ${COVERALLS_SECRET}" > .coveralls.yml + env: + COVERALLS_SECRET: ${{ secrets.COVERALLS_SECRET }} + + - run: yarn + - run: yarn lint + - run: yarn ganache-cli -f "$ETH_NODE" -l 8000000000 -p 9545 & + env: + ETH_NODE: ${{ secrets.ETH_NODE }} + - run: yarn test + #- run: yarn coveralls + #- run: yarn codechecks + # env: + # CC_SECRET: ${{ secrets.CODECHECKS_SECRET }} diff --git a/.gitignore b/.gitignore index 676b56f..bf35e81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -node_modules/ -coverage/ +node_modules +coverage coverage.json -build/ -.env \ No newline at end of file +dist +build diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index e69de29..0000000 diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index ea0d880..0000000 --- a/.prettierrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "printWidth": 100, - "singleQuote": false -} diff --git a/.solcover.js b/.solcover.js index 55bb5c4..53ec9cb 100644 --- a/.solcover.js +++ b/.solcover.js @@ -1,16 +1,16 @@ module.exports = { testrpcOptions: '--port 8555 ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200,1000000000000000000000000" ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501201,1000000000000000000000000" ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501202,1000000000000000000000000" ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501203,1000000000000000000000000" ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501204,1000000000000000000000000" ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501205,1000000000000000000000000" ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501206,1000000000000000000000000" ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501207,1000000000000000000000000" ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501208,1000000000000000000000000" ' + - ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501209,1000000000000000000000000"', + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200,1000000000000000000000000" ' + + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501201,1000000000000000000000000" ' + + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501202,1000000000000000000000000" ' + + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501203,1000000000000000000000000" ' + + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501204,1000000000000000000000000" ' + + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501205,1000000000000000000000000" ' + + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501206,1000000000000000000000000" ' + + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501207,1000000000000000000000000" ' + + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501208,1000000000000000000000000" ' + + ' --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501209,1000000000000000000000000"', copyPackages: ['openzeppelin-solidity'], norpc: true, - skipFiles: ['Migrations.sol'] + skipFiles: ['Migrations.sol', 'mocks'] } diff --git a/.solhint.json b/.solhint.json new file mode 100644 index 0000000..8603361 --- /dev/null +++ b/.solhint.json @@ -0,0 +1,9 @@ +{ + "extends": "solhint:recommended", + "rules": { + "no-empty-blocks": "off", + "not-rely-on-time": "off", + "compiler-version": ["error", "^0.6.0"], + "private-vars-leading-underscore": "error" + } +} diff --git a/.soliumignore b/.soliumignore deleted file mode 100644 index 1ca3954..0000000 --- a/.soliumignore +++ /dev/null @@ -1,4 +0,0 @@ -node_modules -OneSplit.full.sol -OneSplitAudit.full.sol -contracts/interface/IChai.sol diff --git a/.soliumrc.json b/.soliumrc.json deleted file mode 100644 index 5a6308f..0000000 --- a/.soliumrc.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "solium:all", - "plugins": ["security"], - "rules": { - "error-reason": "off", - "indentation": ["error", 4], - "lbrace": "off", - "linebreak-style": ["error", "unix"], - "max-len": ["error", 139], - "no-constant": ["error"], - "no-empty-blocks": "off", - "quotes": ["error", "double"], - "uppercase": "off", - "visibility-first": "error", - "arg-overflow": ["error", 5], - "function-order": "off", - - "security/enforce-explicit-visibility": ["error"], - "security/no-block-members": ["off"], - "security/no-inline-assembly": ["warning"] - } - } \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 712321f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -# -# https://github.com/sc-forks/solidity-coverage/blob/master/docs/faq.md -# - -sudo: required -dist: trusty -language: node_js -node_js: - - '10' -install: - - yarn -script: - - yarn run lint - - yarn run test -after_script: - - yarn run coverage -branches: - only: - - master diff --git a/AaveRegistry.full.abi b/AaveRegistry.full.abi deleted file mode 100644 index 6c09814..0000000 --- a/AaveRegistry.full.abi +++ /dev/null @@ -1 +0,0 @@ -[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"token","type":"address"}],"name":"aTokenByToken","outputs":[{"internalType":"contract IAaveToken","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IAaveToken","name":"aToken","type":"address"}],"name":"addAToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IAaveToken[]","name":"cTokens","type":"address[]"}],"name":"addATokens","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"isOwner","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IAaveToken","name":"aToken","type":"address"}],"name":"tokenByAToken","outputs":[{"internalType":"contract IERC20","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file diff --git a/AaveRegistry.full.bin b/AaveRegistry.full.bin deleted file mode 100644 index 4768290..0000000 --- a/AaveRegistry.full.bin +++ /dev/null @@ -1 +0,0 @@ -608060405260006100176001600160e01b0361006616565b600080546001600160a01b0319166001600160a01b0383169081178255604051929350917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a35061006a565b3390565b610681806100796000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80638da5cb5b1161005b5780638da5cb5b1461016f5780638f32d59b14610177578063a8e6574214610193578063f2fde38b146101b957610088565b806310b1f5261461008d5780634781b14e146100b55780635f5418f314610125578063715018a614610167575b600080fd5b6100b3600480360360208110156100a357600080fd5b50356001600160a01b03166101df565b005b6100b3600480360360208110156100cb57600080fd5b8101906020810181356401000000008111156100e657600080fd5b8201836020820111156100f857600080fd5b8035906020019184602083028401116401000000008311171561011a57600080fd5b5090925090506102d7565b61014b6004803603602081101561013b57600080fd5b50356001600160a01b031661035a565b604080516001600160a01b039092168252519081900360200190f35b6100b36103b0565b61014b610441565b61017f610450565b604080519115158252519081900360200190f35b61014b600480360360208110156101a957600080fd5b50356001600160a01b0316610474565b6100b3600480360360208110156101cf57600080fd5b50356001600160a01b03166104d5565b6101e7610450565b610226576040805162461bcd60e51b8152602060048201819052602482015260008051602061062d833981519152604482015290519081900360640190fd5b6000816001600160a01b03166389d1a0fc6040518163ffffffff1660e01b815260040160206040518083038186803b15801561026157600080fd5b505afa158015610275573d6000803e3d6000fd5b505050506040513d602081101561028b57600080fd5b50516001600160a01b0392831660008181526001602090815260408083208054979095166001600160a01b03199788168117909555938252600290529190912080549093161790915550565b6102df610450565b61031e576040805162461bcd60e51b8152602060048201819052602482015260008051602061062d833981519152604482015290519081900360640190fd5b60005b818110156103555761034d83838381811061033857fe5b905060200201356001600160a01b03166101df565b600101610321565b505050565b600061036e826001600160a01b0316610528565b1561038e5750733a3a65aab0dd2a17e3f1947ba16138cd37d08c046103ab565b506001600160a01b03808216600090815260026020526040902054165b919050565b6103b8610450565b6103f7576040805162461bcd60e51b8152602060048201819052602482015260008051602061062d833981519152604482015290519081900360640190fd5b600080546040516001600160a01b03909116907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a3600080546001600160a01b0319169055565b6000546001600160a01b031690565b600080546001600160a01b0316610465610562565b6001600160a01b031614905090565b60006001600160a01b038216733a3a65aab0dd2a17e3f1947ba16138cd37d08c0414156104b6575073eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee6103ab565b506001600160a01b039081166000908152600160205260409020541690565b6104dd610450565b61051c576040805162461bcd60e51b8152602060048201819052602482015260008051602061062d833981519152604482015290519081900360640190fd5b61052581610566565b50565b60006001600160a01b038216158061055c57506001600160a01b03821673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee145b92915050565b3390565b6001600160a01b0381166105ab5760405162461bcd60e51b81526004018080602001828103825260268152602001806106076026913960400191505060405180910390fd5b600080546040516001600160a01b03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a3600080546001600160a01b0319166001600160a01b039290921691909117905556fe4f776e61626c653a206e6577206f776e657220697320746865207a65726f20616464726573734f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572a265627a7a72315820b212ee2f131114b26e30f778df74f958b98d4ebeca95cd586f997bd961a5557264736f6c63430005110032 \ No newline at end of file diff --git a/AaveRegistry.full.sol b/AaveRegistry.full.sol deleted file mode 100644 index a691fbd..0000000 --- a/AaveRegistry.full.sol +++ /dev/null @@ -1,687 +0,0 @@ - -// File: @openzeppelin/contracts/GSN/Context.sol - -pragma solidity ^0.5.0; - -/* - * @dev Provides information about the current execution context, including the - * sender of the transaction and its data. While these are generally available - * via msg.sender and msg.data, they should not be accessed in such a direct - * manner, since when dealing with GSN meta-transactions the account sending and - * paying for execution may not be the actual sender (as far as an application - * is concerned). - * - * This contract is only required for intermediate, library-like contracts. - */ -contract Context { - // Empty internal constructor, to prevent people from mistakenly deploying - // an instance of this contract, which should be used via inheritance. - constructor () internal { } - // solhint-disable-previous-line no-empty-blocks - - function _msgSender() internal view returns (address payable) { - return msg.sender; - } - - function _msgData() internal view returns (bytes memory) { - this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691 - return msg.data; - } -} - -// File: @openzeppelin/contracts/ownership/Ownable.sol - -pragma solidity ^0.5.0; - -/** - * @dev Contract module which provides a basic access control mechanism, where - * there is an account (an owner) that can be granted exclusive access to - * specific functions. - * - * This module is used through inheritance. It will make available the modifier - * `onlyOwner`, which can be applied to your functions to restrict their use to - * the owner. - */ -contract Ownable is Context { - address private _owner; - - event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); - - /** - * @dev Initializes the contract setting the deployer as the initial owner. - */ - constructor () internal { - address msgSender = _msgSender(); - _owner = msgSender; - emit OwnershipTransferred(address(0), msgSender); - } - - /** - * @dev Returns the address of the current owner. - */ - function owner() public view returns (address) { - return _owner; - } - - /** - * @dev Throws if called by any account other than the owner. - */ - modifier onlyOwner() { - require(isOwner(), "Ownable: caller is not the owner"); - _; - } - - /** - * @dev Returns true if the caller is the current owner. - */ - function isOwner() public view returns (bool) { - return _msgSender() == _owner; - } - - /** - * @dev Leaves the contract without owner. It will not be possible to call - * `onlyOwner` functions anymore. Can only be called by the current owner. - * - * NOTE: Renouncing ownership will leave the contract without an owner, - * thereby removing any functionality that is only available to the owner. - */ - function renounceOwnership() public onlyOwner { - emit OwnershipTransferred(_owner, address(0)); - _owner = address(0); - } - - /** - * @dev Transfers ownership of the contract to a new account (`newOwner`). - * Can only be called by the current owner. - */ - function transferOwnership(address newOwner) public onlyOwner { - _transferOwnership(newOwner); - } - - /** - * @dev Transfers ownership of the contract to a new account (`newOwner`). - */ - function _transferOwnership(address newOwner) internal { - require(newOwner != address(0), "Ownable: new owner is the zero address"); - emit OwnershipTransferred(_owner, newOwner); - _owner = newOwner; - } -} - -// File: @openzeppelin/contracts/token/ERC20/IERC20.sol - -pragma solidity ^0.5.0; - -/** - * @dev Interface of the ERC20 standard as defined in the EIP. Does not include - * the optional functions; to access them see {ERC20Detailed}. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -// File: contracts/interface/IAaveToken.sol - -pragma solidity ^0.5.0; - - - -contract IAaveToken is IERC20 { - function underlyingAssetAddress() external view returns (IERC20); - - function redeem(uint256 amount) external; -} - - -interface IAaveLendingPool { - function core() external view returns (address); - - function deposit(IERC20 token, uint256 amount, uint16 refCode) external payable; -} - -// File: contracts/interface/IAaveRegistry.sol - -pragma solidity ^0.5.0; - - - - -contract IAaveRegistry { - function tokenByAToken(IAaveToken aToken) external view returns(IERC20); - function aTokenByToken(IERC20 token) external view returns(IAaveToken); -} - -// File: @openzeppelin/contracts/math/SafeMath.sol - -pragma solidity ^0.5.0; - -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint256 a, uint256 b) internal pure returns (uint256) { - uint256 c = a + b; - require(c >= a, "SafeMath: addition overflow"); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - */ - function sub(uint256 a, uint256 b) internal pure returns (uint256) { - return sub(a, b, "SafeMath: subtraction overflow"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - * - * _Available since v2.4.0._ - */ - function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b <= a, errorMessage); - uint256 c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint256 a, uint256 b) internal pure returns (uint256) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint256 c = a * b; - require(c / a == b, "SafeMath: multiplication overflow"); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint256 a, uint256 b) internal pure returns (uint256) { - return div(a, b, "SafeMath: division by zero"); - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts with custom message on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint256 c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint256 a, uint256 b) internal pure returns (uint256) { - return mod(a, b, "SafeMath: modulo by zero"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b != 0, errorMessage); - return a % b; - } -} - -// File: @openzeppelin/contracts/utils/Address.sol - -pragma solidity ^0.5.5; - -/** - * @dev Collection of functions related to the address type - */ -library Address { - /** - * @dev Returns true if `account` is a contract. - * - * [IMPORTANT] - * ==== - * It is unsafe to assume that an address for which this function returns - * false is an externally-owned account (EOA) and not a contract. - * - * Among others, `isContract` will return false for the following - * types of addresses: - * - * - an externally-owned account - * - a contract in construction - * - an address where a contract will be created - * - an address where a contract lived, but was destroyed - * ==== - */ - function isContract(address account) internal view returns (bool) { - // According to EIP-1052, 0x0 is the value returned for not-yet created accounts - // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned - // for accounts without code, i.e. `keccak256('')` - bytes32 codehash; - bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; - // solhint-disable-next-line no-inline-assembly - assembly { codehash := extcodehash(account) } - return (codehash != accountHash && codehash != 0x0); - } - - /** - * @dev Converts an `address` into `address payable`. Note that this is - * simply a type cast: the actual underlying value is not changed. - * - * _Available since v2.4.0._ - */ - function toPayable(address account) internal pure returns (address payable) { - return address(uint160(account)); - } - - /** - * @dev Replacement for Solidity's `transfer`: sends `amount` wei to - * `recipient`, forwarding all available gas and reverting on errors. - * - * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost - * of certain opcodes, possibly making contracts go over the 2300 gas limit - * imposed by `transfer`, making them unable to receive funds via - * `transfer`. {sendValue} removes this limitation. - * - * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more]. - * - * IMPORTANT: because control is transferred to `recipient`, care must be - * taken to not create reentrancy vulnerabilities. Consider using - * {ReentrancyGuard} or the - * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern]. - * - * _Available since v2.4.0._ - */ - function sendValue(address payable recipient, uint256 amount) internal { - require(address(this).balance >= amount, "Address: insufficient balance"); - - // solhint-disable-next-line avoid-call-value - (bool success, ) = recipient.call.value(amount)(""); - require(success, "Address: unable to send value, recipient may have reverted"); - } -} - -// File: @openzeppelin/contracts/token/ERC20/SafeERC20.sol - -pragma solidity ^0.5.0; - - - - -/** - * @title SafeERC20 - * @dev Wrappers around ERC20 operations that throw on failure (when the token - * contract returns false). Tokens that return no value (and instead revert or - * throw on failure) are also supported, non-reverting calls are assumed to be - * successful. - * To use this library you can add a `using SafeERC20 for ERC20;` statement to your contract, - * which allows you to call the safe operations as `token.safeTransfer(...)`, etc. - */ -library SafeERC20 { - using SafeMath for uint256; - using Address for address; - - function safeTransfer(IERC20 token, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); - } - - function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); - } - - function safeApprove(IERC20 token, address spender, uint256 value) internal { - // safeApprove should only be called when setting an initial allowance, - // or when resetting it to zero. To increase and decrease it, use - // 'safeIncreaseAllowance' and 'safeDecreaseAllowance' - // solhint-disable-next-line max-line-length - require((value == 0) || (token.allowance(address(this), spender) == 0), - "SafeERC20: approve from non-zero to non-zero allowance" - ); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value)); - } - - function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).add(value); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - function safeDecreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).sub(value, "SafeERC20: decreased allowance below zero"); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - /** - * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement - * on the return value: the return value is optional (but if data is returned, it must not be false). - * @param token The token targeted by the call. - * @param data The call data (encoded using abi.encode or one of its variants). - */ - function callOptionalReturn(IERC20 token, bytes memory data) private { - // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since - // we're implementing it ourselves. - - // A Solidity high level call has three parts: - // 1. The target address is checked to verify it contains contract code - // 2. The call itself is made, and success asserted - // 3. The return value is decoded, which in turn checks the size of the returned data. - // solhint-disable-next-line max-line-length - require(address(token).isContract(), "SafeERC20: call to non-contract"); - - // solhint-disable-next-line avoid-low-level-calls - (bool success, bytes memory returndata) = address(token).call(data); - require(success, "SafeERC20: low-level call failed"); - - if (returndata.length > 0) { // Return data is optional - // solhint-disable-next-line max-line-length - require(abi.decode(returndata, (bool)), "SafeERC20: ERC20 operation did not succeed"); - } - } -} - -// File: contracts/UniversalERC20.sol - -pragma solidity ^0.5.0; - - - - - -library UniversalERC20 { - - using SafeMath for uint256; - using SafeERC20 for IERC20; - - IERC20 private constant ZERO_ADDRESS = IERC20(0x0000000000000000000000000000000000000000); - IERC20 private constant ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - function universalTransfer(IERC20 token, address to, uint256 amount) internal returns(bool) { - if (amount == 0) { - return true; - } - - if (isETH(token)) { - address(uint160(to)).transfer(amount); - } else { - token.safeTransfer(to, amount); - return true; - } - } - - function universalTransferFrom(IERC20 token, address from, address to, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - require(from == msg.sender && msg.value >= amount, "Wrong useage of ETH.universalTransferFrom()"); - if (to != address(this)) { - address(uint160(to)).transfer(amount); - } - if (msg.value > amount) { - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(from, to, amount); - } - } - - function universalTransferFromSenderToThis(IERC20 token, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - if (msg.value > amount) { - // Return remainder if exist - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(msg.sender, address(this), amount); - } - } - - function universalApprove(IERC20 token, address to, uint256 amount) internal { - if (!isETH(token)) { - if (amount == 0) { - token.safeApprove(to, 0); - return; - } - - uint256 allowance = token.allowance(address(this), to); - if (allowance < amount) { - if (allowance > 0) { - token.safeApprove(to, 0); - } - token.safeApprove(to, amount); - } - } - } - - function universalBalanceOf(IERC20 token, address who) internal view returns (uint256) { - if (isETH(token)) { - return who.balance; - } else { - return token.balanceOf(who); - } - } - - function universalDecimals(IERC20 token) internal view returns (uint256) { - - if (isETH(token)) { - return 18; - } - - (bool success, bytes memory data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("decimals()") - ); - if (!success || data.length == 0) { - (success, data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("DECIMALS()") - ); - } - - return (success && data.length > 0) ? abi.decode(data, (uint256)) : 18; - } - - function isETH(IERC20 token) internal pure returns(bool) { - return (address(token) == address(ZERO_ADDRESS) || address(token) == address(ETH_ADDRESS)); - } - - function notExist(IERC20 token) internal pure returns(bool) { - return (address(token) == address(-1)); - } -} - -// File: contracts/AaveRegistry.sol - -pragma solidity ^0.5.0; - - - - - - -contract AaveRegistry is Ownable, IAaveRegistry { - using UniversalERC20 for IERC20; - - IAaveToken internal constant aETH = IAaveToken(0x3a3A65aAb0dd2A17E3F1947bA16138cd37d08c04); - IERC20 internal constant ETH = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - mapping(address => address) private _tokenByAToken; - mapping(address => address) private _aTokenByToken; - - function tokenByAToken(IAaveToken aToken) external view returns(IERC20) { - if (aToken == aETH) { - return ETH; - } - return IERC20(_tokenByAToken[address(aToken)]); - } - - function aTokenByToken(IERC20 token) external view returns(IAaveToken) { - if (token.isETH()) { - return aETH; - } - return IAaveToken(_aTokenByToken[address(token)]); - } - - function addAToken(IAaveToken aToken) public onlyOwner { - IERC20 token = IERC20(aToken.underlyingAssetAddress()); - _tokenByAToken[address(aToken)] = address(token); - _aTokenByToken[address(token)] = address(aToken); - } - - function addATokens(IAaveToken[] calldata cTokens) external onlyOwner { - for (uint i = 0; i < cTokens.length; i++) { - addAToken(cTokens[i]); - } - } -} diff --git a/BalancerHelper.full.abi b/BalancerHelper.full.abi deleted file mode 100644 index a3ddde3..0000000 --- a/BalancerHelper.full.abi +++ /dev/null @@ -1 +0,0 @@ -[{"constant":true,"inputs":[{"internalType":"contract IBalancerPool","name":"pool","type":"address"},{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256[]","name":"amounts","type":"uint256[]"}],"name":"getReturns","outputs":[{"internalType":"uint256[]","name":"rets","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"}] \ No newline at end of file diff --git a/BalancerHelper.full.bin b/BalancerHelper.full.bin deleted file mode 100644 index 3937653..0000000 --- a/BalancerHelper.full.bin +++ /dev/null @@ -1 +0,0 @@ -608060405234801561001057600080fd5b50610a8e806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c806340e10bcc14610030575b600080fd5b6100c16004803603608081101561004657600080fd5b6001600160a01b038235811692602081013582169260408201359092169181019060808101606082013564010000000081111561008257600080fd5b82018360208201111561009457600080fd5b803590602001918460208302840111640100000000831117156100b657600080fd5b509092509050610111565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156100fd5781810151838201526020016100e5565b505050509050019250505060405180910390f35b60606000866001600160a01b031663d4cadf686040518163ffffffff1660e01b815260040160206040518083038186803b15801561014e57600080fd5b505afa158015610162573d6000803e3d6000fd5b505050506040513d602081101561017857600080fd5b50516040805163f8b2cb4f60e01b81526001600160a01b0389811660048301529151929350600092918a169163f8b2cb4f91602480820192602092909190829003018186803b1580156101ca57600080fd5b505afa1580156101de573d6000803e3d6000fd5b505050506040513d60208110156101f457600080fd5b50516040805163f8b2cb4f60e01b81526001600160a01b0389811660048301529151929350600092918b169163f8b2cb4f91602480820192602092909190829003018186803b15801561024657600080fd5b505afa15801561025a573d6000803e3d6000fd5b505050506040513d602081101561027057600080fd5b505160408051634a46c67360e11b81526001600160a01b038b811660048301529151929350600092918c169163948d8ce691602480820192602092909190829003018186803b1580156102c257600080fd5b505afa1580156102d6573d6000803e3d6000fd5b505050506040513d60208110156102ec57600080fd5b505160408051634a46c67360e11b81526001600160a01b038b811660048301529151929350600092918d169163948d8ce691602480820192602092909190829003018186803b15801561033e57600080fd5b505afa158015610352573d6000803e3d6000fd5b505050506040513d602081101561036857600080fd5b50516040805189815260208a8102820101909152909150878015610396578160200160208202803883390190505b50955060005b87811080156103d05750846103cd60028b8b858181106103b857fe5b9050602002013561042390919063ffffffff16565b11155b15610414576103f5858486858d8d878181106103e857fe5b905060200201358b610485565b87828151811061040157fe5b602090810291909101015260010161039c565b50505050505095945050505050565b6000826104325750600061047f565b8282028284828161043f57fe5b041461047c5760405162461bcd60e51b8152600401808060200182810382526021815260200180610a396021913960400191505060405180910390fd5b90505b92915050565b600080610492878661051e565b905060006104a8670de0b6b3a764000085610631565b90506104b48582610693565b905060006104cb8a6104c68c85610755565b61051e565b9050806104de5760009350505050610514565b60006104ea82856107a2565b90506000610500670de0b6b3a764000083610631565b905061050c8a82610693565b955050505050505b9695505050505050565b600081610561576040805162461bcd60e51b815260206004820152600c60248201526b4552525f4449565f5a45524f60a01b604482015290519081900360640190fd5b670de0b6b3a764000083028315806105895750670de0b6b3a764000084828161058657fe5b04145b6105cd576040805162461bcd60e51b815260206004820152601060248201526f11549497d1125597d25395115493905360821b604482015290519081900360640190fd5b6002830481018181101561061b576040805162461bcd60e51b815260206004820152601060248201526f11549497d1125597d25395115493905360821b604482015290519081900360640190fd5b600084828161062657fe5b049695505050505050565b600080600061064085856108b0565b91509150801561068b576040805162461bcd60e51b81526020600482015260116024820152704552525f5355425f554e444552464c4f5760781b604482015290519081900360640190fd5b509392505050565b60008282028315806106ad5750828482816106aa57fe5b04145b6106f1576040805162461bcd60e51b815260206004820152601060248201526f4552525f4d554c5f4f564552464c4f5760801b604482015290519081900360640190fd5b6706f05b59d3b20000810181811015610744576040805162461bcd60e51b815260206004820152601060248201526f4552525f4d554c5f4f564552464c4f5760801b604482015290519081900360640190fd5b6000670de0b6b3a764000082610626565b60008282018381101561047c576040805162461bcd60e51b815260206004820152601060248201526f4552525f4144445f4f564552464c4f5760801b604482015290519081900360640190fd5b600060018310156107f2576040805162461bcd60e51b81526020600482015260156024820152744552525f42504f575f424153455f544f4f5f4c4f5760581b604482015290519081900360640190fd5b671bc16d674ec7ffff831115610848576040805162461bcd60e51b815260206004820152601660248201527508aa4a4be84a09eaebe8482a68abea89e9ebe90928e960531b604482015290519081900360640190fd5b6000610853836108d5565b905060006108618483610631565b9050600061087786610872856108f0565b6108fe565b90508161088857925061047f915050565b600061089987846305f5e100610955565b90506108a58282610693565b979650505050505050565b6000808284106108c657505080820360006108ce565b505081810360015b9250929050565b6000670de0b6b3a76400006108e9836108f0565b0292915050565b670de0b6b3a7640000900490565b6000806002830661091757670de0b6b3a7640000610919565b835b90506002830492505b821561047c576109328485610693565b9350600283061561094a576109478185610693565b90505b600283049250610922565b600082818061096c87670de0b6b3a76400006108b0565b9092509050670de0b6b3a764000080600060015b888410610a29576000670de0b6b3a7640000820290506000806109b48a6109af85670de0b6b3a7640000610631565b6108b0565b915091506109cb876109c6848c610693565b610693565b96506109d7878461051e565b9650866109e657505050610a29565b87156109f0579315935b80156109fa579315935b8415610a1157610a0a8688610631565b9550610a1e565b610a1b8688610755565b95505b505050600101610980565b5090999850505050505050505056fe536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77a265627a7a72315820e7ae9c75954fab1d82996d4faa630feb235495a01f9cca2a413e065ba7828eea64736f6c63430005110032 \ No newline at end of file diff --git a/BalancerHelper.full.sol b/BalancerHelper.full.sol deleted file mode 100644 index a064721..0000000 --- a/BalancerHelper.full.sol +++ /dev/null @@ -1,751 +0,0 @@ - -// File: @openzeppelin/contracts/math/SafeMath.sol - -pragma solidity ^0.5.0; - -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint256 a, uint256 b) internal pure returns (uint256) { - uint256 c = a + b; - require(c >= a, "SafeMath: addition overflow"); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - */ - function sub(uint256 a, uint256 b) internal pure returns (uint256) { - return sub(a, b, "SafeMath: subtraction overflow"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - * - * _Available since v2.4.0._ - */ - function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b <= a, errorMessage); - uint256 c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint256 a, uint256 b) internal pure returns (uint256) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint256 c = a * b; - require(c / a == b, "SafeMath: multiplication overflow"); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint256 a, uint256 b) internal pure returns (uint256) { - return div(a, b, "SafeMath: division by zero"); - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts with custom message on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint256 c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint256 a, uint256 b) internal pure returns (uint256) { - return mod(a, b, "SafeMath: modulo by zero"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b != 0, errorMessage); - return a % b; - } -} - -// File: @openzeppelin/contracts/token/ERC20/IERC20.sol - -pragma solidity ^0.5.0; - -/** - * @dev Interface of the ERC20 standard as defined in the EIP. Does not include - * the optional functions; to access them see {ERC20Detailed}. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -// File: contracts/interface/IBalancerPool.sol - -pragma solidity ^0.5.0; - - - -interface IBalancerPool { - function getSwapFee() - external view returns (uint256 balance); - - function getDenormalizedWeight(IERC20 token) - external view returns (uint256 balance); - - function getBalance(IERC20 token) - external view returns (uint256 balance); - - function swapExactAmountIn( - IERC20 tokenIn, - uint256 tokenAmountIn, - IERC20 tokenOut, - uint256 minAmountOut, - uint256 maxPrice - ) - external - returns (uint256 tokenAmountOut, uint256 spotPriceAfter); -} - - -// 0xA961672E8Db773be387e775bc4937C678F3ddF9a -interface IBalancerHelper { - function getReturns( - IBalancerPool pool, - IERC20 fromToken, - IERC20 destToken, - uint256[] calldata amounts - ) - external - view - returns(uint256[] memory rets); -} - -// File: contracts/BalancerLib.sol - -pragma solidity ^0.5.0; - - -library BalancerLib { - uint public constant BONE = 10**18; - - uint public constant MIN_BOUND_TOKENS = 2; - uint public constant MAX_BOUND_TOKENS = 8; - - uint public constant MIN_FEE = BONE / 10**6; - uint public constant MAX_FEE = BONE / 10; - uint public constant EXIT_FEE = 0; - - uint public constant MIN_WEIGHT = BONE; - uint public constant MAX_WEIGHT = BONE * 50; - uint public constant MAX_TOTAL_WEIGHT = BONE * 50; - uint public constant MIN_BALANCE = BONE / 10**12; - - uint public constant INIT_POOL_SUPPLY = BONE * 100; - - uint public constant MIN_BPOW_BASE = 1 wei; - uint public constant MAX_BPOW_BASE = (2 * BONE) - 1 wei; - uint public constant BPOW_PRECISION = BONE / 10**10; - - uint public constant MAX_IN_RATIO = BONE / 2; - uint public constant MAX_OUT_RATIO = (BONE / 3) + 1 wei; - - function btoi(uint a) - internal pure - returns (uint) - { - return a / BONE; - } - - function bfloor(uint a) - internal pure - returns (uint) - { - return btoi(a) * BONE; - } - - function badd(uint a, uint b) - internal pure - returns (uint) - { - uint c = a + b; - require(c >= a, "ERR_ADD_OVERFLOW"); - return c; - } - - function bsub(uint a, uint b) - internal pure - returns (uint) - { - (uint c, bool flag) = bsubSign(a, b); - require(!flag, "ERR_SUB_UNDERFLOW"); - return c; - } - - function bsubSign(uint a, uint b) - internal pure - returns (uint, bool) - { - if (a >= b) { - return (a - b, false); - } else { - return (b - a, true); - } - } - - function bmul(uint a, uint b) - internal pure - returns (uint) - { - uint c0 = a * b; - require(a == 0 || c0 / a == b, "ERR_MUL_OVERFLOW"); - uint c1 = c0 + (BONE / 2); - require(c1 >= c0, "ERR_MUL_OVERFLOW"); - uint c2 = c1 / BONE; - return c2; - } - - function bdiv(uint a, uint b) - internal pure - returns (uint) - { - require(b != 0, "ERR_DIV_ZERO"); - uint c0 = a * BONE; - require(a == 0 || c0 / a == BONE, "ERR_DIV_INTERNAL"); // bmul overflow - uint c1 = c0 + (b / 2); - require(c1 >= c0, "ERR_DIV_INTERNAL"); // badd require - uint c2 = c1 / b; - return c2; - } - - // DSMath.wpow - function bpowi(uint a, uint n) - internal pure - returns (uint) - { - uint z = n % 2 != 0 ? a : BONE; - - for (n /= 2; n != 0; n /= 2) { - a = bmul(a, a); - - if (n % 2 != 0) { - z = bmul(z, a); - } - } - return z; - } - - // Compute b^(e.w) by splitting it into (b^e)*(b^0.w). - // Use `bpowi` for `b^e` and `bpowK` for k iterations - // of approximation of b^0.w - function bpow(uint base, uint exp) - internal pure - returns (uint) - { - require(base >= MIN_BPOW_BASE, "ERR_BPOW_BASE_TOO_LOW"); - require(base <= MAX_BPOW_BASE, "ERR_BPOW_BASE_TOO_HIGH"); - - uint whole = bfloor(exp); - uint remain = bsub(exp, whole); - - uint wholePow = bpowi(base, btoi(whole)); - - if (remain == 0) { - return wholePow; - } - - uint partialResult = bpowApprox(base, remain, BPOW_PRECISION); - return bmul(wholePow, partialResult); - } - - function bpowApprox(uint base, uint exp, uint precision) - internal pure - returns (uint) - { - // term 0: - uint a = exp; - (uint x, bool xneg) = bsubSign(base, BONE); - uint term = BONE; - uint sum = term; - bool negative = false; - - - // term(k) = numer / denom - // = (product(a - i - 1, i=1-->k) * x^k) / (k!) - // each iteration, multiply previous term by (a-(k-1)) * x / k - // continue until term is less than precision - for (uint i = 1; term >= precision; i++) { - uint bigK = i * BONE; - (uint c, bool cneg) = bsubSign(a, bsub(bigK, BONE)); - term = bmul(term, bmul(c, x)); - term = bdiv(term, bigK); - if (term == 0) break; - - if (xneg) negative = !negative; - if (cneg) negative = !negative; - if (negative) { - sum = bsub(sum, term); - } else { - sum = badd(sum, term); - } - } - - return sum; - } - - /********************************************************************************************** - // calcSpotPrice // - // sP = spotPrice // - // bI = tokenBalanceIn ( bI / wI ) 1 // - // bO = tokenBalanceOut sP = ----------- * ---------- // - // wI = tokenWeightIn ( bO / wO ) ( 1 - sF ) // - // wO = tokenWeightOut // - // sF = swapFee // - **********************************************************************************************/ - function calcSpotPrice( - uint tokenBalanceIn, - uint tokenWeightIn, - uint tokenBalanceOut, - uint tokenWeightOut, - uint swapFee - ) - internal pure - returns (uint spotPrice) - { - uint numer = bdiv(tokenBalanceIn, tokenWeightIn); - uint denom = bdiv(tokenBalanceOut, tokenWeightOut); - uint ratio = bdiv(numer, denom); - uint scale = bdiv(BONE, bsub(BONE, swapFee)); - return (spotPrice = bmul(ratio, scale)); - } - - /********************************************************************************************** - // calcOutGivenIn // - // aO = tokenAmountOut // - // bO = tokenBalanceOut // - // bI = tokenBalanceIn / / bI \ (wI / wO) \ // - // aI = tokenAmountIn aO = bO * | 1 - | -------------------------- | ^ | // - // wI = tokenWeightIn \ \ ( bI + ( aI * ( 1 - sF )) / / // - // wO = tokenWeightOut // - // sF = swapFee // - **********************************************************************************************/ - function calcOutGivenIn( - uint tokenBalanceIn, - uint tokenWeightIn, - uint tokenBalanceOut, - uint tokenWeightOut, - uint tokenAmountIn, - uint swapFee - ) - internal pure - returns (uint tokenAmountOut) - { - uint weightRatio = bdiv(tokenWeightIn, tokenWeightOut); - uint adjustedIn = bsub(BONE, swapFee); - adjustedIn = bmul(tokenAmountIn, adjustedIn); - uint y = bdiv(tokenBalanceIn, badd(tokenBalanceIn, adjustedIn)); - if (y == 0) { - return 0; - } - uint foo = bpow(y, weightRatio); - uint bar = bsub(BONE, foo); - tokenAmountOut = bmul(tokenBalanceOut, bar); - return tokenAmountOut; - } - - /********************************************************************************************** - // calcInGivenOut // - // aI = tokenAmountIn // - // bO = tokenBalanceOut / / bO \ (wO / wI) \ // - // bI = tokenBalanceIn bI * | | ------------ | ^ - 1 | // - // aO = tokenAmountOut aI = \ \ ( bO - aO ) / / // - // wI = tokenWeightIn -------------------------------------------- // - // wO = tokenWeightOut ( 1 - sF ) // - // sF = swapFee // - **********************************************************************************************/ - function calcInGivenOut( - uint tokenBalanceIn, - uint tokenWeightIn, - uint tokenBalanceOut, - uint tokenWeightOut, - uint tokenAmountOut, - uint swapFee - ) - internal pure - returns (uint tokenAmountIn) - { - uint weightRatio = bdiv(tokenWeightOut, tokenWeightIn); - uint diff = bsub(tokenBalanceOut, tokenAmountOut); - uint y = bdiv(tokenBalanceOut, diff); - if (y == 0) { - return 0; - } - uint foo = bpow(y, weightRatio); - foo = bsub(foo, BONE); - tokenAmountIn = bsub(BONE, swapFee); - tokenAmountIn = bdiv(bmul(tokenBalanceIn, foo), tokenAmountIn); - return tokenAmountIn; - } - - /********************************************************************************************** - // calcPoolOutGivenSingleIn // - // pAo = poolAmountOut / \ // - // tAi = tokenAmountIn /// / // wI \ \\ \ wI \ // - // wI = tokenWeightIn //| tAi *| 1 - || 1 - -- | * sF || + tBi \ -- \ // - // tW = totalWeight pAo=|| \ \ \\ tW / // | ^ tW | * pS - pS // - // tBi = tokenBalanceIn \\ ------------------------------------- / / // - // pS = poolSupply \\ tBi / / // - // sF = swapFee \ / // - **********************************************************************************************/ - function calcPoolOutGivenSingleIn( - uint tokenBalanceIn, - uint tokenWeightIn, - uint poolSupply, - uint totalWeight, - uint tokenAmountIn, - uint swapFee - ) - internal pure - returns (uint poolAmountOut) - { - // Charge the trading fee for the proportion of tokenAi - /// which is implicitly traded to the other pool tokens. - // That proportion is (1- weightTokenIn) - // tokenAiAfterFee = tAi * (1 - (1-weightTi) * poolFee); - uint normalizedWeight = bdiv(tokenWeightIn, totalWeight); - uint zaz = bmul(bsub(BONE, normalizedWeight), swapFee); - uint tokenAmountInAfterFee = bmul(tokenAmountIn, bsub(BONE, zaz)); - - uint newTokenBalanceIn = badd(tokenBalanceIn, tokenAmountInAfterFee); - uint tokenInRatio = bdiv(newTokenBalanceIn, tokenBalanceIn); - - // uint newPoolSupply = (ratioTi ^ weightTi) * poolSupply; - uint poolRatio = bpow(tokenInRatio, normalizedWeight); - uint newPoolSupply = bmul(poolRatio, poolSupply); - poolAmountOut = bsub(newPoolSupply, poolSupply); - return poolAmountOut; - } - - /********************************************************************************************** - // calcSingleInGivenPoolOut // - // tAi = tokenAmountIn //(pS + pAo)\ / 1 \\ // - // pS = poolSupply || --------- | ^ | --------- || * bI - bI // - // pAo = poolAmountOut \\ pS / \(wI / tW)// // - // bI = balanceIn tAi = -------------------------------------------- // - // wI = weightIn / wI \ // - // tW = totalWeight | 1 - ---- | * sF // - // sF = swapFee \ tW / // - **********************************************************************************************/ - function calcSingleInGivenPoolOut( - uint tokenBalanceIn, - uint tokenWeightIn, - uint poolSupply, - uint totalWeight, - uint poolAmountOut, - uint swapFee - ) - internal pure - returns (uint tokenAmountIn) - { - uint normalizedWeight = bdiv(tokenWeightIn, totalWeight); - uint newPoolSupply = badd(poolSupply, poolAmountOut); - uint poolRatio = bdiv(newPoolSupply, poolSupply); - - //uint newBalTi = poolRatio^(1/weightTi) * balTi; - uint boo = bdiv(BONE, normalizedWeight); - uint tokenInRatio = bpow(poolRatio, boo); - uint newTokenBalanceIn = bmul(tokenInRatio, tokenBalanceIn); - uint tokenAmountInAfterFee = bsub(newTokenBalanceIn, tokenBalanceIn); - // Do reverse order of fees charged in joinswap_ExternAmountIn, this way - // ``` pAo == joinswap_ExternAmountIn(Ti, joinswap_PoolAmountOut(pAo, Ti)) ``` - //uint tAi = tAiAfterFee / (1 - (1-weightTi) * swapFee) ; - uint zar = bmul(bsub(BONE, normalizedWeight), swapFee); - tokenAmountIn = bdiv(tokenAmountInAfterFee, bsub(BONE, zar)); - return tokenAmountIn; - } - - /********************************************************************************************** - // calcSingleOutGivenPoolIn // - // tAo = tokenAmountOut / / \\ // - // bO = tokenBalanceOut / // pS - (pAi * (1 - eF)) \ / 1 \ \\ // - // pAi = poolAmountIn | bO - || ----------------------- | ^ | --------- | * b0 || // - // ps = poolSupply \ \\ pS / \(wO / tW)/ // // - // wI = tokenWeightIn tAo = \ \ // // - // tW = totalWeight / / wO \ \ // - // sF = swapFee * | 1 - | 1 - ---- | * sF | // - // eF = exitFee \ \ tW / / // - **********************************************************************************************/ - function calcSingleOutGivenPoolIn( - uint tokenBalanceOut, - uint tokenWeightOut, - uint poolSupply, - uint totalWeight, - uint poolAmountIn, - uint swapFee - ) - internal pure - returns (uint tokenAmountOut) - { - uint normalizedWeight = bdiv(tokenWeightOut, totalWeight); - // charge exit fee on the pool token side - // pAiAfterExitFee = pAi*(1-exitFee) - uint poolAmountInAfterExitFee = bmul(poolAmountIn, bsub(BONE, EXIT_FEE)); - uint newPoolSupply = bsub(poolSupply, poolAmountInAfterExitFee); - uint poolRatio = bdiv(newPoolSupply, poolSupply); - - // newBalTo = poolRatio^(1/weightTo) * balTo; - uint tokenOutRatio = bpow(poolRatio, bdiv(BONE, normalizedWeight)); - uint newTokenBalanceOut = bmul(tokenOutRatio, tokenBalanceOut); - - uint tokenAmountOutBeforeSwapFee = bsub(tokenBalanceOut, newTokenBalanceOut); - - // charge swap fee on the output token side - //uint tAo = tAoBeforeSwapFee * (1 - (1-weightTo) * swapFee) - uint zaz = bmul(bsub(BONE, normalizedWeight), swapFee); - tokenAmountOut = bmul(tokenAmountOutBeforeSwapFee, bsub(BONE, zaz)); - return tokenAmountOut; - } - - /********************************************************************************************** - // calcPoolInGivenSingleOut // - // pAi = poolAmountIn // / tAo \\ / wO \ \ // - // bO = tokenBalanceOut // | bO - -------------------------- |\ | ---- | \ // - // tAo = tokenAmountOut pS - || \ 1 - ((1 - (tO / tW)) * sF)/ | ^ \ tW / * pS | // - // ps = poolSupply \\ -----------------------------------/ / // - // wO = tokenWeightOut pAi = \\ bO / / // - // tW = totalWeight ------------------------------------------------------------- // - // sF = swapFee ( 1 - eF ) // - // eF = exitFee // - **********************************************************************************************/ - function calcPoolInGivenSingleOut( - uint tokenBalanceOut, - uint tokenWeightOut, - uint poolSupply, - uint totalWeight, - uint tokenAmountOut, - uint swapFee - ) - internal pure - returns (uint poolAmountIn) - { - - // charge swap fee on the output token side - uint normalizedWeight = bdiv(tokenWeightOut, totalWeight); - //uint tAoBeforeSwapFee = tAo / (1 - (1-weightTo) * swapFee) ; - uint zoo = bsub(BONE, normalizedWeight); - uint zar = bmul(zoo, swapFee); - uint tokenAmountOutBeforeSwapFee = bdiv(tokenAmountOut, bsub(BONE, zar)); - - uint newTokenBalanceOut = bsub(tokenBalanceOut, tokenAmountOutBeforeSwapFee); - uint tokenOutRatio = bdiv(newTokenBalanceOut, tokenBalanceOut); - - //uint newPoolSupply = (ratioTo ^ weightTo) * poolSupply; - uint poolRatio = bpow(tokenOutRatio, normalizedWeight); - uint newPoolSupply = bmul(poolRatio, poolSupply); - uint poolAmountInAfterExitFee = bsub(poolSupply, newPoolSupply); - - // charge exit fee on the pool token side - // pAi = pAiAfterExitFee/(1-exitFee) - poolAmountIn = bdiv(poolAmountInAfterExitFee, bsub(BONE, EXIT_FEE)); - return poolAmountIn; - } -} - -// File: contracts/BalancerHelper.sol - -pragma solidity ^0.5.0; - - - - - - -contract BalancerHelper { - using SafeMath for uint256; - - function getReturns( - IBalancerPool pool, - IERC20 fromToken, - IERC20 destToken, - uint256[] calldata amounts - ) - external - view - returns(uint256[] memory rets) - { - uint256 swapFee = pool.getSwapFee(); - uint256 fromBalance = pool.getBalance(fromToken); - uint256 destBalance = pool.getBalance(destToken); - uint256 fromWeight = pool.getDenormalizedWeight(fromToken); - uint256 destWeight = pool.getDenormalizedWeight(destToken); - - rets = new uint256[](amounts.length); - for (uint i = 0; i < amounts.length && amounts[i].mul(2) <= fromBalance; i++) { - rets[i] = BalancerLib.calcOutGivenIn( - fromBalance, - fromWeight, - destBalance, - destWeight, - amounts[i], - swapFee - ); - } - } -} diff --git a/BancorFinder.full.abi b/BancorFinder.full.abi deleted file mode 100644 index ed5e58f..0000000 --- a/BancorFinder.full.abi +++ /dev/null @@ -1 +0,0 @@ -[{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"}],"name":"buildBancorPath","outputs":[{"internalType":"address[]","name":"path","type":"address[]"}],"payable":false,"stateMutability":"view","type":"function"}] \ No newline at end of file diff --git a/BancorFinder.full.bin b/BancorFinder.full.bin deleted file mode 100644 index bf574c9..0000000 --- a/BancorFinder.full.bin +++ /dev/null @@ -1 +0,0 @@ -608060405234801561001057600080fd5b506108b8806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063fa8f6d1314610030575b600080fd5b61005e6004803603604081101561004657600080fd5b506001600160a01b03813581169160200135166100ae565b60408051602080825283518183015283519192839290830191858101910280838360005b8381101561009a578181015183820152602001610082565b505050509050019250505060405180910390f35b6060816001600160a01b0316836001600160a01b031614156100df5750604080516000815260208101909152610844565b6100f1836001600160a01b031661084a565b1561010e5773eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee92505b610120826001600160a01b031661084a565b1561013d5773eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee91505b6001600160a01b038316731f573d6fb3f13d689ff844b4ce37794d79a7ff1c148061018457506001600160a01b038216731f573d6fb3f13d689ff844b4ce37794d79a7ff1c145b156101af576040805160038082526080820190925290602082016060803883390190505090506101d1565b60408051600580825260c08201909252906020820160a0803883390190505090505b60008060007352ae12abe5d8bd778bd5397f99ca900624cfadd46001600160a01b031663bb34534c6040518163ffffffff1660e01b815260040180807f42616e636f72436f6e7665727465725265676973747279000000000000000000815250602001905060206040518083038186803b15801561024e57600080fd5b505afa158015610262573d6000803e3d6000fd5b505050506040513d602081101561027857600080fd5b505190506001600160a01b038616731f573d6fb3f13d689ff844b4ce37794d79a7ff1c1461043657600060606001600160a01b0380841690620186a090636b625ad960e11b906102c9908c1661084a565b6102d3578a6102e9565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee5b604080516001600160a01b039092166024830152600060448084019190915281518084039091018152606490920181526020820180516001600160e01b03166001600160e01b0319909416939093178352518151919290918291908083835b602083106103675780518252601f199092019160209182019101610348565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d80600081146103c8576040519150601f19603f3d011682016040523d82523d6000602084013e6103cd565b606091505b5091509150816103f65760408051600080825260208201909252905b5095505050505050610844565b80806020019051602081101561040b57600080fd5b505194506001600160a01b0385166104335760408051600080825260208201909252906103e9565b50505b6001600160a01b038516731f573d6fb3f13d689ff844b4ce37794d79a7ff1c146105e757600060606001600160a01b0380841690620186a090636b625ad960e11b90610483908b1661084a565b61048d57896104a3565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee5b604080516001600160a01b039092166024830152600060448084019190915281518084039091018152606490920181526020820180516001600160e01b03166001600160e01b0319909416939093178352518151919290918291908083835b602083106105215780518252601f199092019160209182019101610502565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d8060008114610582576040519150601f19603f3d011682016040523d82523d6000602084013e610587565b606091505b5091509150816105a75760408051600080825260208201909252906103e9565b8080602001905160208110156105bc57600080fd5b505193506001600160a01b0384166105e45760408051600080825260208201909252906103e9565b50505b6001600160a01b038516731f573d6fb3f13d689ff844b4ce37794d79a7ff1c14156106ab57858460008151811061061a57fe5b60200260200101906001600160a01b031690816001600160a01b031681525050828460018151811061064857fe5b60200260200101906001600160a01b031690816001600160a01b031681525050731f573d6fb3f13d689ff844b4ce37794d79a7ff1c8460028151811061068a57fe5b6001600160a01b039092166020928302919091019091015250610844915050565b6001600160a01b038616731f573d6fb3f13d689ff844b4ce37794d79a7ff1c141561074e57731f573d6fb3f13d689ff844b4ce37794d79a7ff1c846000815181106106f257fe5b60200260200101906001600160a01b031690816001600160a01b031681525050818460018151811061072057fe5b60200260200101906001600160a01b031690816001600160a01b031681525050848460028151811061068a57fe5b858460008151811061075c57fe5b60200260200101906001600160a01b031690816001600160a01b031681525050828460018151811061078a57fe5b60200260200101906001600160a01b031690816001600160a01b031681525050731f573d6fb3f13d689ff844b4ce37794d79a7ff1c846002815181106107cc57fe5b60200260200101906001600160a01b031690816001600160a01b03168152505081846003815181106107fa57fe5b60200260200101906001600160a01b031690816001600160a01b031681525050848460048151811061082857fe5b6001600160a01b03909216602092830291909101909101525050505b92915050565b60006001600160a01b038216158061084457506001600160a01b03821673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee149291505056fea265627a7a72315820c9a4717cfd857e00999bd9a99f85e5e734fb9d10351f8d6b3fdaa50e9b85ec2d64736f6c63430005110032 \ No newline at end of file diff --git a/BancorFinder.full.sol b/BancorFinder.full.sol deleted file mode 100644 index 04cfa76..0000000 --- a/BancorFinder.full.sol +++ /dev/null @@ -1,635 +0,0 @@ - -// File: @openzeppelin/contracts/token/ERC20/IERC20.sol - -pragma solidity ^0.5.0; - -/** - * @dev Interface of the ERC20 standard as defined in the EIP. Does not include - * the optional functions; to access them see {ERC20Detailed}. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -// File: contracts/interface/IBancorContractRegistry.sol - -pragma solidity ^0.5.0; - - -contract IBancorContractRegistry { - function addressOf(bytes32 contractName) external view returns (address); -} - -// File: contracts/interface/IBancorConverterRegistry.sol - -pragma solidity ^0.5.0; - - - -interface IBancorConverterRegistry { - - function getConvertibleTokenSmartTokenCount(IERC20 convertibleToken) - external view returns(uint256); - - function getConvertibleTokenSmartTokens(IERC20 convertibleToken) - external view returns(address[] memory); - - function getConvertibleTokenSmartToken(IERC20 convertibleToken, uint256 index) - external view returns(address); - - function isConvertibleTokenSmartToken(IERC20 convertibleToken, address value) - external view returns(bool); -} - -// File: @openzeppelin/contracts/math/SafeMath.sol - -pragma solidity ^0.5.0; - -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint256 a, uint256 b) internal pure returns (uint256) { - uint256 c = a + b; - require(c >= a, "SafeMath: addition overflow"); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - */ - function sub(uint256 a, uint256 b) internal pure returns (uint256) { - return sub(a, b, "SafeMath: subtraction overflow"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - * - * _Available since v2.4.0._ - */ - function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b <= a, errorMessage); - uint256 c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint256 a, uint256 b) internal pure returns (uint256) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint256 c = a * b; - require(c / a == b, "SafeMath: multiplication overflow"); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint256 a, uint256 b) internal pure returns (uint256) { - return div(a, b, "SafeMath: division by zero"); - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts with custom message on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint256 c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint256 a, uint256 b) internal pure returns (uint256) { - return mod(a, b, "SafeMath: modulo by zero"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b != 0, errorMessage); - return a % b; - } -} - -// File: @openzeppelin/contracts/utils/Address.sol - -pragma solidity ^0.5.5; - -/** - * @dev Collection of functions related to the address type - */ -library Address { - /** - * @dev Returns true if `account` is a contract. - * - * [IMPORTANT] - * ==== - * It is unsafe to assume that an address for which this function returns - * false is an externally-owned account (EOA) and not a contract. - * - * Among others, `isContract` will return false for the following - * types of addresses: - * - * - an externally-owned account - * - a contract in construction - * - an address where a contract will be created - * - an address where a contract lived, but was destroyed - * ==== - */ - function isContract(address account) internal view returns (bool) { - // According to EIP-1052, 0x0 is the value returned for not-yet created accounts - // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned - // for accounts without code, i.e. `keccak256('')` - bytes32 codehash; - bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; - // solhint-disable-next-line no-inline-assembly - assembly { codehash := extcodehash(account) } - return (codehash != accountHash && codehash != 0x0); - } - - /** - * @dev Converts an `address` into `address payable`. Note that this is - * simply a type cast: the actual underlying value is not changed. - * - * _Available since v2.4.0._ - */ - function toPayable(address account) internal pure returns (address payable) { - return address(uint160(account)); - } - - /** - * @dev Replacement for Solidity's `transfer`: sends `amount` wei to - * `recipient`, forwarding all available gas and reverting on errors. - * - * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost - * of certain opcodes, possibly making contracts go over the 2300 gas limit - * imposed by `transfer`, making them unable to receive funds via - * `transfer`. {sendValue} removes this limitation. - * - * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more]. - * - * IMPORTANT: because control is transferred to `recipient`, care must be - * taken to not create reentrancy vulnerabilities. Consider using - * {ReentrancyGuard} or the - * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern]. - * - * _Available since v2.4.0._ - */ - function sendValue(address payable recipient, uint256 amount) internal { - require(address(this).balance >= amount, "Address: insufficient balance"); - - // solhint-disable-next-line avoid-call-value - (bool success, ) = recipient.call.value(amount)(""); - require(success, "Address: unable to send value, recipient may have reverted"); - } -} - -// File: @openzeppelin/contracts/token/ERC20/SafeERC20.sol - -pragma solidity ^0.5.0; - - - - -/** - * @title SafeERC20 - * @dev Wrappers around ERC20 operations that throw on failure (when the token - * contract returns false). Tokens that return no value (and instead revert or - * throw on failure) are also supported, non-reverting calls are assumed to be - * successful. - * To use this library you can add a `using SafeERC20 for ERC20;` statement to your contract, - * which allows you to call the safe operations as `token.safeTransfer(...)`, etc. - */ -library SafeERC20 { - using SafeMath for uint256; - using Address for address; - - function safeTransfer(IERC20 token, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); - } - - function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); - } - - function safeApprove(IERC20 token, address spender, uint256 value) internal { - // safeApprove should only be called when setting an initial allowance, - // or when resetting it to zero. To increase and decrease it, use - // 'safeIncreaseAllowance' and 'safeDecreaseAllowance' - // solhint-disable-next-line max-line-length - require((value == 0) || (token.allowance(address(this), spender) == 0), - "SafeERC20: approve from non-zero to non-zero allowance" - ); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value)); - } - - function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).add(value); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - function safeDecreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).sub(value, "SafeERC20: decreased allowance below zero"); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - /** - * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement - * on the return value: the return value is optional (but if data is returned, it must not be false). - * @param token The token targeted by the call. - * @param data The call data (encoded using abi.encode or one of its variants). - */ - function callOptionalReturn(IERC20 token, bytes memory data) private { - // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since - // we're implementing it ourselves. - - // A Solidity high level call has three parts: - // 1. The target address is checked to verify it contains contract code - // 2. The call itself is made, and success asserted - // 3. The return value is decoded, which in turn checks the size of the returned data. - // solhint-disable-next-line max-line-length - require(address(token).isContract(), "SafeERC20: call to non-contract"); - - // solhint-disable-next-line avoid-low-level-calls - (bool success, bytes memory returndata) = address(token).call(data); - require(success, "SafeERC20: low-level call failed"); - - if (returndata.length > 0) { // Return data is optional - // solhint-disable-next-line max-line-length - require(abi.decode(returndata, (bool)), "SafeERC20: ERC20 operation did not succeed"); - } - } -} - -// File: contracts/UniversalERC20.sol - -pragma solidity ^0.5.0; - - - - - -library UniversalERC20 { - - using SafeMath for uint256; - using SafeERC20 for IERC20; - - IERC20 private constant ZERO_ADDRESS = IERC20(0x0000000000000000000000000000000000000000); - IERC20 private constant ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - function universalTransfer(IERC20 token, address to, uint256 amount) internal returns(bool) { - if (amount == 0) { - return true; - } - - if (isETH(token)) { - address(uint160(to)).transfer(amount); - } else { - token.safeTransfer(to, amount); - return true; - } - } - - function universalTransferFrom(IERC20 token, address from, address to, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - require(from == msg.sender && msg.value >= amount, "Wrong useage of ETH.universalTransferFrom()"); - if (to != address(this)) { - address(uint160(to)).transfer(amount); - } - if (msg.value > amount) { - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(from, to, amount); - } - } - - function universalTransferFromSenderToThis(IERC20 token, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - if (msg.value > amount) { - // Return remainder if exist - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(msg.sender, address(this), amount); - } - } - - function universalApprove(IERC20 token, address to, uint256 amount) internal { - if (!isETH(token)) { - if (amount == 0) { - token.safeApprove(to, 0); - return; - } - - uint256 allowance = token.allowance(address(this), to); - if (allowance < amount) { - if (allowance > 0) { - token.safeApprove(to, 0); - } - token.safeApprove(to, amount); - } - } - } - - function universalBalanceOf(IERC20 token, address who) internal view returns (uint256) { - if (isETH(token)) { - return who.balance; - } else { - return token.balanceOf(who); - } - } - - function universalDecimals(IERC20 token) internal view returns (uint256) { - - if (isETH(token)) { - return 18; - } - - (bool success, bytes memory data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("decimals()") - ); - if (!success || data.length == 0) { - (success, data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("DECIMALS()") - ); - } - - return (success && data.length > 0) ? abi.decode(data, (uint256)) : 18; - } - - function isETH(IERC20 token) internal pure returns(bool) { - return (address(token) == address(ZERO_ADDRESS) || address(token) == address(ETH_ADDRESS)); - } - - function notExist(IERC20 token) internal pure returns(bool) { - return (address(token) == address(-1)); - } -} - -// File: contracts/BancorFinder.sol - -pragma solidity ^0.5.0; - - - - - - -contract BancorFinder { - using UniversalERC20 for IERC20; - - IERC20 constant internal ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - IERC20 constant internal bnt = IERC20(0x1F573D6Fb3F13d689FF844B4cE37794d79a7FF1C); - IBancorContractRegistry constant internal bancorContractRegistry = IBancorContractRegistry(0x52Ae12ABe5D8BD778BD5397F99cA900624CfADD4); - - function buildBancorPath( - IERC20 fromToken, - IERC20 destToken - ) - public - view - returns(address[] memory path) - { - if (fromToken == destToken) { - return new address[](0); - } - - if (fromToken.isETH()) { - fromToken = ETH_ADDRESS; - } - if (destToken.isETH()) { - destToken = ETH_ADDRESS; - } - - if (fromToken == bnt || destToken == bnt) { - path = new address[](3); - } else { - path = new address[](5); - } - - address fromConverter; - address toConverter; - - IBancorConverterRegistry bancorConverterRegistry = IBancorConverterRegistry( - bancorContractRegistry.addressOf("BancorConverterRegistry") - ); - - if (fromToken != bnt) { - (bool success, bytes memory data) = address(bancorConverterRegistry).staticcall.gas(100000)(abi.encodeWithSelector( - bancorConverterRegistry.getConvertibleTokenSmartToken.selector, - fromToken.isETH() ? ETH_ADDRESS : fromToken, - 0 - )); - if (!success) { - return new address[](0); - } - - fromConverter = abi.decode(data, (address)); - if (fromConverter == address(0)) { - return new address[](0); - } - } - - if (destToken != bnt) { - (bool success, bytes memory data) = address(bancorConverterRegistry).staticcall.gas(100000)(abi.encodeWithSelector( - bancorConverterRegistry.getConvertibleTokenSmartToken.selector, - destToken.isETH() ? ETH_ADDRESS : destToken, - 0 - )); - if (!success) { - return new address[](0); - } - - toConverter = abi.decode(data, (address)); - if (toConverter == address(0)) { - return new address[](0); - } - } - - if (destToken == bnt) { - path[0] = address(fromToken); - path[1] = fromConverter; - path[2] = address(bnt); - return path; - } - - if (fromToken == bnt) { - path[0] = address(bnt); - path[1] = toConverter; - path[2] = address(destToken); - return path; - } - - path[0] = address(fromToken); - path[1] = fromConverter; - path[2] = address(bnt); - path[3] = toConverter; - path[4] = address(destToken); - return path; - } -} diff --git a/CompoundRegistry.full.abi b/CompoundRegistry.full.abi deleted file mode 100644 index 108ee72..0000000 --- a/CompoundRegistry.full.abi +++ /dev/null @@ -1 +0,0 @@ -[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"constant":false,"inputs":[{"internalType":"contract ICompoundToken","name":"cToken","type":"address"}],"name":"addCToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract ICompoundToken[]","name":"cTokens","type":"address[]"}],"name":"addCTokens","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"token","type":"address"}],"name":"cTokenByToken","outputs":[{"internalType":"contract ICompoundToken","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"isOwner","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"contract ICompoundToken","name":"cToken","type":"address"}],"name":"tokenByCToken","outputs":[{"internalType":"contract IERC20","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file diff --git a/CompoundRegistry.full.bin b/CompoundRegistry.full.bin deleted file mode 100644 index b876836..0000000 --- a/CompoundRegistry.full.bin +++ /dev/null @@ -1 +0,0 @@ -608060405260006100176001600160e01b0361006616565b600080546001600160a01b0319166001600160a01b0383169081178255604051929350917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a35061006a565b3390565b610681806100796000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80638da5cb5b1161005b5780638da5cb5b1461016f5780638f32d59b146101775780639bbde94714610193578063f2fde38b146101b957610088565b80631d2493541461008d57806332a5d5bf146100ff5780633842805c14610141578063715018a614610167575b600080fd5b6100fd600480360360208110156100a357600080fd5b8101906020810181356401000000008111156100be57600080fd5b8201836020820111156100d057600080fd5b803590602001918460208302840111640100000000831117156100f257600080fd5b5090925090506101df565b005b6101256004803603602081101561011557600080fd5b50356001600160a01b0316610262565b604080516001600160a01b039092168252519081900360200190f35b6100fd6004803603602081101561015757600080fd5b50356001600160a01b03166102b8565b6100fd6103b0565b610125610441565b61017f610450565b604080519115158252519081900360200190f35b610125600480360360208110156101a957600080fd5b50356001600160a01b0316610474565b6100fd600480360360208110156101cf57600080fd5b50356001600160a01b03166104d5565b6101e7610450565b610226576040805162461bcd60e51b8152602060048201819052602482015260008051602061062d833981519152604482015290519081900360640190fd5b60005b8181101561025d5761025583838381811061024057fe5b905060200201356001600160a01b03166102b8565b600101610229565b505050565b6000610276826001600160a01b0316610528565b156102965750734ddc2d193948926d02f9b1fe9e1daa0718270ed56102b3565b506001600160a01b03808216600090815260026020526040902054165b919050565b6102c0610450565b6102ff576040805162461bcd60e51b8152602060048201819052602482015260008051602061062d833981519152604482015290519081900360640190fd5b6000816001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561033a57600080fd5b505afa15801561034e573d6000803e3d6000fd5b505050506040513d602081101561036457600080fd5b50516001600160a01b0392831660008181526001602090815260408083208054979095166001600160a01b03199788168117909555938252600290529190912080549093161790915550565b6103b8610450565b6103f7576040805162461bcd60e51b8152602060048201819052602482015260008051602061062d833981519152604482015290519081900360640190fd5b600080546040516001600160a01b03909116907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a3600080546001600160a01b0319169055565b6000546001600160a01b031690565b600080546001600160a01b0316610465610562565b6001600160a01b031614905090565b60006001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514156104b6575073eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee6102b3565b506001600160a01b039081166000908152600160205260409020541690565b6104dd610450565b61051c576040805162461bcd60e51b8152602060048201819052602482015260008051602061062d833981519152604482015290519081900360640190fd5b61052581610566565b50565b60006001600160a01b038216158061055c57506001600160a01b03821673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee145b92915050565b3390565b6001600160a01b0381166105ab5760405162461bcd60e51b81526004018080602001828103825260268152602001806106076026913960400191505060405180910390fd5b600080546040516001600160a01b03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a3600080546001600160a01b0319166001600160a01b039290921691909117905556fe4f776e61626c653a206e6577206f776e657220697320746865207a65726f20616464726573734f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572a265627a7a72315820f98c5c6f5735da117d41870c8dbcd834d42b2c7d374cfd246c8f2ec756462f6864736f6c63430005110032 \ No newline at end of file diff --git a/CompoundRegistry.full.sol b/CompoundRegistry.full.sol deleted file mode 100644 index 1f23607..0000000 --- a/CompoundRegistry.full.sol +++ /dev/null @@ -1,699 +0,0 @@ - -// File: @openzeppelin/contracts/GSN/Context.sol - -pragma solidity ^0.5.0; - -/* - * @dev Provides information about the current execution context, including the - * sender of the transaction and its data. While these are generally available - * via msg.sender and msg.data, they should not be accessed in such a direct - * manner, since when dealing with GSN meta-transactions the account sending and - * paying for execution may not be the actual sender (as far as an application - * is concerned). - * - * This contract is only required for intermediate, library-like contracts. - */ -contract Context { - // Empty internal constructor, to prevent people from mistakenly deploying - // an instance of this contract, which should be used via inheritance. - constructor () internal { } - // solhint-disable-previous-line no-empty-blocks - - function _msgSender() internal view returns (address payable) { - return msg.sender; - } - - function _msgData() internal view returns (bytes memory) { - this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691 - return msg.data; - } -} - -// File: @openzeppelin/contracts/ownership/Ownable.sol - -pragma solidity ^0.5.0; - -/** - * @dev Contract module which provides a basic access control mechanism, where - * there is an account (an owner) that can be granted exclusive access to - * specific functions. - * - * This module is used through inheritance. It will make available the modifier - * `onlyOwner`, which can be applied to your functions to restrict their use to - * the owner. - */ -contract Ownable is Context { - address private _owner; - - event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); - - /** - * @dev Initializes the contract setting the deployer as the initial owner. - */ - constructor () internal { - address msgSender = _msgSender(); - _owner = msgSender; - emit OwnershipTransferred(address(0), msgSender); - } - - /** - * @dev Returns the address of the current owner. - */ - function owner() public view returns (address) { - return _owner; - } - - /** - * @dev Throws if called by any account other than the owner. - */ - modifier onlyOwner() { - require(isOwner(), "Ownable: caller is not the owner"); - _; - } - - /** - * @dev Returns true if the caller is the current owner. - */ - function isOwner() public view returns (bool) { - return _msgSender() == _owner; - } - - /** - * @dev Leaves the contract without owner. It will not be possible to call - * `onlyOwner` functions anymore. Can only be called by the current owner. - * - * NOTE: Renouncing ownership will leave the contract without an owner, - * thereby removing any functionality that is only available to the owner. - */ - function renounceOwnership() public onlyOwner { - emit OwnershipTransferred(_owner, address(0)); - _owner = address(0); - } - - /** - * @dev Transfers ownership of the contract to a new account (`newOwner`). - * Can only be called by the current owner. - */ - function transferOwnership(address newOwner) public onlyOwner { - _transferOwnership(newOwner); - } - - /** - * @dev Transfers ownership of the contract to a new account (`newOwner`). - */ - function _transferOwnership(address newOwner) internal { - require(newOwner != address(0), "Ownable: new owner is the zero address"); - emit OwnershipTransferred(_owner, newOwner); - _owner = newOwner; - } -} - -// File: @openzeppelin/contracts/token/ERC20/IERC20.sol - -pragma solidity ^0.5.0; - -/** - * @dev Interface of the ERC20 standard as defined in the EIP. Does not include - * the optional functions; to access them see {ERC20Detailed}. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -// File: contracts/interface/ICompound.sol - -pragma solidity ^0.5.0; - - - -contract ICompound { - function markets(address cToken) - external - view - returns (bool isListed, uint256 collateralFactorMantissa); -} - - -contract ICompoundToken is IERC20 { - function underlying() external view returns (address); - - function exchangeRateStored() external view returns (uint256); - - function mint(uint256 mintAmount) external returns (uint256); - - function redeem(uint256 redeemTokens) external returns (uint256); -} - - -contract ICompoundEther is IERC20 { - function mint() external payable; - - function redeem(uint256 redeemTokens) external returns (uint256); -} - -// File: contracts/interface/ICompoundRegistry.sol - -pragma solidity ^0.5.0; - - - - -contract ICompoundRegistry { - function tokenByCToken(ICompoundToken cToken) external view returns(IERC20); - function cTokenByToken(IERC20 token) external view returns(ICompoundToken); -} - -// File: @openzeppelin/contracts/math/SafeMath.sol - -pragma solidity ^0.5.0; - -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint256 a, uint256 b) internal pure returns (uint256) { - uint256 c = a + b; - require(c >= a, "SafeMath: addition overflow"); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - */ - function sub(uint256 a, uint256 b) internal pure returns (uint256) { - return sub(a, b, "SafeMath: subtraction overflow"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - * - * _Available since v2.4.0._ - */ - function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b <= a, errorMessage); - uint256 c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint256 a, uint256 b) internal pure returns (uint256) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint256 c = a * b; - require(c / a == b, "SafeMath: multiplication overflow"); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint256 a, uint256 b) internal pure returns (uint256) { - return div(a, b, "SafeMath: division by zero"); - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts with custom message on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint256 c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint256 a, uint256 b) internal pure returns (uint256) { - return mod(a, b, "SafeMath: modulo by zero"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b != 0, errorMessage); - return a % b; - } -} - -// File: @openzeppelin/contracts/utils/Address.sol - -pragma solidity ^0.5.5; - -/** - * @dev Collection of functions related to the address type - */ -library Address { - /** - * @dev Returns true if `account` is a contract. - * - * [IMPORTANT] - * ==== - * It is unsafe to assume that an address for which this function returns - * false is an externally-owned account (EOA) and not a contract. - * - * Among others, `isContract` will return false for the following - * types of addresses: - * - * - an externally-owned account - * - a contract in construction - * - an address where a contract will be created - * - an address where a contract lived, but was destroyed - * ==== - */ - function isContract(address account) internal view returns (bool) { - // According to EIP-1052, 0x0 is the value returned for not-yet created accounts - // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned - // for accounts without code, i.e. `keccak256('')` - bytes32 codehash; - bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; - // solhint-disable-next-line no-inline-assembly - assembly { codehash := extcodehash(account) } - return (codehash != accountHash && codehash != 0x0); - } - - /** - * @dev Converts an `address` into `address payable`. Note that this is - * simply a type cast: the actual underlying value is not changed. - * - * _Available since v2.4.0._ - */ - function toPayable(address account) internal pure returns (address payable) { - return address(uint160(account)); - } - - /** - * @dev Replacement for Solidity's `transfer`: sends `amount` wei to - * `recipient`, forwarding all available gas and reverting on errors. - * - * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost - * of certain opcodes, possibly making contracts go over the 2300 gas limit - * imposed by `transfer`, making them unable to receive funds via - * `transfer`. {sendValue} removes this limitation. - * - * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more]. - * - * IMPORTANT: because control is transferred to `recipient`, care must be - * taken to not create reentrancy vulnerabilities. Consider using - * {ReentrancyGuard} or the - * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern]. - * - * _Available since v2.4.0._ - */ - function sendValue(address payable recipient, uint256 amount) internal { - require(address(this).balance >= amount, "Address: insufficient balance"); - - // solhint-disable-next-line avoid-call-value - (bool success, ) = recipient.call.value(amount)(""); - require(success, "Address: unable to send value, recipient may have reverted"); - } -} - -// File: @openzeppelin/contracts/token/ERC20/SafeERC20.sol - -pragma solidity ^0.5.0; - - - - -/** - * @title SafeERC20 - * @dev Wrappers around ERC20 operations that throw on failure (when the token - * contract returns false). Tokens that return no value (and instead revert or - * throw on failure) are also supported, non-reverting calls are assumed to be - * successful. - * To use this library you can add a `using SafeERC20 for ERC20;` statement to your contract, - * which allows you to call the safe operations as `token.safeTransfer(...)`, etc. - */ -library SafeERC20 { - using SafeMath for uint256; - using Address for address; - - function safeTransfer(IERC20 token, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); - } - - function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); - } - - function safeApprove(IERC20 token, address spender, uint256 value) internal { - // safeApprove should only be called when setting an initial allowance, - // or when resetting it to zero. To increase and decrease it, use - // 'safeIncreaseAllowance' and 'safeDecreaseAllowance' - // solhint-disable-next-line max-line-length - require((value == 0) || (token.allowance(address(this), spender) == 0), - "SafeERC20: approve from non-zero to non-zero allowance" - ); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value)); - } - - function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).add(value); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - function safeDecreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).sub(value, "SafeERC20: decreased allowance below zero"); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - /** - * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement - * on the return value: the return value is optional (but if data is returned, it must not be false). - * @param token The token targeted by the call. - * @param data The call data (encoded using abi.encode or one of its variants). - */ - function callOptionalReturn(IERC20 token, bytes memory data) private { - // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since - // we're implementing it ourselves. - - // A Solidity high level call has three parts: - // 1. The target address is checked to verify it contains contract code - // 2. The call itself is made, and success asserted - // 3. The return value is decoded, which in turn checks the size of the returned data. - // solhint-disable-next-line max-line-length - require(address(token).isContract(), "SafeERC20: call to non-contract"); - - // solhint-disable-next-line avoid-low-level-calls - (bool success, bytes memory returndata) = address(token).call(data); - require(success, "SafeERC20: low-level call failed"); - - if (returndata.length > 0) { // Return data is optional - // solhint-disable-next-line max-line-length - require(abi.decode(returndata, (bool)), "SafeERC20: ERC20 operation did not succeed"); - } - } -} - -// File: contracts/UniversalERC20.sol - -pragma solidity ^0.5.0; - - - - - -library UniversalERC20 { - - using SafeMath for uint256; - using SafeERC20 for IERC20; - - IERC20 private constant ZERO_ADDRESS = IERC20(0x0000000000000000000000000000000000000000); - IERC20 private constant ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - function universalTransfer(IERC20 token, address to, uint256 amount) internal returns(bool) { - if (amount == 0) { - return true; - } - - if (isETH(token)) { - address(uint160(to)).transfer(amount); - } else { - token.safeTransfer(to, amount); - return true; - } - } - - function universalTransferFrom(IERC20 token, address from, address to, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - require(from == msg.sender && msg.value >= amount, "Wrong useage of ETH.universalTransferFrom()"); - if (to != address(this)) { - address(uint160(to)).transfer(amount); - } - if (msg.value > amount) { - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(from, to, amount); - } - } - - function universalTransferFromSenderToThis(IERC20 token, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - if (msg.value > amount) { - // Return remainder if exist - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(msg.sender, address(this), amount); - } - } - - function universalApprove(IERC20 token, address to, uint256 amount) internal { - if (!isETH(token)) { - if (amount == 0) { - token.safeApprove(to, 0); - return; - } - - uint256 allowance = token.allowance(address(this), to); - if (allowance < amount) { - if (allowance > 0) { - token.safeApprove(to, 0); - } - token.safeApprove(to, amount); - } - } - } - - function universalBalanceOf(IERC20 token, address who) internal view returns (uint256) { - if (isETH(token)) { - return who.balance; - } else { - return token.balanceOf(who); - } - } - - function universalDecimals(IERC20 token) internal view returns (uint256) { - - if (isETH(token)) { - return 18; - } - - (bool success, bytes memory data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("decimals()") - ); - if (!success || data.length == 0) { - (success, data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("DECIMALS()") - ); - } - - return (success && data.length > 0) ? abi.decode(data, (uint256)) : 18; - } - - function isETH(IERC20 token) internal pure returns(bool) { - return (address(token) == address(ZERO_ADDRESS) || address(token) == address(ETH_ADDRESS)); - } - - function notExist(IERC20 token) internal pure returns(bool) { - return (address(token) == address(-1)); - } -} - -// File: contracts/CompoundRegistry.sol - -pragma solidity ^0.5.0; - - - - - - -contract CompoundRegistry is Ownable, ICompoundRegistry { - using UniversalERC20 for IERC20; - - ICompoundToken internal constant cETH = ICompoundToken(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5); - IERC20 internal constant ETH = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - mapping(address => address) private _tokenByCToken; - mapping(address => address) private _cTokenByToken; - - function tokenByCToken(ICompoundToken cToken) external view returns(IERC20) { - if (cToken == cETH) { - return ETH; - } - return IERC20(_tokenByCToken[address(cToken)]); - } - - function cTokenByToken(IERC20 token) external view returns(ICompoundToken) { - if (token.isETH()) { - return cETH; - } - return ICompoundToken(_cTokenByToken[address(token)]); - } - - function addCToken(ICompoundToken cToken) public onlyOwner { - IERC20 token = IERC20(cToken.underlying()); - _tokenByCToken[address(cToken)] = address(token); - _cTokenByToken[address(token)] = address(cToken); - } - - function addCTokens(ICompoundToken[] calldata cTokens) external onlyOwner { - for (uint i = 0; i < cTokens.length; i++) { - addCToken(cTokens[i]); - } - } -} diff --git a/KyberReserves.md b/KyberReserves.md deleted file mode 100644 index 5ddd03b..0000000 --- a/KyberReserves.md +++ /dev/null @@ -1,68 +0,0 @@ -# Kyber Reserves - -There are 3 different 1-byte prefixes of reserve id: -- `0xAA` for [Automated Price Reserve](https://developer.kyber.network/docs/Reserves-AutomatedPriceReserve/) -- `0xFF` for [Fed Price Reserve](https://developer.kyber.network/docs/Reserves-FedPriceReserve/) -- `0xBB` for Bridged Price Reserves - -## Multiple token reserves - -| Name | Address | Reserve ID | -| ---- | ---- | ---- | -| Reserve 1 | [`0x63825c174ab367968EC60f061753D3bbD36A0D8F`](https://etherscan.io/address/0x63825c174ab367968EC60f061753D3bbD36A0D8F) | `0xff4b796265722046707200000000000000000000000000000000000000000000` | -| Reserve 2 | [`0x7a3370075a54B187d7bD5DceBf0ff2B5552d4F7D`](https://etherscan.io/address/0x7a3370075a54B187d7bD5DceBf0ff2B5552d4F7D) | `0xffabcd0000000000000000000000000000000000000000000000000000000000` | -| Reserve 3 | [`0x4f32BbE8dFc9efD54345Fc936f9fEF1048746fCF`](https://etherscan.io/address/0x4f32BbE8dFc9efD54345Fc936f9fEF1048746fCF) | `0xff4f6e65426974205175616e7400000000000000000000000000000000000000` | - -## Bridged Reserves - -| Name | Address | Reserve ID | -| ---- | ---- | ---- | -| Oasis (Eth2Dai) | [`0x1E158c0e93c30d24e918Ef83d1e0bE23595C3c0f`](https://etherscan.io/address/0x1E158c0e93c30d24e918Ef83d1e0bE23595C3c0f) | `0xbb4f617369730000000000000000000000000000000000000000000000000000` | -| Uniswap | [`0x31E085Afd48a1d6e51Cc193153d625e8f0514C7F`](https://etherscan.io/address/0x31E085Afd48a1d6e51Cc193153d625e8f0514C7F) | `0xbb756e6973776170563100000000000000000000000000000000000000000000` | -| Uniswap V2 | [`0x10908C875D865C66f271F5d3949848971c9595C9`](https://etherscan.io/address/0x10908C875D865C66f271F5d3949848971c9595C9) | `0xbb756e6973776170563200000000000000000000000000000000000000000000` | -| Bancor | [`0x1fE867bFE9cbE0045467605B959A355223E3885D`](https://etherscan.io/address/0x1fE867bFE9cbE0045467605B959A355223E3885D)| `0xbb42414e434f5230305632000000000000000000000000000000000000000000` | - - -## Single token reserves - -| Name | Address | Reserve ID | -| ---- | ---- | ---- | -| [ABYSS](https://etherscan.io/address/0x0E8d6b471e332F140e7d9dbB99E5E3822F728DA6) | [`0x3e9FFBA3C3eB91f501817b031031a71de2d3163B`](https://etherscan.io/address/0x3e9FFBA3C3eB91f501817b031031a71de2d3163B) | `0xaa41627973730000000000000000000000000000000000000000000000000000` | -| [EQUAD](https://etherscan.io/address/0xC28e931814725BbEB9e670676FaBBCb694Fe7DF2) | [`0x0232Ba609782Cea145Ec3663F52CF7aEb4AC773C`](https://etherscan.io/address/0x0232Ba609782Cea145Ec3663F52CF7aEb4AC773C) | `0xaa65515541440000000000000000000000000000000000000000000000000000` | -| [MLN](https://etherscan.io/address/0xec67005c4E498Ec7f55E092bd1d35cbC47C91892) | [`0xa33c7c22d0BB673c2aEa2C048BB883b679fa1BE9`](https://etherscan.io/address/0xa33c7c22d0BB673c2aEa2C048BB883b679fa1BE9) | `0xaa4d656c6f6e706f727400000000000000000000000000000000000000000000` | -| [REN](https://etherscan.io/address/0x408e41876cCCDC0F92210600ef50372656052a38) | [`0x45eb33D008801d547990cAF3b63B4F8aE596EA57`](https://etherscan.io/address/0x45eb33D008801d547990cAF3b63B4F8aE596EA57) | `0xaa72656e00000000000000000000000000000000000000000000000000000000` | -| [USDC](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48) | [`0x1670DFb52806DE7789D5cF7D5c005cf7083f9A5D`](https://etherscan.io/address/0x1670DFb52806DE7789D5cF7D5c005cf7083f9A5D) | `0xaa55534443303041505200000000000000000000000000000000000000000000` | -| [GEN](https://etherscan.io/address/0x543Ff227F64Aa17eA132Bf9886cAb5DB55DCAddf) | [`0xAA14DCAA0AdbE79cBF00edC6cC4ED17ed39240AC`](https://etherscan.io/address/0xAA14DCAA0AdbE79cBF00edC6cC4ED17ed39240AC) | `0xaa47454e00000000000000000000000000000000000000000000000000000000` | -| [GNO](https://etherscan.io/address/0x6810e776880C02933D47DB1b9fc05908e5386b96) | [`0x05461124C86C0AD7C5d8E012e1499fd9109fFb7d`](https://etherscan.io/address/0x05461124C86C0AD7C5d8E012e1499fd9109fFb7d) | `0xaa4b4e4320474e4f000000000000000000000000000000000000000000000000` | -| [MYB](https://etherscan.io/address/0x5d60d8d7eF6d37E16EBABc324de3bE57f135e0BC) | [`0x1833AD67362249823515B59A8aA8b4f6B4358d1B`](https://etherscan.io/address/0x1833AD67362249823515B59A8aA8b4f6B4358d1B) | `0xaa4d594200000000000000000000000000000000000000000000000000000000` | -| [BAM](https://etherscan.io/address/0x22B3FAaa8DF978F6bAFe18aaDe18DC2e3dfA0e0C) | [`0x302B35bd0B01312ec2652783c04955D7200C3D9b`](https://etherscan.io/address/0x302B35bd0B01312ec2652783c04955D7200C3D9b) | `0xaa42414d00000000000000000000000000000000000000000000000000000000` | -| [SPN](https://etherscan.io/address/0x20F7A3DdF244dc9299975b4Da1C39F8D5D75f05A) | [`0x6b84DBd29643294703dBabf8Ed97cDef74EDD227`](https://etherscan.io/address/0x6b84DBd29643294703dBabf8Ed97cDef74EDD227) | `0xaa48756d616e7320466972737400000000000000000000000000000000000000` | -| [UPP](https://etherscan.io/address/0xC86D054809623432210c107af2e3F619DcFbf652) | [`0x7e2fd015616263Add31a2AcC2A437557cEe80Fc4`](https://etherscan.io/address/0x7e2fd015616263Add31a2AcC2A437557cEe80Fc4) | `0xaa55505000000000000000000000000000000000000000000000000000000000` | -| [SNX](https://etherscan.io/address/0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F) | [`0xa107dfa919c3f084a7893A260b99586981beb528`](https://etherscan.io/address/0xa107dfa919c3f084a7893A260b99586981beb528) | `0xaa534e5800000000000000000000000000000000000000000000000000000000` | -| [TKN](https://etherscan.io/address/0xaAAf91D9b90dF800Df4F55c205fd6989c977E73a) | [`0x3480E12B6C2438e02319e34b4c23770679169190`](https://etherscan.io/address/0x3480E12B6C2438e02319e34b4c23770679169190) | `0xaa97aad58d5670d74ffb37e8c6272b3463f08be662718f7681c6e5bffc1b05c0` | -| [RAE](https://etherscan.io/address/0xE5a3229CCb22b6484594973A03a3851dCd948756) | [`0x751Eea622edd1E3D768C18afbCaeC7DcE7750C65`](https://etherscan.io/address/0x751Eea622edd1E3D768C18afbCaeC7DcE7750C65) | `0xaa52414520415052000000000000000000000000000000000000000000000000` | -| [SUSD](https://etherscan.io/address/0x57Ab1ec28D129707052df4dF418D58a2D46d5f51) | [`0x4Cb01bd05E4652CbB9F312aE604f4549D2bf2C99`](https://etherscan.io/address/0x4Cb01bd05E4652CbB9F312aE604f4549D2bf2C99) | `0xaa73555344000000000000000000000000000000000000000000000000000000` | -| [SPIKE](https://etherscan.io/address/0xA7fC5D2453E3F68aF0cc1B78bcFEe94A1B293650) | [`0x8ea5CF9f61824E8A3cA8AA370AB37e0202B2CC7D`](https://etherscan.io/address/0x8ea5CF9f61824E8A3cA8AA370AB37e0202B2CC7D) | `0xaa88888888888888888888888888888888888888888888888888888888888888` | -| [SAN](https://etherscan.io/address/0x7C5A0CE9267ED19B22F8cae653F198e3E8daf098) | [`0xa9742Ee9a5407f4C2f8a49f65E3a440f3694960a`](https://etherscan.io/address/0xa9742Ee9a5407f4C2f8a49f65E3a440f3694960a) | `0xaa53414e20415052000000000000000000000000000000000000000000000000` | -| [KNC](https://etherscan.io/address/0xdd974D5C2e2928deA5F71b9825b8b646686BD200) | [`0x607d7751d9F4845C5a1dE9eeD39c56f4fC0F855d`](https://etherscan.io/address/0x607d7751d9F4845C5a1dE9eeD39c56f4fC0F855d) | `0xaa4b4e435f4d4547414c41444f4e000000000000000000000000000000000000` | -| [EKG](https://etherscan.io/address/0x6A9b3E36436B7abde8C4E2E2a98Ea40455E615cf) | [`0x4e6d0F492fd139151DE4728caC47dAce56C56Af4`](https://etherscan.io/address/0x4e6d0F492fd139151DE4728caC47dAce56C56Af4) | `0xff454b4700000000000000000000000000000000000000000000000000000000` | -| [ANT](https://etherscan.io/address/0x960b236A07cf122663c4303350609A66A7B288C0) | [`0x0994c18Ed0C328F38d2C451B2a2e1cEb1Ae6A812`](https://etherscan.io/address/0x0994c18Ed0C328F38d2C451B2a2e1cEb1Ae6A812) | `0xaa414e5400000000000000000000000000000000000000000000000000000000` | -| [GDC](https://etherscan.io/address/0x301C755bA0fcA00B1923768Fffb3Df7f4E63aF31) | [`0x2485a4e3Dd95a3Ef445B786acf7bacc5C99986F7`](https://etherscan.io/address/0x2485a4e3Dd95a3Ef445B786acf7bacc5C99986F7) | `0xaa676463746f6b656e0000000000000000000000000000000000000000000000` | -| [AMPL](https://etherscan.io/address/0xD46bA6D942050d489DBd938a2C909A5d5039A161) | [`0x977c9ABB01Ed3E99e9953fD1F472aE9f459E7E70`](https://etherscan.io/address/0x977c9ABB01Ed3E99e9953fD1F472aE9f459E7E70) | `0xaad46ba6d942050d489dbd938a2c909a5d5039a1610000000000000000000000` | -| [MET](https://etherscan.io/address/0xa3d58c4E56fedCae3a7c43A725aeE9A71F0ece4e) | [`0x2Ed6F2bC006DA5897A0C3cD2686283C05e50C573`](https://etherscan.io/address/0x2Ed6F2bC006DA5897A0C3cD2686283C05e50C573) | `0xaa4d455400000000000000000000000000000000000000000000000000000000` | -| [MFG](https://etherscan.io/address/0x6710c63432A2De02954fc0f851db07146a6c0312) | [`0x55a8fda671a257b80258d2a03abd6e0e1e3dbe79`](https://etherscan.io/address/0x55a8fda671a257b80258d2a03abd6e0e1e3dbe79) | `0xaa6d6667546f6b656e0000000000000000000000000000000000000000000000` | -| [UBT](https://etherscan.io/address/0x8400D94A5cb0fa0D041a3788e395285d61c9ee5e) | [`0xfe06bc8BC12595C1c871fF7c2ea9CadC42735d7D`](https://etherscan.io/address/0xfe06bc8BC12595C1c871fF7c2ea9CadC42735d7D) | `0xaa55425400000000000000000000000000000000000000000000000000000000` | -| [PBTC](https://etherscan.io/address/0x5228a22e72ccC52d415EcFd199F99D0665E7733b) | [`0x0Ce59E811024C4aA040389fb8917dD9EDAEf1693`](https://etherscan.io/address/0x0Ce59E811024C4aA040389fb8917dD9EDAEf1693) | `0xff50425443000000000000000000000000000000000000000000000000000000` | -| [OGN](https://etherscan.io/address/0x8207c1FfC5B6804F6024322CcF34F29c3541Ae26) | [`0xb89f41CD2C8B6cba8b851289198b06Be8B4Dec65`](https://etherscan.io/address/0xb89f41CD2C8B6cba8b851289198b06Be8B4Dec65) | `0xaa4f474e00000000000000000000000000000000000000000000000000000000` | -| [BAND](https://etherscan.io/address/0xBA11D00c5f74255f56a5E366F4F77f5A186d7f55) | [`0xb06Cf173DA7E297aa6268139c7Cb67C53D8E4f90`](https://etherscan.io/address/0xb06Cf173DA7E297aa6268139c7Cb67C53D8E4f90) | `0xaa42414e44000000000000000000000000000000000000000000000000000000` | -| [RSV](https://etherscan.io/address/0x1C5857e110CD8411054660F60B5De6a6958CfAE2) | [`0x141104687b51985D6210Eb4b398F1DC5b5b9e9F5`](https://etherscan.io/address/0x141104687b51985D6210Eb4b398F1DC5b5b9e9F5) | `0xaa525356546f6b656e0000000000000000000000000000000000000000000000` | -| [KEY](https://etherscan.io/address/0x4CC19356f2D37338b9802aa8E8fc58B0373296E7) | [`0x3e59c69952a4cFEaF653EedF8ff907D4b6b8762D`](https://etherscan.io/address/0x3e59c69952a4cFEaF653EedF8ff907D4b6b8762D) | `0xaa4b455900000000000000000000000000000000000000000000000000000000` | -| [PNK](https://etherscan.io/address/0x93ED3FBe21207Ec2E8f2d3c3de6e058Cb73Bc04d) | [`0x10db2A136ee3E0C963d82aF4C86Ca483199f2816`](https://etherscan.io/address/0x10db2A136ee3E0C963d82aF4C86Ca483199f2816) | `0xaa504e4b00000000000000000000000000000000000000000000000000000000` | -| [CND](https://etherscan.io/address/0xd4c435F5B09F855C3317c8524Cb1F586E42795fa) | [`0xAD84a44a673Be4FdcD5e39Ebd15eBC404E87F314`](https://etherscan.io/address/0xAD84a44a673Be4FdcD5e39Ebd15eBC404E87F314) | `0xaa434e4400000000000000000000000000000000000000000000000000000000` | -| [TRYB](https://etherscan.io/address/0x2C537E5624e4af88A7ae4060C022609376C8D0EB) | [`0xe96b41aF3DA574A991582dC54cC35535550a3f8d`](https://etherscan.io/address/0xe96b41aF3DA574A991582dC54cC35535550a3f8d) | `0xaa54525942000000000000000000000000000000000000000000000000000000` | -| [2KEY](https://etherscan.io/address/0xE48972fCd82a274411c01834e2f031D4377Fa2c0) | [`0x00Cd2388C86C960A646D640bE44FC8F83b78cEC9`](https://etherscan.io/address/0x00Cd2388C86C960A646D640bE44FC8F83b78cEC9) | `0xaacfefe57c1e0f781f9864fe27287980a2097e60c0ee0c5e71083e32cecd1c9c` | -| [PLR](https://etherscan.io/address/0xe3818504c1B32bF1557b16C238B2E01Fd3149C17) | [`0x71eb6edF770b25Fcd60Ad9790AA20C422F0f4a0d`](https://etherscan.io/address/0x71eb6edF770b25Fcd60Ad9790AA20C422F0f4a0d) | `0xaa504c5200000000000000000000000000000000000000000000000000000000` | -| [QNT](https://etherscan.io/address/0x4a220E6096B25EADb88358cb44068A3248254675) | [`0x773A58C0ae122f56d6747BC1264F00174B3144c3`](https://etherscan.io/address/0x773A58C0ae122f56d6747BC1264F00174B3144c3) | `0xaa514e5452657365727665000000000000000000000000000000000000000000` | -| [PNT](https://etherscan.io/address/0x89Ab32156e46F46D02ade3FEcbe5Fc4243B9AAeD) | [`0x89b3F60A17789Aa7c7061Af6f5e9efA407153C03`](https://etherscan.io/address/0x89b3F60A17789Aa7c7061Af6f5e9efA407153C03) | `0xff504e5400000000000000000000000000000000000000000000000000000000` | -| [REQ](https://etherscan.io/address/0x8f8221aFbB33998d8584A2B05749bA73c37a938a) | [`0x23Fe3C603BE19d3a1155766358071CAcEFe14537`](https://etherscan.io/address/0x23Fe3C603BE19d3a1155766358071CAcEFe14537) | `0xaa52455100000000000000000000000000000000000000000000000000000000` | -| [RSR](https://etherscan.io/address/0x8762db106B2c2A0bccB3A80d1Ed41273552616E8) | [`0x0b798B89155eA31f1312791b9fdFAae7c5F48460`](https://etherscan.io/address/0x0b798B89155eA31f1312791b9fdFAae7c5F48460) | `0xaa525352546f6b656e0000000000000000000000000000000000000000000000` | diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 5f07e41..0000000 --- a/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2020 CryptoManiacs - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/OneSplit.full.abi b/OneSplit.full.abi deleted file mode 100644 index a4c961c..0000000 --- a/OneSplit.full.abi +++ /dev/null @@ -1 +0,0 @@ -[{"inputs":[{"internalType":"contract IOneSplitView","name":"_oneSplitView","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"parts","type":"uint256"},{"internalType":"uint256","name":"flags","type":"uint256"}],"name":"getExpectedReturn","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"parts","type":"uint256"},{"internalType":"uint256","name":"flags","type":"uint256"},{"internalType":"uint256","name":"destTokenEthPriceTimesGasPrice","type":"uint256"}],"name":"getExpectedReturnWithGas","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256","name":"estimateGasAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"oneSplitView","outputs":[{"internalType":"contract IOneSplitView","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256","name":"flags","type":"uint256"}],"name":"swap","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"}] \ No newline at end of file diff --git a/OneSplit.full.bin b/OneSplit.full.bin deleted file mode 100644 index 6bde37e..0000000 --- a/OneSplit.full.bin +++ /dev/null @@ -1 +0,0 @@ -608060405234801561001057600080fd5b5060405162005276380380620052768339818101604052602081101561003557600080fd5b5051600080546001600160a01b039092166001600160a01b031990921691909117905561520e80620000686000396000f3fe60806040526004361061003f5760003560e01c8063085e2c5b1461004e5780638373f265146100f8578063e2a7515e146101af578063fbe4ed9514610289575b3332141561004c57600080fd5b005b34801561005a57600080fd5b5061009d600480360360a081101561007157600080fd5b506001600160a01b038135811691602081013590911690604081013590606081013590608001356102ba565b6040518083815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156100e35781810151838201526020016100cb565b50505050905001935050505060405180910390f35b34801561010457600080fd5b5061014d600480360360c081101561011b57600080fd5b506001600160a01b03813581169160208101359091169060408101359060608101359060808101359060a001356102dd565b6040518084815260200183815260200180602001828103825283818151815260200191508051906020019060200280838360005b83811015610199578181015183820152602001610181565b5050505090500194505050505060405180910390f35b610277600480360360c08110156101c557600080fd5b6001600160a01b03823581169260208101359091169160408201359160608101359181019060a081016080820135600160201b81111561020457600080fd5b82018360208201111561021657600080fd5b803590602001918460208302840111600160201b8311171561023757600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295505091359250610434915050565b60408051918252519081900360200190f35b34801561029557600080fd5b5061029e61080d565b604080516001600160a01b039092168252519081900360200190f35b600060606102cd878787878760006102dd565b9199919850909650505050505050565b6000805460408051638373f26560e01b81526001600160a01b038a81166004830152898116602483015260448201899052606482018890526084820187905260a48201869052915184936060931691638373f2659160c48083019287929190829003018186803b15801561035057600080fd5b505afa158015610364573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052606081101561038d57600080fd5b81516020830151604080850180519151939592948301929184600160201b8211156103b757600080fd5b9083019060208201858111156103cc57600080fd5b82518660208202830111600160201b821117156103e857600080fd5b82525081516020918201928201910280838360005b838110156104155781810151838201526020016103fd565b5050505090500160405250505092509250925096509650969350505050565b6000856001600160a01b0316876001600160a01b03161415610457575083610803565b61045f61503a565b60405180610440016040528061081c8152602001610aa88152602001610af58152602001610e3b8152602001611104815260200161129a815260200161147681526020016116a681526020016118e08152602001611b1a8152602001611dc38152602001611feb81526020016123478152602001612560815260200161256c815260200161258781526020016125a281526020016125bd81526020016127f781526020016129848152602001612b788152602001612c248152602001612cfb8152602001612d9a8152602001612f8e8152602001612f9c8152602001612faa8152602001612fb88152602001612fd58152602001612feb815260200161300b8152602001613021815260200161303b81526020016130db81525090506022845111156105bc5760405162461bcd60e51b81526004018080602001828103825260428152602001806151986042913960600191505060405180910390fd5b600080805b865181101561061a5760008782815181106105d857fe5b602002602001015111156106125761060c8782815181106105f557fe5b60200260200101518461314990919063ffffffff16565b92508091505b6001016105c1565b508161067a576106328a6001600160a01b03166131ac565b1561066f5760405133903480156108fc02916000818181858888f19350505050158015610663573d6000803e3d6000fd5b50349350505050610803565b879350505050610803565b6106956001600160a01b038b1633308b63ffffffff6131e516565b60006106b06001600160a01b038c163063ffffffff6132f716565b905060005b8751811015610753578781815181106106ca57fe5b6020026020010151600014156106df5761074b565b60006107178561070b8b85815181106106f457fe5b60200260200101518e6133a190919063ffffffff16565b9063ffffffff6133fa16565b9050838214156107245750815b80830392506107498d8d838b8a876022811061073c57fe5b602002015163ffffffff16565b505b6001016106b5565b5061076d6001600160a01b038b163063ffffffff6132f716565b9450878510156107ae5760405162461bcd60e51b81526004018080602001828103825260268152602001806151126026913960400191505060405180910390fd5b6107c86001600160a01b038b16338763ffffffff61343c16565b506107fd336107e66001600160a01b038e163063ffffffff6132f716565b6001600160a01b038e16919063ffffffff61343c16565b50505050505b9695505050505050565b6000546001600160a01b031681565b8161082f6001600160a01b0386166131ac565b61096f57604080516303795fb160e11b81526001600160a01b0387166004820152905160009173c0a47dfe034b400b47bdad5fecda2621de6c4d95916306f2bf6291602480820192602092909190829003018186803b15801561089157600080fd5b505afa1580156108a5573d6000803e3d6000fd5b505050506040513d60208110156108bb57600080fd5b505190506001600160a01b0381161561096d576108e86001600160a01b038716828463ffffffff6134ba16565b604080516395e3c50b60e01b8152600481018490526001602482015242604482015290516001600160a01b038316916395e3c50b9160648083019260209291908290030181600087803b15801561093e57600080fd5b505af1158015610952573d6000803e3d6000fd5b505050506040513d602081101561096857600080fd5b505191505b505b610981846001600160a01b03166131ac565b610aa157604080516303795fb160e11b81526001600160a01b0386166004820152905160009173c0a47dfe034b400b47bdad5fecda2621de6c4d95916306f2bf6291602480820192602092909190829003018186803b1580156109e357600080fd5b505afa1580156109f7573d6000803e3d6000fd5b505050506040513d6020811015610a0d57600080fd5b505190506001600160a01b03811615610a9f57806001600160a01b031663f39b5b9b836001426040518463ffffffff1660e01b815260040180838152602001828152602001925050506020604051808303818588803b158015610a6f57600080fd5b505af1158015610a83573d6000803e3d6000fd5b50505050506040513d6020811015610a9a57600080fd5b505191505b505b5050505050565b6040805162461bcd60e51b815260206004820152601a60248201527f5468697320736f75726365207761732064657072656361746564000000000000604482015290519081900360640190fd5b60007352ae12abe5d8bd778bd5397f99ca900624cfadd46001600160a01b031663bb34534c6040518163ffffffff1660e01b815260040180806c42616e636f724e6574776f726b60981b815250602001905060206040518083038186803b158015610b5f57600080fd5b505afa158015610b73573d6000803e3d6000fd5b505050506040513d6020811015610b8957600080fd5b505190506060736f0cd8c4f6f06eab664c7e3031909452b4b728616375e1cc82610bbb6001600160a01b0389166131ac565b610bc55787610bdb565b73c0829421c1d260bd3cb3e0f06cfe2d52db2ce3155b610bed886001600160a01b03166131ac565b610bf75787610c0d565b73c0829421c1d260bd3cb3e0f06cfe2d52db2ce3155b6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060006040518083038186803b158015610c6c57600080fd5b505afa158015610c80573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526020811015610ca957600080fd5b8101908080516040519392919084600160201b821115610cc857600080fd5b908301906020820185811115610cdd57600080fd5b82518660208202830111600160201b82111715610cf957600080fd5b82525081516020918201928201910280838360005b83811015610d26578181015183820152602001610d0e565b505050509050016040525050509050610d538285886001600160a01b03166134ba9092919063ffffffff16565b816001600160a01b031663f3898a97610d74886001600160a01b03166131ac565b610d7f576000610d81565b855b838760016040518563ffffffff1660e01b81526004018080602001848152602001838152602001828103825285818151815260200191508051906020019060200280838360005b83811015610de0578181015183820152602001610dc8565b505050509050019450505050506020604051808303818588803b158015610e0657600080fd5b505af1158015610e1a573d6000803e3d6000fd5b50505050506040513d6020811015610e3157600080fd5b5050505050505050565b610e4d846001600160a01b03166131ac565b15610eb5576000805160206150668339815191526001600160a01b031663d0e30db0836040518263ffffffff1660e01b81526004016000604051808303818588803b158015610e9b57600080fd5b505af1158015610eaf573d6000803e3d6000fd5b50505050505b6000610ec9856001600160a01b03166131ac565b610ed35784610ee3565b6000805160206150668339815191525b9050610f136001600160a01b03821673794e6e91555438afc3ccf1c5076a74f42133d08d8563ffffffff6134ba16565b73794e6e91555438afc3ccf1c5076a74f42133d08d630621b4f6610f3f6001600160a01b0388166131ac565b610f495786610f59565b6000805160206150668339815191525b85610f6c886001600160a01b03166131ac565b610f765787610f86565b6000805160206150668339815191525b604080516001600160e01b031960e087901b1681526001600160a01b03948516600482015260248101939093529216604482015260016064820152905160848083019260209291908290030181600087803b158015610fe457600080fd5b505af1158015610ff8573d6000803e3d6000fd5b505050506040513d602081101561100e57600080fd5b5061102390506001600160a01b0385166131ac565b15610aa157604080516370a0823160e01b8152306004820152905160008051602061506683398151915291632e1a7d4d9183916370a08231916024808301926020929190829003018186803b15801561107b57600080fd5b505afa15801561108f573d6000803e3d6000fd5b505050506040513d60208110156110a557600080fd5b5051604080516001600160e01b031960e085901b168152600481019290925251602480830192600092919082900301818387803b1580156110e557600080fd5b505af11580156110f9573d6000803e3d6000fd5b505050505050505050565b60006001600160a01b0385166000805160206150f28339815191521461112b57600061112e565b60025b6001600160a01b03861660008051602061508683398151915214611153576000611156565b60015b0160ff16905060006000805160206150f28339815191526001600160a01b03861614611183576000611186565b60025b6001600160a01b038616600080516020615086833981519152146111ab5760006111ae565b60015b0160ff16905081600f0b600014806111c9575080600f0b6000145b156111d5575050611294565b6112036001600160a01b03871673a2b47e3d5c44877cca798226b7b8118f9bfb7a568663ffffffff6134ba16565b60408051635320bf6b60e11b8152600019808501600f90810b810b6004840152908401810b900b602482015260448101869052600060648201819052915173a2b47e3d5c44877cca798226b7b8118f9bfb7a569263a6417ed6926084808201939182900301818387803b15801561127957600080fd5b505af115801561128d573d6000803e3d6000fd5b5050505050505b50505050565b60006001600160a01b03851673dac17f958d2ee523a2206206994597c13d831ec7146112c75760006112ca565b60035b6001600160a01b0386166000805160206150f2833981519152146112ef5760006112f2565b60025b6001600160a01b0387166000805160206150868339815191521461131757600061131a565b60015b010160ff169050600073dac17f958d2ee523a2206206994597c13d831ec76001600160a01b0316856001600160a01b03161461135757600061135a565b60035b6001600160a01b0386166000805160206150f28339815191521461137f576000611382565b60025b6001600160a01b038716600080516020615086833981519152146113a75760006113aa565b60015b010160ff16905081600f0b600014806113c6575080600f0b6000145b156113d2575050611294565b6114006001600160a01b0387167352ea46506b9cc5ef470c5bf89f17dc28bb35d85c8663ffffffff6134ba16565b60408051635320bf6b60e11b8152600019808501600f90810b810b6004840152908401810b900b60248201526044810186905260006064820181905291517352ea46506b9cc5ef470c5bf89f17dc28bb35d85c9263a6417ed6926084808201939182900301818387803b15801561127957600080fd5b60006001600160a01b0385166e085d4780b73119b644ae5ecd22b3761461149e5760006114a1565b60045b6001600160a01b03861673dac17f958d2ee523a2206206994597c13d831ec7146114cc5760006114cf565b60035b6001600160a01b0387166000805160206150f2833981519152146114f45760006114f7565b60025b6001600160a01b0388166000805160206150868339815191521461151c57600061151f565b60015b01010160ff16905060006e085d4780b73119b644ae5ecd22b3766001600160a01b0316856001600160a01b03161461155857600061155b565b60045b6001600160a01b03861673dac17f958d2ee523a2206206994597c13d831ec714611586576000611589565b60035b6001600160a01b0387166000805160206150f2833981519152146115ae5760006115b1565b60025b6001600160a01b038816600080516020615086833981519152146115d65760006115d9565b60015b01010160ff16905081600f0b600014806115f6575080600f0b6000145b15611602575050611294565b6116306001600160a01b0387167345f783cce6b7ff23b2ab2d70e416cdb7d6055f518663ffffffff6134ba16565b60408051635320bf6b60e11b8152600019808501600f90810b810b6004840152908401810b900b60248201526044810186905260006064820181905291517345f783cce6b7ff23b2ab2d70e416cdb7d6055f519263a6417ed6926084808201939182900301818387803b15801561127957600080fd5b60006001600160a01b038516734fabb145d64652a948d72533023f6e7a623c7c53146116d35760006116d6565b60045b6001600160a01b03861673dac17f958d2ee523a2206206994597c13d831ec714611701576000611704565b60035b6001600160a01b0387166000805160206150f28339815191521461172957600061172c565b60025b6001600160a01b03881660008051602061508683398151915214611751576000611754565b60015b01010160ff1690506000734fabb145d64652a948d72533023f6e7a623c7c536001600160a01b0316856001600160a01b031614611792576000611795565b60045b6001600160a01b03861673dac17f958d2ee523a2206206994597c13d831ec7146117c05760006117c3565b60035b6001600160a01b0387166000805160206150f2833981519152146117e85760006117eb565b60025b6001600160a01b03881660008051602061508683398151915214611810576000611813565b60015b01010160ff16905081600f0b60001480611830575080600f0b6000145b1561183c575050611294565b61186a6001600160a01b0387167379a8c46dea5ada233abaffd40f3a0a2b1e5a4f278663ffffffff6134ba16565b60408051635320bf6b60e11b8152600019808501600f90810b810b6004840152908401810b900b60248201526044810186905260006064820181905291517379a8c46dea5ada233abaffd40f3a0a2b1e5a4f279263a6417ed6926084808201939182900301818387803b15801561127957600080fd5b60006001600160a01b0385167357ab1ec28d129707052df4df418d58a2d46d5f511461190d576000611910565b60045b6001600160a01b03861673dac17f958d2ee523a2206206994597c13d831ec71461193b57600061193e565b60035b6001600160a01b0387166000805160206150f283398151915214611963576000611966565b60025b6001600160a01b0388166000805160206150868339815191521461198b57600061198e565b60015b01010160ff16905060007357ab1ec28d129707052df4df418d58a2d46d5f516001600160a01b0316856001600160a01b0316146119cc5760006119cf565b60045b6001600160a01b03861673dac17f958d2ee523a2206206994597c13d831ec7146119fa5760006119fd565b60035b6001600160a01b0387166000805160206150f283398151915214611a22576000611a25565b60025b6001600160a01b03881660008051602061508683398151915214611a4a576000611a4d565b60015b01010160ff16905081600f0b60001480611a6a575080600f0b6000145b15611a76575050611294565b611aa46001600160a01b03871673a5407eae9ba41422680e2e00537571bcc53efbfd8663ffffffff6134ba16565b60408051635320bf6b60e11b8152600019808501600f90810b810b6004840152908401810b900b602482015260448101869052600060648201819052915173a5407eae9ba41422680e2e00537571bcc53efbfd9263a6417ed6926084808201939182900301818387803b15801561127957600080fd5b611b2c846001600160a01b03166131ac565b611c7357604080516332a5d5bf60e01b81526001600160a01b0386166004820152905160009173f451dbd7ba14bfa7b1b78a766d3ed438f79ee1d1916332a5d5bf91602480820192602092909190829003018186803b158015611b8e57600080fd5b505afa158015611ba2573d6000803e3d6000fd5b505050506040513d6020811015611bb857600080fd5b50519050611bd66001600160a01b038616828563ffffffff6134ba16565b806001600160a01b031663a0712d68846040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015611c1c57600080fd5b505af1158015611c30573d6000803e3d6000fd5b505050506040513d6020811015611c4657600080fd5b50611c6d90508185611c676001600160a01b0383163063ffffffff6132f716565b8561081c565b50611294565b611c85836001600160a01b03166131ac565b61129457604080516332a5d5bf60e01b81526001600160a01b0385166004820152905160009173f451dbd7ba14bfa7b1b78a766d3ed438f79ee1d1916332a5d5bf91602480820192602092909190829003018186803b158015611ce757600080fd5b505afa158015611cfb573d6000803e3d6000fd5b505050506040513d6020811015611d1157600080fd5b50519050611d218582858561081c565b6001600160a01b03811663db006a75611d40823063ffffffff6132f716565b6040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015611d7657600080fd5b505af1158015611d8a573d6000803e3d6000fd5b505050506040513d6020811015611da057600080fd5b50611dbc90506001600160a01b0385163063ffffffff6132f716565b5050611294565b6001600160a01b0384166000805160206150868339815191521415611eb857611e106001600160a01b0385167306af07097c9eeb7fd685c692751d5c66db49c2158463ffffffff6134ba16565b60408051633b4da69f60e01b81523060048201526024810184905290517306af07097c9eeb7fd685c692751d5c66db49c21591633b4da69f91604480830192600092919082900301818387803b158015611e6957600080fd5b505af1158015611e7d573d6000803e3d6000fd5b50611eb392507306af07097c9eeb7fd685c692751d5c66db49c2159150859050611ead823063ffffffff6132f716565b8461081c565b611294565b6001600160a01b038316600080516020615086833981519152141561129457611ef7847306af07097c9eeb7fd685c692751d5c66db49c215848461081c565b604080516370a0823160e01b8152306004820181905291517306af07097c9eeb7fd685c692751d5c66db49c2159263ef693bed92909184916370a08231916024808301926020929190829003018186803b158015611f5457600080fd5b505afa158015611f68573d6000803e3d6000fd5b505050506040513d6020811015611f7e57600080fd5b5051604080516001600160e01b031960e086901b1681526001600160a01b039093166004840152602483019190915251604480830192600092919082900301818387803b158015611fce57600080fd5b505af1158015611fe2573d6000803e3d6000fd5b50505050611294565b611ffd846001600160a01b03166131ac565b6121c35760408051635f5418f360e01b81526001600160a01b0386166004820152905160009173ed8b133b7b88366e01bb9e38305ab11c2652149491635f5418f391602480820192602092909190829003018186803b15801561205f57600080fd5b505afa158015612073573d6000803e3d6000fd5b505050506040513d602081101561208957600080fd5b50516040805163797a759360e11b815290519192506121209173398ec7346dcd622edc5ae82352f02be94c62d1199163f2f4eb26916004808301926020929190829003018186803b1580156120dd57600080fd5b505afa1580156120f1573d6000803e3d6000fd5b505050506040513d602081101561210757600080fd5b50516001600160a01b038716908563ffffffff6134ba16565b60408051636968703360e11b81526001600160a01b03871660048201526024810185905261044d6044820152905173398ec7346dcd622edc5ae82352f02be94c62d1199163d2d0e06691606480830192600092919082900301818387803b15801561218a57600080fd5b505af115801561219e573d6000803e3d6000fd5b50505050611c6d8185611c6730856001600160a01b03166132f790919063ffffffff16565b6121d5836001600160a01b03166131ac565b6112945760408051635f5418f360e01b81526001600160a01b0385166004820152905160009173ed8b133b7b88366e01bb9e38305ab11c2652149491635f5418f391602480820192602092909190829003018186803b15801561223757600080fd5b505afa15801561224b573d6000803e3d6000fd5b505050506040513d602081101561226157600080fd5b505190506122718582858561081c565b604080516370a0823160e01b815230600482015290516001600160a01b0383169163db006a759183916370a08231916024808301926020929190829003018186803b1580156122bf57600080fd5b505afa1580156122d3573d6000803e3d6000fd5b505050506040513d60208110156122e957600080fd5b5051604080516001600160e01b031960e085901b168152600481019290925251602480830192600092919082900301818387803b15801561232957600080fd5b505af115801561233d573d6000803e3d6000fd5b5050505050611294565b60007371cd6666064c3a1354a3b4dca5fa1e2d3ee7d30363901754d76123756001600160a01b0388166131ac565b61237f5786612382565b60005b612394876001600160a01b03166131ac565b61239e57866123a1565b60005b6040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b03168152602001826001600160a01b03166001600160a01b031681526020019250505060206040518083038186803b15801561240057600080fd5b505afa158015612414573d6000803e3d6000fd5b505050506040513d602081101561242a57600080fd5b505190506124486001600160a01b038616828563ffffffff6134ba16565b806001600160a01b031663d5bcb9b5612469876001600160a01b03166131ac565b612474576000612476565b845b612488886001600160a01b03166131ac565b6124925787612495565b60005b6124a7886001600160a01b03166131ac565b6124b157876124b4565b60005b604080516001600160e01b031960e087901b1681526001600160a01b03938416600482015291909216602482015260448101889052600060648201527368a17b587caf4f9329f0e372e3a78d23a46de6b56084820152905160a480830192602092919082900301818588803b15801561252c57600080fd5b505af1158015612540573d6000803e3d6000fd5b50505050506040513d602081101561255757600080fd5b50505050505050565b610aa1848484846135b3565b61129484600080516020615066833981519152858585613a47565b61129484600080516020615086833981519152858585613a47565b611294846000805160206150f2833981519152858585613a47565b60006001600160a01b038516738e870d67f660d95d5be530380d0ec0bd388289e1146125ea5760006125ed565b60045b6001600160a01b03861673dac17f958d2ee523a2206206994597c13d831ec71461261857600061261b565b60035b6001600160a01b0387166000805160206150f283398151915214612640576000612643565b60025b6001600160a01b0388166000805160206150868339815191521461266857600061266b565b60015b01010160ff1690506000738e870d67f660d95d5be530380d0ec0bd388289e16001600160a01b0316856001600160a01b0316146126a95760006126ac565b60045b6001600160a01b03861673dac17f958d2ee523a2206206994597c13d831ec7146126d75760006126da565b60035b6001600160a01b0387166000805160206150f2833981519152146126ff576000612702565b60025b6001600160a01b0388166000805160206150868339815191521461272757600061272a565b60015b01010160ff16905081600f0b60001480612747575080600f0b6000145b15612753575050611294565b6127816001600160a01b0387167306364f10b501e868329afbc005b3492902d6c7638663ffffffff6134ba16565b60408051635320bf6b60e11b8152600019808501600f90810b810b6004840152908401810b900b60248201526044810186905260006064820181905291517306364f10b501e868329afbc005b3492902d6c7639263a6417ed6926084808201939182900301818387803b15801561127957600080fd5b60006001600160a01b038516732260fac5e5542a773aa44fbcfedf7c193bc2c59914612824576000612827565b60025b6001600160a01b03861673eb4c2781e4eba804ce9a9803c67d0893436bb27d14612852576000612855565b60015b0160ff1690506000732260fac5e5542a773aa44fbcfedf7c193bc2c5996001600160a01b0386161461288857600061288b565b60025b6001600160a01b03861673eb4c2781e4eba804ce9a9803c67d0893436bb27d146128b65760006128b9565b60015b0160ff16905081600f0b600014806128d4575080600f0b6000145b156128e0575050611294565b61290e6001600160a01b0387167393054188d876f558f4a66b2ef1d97d16edf0895b8663ffffffff6134ba16565b60408051630f7c084960e21b8152600019808501600f90810b810b6004840152908401810b900b60248201526044810186905260006064820181905291517393054188d876f558f4a66b2ef1d97d16edf0895b92633df02124926084808201939182900301818387803b15801561127957600080fd5b60006001600160a01b038516730316eb71485b0ab14103307bf65a021042c6d380146129b15760006129b4565b60035b6001600160a01b038616732260fac5e5542a773aa44fbcfedf7c193bc2c599146129df5760006129e2565b60025b6001600160a01b038716731bbe271d15bb64df0bc6cd28df9ff322f2ebd84714612a0d576000612a10565b60015b010160ff1690506000730316eb71485b0ab14103307bf65a021042c6d3806001600160a01b0316856001600160a01b031614612a4d576000612a50565b60035b6001600160a01b038616732260fac5e5542a773aa44fbcfedf7c193bc2c59914612a7b576000612a7e565b60025b6001600160a01b038716731bbe271d15bb64df0bc6cd28df9ff322f2ebd84714612aa9576000612aac565b60015b010160ff16905081600f0b60001480612ac8575080600f0b6000145b15612ad4575050611294565b612b026001600160a01b038716739726e9314ef1b96e45f40056bed61a088897313e8663ffffffff6134ba16565b60408051630f7c084960e21b8152600019808501600f90810b810b6004840152908401810b900b6024820152604481018690526000606482018190529151739726e9314ef1b96e45f40056bed61a088897313e92633df02124926084808201939182900301818387803b15801561127957600080fd5b612ba66001600160a01b0385167303ef3f37856bd08eb47e2de7abc4ddd2c19b60f28463ffffffff6134ba16565b60408051630df791e560e41b81526001600160a01b038681166004830152851660248201526044810184905290517303ef3f37856bd08eb47e2de7abc4ddd2c19b60f29163df791e5091606480830192600092919082900301818387803b158015612c1057600080fd5b505af1158015610e31573d6000803e3d6000fd5b612c526001600160a01b03851673a8253a440be331dc4a7395b73948cca6f19dc97d8463ffffffff6134ba16565b604080516303ff4c0160e31b81526001600160a01b0386811660048301528516602482015260448101849052600060648201819052603242016084830152915173a8253a440be331dc4a7395b73948cca6f19dc97d92631ffa60089260a480820193602093909283900390910190829087803b158015612cd157600080fd5b505af1158015612ce5573d6000803e3d6000fd5b505050506040513d6020811015610a9f57600080fd5b612d296001600160a01b03851673e2f2a5c287993345a840db3b0845fbc70f5935a58463ffffffff6134ba16565b60408051631ba0488760e21b81526001600160a01b0386811660048301528516602482015260448101849052306064820152905173e2f2a5c287993345a840db3b0845fbc70f5935a591636e81221c9160848083019260209291908290030181600087803b158015612cd157600080fd5b60006001600160a01b03851673fe18be6b3bd88a2d2a7f928d00292e7a9963cfc614612dc7576000612dca565b60035b6001600160a01b038616732260fac5e5542a773aa44fbcfedf7c193bc2c59914612df5576000612df8565b60025b6001600160a01b03871673eb4c2781e4eba804ce9a9803c67d0893436bb27d14612e23576000612e26565b60015b010160ff169050600073fe18be6b3bd88a2d2a7f928d00292e7a9963cfc66001600160a01b0316856001600160a01b031614612e63576000612e66565b60035b6001600160a01b038616732260fac5e5542a773aa44fbcfedf7c193bc2c59914612e91576000612e94565b60025b6001600160a01b03871673eb4c2781e4eba804ce9a9803c67d0893436bb27d14612ebf576000612ec2565b60015b010160ff16905081600f0b60001480612ede575080600f0b6000145b15612eea575050611294565b612f186001600160a01b038716737fc77b5c7614e1533320ea6ddc2eb61fa00a97148663ffffffff6134ba16565b60408051630f7c084960e21b8152600019808501600f90810b810b6004840152908401810b900b6024820152604481018690526000606482018190529151737fc77b5c7614e1533320ea6ddc2eb61fa00a971492633df02124926084808201939182900301818387803b15801561127957600080fd5b611294848484846000613a5e565b611294848484846001613a5e565b611294848484846002613a5e565b611294848484846001685a434ecd46efdcc7c760b11b0319613ecf565b61129484848484600161543360e81b0319613ecf565b6112948484848460016b2c2466af65a2f7eba2a7a463609a1b0319613ecf565b6112948484848461301c89896146ff565b613ecf565b61302e8460008484612347565b6112946000844784612347565b613055846000805160206150868339815191528484612347565b604080516370a0823160e01b815230600482015290516112949160008051602061508683398151915291869183916370a0823191602480820192602092909190829003018186803b1580156130a957600080fd5b505afa1580156130bd573d6000803e3d6000fd5b505050506040513d60208110156130d357600080fd5b505184612347565b6130f5846000805160206150f28339815191528484612347565b604080516370a0823160e01b81523060048201529051611294916000805160206150f283398151915291869183916370a0823191602480820192602092909190829003018186803b1580156130a957600080fd5b6000828201838110156131a3576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b90505b92915050565b60006001600160a01b03821615806131a657506001600160a01b03821673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee1492915050565b806131ef57611294565b6131f8846131ac565b156132dc576001600160a01b038316331480156132155750803410155b6132505760405162461bcd60e51b815260040180806020018281038252602b8152602001806150a6602b913960400191505060405180910390fd5b6001600160a01b0382163014613298576040516001600160a01b0383169082156108fc029083906000818181858888f19350505050158015613296573d6000803e3d6000fd5b505b80341115611eb357336108fc6132b4348463ffffffff61497a16565b6040518115909202916000818181858888f19350505050158015611c6d573d6000803e3d6000fd5b6112946001600160a01b03851684848463ffffffff6149bc16565b6000613302836131ac565b1561331857506001600160a01b038116316131a6565b826001600160a01b03166370a08231836040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b15801561336e57600080fd5b505afa158015613382573d6000803e3d6000fd5b505050506040513d602081101561339857600080fd5b505190506131a6565b6000826133b0575060006131a6565b828202828482816133bd57fe5b04146131a35760405162461bcd60e51b81526004018080602001828103825260218152602001806150d16021913960400191505060405180910390fd5b60006131a383836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250614a16565b60008161344b575060016134b3565b613454846131ac565b15613495576040516001600160a01b0384169083156108fc029084906000818181858888f1935050505015801561348f573d6000803e3d6000fd5b506134b3565b6134af6001600160a01b038516848463ffffffff614ab816565b5060015b9392505050565b6134c3836131ac565b6135ae57806134ec576134e76001600160a01b03841683600063ffffffff614b0a16565b6135ae565b60408051636eb1769f60e11b81523060048201526001600160a01b038481166024830152915160009286169163dd62ed3e916044808301926020929190829003018186803b15801561353d57600080fd5b505afa158015613551573d6000803e3d6000fd5b505050506040513d602081101561356757600080fd5b5051905081811015611294578015613594576135946001600160a01b03851684600063ffffffff614b0a16565b6112946001600160a01b038516848463ffffffff614b0a16565b505050565b60006135c7856001600160a01b03166131ac565b1561362f576000805160206150668339815191526001600160a01b031663d0e30db0846040518263ffffffff1660e01b81526004016000604051808303818588803b15801561361557600080fd5b505af1158015613629573d6000803e3d6000fd5b50505050505b6000613643866001600160a01b03166131ac565b61364d578561365d565b6000805160206150668339815191525b90506000613673866001600160a01b03166131ac565b61367d578561368d565b6000805160206150668339815191525b6040805163e6a4390560e01b81526001600160a01b038581166004830152831660248201529051919250600091735c69bee701ef814a2b6a3edd4b1652cb9cc5aa6f9163e6a43905916044808301926020929190829003018186803b1580156136f557600080fd5b505afa158015613709573d6000803e3d6000fd5b505050506040513d602081101561371f57600080fd5b505190506000806137416001600160a01b03841686868b63ffffffff614c1d16565b9197509250905081156137a657826001600160a01b031663fff6cae96040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561378957600080fd5b505af115801561379d573d6000803e3d6000fd5b50505050613820565b8015613820576040805163bc25cf7760e01b81527368a17b587caf4f9329f0e372e3a78d23a46de6b5600482015290516001600160a01b0385169163bc25cf7791602480830192600092919082900301818387803b15801561380757600080fd5b505af115801561381b573d6000803e3d6000fd5b505050505b61383a6001600160a01b038616848a63ffffffff61343c16565b50836001600160a01b0316856001600160a01b031610156138d3576040805163022c0d9f60e01b815260006004820181905260248201899052306044830152608060648301526084820181905291516001600160a01b0386169263022c0d9f9260c4808201939182900301818387803b1580156138b657600080fd5b505af11580156138ca573d6000803e3d6000fd5b5050505061394d565b6040805163022c0d9f60e01b815260048101889052600060248201819052306044830152608060648301526084820181905291516001600160a01b0386169263022c0d9f9260c4808201939182900301818387803b15801561393457600080fd5b505af1158015613948573d6000803e3d6000fd5b505050505b61395f896001600160a01b03166131ac565b15613a3a57604080516370a0823160e01b8152306004820152905160008051602061506683398151915291632e1a7d4d9183916370a08231916024808301926020929190829003018186803b1580156139b757600080fd5b505afa1580156139cb573d6000803e3d6000fd5b505050506040513d60208110156139e157600080fd5b5051604080516001600160e01b031960e085901b168152600481019290925251602480830192600092919082900301818387803b158015613a2157600080fd5b505af1158015613a35573d6000803e3d6000fd5b505050505b5050505050949350505050565b610a9f8484613a58888887876135b3565b846135b3565b60607365e67cbc342712df67494acefc06fe951ee9398263bfdbfc43613a8c6001600160a01b0389166131ac565b613a965787613aa6565b6000805160206150668339815191525b613ab8886001600160a01b03166131ac565b613ac25787613ad2565b6000805160206150668339815191525b856001016040518463ffffffff1660e01b815260040180846001600160a01b03166001600160a01b03168152602001836001600160a01b03166001600160a01b03168152602001828152602001935050505060006040518083038186803b158015613b3c57600080fd5b505afa158015613b50573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526020811015613b7957600080fd5b8101908080516040519392919084600160201b821115613b9857600080fd5b908301906020820185811115613bad57600080fd5b82518660208202830111600160201b82111715613bc957600080fd5b82525081516020918201928201910280838360005b83811015613bf6578181015183820152602001613bde565b505050509050016040525050509050613c17866001600160a01b03166131ac565b15613c7f576000805160206150668339815191526001600160a01b031663d0e30db0856040518263ffffffff1660e01b81526004016000604051808303818588803b158015613c6557600080fd5b505af1158015613c79573d6000803e3d6000fd5b50505050505b613cd9818381518110613c8e57fe5b602002602001015185613ca9896001600160a01b03166131ac565b613cb35788613cc3565b6000805160206150668339815191525b6001600160a01b0316919063ffffffff6134ba16565b808281518110613ce557fe5b60200260200101516001600160a01b0316638201aa3f613d0d886001600160a01b03166131ac565b613d175787613d27565b6000805160206150668339815191525b86613d3a896001600160a01b03166131ac565b613d445788613d54565b6000805160206150668339815191525b60006000196040518663ffffffff1660e01b815260040180866001600160a01b03166001600160a01b03168152602001858152602001846001600160a01b03166001600160a01b03168152602001838152602001828152602001955050505050506040805180830381600087803b158015613dce57600080fd5b505af1158015613de2573d6000803e3d6000fd5b505050506040513d6040811015613df857600080fd5b50613e0d90506001600160a01b0386166131ac565b15610a9f57604080516370a0823160e01b8152306004820152905160008051602061506683398151915291632e1a7d4d9183916370a08231916024808301926020929190829003018186803b158015613e6557600080fd5b505afa158015613e79573d6000803e3d6000fd5b505050506040513d6020811015613e8f57600080fd5b5051604080516001600160e01b031960e085901b168152600481019290925251602480830192600092919082900301818387803b15801561127957600080fd5b604080516001808252818301909252849160609190602080830190803883390190505090508281600081518110613f0257fe5b602002602001018181525050613f20876001600160a01b03166131ac565b61432157606073a1c0fa73c39cfbcc11ec9eb1afc665aba9996e2c6001600160a01b03166361e597f9896001856000604051908082528060200260200182016040528015613f78578160200160208202803883390190505b506040518563ffffffff1660e01b815260040180856001600160a01b03166001600160a01b03168152602001846003811115613fb057fe5b60ff1681526020018060200180602001838103835285818151815260200191508051906020019060200280838360005b83811015613ff8578181015183820152602001613fe0565b50505050905001838103825284818151815260200191508051906020019060200280838360005b8381101561403757818101518382015260200161401f565b50505050905001965050505050505060006040518083038186803b15801561405e57600080fd5b505afa158015614072573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052602081101561409b57600080fd5b8101908080516040519392919084600160201b8211156140ba57600080fd5b9083019060208201858111156140cf57600080fd5b8251600160201b8111828201881017156140e857600080fd5b82525081516020918201929091019080838360005b838110156141155781810151838201526020016140fd565b50505050905090810190601f1680156141425780820380516001836020036101000a031916815260200191505b506040525091925061417b9150506001600160a01b038916739aab3f75489902f3a48495025729a0af77d4b11e8863ffffffff6134ba16565b739aab3f75489902f3a48495025729a0af77d4b11e6001600160a01b031663ae591d54898573eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3060001960007368a17b587caf4f9329f0e372e3a78d23a46de6b560ff8e901c600a028a6040518a63ffffffff1660e01b8152600401808a6001600160a01b03166001600160a01b03168152602001898152602001886001600160a01b03166001600160a01b03168152602001876001600160a01b03166001600160a01b03168152602001868152602001858152602001846001600160a01b03166001600160a01b0316815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b8381101561429d578181015183820152602001614285565b50505050905090810190601f1680156142ca5780820380516001836020036101000a031916815260200191505b509a5050505050505050505050602060405180830381600087803b1580156142f157600080fd5b505af1158015614305573d6000803e3d6000fd5b505050506040513d602081101561431b57600080fd5b50519250505b614333866001600160a01b03166131ac565b61255757606073a1c0fa73c39cfbcc11ec9eb1afc665aba9996e2c6001600160a01b03166381efcbdd88600185600060405190808252806020026020018201604052801561438b578160200160208202803883390190505b506040518563ffffffff1660e01b815260040180856001600160a01b03166001600160a01b031681526020018460038111156143c357fe5b60ff1681526020018060200180602001838103835285818151815260200191508051906020019060200280838360005b8381101561440b5781810151838201526020016143f3565b50505050905001838103825284818151815260200191508051906020019060200280838360005b8381101561444a578181015183820152602001614432565b50505050905001965050505050505060006040518083038186803b15801561447157600080fd5b505afa158015614485573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260208110156144ae57600080fd5b8101908080516040519392919084600160201b8211156144cd57600080fd5b9083019060208201858111156144e257600080fd5b8251600160201b8111828201881017156144fb57600080fd5b82525081516020918201929091019080838360005b83811015614528578181015183820152602001614510565b50505050905090810190601f1680156145555780820380516001836020036101000a031916815260200191505b506040525050509050739aab3f75489902f3a48495025729a0af77d4b11e6001600160a01b031663ae591d548473eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee868b3060001960007368a17b587caf4f9329f0e372e3a78d23a46de6b560ff8f901c600a028b6040518b63ffffffff1660e01b8152600401808a6001600160a01b03166001600160a01b03168152602001898152602001886001600160a01b03166001600160a01b03168152602001876001600160a01b03166001600160a01b03168152602001868152602001858152602001846001600160a01b03166001600160a01b0316815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b83811015614681578181015183820152602001614669565b50505050905090810190601f1680156146ae5780820380516001836020036101000a031916815260200191505b509a50505050505050505050506020604051808303818588803b1580156146d457600080fd5b505af11580156146e8573d6000803e3d6000fd5b50505050506040513d602081101561128d57600080fd5b6000614713836001600160a01b03166131ac565b15801561472f575061472d826001600160a01b03166131ac565b155b1561473c575060006131a6565b606073c8fb12402cb16970f3c5f4b48ff68eb9d1289301633d3dc52c61476a6001600160a01b0387166131ac565b6147745785614776565b845b6040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060006040518083038186803b1580156147bc57600080fd5b505afa1580156147d0573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260208110156147f957600080fd5b8101908080516040519392919084600160201b82111561481857600080fd5b90830190602082018581111561482d57600080fd5b82518660208202830111600160201b8211171561484957600080fd5b82525081516020918201928201910280838360005b8381101561487657818101518382015260200161485e565b50505050905001604052505050905060008090505b815181101561496f5760f88282815181106148a257fe5b602002602001015160001c901c60bb141580156148e557508181815181106148c657fe5b60200260200101516001685a434ecd46efdcc7c760b11b031960001b14155b801561491057508181815181106148f857fe5b6020026020010151600161543360e81b031960001b14155b8015614945575081818151811061492357fe5b602002602001015160016b2c2466af65a2f7eba2a7a463609a1b031960001b14155b156149675781818151811061495657fe5b6020026020010151925050506131a6565b60010161488b565b506000949350505050565b60006131a383836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250614dd6565b604080516001600160a01b0385811660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b179052611294908590614e30565b60008183614aa25760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015614a67578181015183820152602001614a4f565b50505050905090810190601f168015614a945780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b506000838581614aae57fe5b0495945050505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526135ae908490614e30565b801580614b90575060408051636eb1769f60e11b81523060048201526001600160a01b03848116602483015291519185169163dd62ed3e91604480820192602092909190829003018186803b158015614b6257600080fd5b505afa158015614b76573d6000803e3d6000fd5b505050506040513d6020811015614b8c57600080fd5b5051155b614bcb5760405162461bcd60e51b81526004018080602001828103825260368152602001806151626036913960400191505060405180910390fd5b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526135ae908490614e30565b6000808080614c3b6001600160a01b0388168963ffffffff6132f716565b90506000614c586001600160a01b0388168a63ffffffff6132f716565b90506000808a6001600160a01b0316630902f1ac6040518163ffffffff1660e01b815260040160606040518083038186803b158015614c9657600080fd5b505afa158015614caa573d6000803e3d6000fd5b505050506040513d6060811015614cc057600080fd5b50805160209091015190925090506001600160a01b03808a16908b161115614ce457905b816001600160701b0316841080614d035750806001600160701b031683105b955085158015614d2d5750816001600160701b0316841180614d2d5750806001600160701b031683115b94506000614d43896103e563ffffffff6133a116565b90506000614d6a614d5d86856001600160701b0316614fe8565b839063ffffffff6133a116565b90506000614da383614d976103e8614d8b8b8a6001600160701b0316614fe8565b9063ffffffff6133a116565b9063ffffffff61314916565b90508015614dc057614dbb828263ffffffff6133fa16565b614dc3565b60005b9950505050505050509450945094915050565b60008184841115614e285760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315614a67578181015183820152602001614a4f565b505050900390565b614e42826001600160a01b0316614ffe565b614e93576040805162461bcd60e51b815260206004820152601f60248201527f5361666545524332303a2063616c6c20746f206e6f6e2d636f6e747261637400604482015290519081900360640190fd5b60006060836001600160a01b0316836040518082805190602001908083835b60208310614ed15780518252601f199092019160209182019101614eb2565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114614f33576040519150601f19603f3d011682016040523d82523d6000602084013e614f38565b606091505b509150915081614f8f576040805162461bcd60e51b815260206004820181905260248201527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564604482015290519081900360640190fd5b80511561129457808060200190516020811015614fab57600080fd5b50516112945760405162461bcd60e51b815260040180806020018281038252602a815260200180615138602a913960400191505060405180910390fd5b6000818310614ff757816131a3565b5090919050565b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47081811480159061503257508115155b949350505050565b6040518061044001604052806022905b61506381526020019060019003908161504a5790505090565bfefe000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f57726f6e6720757365616765206f66204554482e756e6976657273616c5472616e7366657246726f6d2829536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb484f6e6553706c69743a2052657475726e20616d6f756e7420776173206e6f7420656e6f7567685361666545524332303a204552433230206f7065726174696f6e20646964206e6f7420737563636565645361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f20746f206e6f6e2d7a65726f20616c6c6f77616e63654f6e6553706c69743a20446973747269627574696f6e2061727261792073686f756c64206e6f74206578636565642072657365727665732061727261792073697a65a265627a7a7231582002428ba39f18926dfd33c27cf93f067cc6e39e15d96e1d05d5876bf540f25cae64736f6c63430005110032 \ No newline at end of file diff --git a/OneSplit.full.sol b/OneSplit.full.sol deleted file mode 100644 index 7982f2a..0000000 --- a/OneSplit.full.sol +++ /dev/null @@ -1,7109 +0,0 @@ - -// File: @openzeppelin/contracts/token/ERC20/IERC20.sol - -pragma solidity ^0.5.0; - -/** - * @dev Interface of the ERC20 standard as defined in the EIP. Does not include - * the optional functions; to access them see {ERC20Detailed}. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -// File: contracts/IOneSplit.sol - -pragma solidity ^0.5.0; - - -// -// [ msg.sender ] -// | | -// | | -// \_/ -// +---------------+ ________________________________ -// | OneSplitAudit | _______________________________ \ -// +---------------+ \ \ -// | | ______________ | | (staticcall) -// | | / ____________ \ | | -// | | (call) / / \ \ | | -// | | / / | | | | -// \_/ | | \_/ \_/ -// +--------------+ | | +----------------------+ -// | OneSplitWrap | | | | OneSplitViewWrap | -// +--------------+ | | +----------------------+ -// | | | | | | -// | | (delegatecall) | | (staticcall) | | (staticcall) -// \_/ | | \_/ -// +--------------+ | | +------------------+ -// | OneSplit | | | | OneSplitView | -// +--------------+ | | +------------------+ -// | | / / -// \ \________________/ / -// \__________________/ -// - - -contract IOneSplitConsts { - // flags = FLAG_DISABLE_UNISWAP + FLAG_DISABLE_BANCOR + ... - uint256 internal constant FLAG_DISABLE_UNISWAP = 0x01; - uint256 internal constant DEPRECATED_FLAG_DISABLE_KYBER = 0x02; // Deprecated - uint256 internal constant FLAG_DISABLE_BANCOR = 0x04; - uint256 internal constant FLAG_DISABLE_OASIS = 0x08; - uint256 internal constant FLAG_DISABLE_COMPOUND = 0x10; - uint256 internal constant FLAG_DISABLE_FULCRUM = 0x20; - uint256 internal constant FLAG_DISABLE_CHAI = 0x40; - uint256 internal constant FLAG_DISABLE_AAVE = 0x80; - uint256 internal constant FLAG_DISABLE_SMART_TOKEN = 0x100; - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_ETH = 0x200; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_BDAI = 0x400; - uint256 internal constant FLAG_DISABLE_IEARN = 0x800; - uint256 internal constant FLAG_DISABLE_CURVE_COMPOUND = 0x1000; - uint256 internal constant FLAG_DISABLE_CURVE_USDT = 0x2000; - uint256 internal constant FLAG_DISABLE_CURVE_Y = 0x4000; - uint256 internal constant FLAG_DISABLE_CURVE_BINANCE = 0x8000; - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_DAI = 0x10000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_USDC = 0x20000; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_CURVE_SYNTHETIX = 0x40000; - uint256 internal constant FLAG_DISABLE_WETH = 0x80000; - uint256 internal constant FLAG_DISABLE_UNISWAP_COMPOUND = 0x100000; // Works only when one of assets is ETH or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_UNISWAP_CHAI = 0x200000; // Works only when ETH<>DAI or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_UNISWAP_AAVE = 0x400000; // Works only when one of assets is ETH or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_IDLE = 0x800000; - uint256 internal constant FLAG_DISABLE_MOONISWAP = 0x1000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2 = 0x2000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_ETH = 0x4000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_DAI = 0x8000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_USDC = 0x10000000; - uint256 internal constant FLAG_DISABLE_ALL_SPLIT_SOURCES = 0x20000000; - uint256 internal constant FLAG_DISABLE_ALL_WRAP_SOURCES = 0x40000000; - uint256 internal constant FLAG_DISABLE_CURVE_PAX = 0x80000000; - uint256 internal constant FLAG_DISABLE_CURVE_RENBTC = 0x100000000; - uint256 internal constant FLAG_DISABLE_CURVE_TBTC = 0x200000000; - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_USDT = 0x400000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_WBTC = 0x800000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_TBTC = 0x1000000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_RENBTC = 0x2000000000; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_DFORCE_SWAP = 0x4000000000; - uint256 internal constant FLAG_DISABLE_SHELL = 0x8000000000; - uint256 internal constant FLAG_ENABLE_CHI_BURN = 0x10000000000; - uint256 internal constant FLAG_DISABLE_MSTABLE_MUSD = 0x20000000000; - uint256 internal constant FLAG_DISABLE_CURVE_SBTC = 0x40000000000; - uint256 internal constant FLAG_DISABLE_DMM = 0x80000000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_ALL = 0x100000000000; - uint256 internal constant FLAG_DISABLE_CURVE_ALL = 0x200000000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_ALL = 0x400000000000; - uint256 internal constant FLAG_DISABLE_SPLIT_RECALCULATION = 0x800000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_ALL = 0x1000000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_1 = 0x2000000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_2 = 0x4000000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_3 = 0x8000000000000; - uint256 internal constant DEPRECATED_FLAG_ENABLE_KYBER_UNISWAP_RESERVE = 0x10000000000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_KYBER_OASIS_RESERVE = 0x20000000000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_KYBER_BANCOR_RESERVE = 0x40000000000000; // Deprecated, Turned off by default - uint256 internal constant FLAG_ENABLE_REFERRAL_GAS_SPONSORSHIP = 0x80000000000000; // Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_COMP = 0x100000000000000; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_KYBER_ALL = 0x200000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_1 = 0x400000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_2 = 0x800000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_3 = 0x1000000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_4 = 0x2000000000000000; - uint256 internal constant FLAG_ENABLE_CHI_BURN_BY_ORIGIN = 0x4000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_ALL = 0x8000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_ETH = 0x10000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_DAI = 0x20000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_USDC = 0x40000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_POOL_TOKEN = 0x80000000000000000; -} - - -contract IOneSplit is IOneSplitConsts { - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ); - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ); - - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags - ) - public - payable - returns(uint256 returnAmount); -} - - -contract IOneSplitMulti is IOneSplit { - function getExpectedReturnWithGasMulti( - IERC20[] memory tokens, - uint256 amount, - uint256[] memory parts, - uint256[] memory flags, - uint256[] memory destTokenEthPriceTimesGasPrices - ) - public - view - returns( - uint256[] memory returnAmounts, - uint256 estimateGasAmount, - uint256[] memory distribution - ); - - function swapMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags - ) - public - payable - returns(uint256 returnAmount); -} - -// File: @openzeppelin/contracts/math/SafeMath.sol - -pragma solidity ^0.5.0; - -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint256 a, uint256 b) internal pure returns (uint256) { - uint256 c = a + b; - require(c >= a, "SafeMath: addition overflow"); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - */ - function sub(uint256 a, uint256 b) internal pure returns (uint256) { - return sub(a, b, "SafeMath: subtraction overflow"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - * - * _Available since v2.4.0._ - */ - function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b <= a, errorMessage); - uint256 c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint256 a, uint256 b) internal pure returns (uint256) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint256 c = a * b; - require(c / a == b, "SafeMath: multiplication overflow"); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint256 a, uint256 b) internal pure returns (uint256) { - return div(a, b, "SafeMath: division by zero"); - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts with custom message on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint256 c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint256 a, uint256 b) internal pure returns (uint256) { - return mod(a, b, "SafeMath: modulo by zero"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b != 0, errorMessage); - return a % b; - } -} - -// File: contracts/interface/IUniswapExchange.sol - -pragma solidity ^0.5.0; - - - -interface IUniswapExchange { - function getEthToTokenInputPrice(uint256 ethSold) external view returns (uint256 tokensBought); - - function getTokenToEthInputPrice(uint256 tokensSold) external view returns (uint256 ethBought); - - function ethToTokenSwapInput(uint256 minTokens, uint256 deadline) - external - payable - returns (uint256 tokensBought); - - function tokenToEthSwapInput(uint256 tokensSold, uint256 minEth, uint256 deadline) - external - returns (uint256 ethBought); - - function tokenToTokenSwapInput( - uint256 tokensSold, - uint256 minTokensBought, - uint256 minEthBought, - uint256 deadline, - address tokenAddr - ) external returns (uint256 tokensBought); -} - -// File: contracts/interface/IUniswapFactory.sol - -pragma solidity ^0.5.0; - - - -interface IUniswapFactory { - function getExchange(IERC20 token) external view returns (IUniswapExchange exchange); -} - -// File: contracts/interface/IKyberNetworkContract.sol - -pragma solidity ^0.5.0; - - - -interface IKyberNetworkContract { - function searchBestRate(IERC20 src, IERC20 dest, uint256 srcAmount, bool usePermissionless) - external - view - returns (address reserve, uint256 rate); -} - -// File: contracts/interface/IKyberNetworkProxy.sol - -pragma solidity ^0.5.0; - - - -interface IKyberNetworkProxy { - function getExpectedRateAfterFee( - IERC20 src, - IERC20 dest, - uint256 srcQty, - uint256 platformFeeBps, - bytes calldata hint - ) external view returns (uint256 expectedRate); - - function tradeWithHintAndFee( - IERC20 src, - uint256 srcAmount, - IERC20 dest, - address payable destAddress, - uint256 maxDestAmount, - uint256 minConversionRate, - address payable platformWallet, - uint256 platformFeeBps, - bytes calldata hint - ) external payable returns (uint256 destAmount); - - function kyberNetworkContract() external view returns (IKyberNetworkContract); - - // TODO: Limit usage by tx.gasPrice - // function maxGasPrice() external view returns (uint256); - - // TODO: Limit usage by user cap - // function getUserCapInWei(address user) external view returns (uint256); - // function getUserCapInTokenWei(address user, IERC20 token) external view returns (uint256); -} - -// File: contracts/interface/IKyberStorage.sol - -pragma solidity ^0.5.0; - - - -interface IKyberStorage { - function getReserveIdsPerTokenSrc( - IERC20 token - ) external view returns (bytes32[] memory); -} - -// File: contracts/interface/IKyberHintHandler.sol - -pragma solidity ^0.5.0; - - - -interface IKyberHintHandler { - enum TradeType { - BestOfAll, - MaskIn, - MaskOut, - Split - } - - function buildTokenToEthHint( - IERC20 tokenSrc, - TradeType tokenToEthType, - bytes32[] calldata tokenToEthReserveIds, - uint256[] calldata tokenToEthSplits - ) external view returns (bytes memory hint); - - function buildEthToTokenHint( - IERC20 tokenDest, - TradeType ethToTokenType, - bytes32[] calldata ethToTokenReserveIds, - uint256[] calldata ethToTokenSplits - ) external view returns (bytes memory hint); -} - -// File: contracts/interface/IBancorNetwork.sol - -pragma solidity ^0.5.0; - - -interface IBancorNetwork { - function getReturnByPath(address[] calldata path, uint256 amount) - external - view - returns (uint256 returnAmount, uint256 conversionFee); - - function claimAndConvert(address[] calldata path, uint256 amount, uint256 minReturn) - external - returns (uint256); - - function convert(address[] calldata path, uint256 amount, uint256 minReturn) - external - payable - returns (uint256); -} - -// File: contracts/interface/IBancorContractRegistry.sol - -pragma solidity ^0.5.0; - - -contract IBancorContractRegistry { - function addressOf(bytes32 contractName) external view returns (address); -} - -// File: contracts/interface/IBancorNetworkPathFinder.sol - -pragma solidity ^0.5.0; - - - -interface IBancorNetworkPathFinder { - function generatePath(IERC20 sourceToken, IERC20 targetToken) - external - view - returns (address[] memory); -} - -// File: contracts/interface/IBancorConverterRegistry.sol - -pragma solidity ^0.5.0; - - - -interface IBancorConverterRegistry { - - function getConvertibleTokenSmartTokenCount(IERC20 convertibleToken) - external view returns(uint256); - - function getConvertibleTokenSmartTokens(IERC20 convertibleToken) - external view returns(address[] memory); - - function getConvertibleTokenSmartToken(IERC20 convertibleToken, uint256 index) - external view returns(address); - - function isConvertibleTokenSmartToken(IERC20 convertibleToken, address value) - external view returns(bool); -} - -// File: contracts/interface/IBancorEtherToken.sol - -pragma solidity ^0.5.0; - - - -contract IBancorEtherToken is IERC20 { - function deposit() external payable; - - function withdraw(uint256 amount) external; -} - -// File: contracts/interface/IBancorFinder.sol - -pragma solidity ^0.5.0; - - - -interface IBancorFinder { - function buildBancorPath( - IERC20 fromToken, - IERC20 destToken - ) - external - view - returns(address[] memory path); -} - -// File: contracts/interface/IOasisExchange.sol - -pragma solidity ^0.5.0; - - - -interface IOasisExchange { - function getBuyAmount(IERC20 buyGem, IERC20 payGem, uint256 payAmt) - external - view - returns (uint256 fillAmt); - - function sellAllAmount(IERC20 payGem, uint256 payAmt, IERC20 buyGem, uint256 minFillAmount) - external - returns (uint256 fillAmt); -} - -// File: contracts/interface/IWETH.sol - -pragma solidity ^0.5.0; - - - -contract IWETH is IERC20 { - function deposit() external payable; - - function withdraw(uint256 amount) external; -} - -// File: contracts/interface/ICurve.sol - -pragma solidity ^0.5.0; - - -interface ICurve { - // solium-disable-next-line mixedcase - function get_dy_underlying(int128 i, int128 j, uint256 dx) external view returns(uint256 dy); - - // solium-disable-next-line mixedcase - function get_dy(int128 i, int128 j, uint256 dx) external view returns(uint256 dy); - - // solium-disable-next-line mixedcase - function exchange_underlying(int128 i, int128 j, uint256 dx, uint256 minDy) external; - - // solium-disable-next-line mixedcase - function exchange(int128 i, int128 j, uint256 dx, uint256 minDy) external; -} - - -contract ICurveRegistry { - function get_pool_info(address pool) - external - view - returns( - uint256[8] memory balances, - uint256[8] memory underlying_balances, - uint256[8] memory decimals, - uint256[8] memory underlying_decimals, - address lp_token, - uint256 A, - uint256 fee - ); -} - - -contract ICurveCalculator { - function get_dy( - int128 nCoins, - uint256[8] calldata balances, - uint256 amp, - uint256 fee, - uint256[8] calldata rates, - uint256[8] calldata precisions, - bool underlying, - int128 i, - int128 j, - uint256[100] calldata dx - ) external view returns(uint256[100] memory dy); -} - -// File: contracts/interface/IChai.sol - -pragma solidity ^0.5.0; - - - -interface IPot { - function dsr() external view returns (uint256); - - function chi() external view returns (uint256); - - function rho() external view returns (uint256); - - function drip() external returns (uint256); - - function join(uint256) external; - - function exit(uint256) external; -} - - -contract IChai is IERC20 { - function POT() public view returns (IPot); - - function join(address dst, uint256 wad) external; - - function exit(address src, uint256 wad) external; -} - - -library ChaiHelper { - IPot private constant POT = IPot(0x197E90f9FAD81970bA7976f33CbD77088E5D7cf7); - uint256 private constant RAY = 10**27; - - function _mul(uint256 x, uint256 y) private pure returns (uint256 z) { - require(y == 0 || (z = x * y) / y == x); - } - - function _rmul(uint256 x, uint256 y) private pure returns (uint256 z) { - // always rounds down - z = _mul(x, y) / RAY; - } - - function _rdiv(uint256 x, uint256 y) private pure returns (uint256 z) { - // always rounds down - z = _mul(x, RAY) / y; - } - - function rpow(uint256 x, uint256 n, uint256 base) private pure returns (uint256 z) { - // solium-disable-next-line security/no-inline-assembly - assembly { - switch x - case 0 { - switch n - case 0 { - z := base - } - default { - z := 0 - } - } - default { - switch mod(n, 2) - case 0 { - z := base - } - default { - z := x - } - let half := div(base, 2) // for rounding. - for { - n := div(n, 2) - } n { - n := div(n, 2) - } { - let xx := mul(x, x) - if iszero(eq(div(xx, x), x)) { - revert(0, 0) - } - let xxRound := add(xx, half) - if lt(xxRound, xx) { - revert(0, 0) - } - x := div(xxRound, base) - if mod(n, 2) { - let zx := mul(z, x) - if and(iszero(iszero(x)), iszero(eq(div(zx, x), z))) { - revert(0, 0) - } - let zxRound := add(zx, half) - if lt(zxRound, zx) { - revert(0, 0) - } - z := div(zxRound, base) - } - } - } - } - } - - function potDrip() private view returns (uint256) { - return _rmul(rpow(POT.dsr(), now - POT.rho(), RAY), POT.chi()); - } - - function chaiPrice(IChai chai) internal view returns(uint256) { - return chaiToDai(chai, 1e18); - } - - function daiToChai( - IChai /*chai*/, - uint256 amount - ) internal view returns (uint256) { - uint256 chi = (now > POT.rho()) ? potDrip() : POT.chi(); - return _rdiv(amount, chi); - } - - function chaiToDai( - IChai /*chai*/, - uint256 amount - ) internal view returns (uint256) { - uint256 chi = (now > POT.rho()) ? potDrip() : POT.chi(); - return _rmul(chi, amount); - } -} - -// File: contracts/interface/ICompound.sol - -pragma solidity ^0.5.0; - - - -contract ICompound { - function markets(address cToken) - external - view - returns (bool isListed, uint256 collateralFactorMantissa); -} - - -contract ICompoundToken is IERC20 { - function underlying() external view returns (address); - - function exchangeRateStored() external view returns (uint256); - - function mint(uint256 mintAmount) external returns (uint256); - - function redeem(uint256 redeemTokens) external returns (uint256); -} - - -contract ICompoundEther is IERC20 { - function mint() external payable; - - function redeem(uint256 redeemTokens) external returns (uint256); -} - -// File: contracts/interface/ICompoundRegistry.sol - -pragma solidity ^0.5.0; - - - - -contract ICompoundRegistry { - function tokenByCToken(ICompoundToken cToken) external view returns(IERC20); - function cTokenByToken(IERC20 token) external view returns(ICompoundToken); -} - -// File: contracts/interface/IAaveToken.sol - -pragma solidity ^0.5.0; - - - -contract IAaveToken is IERC20 { - function underlyingAssetAddress() external view returns (IERC20); - - function redeem(uint256 amount) external; -} - - -interface IAaveLendingPool { - function core() external view returns (address); - - function deposit(IERC20 token, uint256 amount, uint16 refCode) external payable; -} - -// File: contracts/interface/IAaveRegistry.sol - -pragma solidity ^0.5.0; - - - - -contract IAaveRegistry { - function tokenByAToken(IAaveToken aToken) external view returns(IERC20); - function aTokenByToken(IERC20 token) external view returns(IAaveToken); -} - -// File: contracts/interface/IMooniswap.sol - -pragma solidity ^0.5.0; - - - -interface IMooniswapRegistry { - function pools(IERC20 token1, IERC20 token2) external view returns(IMooniswap); - function isPool(address addr) external view returns(bool); -} - - -interface IMooniswap { - function fee() external view returns (uint256); - - function tokens(uint256 i) external view returns (IERC20); - - function deposit(uint256[] calldata amounts, uint256[] calldata minAmounts) external payable returns(uint256 fairSupply); - - function withdraw(uint256 amount, uint256[] calldata minReturns) external; - - function getBalanceForAddition(IERC20 token) external view returns(uint256); - - function getBalanceForRemoval(IERC20 token) external view returns(uint256); - - function getReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) - external - view - returns(uint256 returnAmount); - - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - address referral - ) - external - payable - returns(uint256 returnAmount); -} - -// File: @openzeppelin/contracts/math/Math.sol - -pragma solidity ^0.5.0; - -/** - * @dev Standard math utilities missing in the Solidity language. - */ -library Math { - /** - * @dev Returns the largest of two numbers. - */ - function max(uint256 a, uint256 b) internal pure returns (uint256) { - return a >= b ? a : b; - } - - /** - * @dev Returns the smallest of two numbers. - */ - function min(uint256 a, uint256 b) internal pure returns (uint256) { - return a < b ? a : b; - } - - /** - * @dev Returns the average of two numbers. The result is rounded towards - * zero. - */ - function average(uint256 a, uint256 b) internal pure returns (uint256) { - // (a + b) / 2 can overflow, so we distribute - return (a / 2) + (b / 2) + ((a % 2 + b % 2) / 2); - } -} - -// File: @openzeppelin/contracts/utils/Address.sol - -pragma solidity ^0.5.5; - -/** - * @dev Collection of functions related to the address type - */ -library Address { - /** - * @dev Returns true if `account` is a contract. - * - * [IMPORTANT] - * ==== - * It is unsafe to assume that an address for which this function returns - * false is an externally-owned account (EOA) and not a contract. - * - * Among others, `isContract` will return false for the following - * types of addresses: - * - * - an externally-owned account - * - a contract in construction - * - an address where a contract will be created - * - an address where a contract lived, but was destroyed - * ==== - */ - function isContract(address account) internal view returns (bool) { - // According to EIP-1052, 0x0 is the value returned for not-yet created accounts - // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned - // for accounts without code, i.e. `keccak256('')` - bytes32 codehash; - bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; - // solhint-disable-next-line no-inline-assembly - assembly { codehash := extcodehash(account) } - return (codehash != accountHash && codehash != 0x0); - } - - /** - * @dev Converts an `address` into `address payable`. Note that this is - * simply a type cast: the actual underlying value is not changed. - * - * _Available since v2.4.0._ - */ - function toPayable(address account) internal pure returns (address payable) { - return address(uint160(account)); - } - - /** - * @dev Replacement for Solidity's `transfer`: sends `amount` wei to - * `recipient`, forwarding all available gas and reverting on errors. - * - * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost - * of certain opcodes, possibly making contracts go over the 2300 gas limit - * imposed by `transfer`, making them unable to receive funds via - * `transfer`. {sendValue} removes this limitation. - * - * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more]. - * - * IMPORTANT: because control is transferred to `recipient`, care must be - * taken to not create reentrancy vulnerabilities. Consider using - * {ReentrancyGuard} or the - * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern]. - * - * _Available since v2.4.0._ - */ - function sendValue(address payable recipient, uint256 amount) internal { - require(address(this).balance >= amount, "Address: insufficient balance"); - - // solhint-disable-next-line avoid-call-value - (bool success, ) = recipient.call.value(amount)(""); - require(success, "Address: unable to send value, recipient may have reverted"); - } -} - -// File: @openzeppelin/contracts/token/ERC20/SafeERC20.sol - -pragma solidity ^0.5.0; - - - - -/** - * @title SafeERC20 - * @dev Wrappers around ERC20 operations that throw on failure (when the token - * contract returns false). Tokens that return no value (and instead revert or - * throw on failure) are also supported, non-reverting calls are assumed to be - * successful. - * To use this library you can add a `using SafeERC20 for ERC20;` statement to your contract, - * which allows you to call the safe operations as `token.safeTransfer(...)`, etc. - */ -library SafeERC20 { - using SafeMath for uint256; - using Address for address; - - function safeTransfer(IERC20 token, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); - } - - function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); - } - - function safeApprove(IERC20 token, address spender, uint256 value) internal { - // safeApprove should only be called when setting an initial allowance, - // or when resetting it to zero. To increase and decrease it, use - // 'safeIncreaseAllowance' and 'safeDecreaseAllowance' - // solhint-disable-next-line max-line-length - require((value == 0) || (token.allowance(address(this), spender) == 0), - "SafeERC20: approve from non-zero to non-zero allowance" - ); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value)); - } - - function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).add(value); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - function safeDecreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).sub(value, "SafeERC20: decreased allowance below zero"); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - /** - * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement - * on the return value: the return value is optional (but if data is returned, it must not be false). - * @param token The token targeted by the call. - * @param data The call data (encoded using abi.encode or one of its variants). - */ - function callOptionalReturn(IERC20 token, bytes memory data) private { - // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since - // we're implementing it ourselves. - - // A Solidity high level call has three parts: - // 1. The target address is checked to verify it contains contract code - // 2. The call itself is made, and success asserted - // 3. The return value is decoded, which in turn checks the size of the returned data. - // solhint-disable-next-line max-line-length - require(address(token).isContract(), "SafeERC20: call to non-contract"); - - // solhint-disable-next-line avoid-low-level-calls - (bool success, bytes memory returndata) = address(token).call(data); - require(success, "SafeERC20: low-level call failed"); - - if (returndata.length > 0) { // Return data is optional - // solhint-disable-next-line max-line-length - require(abi.decode(returndata, (bool)), "SafeERC20: ERC20 operation did not succeed"); - } - } -} - -// File: contracts/UniversalERC20.sol - -pragma solidity ^0.5.0; - - - - - -library UniversalERC20 { - - using SafeMath for uint256; - using SafeERC20 for IERC20; - - IERC20 private constant ZERO_ADDRESS = IERC20(0x0000000000000000000000000000000000000000); - IERC20 private constant ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - function universalTransfer(IERC20 token, address to, uint256 amount) internal returns(bool) { - if (amount == 0) { - return true; - } - - if (isETH(token)) { - address(uint160(to)).transfer(amount); - } else { - token.safeTransfer(to, amount); - return true; - } - } - - function universalTransferFrom(IERC20 token, address from, address to, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - require(from == msg.sender && msg.value >= amount, "Wrong useage of ETH.universalTransferFrom()"); - if (to != address(this)) { - address(uint160(to)).transfer(amount); - } - if (msg.value > amount) { - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(from, to, amount); - } - } - - function universalTransferFromSenderToThis(IERC20 token, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - if (msg.value > amount) { - // Return remainder if exist - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(msg.sender, address(this), amount); - } - } - - function universalApprove(IERC20 token, address to, uint256 amount) internal { - if (!isETH(token)) { - if (amount == 0) { - token.safeApprove(to, 0); - return; - } - - uint256 allowance = token.allowance(address(this), to); - if (allowance < amount) { - if (allowance > 0) { - token.safeApprove(to, 0); - } - token.safeApprove(to, amount); - } - } - } - - function universalBalanceOf(IERC20 token, address who) internal view returns (uint256) { - if (isETH(token)) { - return who.balance; - } else { - return token.balanceOf(who); - } - } - - function universalDecimals(IERC20 token) internal view returns (uint256) { - - if (isETH(token)) { - return 18; - } - - (bool success, bytes memory data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("decimals()") - ); - if (!success || data.length == 0) { - (success, data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("DECIMALS()") - ); - } - - return (success && data.length > 0) ? abi.decode(data, (uint256)) : 18; - } - - function isETH(IERC20 token) internal pure returns(bool) { - return (address(token) == address(ZERO_ADDRESS) || address(token) == address(ETH_ADDRESS)); - } - - function eq(IERC20 a, IERC20 b) internal pure returns(bool) { - return a == b || (isETH(a) && isETH(b)); - } - - function notExist(IERC20 token) internal pure returns(bool) { - return (address(token) == address(-1)); - } -} - -// File: contracts/interface/IUniswapV2Exchange.sol - -pragma solidity ^0.5.0; - - - - - - -interface IUniswapV2Exchange { - function getReserves() external view returns(uint112 _reserve0, uint112 _reserve1, uint32 _blockTimestampLast); - function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external; - function skim(address to) external; - function sync() external; -} - - -library UniswapV2ExchangeLib { - using Math for uint256; - using SafeMath for uint256; - using UniversalERC20 for IERC20; - - function getReturn( - IUniswapV2Exchange exchange, - IERC20 fromToken, - IERC20 destToken, - uint amountIn - ) internal view returns (uint256 result, bool needSync, bool needSkim) { - uint256 reserveIn = fromToken.universalBalanceOf(address(exchange)); - uint256 reserveOut = destToken.universalBalanceOf(address(exchange)); - (uint112 reserve0, uint112 reserve1,) = exchange.getReserves(); - if (fromToken > destToken) { - (reserve0, reserve1) = (reserve1, reserve0); - } - needSync = (reserveIn < reserve0 || reserveOut < reserve1); - needSkim = !needSync && (reserveIn > reserve0 || reserveOut > reserve1); - - uint256 amountInWithFee = amountIn.mul(997); - uint256 numerator = amountInWithFee.mul(Math.min(reserveOut, reserve1)); - uint256 denominator = Math.min(reserveIn, reserve0).mul(1000).add(amountInWithFee); - result = (denominator == 0) ? 0 : numerator.div(denominator); - } -} - -// File: contracts/interface/IUniswapV2Factory.sol - -pragma solidity ^0.5.0; - - - -interface IUniswapV2Factory { - function getPair(IERC20 tokenA, IERC20 tokenB) external view returns (IUniswapV2Exchange pair); -} - -// File: contracts/interface/IDForceSwap.sol - -pragma solidity ^0.5.0; - - - -interface IDForceSwap { - function getAmountByInput(IERC20 input, IERC20 output, uint256 amount) external view returns(uint256); - function swap(IERC20 input, IERC20 output, uint256 amount) external; -} - -// File: contracts/interface/IShell.sol - -pragma solidity ^0.5.0; - - -interface IShell { - function viewOriginTrade( - address origin, - address target, - uint256 originAmount - ) external view returns (uint256); - - function swapByOrigin( - address origin, - address target, - uint256 originAmount, - uint256 minTargetAmount, - uint256 deadline - ) external returns (uint256); -} - -// File: contracts/interface/IMStable.sol - -pragma solidity ^0.5.0; - - - -contract IMStable is IERC20 { - function getSwapOutput( - IERC20 _input, - IERC20 _output, - uint256 _quantity - ) - external - view - returns (bool, string memory, uint256 output); - - function swap( - IERC20 _input, - IERC20 _output, - uint256 _quantity, - address _recipient - ) - external - returns (uint256 output); - - function redeem( - IERC20 _basset, - uint256 _bassetQuantity - ) - external - returns (uint256 massetRedeemed); -} - -interface IMassetValidationHelper { - /** - * @dev Returns a valid bAsset to redeem - * @param _mAsset Masset addr - * @return valid bool - * @return string message - * @return address of bAsset to redeem - */ - function suggestRedeemAsset( - IERC20 _mAsset - ) - external - view - returns ( - bool valid, - string memory err, - address token - ); - - /** - * @dev Returns a valid bAsset with which to mint - * @param _mAsset Masset addr - * @return valid bool - * @return string message - * @return address of bAsset to mint - */ - function suggestMintAsset( - IERC20 _mAsset - ) - external - view - returns ( - bool valid, - string memory err, - address token - ); - - /** - * @dev Determines if a given Redemption is valid - * @param _mAsset Address of the given mAsset (e.g. mUSD) - * @param _mAssetQuantity Amount of mAsset to redeem (in mUSD units) - * @param _outputBasset Desired output bAsset - * @return valid - * @return validity reason - * @return output in bAsset units - * @return bAssetQuantityArg - required input argument to the 'redeem' call - */ - function getRedeemValidity( - IERC20 _mAsset, - uint256 _mAssetQuantity, - IERC20 _outputBasset - ) - external - view - returns ( - bool valid, - string memory, - uint256 output, - uint256 bassetQuantityArg - ); -} - -// File: contracts/interface/IBalancerPool.sol - -pragma solidity ^0.5.0; - - - -interface IBalancerPool { - function getSwapFee() - external view returns (uint256 balance); - - function getDenormalizedWeight(IERC20 token) - external view returns (uint256 balance); - - function getBalance(IERC20 token) - external view returns (uint256 balance); - - function swapExactAmountIn( - IERC20 tokenIn, - uint256 tokenAmountIn, - IERC20 tokenOut, - uint256 minAmountOut, - uint256 maxPrice - ) - external - returns (uint256 tokenAmountOut, uint256 spotPriceAfter); -} - - -// 0xA961672E8Db773be387e775bc4937C678F3ddF9a -interface IBalancerHelper { - function getReturns( - IBalancerPool pool, - IERC20 fromToken, - IERC20 destToken, - uint256[] calldata amounts - ) - external - view - returns(uint256[] memory rets); -} - -// File: contracts/interface/IBalancerRegistry.sol - -pragma solidity ^0.5.0; - - - - -interface IBalancerRegistry { - event PoolAdded( - address indexed pool - ); - event PoolTokenPairAdded( - address indexed pool, - address indexed fromToken, - address indexed destToken - ); - event IndicesUpdated( - address indexed fromToken, - address indexed destToken, - bytes32 oldIndices, - bytes32 newIndices - ); - - // Get info about pool pair for 1 SLOAD - function getPairInfo(address pool, address fromToken, address destToken) - external view returns(uint256 weight1, uint256 weight2, uint256 swapFee); - - // Pools - function checkAddedPools(address pool) - external view returns(bool); - function getAddedPoolsLength() - external view returns(uint256); - function getAddedPools() - external view returns(address[] memory); - function getAddedPoolsWithLimit(uint256 offset, uint256 limit) - external view returns(address[] memory result); - - // Tokens - function getAllTokensLength() - external view returns(uint256); - function getAllTokens() - external view returns(address[] memory); - function getAllTokensWithLimit(uint256 offset, uint256 limit) - external view returns(address[] memory result); - - // Pairs - function getPoolsLength(address fromToken, address destToken) - external view returns(uint256); - function getPools(address fromToken, address destToken) - external view returns(address[] memory); - function getPoolsWithLimit(address fromToken, address destToken, uint256 offset, uint256 limit) - external view returns(address[] memory result); - function getBestPools(address fromToken, address destToken) - external view returns(address[] memory pools); - function getBestPoolsWithLimit(address fromToken, address destToken, uint256 limit) - external view returns(address[] memory pools); - - // Get swap rates - function getPoolReturn(address pool, address fromToken, address destToken, uint256 amount) - external view returns(uint256); - function getPoolReturns(address pool, address fromToken, address destToken, uint256[] calldata amounts) - external view returns(uint256[] memory result); - - // Add and update registry - function addPool(address pool) external returns(uint256 listed); - function addPools(address[] calldata pools) external returns(uint256[] memory listed); - function updatedIndices(address[] calldata tokens, uint256 lengthLimit) external; -} - -// File: contracts/BalancerLib.sol - -pragma solidity ^0.5.0; - - -library BalancerLib { - uint public constant BONE = 10**18; - - uint public constant MIN_BOUND_TOKENS = 2; - uint public constant MAX_BOUND_TOKENS = 8; - - uint public constant MIN_FEE = BONE / 10**6; - uint public constant MAX_FEE = BONE / 10; - uint public constant EXIT_FEE = 0; - - uint public constant MIN_WEIGHT = BONE; - uint public constant MAX_WEIGHT = BONE * 50; - uint public constant MAX_TOTAL_WEIGHT = BONE * 50; - uint public constant MIN_BALANCE = BONE / 10**12; - - uint public constant INIT_POOL_SUPPLY = BONE * 100; - - uint public constant MIN_BPOW_BASE = 1 wei; - uint public constant MAX_BPOW_BASE = (2 * BONE) - 1 wei; - uint public constant BPOW_PRECISION = BONE / 10**10; - - uint public constant MAX_IN_RATIO = BONE / 2; - uint public constant MAX_OUT_RATIO = (BONE / 3) + 1 wei; - - function btoi(uint a) - internal pure - returns (uint) - { - return a / BONE; - } - - function bfloor(uint a) - internal pure - returns (uint) - { - return btoi(a) * BONE; - } - - function badd(uint a, uint b) - internal pure - returns (uint) - { - uint c = a + b; - require(c >= a, "ERR_ADD_OVERFLOW"); - return c; - } - - function bsub(uint a, uint b) - internal pure - returns (uint) - { - (uint c, bool flag) = bsubSign(a, b); - require(!flag, "ERR_SUB_UNDERFLOW"); - return c; - } - - function bsubSign(uint a, uint b) - internal pure - returns (uint, bool) - { - if (a >= b) { - return (a - b, false); - } else { - return (b - a, true); - } - } - - function bmul(uint a, uint b) - internal pure - returns (uint) - { - uint c0 = a * b; - require(a == 0 || c0 / a == b, "ERR_MUL_OVERFLOW"); - uint c1 = c0 + (BONE / 2); - require(c1 >= c0, "ERR_MUL_OVERFLOW"); - uint c2 = c1 / BONE; - return c2; - } - - function bdiv(uint a, uint b) - internal pure - returns (uint) - { - require(b != 0, "ERR_DIV_ZERO"); - uint c0 = a * BONE; - require(a == 0 || c0 / a == BONE, "ERR_DIV_INTERNAL"); // bmul overflow - uint c1 = c0 + (b / 2); - require(c1 >= c0, "ERR_DIV_INTERNAL"); // badd require - uint c2 = c1 / b; - return c2; - } - - // DSMath.wpow - function bpowi(uint a, uint n) - internal pure - returns (uint) - { - uint z = n % 2 != 0 ? a : BONE; - - for (n /= 2; n != 0; n /= 2) { - a = bmul(a, a); - - if (n % 2 != 0) { - z = bmul(z, a); - } - } - return z; - } - - // Compute b^(e.w) by splitting it into (b^e)*(b^0.w). - // Use `bpowi` for `b^e` and `bpowK` for k iterations - // of approximation of b^0.w - function bpow(uint base, uint exp) - internal pure - returns (uint) - { - require(base >= MIN_BPOW_BASE, "ERR_BPOW_BASE_TOO_LOW"); - require(base <= MAX_BPOW_BASE, "ERR_BPOW_BASE_TOO_HIGH"); - - uint whole = bfloor(exp); - uint remain = bsub(exp, whole); - - uint wholePow = bpowi(base, btoi(whole)); - - if (remain == 0) { - return wholePow; - } - - uint partialResult = bpowApprox(base, remain, BPOW_PRECISION); - return bmul(wholePow, partialResult); - } - - function bpowApprox(uint base, uint exp, uint precision) - internal pure - returns (uint) - { - // term 0: - uint a = exp; - (uint x, bool xneg) = bsubSign(base, BONE); - uint term = BONE; - uint sum = term; - bool negative = false; - - - // term(k) = numer / denom - // = (product(a - i - 1, i=1-->k) * x^k) / (k!) - // each iteration, multiply previous term by (a-(k-1)) * x / k - // continue until term is less than precision - for (uint i = 1; term >= precision; i++) { - uint bigK = i * BONE; - (uint c, bool cneg) = bsubSign(a, bsub(bigK, BONE)); - term = bmul(term, bmul(c, x)); - term = bdiv(term, bigK); - if (term == 0) break; - - if (xneg) negative = !negative; - if (cneg) negative = !negative; - if (negative) { - sum = bsub(sum, term); - } else { - sum = badd(sum, term); - } - } - - return sum; - } - - /********************************************************************************************** - // calcSpotPrice // - // sP = spotPrice // - // bI = tokenBalanceIn ( bI / wI ) 1 // - // bO = tokenBalanceOut sP = ----------- * ---------- // - // wI = tokenWeightIn ( bO / wO ) ( 1 - sF ) // - // wO = tokenWeightOut // - // sF = swapFee // - **********************************************************************************************/ - function calcSpotPrice( - uint tokenBalanceIn, - uint tokenWeightIn, - uint tokenBalanceOut, - uint tokenWeightOut, - uint swapFee - ) - internal pure - returns (uint spotPrice) - { - uint numer = bdiv(tokenBalanceIn, tokenWeightIn); - uint denom = bdiv(tokenBalanceOut, tokenWeightOut); - uint ratio = bdiv(numer, denom); - uint scale = bdiv(BONE, bsub(BONE, swapFee)); - return (spotPrice = bmul(ratio, scale)); - } - - /********************************************************************************************** - // calcOutGivenIn // - // aO = tokenAmountOut // - // bO = tokenBalanceOut // - // bI = tokenBalanceIn / / bI \ (wI / wO) \ // - // aI = tokenAmountIn aO = bO * | 1 - | -------------------------- | ^ | // - // wI = tokenWeightIn \ \ ( bI + ( aI * ( 1 - sF )) / / // - // wO = tokenWeightOut // - // sF = swapFee // - **********************************************************************************************/ - function calcOutGivenIn( - uint tokenBalanceIn, - uint tokenWeightIn, - uint tokenBalanceOut, - uint tokenWeightOut, - uint tokenAmountIn, - uint swapFee - ) - internal pure - returns (uint tokenAmountOut) - { - uint weightRatio = bdiv(tokenWeightIn, tokenWeightOut); - uint adjustedIn = bsub(BONE, swapFee); - adjustedIn = bmul(tokenAmountIn, adjustedIn); - uint y = bdiv(tokenBalanceIn, badd(tokenBalanceIn, adjustedIn)); - if (y == 0) { - return 0; - } - uint foo = bpow(y, weightRatio); - uint bar = bsub(BONE, foo); - tokenAmountOut = bmul(tokenBalanceOut, bar); - return tokenAmountOut; - } - - /********************************************************************************************** - // calcInGivenOut // - // aI = tokenAmountIn // - // bO = tokenBalanceOut / / bO \ (wO / wI) \ // - // bI = tokenBalanceIn bI * | | ------------ | ^ - 1 | // - // aO = tokenAmountOut aI = \ \ ( bO - aO ) / / // - // wI = tokenWeightIn -------------------------------------------- // - // wO = tokenWeightOut ( 1 - sF ) // - // sF = swapFee // - **********************************************************************************************/ - function calcInGivenOut( - uint tokenBalanceIn, - uint tokenWeightIn, - uint tokenBalanceOut, - uint tokenWeightOut, - uint tokenAmountOut, - uint swapFee - ) - internal pure - returns (uint tokenAmountIn) - { - uint weightRatio = bdiv(tokenWeightOut, tokenWeightIn); - uint diff = bsub(tokenBalanceOut, tokenAmountOut); - uint y = bdiv(tokenBalanceOut, diff); - if (y == 0) { - return 0; - } - uint foo = bpow(y, weightRatio); - foo = bsub(foo, BONE); - tokenAmountIn = bsub(BONE, swapFee); - tokenAmountIn = bdiv(bmul(tokenBalanceIn, foo), tokenAmountIn); - return tokenAmountIn; - } - - /********************************************************************************************** - // calcPoolOutGivenSingleIn // - // pAo = poolAmountOut / \ // - // tAi = tokenAmountIn /// / // wI \ \\ \ wI \ // - // wI = tokenWeightIn //| tAi *| 1 - || 1 - -- | * sF || + tBi \ -- \ // - // tW = totalWeight pAo=|| \ \ \\ tW / // | ^ tW | * pS - pS // - // tBi = tokenBalanceIn \\ ------------------------------------- / / // - // pS = poolSupply \\ tBi / / // - // sF = swapFee \ / // - **********************************************************************************************/ - function calcPoolOutGivenSingleIn( - uint tokenBalanceIn, - uint tokenWeightIn, - uint poolSupply, - uint totalWeight, - uint tokenAmountIn, - uint swapFee - ) - internal pure - returns (uint poolAmountOut) - { - // Charge the trading fee for the proportion of tokenAi - /// which is implicitly traded to the other pool tokens. - // That proportion is (1- weightTokenIn) - // tokenAiAfterFee = tAi * (1 - (1-weightTi) * poolFee); - uint normalizedWeight = bdiv(tokenWeightIn, totalWeight); - uint zaz = bmul(bsub(BONE, normalizedWeight), swapFee); - uint tokenAmountInAfterFee = bmul(tokenAmountIn, bsub(BONE, zaz)); - - uint newTokenBalanceIn = badd(tokenBalanceIn, tokenAmountInAfterFee); - uint tokenInRatio = bdiv(newTokenBalanceIn, tokenBalanceIn); - - // uint newPoolSupply = (ratioTi ^ weightTi) * poolSupply; - uint poolRatio = bpow(tokenInRatio, normalizedWeight); - uint newPoolSupply = bmul(poolRatio, poolSupply); - poolAmountOut = bsub(newPoolSupply, poolSupply); - return poolAmountOut; - } - - /********************************************************************************************** - // calcSingleInGivenPoolOut // - // tAi = tokenAmountIn //(pS + pAo)\ / 1 \\ // - // pS = poolSupply || --------- | ^ | --------- || * bI - bI // - // pAo = poolAmountOut \\ pS / \(wI / tW)// // - // bI = balanceIn tAi = -------------------------------------------- // - // wI = weightIn / wI \ // - // tW = totalWeight | 1 - ---- | * sF // - // sF = swapFee \ tW / // - **********************************************************************************************/ - function calcSingleInGivenPoolOut( - uint tokenBalanceIn, - uint tokenWeightIn, - uint poolSupply, - uint totalWeight, - uint poolAmountOut, - uint swapFee - ) - internal pure - returns (uint tokenAmountIn) - { - uint normalizedWeight = bdiv(tokenWeightIn, totalWeight); - uint newPoolSupply = badd(poolSupply, poolAmountOut); - uint poolRatio = bdiv(newPoolSupply, poolSupply); - - //uint newBalTi = poolRatio^(1/weightTi) * balTi; - uint boo = bdiv(BONE, normalizedWeight); - uint tokenInRatio = bpow(poolRatio, boo); - uint newTokenBalanceIn = bmul(tokenInRatio, tokenBalanceIn); - uint tokenAmountInAfterFee = bsub(newTokenBalanceIn, tokenBalanceIn); - // Do reverse order of fees charged in joinswap_ExternAmountIn, this way - // ``` pAo == joinswap_ExternAmountIn(Ti, joinswap_PoolAmountOut(pAo, Ti)) ``` - //uint tAi = tAiAfterFee / (1 - (1-weightTi) * swapFee) ; - uint zar = bmul(bsub(BONE, normalizedWeight), swapFee); - tokenAmountIn = bdiv(tokenAmountInAfterFee, bsub(BONE, zar)); - return tokenAmountIn; - } - - /********************************************************************************************** - // calcSingleOutGivenPoolIn // - // tAo = tokenAmountOut / / \\ // - // bO = tokenBalanceOut / // pS - (pAi * (1 - eF)) \ / 1 \ \\ // - // pAi = poolAmountIn | bO - || ----------------------- | ^ | --------- | * b0 || // - // ps = poolSupply \ \\ pS / \(wO / tW)/ // // - // wI = tokenWeightIn tAo = \ \ // // - // tW = totalWeight / / wO \ \ // - // sF = swapFee * | 1 - | 1 - ---- | * sF | // - // eF = exitFee \ \ tW / / // - **********************************************************************************************/ - function calcSingleOutGivenPoolIn( - uint tokenBalanceOut, - uint tokenWeightOut, - uint poolSupply, - uint totalWeight, - uint poolAmountIn, - uint swapFee - ) - internal pure - returns (uint tokenAmountOut) - { - uint normalizedWeight = bdiv(tokenWeightOut, totalWeight); - // charge exit fee on the pool token side - // pAiAfterExitFee = pAi*(1-exitFee) - uint poolAmountInAfterExitFee = bmul(poolAmountIn, bsub(BONE, EXIT_FEE)); - uint newPoolSupply = bsub(poolSupply, poolAmountInAfterExitFee); - uint poolRatio = bdiv(newPoolSupply, poolSupply); - - // newBalTo = poolRatio^(1/weightTo) * balTo; - uint tokenOutRatio = bpow(poolRatio, bdiv(BONE, normalizedWeight)); - uint newTokenBalanceOut = bmul(tokenOutRatio, tokenBalanceOut); - - uint tokenAmountOutBeforeSwapFee = bsub(tokenBalanceOut, newTokenBalanceOut); - - // charge swap fee on the output token side - //uint tAo = tAoBeforeSwapFee * (1 - (1-weightTo) * swapFee) - uint zaz = bmul(bsub(BONE, normalizedWeight), swapFee); - tokenAmountOut = bmul(tokenAmountOutBeforeSwapFee, bsub(BONE, zaz)); - return tokenAmountOut; - } - - /********************************************************************************************** - // calcPoolInGivenSingleOut // - // pAi = poolAmountIn // / tAo \\ / wO \ \ // - // bO = tokenBalanceOut // | bO - -------------------------- |\ | ---- | \ // - // tAo = tokenAmountOut pS - || \ 1 - ((1 - (tO / tW)) * sF)/ | ^ \ tW / * pS | // - // ps = poolSupply \\ -----------------------------------/ / // - // wO = tokenWeightOut pAi = \\ bO / / // - // tW = totalWeight ------------------------------------------------------------- // - // sF = swapFee ( 1 - eF ) // - // eF = exitFee // - **********************************************************************************************/ - function calcPoolInGivenSingleOut( - uint tokenBalanceOut, - uint tokenWeightOut, - uint poolSupply, - uint totalWeight, - uint tokenAmountOut, - uint swapFee - ) - internal pure - returns (uint poolAmountIn) - { - - // charge swap fee on the output token side - uint normalizedWeight = bdiv(tokenWeightOut, totalWeight); - //uint tAoBeforeSwapFee = tAo / (1 - (1-weightTo) * swapFee) ; - uint zoo = bsub(BONE, normalizedWeight); - uint zar = bmul(zoo, swapFee); - uint tokenAmountOutBeforeSwapFee = bdiv(tokenAmountOut, bsub(BONE, zar)); - - uint newTokenBalanceOut = bsub(tokenBalanceOut, tokenAmountOutBeforeSwapFee); - uint tokenOutRatio = bdiv(newTokenBalanceOut, tokenBalanceOut); - - //uint newPoolSupply = (ratioTo ^ weightTo) * poolSupply; - uint poolRatio = bpow(tokenOutRatio, normalizedWeight); - uint newPoolSupply = bmul(poolRatio, poolSupply); - uint poolAmountInAfterExitFee = bsub(poolSupply, newPoolSupply); - - // charge exit fee on the pool token side - // pAi = pAiAfterExitFee/(1-exitFee) - poolAmountIn = bdiv(poolAmountInAfterExitFee, bsub(BONE, EXIT_FEE)); - return poolAmountIn; - } -} - -// File: contracts/OneSplitBase.sol - -pragma solidity ^0.5.0; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -contract IOneSplitView is IOneSplitConsts { - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ); - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ); -} - - -library DisableFlags { - function check(uint256 flags, uint256 flag) internal pure returns(bool) { - return (flags & flag) != 0; - } -} - - -contract OneSplitRoot is IOneSplitView { - using SafeMath for uint256; - using DisableFlags for uint256; - - using UniversalERC20 for IERC20; - using UniversalERC20 for IWETH; - using UniswapV2ExchangeLib for IUniswapV2Exchange; - using ChaiHelper for IChai; - - uint256 constant internal DEXES_COUNT = 34; - IERC20 constant internal ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - IERC20 constant internal ZERO_ADDRESS = IERC20(0); - - IBancorEtherToken constant internal bancorEtherToken = IBancorEtherToken(0xc0829421C1d260BD3cB3E0F06cfE2D52db2cE315); - IWETH constant internal weth = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); - IChai constant internal chai = IChai(0x06AF07097C9Eeb7fD685c692751D5C66dB49c215); - IERC20 constant internal dai = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); - IERC20 constant internal usdc = IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); - IERC20 constant internal usdt = IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); - IERC20 constant internal tusd = IERC20(0x0000000000085d4780B73119b644AE5ecd22b376); - IERC20 constant internal busd = IERC20(0x4Fabb145d64652a948d72533023f6E7A623C7C53); - IERC20 constant internal susd = IERC20(0x57Ab1ec28D129707052df4dF418D58a2D46d5f51); - IERC20 constant internal pax = IERC20(0x8E870D67F660D95d5be530380D0eC0bd388289E1); - IERC20 constant internal renbtc = IERC20(0xEB4C2781e4ebA804CE9a9803C67d0893436bB27D); - IERC20 constant internal wbtc = IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); - IERC20 constant internal tbtc = IERC20(0x1bBE271d15Bb64dF0bc6CD28Df9Ff322F2eBD847); - IERC20 constant internal hbtc = IERC20(0x0316EB71485b0Ab14103307bf65a021042c6d380); - IERC20 constant internal sbtc = IERC20(0xfE18be6b3Bd88A2D2A7f928d00292E7a9963CfC6); - - IKyberNetworkProxy constant internal kyberNetworkProxy = IKyberNetworkProxy(0x9AAb3f75489902f3a48495025729a0AF77d4b11e); - IKyberStorage constant internal kyberStorage = IKyberStorage(0xC8fb12402cB16970F3C5F4b48Ff68Eb9D1289301); - IKyberHintHandler constant internal kyberHintHandler = IKyberHintHandler(0xa1C0Fa73c39CFBcC11ec9Eb1Afc665aba9996E2C); - IUniswapFactory constant internal uniswapFactory = IUniswapFactory(0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95); - IBancorContractRegistry constant internal bancorContractRegistry = IBancorContractRegistry(0x52Ae12ABe5D8BD778BD5397F99cA900624CfADD4); - IBancorNetworkPathFinder constant internal bancorNetworkPathFinder = IBancorNetworkPathFinder(0x6F0cD8C4f6F06eAB664C7E3031909452b4B72861); - //IBancorConverterRegistry constant internal bancorConverterRegistry = IBancorConverterRegistry(0xf6E2D7F616B67E46D708e4410746E9AAb3a4C518); - IBancorFinder constant internal bancorFinder = IBancorFinder(0x2B344e14dc2641D11D338C053C908c7A7D4c30B9); - IOasisExchange constant internal oasisExchange = IOasisExchange(0x794e6e91555438aFc3ccF1c5076A74F42133d08D); - ICurve constant internal curveCompound = ICurve(0xA2B47E3D5c44877cca798226B7B8118F9BFb7A56); - ICurve constant internal curveUSDT = ICurve(0x52EA46506B9CC5Ef470C5bf89f17Dc28bB35D85C); - ICurve constant internal curveY = ICurve(0x45F783CCE6B7FF23B2ab2D70e416cdb7D6055f51); - ICurve constant internal curveBinance = ICurve(0x79a8C46DeA5aDa233ABaFFD40F3A0A2B1e5A4F27); - ICurve constant internal curveSynthetix = ICurve(0xA5407eAE9Ba41422680e2e00537571bcC53efBfD); - ICurve constant internal curvePAX = ICurve(0x06364f10B501e868329afBc005b3492902d6C763); - ICurve constant internal curveRenBTC = ICurve(0x93054188d876f558f4a66B2EF1d97d16eDf0895B); - ICurve constant internal curveTBTC = ICurve(0x9726e9314eF1b96E45f40056bEd61A088897313E); - ICurve constant internal curveSBTC = ICurve(0x7fC77b5c7614E1533320Ea6DDc2Eb61fa00A9714); - IShell constant internal shell = IShell(0xA8253a440Be331dC4a7395B73948cCa6F19Dc97D); - IAaveLendingPool constant internal aave = IAaveLendingPool(0x398eC7346DcD622eDc5ae82352F02bE94C62d119); - ICompound constant internal compound = ICompound(0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B); - ICompoundEther constant internal cETH = ICompoundEther(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5); - IMooniswapRegistry constant internal mooniswapRegistry = IMooniswapRegistry(0x71CD6666064C3A1354a3B4dca5fA1E2D3ee7D303); - IUniswapV2Factory constant internal uniswapV2 = IUniswapV2Factory(0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f); - IDForceSwap constant internal dforceSwap = IDForceSwap(0x03eF3f37856bD08eb47E2dE7ABc4Ddd2c19B60F2); - IMStable constant internal musd = IMStable(0xe2f2a5C287993345a840Db3B0845fbC70f5935a5); - IMassetValidationHelper constant internal musd_helper = IMassetValidationHelper(0xaBcC93c3be238884cc3309C19Afd128fAfC16911); - IBalancerRegistry constant internal balancerRegistry = IBalancerRegistry(0x65e67cbc342712DF67494ACEfc06fe951EE93982); - ICurveCalculator constant internal curveCalculator = ICurveCalculator(0xc1DB00a8E5Ef7bfa476395cdbcc98235477cDE4E); - ICurveRegistry constant internal curveRegistry = ICurveRegistry(0x7002B727Ef8F5571Cb5F9D70D13DBEEb4dFAe9d1); - ICompoundRegistry constant internal compoundRegistry = ICompoundRegistry(0xF451Dbd7Ba14BFa7B1B78A766D3Ed438F79EE1D1); - IAaveRegistry constant internal aaveRegistry = IAaveRegistry(0xEd8b133B7B88366E01Bb9E38305Ab11c26521494); - IBalancerHelper constant internal balancerHelper = IBalancerHelper(0xA961672E8Db773be387e775bc4937C678F3ddF9a); - - int256 internal constant VERY_NEGATIVE_VALUE = -1e72; - - function _findBestDistribution( - uint256 s, // parts - int256[][] memory amounts // exchangesReturns - ) - internal - pure - returns( - int256 returnAmount, - uint256[] memory distribution - ) - { - uint256 n = amounts.length; - - int256[][] memory answer = new int256[][](n); // int[n][s+1] - uint256[][] memory parent = new uint256[][](n); // int[n][s+1] - - for (uint i = 0; i < n; i++) { - answer[i] = new int256[](s + 1); - parent[i] = new uint256[](s + 1); - } - - for (uint j = 0; j <= s; j++) { - answer[0][j] = amounts[0][j]; - for (uint i = 1; i < n; i++) { - answer[i][j] = -1e72; - } - parent[0][j] = 0; - } - - for (uint i = 1; i < n; i++) { - for (uint j = 0; j <= s; j++) { - answer[i][j] = answer[i - 1][j]; - parent[i][j] = j; - - for (uint k = 1; k <= j; k++) { - if (answer[i - 1][j - k] + amounts[i][k] > answer[i][j]) { - answer[i][j] = answer[i - 1][j - k] + amounts[i][k]; - parent[i][j] = j - k; - } - } - } - } - - distribution = new uint256[](DEXES_COUNT); - - uint256 partsLeft = s; - for (uint curExchange = n - 1; partsLeft > 0; curExchange--) { - distribution[curExchange] = partsLeft - parent[curExchange][partsLeft]; - partsLeft = parent[curExchange][partsLeft]; - } - - returnAmount = (answer[n - 1][s] == VERY_NEGATIVE_VALUE) ? 0 : answer[n - 1][s]; - } - - function _kyberReserveIdByTokens( - IERC20 fromToken, - IERC20 destToken - ) internal view returns(bytes32) { - if (!fromToken.isETH() && !destToken.isETH()) { - return 0; - } - - bytes32[] memory reserveIds = kyberStorage.getReserveIdsPerTokenSrc( - fromToken.isETH() ? destToken : fromToken - ); - - for (uint i = 0; i < reserveIds.length; i++) { - if ((uint256(reserveIds[i]) >> 248) != 0xBB && // Bridge - reserveIds[i] != 0xff4b796265722046707200000000000000000000000000000000000000000000 && // Reserve 1 - reserveIds[i] != 0xffabcd0000000000000000000000000000000000000000000000000000000000 && // Reserve 2 - reserveIds[i] != 0xff4f6e65426974205175616e7400000000000000000000000000000000000000) // Reserve 3 - { - return reserveIds[i]; - } - } - - return 0; - } - - function _scaleDestTokenEthPriceTimesGasPrice( - IERC20 fromToken, - IERC20 destToken, - uint256 destTokenEthPriceTimesGasPrice - ) internal view returns(uint256) { - if (fromToken == destToken) { - return destTokenEthPriceTimesGasPrice; - } - - uint256 mul = _cheapGetPrice(ETH_ADDRESS, destToken, 0.01 ether); - uint256 div = _cheapGetPrice(ETH_ADDRESS, fromToken, 0.01 ether); - if (div > 0) { - return destTokenEthPriceTimesGasPrice.mul(mul).div(div); - } - return 0; - } - - function _cheapGetPrice( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal view returns(uint256 returnAmount) { - (returnAmount,,) = this.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - 1, - FLAG_DISABLE_SPLIT_RECALCULATION | - FLAG_DISABLE_ALL_SPLIT_SOURCES | - FLAG_DISABLE_UNISWAP_V2_ALL | - FLAG_DISABLE_UNISWAP, - 0 - ); - } - - function _linearInterpolation( - uint256 value, - uint256 parts - ) internal pure returns(uint256[] memory rets) { - rets = new uint256[](parts); - for (uint i = 0; i < parts; i++) { - rets[i] = value.mul(i + 1).div(parts); - } - } - - function _tokensEqual(IERC20 tokenA, IERC20 tokenB) internal pure returns(bool) { - return ((tokenA.isETH() && tokenB.isETH()) || tokenA == tokenB); - } -} - - -contract OneSplitViewWrapBase is IOneSplitView, OneSplitRoot { - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = this.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _getExpectedReturnRespectingGasFloor( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _getExpectedReturnRespectingGasFloor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - internal - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ); -} - - -contract OneSplitView is IOneSplitView, OneSplitRoot { - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - distribution = new uint256[](DEXES_COUNT); - - if (fromToken == destToken) { - return (amount, 0, distribution); - } - - function(IERC20,IERC20,uint256,uint256,uint256) view returns(uint256[] memory, uint256)[DEXES_COUNT] memory reserves = _getAllReserves(flags); - - int256[][] memory matrix = new int256[][](DEXES_COUNT); - uint256[DEXES_COUNT] memory gases; - bool atLeastOnePositive = false; - for (uint i = 0; i < DEXES_COUNT; i++) { - uint256[] memory rets; - (rets, gases[i]) = reserves[i](fromToken, destToken, amount, parts, flags); - - // Prepend zero and sub gas - int256 gas = int256(gases[i].mul(destTokenEthPriceTimesGasPrice).div(1e18)); - matrix[i] = new int256[](parts + 1); - for (uint j = 0; j < rets.length; j++) { - matrix[i][j + 1] = int256(rets[j]) - gas; - atLeastOnePositive = atLeastOnePositive || (matrix[i][j + 1] > 0); - } - } - - if (!atLeastOnePositive) { - for (uint i = 0; i < DEXES_COUNT; i++) { - for (uint j = 1; j < parts + 1; j++) { - if (matrix[i][j] == 0) { - matrix[i][j] = VERY_NEGATIVE_VALUE; - } - } - } - } - - (, distribution) = _findBestDistribution(parts, matrix); - - (returnAmount, estimateGasAmount) = _getReturnAndGasByDistribution( - Args({ - fromToken: fromToken, - destToken: destToken, - amount: amount, - parts: parts, - flags: flags, - destTokenEthPriceTimesGasPrice: destTokenEthPriceTimesGasPrice, - distribution: distribution, - matrix: matrix, - gases: gases, - reserves: reserves - }) - ); - return (returnAmount, estimateGasAmount, distribution); - } - - struct Args { - IERC20 fromToken; - IERC20 destToken; - uint256 amount; - uint256 parts; - uint256 flags; - uint256 destTokenEthPriceTimesGasPrice; - uint256[] distribution; - int256[][] matrix; - uint256[DEXES_COUNT] gases; - function(IERC20,IERC20,uint256,uint256,uint256) view returns(uint256[] memory, uint256)[DEXES_COUNT] reserves; - } - - function _getReturnAndGasByDistribution( - Args memory args - ) internal view returns(uint256 returnAmount, uint256 estimateGasAmount) { - bool[DEXES_COUNT] memory exact = [ - true, // "Uniswap", - false, // "Kyber", - false, // "Bancor", - false, // "Oasis", - true, // "Curve Compound", - true, // "Curve USDT", - true, // "Curve Y", - true, // "Curve Binance", - true, // "Curve Synthetix", - true, // "Uniswap Compound", - true, // "Uniswap CHAI", - true, // "Uniswap Aave", - true, // "Mooniswap 1", - true, // "Uniswap V2", - true, // "Uniswap V2 (ETH)", - true, // "Uniswap V2 (DAI)", - true, // "Uniswap V2 (USDC)", - true, // "Curve Pax", - true, // "Curve RenBTC", - true, // "Curve tBTC", - true, // "Dforce XSwap", - false, // "Shell", - true, // "mStable", - true, // "Curve sBTC" - true, // "Balancer 1" - true, // "Balancer 2" - true, // "Balancer 3" - true, // "Kyber 1" - true, // "Kyber 2" - true, // "Kyber 3" - true, // "Kyber 4" - true, // "Mooniswap 2" - true, // "Mooniswap 3" - true // "Mooniswap 4" - ]; - - for (uint i = 0; i < DEXES_COUNT; i++) { - if (args.distribution[i] > 0) { - if (args.distribution[i] == args.parts || exact[i] || args.flags.check(FLAG_DISABLE_SPLIT_RECALCULATION)) { - estimateGasAmount = estimateGasAmount.add(args.gases[i]); - int256 value = args.matrix[i][args.distribution[i]]; - returnAmount = returnAmount.add(uint256( - (value == VERY_NEGATIVE_VALUE ? 0 : value) + - int256(args.gases[i].mul(args.destTokenEthPriceTimesGasPrice).div(1e18)) - )); - } - else { - (uint256[] memory rets, uint256 gas) = args.reserves[i](args.fromToken, args.destToken, args.amount.mul(args.distribution[i]).div(args.parts), 1, args.flags); - estimateGasAmount = estimateGasAmount.add(gas); - returnAmount = returnAmount.add(rets[0]); - } - } - } - } - - function _getAllReserves(uint256 flags) - internal - pure - returns(function(IERC20,IERC20,uint256,uint256,uint256) view returns(uint256[] memory, uint256)[DEXES_COUNT] memory) - { - bool invert = flags.check(FLAG_DISABLE_ALL_SPLIT_SOURCES); - return [ - invert != flags.check(FLAG_DISABLE_UNISWAP_ALL | FLAG_DISABLE_UNISWAP) ? _calculateNoReturn : calculateUniswap, - _calculateNoReturn, // invert != flags.check(FLAG_DISABLE_KYBER) ? _calculateNoReturn : calculateKyber, - invert != flags.check(FLAG_DISABLE_BANCOR) ? _calculateNoReturn : calculateBancor, - invert != flags.check(FLAG_DISABLE_OASIS) ? _calculateNoReturn : calculateOasis, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_COMPOUND) ? _calculateNoReturn : calculateCurveCompound, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_USDT) ? _calculateNoReturn : calculateCurveUSDT, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_Y) ? _calculateNoReturn : calculateCurveY, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_BINANCE) ? _calculateNoReturn : calculateCurveBinance, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_SYNTHETIX) ? _calculateNoReturn : calculateCurveSynthetix, - invert != flags.check(FLAG_DISABLE_UNISWAP_ALL | FLAG_DISABLE_UNISWAP_COMPOUND) ? _calculateNoReturn : calculateUniswapCompound, - invert != flags.check(FLAG_DISABLE_UNISWAP_ALL | FLAG_DISABLE_UNISWAP_CHAI) ? _calculateNoReturn : calculateUniswapChai, - invert != flags.check(FLAG_DISABLE_UNISWAP_ALL | FLAG_DISABLE_UNISWAP_AAVE) ? _calculateNoReturn : calculateUniswapAave, - invert != flags.check(FLAG_DISABLE_MOONISWAP_ALL | FLAG_DISABLE_MOONISWAP) ? _calculateNoReturn : calculateMooniswap, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_ALL | FLAG_DISABLE_UNISWAP_V2) ? _calculateNoReturn : calculateUniswapV2, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_ALL | FLAG_DISABLE_UNISWAP_V2_ETH) ? _calculateNoReturn : calculateUniswapV2ETH, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_ALL | FLAG_DISABLE_UNISWAP_V2_DAI) ? _calculateNoReturn : calculateUniswapV2DAI, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_ALL | FLAG_DISABLE_UNISWAP_V2_USDC) ? _calculateNoReturn : calculateUniswapV2USDC, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_PAX) ? _calculateNoReturn : calculateCurvePAX, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_RENBTC) ? _calculateNoReturn : calculateCurveRenBTC, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_TBTC) ? _calculateNoReturn : calculateCurveTBTC, - invert != flags.check(FLAG_DISABLE_DFORCE_SWAP) ? _calculateNoReturn : calculateDforceSwap, - invert != flags.check(FLAG_DISABLE_SHELL) ? _calculateNoReturn : calculateShell, - invert != flags.check(FLAG_DISABLE_MSTABLE_MUSD) ? _calculateNoReturn : calculateMStableMUSD, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_SBTC) ? _calculateNoReturn : calculateCurveSBTC, - invert != flags.check(FLAG_DISABLE_BALANCER_ALL | FLAG_DISABLE_BALANCER_1) ? _calculateNoReturn : calculateBalancer1, - invert != flags.check(FLAG_DISABLE_BALANCER_ALL | FLAG_DISABLE_BALANCER_2) ? _calculateNoReturn : calculateBalancer2, - invert != flags.check(FLAG_DISABLE_BALANCER_ALL | FLAG_DISABLE_BALANCER_3) ? _calculateNoReturn : calculateBalancer3, - invert != flags.check(FLAG_DISABLE_KYBER_ALL | FLAG_DISABLE_KYBER_1) ? _calculateNoReturn : calculateKyber1, - invert != flags.check(FLAG_DISABLE_KYBER_ALL | FLAG_DISABLE_KYBER_2) ? _calculateNoReturn : calculateKyber2, - invert != flags.check(FLAG_DISABLE_KYBER_ALL | FLAG_DISABLE_KYBER_3) ? _calculateNoReturn : calculateKyber3, - invert != flags.check(FLAG_DISABLE_KYBER_ALL | FLAG_DISABLE_KYBER_4) ? _calculateNoReturn : calculateKyber4, - invert != flags.check(FLAG_DISABLE_MOONISWAP_ALL | FLAG_DISABLE_MOONISWAP_ETH) ? _calculateNoReturn : calculateMooniswapOverETH, - invert != flags.check(FLAG_DISABLE_MOONISWAP_ALL | FLAG_DISABLE_MOONISWAP_DAI) ? _calculateNoReturn : calculateMooniswapOverDAI, - invert != flags.check(FLAG_DISABLE_MOONISWAP_ALL | FLAG_DISABLE_MOONISWAP_USDC) ? _calculateNoReturn : calculateMooniswapOverUSDC - ]; - } - - function _calculateNoGas( - IERC20 /*fromToken*/, - IERC20 /*destToken*/, - uint256 /*amount*/, - uint256 /*parts*/, - uint256 /*destTokenEthPriceTimesGasPrice*/, - uint256 /*flags*/, - uint256 /*destTokenEthPrice*/ - ) internal view returns(uint256[] memory /*rets*/, uint256 /*gas*/) { - this; - } - - // View Helpers - - struct Balances { - uint256 src; - uint256 dst; - } - - function _calculateBalancer( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 poolIndex - ) internal view returns(uint256[] memory rets, uint256 gas) { - address[] memory pools = balancerRegistry.getBestPoolsWithLimit( - address(fromToken.isETH() ? weth : fromToken), - address(destToken.isETH() ? weth : destToken), - poolIndex + 1 - ); - if (poolIndex >= pools.length) { - return (new uint256[](parts), 0); - } - - rets = balancerHelper.getReturns( - IBalancerPool(pools[poolIndex]), - fromToken.isETH() ? weth : fromToken, - destToken.isETH() ? weth : destToken, - _linearInterpolation(amount, parts) - ); - gas = 75_000 + (fromToken.isETH() || destToken.isETH() ? 0 : 65_000); - } - - function calculateBalancer1( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateBalancer( - fromToken, - destToken, - amount, - parts, - 0 - ); - } - - function calculateBalancer2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateBalancer( - fromToken, - destToken, - amount, - parts, - 1 - ); - } - - function calculateBalancer3( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateBalancer( - fromToken, - destToken, - amount, - parts, - 2 - ); - } - - function calculateMStableMUSD( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = new uint256[](parts); - - if ((fromToken != usdc && fromToken != dai && fromToken != usdt && fromToken != tusd) || - (destToken != usdc && destToken != dai && destToken != usdt && destToken != tusd)) - { - return (rets, 0); - } - - for (uint i = 1; i <= parts; i *= 2) { - (bool success, bytes memory data) = address(musd).staticcall(abi.encodeWithSelector( - musd.getSwapOutput.selector, - fromToken, - destToken, - amount.mul(parts.div(i)).div(parts) - )); - - if (success && data.length > 0) { - (,, uint256 maxRet) = abi.decode(data, (bool,string,uint256)); - if (maxRet > 0) { - for (uint j = 0; j < parts.div(i); j++) { - rets[j] = maxRet.mul(j + 1).div(parts.div(i)); - } - break; - } - } - } - - return ( - rets, - 700_000 - ); - } - - function _getCurvePoolInfo( - ICurve curve, - bool haveUnderlying - ) internal view returns( - uint256[8] memory balances, - uint256[8] memory precisions, - uint256[8] memory rates, - uint256 amp, - uint256 fee - ) { - uint256[8] memory underlying_balances; - uint256[8] memory decimals; - uint256[8] memory underlying_decimals; - - ( - balances, - underlying_balances, - decimals, - underlying_decimals, - /*address lp_token*/, - amp, - fee - ) = curveRegistry.get_pool_info(address(curve)); - - for (uint k = 0; k < 8 && balances[k] > 0; k++) { - precisions[k] = 10 ** (18 - (haveUnderlying ? underlying_decimals : decimals)[k]); - if (haveUnderlying) { - rates[k] = underlying_balances[k].mul(1e18).div(balances[k]); - } else { - rates[k] = 1e18; - } - } - } - - function _calculateCurveSelector( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - ICurve curve, - bool haveUnderlying, - IERC20[] memory tokens - ) internal view returns(uint256[] memory rets) { - rets = new uint256[](parts); - - int128 i = 0; - int128 j = 0; - for (uint t = 0; t < tokens.length; t++) { - if (fromToken == tokens[t]) { - i = int128(t + 1); - } - if (destToken == tokens[t]) { - j = int128(t + 1); - } - } - - if (i == 0 || j == 0) { - return rets; - } - - bytes memory data = abi.encodePacked( - uint256(haveUnderlying ? 1 : 0), - uint256(i - 1), - uint256(j - 1), - _linearInterpolation100(amount, parts) - ); - - ( - uint256[8] memory balances, - uint256[8] memory precisions, - uint256[8] memory rates, - uint256 amp, - uint256 fee - ) = _getCurvePoolInfo(curve, haveUnderlying); - - bool success; - (success, data) = address(curveCalculator).staticcall( - abi.encodePacked( - abi.encodeWithSelector( - curveCalculator.get_dy.selector, - tokens.length, - balances, - amp, - fee, - rates, - precisions - ), - data - ) - ); - - if (!success || data.length == 0) { - return rets; - } - - uint256[100] memory dy = abi.decode(data, (uint256[100])); - for (uint t = 0; t < parts; t++) { - rets[t] = dy[t]; - } - } - - function _linearInterpolation100( - uint256 value, - uint256 parts - ) internal pure returns(uint256[100] memory rets) { - for (uint i = 0; i < parts; i++) { - rets[i] = value.mul(i + 1).div(parts); - } - } - - function calculateCurveCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](2); - tokens[0] = dai; - tokens[1] = usdc; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveCompound, - true, - tokens - ), 720_000); - } - - function calculateCurveUSDT( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](3); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveUSDT, - true, - tokens - ), 720_000); - } - - function calculateCurveY( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = tusd; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveY, - true, - tokens - ), 1_400_000); - } - - function calculateCurveBinance( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = busd; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveBinance, - true, - tokens - ), 1_400_000); - } - - function calculateCurveSynthetix( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = susd; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveSynthetix, - true, - tokens - ), 200_000); - } - - function calculateCurvePAX( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = pax; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curvePAX, - true, - tokens - ), 1_000_000); - } - - function calculateCurveRenBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](2); - tokens[0] = renbtc; - tokens[1] = wbtc; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveRenBTC, - false, - tokens - ), 130_000); - } - - function calculateCurveTBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](3); - tokens[0] = tbtc; - tokens[1] = wbtc; - tokens[2] = hbtc; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveTBTC, - false, - tokens - ), 145_000); - } - - function calculateCurveSBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](3); - tokens[0] = renbtc; - tokens[1] = wbtc; - tokens[2] = sbtc; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveSBTC, - false, - tokens - ), 150_000); - } - - function calculateShell( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - (bool success, bytes memory data) = address(shell).staticcall(abi.encodeWithSelector( - shell.viewOriginTrade.selector, - fromToken, - destToken, - amount - )); - - if (!success || data.length == 0) { - return (new uint256[](parts), 0); - } - - uint256 maxRet = abi.decode(data, (uint256)); - return (_linearInterpolation(maxRet, parts), 300_000); - } - - function calculateDforceSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - (bool success, bytes memory data) = address(dforceSwap).staticcall( - abi.encodeWithSelector( - dforceSwap.getAmountByInput.selector, - fromToken, - destToken, - amount - ) - ); - if (!success || data.length == 0) { - return (new uint256[](parts), 0); - } - - uint256 maxRet = abi.decode(data, (uint256)); - uint256 available = destToken.universalBalanceOf(address(dforceSwap)); - if (maxRet > available) { - return (new uint256[](parts), 0); - } - - return (_linearInterpolation(maxRet, parts), 160_000); - } - - function _calculateUniswapFormula(uint256 fromBalance, uint256 toBalance, uint256 amount) internal pure returns(uint256) { - if (amount == 0) { - return 0; - } - return amount.mul(toBalance).mul(997).div( - fromBalance.mul(1000).add(amount.mul(997)) - ); - } - - function _calculateUniswap( - IERC20 fromToken, - IERC20 destToken, - uint256[] memory amounts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = amounts; - - if (!fromToken.isETH()) { - IUniswapExchange fromExchange = uniswapFactory.getExchange(fromToken); - if (fromExchange == IUniswapExchange(0)) { - return (new uint256[](rets.length), 0); - } - - uint256 fromTokenBalance = fromToken.universalBalanceOf(address(fromExchange)); - uint256 fromEtherBalance = address(fromExchange).balance; - - for (uint i = 0; i < rets.length; i++) { - rets[i] = _calculateUniswapFormula(fromTokenBalance, fromEtherBalance, rets[i]); - } - } - - if (!destToken.isETH()) { - IUniswapExchange toExchange = uniswapFactory.getExchange(destToken); - if (toExchange == IUniswapExchange(0)) { - return (new uint256[](rets.length), 0); - } - - uint256 toEtherBalance = address(toExchange).balance; - uint256 toTokenBalance = destToken.universalBalanceOf(address(toExchange)); - - for (uint i = 0; i < rets.length; i++) { - rets[i] = _calculateUniswapFormula(toEtherBalance, toTokenBalance, rets[i]); - } - } - - return (rets, fromToken.isETH() || destToken.isETH() ? 60_000 : 100_000); - } - - function calculateUniswap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateUniswap( - fromToken, - destToken, - _linearInterpolation(amount, parts), - flags - ); - } - - function _calculateUniswapWrapped( - IERC20 fromToken, - IERC20 midToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 midTokenPrice, - uint256 flags, - uint256 gas1, - uint256 gas2 - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (!fromToken.isETH() && destToken.isETH()) { - (rets, gas) = _calculateUniswap( - midToken, - destToken, - _linearInterpolation(amount.mul(1e18).div(midTokenPrice), parts), - flags - ); - return (rets, gas + gas1); - } - else if (fromToken.isETH() && !destToken.isETH()) { - (rets, gas) = _calculateUniswap( - fromToken, - midToken, - _linearInterpolation(amount, parts), - flags - ); - - for (uint i = 0; i < parts; i++) { - rets[i] = rets[i].mul(midTokenPrice).div(1e18); - } - return (rets, gas + gas2); - } - - return (new uint256[](parts), 0); - } - - function calculateUniswapCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20 midPreToken; - if (!fromToken.isETH() && destToken.isETH()) { - midPreToken = fromToken; - } - else if (!destToken.isETH() && fromToken.isETH()) { - midPreToken = destToken; - } - - if (!midPreToken.isETH()) { - ICompoundToken midToken = compoundRegistry.cTokenByToken(midPreToken); - if (midToken != ICompoundToken(0)) { - return _calculateUniswapWrapped( - fromToken, - midToken, - destToken, - amount, - parts, - midToken.exchangeRateStored(), - flags, - 200_000, - 200_000 - ); - } - } - - return (new uint256[](parts), 0); - } - - function calculateUniswapChai( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == dai && destToken.isETH() || - fromToken.isETH() && destToken == dai) - { - return _calculateUniswapWrapped( - fromToken, - chai, - destToken, - amount, - parts, - chai.chaiPrice(), - flags, - 180_000, - 160_000 - ); - } - - return (new uint256[](parts), 0); - } - - function calculateUniswapAave( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20 midPreToken; - if (!fromToken.isETH() && destToken.isETH()) { - midPreToken = fromToken; - } - else if (!destToken.isETH() && fromToken.isETH()) { - midPreToken = destToken; - } - - if (!midPreToken.isETH()) { - IAaveToken midToken = aaveRegistry.aTokenByToken(midPreToken); - if (midToken != IAaveToken(0)) { - return _calculateUniswapWrapped( - fromToken, - midToken, - destToken, - amount, - parts, - 1e18, - flags, - 310_000, - 670_000 - ); - } - } - - return (new uint256[](parts), 0); - } - - function calculateKyber1( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateKyber( - fromToken, - destToken, - amount, - parts, - flags, - 0xff4b796265722046707200000000000000000000000000000000000000000000 // 0x63825c174ab367968EC60f061753D3bbD36A0D8F - ); - } - - function calculateKyber2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateKyber( - fromToken, - destToken, - amount, - parts, - flags, - 0xffabcd0000000000000000000000000000000000000000000000000000000000 // 0x7a3370075a54B187d7bD5DceBf0ff2B5552d4F7D - ); - } - - function calculateKyber3( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateKyber( - fromToken, - destToken, - amount, - parts, - flags, - 0xff4f6e65426974205175616e7400000000000000000000000000000000000000 // 0x4f32BbE8dFc9efD54345Fc936f9fEF1048746fCF - ); - } - - function calculateKyber4( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - bytes32 reserveId = _kyberReserveIdByTokens(fromToken, destToken); - if (reserveId == 0) { - return (new uint256[](parts), 0); - } - - return _calculateKyber( - fromToken, - destToken, - amount, - parts, - flags, - reserveId - ); - } - - function _kyberGetRate( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags, - bytes memory hint - ) private view returns(uint256) { - (, bytes memory data) = address(kyberNetworkProxy).staticcall( - abi.encodeWithSelector( - kyberNetworkProxy.getExpectedRateAfterFee.selector, - fromToken, - destToken, - amount, - (flags >> 255) * 10, - hint - ) - ); - - return (data.length == 32) ? abi.decode(data, (uint256)) : 0; - } - - function _calculateKyber( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - bytes32 reserveId - ) internal view returns(uint256[] memory rets, uint256 gas) { - bytes memory fromHint; - bytes memory destHint; - { - bytes32[] memory reserveIds = new bytes32[](1); - reserveIds[0] = reserveId; - - (bool success, bytes memory data) = address(kyberHintHandler).staticcall( - abi.encodeWithSelector( - kyberHintHandler.buildTokenToEthHint.selector, - fromToken, - IKyberHintHandler.TradeType.MaskIn, - reserveIds, - new uint256[](0) - ) - ); - fromHint = success ? abi.decode(data, (bytes)) : bytes(""); - - (success, data) = address(kyberHintHandler).staticcall( - abi.encodeWithSelector( - kyberHintHandler.buildEthToTokenHint.selector, - destToken, - IKyberHintHandler.TradeType.MaskIn, - reserveIds, - new uint256[](0) - ) - ); - destHint = success ? abi.decode(data, (bytes)) : bytes(""); - } - - uint256 fromTokenDecimals = 10 ** IERC20(fromToken).universalDecimals(); - uint256 destTokenDecimals = 10 ** IERC20(destToken).universalDecimals(); - rets = new uint256[](parts); - for (uint i = 0; i < parts; i++) { - if (i > 0 && rets[i - 1] == 0) { - break; - } - rets[i] = amount.mul(i + 1).div(parts); - - if (!fromToken.isETH()) { - if (fromHint.length == 0) { - rets[i] = 0; - break; - } - uint256 rate = _kyberGetRate( - fromToken, - ETH_ADDRESS, - rets[i], - flags, - fromHint - ); - rets[i] = rate.mul(rets[i]).div(fromTokenDecimals); - } - - if (!destToken.isETH() && rets[i] > 0) { - if (destHint.length == 0) { - rets[i] = 0; - break; - } - uint256 rate = _kyberGetRate( - ETH_ADDRESS, - destToken, - rets[i], - 10, - destHint - ); - rets[i] = rate.mul(rets[i]).mul(destTokenDecimals).div(1e36); - } - } - - return (rets, 100_000); - } - - function calculateBancor( - IERC20 /*fromToken*/, - IERC20 /*destToken*/, - uint256 /*amount*/, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return (new uint256[](parts), 0); - // IBancorNetwork bancorNetwork = IBancorNetwork(bancorContractRegistry.addressOf("BancorNetwork")); - - // address[] memory path = bancorFinder.buildBancorPath( - // fromToken.isETH() ? bancorEtherToken : fromToken, - // destToken.isETH() ? bancorEtherToken : destToken - // ); - - // rets = _linearInterpolation(amount, parts); - // for (uint i = 0; i < parts; i++) { - // (bool success, bytes memory data) = address(bancorNetwork).staticcall.gas(500000)( - // abi.encodeWithSelector( - // bancorNetwork.getReturnByPath.selector, - // path, - // rets[i] - // ) - // ); - // if (!success || data.length == 0) { - // for (; i < parts; i++) { - // rets[i] = 0; - // } - // break; - // } else { - // (uint256 ret,) = abi.decode(data, (uint256,uint256)); - // rets[i] = ret; - // } - // } - - // return (rets, path.length.mul(150_000)); - } - - function calculateOasis( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = _linearInterpolation(amount, parts); - for (uint i = 0; i < parts; i++) { - (bool success, bytes memory data) = address(oasisExchange).staticcall.gas(500000)( - abi.encodeWithSelector( - oasisExchange.getBuyAmount.selector, - destToken.isETH() ? weth : destToken, - fromToken.isETH() ? weth : fromToken, - rets[i] - ) - ); - - if (!success || data.length == 0) { - for (; i < parts; i++) { - rets[i] = 0; - } - break; - } else { - rets[i] = abi.decode(data, (uint256)); - } - } - - return (rets, 500_000); - } - - function calculateMooniswapMany( - IERC20 fromToken, - IERC20 destToken, - uint256[] memory amounts - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = new uint256[](amounts.length); - - IMooniswap mooniswap = mooniswapRegistry.pools( - fromToken.isETH() ? ZERO_ADDRESS : fromToken, - destToken.isETH() ? ZERO_ADDRESS : destToken - ); - if (mooniswap == IMooniswap(0)) { - return (rets, 0); - } - - uint256 fee = mooniswap.fee(); - uint256 fromBalance = mooniswap.getBalanceForAddition(fromToken.isETH() ? ZERO_ADDRESS : fromToken); - uint256 destBalance = mooniswap.getBalanceForRemoval(destToken.isETH() ? ZERO_ADDRESS : destToken); - if (fromBalance == 0 || destBalance == 0) { - return (rets, 0); - } - - for (uint i = 0; i < amounts.length; i++) { - uint256 amount = amounts[i].sub(amounts[i].mul(fee).div(1e18)); - rets[i] = amount.mul(destBalance).div( - fromBalance.add(amount) - ); - } - - return (rets, (fromToken.isETH() || destToken.isETH()) ? 80_000 : 110_000); - } - - function calculateMooniswap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return calculateMooniswapMany( - fromToken, - destToken, - _linearInterpolation(amount, parts) - ); - } - - function calculateMooniswapOverETH( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken.isETH() || destToken.isETH()) { - return (new uint256[](parts), 0); - } - - (uint256[] memory results, uint256 gas1) = calculateMooniswap(fromToken, ZERO_ADDRESS, amount, parts, flags); - (rets, gas) = calculateMooniswapMany(ZERO_ADDRESS, destToken, results); - gas = gas.add(gas1); - } - - function calculateMooniswapOverDAI( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == dai || destToken == dai) { - return (new uint256[](parts), 0); - } - - (uint256[] memory results, uint256 gas1) = calculateMooniswap(fromToken, dai, amount, parts, flags); - (rets, gas) = calculateMooniswapMany(dai, destToken, results); - gas = gas.add(gas1); - } - - function calculateMooniswapOverUSDC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == usdc || destToken == usdc) { - return (new uint256[](parts), 0); - } - - (uint256[] memory results, uint256 gas1) = calculateMooniswap(fromToken, usdc, amount, parts, flags); - (rets, gas) = calculateMooniswapMany(usdc, destToken, results); - gas = gas.add(gas1); - } - - function calculateUniswapV2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateUniswapV2( - fromToken, - destToken, - _linearInterpolation(amount, parts), - flags - ); - } - - function calculateUniswapV2ETH( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken.isETH() || fromToken == weth || destToken.isETH() || destToken == weth) { - return (new uint256[](parts), 0); - } - - return _calculateUniswapV2OverMidToken( - fromToken, - weth, - destToken, - amount, - parts, - flags - ); - } - - function calculateUniswapV2DAI( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == dai || destToken == dai) { - return (new uint256[](parts), 0); - } - - return _calculateUniswapV2OverMidToken( - fromToken, - dai, - destToken, - amount, - parts, - flags - ); - } - - function calculateUniswapV2USDC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == usdc || destToken == usdc) { - return (new uint256[](parts), 0); - } - - return _calculateUniswapV2OverMidToken( - fromToken, - usdc, - destToken, - amount, - parts, - flags - ); - } - - function _calculateUniswapV2( - IERC20 fromToken, - IERC20 destToken, - uint256[] memory amounts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = new uint256[](amounts.length); - - IERC20 fromTokenReal = fromToken.isETH() ? weth : fromToken; - IERC20 destTokenReal = destToken.isETH() ? weth : destToken; - IUniswapV2Exchange exchange = uniswapV2.getPair(fromTokenReal, destTokenReal); - if (exchange != IUniswapV2Exchange(0)) { - uint256 fromTokenBalance = fromTokenReal.universalBalanceOf(address(exchange)); - uint256 destTokenBalance = destTokenReal.universalBalanceOf(address(exchange)); - for (uint i = 0; i < amounts.length; i++) { - rets[i] = _calculateUniswapFormula(fromTokenBalance, destTokenBalance, amounts[i]); - } - return (rets, 50_000); - } - } - - function _calculateUniswapV2OverMidToken( - IERC20 fromToken, - IERC20 midToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = _linearInterpolation(amount, parts); - - uint256 gas1; - uint256 gas2; - (rets, gas1) = _calculateUniswapV2(fromToken, midToken, rets, flags); - (rets, gas2) = _calculateUniswapV2(midToken, destToken, rets, flags); - return (rets, gas1 + gas2); - } - - function _calculateNoReturn( - IERC20 /*fromToken*/, - IERC20 /*destToken*/, - uint256 /*amount*/, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - this; - return (new uint256[](parts), 0); - } -} - - -contract OneSplitBaseWrap is IOneSplit, OneSplitRoot { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags // See constants in IOneSplit.sol - ) internal { - if (fromToken == destToken) { - return; - } - - _swapFloor( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _swapFloor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 /*flags*/ // See constants in IOneSplit.sol - ) internal; -} - - -contract OneSplit is IOneSplit, OneSplitRoot { - IOneSplitView public oneSplitView; - - constructor(IOneSplitView _oneSplitView) public { - oneSplitView = _oneSplitView; - } - - function() external payable { - // solium-disable-next-line security/no-tx-origin - require(msg.sender != tx.origin); - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitView.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags // See constants in IOneSplit.sol - ) public payable returns(uint256 returnAmount) { - if (fromToken == destToken) { - return amount; - } - - function(IERC20,IERC20,uint256,uint256)[DEXES_COUNT] memory reserves = [ - _swapOnUniswap, - _swapOnNowhere, - _swapOnBancor, - _swapOnOasis, - _swapOnCurveCompound, - _swapOnCurveUSDT, - _swapOnCurveY, - _swapOnCurveBinance, - _swapOnCurveSynthetix, - _swapOnUniswapCompound, - _swapOnUniswapChai, - _swapOnUniswapAave, - _swapOnMooniswap, - _swapOnUniswapV2, - _swapOnUniswapV2ETH, - _swapOnUniswapV2DAI, - _swapOnUniswapV2USDC, - _swapOnCurvePAX, - _swapOnCurveRenBTC, - _swapOnCurveTBTC, - _swapOnDforceSwap, - _swapOnShell, - _swapOnMStableMUSD, - _swapOnCurveSBTC, - _swapOnBalancer1, - _swapOnBalancer2, - _swapOnBalancer3, - _swapOnKyber1, - _swapOnKyber2, - _swapOnKyber3, - _swapOnKyber4, - _swapOnMooniswapETH, - _swapOnMooniswapDAI, - _swapOnMooniswapUSDC - ]; - - require(distribution.length <= reserves.length, "OneSplit: Distribution array should not exceed reserves array size"); - - uint256 parts = 0; - uint256 lastNonZeroIndex = 0; - for (uint i = 0; i < distribution.length; i++) { - if (distribution[i] > 0) { - parts = parts.add(distribution[i]); - lastNonZeroIndex = i; - } - } - - if (parts == 0) { - if (fromToken.isETH()) { - msg.sender.transfer(msg.value); - return msg.value; - } - return amount; - } - - fromToken.universalTransferFrom(msg.sender, address(this), amount); - uint256 remainingAmount = fromToken.universalBalanceOf(address(this)); - - for (uint i = 0; i < distribution.length; i++) { - if (distribution[i] == 0) { - continue; - } - - uint256 swapAmount = amount.mul(distribution[i]).div(parts); - if (i == lastNonZeroIndex) { - swapAmount = remainingAmount; - } - remainingAmount -= swapAmount; - reserves[i](fromToken, destToken, swapAmount, flags); - } - - returnAmount = destToken.universalBalanceOf(address(this)); - require(returnAmount >= minReturn, "OneSplit: Return amount was not enough"); - destToken.universalTransfer(msg.sender, returnAmount); - fromToken.universalTransfer(msg.sender, fromToken.universalBalanceOf(address(this))); - } - - // Swap helpers - - function _swapOnCurveCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + (fromToken == usdc ? 2 : 0); - int128 j = (destToken == dai ? 1 : 0) + (destToken == usdc ? 2 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveCompound), amount); - curveCompound.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveUSDT( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveUSDT), amount); - curveUSDT.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveY( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == tusd ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == tusd ? 4 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveY), amount); - curveY.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveBinance( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == busd ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == busd ? 4 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveBinance), amount); - curveBinance.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveSynthetix( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == susd ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == susd ? 4 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveSynthetix), amount); - curveSynthetix.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurvePAX( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == pax ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == pax ? 4 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curvePAX), amount); - curvePAX.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnShell( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - fromToken.universalApprove(address(shell), amount); - shell.swapByOrigin( - address(fromToken), - address(destToken), - amount, - 0, - now + 50 - ); - } - - function _swapOnMStableMUSD( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - fromToken.universalApprove(address(musd), amount); - musd.swap( - fromToken, - destToken, - amount, - address(this) - ); - } - - function _swapOnCurveRenBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == renbtc ? 1 : 0) + - (fromToken == wbtc ? 2 : 0); - int128 j = (destToken == renbtc ? 1 : 0) + - (destToken == wbtc ? 2 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveRenBTC), amount); - curveRenBTC.exchange(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveTBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == tbtc ? 1 : 0) + - (fromToken == wbtc ? 2 : 0) + - (fromToken == hbtc ? 3 : 0); - int128 j = (destToken == tbtc ? 1 : 0) + - (destToken == wbtc ? 2 : 0) + - (destToken == hbtc ? 3 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveTBTC), amount); - curveTBTC.exchange(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveSBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == renbtc ? 1 : 0) + - (fromToken == wbtc ? 2 : 0) + - (fromToken == sbtc ? 3 : 0); - int128 j = (destToken == renbtc ? 1 : 0) + - (destToken == wbtc ? 2 : 0) + - (destToken == sbtc ? 3 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveSBTC), amount); - curveSBTC.exchange(i - 1, j - 1, amount, 0); - } - - function _swapOnDforceSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - fromToken.universalApprove(address(dforceSwap), amount); - dforceSwap.swap(fromToken, destToken, amount); - } - - function _swapOnUniswap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - uint256 returnAmount = amount; - - if (!fromToken.isETH()) { - IUniswapExchange fromExchange = uniswapFactory.getExchange(fromToken); - if (fromExchange != IUniswapExchange(0)) { - fromToken.universalApprove(address(fromExchange), returnAmount); - returnAmount = fromExchange.tokenToEthSwapInput(returnAmount, 1, now); - } - } - - if (!destToken.isETH()) { - IUniswapExchange toExchange = uniswapFactory.getExchange(destToken); - if (toExchange != IUniswapExchange(0)) { - returnAmount = toExchange.ethToTokenSwapInput.value(returnAmount)(1, now); - } - } - } - - function _swapOnUniswapCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - if (!fromToken.isETH()) { - ICompoundToken fromCompound = compoundRegistry.cTokenByToken(fromToken); - fromToken.universalApprove(address(fromCompound), amount); - fromCompound.mint(amount); - _swapOnUniswap(IERC20(fromCompound), destToken, IERC20(fromCompound).universalBalanceOf(address(this)), flags); - return; - } - - if (!destToken.isETH()) { - ICompoundToken toCompound = compoundRegistry.cTokenByToken(destToken); - _swapOnUniswap(fromToken, IERC20(toCompound), amount, flags); - toCompound.redeem(IERC20(toCompound).universalBalanceOf(address(this))); - destToken.universalBalanceOf(address(this)); - return; - } - } - - function _swapOnUniswapChai( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - if (fromToken == dai) { - fromToken.universalApprove(address(chai), amount); - chai.join(address(this), amount); - _swapOnUniswap(IERC20(chai), destToken, IERC20(chai).universalBalanceOf(address(this)), flags); - return; - } - - if (destToken == dai) { - _swapOnUniswap(fromToken, IERC20(chai), amount, flags); - chai.exit(address(this), chai.balanceOf(address(this))); - return; - } - } - - function _swapOnUniswapAave( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - if (!fromToken.isETH()) { - IAaveToken fromAave = aaveRegistry.aTokenByToken(fromToken); - fromToken.universalApprove(aave.core(), amount); - aave.deposit(fromToken, amount, 1101); - _swapOnUniswap(IERC20(fromAave), destToken, IERC20(fromAave).universalBalanceOf(address(this)), flags); - return; - } - - if (!destToken.isETH()) { - IAaveToken toAave = aaveRegistry.aTokenByToken(destToken); - _swapOnUniswap(fromToken, IERC20(toAave), amount, flags); - toAave.redeem(toAave.balanceOf(address(this))); - return; - } - } - - function _swapOnMooniswap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - IMooniswap mooniswap = mooniswapRegistry.pools( - fromToken.isETH() ? ZERO_ADDRESS : fromToken, - destToken.isETH() ? ZERO_ADDRESS : destToken - ); - fromToken.universalApprove(address(mooniswap), amount); - mooniswap.swap.value(fromToken.isETH() ? amount : 0)( - fromToken.isETH() ? ZERO_ADDRESS : fromToken, - destToken.isETH() ? ZERO_ADDRESS : destToken, - amount, - 0, - 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5 - ); - } - - function _swapOnMooniswapETH( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnMooniswap(fromToken, ZERO_ADDRESS, amount, flags); - _swapOnMooniswap(ZERO_ADDRESS, destToken, address(this).balance, flags); - } - - function _swapOnMooniswapDAI( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnMooniswap(fromToken, dai, amount, flags); - _swapOnMooniswap(dai, destToken, dai.balanceOf(address(this)), flags); - } - - function _swapOnMooniswapUSDC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnMooniswap(fromToken, usdc, amount, flags); - _swapOnMooniswap(usdc, destToken, usdc.balanceOf(address(this)), flags); - } - - function _swapOnNowhere( - IERC20 /*fromToken*/, - IERC20 /*destToken*/, - uint256 /*amount*/, - uint256 /*flags*/ - ) internal { - revert("This source was deprecated"); - } - - function _swapOnKyber1( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnKyber( - fromToken, - destToken, - amount, - flags, - 0xff4b796265722046707200000000000000000000000000000000000000000000 - ); - } - - function _swapOnKyber2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnKyber( - fromToken, - destToken, - amount, - flags, - 0xffabcd0000000000000000000000000000000000000000000000000000000000 - ); - } - - function _swapOnKyber3( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnKyber( - fromToken, - destToken, - amount, - flags, - 0xff4f6e65426974205175616e7400000000000000000000000000000000000000 - ); - } - - function _swapOnKyber4( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnKyber( - fromToken, - destToken, - amount, - flags, - _kyberReserveIdByTokens(fromToken, destToken) - ); - } - - function _swapOnKyber( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags, - bytes32 reserveId - ) internal { - uint256 returnAmount = amount; - - bytes32[] memory reserveIds = new bytes32[](1); - reserveIds[0] = reserveId; - - if (!fromToken.isETH()) { - bytes memory fromHint = kyberHintHandler.buildTokenToEthHint( - fromToken, - IKyberHintHandler.TradeType.MaskIn, - reserveIds, - new uint256[](0) - ); - - fromToken.universalApprove(address(kyberNetworkProxy), amount); - returnAmount = kyberNetworkProxy.tradeWithHintAndFee( - fromToken, - returnAmount, - ETH_ADDRESS, - address(this), - uint256(-1), - 0, - 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5, - (flags >> 255) * 10, - fromHint - ); - } - - if (!destToken.isETH()) { - bytes memory destHint = kyberHintHandler.buildEthToTokenHint( - destToken, - IKyberHintHandler.TradeType.MaskIn, - reserveIds, - new uint256[](0) - ); - - returnAmount = kyberNetworkProxy.tradeWithHintAndFee.value(returnAmount)( - ETH_ADDRESS, - returnAmount, - destToken, - address(this), - uint256(-1), - 0, - 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5, - (flags >> 255) * 10, - destHint - ); - } - } - - function _swapOnBancor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - IBancorNetwork bancorNetwork = IBancorNetwork(bancorContractRegistry.addressOf("BancorNetwork")); - address[] memory path = bancorNetworkPathFinder.generatePath( - fromToken.isETH() ? bancorEtherToken : fromToken, - destToken.isETH() ? bancorEtherToken : destToken - ); - fromToken.universalApprove(address(bancorNetwork), amount); - bancorNetwork.convert.value(fromToken.isETH() ? amount : 0)(path, amount, 1); - } - - function _swapOnOasis( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - if (fromToken.isETH()) { - weth.deposit.value(amount)(); - } - - IERC20 approveToken = fromToken.isETH() ? weth : fromToken; - approveToken.universalApprove(address(oasisExchange), amount); - oasisExchange.sellAllAmount( - fromToken.isETH() ? weth : fromToken, - amount, - destToken.isETH() ? weth : destToken, - 1 - ); - - if (destToken.isETH()) { - weth.withdraw(weth.balanceOf(address(this))); - } - } - - function _swapOnUniswapV2Internal( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal returns(uint256 returnAmount) { - if (fromToken.isETH()) { - weth.deposit.value(amount)(); - } - - IERC20 fromTokenReal = fromToken.isETH() ? weth : fromToken; - IERC20 toTokenReal = destToken.isETH() ? weth : destToken; - IUniswapV2Exchange exchange = uniswapV2.getPair(fromTokenReal, toTokenReal); - bool needSync; - bool needSkim; - (returnAmount, needSync, needSkim) = exchange.getReturn(fromTokenReal, toTokenReal, amount); - if (needSync) { - exchange.sync(); - } - else if (needSkim) { - exchange.skim(0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5); - } - - fromTokenReal.universalTransfer(address(exchange), amount); - if (uint256(address(fromTokenReal)) < uint256(address(toTokenReal))) { - exchange.swap(0, returnAmount, address(this), ""); - } else { - exchange.swap(returnAmount, 0, address(this), ""); - } - - if (destToken.isETH()) { - weth.withdraw(weth.balanceOf(address(this))); - } - } - - function _swapOnUniswapV2OverMid( - IERC20 fromToken, - IERC20 midToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2Internal( - midToken, - destToken, - _swapOnUniswapV2Internal( - fromToken, - midToken, - amount, - flags - ), - flags - ); - } - - function _swapOnUniswapV2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2Internal( - fromToken, - destToken, - amount, - flags - ); - } - - function _swapOnUniswapV2ETH( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2OverMid( - fromToken, - weth, - destToken, - amount, - flags - ); - } - - function _swapOnUniswapV2DAI( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2OverMid( - fromToken, - dai, - destToken, - amount, - flags - ); - } - - function _swapOnUniswapV2USDC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2OverMid( - fromToken, - usdc, - destToken, - amount, - flags - ); - } - - function _swapOnBalancerX( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/, - uint256 poolIndex - ) internal { - address[] memory pools = balancerRegistry.getBestPoolsWithLimit( - address(fromToken.isETH() ? weth : fromToken), - address(destToken.isETH() ? weth : destToken), - poolIndex + 1 - ); - - if (fromToken.isETH()) { - weth.deposit.value(amount)(); - } - - (fromToken.isETH() ? weth : fromToken).universalApprove(pools[poolIndex], amount); - IBalancerPool(pools[poolIndex]).swapExactAmountIn( - fromToken.isETH() ? weth : fromToken, - amount, - destToken.isETH() ? weth : destToken, - 0, - uint256(-1) - ); - - if (destToken.isETH()) { - weth.withdraw(weth.balanceOf(address(this))); - } - } - - function _swapOnBalancer1( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnBalancerX(fromToken, destToken, amount, flags, 0); - } - - function _swapOnBalancer2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnBalancerX(fromToken, destToken, amount, flags, 1); - } - - function _swapOnBalancer3( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnBalancerX(fromToken, destToken, amount, flags, 2); - } -} - -// File: contracts/OneSplitCompound.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitCompoundView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _compoundGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _compoundGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_COMPOUND)) { - IERC20 underlying = compoundRegistry.tokenByCToken(ICompoundToken(address(fromToken))); - if (underlying != IERC20(0)) { - uint256 compoundRate = ICompoundToken(address(fromToken)).exchangeRateStored(); - (returnAmount, estimateGasAmount, distribution) = _compoundGetExpectedReturn( - underlying, - destToken, - amount.mul(compoundRate).div(1e18), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 295_000, distribution); - } - - underlying = compoundRegistry.tokenByCToken(ICompoundToken(address(destToken))); - if (underlying != IERC20(0)) { - uint256 _destTokenEthPriceTimesGasPrice = destTokenEthPriceTimesGasPrice; - uint256 compoundRate = ICompoundToken(address(destToken)).exchangeRateStored(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - underlying, - amount, - parts, - flags, - _destTokenEthPriceTimesGasPrice.mul(compoundRate).div(1e18) - ); - return (returnAmount.mul(1e18).div(compoundRate), estimateGasAmount + 430_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitCompound is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _compoundSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _compoundSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_COMPOUND)) { - IERC20 underlying = compoundRegistry.tokenByCToken(ICompoundToken(address(fromToken))); - if (underlying != IERC20(0)) { - ICompoundToken(address(fromToken)).redeem(amount); - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - return _compoundSwap( - underlying, - destToken, - underlyingAmount, - distribution, - flags - ); - } - - underlying = compoundRegistry.tokenByCToken(ICompoundToken(address(destToken))); - if (underlying != IERC20(0)) { - super._swap( - fromToken, - underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - if (underlying.isETH()) { - cETH.mint.value(underlyingAmount)(); - } else { - underlying.universalApprove(address(destToken), underlyingAmount); - ICompoundToken(address(destToken)).mint(underlyingAmount); - } - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/interface/IFulcrum.sol - -pragma solidity ^0.5.0; - - - -contract IFulcrumToken is IERC20 { - function tokenPrice() external view returns (uint256); - - function loanTokenAddress() external view returns (address); - - function mintWithEther(address receiver) external payable returns (uint256 mintAmount); - - function mint(address receiver, uint256 depositAmount) external returns (uint256 mintAmount); - - function burnToEther(address receiver, uint256 burnAmount) - external - returns (uint256 loanAmountPaid); - - function burn(address receiver, uint256 burnAmount) external returns (uint256 loanAmountPaid); -} - -// File: contracts/OneSplitFulcrum.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitFulcrumBase { - using UniversalERC20 for IERC20; - - function _isFulcrumToken(IERC20 token) internal view returns(IERC20) { - if (token.isETH()) { - return IERC20(-1); - } - - (bool success, bytes memory data) = address(token).staticcall.gas(5000)(abi.encodeWithSignature( - "name()" - )); - if (!success) { - return IERC20(-1); - } - - bool foundBZX = false; - for (uint i = 0; i + 6 < data.length; i++) { - if (data[i + 0] == "F" && - data[i + 1] == "u" && - data[i + 2] == "l" && - data[i + 3] == "c" && - data[i + 4] == "r" && - data[i + 5] == "u" && - data[i + 6] == "m") - { - foundBZX = true; - break; - } - } - if (!foundBZX) { - return IERC20(-1); - } - - (success, data) = address(token).staticcall.gas(5000)(abi.encodeWithSelector( - IFulcrumToken(address(token)).loanTokenAddress.selector - )); - if (!success) { - return IERC20(-1); - } - - return abi.decode(data, (IERC20)); - } -} - - -contract OneSplitFulcrumView is OneSplitViewWrapBase, OneSplitFulcrumBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _fulcrumGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _fulcrumGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_FULCRUM)) { - IERC20 underlying = _isFulcrumToken(fromToken); - if (underlying != IERC20(-1)) { - uint256 fulcrumRate = IFulcrumToken(address(fromToken)).tokenPrice(); - (returnAmount, estimateGasAmount, distribution) = _fulcrumGetExpectedReturn( - underlying, - destToken, - amount.mul(fulcrumRate).div(1e18), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 381_000, distribution); - } - - underlying = _isFulcrumToken(destToken); - if (underlying != IERC20(-1)) { - uint256 _destTokenEthPriceTimesGasPrice = destTokenEthPriceTimesGasPrice; - uint256 fulcrumRate = IFulcrumToken(address(destToken)).tokenPrice(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - underlying, - amount, - parts, - flags, - _destTokenEthPriceTimesGasPrice.mul(fulcrumRate).div(1e18) - ); - return (returnAmount.mul(1e18).div(fulcrumRate), estimateGasAmount + 354_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitFulcrum is OneSplitBaseWrap, OneSplitFulcrumBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _fulcrumSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _fulcrumSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_FULCRUM)) { - IERC20 underlying = _isFulcrumToken(fromToken); - if (underlying != IERC20(-1)) { - if (underlying.isETH()) { - IFulcrumToken(address(fromToken)).burnToEther(address(this), amount); - } else { - IFulcrumToken(address(fromToken)).burn(address(this), amount); - } - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - return super._swap( - underlying, - destToken, - underlyingAmount, - distribution, - flags - ); - } - - underlying = _isFulcrumToken(destToken); - if (underlying != IERC20(-1)) { - super._swap( - fromToken, - underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - if (underlying.isETH()) { - IFulcrumToken(address(destToken)).mintWithEther.value(underlyingAmount)(address(this)); - } else { - underlying.universalApprove(address(destToken), underlyingAmount); - IFulcrumToken(address(destToken)).mint(address(this), underlyingAmount); - } - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/OneSplitChai.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitChaiView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_CHAI)) { - if (fromToken == IERC20(chai)) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - dai, - destToken, - chai.chaiToDai(amount), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 197_000, distribution); - } - - if (destToken == IERC20(chai)) { - uint256 price = chai.chaiPrice(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - dai, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice.mul(1e18).div(price) - ); - return (returnAmount.mul(price).div(1e18), estimateGasAmount + 168_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitChai is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_CHAI)) { - if (fromToken == IERC20(chai)) { - chai.exit(address(this), amount); - - return super._swap( - dai, - destToken, - dai.balanceOf(address(this)), - distribution, - flags - ); - } - - if (destToken == IERC20(chai)) { - super._swap( - fromToken, - dai, - amount, - distribution, - flags - ); - - uint256 daiBalance = dai.balanceOf(address(this)); - dai.universalApprove(address(chai), daiBalance); - chai.join(address(this), daiBalance); - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/interface/IBdai.sol - -pragma solidity ^0.5.0; - - - -contract IBdai is IERC20 { - function join(uint256) external; - - function exit(uint256) external; -} - -// File: contracts/OneSplitBdai.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitBdaiBase { - IBdai internal constant bdai = IBdai(0x6a4FFAafa8DD400676Df8076AD6c724867b0e2e8); - IERC20 internal constant btu = IERC20(0xb683D83a532e2Cb7DFa5275eED3698436371cc9f); -} - - -contract OneSplitBdaiView is OneSplitViewWrapBase, OneSplitBdaiBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_BDAI)) { - if (fromToken == IERC20(bdai)) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - dai, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 227_000, distribution); - } - - if (destToken == IERC20(bdai)) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - dai, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 295_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitBdai is OneSplitBaseWrap, OneSplitBdaiBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_BDAI)) { - if (fromToken == IERC20(bdai)) { - bdai.exit(amount); - - uint256 btuBalance = btu.balanceOf(address(this)); - if (btuBalance > 0) { - (,uint256[] memory btuDistribution) = getExpectedReturn( - btu, - destToken, - btuBalance, - 1, - flags - ); - - _swap( - btu, - destToken, - btuBalance, - btuDistribution, - flags - ); - } - - return super._swap( - dai, - destToken, - amount, - distribution, - flags - ); - } - - if (destToken == IERC20(bdai)) { - super._swap(fromToken, dai, amount, distribution, flags); - - uint256 daiBalance = dai.balanceOf(address(this)); - dai.universalApprove(address(bdai), daiBalance); - bdai.join(daiBalance); - return; - } - } - - return super._swap(fromToken, destToken, amount, distribution, flags); - } -} - -// File: contracts/interface/IIearn.sol - -pragma solidity ^0.5.0; - - - -contract IIearn is IERC20 { - function token() external view returns(IERC20); - - function calcPoolValueInToken() external view returns(uint256); - - function deposit(uint256 _amount) external; - - function withdraw(uint256 _shares) external; -} - -// File: contracts/OneSplitIearn.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitIearnBase { - function _yTokens() internal pure returns(IIearn[13] memory) { - return [ - IIearn(0x16de59092dAE5CcF4A1E6439D611fd0653f0Bd01), - IIearn(0x04Aa51bbcB46541455cCF1B8bef2ebc5d3787EC9), - IIearn(0x73a052500105205d34Daf004eAb301916DA8190f), - IIearn(0x83f798e925BcD4017Eb265844FDDAbb448f1707D), - IIearn(0xd6aD7a6750A7593E092a9B218d66C0A814a3436e), - IIearn(0xF61718057901F84C4eEC4339EF8f0D86D2B45600), - IIearn(0x04bC0Ab673d88aE9dbC9DA2380cB6B79C4BCa9aE), - IIearn(0xC2cB1040220768554cf699b0d863A3cd4324ce32), - IIearn(0xE6354ed5bC4b393a5Aad09f21c46E101e692d447), - IIearn(0x26EA744E5B887E5205727f55dFBE8685e3b21951), - IIearn(0x99d1Fa417f94dcD62BfE781a1213c092a47041Bc), - IIearn(0x9777d7E2b60bB01759D0E2f8be2095df444cb07E), - IIearn(0x1bE5d71F2dA660BFdee8012dDc58D024448A0A59) - ]; - } -} - - -contract OneSplitIearnView is OneSplitViewWrapBase, OneSplitIearnBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _iearnGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _iearnGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (!flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == !flags.check(FLAG_DISABLE_IEARN)) { - IIearn[13] memory yTokens = _yTokens(); - - for (uint i = 0; i < yTokens.length; i++) { - if (fromToken == IERC20(yTokens[i])) { - (returnAmount, estimateGasAmount, distribution) = _iearnGetExpectedReturn( - yTokens[i].token(), - destToken, - amount - .mul(yTokens[i].calcPoolValueInToken()) - .div(yTokens[i].totalSupply()), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 260_000, distribution); - } - } - - for (uint i = 0; i < yTokens.length; i++) { - if (destToken == IERC20(yTokens[i])) { - uint256 _destTokenEthPriceTimesGasPrice = destTokenEthPriceTimesGasPrice; - IERC20 token = yTokens[i].token(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - token, - amount, - parts, - flags, - _destTokenEthPriceTimesGasPrice - .mul(yTokens[i].calcPoolValueInToken()) - .div(yTokens[i].totalSupply()) - ); - - return( - returnAmount - .mul(yTokens[i].totalSupply()) - .div(yTokens[i].calcPoolValueInToken()), - estimateGasAmount + 743_000, - distribution - ); - } - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitIearn is OneSplitBaseWrap, OneSplitIearnBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _iearnSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _iearnSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_IEARN)) { - IIearn[13] memory yTokens = _yTokens(); - - for (uint i = 0; i < yTokens.length; i++) { - if (fromToken == IERC20(yTokens[i])) { - IERC20 underlying = yTokens[i].token(); - yTokens[i].withdraw(amount); - _iearnSwap(underlying, destToken, underlying.balanceOf(address(this)), distribution, flags); - return; - } - } - - for (uint i = 0; i < yTokens.length; i++) { - if (destToken == IERC20(yTokens[i])) { - IERC20 underlying = yTokens[i].token(); - super._swap(fromToken, underlying, amount, distribution, flags); - - uint256 underlyingBalance = underlying.balanceOf(address(this)); - underlying.universalApprove(address(yTokens[i]), underlyingBalance); - yTokens[i].deposit(underlyingBalance); - return; - } - } - } - - return super._swap(fromToken, destToken, amount, distribution, flags); - } -} - -// File: contracts/interface/IIdle.sol - -pragma solidity ^0.5.0; - - - -contract IIdle is IERC20 { - function token() - external view returns (IERC20); - - function tokenPrice() - external view returns (uint256); - - function mintIdleToken(uint256 _amount, uint256[] calldata _clientProtocolAmounts) - external returns (uint256 mintedTokens); - - function redeemIdleToken(uint256 _amount, bool _skipRebalance, uint256[] calldata _clientProtocolAmounts) - external returns (uint256 redeemedTokens); -} - -// File: contracts/OneSplitIdle.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitIdleBase { - function _idleTokens() internal pure returns(IIdle[8] memory) { - // https://developers.idle.finance/contracts-and-codebase - return [ - // V3 - IIdle(0x78751B12Da02728F467A44eAc40F5cbc16Bd7934), - IIdle(0x12B98C621E8754Ae70d0fDbBC73D6208bC3e3cA6), - IIdle(0x63D27B3DA94A9E871222CB0A32232674B02D2f2D), - IIdle(0x1846bdfDB6A0f5c473dEc610144513bd071999fB), - IIdle(0xcDdB1Bceb7a1979C6caa0229820707429dd3Ec6C), - IIdle(0x42740698959761BAF1B06baa51EfBD88CB1D862B), - // V2 - IIdle(0x10eC0D497824e342bCB0EDcE00959142aAa766dD), - IIdle(0xeB66ACc3d011056B00ea521F8203580C2E5d3991) - ]; - } -} - - -contract OneSplitIdleView is OneSplitViewWrapBase, OneSplitIdleBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _idleGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _idleGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - internal - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (!flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == !flags.check(FLAG_DISABLE_IDLE)) { - IIdle[8] memory tokens = _idleTokens(); - - for (uint i = 0; i < tokens.length; i++) { - if (fromToken == IERC20(tokens[i])) { - (returnAmount, estimateGasAmount, distribution) = _idleGetExpectedReturn( - tokens[i].token(), - destToken, - amount.mul(tokens[i].tokenPrice()).div(1e18), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 2_400_000, distribution); - } - } - - for (uint i = 0; i < tokens.length; i++) { - if (destToken == IERC20(tokens[i])) { - uint256 _destTokenEthPriceTimesGasPrice = destTokenEthPriceTimesGasPrice; - uint256 _price = tokens[i].tokenPrice(); - IERC20 token = tokens[i].token(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - token, - amount, - parts, - flags, - _destTokenEthPriceTimesGasPrice.mul(_price).div(1e18) - ); - return (returnAmount.mul(1e18).div(_price), estimateGasAmount + 1_300_000, distribution); - } - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitIdle is OneSplitBaseWrap, OneSplitIdleBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _idleSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _idleSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (!flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == !flags.check(FLAG_DISABLE_IDLE)) { - IIdle[8] memory tokens = _idleTokens(); - - for (uint i = 0; i < tokens.length; i++) { - if (fromToken == IERC20(tokens[i])) { - IERC20 underlying = tokens[i].token(); - uint256 minted = tokens[i].redeemIdleToken(amount, true, new uint256[](0)); - _idleSwap(underlying, destToken, minted, distribution, flags); - return; - } - } - - for (uint i = 0; i < tokens.length; i++) { - if (destToken == IERC20(tokens[i])) { - IERC20 underlying = tokens[i].token(); - super._swap(fromToken, underlying, amount, distribution, flags); - - uint256 underlyingBalance = underlying.balanceOf(address(this)); - underlying.universalApprove(address(tokens[i]), underlyingBalance); - tokens[i].mintIdleToken(underlyingBalance, new uint256[](0)); - return; - } - } - } - - return super._swap(fromToken, destToken, amount, distribution, flags); - } -} - -// File: contracts/OneSplitAave.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitAaveView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _aaveGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _aaveGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_AAVE)) { - IERC20 underlying = aaveRegistry.tokenByAToken(IAaveToken(address(fromToken))); - if (underlying != IERC20(0)) { - (returnAmount, estimateGasAmount, distribution) = _aaveGetExpectedReturn( - underlying, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 670_000, distribution); - } - - underlying = aaveRegistry.tokenByAToken(IAaveToken(address(destToken))); - if (underlying != IERC20(0)) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - underlying, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 310_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitAave is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _aaveSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _aaveSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_AAVE)) { - IERC20 underlying = aaveRegistry.tokenByAToken(IAaveToken(address(fromToken))); - if (underlying != IERC20(0)) { - IAaveToken(address(fromToken)).redeem(amount); - - return _aaveSwap( - underlying, - destToken, - amount, - distribution, - flags - ); - } - - underlying = aaveRegistry.tokenByAToken(IAaveToken(address(destToken))); - if (underlying != IERC20(0)) { - super._swap( - fromToken, - underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - underlying.universalApprove(aave.core(), underlyingAmount); - aave.deposit.value(underlying.isETH() ? underlyingAmount : 0)( - underlying.isETH() ? ETH_ADDRESS : underlying, - underlyingAmount, - 1101 - ); - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/OneSplitWeth.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitWethView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _wethGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _wethGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_WETH)) { - if (fromToken == weth || fromToken == bancorEtherToken) { - return super.getExpectedReturnWithGas(ETH_ADDRESS, destToken, amount, parts, flags, destTokenEthPriceTimesGasPrice); - } - - if (destToken == weth || destToken == bancorEtherToken) { - return super.getExpectedReturnWithGas(fromToken, ETH_ADDRESS, amount, parts, flags, destTokenEthPriceTimesGasPrice); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitWeth is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _wethSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _wethSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_WETH)) { - if (fromToken == weth) { - weth.withdraw(weth.balanceOf(address(this))); - super._swap( - ETH_ADDRESS, - destToken, - amount, - distribution, - flags - ); - return; - } - - if (fromToken == bancorEtherToken) { - bancorEtherToken.withdraw(bancorEtherToken.balanceOf(address(this))); - super._swap( - ETH_ADDRESS, - destToken, - amount, - distribution, - flags - ); - return; - } - - if (destToken == weth) { - _wethSwap( - fromToken, - ETH_ADDRESS, - amount, - distribution, - flags - ); - weth.deposit.value(address(this).balance)(); - return; - } - - if (destToken == bancorEtherToken) { - _wethSwap( - fromToken, - ETH_ADDRESS, - amount, - distribution, - flags - ); - bancorEtherToken.deposit.value(address(this).balance)(); - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/OneSplitMStable.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitMStableView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_MSTABLE_MUSD)) { - if (fromToken == IERC20(musd)) { - { - (bool valid1,, uint256 res1,) = musd_helper.getRedeemValidity(musd, amount, destToken); - if (valid1) { - return (res1, 300_000, new uint256[](DEXES_COUNT)); - } - } - - (bool valid,, address token) = musd_helper.suggestRedeemAsset(musd); - if (valid) { - (,, returnAmount,) = musd_helper.getRedeemValidity(musd, amount, IERC20(token)); - if (IERC20(token) != destToken) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - IERC20(token), - destToken, - returnAmount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } else { - distribution = new uint256[](DEXES_COUNT); - } - - return (returnAmount, estimateGasAmount + 300_000, distribution); - } - } - - if (destToken == IERC20(musd)) { - if (fromToken == usdc || fromToken == dai || fromToken == usdt || fromToken == tusd) { - (,, returnAmount) = musd.getSwapOutput(fromToken, destToken, amount); - return (returnAmount, 300_000, new uint256[](DEXES_COUNT)); - } - else { - IERC20 _destToken = destToken; - (bool valid,, address token) = musd_helper.suggestMintAsset(_destToken); - if (valid) { - if (IERC20(token) != fromToken) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - IERC20(token), - amount, - parts, - flags, - _scaleDestTokenEthPriceTimesGasPrice( - _destToken, - IERC20(token), - destTokenEthPriceTimesGasPrice - ) - ); - } else { - returnAmount = amount; - } - (,, returnAmount) = musd.getSwapOutput(IERC20(token), _destToken, returnAmount); - return (returnAmount, estimateGasAmount + 300_000, distribution); - } - } - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitMStable is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_MSTABLE_MUSD)) { - if (fromToken == IERC20(musd)) { - if (destToken == usdc || destToken == dai || destToken == usdt || destToken == tusd) { - (,,, uint256 result) = musd_helper.getRedeemValidity(fromToken, amount, destToken); - musd.redeem( - destToken, - result - ); - } - else { - (,,, uint256 result) = musd_helper.getRedeemValidity(fromToken, amount, dai); - musd.redeem( - dai, - result - ); - super._swap( - dai, - destToken, - dai.balanceOf(address(this)), - distribution, - flags - ); - } - return; - } - - if (destToken == IERC20(musd)) { - if (fromToken == usdc || fromToken == dai || fromToken == usdt || fromToken == tusd) { - fromToken.universalApprove(address(musd), amount); - musd.swap( - fromToken, - destToken, - amount, - address(this) - ); - } - else { - super._swap( - fromToken, - dai, - amount, - distribution, - flags - ); - musd.swap( - dai, - destToken, - dai.balanceOf(address(this)), - address(this) - ); - } - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/interface/IDMM.sol - -pragma solidity ^0.5.0; - - - -interface IDMMController { - function getUnderlyingTokenForDmm(IERC20 token) external view returns(IERC20); -} - - -contract IDMM is IERC20 { - function getCurrentExchangeRate() public view returns(uint256); - function mint(uint256 underlyingAmount) public returns(uint256); - function redeem(uint256 amount) public returns(uint256); -} - -// File: contracts/OneSplitDMM.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitDMMBase { - IDMMController internal constant _dmmController = IDMMController(0x4CB120Dd1D33C9A3De8Bc15620C7Cd43418d77E2); - - function _getDMMUnderlyingToken(IERC20 token) internal view returns(IERC20) { - (bool success, bytes memory data) = address(_dmmController).staticcall( - abi.encodeWithSelector( - _dmmController.getUnderlyingTokenForDmm.selector, - token - ) - ); - - if (!success || data.length == 0) { - return IERC20(-1); - } - - return abi.decode(data, (IERC20)); - } - - function _getDMMExchangeRate(IDMM dmm) internal view returns(uint256) { - (bool success, bytes memory data) = address(dmm).staticcall( - abi.encodeWithSelector( - dmm.getCurrentExchangeRate.selector - ) - ); - - if (!success || data.length == 0) { - return 0; - } - - return abi.decode(data, (uint256)); - } -} - - -contract OneSplitDMMView is OneSplitViewWrapBase, OneSplitDMMBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _dmmGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _dmmGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_DMM)) { - IERC20 underlying = _getDMMUnderlyingToken(fromToken); - if (underlying != IERC20(-1)) { - if (underlying == weth) { - underlying = ETH_ADDRESS; - } - IERC20 _fromToken = fromToken; - (returnAmount, estimateGasAmount, distribution) = _dmmGetExpectedReturn( - underlying, - destToken, - amount.mul(_getDMMExchangeRate(IDMM(address(_fromToken)))).div(1e18), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 295_000, distribution); - } - - underlying = _getDMMUnderlyingToken(destToken); - if (underlying != IERC20(-1)) { - if (underlying == weth) { - underlying = ETH_ADDRESS; - } - uint256 price = _getDMMExchangeRate(IDMM(address(destToken))); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - underlying, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice.mul(price).div(1e18) - ); - return ( - returnAmount.mul(1e18).div(price), - estimateGasAmount + 430_000, - distribution - ); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitDMM is OneSplitBaseWrap, OneSplitDMMBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _dmmSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _dmmSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_DMM)) { - IERC20 underlying = _getDMMUnderlyingToken(fromToken); - if (underlying != IERC20(-1)) { - IDMM(address(fromToken)).redeem(amount); - uint256 balance = underlying.universalBalanceOf(address(this)); - if (underlying == weth) { - weth.withdraw(balance); - } - _dmmSwap( - (underlying == weth) ? ETH_ADDRESS : underlying, - destToken, - balance, - distribution, - flags - ); - } - - underlying = _getDMMUnderlyingToken(destToken); - if (underlying != IERC20(-1)) { - super._swap( - fromToken, - (underlying == weth) ? ETH_ADDRESS : underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = ((underlying == weth) ? ETH_ADDRESS : underlying).universalBalanceOf(address(this)); - if (underlying == weth) { - weth.deposit.value(underlyingAmount); - } - - underlying.universalApprove(address(destToken), underlyingAmount); - IDMM(address(destToken)).mint(underlyingAmount); - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/OneSplitMooniswapPoolToken.sol - -pragma solidity ^0.5.0; - - - - - -contract OneSplitMooniswapTokenBase { - using SafeMath for uint256; - using Math for uint256; - using UniversalERC20 for IERC20; - - struct TokenInfo { - IERC20 token; - uint256 reserve; - } - - struct PoolDetails { - TokenInfo[2] tokens; - uint256 totalSupply; - } - - function _getPoolDetails(IMooniswap pool) internal view returns (PoolDetails memory details) { - for (uint i = 0; i < 2; i++) { - IERC20 token = pool.tokens(i); - details.tokens[i] = TokenInfo({ - token: token, - reserve: token.universalBalanceOf(address(pool)) - }); - } - - details.totalSupply = IERC20(address(pool)).totalSupply(); - } -} - - -contract OneSplitMooniswapTokenView is OneSplitViewWrapBase, OneSplitMooniswapTokenBase { - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns ( - uint256 returnAmount, - uint256, - uint256[] memory distribution - ) - { - if (fromToken.eq(toToken)) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - - if (!flags.check(FLAG_DISABLE_MOONISWAP_POOL_TOKEN)) { - bool isPoolTokenFrom = mooniswapRegistry.isPool(address(fromToken)); - bool isPoolTokenTo = mooniswapRegistry.isPool(address(toToken)); - - if (isPoolTokenFrom && isPoolTokenTo) { - ( - uint256 returnETHAmount, - uint256[] memory poolTokenFromDistribution - ) = _getExpectedReturnFromMooniswapPoolToken( - fromToken, - ETH_ADDRESS, - amount, - parts, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - - ( - uint256 returnPoolTokenToAmount, - uint256[] memory poolTokenToDistribution - ) = _getExpectedReturnToMooniswapPoolToken( - ETH_ADDRESS, - toToken, - returnETHAmount, - parts, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - - for (uint i = 0; i < poolTokenToDistribution.length; i++) { - poolTokenFromDistribution[i] |= poolTokenToDistribution[i] << 128; - } - - return (returnPoolTokenToAmount, 0, poolTokenFromDistribution); - } - - if (isPoolTokenFrom) { - (returnAmount, distribution) = _getExpectedReturnFromMooniswapPoolToken( - fromToken, - toToken, - amount, - parts, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - return (returnAmount, 0, distribution); - } - - if (isPoolTokenTo) { - (returnAmount, distribution) = _getExpectedReturnToMooniswapPoolToken( - fromToken, - toToken, - amount, - parts, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - return (returnAmount, 0, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - toToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _getExpectedReturnFromMooniswapPoolToken( - IERC20 poolToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - private - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - distribution = new uint256[](DEXES_COUNT); - - PoolDetails memory details = _getPoolDetails(IMooniswap(address(poolToken))); - - for (uint i = 0; i < 2; i++) { - - uint256 exchangeAmount = amount - .mul(details.tokens[i].reserve) - .div(details.totalSupply); - - if (toToken.eq(details.tokens[i].token)) { - returnAmount = returnAmount.add(exchangeAmount); - continue; - } - - (uint256 ret, ,uint256[] memory dist) = super.getExpectedReturnWithGas( - details.tokens[i].token, - toToken, - exchangeAmount, - parts, - flags, - 0 - ); - - returnAmount = returnAmount.add(ret); - for (uint j = 0; j < distribution.length; j++) { - distribution[j] |= dist[j] << (i * 8); - } - } - - return (returnAmount, distribution); - } - - function _getExpectedReturnToMooniswapPoolToken( - IERC20 fromToken, - IERC20 poolToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - private - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - distribution = new uint256[](DEXES_COUNT); - - PoolDetails memory details = _getPoolDetails(IMooniswap(address(poolToken))); - - // will overwritten to liquidity amounts - uint256[2] memory amounts; - amounts[0] = amount.div(2); - amounts[1] = amount.sub(amounts[0]); - uint256[] memory dist = new uint256[](distribution.length); - for (uint i = 0; i < 2; i++) { - - if (fromToken.eq(details.tokens[i].token)) { - continue; - } - - (amounts[i], ,dist) = super.getExpectedReturnWithGas( - fromToken, - details.tokens[i].token, - amounts[i], - parts, - flags, - 0 - ); - - for (uint j = 0; j < distribution.length; j++) { - distribution[j] |= dist[j] << (i * 8); - } - } - - returnAmount = uint256(-1); - for (uint i = 0; i < 2; i++) { - returnAmount = Math.min( - returnAmount, - details.totalSupply.mul(amounts[i]).div(details.tokens[i].reserve) - ); - } - - return ( - returnAmount, - distribution - ); - } - -} - - -contract OneSplitMooniswapToken is OneSplitBaseWrap, OneSplitMooniswapTokenBase { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken.eq(toToken)) { - return; - } - - if (!flags.check(FLAG_DISABLE_MOONISWAP_POOL_TOKEN)) { - bool isPoolTokenFrom = mooniswapRegistry.isPool(address(fromToken)); - bool isPoolTokenTo = mooniswapRegistry.isPool(address(toToken)); - - if (isPoolTokenFrom && isPoolTokenTo) { - uint256[] memory dist = new uint256[](distribution.length); - for (uint i = 0; i < distribution.length; i++) { - dist[i] = distribution[i] & ((1 << 128) - 1); - } - - uint256 ethBalanceBefore = ETH_ADDRESS.universalBalanceOf(address(this)); - - _swapFromMooniswapToken( - fromToken, - ETH_ADDRESS, - amount, - dist, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - - for (uint i = 0; i < distribution.length; i++) { - dist[i] = distribution[i] >> 128; - } - - uint256 ethBalanceAfter = ETH_ADDRESS.universalBalanceOf(address(this)); - - return _swapToMooniswapToken( - ETH_ADDRESS, - toToken, - ethBalanceAfter.sub(ethBalanceBefore), - dist, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - } - - if (isPoolTokenFrom) { - return _swapFromMooniswapToken( - fromToken, - toToken, - amount, - distribution, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - } - - if (isPoolTokenTo) { - return _swapToMooniswapToken( - fromToken, - toToken, - amount, - distribution, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - } - } - - return super._swap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } - - function _swapFromMooniswapToken( - IERC20 poolToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - IERC20[2] memory tokens = [ - IMooniswap(address(poolToken)).tokens(0), - IMooniswap(address(poolToken)).tokens(1) - ]; - - IMooniswap(address(poolToken)).withdraw( - amount, - new uint256[](0) - ); - - uint256[] memory dist = new uint256[](distribution.length); - for (uint i = 0; i < 2; i++) { - - if (toToken.eq(tokens[i])) { - continue; - } - - for (uint j = 0; j < distribution.length; j++) { - dist[j] = (distribution[j] >> (i * 8)) & 0xFF; - } - - super._swap( - tokens[i], - toToken, - tokens[i].universalBalanceOf(address(this)), - dist, - flags - ); - } - } - - function _swapToMooniswapToken( - IERC20 fromToken, - IERC20 poolToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - IERC20[2] memory tokens = [ - IMooniswap(address(poolToken)).tokens(0), - IMooniswap(address(poolToken)).tokens(1) - ]; - - // will overwritten to liquidity amounts - uint256[] memory amounts = new uint256[](2); - amounts[0] = amount.div(2); - amounts[1] = amount.sub(amounts[0]); - uint256[] memory dist = new uint256[](distribution.length); - for (uint i = 0; i < 2; i++) { - - if (fromToken.eq(tokens[i])) { - continue; - } - - for (uint j = 0; j < distribution.length; j++) { - dist[j] = (distribution[j] >> (i * 8)) & 0xFF; - } - - super._swap( - fromToken, - tokens[i], - amounts[i], - dist, - flags - ); - - amounts[i] = tokens[i].universalBalanceOf(address(this)); - tokens[i].universalApprove(address(poolToken), amounts[i]); - } - - uint256 ethValue = (tokens[0].isETH() ? amounts[0] : 0) + (tokens[1].isETH() ? amounts[1] : 0); - IMooniswap(address(poolToken)).deposit.value(ethValue)( - amounts, - new uint256[](2) - ); - - for (uint i = 0; i < 2; i++) { - tokens[i].universalTransfer( - msg.sender, - tokens[i].universalBalanceOf(address(this)) - ); - } - } -} - -// File: contracts/OneSplit.sol - -pragma solidity ^0.5.0; - - - - - - - - - - - - - - - -contract OneSplitViewWrap is - OneSplitViewWrapBase, - OneSplitMStableView, - OneSplitChaiView, - OneSplitBdaiView, - OneSplitAaveView, - OneSplitFulcrumView, - OneSplitCompoundView, - OneSplitIearnView, - OneSplitIdleView, - OneSplitWethView, - OneSplitDMMView, - OneSplitMooniswapTokenView -{ - IOneSplitView public oneSplitView; - - constructor(IOneSplitView _oneSplit) public { - oneSplitView = _oneSplit; - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _getExpectedReturnRespectingGasFloor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - internal - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitView.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitWrap is - OneSplitBaseWrap, - OneSplitMStable, - OneSplitChai, - OneSplitBdai, - OneSplitAave, - OneSplitFulcrum, - OneSplitCompound, - OneSplitIearn, - OneSplitIdle, - OneSplitWeth, - OneSplitDMM, - OneSplitMooniswapToken -{ - IOneSplitView public oneSplitView; - IOneSplit public oneSplit; - - constructor(IOneSplitView _oneSplitView, IOneSplit _oneSplit) public { - oneSplitView = _oneSplitView; - oneSplit = _oneSplit; - } - - function() external payable { - // solium-disable-next-line security/no-tx-origin - require(msg.sender != tx.origin); - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitView.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function getExpectedReturnWithGasMulti( - IERC20[] memory tokens, - uint256 amount, - uint256[] memory parts, - uint256[] memory flags, - uint256[] memory destTokenEthPriceTimesGasPrices - ) - public - view - returns( - uint256[] memory returnAmounts, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - uint256[] memory dist; - - returnAmounts = new uint256[](tokens.length - 1); - for (uint i = 1; i < tokens.length; i++) { - if (tokens[i - 1] == tokens[i]) { - returnAmounts[i - 1] = (i == 1) ? amount : returnAmounts[i - 2]; - continue; - } - - IERC20[] memory _tokens = tokens; - - ( - returnAmounts[i - 1], - amount, - dist - ) = getExpectedReturnWithGas( - _tokens[i - 1], - _tokens[i], - (i == 1) ? amount : returnAmounts[i - 2], - parts[i - 1], - flags[i - 1], - destTokenEthPriceTimesGasPrices[i - 1] - ); - estimateGasAmount = estimateGasAmount.add(amount); - - if (distribution.length == 0) { - distribution = new uint256[](dist.length); - } - for (uint j = 0; j < distribution.length; j++) { - distribution[j] = distribution[j].add(dist[j] << (8 * (i - 1))); - } - } - } - - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags - ) public payable returns(uint256 returnAmount) { - fromToken.universalTransferFrom(msg.sender, address(this), amount); - uint256 confirmed = fromToken.universalBalanceOf(address(this)); - _swap(fromToken, destToken, confirmed, distribution, flags); - - returnAmount = destToken.universalBalanceOf(address(this)); - require(returnAmount >= minReturn, "OneSplit: actual return amount is less than minReturn"); - destToken.universalTransfer(msg.sender, returnAmount); - fromToken.universalTransfer(msg.sender, fromToken.universalBalanceOf(address(this))); - } - - function swapMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags - ) public payable returns(uint256 returnAmount) { - tokens[0].universalTransferFrom(msg.sender, address(this), amount); - - returnAmount = tokens[0].universalBalanceOf(address(this)); - for (uint i = 1; i < tokens.length; i++) { - if (tokens[i - 1] == tokens[i]) { - continue; - } - - uint256[] memory dist = new uint256[](distribution.length); - for (uint j = 0; j < distribution.length; j++) { - dist[j] = (distribution[j] >> (8 * (i - 1))) & 0xFF; - } - - _swap( - tokens[i - 1], - tokens[i], - returnAmount, - dist, - flags[i - 1] - ); - returnAmount = tokens[i].universalBalanceOf(address(this)); - tokens[i - 1].universalTransfer(msg.sender, tokens[i - 1].universalBalanceOf(address(this))); - } - - require(returnAmount >= minReturn, "OneSplit: actual return amount is less than minReturn"); - tokens[tokens.length - 1].universalTransfer(msg.sender, returnAmount); - } - - function _swapFloor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - fromToken.universalApprove(address(oneSplit), amount); - oneSplit.swap.value(fromToken.isETH() ? amount : 0)( - fromToken, - destToken, - amount, - 0, - distribution, - flags - ); - } -} diff --git a/OneSplitAudit.full.abi b/OneSplitAudit.full.abi deleted file mode 100644 index 445cfec..0000000 --- a/OneSplitAudit.full.abi +++ /dev/null @@ -1 +0,0 @@ -[{"inputs":[{"internalType":"contract IOneSplitMulti","name":"impl","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"newImpl","type":"address"}],"name":"ImplementationUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"contract IERC20","name":"fromToken","type":"address"},{"indexed":true,"internalType":"contract IERC20","name":"destToken","type":"address"},{"indexed":false,"internalType":"uint256","name":"fromTokenAmount","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"destTokenAmount","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"minReturn","type":"uint256"},{"indexed":false,"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"indexed":false,"internalType":"uint256[]","name":"flags","type":"uint256[]"},{"indexed":false,"internalType":"address","name":"referral","type":"address"},{"indexed":false,"internalType":"uint256","name":"feePercent","type":"uint256"}],"name":"Swapped","type":"event"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"constant":true,"inputs":[],"name":"chi","outputs":[{"internalType":"contract IFreeFromUpTo","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"asset","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"claimAsset","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"parts","type":"uint256"},{"internalType":"uint256","name":"flags","type":"uint256"}],"name":"getExpectedReturn","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"parts","type":"uint256"},{"internalType":"uint256","name":"flags","type":"uint256"},{"internalType":"uint256","name":"destTokenEthPriceTimesGasPrice","type":"uint256"}],"name":"getExpectedReturnWithGas","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256","name":"estimateGasAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20[]","name":"tokens","type":"address[]"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256[]","name":"parts","type":"uint256[]"},{"internalType":"uint256[]","name":"flags","type":"uint256[]"},{"internalType":"uint256[]","name":"destTokenEthPriceTimesGasPrices","type":"uint256[]"}],"name":"getExpectedReturnWithGasMulti","outputs":[{"internalType":"uint256[]","name":"returnAmounts","type":"uint256[]"},{"internalType":"uint256","name":"estimateGasAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"isOwner","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"oneSplitImpl","outputs":[{"internalType":"contract IOneSplitMulti","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IOneSplitMulti","name":"impl","type":"address"}],"name":"setNewImpl","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256","name":"flags","type":"uint256"}],"name":"swap","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20[]","name":"tokens","type":"address[]"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256[]","name":"flags","type":"uint256[]"}],"name":"swapMulti","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256","name":"flags","type":"uint256"},{"internalType":"address","name":"referral","type":"address"},{"internalType":"uint256","name":"feePercent","type":"uint256"}],"name":"swapWithReferral","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20[]","name":"tokens","type":"address[]"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256[]","name":"flags","type":"uint256[]"},{"internalType":"address","name":"referral","type":"address"},{"internalType":"uint256","name":"feePercent","type":"uint256"}],"name":"swapWithReferralMulti","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] \ No newline at end of file diff --git a/OneSplitAudit.full.bin b/OneSplitAudit.full.bin deleted file mode 100644 index c9707ec..0000000 --- a/OneSplitAudit.full.bin +++ /dev/null @@ -1 +0,0 @@ -60806040523480156200001157600080fd5b5060405162002cf838038062002cf8833981810160405260208110156200003757600080fd5b505160006200004e6001600160e01b03620000b316565b600080546001600160a01b0319166001600160a01b0383169081178255604051929350917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908290a350620000ac816001600160e01b03620000b716565b5062000195565b3390565b620000ca6001600160e01b036200016616565b6200011c576040805162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604482015290519081900360640190fd5b600180546001600160a01b0319166001600160a01b0383169081179091556040517f310ba5f1d2ed074b51e2eccd052a47ae9ab7c6b800d1fca3db3999d6a592ca0390600090a250565b600080546001600160a01b0316620001866001600160e01b03620000b316565b6001600160a01b031614905090565b612b5380620001a56000396000f3fe6080604052600436106100e85760003560e01c80638f32d59b1161008a578063c92aecc411610059578063c92aecc4146108f4578063e2a7515e14610909578063e3a5ab78146109d1578063f2fde38b14610b90576100e8565b80638f32d59b146106ae578063b26413f8146106d7578063ba4917b31461070a578063c785139614610743576100e8565b80637b33701a116100c65780637b33701a146102d55780638373f265146105b1578063867807ca146106685780638da5cb5b14610699576100e8565b8063085e2c5b146101295780634080eb7e146101d3578063715018a6146102c0575b333214156101275760405162461bcd60e51b81526004018080602001828103825260228152602001806129856022913960400191505060405180910390fd5b005b34801561013557600080fd5b50610178600480360360a081101561014c57600080fd5b506001600160a01b03813581169160208101359091169060408101359060608101359060800135610bc3565b6040518083815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156101be5781810151838201526020016101a6565b50505050905001935050505060405180910390f35b6102ae60048036036101008110156101ea57600080fd5b6001600160a01b03823581169260208101359091169160408201359160608101359181019060a081016080820135600160201b81111561022957600080fd5b82018360208201111561023b57600080fd5b803590602001918460208302840111600160201b8311171561025c57600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295505082359350505060208101356001600160a01b03169060400135610be6565b60408051918252519081900360200190f35b3480156102cc57600080fd5b50610127610cbc565b3480156102e157600080fd5b50610511600480360360a08110156102f857600080fd5b810190602081018135600160201b81111561031257600080fd5b82018360208201111561032457600080fd5b803590602001918460208302840111600160201b8311171561034557600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092958435959094909350604081019250602001359050600160201b81111561039c57600080fd5b8201836020820111156103ae57600080fd5b803590602001918460208302840111600160201b831117156103cf57600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b81111561041e57600080fd5b82018360208201111561043057600080fd5b803590602001918460208302840111600160201b8311171561045157600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b8111156104a057600080fd5b8201836020820111156104b257600080fd5b803590602001918460208302840111600160201b831117156104d357600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610d4d945050505050565b604051808060200184815260200180602001838103835286818151815260200191508051906020019060200280838360005b8381101561055b578181015183820152602001610543565b50505050905001838103825284818151815260200191508051906020019060200280838360005b8381101561059a578181015183820152602001610582565b505050509050019550505050505060405180910390f35b3480156105bd57600080fd5b50610606600480360360c08110156105d457600080fd5b506001600160a01b03813581169160208101359091169060408101359060608101359060808101359060a0013561102c565b6040518084815260200183815260200180602001828103825283818151815260200191508051906020019060200280838360005b8381101561065257818101518382015260200161063a565b5050505090500194505050505060405180910390f35b34801561067457600080fd5b5061067d611187565b604080516001600160a01b039092168252519081900360200190f35b3480156106a557600080fd5b5061067d611196565b3480156106ba57600080fd5b506106c36111a5565b604080519115158252519081900360200190f35b3480156106e357600080fd5b50610127600480360360208110156106fa57600080fd5b50356001600160a01b03166111c9565b34801561071657600080fd5b506101276004803603604081101561072d57600080fd5b506001600160a01b03813516906020013561125a565b6102ae600480360360a081101561075957600080fd5b810190602081018135600160201b81111561077357600080fd5b82018360208201111561078557600080fd5b803590602001918460208302840111600160201b831117156107a657600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295843595602086013595919450925060608101915060400135600160201b81111561080157600080fd5b82018360208201111561081357600080fd5b803590602001918460208302840111600160201b8311171561083457600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b81111561088357600080fd5b82018360208201111561089557600080fd5b803590602001918460208302840111600160201b831117156108b657600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506112c0945050505050565b34801561090057600080fd5b5061067d6112dc565b6102ae600480360360c081101561091f57600080fd5b6001600160a01b03823581169260208101359091169160408201359160608101359181019060a081016080820135600160201b81111561095e57600080fd5b82018360208201111561097057600080fd5b803590602001918460208302840111600160201b8311171561099157600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955050913592506112ee915050565b6102ae600480360360e08110156109e757600080fd5b810190602081018135600160201b811115610a0157600080fd5b820183602082011115610a1357600080fd5b803590602001918460208302840111600160201b83111715610a3457600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295843595602086013595919450925060608101915060400135600160201b811115610a8f57600080fd5b820183602082011115610aa157600080fd5b803590602001918460208302840111600160201b83111715610ac257600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295949360208101935035915050600160201b811115610b1157600080fd5b820183602082011115610b2357600080fd5b803590602001918460208302840111600160201b83111715610b4457600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550506001600160a01b03833516935050506020013561130c565b348015610b9c57600080fd5b5061012760048036036020811015610bb357600080fd5b50356001600160a01b0316611b1d565b60006060610bd68787878787600061102c565b9199919850909650505050505050565b60408051600280825260608083018452600093909291906020830190803883390190505090508981600081518110610c1a57fe5b60200260200101906001600160a01b031690816001600160a01b0316815250508881600181518110610c4857fe5b6001600160a01b03909216602092830291909101909101526040805160018082528183019092526060918160200160208202803883390190505090508581600081518110610c9257fe5b602002602001018181525050610cad828a8a8a858a8a61130c565b50505098975050505050505050565b610cc46111a5565b610d03576040805162461bcd60e51b81526020600482018190526024820152600080516020612a9f833981519152604482015290519081900360640190fd5b600080546040516001600160a01b03909116907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a3600080546001600160a01b0319169055565b606060006060600160009054906101000a90046001600160a01b03166001600160a01b0316637b33701a89898989896040518663ffffffff1660e01b8152600401808060200186815260200180602001806020018060200185810385528a818151815260200191508051906020019060200280838360005b83811015610ddd578181015183820152602001610dc5565b50505050905001858103845288818151815260200191508051906020019060200280838360005b83811015610e1c578181015183820152602001610e04565b50505050905001858103835287818151815260200191508051906020019060200280838360005b83811015610e5b578181015183820152602001610e43565b50505050905001858103825286818151815260200191508051906020019060200280838360005b83811015610e9a578181015183820152602001610e82565b50505050905001995050505050505050505060006040518083038186803b158015610ec457600080fd5b505afa158015610ed8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526060811015610f0157600080fd5b8101908080516040519392919084600160201b821115610f2057600080fd5b908301906020820185811115610f3557600080fd5b82518660208202830111600160201b82111715610f5157600080fd5b82525081516020918201928201910280838360005b83811015610f7e578181015183820152602001610f66565b505050509050016040526020018051906020019092919080516040519392919084600160201b821115610fb057600080fd5b908301906020820185811115610fc557600080fd5b82518660208202830111600160201b82111715610fe157600080fd5b82525081516020918201928201910280838360005b8381101561100e578181015183820152602001610ff6565b50505050905001604052505050925092509250955095509592505050565b60015460408051638373f26560e01b81526001600160a01b038981166004830152888116602483015260448201889052606482018790526084820186905260a4820185905291516000938493606093911691638373f2659160c4808201928792909190829003018186803b1580156110a357600080fd5b505afa1580156110b7573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405260608110156110e057600080fd5b81516020830151604080850180519151939592948301929184600160201b82111561110a57600080fd5b90830190602082018581111561111f57600080fd5b82518660208202830111600160201b8211171561113b57600080fd5b82525081516020918201928201910280838360005b83811015611168578181015183820152602001611150565b5050505090500160405250505092509250925096509650969350505050565b6001546001600160a01b031681565b6000546001600160a01b031690565b600080546001600160a01b03166111ba611b70565b6001600160a01b031614905090565b6111d16111a5565b611210576040805162461bcd60e51b81526020600482018190526024820152600080516020612a9f833981519152604482015290519081900360640190fd5b600180546001600160a01b0319166001600160a01b0383169081179091556040517f310ba5f1d2ed074b51e2eccd052a47ae9ab7c6b800d1fca3db3999d6a592ca0390600090a250565b6112626111a5565b6112a1576040805162461bcd60e51b81526020600482018190526024820152600080516020612a9f833981519152604482015290519081900360640190fd5b6112bb6001600160a01b038316338363ffffffff611b7416565b505050565b60006112d2868686868660008061130c565b5095945050505050565b6d4946c0e9f43f4dee607b0ef1fa1c81565b6000611301878787878787600080610be6565b979650505050505050565b600060028851101580156113205750600087115b611371576040805162461bcd60e51b815260206004820152601d60248201527f4f6e6553706c69743a2073776170206d616b6573206e6f2073656e7365000000604482015290519081900360640190fd5b60018851038451146113b45760405162461bcd60e51b8152600401808060200182810382526027815260200180612a236027913960400191505060405180910390fd5b6113ce6113c089611bf2565b6001600160a01b0316611c10565b15153415151461140f5760405162461bcd60e51b8152600401808060200182810382526034815260200180612a4a6034913960400191505060405180910390fd5b666a94d74f4300008211156114555760405162461bcd60e51b8152600401808060200182810382526021815260200180612a026021913960400191505060405180910390fd5b60005a905061146261296a565b61146d8a6001611c4a565b90506115b76000198a1415611597576115926114888c611bf2565b6001600160a01b03166370a08231336040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156114dd57600080fd5b505afa1580156114f1573d6000803e3d6000fd5b505050506040513d602081101561150757600080fd5b50516115128d611bf2565b60408051636eb1769f60e11b815233600482015230602482015290516001600160a01b03929092169163dd62ed3e91604480820192602092909190829003018186803b15801561156157600080fd5b505afa158015611575573d6000803e3d6000fd5b505050506040513d602081101561158b57600080fd5b5051611c96565b611599565b895b6115a28c611bf2565b6001600160a01b03169063ffffffff611cac16565b60006115ef82600001516115e3306115ce8f611bf2565b6001600160a01b03169063ffffffff611d2e16565b9063ffffffff611dd816565b600154909150611622906001600160a01b03168261160c8e611bf2565b6001600160a01b0316919063ffffffff611e1a16565b6001546001600160a01b031663c785139661163f6113c08e611bf2565b61164a57600061164c565b825b8d848d8d8d6040518763ffffffff1660e01b815260040180806020018681526020018581526020018060200180602001848103845289818151815260200191508051906020019060200280838360005b838110156116b457818101518382015260200161169c565b50505050905001848103835286818151815260200191508051906020019060200280838360005b838110156116f35781810151838201526020016116db565b50505050905001848103825285818151815260200191508051906020019060200280838360005b8381101561173257818101518382015260200161171a565b50505050905001985050505050505050506020604051808303818588803b15801561175c57600080fd5b505af1158015611770573d6000803e3d6000fd5b50505050506040513d602081101561178757600080fd5b50611792905061296a565b61179d8c6000611c4a565b90506117ba83602001518260200151611dd890919063ffffffff16565b9450898510156117fb5760405162461bcd60e51b81526004018080602001828103825260358152602001806129cd6035913960400191505060405180910390fd5b61184687611827670de0b6b3a764000061181b898b63ffffffff611f1416565b9063ffffffff611f6d16565b6118308f611faf565b6001600160a01b0316919063ffffffff611b7416565b506118773361182761186a670de0b6b3a764000061181b8a8c63ffffffff611f1416565b889063ffffffff611dd816565b506118818c611faf565b6001600160a01b03166118938d611bf2565b6001600160a01b03167f97dab93572c2c66c701e75607e2db4045d7b8d0765335338b556929b940707e28d888e8e8e8e8e604051808881526020018781526020018681526020018060200180602001856001600160a01b03166001600160a01b03168152602001848152602001838103835287818151815260200191508051906020019060200280838360005b83811015611938578181015183820152602001611920565b50505050905001838103825286818151815260200191508051906020019060200280838360005b8381101561197757818101518382015260200161195f565b50505050905001995050505050505050505060405180910390a38251815111156119bf57825181516119bd9133916119b49163ffffffff611dd816565b6118308f611bf2565b505b60006001603e1b6501000000000017896000815181106119db57fe5b6020026020010151161115611a3b576000601036025a866152080103019050611a3560006001603e1b8b600081518110611a1157fe5b60200260200101511611611a255733611a27565b325b61a3db61374a840104611fc1565b50611b0e565b6000668000000000000089600081518110611a5257fe5b6020026020010151161115611b0e576000601036025a866152080103019050876001600160a01b031663bc3d0d7882886000366040518563ffffffff1660e01b815260040180858152602001848152602001806020018281038252848482818152602001925080828437600081840152601f19601f82011690508083019250505095505050505050600060405180830381600087803b158015611af457600080fd5b505af1158015611b08573d6000803e3d6000fd5b50505050505b50505050979650505050505050565b611b256111a5565b611b64576040805162461bcd60e51b81526020600482018190526024820152600080516020612a9f833981519152604482015290519081900360640190fd5b611b6d8161230a565b50565b3390565b600081611b8357506001611beb565b611b8c84611c10565b15611bcd576040516001600160a01b0384169083156108fc029084906000818181858888f19350505050158015611bc7573d6000803e3d6000fd5b50611beb565b611be76001600160a01b038516848463ffffffff6123aa16565b5060015b9392505050565b600081600081518110611c0157fe5b60200260200101519050919050565b60006001600160a01b0382161580611c4457506001600160a01b03821673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee145b92915050565b611c5261296a565b6040518060400160405280611c7b84611c6c576000611c6e565b345b6115e3306115ce89611bf2565b8152602001611c8d306115ce87611faf565b90529392505050565b6000818310611ca55781611beb565b5090919050565b80611cb657611d2a565b611cbf82611c10565b15611d0f5780341115611d0a57336108fc611ce0348463ffffffff611dd816565b6040518115909202916000818181858888f19350505050158015611d08573d6000803e3d6000fd5b505b611d2a565b611d2a6001600160a01b03831633308463ffffffff6123fc16565b5050565b6000611d3983611c10565b15611d4f57506001600160a01b03811631611c44565b826001600160a01b03166370a08231836040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b158015611da557600080fd5b505afa158015611db9573d6000803e3d6000fd5b505050506040513d6020811015611dcf57600080fd5b50519050611c44565b6000611beb83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250612456565b611e2383611c10565b6112bb5780611e4c57611e476001600160a01b03841683600063ffffffff6124ed16565b6112bb565b60408051636eb1769f60e11b81523060048201526001600160a01b038481166024830152915160009286169163dd62ed3e916044808301926020929190829003018186803b158015611e9d57600080fd5b505afa158015611eb1573d6000803e3d6000fd5b505050506040513d6020811015611ec757600080fd5b5051905081811015611f0e578015611ef457611ef46001600160a01b03851684600063ffffffff6124ed16565b611f0e6001600160a01b038516848463ffffffff6124ed16565b50505050565b600082611f2357506000611c44565b82820282848281611f3057fe5b0414611beb5760405162461bcd60e51b8152600401808060200182810382526021815260200180612a7e6021913960400191505060405180910390fd5b6000611beb83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250612600565b600081600183510381518110611c0157fe5b73a6f3ef841d371a82ca757fad08efc0dee2f1f5e26000612006826d4946c0e9f43f4dee607b0ef1fa1c73c02aaa39b223fe8d0a0e5c4f27ead9083c756cc286612665565b9050600061202c3a6120208661465063ffffffff611f1416565b9063ffffffff611f1416565b90506120506120433a618ca063ffffffff611f1416565b829063ffffffff61271c16565b8210156120e6576040805163079d229f60e01b81526001600160a01b03871660048201526024810186905290516d4946c0e9f43f4dee607b0ef1fa1c9163079d229f9160448083019260209291908290030181600087803b1580156120b457600080fd5b505af11580156120c8573d6000803e3d6000fd5b505050506040513d60208110156120de57600080fd5b506123039050565b604080516323b872dd60e01b81526001600160a01b038781166004830152851660248201526044810186905290516d4946c0e9f43f4dee607b0ef1fa1c916323b872dd9160648083019260209291908290030181600087803b15801561214b57600080fd5b505af115801561215f573d6000803e3d6000fd5b505050506040513d602081101561217557600080fd5b50506040805163022c0d9f60e01b815260006004820181905260248201859052306044830152608060648301526084820181905291516001600160a01b0386169263022c0d9f9260c4808201939182900301818387803b1580156121d857600080fd5b505af11580156121ec573d6000803e3d6000fd5b5050604080516370a0823160e01b8152306004820152905173c02aaa39b223fe8d0a0e5c4f27ead9083c756cc29350632e1a7d4d925083916370a08231916024808301926020929190829003018186803b15801561224957600080fd5b505afa15801561225d573d6000803e3d6000fd5b505050506040513d602081101561227357600080fd5b5051604080516001600160e01b031960e085901b168152600481019290925251602480830192600092919082900301818387803b1580156122b357600080fd5b505af11580156122c7573d6000803e3d6000fd5b50506040516001600160a01b03881692504780156108fc029250906000818181858888f19350505050158015612301573d6000803e3d6000fd5b505b5050505050565b6001600160a01b03811661234f5760405162461bcd60e51b81526004018080602001828103825260268152602001806129a76026913960400191505060405180910390fd5b600080546040516001600160a01b03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a3600080546001600160a01b0319166001600160a01b0392909216919091179055565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526112bb908490612776565b604080516001600160a01b0385811660248301528416604482015260648082018490528251808303909101815260849091019091526020810180516001600160e01b03166323b872dd60e01b179052611f0e908590612776565b600081848411156124e55760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b838110156124aa578181015183820152602001612492565b50505050905090810190601f1680156124d75780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b505050900390565b801580612573575060408051636eb1769f60e11b81523060048201526001600160a01b03848116602483015291519185169163dd62ed3e91604480820192602092909190829003018186803b15801561254557600080fd5b505afa158015612559573d6000803e3d6000fd5b505050506040513d602081101561256f57600080fd5b5051155b6125ae5760405162461bcd60e51b8152600401808060200182810382526036815260200180612ae96036913960400191505060405180910390fd5b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526112bb908490612776565b6000818361264f5760405162461bcd60e51b81526020600482018181528351602484015283519092839260449091019190850190808383600083156124aa578181015183820152602001612492565b50600083858161265b57fe5b0495945050505050565b6000806126816001600160a01b0386168763ffffffff611d2e16565b9050600061269e6001600160a01b0386168863ffffffff611d2e16565b905060006126b4856103e563ffffffff611f1416565b905060006126c8828463ffffffff611f1416565b905060006126ee836126e2876103e863ffffffff611f1416565b9063ffffffff61271c16565b9050801561270b57612706828263ffffffff611f6d16565b61270e565b60005b9a9950505050505050505050565b600082820183811015611beb576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b612788826001600160a01b031661292e565b6127d9576040805162461bcd60e51b815260206004820152601f60248201527f5361666545524332303a2063616c6c20746f206e6f6e2d636f6e747261637400604482015290519081900360640190fd5b60006060836001600160a01b0316836040518082805190602001908083835b602083106128175780518252601f1990920191602091820191016127f8565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114612879576040519150601f19603f3d011682016040523d82523d6000602084013e61287e565b606091505b5091509150816128d5576040805162461bcd60e51b815260206004820181905260248201527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564604482015290519081900360640190fd5b805115611f0e578080602001905160208110156128f157600080fd5b5051611f0e5760405162461bcd60e51b815260040180806020018281038252602a815260200180612abf602a913960400191505060405180910390fd5b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47081811480159061296257508115155b949350505050565b60405180604001604052806000815260200160008152509056fe4f6e6553706c69743a20646f206e6f742073656e6420455448206469726563746c794f776e61626c653a206e6577206f776e657220697320746865207a65726f20616464726573734f6e6553706c69743a2061637475616c2072657475726e20616d6f756e74206973206c657373207468616e206d696e52657475726e4f6e6553706c69743a2066656550657263656e74206f7574206f662072616e67654f6e6553706c69743a20666c616773206172726179206c656e67746820697320696e76616c69644f6e6553706c69743a206d73672e76616c75652073686f756c642062652075736564206f6e6c7920666f72204554482073776170536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f774f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65725361666545524332303a204552433230206f7065726174696f6e20646964206e6f7420737563636565645361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f20746f206e6f6e2d7a65726f20616c6c6f77616e6365a265627a7a72315820bc4cbcb6fd4de1c8952a89fff476e184a8d0e7cf0f8299d351a3c0ba616425a864736f6c63430005110032 \ No newline at end of file diff --git a/OneSplitAudit.full.sol b/OneSplitAudit.full.sol deleted file mode 100644 index 684e2d2..0000000 --- a/OneSplitAudit.full.sol +++ /dev/null @@ -1,1250 +0,0 @@ - -// File: @openzeppelin/contracts/math/Math.sol - -pragma solidity ^0.5.0; - -/** - * @dev Standard math utilities missing in the Solidity language. - */ -library Math { - /** - * @dev Returns the largest of two numbers. - */ - function max(uint256 a, uint256 b) internal pure returns (uint256) { - return a >= b ? a : b; - } - - /** - * @dev Returns the smallest of two numbers. - */ - function min(uint256 a, uint256 b) internal pure returns (uint256) { - return a < b ? a : b; - } - - /** - * @dev Returns the average of two numbers. The result is rounded towards - * zero. - */ - function average(uint256 a, uint256 b) internal pure returns (uint256) { - // (a + b) / 2 can overflow, so we distribute - return (a / 2) + (b / 2) + ((a % 2 + b % 2) / 2); - } -} - -// File: @openzeppelin/contracts/GSN/Context.sol - -pragma solidity ^0.5.0; - -/* - * @dev Provides information about the current execution context, including the - * sender of the transaction and its data. While these are generally available - * via msg.sender and msg.data, they should not be accessed in such a direct - * manner, since when dealing with GSN meta-transactions the account sending and - * paying for execution may not be the actual sender (as far as an application - * is concerned). - * - * This contract is only required for intermediate, library-like contracts. - */ -contract Context { - // Empty internal constructor, to prevent people from mistakenly deploying - // an instance of this contract, which should be used via inheritance. - constructor () internal { } - // solhint-disable-previous-line no-empty-blocks - - function _msgSender() internal view returns (address payable) { - return msg.sender; - } - - function _msgData() internal view returns (bytes memory) { - this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691 - return msg.data; - } -} - -// File: @openzeppelin/contracts/ownership/Ownable.sol - -pragma solidity ^0.5.0; - -/** - * @dev Contract module which provides a basic access control mechanism, where - * there is an account (an owner) that can be granted exclusive access to - * specific functions. - * - * This module is used through inheritance. It will make available the modifier - * `onlyOwner`, which can be applied to your functions to restrict their use to - * the owner. - */ -contract Ownable is Context { - address private _owner; - - event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); - - /** - * @dev Initializes the contract setting the deployer as the initial owner. - */ - constructor () internal { - address msgSender = _msgSender(); - _owner = msgSender; - emit OwnershipTransferred(address(0), msgSender); - } - - /** - * @dev Returns the address of the current owner. - */ - function owner() public view returns (address) { - return _owner; - } - - /** - * @dev Throws if called by any account other than the owner. - */ - modifier onlyOwner() { - require(isOwner(), "Ownable: caller is not the owner"); - _; - } - - /** - * @dev Returns true if the caller is the current owner. - */ - function isOwner() public view returns (bool) { - return _msgSender() == _owner; - } - - /** - * @dev Leaves the contract without owner. It will not be possible to call - * `onlyOwner` functions anymore. Can only be called by the current owner. - * - * NOTE: Renouncing ownership will leave the contract without an owner, - * thereby removing any functionality that is only available to the owner. - */ - function renounceOwnership() public onlyOwner { - emit OwnershipTransferred(_owner, address(0)); - _owner = address(0); - } - - /** - * @dev Transfers ownership of the contract to a new account (`newOwner`). - * Can only be called by the current owner. - */ - function transferOwnership(address newOwner) public onlyOwner { - _transferOwnership(newOwner); - } - - /** - * @dev Transfers ownership of the contract to a new account (`newOwner`). - */ - function _transferOwnership(address newOwner) internal { - require(newOwner != address(0), "Ownable: new owner is the zero address"); - emit OwnershipTransferred(_owner, newOwner); - _owner = newOwner; - } -} - -// File: @openzeppelin/contracts/token/ERC20/IERC20.sol - -pragma solidity ^0.5.0; - -/** - * @dev Interface of the ERC20 standard as defined in the EIP. Does not include - * the optional functions; to access them see {ERC20Detailed}. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -// File: contracts/interface/IWETH.sol - -pragma solidity ^0.5.0; - - - -contract IWETH is IERC20 { - function deposit() external payable; - - function withdraw(uint256 amount) external; -} - -// File: @openzeppelin/contracts/math/SafeMath.sol - -pragma solidity ^0.5.0; - -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint256 a, uint256 b) internal pure returns (uint256) { - uint256 c = a + b; - require(c >= a, "SafeMath: addition overflow"); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - */ - function sub(uint256 a, uint256 b) internal pure returns (uint256) { - return sub(a, b, "SafeMath: subtraction overflow"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - * - * _Available since v2.4.0._ - */ - function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b <= a, errorMessage); - uint256 c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint256 a, uint256 b) internal pure returns (uint256) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint256 c = a * b; - require(c / a == b, "SafeMath: multiplication overflow"); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint256 a, uint256 b) internal pure returns (uint256) { - return div(a, b, "SafeMath: division by zero"); - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts with custom message on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint256 c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint256 a, uint256 b) internal pure returns (uint256) { - return mod(a, b, "SafeMath: modulo by zero"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b != 0, errorMessage); - return a % b; - } -} - -// File: @openzeppelin/contracts/utils/Address.sol - -pragma solidity ^0.5.5; - -/** - * @dev Collection of functions related to the address type - */ -library Address { - /** - * @dev Returns true if `account` is a contract. - * - * [IMPORTANT] - * ==== - * It is unsafe to assume that an address for which this function returns - * false is an externally-owned account (EOA) and not a contract. - * - * Among others, `isContract` will return false for the following - * types of addresses: - * - * - an externally-owned account - * - a contract in construction - * - an address where a contract will be created - * - an address where a contract lived, but was destroyed - * ==== - */ - function isContract(address account) internal view returns (bool) { - // According to EIP-1052, 0x0 is the value returned for not-yet created accounts - // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned - // for accounts without code, i.e. `keccak256('')` - bytes32 codehash; - bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; - // solhint-disable-next-line no-inline-assembly - assembly { codehash := extcodehash(account) } - return (codehash != accountHash && codehash != 0x0); - } - - /** - * @dev Converts an `address` into `address payable`. Note that this is - * simply a type cast: the actual underlying value is not changed. - * - * _Available since v2.4.0._ - */ - function toPayable(address account) internal pure returns (address payable) { - return address(uint160(account)); - } - - /** - * @dev Replacement for Solidity's `transfer`: sends `amount` wei to - * `recipient`, forwarding all available gas and reverting on errors. - * - * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost - * of certain opcodes, possibly making contracts go over the 2300 gas limit - * imposed by `transfer`, making them unable to receive funds via - * `transfer`. {sendValue} removes this limitation. - * - * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more]. - * - * IMPORTANT: because control is transferred to `recipient`, care must be - * taken to not create reentrancy vulnerabilities. Consider using - * {ReentrancyGuard} or the - * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern]. - * - * _Available since v2.4.0._ - */ - function sendValue(address payable recipient, uint256 amount) internal { - require(address(this).balance >= amount, "Address: insufficient balance"); - - // solhint-disable-next-line avoid-call-value - (bool success, ) = recipient.call.value(amount)(""); - require(success, "Address: unable to send value, recipient may have reverted"); - } -} - -// File: @openzeppelin/contracts/token/ERC20/SafeERC20.sol - -pragma solidity ^0.5.0; - - - - -/** - * @title SafeERC20 - * @dev Wrappers around ERC20 operations that throw on failure (when the token - * contract returns false). Tokens that return no value (and instead revert or - * throw on failure) are also supported, non-reverting calls are assumed to be - * successful. - * To use this library you can add a `using SafeERC20 for ERC20;` statement to your contract, - * which allows you to call the safe operations as `token.safeTransfer(...)`, etc. - */ -library SafeERC20 { - using SafeMath for uint256; - using Address for address; - - function safeTransfer(IERC20 token, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); - } - - function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); - } - - function safeApprove(IERC20 token, address spender, uint256 value) internal { - // safeApprove should only be called when setting an initial allowance, - // or when resetting it to zero. To increase and decrease it, use - // 'safeIncreaseAllowance' and 'safeDecreaseAllowance' - // solhint-disable-next-line max-line-length - require((value == 0) || (token.allowance(address(this), spender) == 0), - "SafeERC20: approve from non-zero to non-zero allowance" - ); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value)); - } - - function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).add(value); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - function safeDecreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).sub(value, "SafeERC20: decreased allowance below zero"); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - /** - * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement - * on the return value: the return value is optional (but if data is returned, it must not be false). - * @param token The token targeted by the call. - * @param data The call data (encoded using abi.encode or one of its variants). - */ - function callOptionalReturn(IERC20 token, bytes memory data) private { - // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since - // we're implementing it ourselves. - - // A Solidity high level call has three parts: - // 1. The target address is checked to verify it contains contract code - // 2. The call itself is made, and success asserted - // 3. The return value is decoded, which in turn checks the size of the returned data. - // solhint-disable-next-line max-line-length - require(address(token).isContract(), "SafeERC20: call to non-contract"); - - // solhint-disable-next-line avoid-low-level-calls - (bool success, bytes memory returndata) = address(token).call(data); - require(success, "SafeERC20: low-level call failed"); - - if (returndata.length > 0) { // Return data is optional - // solhint-disable-next-line max-line-length - require(abi.decode(returndata, (bool)), "SafeERC20: ERC20 operation did not succeed"); - } - } -} - -// File: contracts/UniversalERC20.sol - -pragma solidity ^0.5.0; - - - - - -library UniversalERC20 { - - using SafeMath for uint256; - using SafeERC20 for IERC20; - - IERC20 private constant ZERO_ADDRESS = IERC20(0x0000000000000000000000000000000000000000); - IERC20 private constant ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - function universalTransfer(IERC20 token, address to, uint256 amount) internal returns(bool) { - if (amount == 0) { - return true; - } - - if (isETH(token)) { - address(uint160(to)).transfer(amount); - } else { - token.safeTransfer(to, amount); - return true; - } - } - - function universalTransferFrom(IERC20 token, address from, address to, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - require(from == msg.sender && msg.value >= amount, "Wrong useage of ETH.universalTransferFrom()"); - if (to != address(this)) { - address(uint160(to)).transfer(amount); - } - if (msg.value > amount) { - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(from, to, amount); - } - } - - function universalTransferFromSenderToThis(IERC20 token, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - if (msg.value > amount) { - // Return remainder if exist - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(msg.sender, address(this), amount); - } - } - - function universalApprove(IERC20 token, address to, uint256 amount) internal { - if (!isETH(token)) { - if (amount == 0) { - token.safeApprove(to, 0); - return; - } - - uint256 allowance = token.allowance(address(this), to); - if (allowance < amount) { - if (allowance > 0) { - token.safeApprove(to, 0); - } - token.safeApprove(to, amount); - } - } - } - - function universalBalanceOf(IERC20 token, address who) internal view returns (uint256) { - if (isETH(token)) { - return who.balance; - } else { - return token.balanceOf(who); - } - } - - function universalDecimals(IERC20 token) internal view returns (uint256) { - - if (isETH(token)) { - return 18; - } - - (bool success, bytes memory data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("decimals()") - ); - if (!success || data.length == 0) { - (success, data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("DECIMALS()") - ); - } - - return (success && data.length > 0) ? abi.decode(data, (uint256)) : 18; - } - - function isETH(IERC20 token) internal pure returns(bool) { - return (address(token) == address(ZERO_ADDRESS) || address(token) == address(ETH_ADDRESS)); - } - - function notExist(IERC20 token) internal pure returns(bool) { - return (address(token) == address(-1)); - } -} - -// File: contracts/interface/IUniswapV2Exchange.sol - -pragma solidity ^0.5.0; - - - - - -interface IUniswapV2Exchange { - function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external; -} - - -library UniswapV2ExchangeLib { - using SafeMath for uint256; - using UniversalERC20 for IERC20; - - function getReturn( - IUniswapV2Exchange exchange, - IERC20 fromToken, - IERC20 destToken, - uint amountIn - ) internal view returns (uint256) { - uint256 reserveIn = fromToken.universalBalanceOf(address(exchange)); - uint256 reserveOut = destToken.universalBalanceOf(address(exchange)); - - uint256 amountInWithFee = amountIn.mul(997); - uint256 numerator = amountInWithFee.mul(reserveOut); - uint256 denominator = reserveIn.mul(1000).add(amountInWithFee); - return (denominator == 0) ? 0 : numerator.div(denominator); - } -} - -// File: contracts/IOneSplit.sol - -pragma solidity ^0.5.0; - - -// -// [ msg.sender ] -// | | -// | | -// \_/ -// +---------------+ ________________________________ -// | OneSplitAudit | _______________________________ \ -// +---------------+ \ \ -// | | ______________ | | (staticcall) -// | | / ____________ \ | | -// | | (call) / / \ \ | | -// | | / / | | | | -// \_/ | | \_/ \_/ -// +--------------+ | | +----------------------+ -// | OneSplitWrap | | | | OneSplitViewWrap | -// +--------------+ | | +----------------------+ -// | | | | | | -// | | (delegatecall) | | (staticcall) | | (staticcall) -// \_/ | | \_/ -// +--------------+ | | +------------------+ -// | OneSplit | | | | OneSplitView | -// +--------------+ | | +------------------+ -// | | / / -// \ \________________/ / -// \__________________/ -// - - -contract IOneSplitConsts { - // flags = FLAG_DISABLE_UNISWAP + FLAG_DISABLE_BANCOR + ... - uint256 internal constant FLAG_DISABLE_UNISWAP = 0x01; - uint256 internal constant DEPRECATED_FLAG_DISABLE_KYBER = 0x02; // Deprecated - uint256 internal constant FLAG_DISABLE_BANCOR = 0x04; - uint256 internal constant FLAG_DISABLE_OASIS = 0x08; - uint256 internal constant FLAG_DISABLE_COMPOUND = 0x10; - uint256 internal constant FLAG_DISABLE_FULCRUM = 0x20; - uint256 internal constant FLAG_DISABLE_CHAI = 0x40; - uint256 internal constant FLAG_DISABLE_AAVE = 0x80; - uint256 internal constant FLAG_DISABLE_SMART_TOKEN = 0x100; - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_ETH = 0x200; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_BDAI = 0x400; - uint256 internal constant FLAG_DISABLE_IEARN = 0x800; - uint256 internal constant FLAG_DISABLE_CURVE_COMPOUND = 0x1000; - uint256 internal constant FLAG_DISABLE_CURVE_USDT = 0x2000; - uint256 internal constant FLAG_DISABLE_CURVE_Y = 0x4000; - uint256 internal constant FLAG_DISABLE_CURVE_BINANCE = 0x8000; - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_DAI = 0x10000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_USDC = 0x20000; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_CURVE_SYNTHETIX = 0x40000; - uint256 internal constant FLAG_DISABLE_WETH = 0x80000; - uint256 internal constant FLAG_DISABLE_UNISWAP_COMPOUND = 0x100000; // Works only when one of assets is ETH or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_UNISWAP_CHAI = 0x200000; // Works only when ETH<>DAI or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_UNISWAP_AAVE = 0x400000; // Works only when one of assets is ETH or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_IDLE = 0x800000; - uint256 internal constant FLAG_DISABLE_MOONISWAP = 0x1000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2 = 0x2000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_ETH = 0x4000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_DAI = 0x8000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_USDC = 0x10000000; - uint256 internal constant FLAG_DISABLE_ALL_SPLIT_SOURCES = 0x20000000; - uint256 internal constant FLAG_DISABLE_ALL_WRAP_SOURCES = 0x40000000; - uint256 internal constant FLAG_DISABLE_CURVE_PAX = 0x80000000; - uint256 internal constant FLAG_DISABLE_CURVE_RENBTC = 0x100000000; - uint256 internal constant FLAG_DISABLE_CURVE_TBTC = 0x200000000; - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_USDT = 0x400000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_WBTC = 0x800000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_TBTC = 0x1000000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_RENBTC = 0x2000000000; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_DFORCE_SWAP = 0x4000000000; - uint256 internal constant FLAG_DISABLE_SHELL = 0x8000000000; - uint256 internal constant FLAG_ENABLE_CHI_BURN = 0x10000000000; - uint256 internal constant FLAG_DISABLE_MSTABLE_MUSD = 0x20000000000; - uint256 internal constant FLAG_DISABLE_CURVE_SBTC = 0x40000000000; - uint256 internal constant FLAG_DISABLE_DMM = 0x80000000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_ALL = 0x100000000000; - uint256 internal constant FLAG_DISABLE_CURVE_ALL = 0x200000000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_ALL = 0x400000000000; - uint256 internal constant FLAG_DISABLE_SPLIT_RECALCULATION = 0x800000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_ALL = 0x1000000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_1 = 0x2000000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_2 = 0x4000000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_3 = 0x8000000000000; - uint256 internal constant DEPRECATED_FLAG_ENABLE_KYBER_UNISWAP_RESERVE = 0x10000000000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_KYBER_OASIS_RESERVE = 0x20000000000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_KYBER_BANCOR_RESERVE = 0x40000000000000; // Deprecated, Turned off by default - uint256 internal constant FLAG_ENABLE_REFERRAL_GAS_SPONSORSHIP = 0x80000000000000; // Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_COMP = 0x100000000000000; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_KYBER_ALL = 0x200000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_1 = 0x400000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_2 = 0x800000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_3 = 0x1000000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_4 = 0x2000000000000000; - uint256 internal constant FLAG_ENABLE_CHI_BURN_BY_ORIGIN = 0x4000000000000000; -} - - -contract IOneSplit is IOneSplitConsts { - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ); - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ); - - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags - ) - public - payable - returns(uint256 returnAmount); -} - - -contract IOneSplitMulti is IOneSplit { - function getExpectedReturnWithGasMulti( - IERC20[] memory tokens, - uint256 amount, - uint256[] memory parts, - uint256[] memory flags, - uint256[] memory destTokenEthPriceTimesGasPrices - ) - public - view - returns( - uint256[] memory returnAmounts, - uint256 estimateGasAmount, - uint256[] memory distribution - ); - - function swapMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags - ) - public - payable - returns(uint256 returnAmount); -} - -// File: contracts/OneSplitAudit.sol - -pragma solidity ^0.5.0; - - - - - - - - -contract IFreeFromUpTo is IERC20 { - function freeFromUpTo(address from, uint256 value) external returns(uint256 freed); -} - -interface IReferralGasSponsor { - function makeGasDiscount( - uint256 gasSpent, - uint256 returnAmount, - bytes calldata msgSenderCalldata - ) external; -} - - -library Array { - function first(IERC20[] memory arr) internal pure returns(IERC20) { - return arr[0]; - } - - function last(IERC20[] memory arr) internal pure returns(IERC20) { - return arr[arr.length - 1]; - } -} - - -// -// Security assumptions: -// 1. It is safe to have infinite approves of any tokens to this smart contract, -// since it could only call `transferFrom()` with first argument equal to msg.sender -// 2. It is safe to call `swap()` with reliable `minReturn` argument, -// if returning amount will not reach `minReturn` value whole swap will be reverted. -// 3. Additionally CHI tokens could be burned from caller in case of FLAG_ENABLE_CHI_BURN (0x10000000000) -// presented in `flags` or from transaction origin in case of FLAG_ENABLE_CHI_BURN_BY_ORIGIN (0x4000000000000000) -// presented in `flags`. Burned amount would refund up to 43% of gas fees. -// -contract OneSplitAudit is IOneSplit, Ownable { - using SafeMath for uint256; - using UniversalERC20 for IERC20; - using Array for IERC20[]; - - IWETH constant internal weth = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); - IFreeFromUpTo public constant chi = IFreeFromUpTo(0x0000000000004946c0e9F43F4Dee607b0eF1fA1c); - - IOneSplitMulti public oneSplitImpl; - - event ImplementationUpdated(address indexed newImpl); - - event Swapped( - IERC20 indexed fromToken, - IERC20 indexed destToken, - uint256 fromTokenAmount, - uint256 destTokenAmount, - uint256 minReturn, - uint256[] distribution, - uint256[] flags, - address referral, - uint256 feePercent - ); - - constructor(IOneSplitMulti impl) public { - setNewImpl(impl); - } - - function() external payable { - // solium-disable-next-line security/no-tx-origin - require(msg.sender != tx.origin, "OneSplit: do not send ETH directly"); - } - - function setNewImpl(IOneSplitMulti impl) public onlyOwner { - oneSplitImpl = impl; - emit ImplementationUpdated(address(impl)); - } - - /// @notice Calculate expected returning amount of `destToken` - /// @param fromToken (IERC20) Address of token or `address(0)` for Ether - /// @param destToken (IERC20) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param parts (uint256) Number of pieces source volume could be splitted, - /// works like granularity, higly affects gas usage. Should be called offchain, - /// but could be called onchain if user swaps not his own funds, but this is still considered as not safe. - /// @param flags (uint256) Flags for enabling and disabling some features, default 0 - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags // See contants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - /// @notice Calculate expected returning amount of `destToken` - /// @param fromToken (IERC20) Address of token or `address(0)` for Ether - /// @param destToken (IERC20) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param parts (uint256) Number of pieces source volume could be splitted, - /// works like granularity, higly affects gas usage. Should be called offchain, - /// but could be called onchain if user swaps not his own funds, but this is still considered as not safe. - /// @param flags (uint256) Flags for enabling and disabling some features, default 0 - /// @param destTokenEthPriceTimesGasPrice (uint256) destToken price to ETH multiplied by gas price - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitImpl.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - /// @notice Calculate expected returning amount of first `tokens` element to - /// last `tokens` element through ann the middle tokens with corresponding - /// `parts`, `flags` and `destTokenEthPriceTimesGasPrices` array values of each step - /// @param tokens (IERC20[]) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param parts (uint256[]) Number of pieces source volume could be splitted - /// @param flags (uint256[]) Flags for enabling and disabling some features, default 0 - /// @param destTokenEthPriceTimesGasPrices (uint256[]) destToken price to ETH multiplied by gas price - function getExpectedReturnWithGasMulti( - IERC20[] memory tokens, - uint256 amount, - uint256[] memory parts, - uint256[] memory flags, - uint256[] memory destTokenEthPriceTimesGasPrices - ) - public - view - returns( - uint256[] memory returnAmounts, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitImpl.getExpectedReturnWithGasMulti( - tokens, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrices - ); - } - - /// @notice Swap `amount` of `fromToken` to `destToken` - /// @param fromToken (IERC20) Address of token or `address(0)` for Ether - /// @param destToken (IERC20) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param minReturn (uint256) Minimum expected return, else revert - /// @param distribution (uint256[]) Array of weights for volume distribution returned by `getExpectedReturn` - /// @param flags (uint256) Flags for enabling and disabling some features, default 0 - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags // See contants in IOneSplit.sol - ) public payable returns(uint256) { - return swapWithReferral( - fromToken, - destToken, - amount, - minReturn, - distribution, - flags, - address(0), - 0 - ); - } - - /// @notice Swap `amount` of `fromToken` to `destToken` - /// param fromToken (IERC20) Address of token or `address(0)` for Ether - /// param destToken (IERC20) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param minReturn (uint256) Minimum expected return, else revert - /// @param distribution (uint256[]) Array of weights for volume distribution returned by `getExpectedReturn` - /// @param flags (uint256) Flags for enabling and disabling some features, default 0 - /// @param referral (address) Address of referral - /// @param feePercent (uint256) Fees percents normalized to 1e18, limited to 0.03e18 (3%) - function swapWithReferral( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags, // See contants in IOneSplit.sol - address referral, - uint256 feePercent - ) public payable returns(uint256) { - IERC20[] memory tokens = new IERC20[](2); - tokens[0] = fromToken; - tokens[1] = destToken; - - uint256[] memory flagsArray = new uint256[](1); - flagsArray[0] = flags; - - swapWithReferralMulti( - tokens, - amount, - minReturn, - distribution, - flagsArray, - referral, - feePercent - ); - } - - /// @notice Swap `amount` of first element of `tokens` to the latest element of `destToken` - /// @param tokens (IERC20[]) Addresses of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param minReturn (uint256) Minimum expected return, else revert - /// @param distribution (uint256[]) Array of weights for volume distribution returned by `getExpectedReturn` - /// @param flags (uint256[]) Flags for enabling and disabling some features, default 0 - function swapMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags - ) public payable returns(uint256) { - swapWithReferralMulti( - tokens, - amount, - minReturn, - distribution, - flags, - address(0), - 0 - ); - } - - /// @notice Swap `amount` of first element of `tokens` to the latest element of `destToken` - /// @param tokens (IERC20[]) Addresses of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param minReturn (uint256) Minimum expected return, else revert - /// @param distribution (uint256[]) Array of weights for volume distribution returned by `getExpectedReturn` - /// @param flags (uint256[]) Flags for enabling and disabling some features, default 0 - /// @param referral (address) Address of referral - /// @param feePercent (uint256) Fees percents normalized to 1e18, limited to 0.03e18 (3%) - function swapWithReferralMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags, - address referral, - uint256 feePercent - ) public payable returns(uint256 returnAmount) { - require(tokens.length >= 2 && amount > 0, "OneSplit: swap makes no sense"); - require(flags.length == tokens.length - 1, "OneSplit: flags array length is invalid"); - require((msg.value != 0) == tokens.first().isETH(), "OneSplit: msg.value should be used only for ETH swap"); - require(feePercent <= 0.03e18, "OneSplit: feePercent out of range"); - - uint256 gasStart = gasleft(); - - Balances memory beforeBalances = _getFirstAndLastBalances(tokens, true); - - // Transfer From - tokens.first().universalTransferFromSenderToThis( - amount != uint256(-1) - ? amount - : Math.min( - tokens.first().balanceOf(msg.sender), - tokens.first().allowance(msg.sender, address(this)) - ) - ); - uint256 confirmed = tokens.first().universalBalanceOf(address(this)).sub(beforeBalances.ofFromToken); - - // Swap - tokens.first().universalApprove(address(oneSplitImpl), confirmed); - oneSplitImpl.swapMulti.value(tokens.first().isETH() ? confirmed : 0)( - tokens, - confirmed, - minReturn, - distribution, - flags - ); - - Balances memory afterBalances = _getFirstAndLastBalances(tokens, false); - - // Return - returnAmount = afterBalances.ofDestToken.sub(beforeBalances.ofDestToken); - require(returnAmount >= minReturn, "OneSplit: actual return amount is less than minReturn"); - tokens.last().universalTransfer(referral, returnAmount.mul(feePercent).div(1e18)); - tokens.last().universalTransfer(msg.sender, returnAmount.sub(returnAmount.mul(feePercent).div(1e18))); - - emit Swapped( - tokens.first(), - tokens.last(), - amount, - returnAmount, - minReturn, - distribution, - flags, - referral, - feePercent - ); - - // Return remainder - if (afterBalances.ofFromToken > beforeBalances.ofFromToken) { - tokens.first().universalTransfer(msg.sender, afterBalances.ofFromToken.sub(beforeBalances.ofFromToken)); - } - - if ((flags[0] & (FLAG_ENABLE_CHI_BURN | FLAG_ENABLE_CHI_BURN_BY_ORIGIN)) > 0) { - uint256 gasSpent = 21000 + gasStart - gasleft() + 16 * msg.data.length; - _chiBurnOrSell( - ((flags[0] & FLAG_ENABLE_CHI_BURN_BY_ORIGIN) > 0) ? tx.origin : msg.sender, - (gasSpent + 14154) / 41947 - ); - } - else if ((flags[0] & FLAG_ENABLE_REFERRAL_GAS_SPONSORSHIP) > 0) { - uint256 gasSpent = 21000 + gasStart - gasleft() + 16 * msg.data.length; - IReferralGasSponsor(referral).makeGasDiscount(gasSpent, returnAmount, msg.data); - } - } - - function claimAsset(IERC20 asset, uint256 amount) public onlyOwner { - asset.universalTransfer(msg.sender, amount); - } - - function _chiBurnOrSell(address payable sponsor, uint256 amount) internal { - IUniswapV2Exchange exchange = IUniswapV2Exchange(0xa6f3ef841d371a82ca757FaD08efc0DeE2F1f5e2); - uint256 sellRefund = UniswapV2ExchangeLib.getReturn(exchange, chi, weth, amount); - uint256 burnRefund = amount.mul(18_000).mul(tx.gasprice); - - if (sellRefund < burnRefund.add(tx.gasprice.mul(36_000))) { - chi.freeFromUpTo(sponsor, amount); - } - else { - chi.transferFrom(sponsor, address(exchange), amount); - exchange.swap(0, sellRefund, address(this), ""); - weth.withdraw(weth.balanceOf(address(this))); - sponsor.transfer(address(this).balance); - } - } - - struct Balances { - uint256 ofFromToken; - uint256 ofDestToken; - } - - function _getFirstAndLastBalances(IERC20[] memory tokens, bool subValue) internal view returns(Balances memory) { - return Balances({ - ofFromToken: tokens.first().universalBalanceOf(address(this)).sub(subValue ? msg.value : 0), - ofDestToken: tokens.last().universalBalanceOf(address(this)) - }); - } -} diff --git a/OneSplitView.full.abi b/OneSplitView.full.abi deleted file mode 100644 index b550aba..0000000 --- a/OneSplitView.full.abi +++ /dev/null @@ -1 +0,0 @@ -[{"constant":true,"inputs":[],"name":"DEXES_COUNT","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"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":"flags","type":"uint256"}],"name":"getExpectedReturn","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"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":"flags","type":"uint256"},{"internalType":"uint256","name":"toTokenEthPrice","type":"uint256"}],"name":"getExpectedReturnRespectingGas","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256","name":"estimateGasAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256[]","name":"","type":"uint256[]"}],"name":"log","outputs":[],"payable":false,"stateMutability":"view","type":"function"}] \ No newline at end of file diff --git a/OneSplitView.full.bin b/OneSplitView.full.bin deleted file mode 100644 index d4bd40e..0000000 --- a/OneSplitView.full.bin +++ /dev/null @@ -1 +0,0 @@ -608060405234801561001057600080fd5b5061519b806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063085e2c5b14610051578063460ec58a146100ee578063671cc20914610198578063cc26e9fc14610211575b600080fd5b610093600480360360a081101561006757600080fd5b506001600160a01b0381358116916020810135909116906040810135906060810135906080013561022b565b6040518083815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156100d95781810151838201526020016100c1565b50505050905001935050505060405180910390f35b610136600480360360c081101561010457600080fd5b506001600160a01b03813581169160208101359091169060408101359060608101359060808101359060a0013561024e565b6040518084815260200183815260200180602001828103825283818151815260200191508051906020019060200280838360005b8381101561018257818101518382015260200161016a565b5050505090500194505050505060405180910390f35b61020f600480360360408110156101ae57600080fd5b813591908101906040810160208201356401000000008111156101d057600080fd5b8201836020820111156101e257600080fd5b8035906020019184602083028401116401000000008311171561020457600080fd5b5090925090506105ec565b005b6102196105f1565b60408051918252519081900360200190f35b6000606061023e8787878787600061024e565b9199919850909650505050505050565b6040805160168082526102e082019092526000918291606091602082016102c080388339019050509050876001600160a01b0316896001600160a01b0316141561029e57869250600091506105e0565b6102a66150d2565b6102af866105f6565b90506102b96150fb565b60005b60168110156105435760006102e88d8d8d8d8d8988601681106102db57fe5b602002015163ffffffff16565b8484601681106102f457fe5b6020020191909152905061030e868263ffffffff610afa16565b95503063671cc2098285856016811061032357fe5b60200201516040518363ffffffff1660e01b81526004018083815260200180602001828103825283818151815260200191508051906020019060200280838360005b8381101561037d578181015183820152602001610365565b50505050905001935050505060006040518083038186803b1580156103a157600080fd5b505afa1580156103b5573d6000803e3d6000fd5b5050505060608a6001016040519080825280602002602001820160405280156103e8578160200160208202803883390190505b5090508a5b801561043c578484601681106103ff57fe5b6020020151600182038151811061041257fe5b602002602001015182828151811061042657fe5b60209081029190910101526001909301926103ed565b508084846016811061044a57fe5b60200201526000610479670de0b6b3a764000061046d858d63ffffffff610b5d16565b9063ffffffff610bb616565b90508085856016811061048857fe5b602002015160008151811061049957fe5b6020026020010151111561050c576104de818686601681106104b757fe5b60200201516000815181106104c857fe5b6020026020010151610bf890919063ffffffff16565b8585601681106104ea57fe5b60200201516000815181106104fb57fe5b602002602001018181525050610538565b600085856016811061051a57fe5b602002015160008151811061052b57fe5b6020026020010181815250505b5050506001016102bc565b5061054e8882610c3a565b6000965093508590505b60168110156105dc57600061058d8a61046d87858151811061057657fe5b60200260200101518e610b5d90919063ffffffff16565b905060606105a68e8e8460018e8a89601681106102db57fe5b5090506105d0816000815181106105b957fe5b602002602001015189610afa90919063ffffffff16565b97505050600101610558565b5050505b96509650969350505050565b505050565b601681565b6105fe6150d2565b600061061483632000000063ffffffff61109416565b9050604051806102c0016040528061063660018661109490919063ffffffff16565b151583151514156106495761109a61064d565b6110c25b6001600160401b0316815260200161066c85600263ffffffff61109416565b1515831515141561067f576110ff610683565b6110c25b6001600160401b031681526020016106a285600463ffffffff61109416565b151583151514156106b5576111a16106b9565b6110c25b6001600160401b031681526020016106d885600863ffffffff61109416565b151583151514156106eb576114196106ef565b6110c25b6001600160401b0316815260200161070f8561100063ffffffff61109416565b1515831515141561072257611609610726565b6110c25b6001600160401b031681526020016107468561200063ffffffff61109416565b15158315151415610759576116e361075d565b6110c25b6001600160401b0316815260200161077d8561400063ffffffff61109416565b15158315151415610790576117ed610794565b6110c25b6001600160401b031681526020016107b48561800063ffffffff61109416565b151583151514156107c7576119466107cb565b6110c25b6001600160401b031681526020016107ec856204000063ffffffff61109416565b151583151514156107ff57611a93610803565b6110c25b6001600160401b03168152602001610824856210000063ffffffff61109416565b15156001141561083657611bf161083a565b6110c25b6001600160401b0316815260200161085b856220000063ffffffff61109416565b15156001141561086d57611d53610871565b6110c25b6001600160401b03168152602001610892856240000063ffffffff61109416565b1515600114156108a457611e3d6108a8565b6110c25b6001600160401b031681526020016108ca85630100000063ffffffff61109416565b151583151514156108dd57611eff6108e1565b6110c25b6001600160401b0316815260200161090385630200000063ffffffff61109416565b15158315151415610916576120ee61091a565b6110c25b6001600160401b0316815260200161093c85630400000063ffffffff61109416565b1515831515141561094f57612107610953565b6110c25b6001600160401b0316815260200161097585630800000063ffffffff61109416565b15158315151415610988576121e061098c565b6110c25b6001600160401b031681526020016109ae85631000000063ffffffff61109416565b151583151514156109c1576122756109c5565b6110c25b6001600160401b031681526020016109e785638000000063ffffffff61109416565b151583151514156109fa5761231c6109fe565b6110c25b6001600160401b03168152602001610a218564010000000063ffffffff61109416565b15158315151415610a345761247a610a38565b6110c25b6001600160401b03168152602001610a5b8564020000000063ffffffff61109416565b15158315151415610a6e5761255a610a72565b6110c25b6001600160401b03168152602001610a958564400000000063ffffffff61109416565b15158315151415610aa85761267b610aac565b6110c25b6001600160401b03168152602001610acf8564800000000063ffffffff61109416565b15158315151415610ae257612871610ae6565b6110c25b6001600160401b031690529150505b919050565b600082820183811015610b54576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b90505b92915050565b600082610b6c57506000610b57565b82820282848281610b7957fe5b0414610b545760405162461bcd60e51b81526004018080602001828103825260218152602001806151466021913960400191505060405180910390fd5b6000610b5483836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f0000000000008152506129f3565b6000610b5483836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250612a95565b6040805160168082526102e08201909252600091606091829082816020015b6060815260200190600190039081610c59579050509050606082604051908082528060200260200182016040528015610ca657816020015b6060815260200190600190039081610c915790505b50905060005b83811015610d465787600101604051908082528060200260200182016040528015610ce1578160200160208202803883390190505b50838281518110610cee57fe5b602002602001018190525087600101604051908082528060200260200182016040528015610d26578160200160208202803883390190505b50828281518110610d3357fe5b6020908102919091010152600101610cac565b5060005b878111610dc8578651805182908110610d5f57fe5b602002602001015183600081518110610d7457fe5b60200260200101518281518110610d8757fe5b602002602001018181525050600082600081518110610da257fe5b60200260200101518281518110610db557fe5b6020908102919091010152600101610d4a565b5060015b83811015610fb55760005b888111610fac57836001830381518110610ded57fe5b60200260200101518181518110610e0057fe5b6020026020010151848381518110610e1457fe5b60200260200101518281518110610e2757fe5b60200260200101818152505080838381518110610e4057fe5b60200260200101518281518110610e5357fe5b602090810291909101015260015b818111610fa357848381518110610e7457fe5b60200260200101518281518110610e8757fe5b6020026020010151610ef08a8560168110610e9e57fe5b60200201518381518110610eae57fe5b6020026020010151876001870381518110610ec557fe5b602002602001015184860381518110610eda57fe5b6020026020010151610afa90919063ffffffff16565b1115610f9b57610f41898460168110610f0557fe5b60200201518281518110610f1557fe5b6020026020010151866001860381518110610f2c57fe5b602002602001015183850381518110610eda57fe5b858481518110610f4d57fe5b60200260200101518381518110610f6057fe5b602002602001018181525050808203848481518110610f7b57fe5b60200260200101518381518110610f8e57fe5b6020026020010181815250505b600101610e61565b50600101610dd7565b50600101610dcc565b506040805160168082526102e0820190925290602082016102c0803883390190505093508660001984015b811561105c57828181518110610ff257fe5b6020026020010151828151811061100557fe5b6020026020010151820386828151811061101b57fe5b60200260200101818152505082818151811061103357fe5b6020026020010151828151811061104657fe5b6020908102919091010151915060001901610fe0565b5082600185038151811061106c57fe5b6020026020010151888151811061107f57fe5b60200260200101519550505050509250929050565b16151590565b606060006110b387876110ad8888612aef565b86612b66565b915091505b9550959350505050565b60606000836040519080825280602002602001820160405280156110f0578160200160208202803883390190505b50976000975095505050505050565b6060600080845b811580156111145750600081115b1561114b5761113889896111328961046d8c8763ffffffff610b5d16565b88612e65565b935091508161114657600290045b611106565b80611189578560405190808252806020026020018201604052801561117a578160200160208202803883390190505b509350600092506110b8915050565b6111938282612aef565b935050509550959350505050565b60606000807352ae12abe5d8bd778bd5397f99ca900624cfadd46001600160a01b031663bb34534c6040518163ffffffff1660e01b815260040180806c42616e636f724e6574776f726b60981b815250602001905060206040518083038186803b15801561120e57600080fd5b505afa158015611222573d6000803e3d6000fd5b505050506040513d602081101561123857600080fd5b5051905060606112488989613047565b60408051604481018a9052602481019182528251606482015282519293506000926060926001600160a01b038716926207a1209263032125b360e21b9288928f92829160840190602080870191028083838e5b838110156112b357818101518382015260200161129b565b505050509050019350505050604051602081830303815290604052906001600160e01b0319166020820180516001600160e01b0383818316178352505050506040518082805190602001908083835b602083106113215780518252601f199092019160209182019101611302565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d8060008114611382576040519150601f19603f3d011682016040523d82523d6000602084013e611387565b606091505b5091509150816113cc57876040519080825280602002602001820160405280156113bb578160200160208202803883390190505b509550600094506110b89350505050565b60008180602001905160408110156113e357600080fd5b505190506113f1818a612aef565b845161140690620249f063ffffffff610b5d16565b9650965050505050509550959350505050565b60606000808273794e6e91555438afc3ccf1c5076a74f42133d08d6207a120630a2513a960e11b6114526001600160a01b038c16613751565b61145c578a611472565b73c02aaa39b223fe8d0a0e5c4f27ead9083c756cc25b6114848d6001600160a01b0316613751565b61148e578c6114a4565b73c02aaa39b223fe8d0a0e5c4f27ead9083c756cc25b604080516001600160a01b03938416602482015291909216604482015260648082018d905282518083039091018152608490910182526020810180516001600160e01b03166001600160e01b031990941693909317835290518151919290918291908083835b602083106115295780518252601f19909201916020918201910161150a565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d806000811461158a576040519150601f19603f3d011682016040523d82523d6000602084013e61158f565b606091505b5091509150816115d1578560405190808252806020026020018201604052801561117a57816020016020820280388339019050509350600092506110b8915050565b60008180602001905160208110156115e857600080fd5b505190506115f68188612aef565b9a6207a1209a5098505050505050505050565b604080516002808252606082810190935260009183918160200160208202803883390190505090506000805160206151268339815191528160008151811061164d57fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073a0b86991c6218b36c1d19d4a2e9eb0ce3606eb488160018151811061168f57fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506116d273a2b47e3d5c44877cca798226b7b8118f9bfb7a56828a8a8a8a8a61378a565b98620afc8098509650505050505050565b6040805160038082526080820190925260609160009183916020820183803883390190505090506000805160206151268339815191528160008151811061172657fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073a0b86991c6218b36c1d19d4a2e9eb0ce3606eb488160018151811061176857fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073dac17f958d2ee523a2206206994597c13d831ec7816002815181106117aa57fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506116d27352ea46506b9cc5ef470c5bf89f17dc28bb35d85c828a8a8a8a8a61378a565b60408051600480825260a082019092526060916000918391602082016080803883390190505090506000805160206151268339815191528160008151811061183157fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073a0b86991c6218b36c1d19d4a2e9eb0ce3606eb488160018151811061187357fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073dac17f958d2ee523a2206206994597c13d831ec7816002815181106118b557fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506e085d4780b73119b644ae5ecd22b376816003815181106118f257fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506119357345f783cce6b7ff23b2ab2d70e416cdb7d6055f51828a8a8a8a8a61378a565b9862155cc098509650505050505050565b60408051600480825260a082019092526060916000918391602082016080803883390190505090506000805160206151268339815191528160008151811061198a57fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48816001815181106119cc57fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073dac17f958d2ee523a2206206994597c13d831ec781600281518110611a0e57fe5b60200260200101906001600160a01b031690816001600160a01b031681525050734fabb145d64652a948d72533023f6e7a623c7c5381600381518110611a5057fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506119357379a8c46dea5ada233abaffd40f3a0a2b1e5a4f27828a8a8a8a8a61378a565b60408051600480825260a0820190925260609160009183916020820160808038833901905050905060008051602061512683398151915281600081518110611ad757fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4881600181518110611b1957fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073dac17f958d2ee523a2206206994597c13d831ec781600281518110611b5b57fe5b60200260200101906001600160a01b031690816001600160a01b0316815250507357ab1ec28d129707052df4df418d58a2d46d5f5181600381518110611b9d57fe5b60200260200101906001600160a01b031690816001600160a01b031681525050611be073a5407eae9ba41422680e2e00537571bcc53efbfd828a8a8a8a8a61378a565b9862030d4098509650505050505050565b6060600080611c08886001600160a01b0316613751565b158015611c225750611c22876001600160a01b0316613751565b15611c2e575086611c62565b611c40876001600160a01b0316613751565b158015611c5a5750611c5a886001600160a01b0316613751565b15611c625750855b611c74816001600160a01b0316613751565b611d19576000611c83826137af565b90506001600160a01b03811615611d1757611d0c89828a8a8a866001600160a01b031663182df0f56040518163ffffffff1660e01b815260040160206040518083038186803b158015611cd557600080fd5b505afa158015611ce9573d6000803e3d6000fd5b505050506040513d6020811015611cff57600080fd5b50518b62030d40806139a5565b9350935050506110b8565b505b84604051908082528060200260200182016040528015611d43578160200160208202803883390190505b5098600098509650505050505050565b606060006001600160a01b038716600080516020615126833981519152148015611d8a5750611d8a866001600160a01b0316613751565b80611dc45750611da2876001600160a01b0316613751565b8015611dc457506001600160a01b038616600080516020615126833981519152145b15611e0557611dfc877306af07097c9eeb7fd685c692751d5c66db49c215888888611dee84613b00565b896202bf20620271006139a5565b915091506110b8565b836040519080825280602002602001820160405280156110f05781602001602082028038833950919960009950975050505050505050565b6060600080611e54886001600160a01b0316613751565b158015611e6e5750611e6e876001600160a01b0316613751565b15611e7a575086611eae565b611e8c876001600160a01b0316613751565b158015611ea65750611ea6886001600160a01b0316613751565b15611eae5750855b611ec0816001600160a01b0316613751565b611d19576000611ecf82613b14565b90506001600160a01b03811615611d1757611d0c89828a8a8a670de0b6b3a76400008b6204baf0620a39306139a5565b6060600080737079e8517594e5b21d2b9a0d17cb33f5fe2bca706001600160a01b031663d4b839926040518163ffffffff1660e01b815260040160206040518083038186803b158015611f5157600080fd5b505afa158015611f65573d6000803e3d6000fd5b505050506040513d6020811015611f7b57600080fd5b5051604080516001600160a01b038b811660248301528a8116604483015260648083018b905283518084039091018152608490920183526020820180516001600160e01b03166303c2803f60e31b1781529251825194955060009460609492871693620f4240939092918291908083835b6020831061200b5780518252601f199092019160209182019101611fec565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d806000811461206c576040519150601f19603f3d011682016040523d82523d6000602084013e612071565b606091505b5091509150816120b557866040519080825280602002602001820160405280156120a5578160200160208202803883390190505b509450600093506110b892505050565b60008180602001905160208110156120cc57600080fd5b505190506120da8189612aef565b9b620f42409b509950505050505050505050565b606060006110b387876121018888612aef565b86613f3d565b6060600061211d876001600160a01b0316613751565b8061214457506001600160a01b03871673c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2145b8061215c575061215c866001600160a01b0316613751565b8061218357506001600160a01b03861673c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2145b156121be57836040519080825280602002602001820160405280156121b2578160200160208202803883390190505b509150600090506110b8565b6110b38773c02aaa39b223fe8d0a0e5c4f27ead9083c756cc288888888614111565b606060006001600160a01b038716600080516020615126833981519152148061221f57506001600160a01b038616600080516020615126833981519152145b1561225957836040519080825280602002602001820160405280156121b257816020016020820280388339019050509150600090506110b8565b6110b38760008051602061512683398151915288888888614111565b606060006001600160a01b03871673a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4814806122c057506001600160a01b03861673a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48145b156122fa57836040519080825280602002602001820160405280156121b257816020016020820280388339019050509150600090506110b8565b6110b38773a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4888888888614111565b60408051600480825260a082019092526060916000918391602082016080803883390190505090506000805160206151268339815191528160008151811061236057fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48816001815181106123a257fe5b60200260200101906001600160a01b031690816001600160a01b03168152505073dac17f958d2ee523a2206206994597c13d831ec7816002815181106123e457fe5b60200260200101906001600160a01b031690816001600160a01b031681525050738e870d67f660d95d5be530380d0ec0bd388289e18160038151811061242657fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506124697306364f10b501e868329afbc005b3492902d6c763828a8a8a8a8a61378a565b98620f424098509650505050505050565b604080516002808252606082810190935260009183918160200160208202803883390190505090507393054188d876f558f4a66b2ef1d97d16edf0895b816000815181106124c457fe5b60200260200101906001600160a01b031690816001600160a01b031681525050732260fac5e5542a773aa44fbcfedf7c193bc2c5998160018151811061250657fe5b60200260200101906001600160a01b031690816001600160a01b031681525050612549738474c1236f0bc23830a23a41abb81b2764ba9f4f828a8a8a8a8a614153565b986201fbd098509650505050505050565b604080516003808252608082019092526060916000918391602082018380388339019050509050731bbe271d15bb64df0bc6cd28df9ff322f2ebd847816000815181106125a357fe5b60200260200101906001600160a01b031690816001600160a01b031681525050732260fac5e5542a773aa44fbcfedf7c193bc2c599816001815181106125e557fe5b60200260200101906001600160a01b031690816001600160a01b031681525050730316eb71485b0ab14103307bf65a021042c6d3808160028151811061262757fe5b60200260200101906001600160a01b031690816001600160a01b03168152505061266a739726e9314ef1b96e45f40056bed61a088897313e828a8a8a8a8a614153565b986202366898509650505050505050565b604080516001600160a01b03878116602483015286166044820152606480820186905282518083039091018152608490910182526020810180516001600160e01b031663af77fedb60e01b17815291518151606093600093849386937303ef3f37856bd08eb47e2de7abc4ddd2c19b60f29382918083835b602083106127125780518252601f1990920191602091820191016126f3565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855afa9150503d8060008114612772576040519150601f19603f3d011682016040523d82523d6000602084013e612777565b606091505b509150915081158061278857508051155b156127c5578560405190808252806020026020018201604052801561117a57816020016020820280388339019050509350600092506110b8915050565b60008180602001905160208110156127dc57600080fd5b50519050600061280f6001600160a01b038b167303ef3f37856bd08eb47e2de7abc4ddd2c19b60f263ffffffff61416c16565b90508082111561285357876040519080825280602002602001820160405280156113bb57816020016020820280388339019050509550600094506110b89350505050565b61285d8289612aef565b9b620271009b509950505050505050505050565b604080516001600160a01b03878116602483015286166044820152606480820186905282518083039091018152608490910182526020810180516001600160e01b03166334c0570f60e11b178152915181516060936000938493869373a8253a440be331dc4a7395b73948cca6f19dc97d9382918083835b602083106129085780518252601f1990920191602091820191016128e9565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855afa9150503d8060008114612968576040519150601f19603f3d011682016040523d82523d6000602084013e61296d565b606091505b509150915081158061297e57508051155b156129bb578560405190808252806020026020018201604052801561117a57816020016020820280388339019050509350600092506110b8915050565b60008180602001905160208110156129d257600080fd5b505190506129e08188612aef565b9a620493e09a5098505050505050505050565b60008183612a7f5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015612a44578181015183820152602001612a2c565b50505050905090810190601f168015612a715780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b506000838581612a8b57fe5b0495945050505050565b60008184841115612ae75760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315612a44578181015183820152602001612a2c565b505050900390565b606081604051908082528060200260200182016040528015612b1b578160200160208202803883390190505b50905060005b82811015612b5f57612b408361046d866001850163ffffffff610b5d16565b828281518110612b4c57fe5b6020908102919091010152600101612b21565b5092915050565b816000612b7b6001600160a01b038716613751565b612cc857604080516303795fb160e11b81526001600160a01b0388166004820152905160009173c0a47dfe034b400b47bdad5fecda2621de6c4d95916306f2bf6291602480820192602092909190829003018186803b158015612bdd57600080fd5b505afa158015612bf1573d6000803e3d6000fd5b505050506040513d6020811015612c0757600080fd5b505190506001600160a01b038116612c52578251604051908082528060200260200182016040528015612c44578160200160208202803883390190505b50925060009150612e5c9050565b6000612c6d6001600160a01b0389168363ffffffff61416c16565b90506001600160a01b0382163160005b8551811015612cc357612ca48383888481518110612c9757fe5b6020026020010151614216565b868281518110612cb057fe5b6020908102919091010152600101612c7d565b505050505b612cda856001600160a01b0316613751565b612e1557604080516303795fb160e11b81526001600160a01b0387166004820152905160009173c0a47dfe034b400b47bdad5fecda2621de6c4d95916306f2bf6291602480820192602092909190829003018186803b158015612d3c57600080fd5b505afa158015612d50573d6000803e3d6000fd5b505050506040513d6020811015612d6657600080fd5b505190506001600160a01b038116612db0578251604051908082528060200260200182016040528015612c445781602001602082028038833901905050925060009150612e5c9050565b6001600160a01b038082163190600090612dd29089168463ffffffff61416c16565b905060005b8551811015612e1057612df18383888481518110612c9757fe5b868281518110612dfd57fe5b6020908102919091010152600101612dd7565b505050505b81612e28876001600160a01b0316613751565b80612e405750612e40866001600160a01b0316613751565b612e4d57620186a0612e51565b61ea605b90925062ffffff1690505b94509492505050565b60408051600481526024810182526020810180516001600160e01b0316634f61ff8b60e01b178152915181516000938493849360609373818e6fecd516ecc3849daf6845e3ec868087b755936108fc9392918291908083835b60208310612edd5780518252601f199092019160209182019101612ebe565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d8060008114612f3e576040519150601f19603f3d011682016040523d82523d6000602084013e612f43565b606091505b5091509150811580612f5457508051155b15612f68575060009250829150612e5c9050565b6000818060200190516020811015612f7f57600080fd5b50519050612f956001600160a01b038a16613751565b80612fad5750612fad886001600160a01b0316613751565b15612fcb57612fbf818a8a8a8a614278565b94509450505050612e5c565b600080612fef838c73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee8c8c614278565b91509150816000141561300e575060009550859450612e5c9350505050565b6000806130328573eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee8e878e614278565b909e93019c50919a5050505050505050505050565b6060816001600160a01b0316836001600160a01b031614156130785750604080516000815260208101909152610b57565b61308a836001600160a01b0316613751565b156130a75773c0829421c1d260bd3cb3e0f06cfe2d52db2ce31592505b6130b9826001600160a01b0316613751565b156130d65773c0829421c1d260bd3cb3e0f06cfe2d52db2ce31591505b6001600160a01b038316731f573d6fb3f13d689ff844b4ce37794d79a7ff1c148061311d57506001600160a01b038216731f573d6fb3f13d689ff844b4ce37794d79a7ff1c145b156131485760408051600380825260808201909252906020820160608038833901905050905061316a565b60408051600580825260c08201909252906020820160a0803883390190505090505b6000806001600160a01b038516731f573d6fb3f13d689ff844b4ce37794d79a7ff1c14613333576000606073f6e2d7f616b67e46d708e4410746e9aab3a4c518612710636b625ad960e11b6131c76001600160a01b038b16613751565b6131d157896131e7565b731f573d6fb3f13d689ff844b4ce37794d79a7ff1c5b604080516001600160a01b039092166024830152600060448084019190915281518084039091018152606490920181526020820180516001600160e01b03166001600160e01b0319909416939093178352518151919290918291908083835b602083106132655780518252601f199092019160209182019101613246565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d80600081146132c6576040519150601f19603f3d011682016040523d82523d6000602084013e6132cb565b606091505b5091509150816132f35760408051600080825260208201909252905b50945050505050610b57565b80806020019051602081101561330857600080fd5b505193506001600160a01b0384166133305760408051600080825260208201909252906132e7565b50505b6001600160a01b038416731f573d6fb3f13d689ff844b4ce37794d79a7ff1c146134f1576000606073f6e2d7f616b67e46d708e4410746e9aab3a4c518612710636b625ad960e11b61338d6001600160a01b038a16613751565b61339757886133ad565b731f573d6fb3f13d689ff844b4ce37794d79a7ff1c5b604080516001600160a01b039092166024830152600060448084019190915281518084039091018152606490920181526020820180516001600160e01b03166001600160e01b0319909416939093178352518151919290918291908083835b6020831061342b5780518252601f19909201916020918201910161340c565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d806000811461348c576040519150601f19603f3d011682016040523d82523d6000602084013e613491565b606091505b5091509150816134b15760408051600080825260208201909252906132e7565b8080602001905160208110156134c657600080fd5b505192506001600160a01b0383166134ee5760408051600080825260208201909252906132e7565b50505b6001600160a01b038416731f573d6fb3f13d689ff844b4ce37794d79a7ff1c14156135b457848360008151811061352457fe5b60200260200101906001600160a01b031690816001600160a01b031681525050818360018151811061355257fe5b60200260200101906001600160a01b031690816001600160a01b031681525050731f573d6fb3f13d689ff844b4ce37794d79a7ff1c8360028151811061359457fe5b6001600160a01b039092166020928302919091019091015250610b579050565b6001600160a01b038516731f573d6fb3f13d689ff844b4ce37794d79a7ff1c141561365757731f573d6fb3f13d689ff844b4ce37794d79a7ff1c836000815181106135fb57fe5b60200260200101906001600160a01b031690816001600160a01b031681525050808360018151811061362957fe5b60200260200101906001600160a01b031690816001600160a01b031681525050838360028151811061359457fe5b848360008151811061366557fe5b60200260200101906001600160a01b031690816001600160a01b031681525050818360018151811061369357fe5b60200260200101906001600160a01b031690816001600160a01b031681525050731f573d6fb3f13d689ff844b4ce37794d79a7ff1c836002815181106136d557fe5b60200260200101906001600160a01b031690816001600160a01b031681525050808360038151811061370357fe5b60200260200101906001600160a01b031690816001600160a01b031681525050838360048151811061373157fe5b6001600160a01b0390921660209283029190910190910152505092915050565b60006001600160a01b0382161580610b5757506001600160a01b03821673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee1492915050565b60606137a3886307211ef760e01b8989898989896148f1565b98975050505050505050565b60006137c3826001600160a01b0316613751565b156137e35750734ddc2d193948926d02f9b1fe9e1daa0718270ed5610af5565b6001600160a01b038216600080516020615126833981519152141561381d5750735d3a536e4d6dbd6114cc1ead35777bab948e3643610af5565b6001600160a01b038216730d8775f648430679a709e98d2b0cb6250d2887ef141561385d5750736c8c6b02e7b2be14d4fa6022dfd6d75921d90e4e610af5565b6001600160a01b038216731985365e9f78359a9b6ad760e32412f4a445e862141561389d575073158079ee67fce2f58472a96584a73c7ab9ac95c1610af5565b6001600160a01b03821673a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4814156138dd57507339aa39c021dfbae8fac545936693ac917d5e7563610af5565b6001600160a01b038216732260fac5e5542a773aa44fbcfedf7c193bc2c599141561391d575073c11b1268c1a384e55c48c2391d8d480264a3a7f4610af5565b6001600160a01b03821673e41d2489571d322189246dafa5ebde1f4699f498141561395d575073b3319f5d18bc0d84dd1b4825dcde5d5f7266d407610af5565b6001600160a01b03821673dac17f958d2ee523a2206206994597c13d831ec7141561399d575073f650c3d88d12db855b8bf7d11be6c55a4e07dcc9610af5565b506000919050565b606060006139bb8b6001600160a01b0316613751565b1580156139d557506139d5896001600160a01b0316613751565b15613a1657613a0a8a8a613a046139fe8a61046d8e670de0b6b3a764000063ffffffff610b5d16565b8b612aef565b88612b66565b90925084019050613af2565b613a288b6001600160a01b0316613751565b8015613a435750613a41896001600160a01b0316613751565b155b15613ac057613a578b8b613a048b8b612aef565b909250905060005b87811015613ab857613a99670de0b6b3a764000061046d89868581518110613a8357fe5b6020026020010151610b5d90919063ffffffff16565b838281518110613aa557fe5b6020908102919091010152600101613a5f565b508201613af2565b86604051908082528060200260200182016040528015613aea578160200160208202803883390190505b509150600090505b995099975050505050505050565b6000610b5782670de0b6b3a7640000614b1d565b6000613b28826001600160a01b0316613751565b15613b485750733a3a65aab0dd2a17e3f1947ba16138cd37d08c04610af5565b6001600160a01b0382166000805160206151268339815191521415613b82575073fc1e690f61efd961294b3e1ce3313fbd8aa4f85d610af5565b6001600160a01b03821673a0b86991c6218b36c1d19d4a2e9eb0ce3606eb481415613bc25750739ba00d6856a4edf4665bca2c2309936572473b7e610af5565b6001600160a01b0382167357ab1ec28d129707052df4df418d58a2d46d5f511415613c02575073625ae63000f46200499120b906716420bd059240610af5565b6001600160a01b038216734fabb145d64652a948d72533023f6e7a623c7c531415613c425750736ee0f7bb50a54ab5253da0667b0dc2ee526c30a8610af5565b6001600160a01b0382166e085d4780b73119b644ae5ecd22b3761415613c7d5750734da9b813057d04baef4e5800e36083717b4a0341610af5565b6001600160a01b03821673dac17f958d2ee523a2206206994597c13d831ec71415613cbd57507371fc860f7d3a592a4a98740e39db31d25db65ae8610af5565b6001600160a01b038216730d8775f648430679a709e98d2b0cb6250d2887ef1415613cfd575073e1ba0fb44ccb0d11b80f92f4f8ed94ca3ff51d00610af5565b6001600160a01b03821673dd974d5c2e2928dea5f71b9825b8b646686bd2001415613d3d5750739d91be44c06d373a8a226e1f3b146956083803eb610af5565b6001600160a01b0382167380fb784b7ed66730e8b1dbd9820afd29931aab031415613d7d5750737d2d3688df45ce7c552e19c27e007673da9204b8610af5565b6001600160a01b03821673514910771af9ca656af840dff83e8264ecf986ca1415613dbd575073a64bd6c70cb9051f6a9ba1f163fdc07e0dfb5f84610af5565b6001600160a01b038216730f5d2fb29fb7d3cfee444a200298f468908cc9421415613dfd5750736fce4a401b6b80ace52baaefe4421bd188e76f6f610af5565b6001600160a01b038216739f8f72aa9304c8b593d555f12ef6589cc3a579a21415613e3d5750737deb5e830be29f91e298ba5ff1356bb7f8146998610af5565b6001600160a01b038216731985365e9f78359a9b6ad760e32412f4a445e8621415613e7d57507371010a9d003445ac60c4e6a7017c1e89a477b438610af5565b6001600160a01b03821673c011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f1415613ebd575073328c4c80bc7aca0834db37e6600a6c49e12da4de610af5565b6001600160a01b038216732260fac5e5542a773aa44fbcfedf7c193bc2c5991415613efd575073fc4b8ed459e00e5400be803a9bb3954234fd50e3610af5565b6001600160a01b03821673e41d2489571d322189246dafa5ebde1f4699f498141561399d5750736fb0855c404e09c47c3fbca25f08d4e41f9f062f610af5565b606060008351604051908082528060200260200182016040528015613f6c578160200160208202803883390190505b5091506000613f83876001600160a01b0316613751565b613f8d5786613fa3565b73c02aaa39b223fe8d0a0e5c4f27ead9083c756cc25b90506000613fb9876001600160a01b0316613751565b613fc35786613fd9565b73c02aaa39b223fe8d0a0e5c4f27ead9083c756cc25b6040805163e6a4390560e01b81526001600160a01b038581166004830152831660248201529051919250600091735c69bee701ef814a2b6a3edd4b1652cb9cc5aa6f9163e6a43905916044808301926020929190829003018186803b15801561404157600080fd5b505afa158015614055573d6000803e3d6000fd5b505050506040513d602081101561406b57600080fd5b505190506001600160a01b038116156141055760006140996001600160a01b0385168363ffffffff61416c16565b905060006140b66001600160a01b0385168463ffffffff61416c16565b905060005b89518110156140f4576140d583838c8481518110612c9757fe5b8882815181106140e157fe5b60209081029190910101526001016140bb565b5061c3509550612e5c945050505050565b50505094509492505050565b6060600061411f8585612aef565b91506000806141308a8a8688613f3d565b909450915061414189898688613f3d565b909b9201995090975050505050505050565b60606137a388635e0d443f60e01b8989898989896148f1565b600061417783613751565b1561418d57506001600160a01b03811631610b57565b826001600160a01b03166370a08231836040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156141e357600080fd5b505afa1580156141f7573d6000803e3d6000fd5b505050506040513d602081101561420d57600080fd5b50519050610b57565b600061427061424e614230846103e563ffffffff610b5d16565b614242876103e863ffffffff610b5d16565b9063ffffffff610afa16565b61046d6103e5614264868863ffffffff610b5d16565b9063ffffffff610b5d16565b949350505050565b60008061428d866001600160a01b0316613751565b806142a557506142a5856001600160a01b0316613751565b6142f6576040805162461bcd60e51b815260206004820152601f60248201527f4f6e65206f662074686520746f6b656e732073686f756c642062652045544800604482015290519081900360640190fd5b600060606001600160a01b03808a16906216e36090630611aecb60e11b9061431f908c16613751565b614329578a61433f565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee5b6143518b6001600160a01b0316613751565b61435b578a614371565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee5b604080516001600160a01b039384166024820152919092166044820152606481018b905260016084808301919091528251808303909101815260a490910182526020810180516001600160e01b03166001600160e01b031990941693909317835290518151919290918291908083835b602083106144005780518252601f1990920191602091820191016143e1565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d8060008114614461576040519150601f19603f3d011682016040523d82523d6000602084013e614466565b606091505b50915091508161447f5750600092508291506110b89050565b60008082806020019051604081101561449757600080fd5b5080516020909101519092509050806144bb5750600094508493506110b892505050565b7331e085afd48a1d6e51cc193153d625e8f0514c7f6001600160a01b0383161480156144f957506144f78764010000000063ffffffff61109416565b155b8061453d5750731e158c0e93c30d24e918ef83d1e0be23595c3c0f6001600160a01b03831614801561453d575061453b8764020000000063ffffffff61109416565b155b80614581575073053aa84fcc676113a57e0ebb0bd1913839874be46001600160a01b038316148015614581575061457f8764040000000063ffffffff61109416565b155b156145975750600094508493506110b892505050565b6145ac8764010000000063ffffffff61109416565b6146955760408051600481526024810182526020810180516001600160e01b03166345ed957d60e11b178152915181516001600160a01b038616936108fc9392918291908083835b602083106146135780518252601f1990920191602091820191016145f4565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d8060008114614674576040519150601f19603f3d011682016040523d82523d6000602084013e614679565b606091505b509094505083156146955750600094508493506110b892505050565b6146aa8764020000000063ffffffff61109416565b6147935760408051600481526024810182526020810180516001600160e01b0316630dad878f60e21b178152915181516001600160a01b038616936108fc9392918291908083835b602083106147115780518252601f1990920191602091820191016146f2565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d8060008114614772576040519150601f19603f3d011682016040523d82523d6000602084013e614777565b606091505b509094505083156147935750600094508493506110b892505050565b6147a88764040000000063ffffffff61109416565b6148915760408051600481526024810182526020810180516001600160e01b0316634d21dff760e01b178152915181516001600160a01b038616936108fc9392918291908083835b6020831061480f5780518252601f1990920191602091820191016147f0565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d8060008114614870576040519150601f19603f3d011682016040523d82523d6000602084013e614875565b606091505b509094505083156148915750600094508493506110b892505050565b6148dd670de0b6b3a764000061046d6148b28d6001600160a01b0316614c31565b600a0a61046d6148ca8e6001600160a01b0316614c31565b600a0a614264878f63ffffffff610b5d16565b9b620aae609b509950505050505050505050565b6060600080805b89518110156149715789818151811061490d57fe5b60200260200101516001600160a01b0316896001600160a01b03161415614935578060010192505b89818151811061494157fe5b60200260200101516001600160a01b0316886001600160a01b03161415614969578060010191505b6001016148f8565b5081600f0b60001480614987575080600f0b6000145b156149c057846040519080825280602002602001820160405280156149b6578160200160208202803883390190505b50925050506137a3565b600060608c6001600160a01b03168c60018603600186038b6040516024018084600f0b600f0b815260200183600f0b600f0b81526020018281526020019350505050604051602081830303815290604052906001600160e01b0319166020820180516001600160e01b0383818316178352505050506040518082805190602001908083835b60208310614a645780518252601f199092019160209182019101614a45565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855afa9150503d8060008114614ac4576040519150601f19603f3d011682016040523d82523d6000602084013e614ac9565b606091505b50915091506000821580614adc57508151155b614afc57818060200190516020811015614af557600080fd5b5051614aff565b60005b9050614b0b8189612aef565b9e9d5050505050505050505050505050565b60008073197e90f9fad81970ba7976f33cbd77088e5d7cf76001600160a01b03166320aba08b6040518163ffffffff1660e01b815260040160206040518083038186803b158015614b6d57600080fd5b505afa158015614b81573d6000803e3d6000fd5b505050506040513d6020811015614b9757600080fd5b50514211614c1d5773197e90f9fad81970ba7976f33cbd77088e5d7cf76001600160a01b031663c92aecc46040518163ffffffff1660e01b815260040160206040518083038186803b158015614bec57600080fd5b505afa158015614c00573d6000803e3d6000fd5b505050506040513d6020811015614c1657600080fd5b5051614c25565b614c25614e38565b90506142708184614fc7565b6000614c3c82613751565b15614c4957506012610af5565b60408051600481526024810182526020810180516001600160e01b031663313ce56760e01b178152915181516000936060936001600160a01b0388169361271093919290918291908083835b60208310614cb45780518252601f199092019160209182019101614c95565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d8060008114614d15576040519150601f19603f3d011682016040523d82523d6000602084013e614d1a565b606091505b5091509150811580614d2b57508051155b15614e005760408051600481526024810182526020810180516001600160e01b0316632e0f262560e01b178152915181516001600160a01b038816936127109392918291908083835b60208310614d935780518252601f199092019160209182019101614d74565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303818686fa925050503d8060008114614df4576040519150601f19603f3d011682016040523d82523d6000602084013e614df9565b606091505b5090925090505b818015614e0e575060008151115b614e19576012614270565b808060200190516020811015614e2e57600080fd5b5051949350505050565b6000614fc2614f4473197e90f9fad81970ba7976f33cbd77088e5d7cf76001600160a01b031663487bf0826040518163ffffffff1660e01b815260040160206040518083038186803b158015614e8d57600080fd5b505afa158015614ea1573d6000803e3d6000fd5b505050506040513d6020811015614eb757600080fd5b5051604080516320aba08b60e01b8152905173197e90f9fad81970ba7976f33cbd77088e5d7cf7916320aba08b916004808301926020929190829003018186803b158015614f0457600080fd5b505afa158015614f18573d6000803e3d6000fd5b505050506040513d6020811015614f2e57600080fd5b505142036b033b2e3c9fd0803ce8000000614fef565b73197e90f9fad81970ba7976f33cbd77088e5d7cf76001600160a01b031663c92aecc46040518163ffffffff1660e01b815260040160206040518083038186803b158015614f9157600080fd5b505afa158015614fa5573d6000803e3d6000fd5b505050506040513d6020811015614fbb57600080fd5b5051614fc7565b905090565b60006b033b2e3c9fd0803ce8000000614fe084846150ae565b81614fe757fe5b049392505050565b60008380156150905760018416801561500a5785925061500e565b8392505b50600283046002850494505b841561508a57858602868782041461503157600080fd5b8181018181101561504157600080fd5b8581049750600287061561507d57878502858982041415891515161561506657600080fd5b8381018181101561507657600080fd5b8790049550505b505060028504945061501a565b506150a6565b8380156150a057600092506150a4565b8392505b505b509392505050565b60008115806150c9575050808202828282816150c657fe5b04145b610b5757600080fd5b604051806102c001604052806016905b6151238152602001906001900390816150e25790505090565b604051806102c001604052806016905b606081526020019060019003908161510b5790505090565bfefe0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77a265627a7a72315820e43f34a4d7f825dbec0ad6c204ea3ff187ca8158c18f43631ac66101ae9fbcf264736f6c63430005110032 \ No newline at end of file diff --git a/OneSplitView.full.sol b/OneSplitView.full.sol deleted file mode 100644 index 627e9c9..0000000 --- a/OneSplitView.full.sol +++ /dev/null @@ -1,4807 +0,0 @@ - -// File: @openzeppelin/contracts/token/ERC20/IERC20.sol - -pragma solidity ^0.5.0; - -/** - * @dev Interface of the ERC20 standard as defined in the EIP. Does not include - * the optional functions; to access them see {ERC20Detailed}. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -// File: contracts/IOneSplit.sol - -pragma solidity ^0.5.0; - - - -// -// || -// || -// \/ -// +--------------+ -// | OneSplitWrap | -// +--------------+ -// || -// || (delegatecall) -// \/ -// +--------------+ -// | OneSplit | -// +--------------+ -// -// - - -contract IOneSplitConsts { - // flags = FLAG_DISABLE_UNISWAP + FLAG_DISABLE_KYBER + ... - uint256 internal constant FLAG_DISABLE_UNISWAP = 0x01; - uint256 internal constant FLAG_DISABLE_KYBER = 0x02; - uint256 internal constant FLAG_ENABLE_KYBER_UNISWAP_RESERVE = 0x100000000; // Turned off by default - uint256 internal constant FLAG_ENABLE_KYBER_OASIS_RESERVE = 0x200000000; // Turned off by default - uint256 internal constant FLAG_ENABLE_KYBER_BANCOR_RESERVE = 0x400000000; // Turned off by default - uint256 internal constant FLAG_DISABLE_BANCOR = 0x04; - uint256 internal constant FLAG_DISABLE_OASIS = 0x08; - uint256 internal constant FLAG_DISABLE_COMPOUND = 0x10; - uint256 internal constant FLAG_DISABLE_FULCRUM = 0x20; - uint256 internal constant FLAG_DISABLE_CHAI = 0x40; - uint256 internal constant FLAG_DISABLE_AAVE = 0x80; - uint256 internal constant FLAG_DISABLE_SMART_TOKEN = 0x100; - uint256 internal constant FLAG_ENABLE_MULTI_PATH_ETH = 0x200; // Turned off by default - uint256 internal constant FLAG_DISABLE_BDAI = 0x400; - uint256 internal constant FLAG_DISABLE_IEARN = 0x800; - uint256 internal constant FLAG_DISABLE_CURVE_COMPOUND = 0x1000; - uint256 internal constant FLAG_DISABLE_CURVE_USDT = 0x2000; - uint256 internal constant FLAG_DISABLE_CURVE_Y = 0x4000; - uint256 internal constant FLAG_DISABLE_CURVE_BINANCE = 0x8000; - uint256 internal constant FLAG_ENABLE_MULTI_PATH_DAI = 0x10000; // Turned off by default - uint256 internal constant FLAG_ENABLE_MULTI_PATH_USDC = 0x20000; // Turned off by default - uint256 internal constant FLAG_DISABLE_CURVE_SYNTHETIX = 0x40000; - uint256 internal constant FLAG_DISABLE_WETH = 0x80000; - uint256 internal constant FLAG_ENABLE_UNISWAP_COMPOUND = 0x100000; // Works only when one of assets is ETH or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_ENABLE_UNISWAP_CHAI = 0x200000; // Works only when ETH<>DAI or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_ENABLE_UNISWAP_AAVE = 0x400000; // Works only when one of assets is ETH or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_IDLE = 0x800000; - uint256 internal constant FLAG_DISABLE_MOONISWAP = 0x1000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_ALL = 0x1E000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2 = 0x2000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_ETH = 0x4000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_DAI = 0x8000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_USDC = 0x10000000; - uint256 internal constant FLAG_DISABLE_ALL_SPLIT_SOURCES = 0x20000000; - uint256 internal constant FLAG_DISABLE_ALL_WRAP_SOURCES = 0x40000000; - uint256 internal constant FLAG_DISABLE_CURVE_PAX = 0x80000000; - uint256 internal constant FLAG_DISABLE_CURVE_RENBTC = 0x100000000; - uint256 internal constant FLAG_DISABLE_CURVE_TBTC = 0x200000000; - uint256 internal constant FLAG_ENABLE_MULTI_PATH_USDT = 0x400000000; // Turned off by default - uint256 internal constant FLAG_ENABLE_MULTI_PATH_WBTC = 0x800000000; // Turned off by default - uint256 internal constant FLAG_ENABLE_MULTI_PATH_TBTC = 0x1000000000; // Turned off by default - uint256 internal constant FLAG_ENABLE_MULTI_PATH_RENBTC = 0x2000000000; // Turned off by default - uint256 internal constant FLAG_DISABLE_DFORCE_SWAP = 0x4000000000; - uint256 internal constant FLAG_DISABLE_SHELL = 0x8000000000; - uint256 internal constant FLAG_ENABLE_CHI_BURN = 0x10000000000; -} - - -contract IOneSplit is IOneSplitConsts { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ); - - function swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags - ) public payable; -} - -// File: @openzeppelin/contracts/math/SafeMath.sol - -pragma solidity ^0.5.0; - -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint256 a, uint256 b) internal pure returns (uint256) { - uint256 c = a + b; - require(c >= a, "SafeMath: addition overflow"); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - */ - function sub(uint256 a, uint256 b) internal pure returns (uint256) { - return sub(a, b, "SafeMath: subtraction overflow"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on - * overflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot overflow. - * - * _Available since v2.4.0._ - */ - function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b <= a, errorMessage); - uint256 c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on - * overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint256 a, uint256 b) internal pure returns (uint256) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint256 c = a * b; - require(c / a == b, "SafeMath: multiplication overflow"); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint256 a, uint256 b) internal pure returns (uint256) { - return div(a, b, "SafeMath: division by zero"); - } - - /** - * @dev Returns the integer division of two unsigned integers. Reverts with custom message on - * division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint256 c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint256 a, uint256 b) internal pure returns (uint256) { - return mod(a, b, "SafeMath: modulo by zero"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - * - * _Available since v2.4.0._ - */ - function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b != 0, errorMessage); - return a % b; - } -} - -// File: contracts/interface/IUniswapExchange.sol - -pragma solidity ^0.5.0; - - - -interface IUniswapExchange { - function getEthToTokenInputPrice(uint256 ethSold) external view returns (uint256 tokensBought); - - function getTokenToEthInputPrice(uint256 tokensSold) external view returns (uint256 ethBought); - - function ethToTokenSwapInput(uint256 minTokens, uint256 deadline) - external - payable - returns (uint256 tokensBought); - - function tokenToEthSwapInput(uint256 tokensSold, uint256 minEth, uint256 deadline) - external - returns (uint256 ethBought); - - function tokenToTokenSwapInput( - uint256 tokensSold, - uint256 minTokensBought, - uint256 minEthBought, - uint256 deadline, - address tokenAddr - ) external returns (uint256 tokensBought); -} - -// File: contracts/interface/IUniswapFactory.sol - -pragma solidity ^0.5.0; - - - -interface IUniswapFactory { - function getExchange(IERC20 token) external view returns (IUniswapExchange exchange); -} - -// File: contracts/interface/IKyberNetworkContract.sol - -pragma solidity ^0.5.0; - - - -interface IKyberNetworkContract { - function searchBestRate(IERC20 src, IERC20 dest, uint256 srcAmount, bool usePermissionless) - external - view - returns (address reserve, uint256 rate); -} - -// File: contracts/interface/IKyberNetworkProxy.sol - -pragma solidity ^0.5.0; - - - -interface IKyberNetworkProxy { - function getExpectedRate(IERC20 src, IERC20 dest, uint256 srcQty) - external - view - returns (uint256 expectedRate, uint256 slippageRate); - - function tradeWithHint( - IERC20 src, - uint256 srcAmount, - IERC20 dest, - address destAddress, - uint256 maxDestAmount, - uint256 minConversionRate, - address walletId, - bytes calldata hint - ) external payable returns (uint256); - - function kyberNetworkContract() external view returns (IKyberNetworkContract); - - // TODO: Limit usage by tx.gasPrice - // function maxGasPrice() external view returns (uint256); - - // TODO: Limit usage by user cap - // function getUserCapInWei(address user) external view returns (uint256); - // function getUserCapInTokenWei(address user, IERC20 token) external view returns (uint256); -} - -// File: contracts/interface/IKyberUniswapReserve.sol - -pragma solidity ^0.5.0; - - -interface IKyberUniswapReserve { - function uniswapFactory() external view returns (address); -} - -// File: contracts/interface/IKyberOasisReserve.sol - -pragma solidity ^0.5.0; - - -interface IKyberOasisReserve { - function otc() external view returns (address); -} - -// File: contracts/interface/IKyberBancorReserve.sol - -pragma solidity ^0.5.0; - - -contract IKyberBancorReserve { - function bancorEth() public view returns (address); -} - -// File: contracts/interface/IBancorNetwork.sol - -pragma solidity ^0.5.0; - - -interface IBancorNetwork { - function getReturnByPath(address[] calldata path, uint256 amount) - external - view - returns (uint256 returnAmount, uint256 conversionFee); - - function claimAndConvert(address[] calldata path, uint256 amount, uint256 minReturn) - external - returns (uint256); - - function convert(address[] calldata path, uint256 amount, uint256 minReturn) - external - payable - returns (uint256); -} - -// File: contracts/interface/IBancorContractRegistry.sol - -pragma solidity ^0.5.0; - - -contract IBancorContractRegistry { - function addressOf(bytes32 contractName) external view returns (address); -} - -// File: contracts/interface/IBancorConverterRegistry.sol - -pragma solidity ^0.5.0; - - - -interface IBancorConverterRegistry { - - function getConvertibleTokenSmartTokenCount(IERC20 convertibleToken) - external view returns(uint256); - - function getConvertibleTokenSmartTokens(IERC20 convertibleToken) - external view returns(address[] memory); - - function getConvertibleTokenSmartToken(IERC20 convertibleToken, uint256 index) - external view returns(address); - - function isConvertibleTokenSmartToken(IERC20 convertibleToken, address value) - external view returns(bool); -} - -// File: contracts/interface/IBancorEtherToken.sol - -pragma solidity ^0.5.0; - - - -contract IBancorEtherToken is IERC20 { - function deposit() external payable; - - function withdraw(uint256 amount) external; -} - -// File: contracts/interface/IOasisExchange.sol - -pragma solidity ^0.5.0; - - - -interface IOasisExchange { - function getBuyAmount(IERC20 buyGem, IERC20 payGem, uint256 payAmt) - external - view - returns (uint256 fillAmt); - - function sellAllAmount(IERC20 payGem, uint256 payAmt, IERC20 buyGem, uint256 minFillAmount) - external - returns (uint256 fillAmt); -} - -// File: contracts/interface/IWETH.sol - -pragma solidity ^0.5.0; - - - -contract IWETH is IERC20 { - function deposit() external payable; - - function withdraw(uint256 amount) external; -} - -// File: contracts/interface/ICurve.sol - -pragma solidity ^0.5.0; - - -interface ICurve { - // solium-disable-next-line mixedcase - function get_dy_underlying(int128 i, int128 j, uint256 dx) external view returns(uint256 dy); - - // solium-disable-next-line mixedcase - function get_dy(int128 i, int128 j, uint256 dx) external view returns(uint256 dy); - - // solium-disable-next-line mixedcase - function exchange_underlying(int128 i, int128 j, uint256 dx, uint256 minDy) external; - - // solium-disable-next-line mixedcase - function exchange(int128 i, int128 j, uint256 dx, uint256 minDy) external; -} - -// File: contracts/interface/IChai.sol - -pragma solidity ^0.5.0; - - - -interface IPot { - function dsr() external view returns (uint256); - - function chi() external view returns (uint256); - - function rho() external view returns (uint256); - - function drip() external returns (uint256); - - function join(uint256) external; - - function exit(uint256) external; -} - - -contract IChai is IERC20 { - function POT() public view returns (IPot); - - function join(address dst, uint256 wad) external; - - function exit(address src, uint256 wad) external; -} - - -library ChaiHelper { - IPot private constant POT = IPot(0x197E90f9FAD81970bA7976f33CbD77088E5D7cf7); - uint256 private constant RAY = 10**27; - - function _mul(uint256 x, uint256 y) private pure returns (uint256 z) { - require(y == 0 || (z = x * y) / y == x); - } - - function _rmul(uint256 x, uint256 y) private pure returns (uint256 z) { - // always rounds down - z = _mul(x, y) / RAY; - } - - function _rdiv(uint256 x, uint256 y) private pure returns (uint256 z) { - // always rounds down - z = _mul(x, RAY) / y; - } - - function rpow(uint256 x, uint256 n, uint256 base) private pure returns (uint256 z) { - // solium-disable-next-line security/no-inline-assembly - assembly { - switch x - case 0 { - switch n - case 0 { - z := base - } - default { - z := 0 - } - } - default { - switch mod(n, 2) - case 0 { - z := base - } - default { - z := x - } - let half := div(base, 2) // for rounding. - for { - n := div(n, 2) - } n { - n := div(n, 2) - } { - let xx := mul(x, x) - if iszero(eq(div(xx, x), x)) { - revert(0, 0) - } - let xxRound := add(xx, half) - if lt(xxRound, xx) { - revert(0, 0) - } - x := div(xxRound, base) - if mod(n, 2) { - let zx := mul(z, x) - if and(iszero(iszero(x)), iszero(eq(div(zx, x), z))) { - revert(0, 0) - } - let zxRound := add(zx, half) - if lt(zxRound, zx) { - revert(0, 0) - } - z := div(zxRound, base) - } - } - } - } - } - - function potDrip() private view returns (uint256) { - return _rmul(rpow(POT.dsr(), now - POT.rho(), RAY), POT.chi()); - } - - function chaiPrice(IChai chai) internal view returns(uint256) { - return chaiToDai(chai, 1e18); - } - - function daiToChai( - IChai /*chai*/, - uint256 amount - ) internal view returns (uint256) { - uint256 chi = (now > POT.rho()) ? potDrip() : POT.chi(); - return _rdiv(amount, chi); - } - - function chaiToDai( - IChai /*chai*/, - uint256 amount - ) internal view returns (uint256) { - uint256 chi = (now > POT.rho()) ? potDrip() : POT.chi(); - return _rmul(chi, amount); - } -} - -// File: contracts/interface/ICompound.sol - -pragma solidity ^0.5.0; - - - -contract ICompound { - function markets(address cToken) - external - view - returns (bool isListed, uint256 collateralFactorMantissa); -} - - -contract ICompoundToken is IERC20 { - function underlying() external view returns (address); - - function exchangeRateStored() external view returns (uint256); - - function mint(uint256 mintAmount) external returns (uint256); - - function redeem(uint256 redeemTokens) external returns (uint256); -} - - -contract ICompoundEther is IERC20 { - function mint() external payable; - - function redeem(uint256 redeemTokens) external returns (uint256); -} - -// File: contracts/interface/IAaveToken.sol - -pragma solidity ^0.5.0; - - - -contract IAaveToken is IERC20 { - function underlyingAssetAddress() external view returns (IERC20); - - function redeem(uint256 amount) external; -} - - -interface IAaveLendingPool { - function core() external view returns (address); - - function deposit(IERC20 token, uint256 amount, uint16 refCode) external payable; -} - -// File: contracts/interface/IMooniswap.sol - -pragma solidity ^0.5.0; - - - -interface IMooniswapRegistry { - function target() external view returns(IMooniswap); -} - - -interface IMooniswap { - function getReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) - external - view - returns(uint256 returnAmount); - - function swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 minReturn - ) - external - payable - returns(uint256 returnAmount); -} - -// File: @openzeppelin/contracts/utils/Address.sol - -pragma solidity ^0.5.5; - -/** - * @dev Collection of functions related to the address type - */ -library Address { - /** - * @dev Returns true if `account` is a contract. - * - * [IMPORTANT] - * ==== - * It is unsafe to assume that an address for which this function returns - * false is an externally-owned account (EOA) and not a contract. - * - * Among others, `isContract` will return false for the following - * types of addresses: - * - * - an externally-owned account - * - a contract in construction - * - an address where a contract will be created - * - an address where a contract lived, but was destroyed - * ==== - */ - function isContract(address account) internal view returns (bool) { - // According to EIP-1052, 0x0 is the value returned for not-yet created accounts - // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned - // for accounts without code, i.e. `keccak256('')` - bytes32 codehash; - bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; - // solhint-disable-next-line no-inline-assembly - assembly { codehash := extcodehash(account) } - return (codehash != accountHash && codehash != 0x0); - } - - /** - * @dev Converts an `address` into `address payable`. Note that this is - * simply a type cast: the actual underlying value is not changed. - * - * _Available since v2.4.0._ - */ - function toPayable(address account) internal pure returns (address payable) { - return address(uint160(account)); - } - - /** - * @dev Replacement for Solidity's `transfer`: sends `amount` wei to - * `recipient`, forwarding all available gas and reverting on errors. - * - * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost - * of certain opcodes, possibly making contracts go over the 2300 gas limit - * imposed by `transfer`, making them unable to receive funds via - * `transfer`. {sendValue} removes this limitation. - * - * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more]. - * - * IMPORTANT: because control is transferred to `recipient`, care must be - * taken to not create reentrancy vulnerabilities. Consider using - * {ReentrancyGuard} or the - * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern]. - * - * _Available since v2.4.0._ - */ - function sendValue(address payable recipient, uint256 amount) internal { - require(address(this).balance >= amount, "Address: insufficient balance"); - - // solhint-disable-next-line avoid-call-value - (bool success, ) = recipient.call.value(amount)(""); - require(success, "Address: unable to send value, recipient may have reverted"); - } -} - -// File: @openzeppelin/contracts/token/ERC20/SafeERC20.sol - -pragma solidity ^0.5.0; - - - - -/** - * @title SafeERC20 - * @dev Wrappers around ERC20 operations that throw on failure (when the token - * contract returns false). Tokens that return no value (and instead revert or - * throw on failure) are also supported, non-reverting calls are assumed to be - * successful. - * To use this library you can add a `using SafeERC20 for ERC20;` statement to your contract, - * which allows you to call the safe operations as `token.safeTransfer(...)`, etc. - */ -library SafeERC20 { - using SafeMath for uint256; - using Address for address; - - function safeTransfer(IERC20 token, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); - } - - function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); - } - - function safeApprove(IERC20 token, address spender, uint256 value) internal { - // safeApprove should only be called when setting an initial allowance, - // or when resetting it to zero. To increase and decrease it, use - // 'safeIncreaseAllowance' and 'safeDecreaseAllowance' - // solhint-disable-next-line max-line-length - require((value == 0) || (token.allowance(address(this), spender) == 0), - "SafeERC20: approve from non-zero to non-zero allowance" - ); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value)); - } - - function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).add(value); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - function safeDecreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).sub(value, "SafeERC20: decreased allowance below zero"); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - /** - * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement - * on the return value: the return value is optional (but if data is returned, it must not be false). - * @param token The token targeted by the call. - * @param data The call data (encoded using abi.encode or one of its variants). - */ - function callOptionalReturn(IERC20 token, bytes memory data) private { - // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since - // we're implementing it ourselves. - - // A Solidity high level call has three parts: - // 1. The target address is checked to verify it contains contract code - // 2. The call itself is made, and success asserted - // 3. The return value is decoded, which in turn checks the size of the returned data. - // solhint-disable-next-line max-line-length - require(address(token).isContract(), "SafeERC20: call to non-contract"); - - // solhint-disable-next-line avoid-low-level-calls - (bool success, bytes memory returndata) = address(token).call(data); - require(success, "SafeERC20: low-level call failed"); - - if (returndata.length > 0) { // Return data is optional - // solhint-disable-next-line max-line-length - require(abi.decode(returndata, (bool)), "SafeERC20: ERC20 operation did not succeed"); - } - } -} - -// File: contracts/UniversalERC20.sol - -pragma solidity ^0.5.0; - - - - - -library UniversalERC20 { - - using SafeMath for uint256; - using SafeERC20 for IERC20; - - IERC20 private constant ZERO_ADDRESS = IERC20(0x0000000000000000000000000000000000000000); - IERC20 private constant ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - function universalTransfer(IERC20 token, address to, uint256 amount) internal returns(bool) { - if (amount == 0) { - return true; - } - - if (isETH(token)) { - address(uint160(to)).transfer(amount); - } else { - token.safeTransfer(to, amount); - return true; - } - } - - function universalTransferFrom(IERC20 token, address from, address to, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - require(from == msg.sender && msg.value >= amount, "Wrong useage of ETH.universalTransferFrom()"); - if (to != address(this)) { - address(uint160(to)).transfer(amount); - } - if (msg.value > amount) { - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(from, to, amount); - } - } - - function universalTransferFromSenderToThis(IERC20 token, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - if (msg.value > amount) { - // Return remainder if exist - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(msg.sender, address(this), amount); - } - } - - function universalApprove(IERC20 token, address to, uint256 amount) internal { - if (!isETH(token)) { - if (amount > 0 && token.allowance(address(this), to) > 0) { - token.safeApprove(to, 0); - } - token.safeApprove(to, amount); - } - } - - function universalBalanceOf(IERC20 token, address who) internal view returns (uint256) { - if (isETH(token)) { - return who.balance; - } else { - return token.balanceOf(who); - } - } - - function universalDecimals(IERC20 token) internal view returns (uint256) { - - if (isETH(token)) { - return 18; - } - - (bool success, bytes memory data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("decimals()") - ); - if (!success || data.length == 0) { - (success, data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("DECIMALS()") - ); - } - - return (success && data.length > 0) ? abi.decode(data, (uint256)) : 18; - } - - function isETH(IERC20 token) internal pure returns(bool) { - return (address(token) == address(ZERO_ADDRESS) || address(token) == address(ETH_ADDRESS)); - } - - function notExist(IERC20 token) internal pure returns(bool) { - return (address(token) == address(-1)); - } -} - -// File: contracts/interface/IUniswapV2Exchange.sol - -pragma solidity ^0.5.0; - - - - - -interface IUniswapV2Exchange { - function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external; -} - - -library UniswapV2ExchangeLib { - using SafeMath for uint256; - using UniversalERC20 for IERC20; - - function getReturn( - IUniswapV2Exchange exchange, - IERC20 fromToken, - IERC20 toToken, - uint amountIn - ) internal view returns (uint256) { - uint256 reserveIn = fromToken.universalBalanceOf(address(exchange)); - uint256 reserveOut = toToken.universalBalanceOf(address(exchange)); - - uint256 amountInWithFee = amountIn.mul(997); - uint256 numerator = amountInWithFee.mul(reserveOut); - uint256 denominator = reserveIn.mul(1000).add(amountInWithFee); - return (denominator == 0) ? 0 : numerator.div(denominator); - } -} - -// File: contracts/interface/IUniswapV2Factory.sol - -pragma solidity ^0.5.0; - - - -interface IUniswapV2Factory { - function getPair(IERC20 tokenA, IERC20 tokenB) external view returns (IUniswapV2Exchange pair); -} - -// File: contracts/interface/IDForceSwap.sol - -pragma solidity ^0.5.0; - - - -interface IDForceSwap { - function getAmountByInput(IERC20 input, IERC20 output, uint256 amount) external view returns(uint256); - function swap(IERC20 input, IERC20 output, uint256 amount) external; -} - -// File: contracts/interface/IShell.sol - -pragma solidity ^0.5.0; - - -interface IShell { - function viewOriginTrade( - address origin, - address target, - uint256 originAmount - ) external view returns (uint256); - - function swapByOrigin( - address origin, - address target, - uint256 originAmount, - uint256 minTargetAmount, - uint256 deadline - ) external returns (uint256); -} - -// File: contracts/OneSplitBase.sol - -pragma solidity ^0.5.0; - - - - - - - - - -//import "./interface/IBancorNetworkPathFinder.sol"; - - - - - - - - - - - - - - - - -contract IOneSplitView is IOneSplitConsts { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ); -} - - -library DisableFlags { - function check(uint256 flags, uint256 flag) internal pure returns(bool) { - return (flags & flag) != 0; - } -} - - -contract OneSplitRoot { - using SafeMath for uint256; - using DisableFlags for uint256; - - using UniversalERC20 for IERC20; - using UniversalERC20 for IWETH; - using UniversalERC20 for IBancorEtherToken; - using UniswapV2ExchangeLib for IUniswapV2Exchange; - using ChaiHelper for IChai; - - uint256 constant public DEXES_COUNT = 22; - IERC20 constant internal ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - IERC20 constant internal dai = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); - IERC20 constant internal bnt = IERC20(0x1F573D6Fb3F13d689FF844B4cE37794d79a7FF1C); - IERC20 constant internal usdc = IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); - IERC20 constant internal usdt = IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); - IERC20 constant internal tusd = IERC20(0x0000000000085d4780B73119b644AE5ecd22b376); - IERC20 constant internal busd = IERC20(0x4Fabb145d64652a948d72533023f6E7A623C7C53); - IERC20 constant internal susd = IERC20(0x57Ab1ec28D129707052df4dF418D58a2D46d5f51); - IERC20 constant internal pax = IERC20(0x8E870D67F660D95d5be530380D0eC0bd388289E1); - IWETH constant internal weth = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); - IBancorEtherToken constant internal bancorEtherToken = IBancorEtherToken(0xc0829421C1d260BD3cB3E0F06cfE2D52db2cE315); - IChai constant internal chai = IChai(0x06AF07097C9Eeb7fD685c692751D5C66dB49c215); - IERC20 constant internal renbtc = IERC20(0x93054188d876f558f4a66B2EF1d97d16eDf0895B); - IERC20 constant internal wbtc = IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); - IERC20 constant internal tbtc = IERC20(0x1bBE271d15Bb64dF0bc6CD28Df9Ff322F2eBD847); - IERC20 constant internal hbtc = IERC20(0x0316EB71485b0Ab14103307bf65a021042c6d380); - - IKyberNetworkProxy constant internal kyberNetworkProxy = IKyberNetworkProxy(0x818E6FECD516Ecc3849DAf6845e3EC868087B755); - IUniswapFactory constant internal uniswapFactory = IUniswapFactory(0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95); - IBancorContractRegistry constant internal bancorContractRegistry = IBancorContractRegistry(0x52Ae12ABe5D8BD778BD5397F99cA900624CfADD4); - //IBancorNetworkPathFinder constant internal bancorNetworkPathFinder = IBancorNetworkPathFinder(0x6F0cD8C4f6F06eAB664C7E3031909452b4B72861); - IBancorConverterRegistry constant internal bancorConverterRegistry = IBancorConverterRegistry(0xf6E2D7F616B67E46D708e4410746E9AAb3a4C518); - IOasisExchange constant internal oasisExchange = IOasisExchange(0x794e6e91555438aFc3ccF1c5076A74F42133d08D); - ICurve constant internal curveCompound = ICurve(0xA2B47E3D5c44877cca798226B7B8118F9BFb7A56); - ICurve constant internal curveUsdt = ICurve(0x52EA46506B9CC5Ef470C5bf89f17Dc28bB35D85C); - ICurve constant internal curveY = ICurve(0x45F783CCE6B7FF23B2ab2D70e416cdb7D6055f51); - ICurve constant internal curveBinance = ICurve(0x79a8C46DeA5aDa233ABaFFD40F3A0A2B1e5A4F27); - ICurve constant internal curveSynthetix = ICurve(0xA5407eAE9Ba41422680e2e00537571bcC53efBfD); - ICurve constant internal curvePax = ICurve(0x06364f10B501e868329afBc005b3492902d6C763); - ICurve constant internal curveRenBtc = ICurve(0x8474c1236F0Bc23830A23a41aBB81B2764bA9f4F); - ICurve constant internal curveTBtc = ICurve(0x9726e9314eF1b96E45f40056bEd61A088897313E); - IShell constant internal shell = IShell(0xA8253a440Be331dC4a7395B73948cCa6F19Dc97D); - IAaveLendingPool constant internal aave = IAaveLendingPool(0x398eC7346DcD622eDc5ae82352F02bE94C62d119); - ICompound constant internal compound = ICompound(0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B); - ICompoundEther constant internal cETH = ICompoundEther(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5); - IMooniswapRegistry constant internal mooniswapRegistry = IMooniswapRegistry(0x7079E8517594e5b21d2B9a0D17cb33F5FE2bca70); - IUniswapV2Factory constant internal uniswapV2 = IUniswapV2Factory(0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f); - IDForceSwap constant internal dforceSwap = IDForceSwap(0x03eF3f37856bD08eb47E2dE7ABc4Ddd2c19B60F2); - - function _buildBancorPath( - IERC20 fromToken, - IERC20 toToken - ) internal view returns(address[] memory path) { - if (fromToken == toToken) { - return new address[](0); - } - - if (fromToken.isETH()) { - fromToken = bancorEtherToken; - } - if (toToken.isETH()) { - toToken = bancorEtherToken; - } - - if (fromToken == bnt || toToken == bnt) { - path = new address[](3); - } else { - path = new address[](5); - } - - address fromConverter; - address toConverter; - - if (fromToken != bnt) { - (bool success, bytes memory data) = address(bancorConverterRegistry).staticcall.gas(10000)(abi.encodeWithSelector( - bancorConverterRegistry.getConvertibleTokenSmartToken.selector, - fromToken.isETH() ? bnt : fromToken, - 0 - )); - if (!success) { - return new address[](0); - } - - fromConverter = abi.decode(data, (address)); - if (fromConverter == address(0)) { - return new address[](0); - } - } - - if (toToken != bnt) { - (bool success, bytes memory data) = address(bancorConverterRegistry).staticcall.gas(10000)(abi.encodeWithSelector( - bancorConverterRegistry.getConvertibleTokenSmartToken.selector, - toToken.isETH() ? bnt : toToken, - 0 - )); - if (!success) { - return new address[](0); - } - - toConverter = abi.decode(data, (address)); - if (toConverter == address(0)) { - return new address[](0); - } - } - - if (toToken == bnt) { - path[0] = address(fromToken); - path[1] = fromConverter; - path[2] = address(bnt); - return path; - } - - if (fromToken == bnt) { - path[0] = address(bnt); - path[1] = toConverter; - path[2] = address(toToken); - return path; - } - - path[0] = address(fromToken); - path[1] = fromConverter; - path[2] = address(bnt); - path[3] = toConverter; - path[4] = address(toToken); - return path; - } - - function _getCompoundToken(IERC20 token) internal pure returns(ICompoundToken) { - if (token.isETH()) { // ETH - return ICompoundToken(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5); - } - if (token == IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F)) { // DAI - return ICompoundToken(0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643); - } - if (token == IERC20(0x0D8775F648430679A709E98d2b0Cb6250d2887EF)) { // BAT - return ICompoundToken(0x6C8c6b02E7b2BE14d4fA6022Dfd6d75921D90E4E); - } - if (token == IERC20(0x1985365e9f78359a9B6AD760e32412f4a445E862)) { // REP - return ICompoundToken(0x158079Ee67Fce2f58472A96584A73C7Ab9AC95c1); - } - if (token == IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48)) { // USDC - return ICompoundToken(0x39AA39c021dfbaE8faC545936693aC917d5E7563); - } - if (token == IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599)) { // WBTC - return ICompoundToken(0xC11b1268C1A384e55C48c2391d8d480264A3A7F4); - } - if (token == IERC20(0xE41d2489571d322189246DaFA5ebDe1F4699F498)) { // ZRX - return ICompoundToken(0xB3319f5D18Bc0D84dD1b4825Dcde5d5f7266d407); - } - if (token == IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7)) { // USDT - return ICompoundToken(0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9); - } - - return ICompoundToken(0); - } - - function _getAaveToken(IERC20 token) internal pure returns(IAaveToken) { - if (token.isETH()) { // ETH - return IAaveToken(0x3a3A65aAb0dd2A17E3F1947bA16138cd37d08c04); - } - if (token == IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F)) { // DAI - return IAaveToken(0xfC1E690f61EFd961294b3e1Ce3313fBD8aa4f85d); - } - if (token == IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48)) { // USDC - return IAaveToken(0x9bA00D6856a4eDF4665BcA2C2309936572473B7E); - } - if (token == IERC20(0x57Ab1ec28D129707052df4dF418D58a2D46d5f51)) { // SUSD - return IAaveToken(0x625aE63000f46200499120B906716420bd059240); - } - if (token == IERC20(0x4Fabb145d64652a948d72533023f6E7A623C7C53)) { // BUSD - return IAaveToken(0x6Ee0f7BB50a54AB5253dA0667B0Dc2ee526C30a8); - } - if (token == IERC20(0x0000000000085d4780B73119b644AE5ecd22b376)) { // TUSD - return IAaveToken(0x4DA9b813057D04BAef4e5800E36083717b4a0341); - } - if (token == IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7)) { // USDT - return IAaveToken(0x71fc860F7D3A592A4a98740e39dB31d25db65ae8); - } - if (token == IERC20(0x0D8775F648430679A709E98d2b0Cb6250d2887EF)) { // BAT - return IAaveToken(0xE1BA0FB44CCb0D11b80F92f4f8Ed94CA3fF51D00); - } - if (token == IERC20(0xdd974D5C2e2928deA5F71b9825b8b646686BD200)) { // KNC - return IAaveToken(0x9D91BE44C06d373a8a226E1f3b146956083803eB); - } - if (token == IERC20(0x80fB784B7eD66730e8b1DBd9820aFD29931aab03)) { // LEND - return IAaveToken(0x7D2D3688Df45Ce7C552E19c27e007673da9204B8); - } - if (token == IERC20(0x514910771AF9Ca656af840dff83E8264EcF986CA)) { // LINK - return IAaveToken(0xA64BD6C70Cb9051F6A9ba1F163Fdc07E0DfB5F84); - } - if (token == IERC20(0x0F5D2fB29fb7d3CFeE444a200298f468908cC942)) { // MANA - return IAaveToken(0x6FCE4A401B6B80ACe52baAefE4421Bd188e76F6f); - } - if (token == IERC20(0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2)) { // MKR - return IAaveToken(0x7deB5e830be29F91E298ba5FF1356BB7f8146998); - } - if (token == IERC20(0x1985365e9f78359a9B6AD760e32412f4a445E862)) { // REP - return IAaveToken(0x71010A9D003445aC60C4e6A7017c1E89A477B438); - } - if (token == IERC20(0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F)) { // SNX - return IAaveToken(0x328C4c80BC7aCa0834Db37e6600A6c49E12Da4DE); - } - if (token == IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599)) { // WBTC - return IAaveToken(0xFC4B8ED459e00e5400be803A9BB3954234FD50e3); - } - if (token == IERC20(0xE41d2489571d322189246DaFA5ebDe1F4699F498)) { // ZRX - return IAaveToken(0x6Fb0855c404E09c47C3fBCA25f08d4E41f9F062f); - } - - return IAaveToken(0); - } - - function _infiniteApproveIfNeeded(IERC20 token, address to) internal { - if (!token.isETH()) { - if ((token.allowance(address(this), to) >> 255) == 0) { - token.universalApprove(to, uint256(- 1)); - } - } - } -} - - -contract OneSplitViewWrapBase is IOneSplitView, OneSplitRoot { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - return _getExpectedReturnFloor( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function _getExpectedReturnFloor( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - internal - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ); -} - - -contract OneSplitView is IOneSplitView, OneSplitRoot { - function _findBestDistribution( - uint256 s, // parts - uint256[][DEXES_COUNT] memory amounts // exchangesReturns - ) internal pure returns(uint256 returnAmount, uint256[] memory distribution) { - uint256 n = amounts.length; - - uint256[][] memory answer = new uint256[][](n); // int[n][s+1] - uint256[][] memory parent = new uint256[][](n); // int[n][s+1] - - for (uint i = 0; i < n; i++) { - answer[i] = new uint256[](s + 1); - parent[i] = new uint256[](s + 1); - } - - for (uint j = 0; j <= s; j++) { - answer[0][j] = amounts[0][j]; - parent[0][j] = 0; - } - - for (uint i = 1; i < n; i++) { - for (uint j = 0; j <= s; j++) { - answer[i][j] = answer[i - 1][j]; - parent[i][j] = j; - - for (uint k = 1; k <= j; k++) { - if (answer[i - 1][j - k].add(amounts[i][k]) > answer[i][j]) { - answer[i][j] = answer[i - 1][j - k].add(amounts[i][k]); - parent[i][j] = j - k; - } - } - } - } - - distribution = new uint256[](DEXES_COUNT); - - uint256 partsLeft = s; - for (uint curExchange = n - 1; partsLeft > 0; curExchange--) { - distribution[curExchange] = partsLeft - parent[curExchange][partsLeft]; - partsLeft = parent[curExchange][partsLeft]; - } - - returnAmount = answer[n - 1][s]; - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnRespectingGas( - fromToken, - toToken, - amount, - parts, - flags, - 0 - ); - } - - function log(uint256, uint256[] calldata) external view { - } - - function getExpectedReturnRespectingGas( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 toTokenEthPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - distribution = new uint256[](DEXES_COUNT); - - if (fromToken == toToken) { - return (amount, 0, distribution); - } - - function(IERC20,IERC20,uint256,uint256,uint256) view returns(uint256[] memory, uint256)[DEXES_COUNT] memory reserves = _getAllReserves(flags); - - uint256[][DEXES_COUNT] memory matrix; - for (uint i = 0; i < DEXES_COUNT; i++) { - uint256 gas; - (matrix[i], gas) = reserves[i](fromToken, toToken, amount, parts, flags); - estimateGasAmount = estimateGasAmount.add(gas); - this.log(gas, matrix[i]); - - // Prepend zero - uint256[] memory newLine = new uint256[](parts + 1); - for (uint j = parts; j > 0; i++) { - newLine[j] = matrix[i][j - 1]; - } - matrix[i] = newLine; - - // Substract gas from first part - uint256 toGas = gas.mul(toTokenEthPrice).div(1e18); - if (matrix[i][0] > toGas) { - matrix[i][0] = matrix[i][0].sub(toGas); - } else { - matrix[i][0] = 0; - } - } - - (returnAmount, distribution) = _findBestDistribution(parts, matrix); - - // Recalculate exact returnAmount - returnAmount = 0; - for (uint i = 0; i < DEXES_COUNT; i++) { - uint256 volume = amount.mul(distribution[i]).div(parts); - (uint256[] memory res,) = reserves[i](fromToken, toToken, volume, 1, flags); - returnAmount = returnAmount.add(res[0]); - } - } - - function _getAllReserves(uint256 flags) - internal - pure - returns(function(IERC20,IERC20,uint256,uint256,uint256) view returns(uint256[] memory, uint256)[DEXES_COUNT] memory) - { - bool invert = flags.check(FLAG_DISABLE_ALL_SPLIT_SOURCES); - return [ - invert != flags.check(FLAG_DISABLE_UNISWAP) ? _calculateNoReturn : calculateUniswapReturn, - invert != flags.check(FLAG_DISABLE_KYBER) ? _calculateNoReturn : calculateKyberReturn, - invert != flags.check(FLAG_DISABLE_BANCOR) ? _calculateNoReturn : calculateBancorReturn, - invert != flags.check(FLAG_DISABLE_OASIS) ? _calculateNoReturn : calculateOasisReturn, - invert != flags.check(FLAG_DISABLE_CURVE_COMPOUND) ? _calculateNoReturn : calculateCurveCompound, - invert != flags.check(FLAG_DISABLE_CURVE_USDT) ? _calculateNoReturn : calculateCurveUsdt, - invert != flags.check(FLAG_DISABLE_CURVE_Y) ? _calculateNoReturn : calculateCurveY, - invert != flags.check(FLAG_DISABLE_CURVE_BINANCE) ? _calculateNoReturn : calculateCurveBinance, - invert != flags.check(FLAG_DISABLE_CURVE_SYNTHETIX) ? _calculateNoReturn : calculateCurveSynthetix, - (true) != flags.check(FLAG_ENABLE_UNISWAP_COMPOUND) ? _calculateNoReturn : calculateUniswapCompound, - (true) != flags.check(FLAG_ENABLE_UNISWAP_CHAI) ? _calculateNoReturn : calculateUniswapChai, - (true) != flags.check(FLAG_ENABLE_UNISWAP_AAVE) ? _calculateNoReturn : calculateUniswapAave, - invert != flags.check(FLAG_DISABLE_MOONISWAP) ? _calculateNoReturn : calculateMooniswap, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2) ? _calculateNoReturn : calculateUniswapV2, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_ETH) ? _calculateNoReturn : calculateUniswapV2ETH, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_DAI) ? _calculateNoReturn : calculateUniswapV2DAI, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_USDC) ? _calculateNoReturn : calculateUniswapV2USDC, - invert != flags.check(FLAG_DISABLE_CURVE_PAX) ? _calculateNoReturn : calculateCurvePax, - invert != flags.check(FLAG_DISABLE_CURVE_RENBTC) ? _calculateNoReturn : calculateCurveRenBtc, - invert != flags.check(FLAG_DISABLE_CURVE_TBTC) ? _calculateNoReturn : calculateCurveTBtc, - invert != flags.check(FLAG_DISABLE_DFORCE_SWAP) ? _calculateNoReturn : calculateDforceSwap, - invert != flags.check(FLAG_DISABLE_SHELL) ? _calculateNoReturn : calculateShell - ]; - } - - function _calculateNoGas( - IERC20 /*fromToken*/, - IERC20 /*destToken*/, - uint256 /*amount*/, - uint256 /*parts*/, - uint256 /*toTokenEthPrice*/, - uint256 /*flags*/, - uint256 /*destTokenEthPrice*/ - ) internal view returns(uint256[] memory /*rets*/, uint256 /*gas*/) { - this; - } - - // View Helpers - - function _linearInterpolation( - uint256 value, - uint256 parts - ) internal pure returns(uint256[] memory rets) { - rets = new uint256[](parts); - for (uint i = 0; i < parts; i++) { - rets[i] = value.mul(i + 1).div(parts); - } - } - - function _calculateCurveSelector( - ICurve curve, - bytes4 sel, - IERC20[] memory tokens, - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets) { - int128 i = 0; - int128 j = 0; - for (uint t = 0; t < tokens.length; t++) { - if (fromToken == tokens[t]) { - i = int128(t + 1); - } - if (destToken == tokens[t]) { - j = int128(t + 1); - } - } - - if (i == 0 || j == 0) { - return new uint256[](parts); - } - - // curve.get_dy(i - 1, j - 1, amount); - // curve.get_dy_underlying(i - 1, j - 1, amount); - (bool success, bytes memory data) = address(curve).staticcall(abi.encodeWithSelector(sel, i - 1, j - 1, amount)); - uint256 maxRet = (!success || data.length == 0) ? 0 : abi.decode(data, (uint256)); - - return _linearInterpolation(maxRet, parts); - } - - function _calculateCurveUnderlying( - ICurve curve, - IERC20[] memory tokens, - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets) { - return _calculateCurveSelector( - curve, - curve.get_dy_underlying.selector, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ); - } - - function _calculateCurve( - ICurve curve, - IERC20[] memory tokens, - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets) { - return _calculateCurveSelector( - curve, - curve.get_dy.selector, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ); - } - - function calculateCurveCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](2); - tokens[0] = dai; - tokens[1] = usdc; - return (_calculateCurveUnderlying( - curveCompound, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ), 720_000); - } - - function calculateCurveUsdt( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](3); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - return (_calculateCurveUnderlying( - curveUsdt, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ), 720_000); - } - - function calculateCurveY( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = tusd; - return (_calculateCurveUnderlying( - curveY, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ), 1_400_000); - } - - function calculateCurveBinance( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = busd; - return (_calculateCurveUnderlying( - curveBinance, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ), 1_400_000); - } - - function calculateCurveSynthetix( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = susd; - return (_calculateCurveUnderlying( - curveSynthetix, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ), 200_000); - } - - function calculateCurvePax( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = pax; - return (_calculateCurveUnderlying( - curvePax, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ), 1_000_000); - } - - function calculateCurveRenBtc( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](2); - tokens[0] = renbtc; - tokens[1] = wbtc; - return (_calculateCurve( - curveRenBtc, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ), 130_000); - } - - function calculateCurveTBtc( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](3); - tokens[0] = tbtc; - tokens[1] = wbtc; - tokens[2] = hbtc; - return (_calculateCurve( - curveTBtc, - tokens, - fromToken, - destToken, - amount, - parts, - flags - ), 145_000); - } - - function calculateShell( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - (bool success, bytes memory data) = address(shell).staticcall(abi.encodeWithSelector( - shell.viewOriginTrade.selector, - fromToken, - destToken, - amount - )); - - if (!success || data.length == 0) { - return (new uint256[](parts), 0); - } - - uint256 maxRet = abi.decode(data, (uint256)); - return (_linearInterpolation(maxRet, parts), 300_000); - } - - function calculateDforceSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - (bool success, bytes memory data) = address(dforceSwap).staticcall( - abi.encodeWithSelector( - dforceSwap.getAmountByInput.selector, - fromToken, - destToken, - amount - ) - ); - if (!success || data.length == 0) { - return (new uint256[](parts), 0); - } - - uint256 maxRet = abi.decode(data, (uint256)); - uint256 available = destToken.universalBalanceOf(address(dforceSwap)); - if (maxRet > available) { - return (new uint256[](parts), 0); - } - - return (_linearInterpolation(maxRet, parts), 160_000); - } - - function _calculateUniswapFormula(uint256 fromBalance, uint256 toBalance, uint256 amount) internal pure returns(uint256) { - return amount.mul(toBalance).mul(997).div( - fromBalance.mul(1000).add(amount.mul(997)) - ); - } - - function _calculateUniswapReturn( - IERC20 fromToken, - IERC20 toToken, - uint256[] memory amounts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = amounts; - - if (!fromToken.isETH()) { - IUniswapExchange fromExchange = uniswapFactory.getExchange(fromToken); - if (fromExchange == IUniswapExchange(0)) { - return (new uint256[](rets.length), 0); - } - - uint256 fromTokenBalance = fromToken.universalBalanceOf(address(fromExchange)); - uint256 fromEtherBalance = address(fromExchange).balance; - - for (uint i = 0; i < rets.length; i++) { - rets[i] = _calculateUniswapFormula(fromTokenBalance, fromEtherBalance, rets[i]); - } - } - - if (!toToken.isETH()) { - IUniswapExchange toExchange = uniswapFactory.getExchange(toToken); - if (toExchange == IUniswapExchange(0)) { - return (new uint256[](rets.length), 0); - } - - uint256 toEtherBalance = address(toExchange).balance; - uint256 toTokenBalance = toToken.universalBalanceOf(address(toExchange)); - - for (uint i = 0; i < rets.length; i++) { - rets[i] = _calculateUniswapFormula(toEtherBalance, toTokenBalance, rets[i]); - } - } - - return (rets, fromToken.isETH() || toToken.isETH() ? 60_000 : 100_000); - } - - function calculateUniswapReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateUniswapReturn( - fromToken, - destToken, - _linearInterpolation(amount, parts), - flags - ); - } - - function _calculateUniswapWrapped( - IERC20 fromToken, - IERC20 midToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 midTokenPrice, - uint256 flags, - uint256 gas1, - uint256 gas2 - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (!fromToken.isETH() && destToken.isETH()) { - (rets, gas) = _calculateUniswapReturn( - midToken, - destToken, - _linearInterpolation(amount.mul(1e18).div(midTokenPrice), parts), - flags - ); - return (rets, gas + gas1); - } - else if (fromToken.isETH() && !destToken.isETH()) { - (rets, gas) = _calculateUniswapReturn( - fromToken, - midToken, - _linearInterpolation(amount, parts), - flags - ); - - for (uint i = 0; i < parts; i++) { - rets[i] = rets[i].mul(midTokenPrice).div(1e18); - } - return (rets, gas + gas2); - } - - return (new uint256[](parts), 0); - } - - function calculateUniswapCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20 midPreToken; - if (!fromToken.isETH() && destToken.isETH()) { - midPreToken = fromToken; - } - else if (!destToken.isETH() && fromToken.isETH()) { - midPreToken = destToken; - } - - if (!midPreToken.isETH()) { - ICompoundToken midToken = _getCompoundToken(midPreToken); - if (midToken != ICompoundToken(0)) { - return _calculateUniswapWrapped( - fromToken, - midToken, - destToken, - amount, - parts, - midToken.exchangeRateStored(), - flags, - 200_000, - 200_000 - ); - } - } - - return (new uint256[](parts), 0); - } - - function calculateUniswapChai( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == dai && destToken.isETH() || - fromToken.isETH() && destToken == dai) - { - return _calculateUniswapWrapped( - fromToken, - chai, - destToken, - amount, - parts, - chai.chaiPrice(), - flags, - 180_000, - 160_000 - ); - } - - return (new uint256[](parts), 0); - } - - function calculateUniswapAave( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20 midPreToken; - if (!fromToken.isETH() && destToken.isETH()) { - midPreToken = fromToken; - } - else if (!destToken.isETH() && fromToken.isETH()) { - midPreToken = destToken; - } - - if (!midPreToken.isETH()) { - IAaveToken midToken = _getAaveToken(midPreToken); - if (midToken != IAaveToken(0)) { - return _calculateUniswapWrapped( - fromToken, - midToken, - destToken, - amount, - parts, - 1e18, - flags, - 310_000, - 670_000 - ); - } - } - - return (new uint256[](parts), 0); - } - - function _calculateKyberReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 flags - ) internal view returns(uint256 returnAmount, uint256 gas) { - (bool success, bytes memory data) = address(kyberNetworkProxy).staticcall.gas(2300)(abi.encodeWithSelector( - kyberNetworkProxy.kyberNetworkContract.selector - )); - if (!success || data.length == 0) { - return (0, 0); - } - - IKyberNetworkContract kyberNetworkContract = IKyberNetworkContract(abi.decode(data, (address))); - - if (fromToken.isETH() || toToken.isETH()) { - return _calculateKyberReturnWithEth(kyberNetworkContract, fromToken, toToken, amount, flags); - } - - (uint256 value, uint256 gasFee) = _calculateKyberReturnWithEth(kyberNetworkContract, fromToken, ETH_ADDRESS, amount, flags); - if (value == 0) { - return (0, 0); - } - - (uint256 value2, uint256 gasFee2) = _calculateKyberReturnWithEth(kyberNetworkContract, ETH_ADDRESS, toToken, value, flags); - return (value2, gasFee + gasFee2); - } - - function _calculateKyberReturnWithEth( - IKyberNetworkContract kyberNetworkContract, - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 flags - ) internal view returns(uint256 returnAmount, uint256 gas) { - require(fromToken.isETH() || toToken.isETH(), "One of the tokens should be ETH"); - - (bool success, bytes memory data) = address(kyberNetworkContract).staticcall.gas(1500000)(abi.encodeWithSelector( - kyberNetworkContract.searchBestRate.selector, - fromToken.isETH() ? ETH_ADDRESS : fromToken, - toToken.isETH() ? ETH_ADDRESS : toToken, - amount, - true - )); - if (!success) { - return (0, 0); - } - - (address reserve, uint256 ret) = abi.decode(data, (address,uint256)); - - if (ret == 0) { - return (0, 0); - } - - if ((reserve == 0x31E085Afd48a1d6e51Cc193153d625e8f0514C7F && !flags.check(FLAG_ENABLE_KYBER_UNISWAP_RESERVE)) || - (reserve == 0x1E158c0e93c30d24e918Ef83d1e0bE23595C3c0f && !flags.check(FLAG_ENABLE_KYBER_OASIS_RESERVE)) || - (reserve == 0x053AA84FCC676113a57e0EbB0bD1913839874bE4 && !flags.check(FLAG_ENABLE_KYBER_BANCOR_RESERVE))) - { - return (0, 0); - } - - if (!flags.check(FLAG_ENABLE_KYBER_UNISWAP_RESERVE)) { - (success,) = reserve.staticcall.gas(2300)(abi.encodeWithSelector( - IKyberUniswapReserve(reserve).uniswapFactory.selector - )); - if (success) { - return (0, 0); - } - } - - if (!flags.check(FLAG_ENABLE_KYBER_OASIS_RESERVE)) { - (success,) = reserve.staticcall.gas(2300)(abi.encodeWithSelector( - IKyberOasisReserve(reserve).otc.selector - )); - if (success) { - return (0, 0); - } - } - - if (!flags.check(FLAG_ENABLE_KYBER_BANCOR_RESERVE)) { - (success,) = reserve.staticcall.gas(2300)(abi.encodeWithSelector( - IKyberBancorReserve(reserve).bancorEth.selector - )); - if (success) { - return (0, 0); - } - } - - return ( - ret.mul(amount) - .mul(10 ** IERC20(toToken).universalDecimals()) - .div(10 ** IERC20(fromToken).universalDecimals()) - .div(1e18), - 700_000 - ); - } - - function calculateKyberReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - uint256 maxRet = 0; - uint i = parts; - while (maxRet == 0 && i > 0) { - (maxRet, gas) = _calculateKyberReturn(fromToken, destToken, amount.mul(i).div(parts), flags); - if (maxRet == 0) { - i = i / 2; - } - } - - if (i == 0) { - return (new uint256[](parts), 0); - } - - return (_linearInterpolation(maxRet, i), gas); - } - - function calculateBancorReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IBancorNetwork bancorNetwork = IBancorNetwork(bancorContractRegistry.addressOf("BancorNetwork")); - address[] memory path = _buildBancorPath(fromToken, destToken); - - (bool success, bytes memory data) = address(bancorNetwork).staticcall.gas(500000)( - abi.encodeWithSelector( - bancorNetwork.getReturnByPath.selector, - path, - amount - ) - ); - if (!success) { - return (new uint256[](parts), 0); - } - - (uint256 maxRet,) = abi.decode(data, (uint256,uint256)); - return (_linearInterpolation(maxRet, parts), path.length.mul(150_000)); - } - - function calculateOasisReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - (bool success, bytes memory data) = address(oasisExchange).staticcall.gas(500000)( - abi.encodeWithSelector( - oasisExchange.getBuyAmount.selector, - destToken.isETH() ? weth : destToken, - fromToken.isETH() ? weth : fromToken, - amount - ) - ); - - if (!success) { - return (new uint256[](parts), 0); - } - - uint256 maxRet = abi.decode(data, (uint256)); - return (_linearInterpolation(maxRet, parts), 500_000); - } - - function calculateMooniswap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IMooniswap mooniswap = mooniswapRegistry.target(); - (bool success, bytes memory data) = address(mooniswap).staticcall.gas(1000000)( - abi.encodeWithSelector( - mooniswap.getReturn.selector, - fromToken, - destToken, - amount - ) - ); - - if (!success) { - return (new uint256[](parts), 0); - } - - uint256 maxRet = abi.decode(data, (uint256)); - return (_linearInterpolation(maxRet, parts), 1_000_000); - } - - function calculateUniswapV2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateUniswapV2( - fromToken, - destToken, - _linearInterpolation(amount, parts), - flags - ); - } - - function calculateUniswapV2ETH( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken.isETH() || fromToken == weth || destToken.isETH() || destToken == weth) { - return (new uint256[](parts), 0); - } - - return _calculateUniswapV2OverMidToken( - fromToken, - weth, - destToken, - amount, - parts, - flags - ); - } - - function calculateUniswapV2DAI( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == dai || destToken == dai) { - return (new uint256[](parts), 0); - } - - return _calculateUniswapV2OverMidToken( - fromToken, - dai, - destToken, - amount, - parts, - flags - ); - } - - function calculateUniswapV2USDC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == usdc || destToken == usdc) { - return (new uint256[](parts), 0); - } - - return _calculateUniswapV2OverMidToken( - fromToken, - usdc, - destToken, - amount, - parts, - flags - ); - } - - function _calculateUniswapV2( - IERC20 fromToken, - IERC20 destToken, - uint256[] memory amounts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = new uint256[](amounts.length); - - IERC20 fromTokenReal = fromToken.isETH() ? weth : fromToken; - IERC20 destTokenReal = destToken.isETH() ? weth : destToken; - IUniswapV2Exchange exchange = uniswapV2.getPair(fromTokenReal, destTokenReal); - if (exchange != IUniswapV2Exchange(0)) { - uint256 fromTokenBalance = fromTokenReal.universalBalanceOf(address(exchange)); - uint256 destTokenBalance = destTokenReal.universalBalanceOf(address(exchange)); - for (uint i = 0; i < amounts.length; i++) { - rets[i] = _calculateUniswapFormula(fromTokenBalance, destTokenBalance, amounts[i]); - } - return (rets, 50_000); - } - } - - function _calculateUniswapV2OverMidToken( - IERC20 fromToken, - IERC20 midToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = _linearInterpolation(amount, parts); - - uint256 gas1; - uint256 gas2; - (rets, gas1) = _calculateUniswapV2(fromToken, midToken, rets, flags); - (rets, gas2) = _calculateUniswapV2(midToken, destToken, rets, flags); - return (rets, gas1 + gas2); - } - - function _calculateNoReturn( - IERC20 /*fromToken*/, - IERC20 /*toToken*/, - uint256 /*amount*/, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - this; - return (new uint256[](parts), 0); - } -} - - -contract OneSplitBaseWrap is IOneSplit, OneSplitRoot { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags // See constants in IOneSplit.sol - ) internal { - if (fromToken == toToken) { - return; - } - - _swapFloor( - fromToken, - toToken, - amount, - distribution, - flags - ); - } - - function _swapFloor( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 /*flags*/ // See constants in IOneSplit.sol - ) internal; -} - - -contract OneSplit is IOneSplit, OneSplitRoot { - IOneSplitView public oneSplitView; - - constructor(IOneSplitView _oneSplitView) public { - oneSplitView = _oneSplitView; - } - - function() external payable { - // solium-disable-next-line security/no-tx-origin - require(msg.sender != tx.origin); - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - return oneSplitView.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 /*minReturn*/, - uint256[] memory distribution, - uint256 /*flags*/ // See constants in IOneSplit.sol - ) public payable { - if (fromToken == toToken) { - return; - } - - function(IERC20,IERC20,uint256) returns(uint256)[DEXES_COUNT] memory reserves = [ - _swapOnUniswap, - _swapOnKyber, - _swapOnBancor, - _swapOnOasis, - _swapOnCurveCompound, - _swapOnCurveUsdt, - _swapOnCurveY, - _swapOnCurveBinance, - _swapOnCurveSynthetix, - _swapOnUniswapCompound, - _swapOnUniswapChai, - _swapOnUniswapAave, - _swapOnMooniswap, - _swapOnUniswapV2, - _swapOnUniswapV2ETH, - _swapOnUniswapV2DAI, - _swapOnUniswapV2USDC, - _swapOnCurvePax, - _swapOnCurveRenBtc, - _swapOnCurveTBtc, - _swapOnDforceSwap, - _swapOnShell - ]; - - require(distribution.length <= reserves.length, "OneSplit: Distribution array should not exceed reserves array size"); - - uint256 parts = 0; - uint256 lastNonZeroIndex = 0; - for (uint i = 0; i < distribution.length; i++) { - if (distribution[i] > 0) { - parts = parts.add(distribution[i]); - lastNonZeroIndex = i; - } - } - - require(parts > 0, "OneSplit: distribution should contain non-zeros"); - - uint256 remainingAmount = amount; - for (uint i = 0; i < distribution.length; i++) { - if (distribution[i] == 0) { - continue; - } - - uint256 swapAmount = amount.mul(distribution[i]).div(parts); - if (i == lastNonZeroIndex) { - swapAmount = remainingAmount; - } - remainingAmount -= swapAmount; - reserves[i](fromToken, toToken, swapAmount); - } - } - - // Swap helpers - - function _swapOnCurveCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal returns(uint256) { - int128 i = (fromToken == dai ? 1 : 0) + (fromToken == usdc ? 2 : 0); - int128 j = (destToken == dai ? 1 : 0) + (destToken == usdc ? 2 : 0); - if (i == 0 || j == 0) { - return 0; - } - - _infiniteApproveIfNeeded(fromToken, address(curveCompound)); - curveCompound.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveUsdt( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal returns(uint256) { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0); - if (i == 0 || j == 0) { - return 0; - } - - _infiniteApproveIfNeeded(fromToken, address(curveUsdt)); - curveUsdt.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveY( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal returns(uint256) { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == tusd ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == tusd ? 4 : 0); - if (i == 0 || j == 0) { - return 0; - } - - _infiniteApproveIfNeeded(fromToken, address(curveY)); - curveY.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveBinance( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal returns(uint256) { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == busd ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == busd ? 4 : 0); - if (i == 0 || j == 0) { - return 0; - } - - _infiniteApproveIfNeeded(fromToken, address(curveBinance)); - curveBinance.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveSynthetix( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal returns(uint256) { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == susd ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == susd ? 4 : 0); - if (i == 0 || j == 0) { - return 0; - } - - _infiniteApproveIfNeeded(fromToken, address(curveSynthetix)); - curveSynthetix.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurvePax( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal returns(uint256) { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == pax ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == pax ? 4 : 0); - if (i == 0 || j == 0) { - return 0; - } - - _infiniteApproveIfNeeded(fromToken, address(curvePax)); - curvePax.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnShell( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns (uint256) { - _infiniteApproveIfNeeded(fromToken, address(shell)); - return shell.swapByOrigin( - address(fromToken), - address(toToken), - amount, - 0, - now + 50 - ); - } - - function _swapOnCurveRenBtc( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal returns(uint256) { - int128 i = (fromToken == renbtc ? 1 : 0) + - (fromToken == wbtc ? 2 : 0); - int128 j = (destToken == renbtc ? 1 : 0) + - (destToken == wbtc ? 2 : 0); - if (i == 0 || j == 0) { - return 0; - } - - _infiniteApproveIfNeeded(fromToken, address(curveRenBtc)); - curveRenBtc.exchange(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveTBtc( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal returns(uint256) { - int128 i = (fromToken == tbtc ? 1 : 0) + - (fromToken == wbtc ? 2 : 0) + - (fromToken == hbtc ? 3 : 0); - int128 j = (destToken == tbtc ? 1 : 0) + - (destToken == wbtc ? 2 : 0) + - (destToken == hbtc ? 3 : 0); - if (i == 0 || j == 0) { - return 0; - } - - _infiniteApproveIfNeeded(fromToken, address(curveTBtc)); - curveTBtc.exchange(i - 1, j - 1, amount, 0); - } - - function _swapOnDforceSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal returns(uint256) { - _infiniteApproveIfNeeded(fromToken, address(dforceSwap)); - dforceSwap.swap(fromToken, destToken, amount); - } - - function _swapOnUniswap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - - uint256 returnAmount = amount; - - if (!fromToken.isETH()) { - IUniswapExchange fromExchange = uniswapFactory.getExchange(fromToken); - if (fromExchange != IUniswapExchange(0)) { - _infiniteApproveIfNeeded(fromToken, address(fromExchange)); - returnAmount = fromExchange.tokenToEthSwapInput(returnAmount, 1, now); - } - } - - if (!toToken.isETH()) { - IUniswapExchange toExchange = uniswapFactory.getExchange(toToken); - if (toExchange != IUniswapExchange(0)) { - returnAmount = toExchange.ethToTokenSwapInput.value(returnAmount)(1, now); - } - } - - return returnAmount; - } - - function _swapOnUniswapCompound( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - if (!fromToken.isETH()) { - ICompoundToken fromCompound = _getCompoundToken(fromToken); - _infiniteApproveIfNeeded(fromToken, address(fromCompound)); - fromCompound.mint(amount); - return _swapOnUniswap(IERC20(fromCompound), toToken, IERC20(fromCompound).universalBalanceOf(address(this))); - } - - if (!toToken.isETH()) { - ICompoundToken toCompound = _getCompoundToken(toToken); - uint256 compoundAmount = _swapOnUniswap(fromToken, IERC20(toCompound), amount); - toCompound.redeem(compoundAmount); - return toToken.universalBalanceOf(address(this)); - } - - return 0; - } - - function _swapOnUniswapChai( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - if (fromToken == dai) { - _infiniteApproveIfNeeded(fromToken, address(chai)); - chai.join(address(this), amount); - return _swapOnUniswap(IERC20(chai), toToken, IERC20(chai).universalBalanceOf(address(this))); - } - - if (toToken == dai) { - uint256 chaiAmount = _swapOnUniswap(fromToken, IERC20(chai), amount); - chai.exit(address(this), chaiAmount); - return toToken.universalBalanceOf(address(this)); - } - - return 0; - } - - function _swapOnUniswapAave( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - if (!fromToken.isETH()) { - IAaveToken fromAave = _getAaveToken(fromToken); - _infiniteApproveIfNeeded(fromToken, aave.core()); - aave.deposit(fromToken, amount, 1101); - return _swapOnUniswap(IERC20(fromAave), toToken, IERC20(fromAave).universalBalanceOf(address(this))); - } - - if (!toToken.isETH()) { - IAaveToken toAave = _getAaveToken(toToken); - uint256 aaveAmount = _swapOnUniswap(fromToken, IERC20(toAave), amount); - toAave.redeem(aaveAmount); - return aaveAmount; - } - - return 0; - } - - function _swapOnMooniswap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - IMooniswap mooniswap = mooniswapRegistry.target(); - _infiniteApproveIfNeeded(fromToken, address(mooniswap)); - return mooniswap.swap.value(fromToken.isETH() ? amount : 0)( - fromToken, - toToken, - amount, - 0 - ); - } - - function _swapOnKyber( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - _infiniteApproveIfNeeded(fromToken, address(kyberNetworkProxy)); - return kyberNetworkProxy.tradeWithHint.value(fromToken.isETH() ? amount : 0)( - fromToken.isETH() ? ETH_ADDRESS : fromToken, - amount, - toToken.isETH() ? ETH_ADDRESS : toToken, - address(this), - 1 << 255, - 0, - 0x4D37f28D2db99e8d35A6C725a5f1749A085850a3, - "" - ); - } - - function _swapOnBancor( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - if (fromToken.isETH()) { - bancorEtherToken.deposit.value(amount)(); - } - - IBancorNetwork bancorNetwork = IBancorNetwork(bancorContractRegistry.addressOf("BancorNetwork")); - address[] memory path = _buildBancorPath(fromToken, toToken); - - _infiniteApproveIfNeeded(fromToken.isETH() ? bancorEtherToken : fromToken, address(bancorNetwork)); - uint256 returnAmount = bancorNetwork.claimAndConvert(path, amount, 1); - - if (toToken.isETH()) { - bancorEtherToken.withdraw(bancorEtherToken.balanceOf(address(this))); - } - - return returnAmount; - } - - function _swapOnOasis( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - if (fromToken.isETH()) { - weth.deposit.value(amount)(); - } - - _infiniteApproveIfNeeded(fromToken.isETH() ? weth : fromToken, address(oasisExchange)); - uint256 returnAmount = oasisExchange.sellAllAmount( - fromToken.isETH() ? weth : fromToken, - amount, - toToken.isETH() ? weth : toToken, - 1 - ); - - if (toToken.isETH()) { - weth.withdraw(weth.balanceOf(address(this))); - } - - return returnAmount; - } - - function _swapOnUniswapV2Internal( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256 returnAmount) { - if (fromToken.isETH()) { - weth.deposit.value(amount)(); - } - - IERC20 fromTokenReal = fromToken.isETH() ? weth : fromToken; - IERC20 toTokenReal = toToken.isETH() ? weth : toToken; - IUniswapV2Exchange exchange = uniswapV2.getPair(fromTokenReal, toTokenReal); - returnAmount = exchange.getReturn(fromTokenReal, toTokenReal, amount); - - fromTokenReal.universalTransfer(address(exchange), amount); - if (uint256(address(fromTokenReal)) < uint256(address(toTokenReal))) { - exchange.swap(0, returnAmount, address(this), ""); - } else { - exchange.swap(returnAmount, 0, address(this), ""); - } - - if (toToken.isETH()) { - weth.withdraw(weth.balanceOf(address(this))); - } - } - - function _swapOnUniswapV2OverMid( - IERC20 fromToken, - IERC20 midToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - return _swapOnUniswapV2Internal( - midToken, - toToken, - _swapOnUniswapV2Internal( - fromToken, - midToken, - amount - ) - ); - } - - function _swapOnUniswapV2( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - return _swapOnUniswapV2Internal( - fromToken, - toToken, - amount - ); - } - - function _swapOnUniswapV2ETH( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - return _swapOnUniswapV2OverMid( - fromToken, - weth, - toToken, - amount - ); - } - - function _swapOnUniswapV2DAI( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - return _swapOnUniswapV2OverMid( - fromToken, - dai, - toToken, - amount - ); - } - - function _swapOnUniswapV2USDC( - IERC20 fromToken, - IERC20 toToken, - uint256 amount - ) internal returns(uint256) { - return _swapOnUniswapV2OverMid( - fromToken, - usdc, - toToken, - amount - ); - } -} - -// File: contracts/OneSplitMultiPath.sol - -pragma solidity ^0.5.0; - - - -contract OneSplitMultiPathBase is IOneSplitConsts, OneSplitRoot { - function _getMultiPathToken(uint256 flags) internal pure returns(IERC20 midToken) { - uint256[7] memory allFlags = [ - FLAG_ENABLE_MULTI_PATH_ETH, - FLAG_ENABLE_MULTI_PATH_DAI, - FLAG_ENABLE_MULTI_PATH_USDC, - FLAG_ENABLE_MULTI_PATH_USDT, - FLAG_ENABLE_MULTI_PATH_WBTC, - FLAG_ENABLE_MULTI_PATH_TBTC, - FLAG_ENABLE_MULTI_PATH_RENBTC - ]; - - IERC20[7] memory allMidTokens = [ - ETH_ADDRESS, - dai, - usdc, - usdt, - wbtc, - tbtc, - renbtc - ]; - - for (uint i = 0; i < allFlags.length; i++) { - if (flags.check(allFlags[i])) { - require(midToken == IERC20(0), "OneSplit: Do not use multipath with each other"); - midToken = allMidTokens[i]; - } - } - } -} - - -contract OneSplitMultiPathView is OneSplitViewWrapBase, OneSplitMultiPathBase { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns ( - uint256 returnAmount, - uint256[] memory distribution - ) - { - if (fromToken == toToken) { - return (amount, new uint256[](DEXES_COUNT)); - } - - IERC20 midToken = _getMultiPathToken(flags); - - if (midToken != IERC20(0)) { - if ((fromToken.isETH() && midToken.isETH()) || - (toToken.isETH() && midToken.isETH()) || - fromToken == midToken || - toToken == midToken) - { - super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - (returnAmount, distribution) = super.getExpectedReturn( - fromToken, - midToken, - amount, - parts, - flags | FLAG_DISABLE_BANCOR | FLAG_DISABLE_CURVE_COMPOUND | FLAG_DISABLE_CURVE_USDT | FLAG_DISABLE_CURVE_Y | FLAG_DISABLE_CURVE_BINANCE | FLAG_DISABLE_CURVE_PAX - ); - - uint256[] memory dist; - (returnAmount, dist) = super.getExpectedReturn( - midToken, - toToken, - returnAmount, - parts, - flags | FLAG_DISABLE_BANCOR | FLAG_DISABLE_CURVE_COMPOUND | FLAG_DISABLE_CURVE_USDT | FLAG_DISABLE_CURVE_Y | FLAG_DISABLE_CURVE_BINANCE | FLAG_DISABLE_CURVE_PAX - ); - for (uint i = 0; i < distribution.length; i++) { - distribution[i] = distribution[i].add(dist[i] << 8); - } - return (returnAmount, distribution); - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitMultiPath is OneSplitBaseWrap, OneSplitMultiPathBase { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - IERC20 midToken = _getMultiPathToken(flags); - - if (midToken != IERC20(0)) { - uint256[] memory dist = new uint256[](distribution.length); - for (uint i = 0; i < distribution.length; i++) { - dist[i] = distribution[i] & 0xFF; - } - super._swap( - fromToken, - midToken, - amount, - dist, - flags - ); - - for (uint i = 0; i < distribution.length; i++) { - dist[i] = (distribution[i] >> 8) & 0xFF; - } - super._swap( - midToken, - toToken, - midToken.universalBalanceOf(address(this)), - dist, - flags - ); - return; - } - - super._swap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/OneSplitCompound.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitCompoundBase { - function _getCompoundUnderlyingToken(IERC20 token) internal pure returns(IERC20) { - if (token == IERC20(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5)) { // ETH - return IERC20(0); - } - if (token == IERC20(0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643)) { // DAI - return IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); - } - if (token == IERC20(0x6C8c6b02E7b2BE14d4fA6022Dfd6d75921D90E4E)) { // BAT - return IERC20(0x0D8775F648430679A709E98d2b0Cb6250d2887EF); - } - if (token == IERC20(0x158079Ee67Fce2f58472A96584A73C7Ab9AC95c1)) { // REP - return IERC20(0x1985365e9f78359a9B6AD760e32412f4a445E862); - } - if (token == IERC20(0x39AA39c021dfbaE8faC545936693aC917d5E7563)) { // USDC - return IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); - } - if (token == IERC20(0xC11b1268C1A384e55C48c2391d8d480264A3A7F4)) { // WBTC - return IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); - } - if (token == IERC20(0xB3319f5D18Bc0D84dD1b4825Dcde5d5f7266d407)) { // ZRX - return IERC20(0xE41d2489571d322189246DaFA5ebDe1F4699F498); - } - if (token == IERC20(0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9)) { // USDT - return IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); - } - - return IERC20(-1); - } -} - - -contract OneSplitCompoundView is OneSplitViewWrapBase, OneSplitCompoundBase { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - return _compoundGetExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function _compoundGetExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - private - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - if (fromToken == toToken) { - return (amount, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_COMPOUND)) { - IERC20 underlying = _getCompoundUnderlyingToken(fromToken); - if (underlying != IERC20(-1)) { - uint256 compoundRate = ICompoundToken(address(fromToken)).exchangeRateStored(); - - return _compoundGetExpectedReturn( - underlying, - toToken, - amount.mul(compoundRate).div(1e18), - parts, - flags - ); - } - - underlying = _getCompoundUnderlyingToken(toToken); - if (underlying != IERC20(-1)) { - uint256 compoundRate = ICompoundToken(address(toToken)).exchangeRateStored(); - - (returnAmount, distribution) = super.getExpectedReturn( - fromToken, - underlying, - amount, - parts, - flags - ); - - returnAmount = returnAmount.mul(1e18).div(compoundRate); - return (returnAmount, distribution); - - } - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitCompound is OneSplitBaseWrap, OneSplitCompoundBase { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _compundSwap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } - - function _compundSwap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == toToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_COMPOUND)) { - IERC20 underlying = _getCompoundUnderlyingToken(fromToken); - if (underlying != IERC20(-1)) { - ICompoundToken(address(fromToken)).redeem(amount); - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - return _compundSwap( - underlying, - toToken, - underlyingAmount, - distribution, - flags - ); - } - - underlying = _getCompoundUnderlyingToken(toToken); - if (underlying != IERC20(-1)) { - super._swap( - fromToken, - underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - if (underlying.isETH()) { - cETH.mint.value(underlyingAmount)(); - } else { - _infiniteApproveIfNeeded(underlying, address(toToken)); - ICompoundToken(address(toToken)).mint(underlyingAmount); - } - return; - } - } - - return super._swap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } -} - -// File: @openzeppelin/contracts/token/ERC20/ERC20Detailed.sol - -pragma solidity ^0.5.0; - - -/** - * @dev Optional functions from the ERC20 standard. - */ -contract ERC20Detailed is IERC20 { - string private _name; - string private _symbol; - uint8 private _decimals; - - /** - * @dev Sets the values for `name`, `symbol`, and `decimals`. All three of - * these values are immutable: they can only be set once during - * construction. - */ - constructor (string memory name, string memory symbol, uint8 decimals) public { - _name = name; - _symbol = symbol; - _decimals = decimals; - } - - /** - * @dev Returns the name of the token. - */ - function name() public view returns (string memory) { - return _name; - } - - /** - * @dev Returns the symbol of the token, usually a shorter version of the - * name. - */ - function symbol() public view returns (string memory) { - return _symbol; - } - - /** - * @dev Returns the number of decimals used to get its user representation. - * For example, if `decimals` equals `2`, a balance of `505` tokens should - * be displayed to a user as `5,05` (`505 / 10 ** 2`). - * - * Tokens usually opt for a value of 18, imitating the relationship between - * Ether and Wei. - * - * NOTE: This information is only used for _display_ purposes: it in - * no way affects any of the arithmetic of the contract, including - * {IERC20-balanceOf} and {IERC20-transfer}. - */ - function decimals() public view returns (uint8) { - return _decimals; - } -} - -// File: contracts/interface/IFulcrum.sol - -pragma solidity ^0.5.0; - - - -contract IFulcrumToken is IERC20 { - function tokenPrice() external view returns (uint256); - - function loanTokenAddress() external view returns (address); - - function mintWithEther(address receiver) external payable returns (uint256 mintAmount); - - function mint(address receiver, uint256 depositAmount) external returns (uint256 mintAmount); - - function burnToEther(address receiver, uint256 burnAmount) - external - returns (uint256 loanAmountPaid); - - function burn(address receiver, uint256 burnAmount) external returns (uint256 loanAmountPaid); -} - -// File: contracts/OneSplitFulcrum.sol - -pragma solidity ^0.5.0; - - - - - -contract OneSplitFulcrumBase { - using UniversalERC20 for IERC20; - - function _isFulcrumToken(IERC20 token) public view returns(IERC20) { - if (token.isETH()) { - return IERC20(-1); - } - - (bool success, bytes memory data) = address(token).staticcall.gas(5000)(abi.encodeWithSelector( - ERC20Detailed(address(token)).name.selector - )); - if (!success) { - return IERC20(-1); - } - - bool foundBZX = false; - for (uint i = 0; i + 6 < data.length; i++) { - if (data[i + 0] == "F" && - data[i + 1] == "u" && - data[i + 2] == "l" && - data[i + 3] == "c" && - data[i + 4] == "r" && - data[i + 5] == "u" && - data[i + 6] == "m") - { - foundBZX = true; - break; - } - } - if (!foundBZX) { - return IERC20(-1); - } - - (success, data) = address(token).staticcall.gas(5000)(abi.encodeWithSelector( - IFulcrumToken(address(token)).loanTokenAddress.selector - )); - if (!success) { - return IERC20(-1); - } - - return abi.decode(data, (IERC20)); - } -} - - -contract OneSplitFulcrumView is OneSplitViewWrapBase, OneSplitFulcrumBase { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - return _fulcrumGetExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function _fulcrumGetExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - private - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - if (fromToken == toToken) { - return (amount, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_FULCRUM)) { - IERC20 underlying = _isFulcrumToken(fromToken); - if (underlying != IERC20(-1)) { - uint256 fulcrumRate = IFulcrumToken(address(fromToken)).tokenPrice(); - - return _fulcrumGetExpectedReturn( - underlying, - toToken, - amount.mul(fulcrumRate).div(1e18), - parts, - flags - ); - } - - underlying = _isFulcrumToken(toToken); - if (underlying != IERC20(-1)) { - uint256 fulcrumRate = IFulcrumToken(address(toToken)).tokenPrice(); - - (returnAmount, distribution) = super.getExpectedReturn( - fromToken, - underlying, - amount, - parts, - flags - ); - - returnAmount = returnAmount.mul(1e18).div(fulcrumRate); - return (returnAmount, distribution); - } - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitFulcrum is OneSplitBaseWrap, OneSplitFulcrumBase { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _fulcrumSwap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } - - function _fulcrumSwap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == toToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_FULCRUM)) { - IERC20 underlying = _isFulcrumToken(fromToken); - if (underlying != IERC20(-1)) { - if (underlying.isETH()) { - IFulcrumToken(address(fromToken)).burnToEther(address(this), amount); - } else { - IFulcrumToken(address(fromToken)).burn(address(this), amount); - } - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - return super._swap( - underlying, - toToken, - underlyingAmount, - distribution, - flags - ); - } - - underlying = _isFulcrumToken(toToken); - if (underlying != IERC20(-1)) { - super._swap( - fromToken, - underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - if (underlying.isETH()) { - IFulcrumToken(address(toToken)).mintWithEther.value(underlyingAmount)(address(this)); - } else { - _infiniteApproveIfNeeded(underlying, address(toToken)); - IFulcrumToken(address(toToken)).mint(address(this), underlyingAmount); - } - return; - } - } - - return super._swap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/OneSplitChai.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitChaiView is OneSplitViewWrapBase { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - if (fromToken == toToken) { - return (amount, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_CHAI)) { - if (fromToken == IERC20(chai)) { - return super.getExpectedReturn( - dai, - toToken, - chai.chaiToDai(amount), - parts, - flags - ); - } - - if (toToken == IERC20(chai)) { - (returnAmount, distribution) = super.getExpectedReturn( - fromToken, - dai, - amount, - parts, - flags - ); - return (chai.daiToChai(returnAmount), distribution); - } - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitChai is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken == toToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_CHAI)) { - if (fromToken == IERC20(chai)) { - chai.exit(address(this), amount); - - return super._swap( - dai, - toToken, - dai.balanceOf(address(this)), - distribution, - flags - ); - } - - if (toToken == IERC20(chai)) { - super._swap( - fromToken, - dai, - amount, - distribution, - flags - ); - - _infiniteApproveIfNeeded(dai, address(chai)); - chai.join(address(this), dai.balanceOf(address(this))); - return; - } - } - - return super._swap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/interface/IBdai.sol - -pragma solidity ^0.5.0; - - - -contract IBdai is IERC20 { - function join(uint256) external; - - function exit(uint256) external; -} - -// File: contracts/OneSplitBdai.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitBdaiBase { - IBdai public bdai = IBdai(0x6a4FFAafa8DD400676Df8076AD6c724867b0e2e8); - IERC20 public btu = IERC20(0xb683D83a532e2Cb7DFa5275eED3698436371cc9f); -} - - -contract OneSplitBdaiView is OneSplitViewWrapBase, OneSplitBdaiBase { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns (uint256 returnAmount, uint256[] memory distribution) - { - if (fromToken == toToken) { - return (amount, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_BDAI)) { - if (fromToken == IERC20(bdai)) { - return super.getExpectedReturn( - dai, - toToken, - amount, - parts, - flags - ); - } - - if (toToken == IERC20(bdai)) { - return super.getExpectedReturn( - fromToken, - dai, - amount, - parts, - flags - ); - } - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitBdai is OneSplitBaseWrap, OneSplitBdaiBase { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken == toToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_BDAI)) { - if (fromToken == IERC20(bdai)) { - bdai.exit(amount); - - uint256 btuBalance = btu.balanceOf(address(this)); - if (btuBalance > 0) { - (,uint256[] memory btuDistribution) = getExpectedReturn( - btu, - toToken, - btuBalance, - 1, - flags - ); - - _swap( - btu, - toToken, - btuBalance, - btuDistribution, - flags - ); - } - - return super._swap( - dai, - toToken, - amount, - distribution, - flags - ); - } - - if (toToken == IERC20(bdai)) { - super._swap(fromToken, dai, amount, distribution, flags); - - _infiniteApproveIfNeeded(dai, address(bdai)); - bdai.join(dai.balanceOf(address(this))); - return; - } - } - - return super._swap(fromToken, toToken, amount, distribution, flags); - } -} - -// File: contracts/interface/IIearn.sol - -pragma solidity ^0.5.0; - - - -contract IIearn is IERC20 { - function token() external view returns(IERC20); - - function calcPoolValueInToken() external view returns(uint256); - - function deposit(uint256 _amount) external; - - function withdraw(uint256 _shares) external; -} - -// File: contracts/OneSplitIearn.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitIearnBase { - function _yTokens() internal pure returns(IIearn[13] memory) { - return [ - IIearn(0x16de59092dAE5CcF4A1E6439D611fd0653f0Bd01), - IIearn(0x04Aa51bbcB46541455cCF1B8bef2ebc5d3787EC9), - IIearn(0x73a052500105205d34Daf004eAb301916DA8190f), - IIearn(0x83f798e925BcD4017Eb265844FDDAbb448f1707D), - IIearn(0xd6aD7a6750A7593E092a9B218d66C0A814a3436e), - IIearn(0xF61718057901F84C4eEC4339EF8f0D86D2B45600), - IIearn(0x04bC0Ab673d88aE9dbC9DA2380cB6B79C4BCa9aE), - IIearn(0xC2cB1040220768554cf699b0d863A3cd4324ce32), - IIearn(0xE6354ed5bC4b393a5Aad09f21c46E101e692d447), - IIearn(0x26EA744E5B887E5205727f55dFBE8685e3b21951), - IIearn(0x99d1Fa417f94dcD62BfE781a1213c092a47041Bc), - IIearn(0x9777d7E2b60bB01759D0E2f8be2095df444cb07E), - IIearn(0x1bE5d71F2dA660BFdee8012dDc58D024448A0A59) - ]; - } -} - - -contract OneSplitIearnView is OneSplitViewWrapBase, OneSplitIearnBase { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns (uint256 returnAmount, uint256[] memory distribution) - { - return _iearnGetExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function _iearnGetExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - private - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - if (fromToken == toToken) { - return (amount, new uint256[](DEXES_COUNT)); - } - - if (!flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == !flags.check(FLAG_DISABLE_IEARN)) { - IIearn[13] memory yTokens = _yTokens(); - - for (uint i = 0; i < yTokens.length; i++) { - if (fromToken == IERC20(yTokens[i])) { - return _iearnGetExpectedReturn( - yTokens[i].token(), - toToken, - amount - .mul(yTokens[i].calcPoolValueInToken()) - .div(yTokens[i].totalSupply()), - parts, - flags - ); - } - } - - for (uint i = 0; i < yTokens.length; i++) { - if (toToken == IERC20(yTokens[i])) { - (uint256 ret, uint256[] memory dist) = super.getExpectedReturn( - fromToken, - yTokens[i].token(), - amount, - parts, - flags - ); - - return ( - ret - .mul(yTokens[i].totalSupply()) - .div(yTokens[i].calcPoolValueInToken()), - dist - ); - } - } - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitIearn is OneSplitBaseWrap, OneSplitIearnBase { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _iearnSwap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } - - function _iearnSwap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == toToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_IEARN)) { - IIearn[13] memory yTokens = _yTokens(); - - for (uint i = 0; i < yTokens.length; i++) { - if (fromToken == IERC20(yTokens[i])) { - IERC20 underlying = yTokens[i].token(); - yTokens[i].withdraw(amount); - _iearnSwap(underlying, toToken, underlying.balanceOf(address(this)), distribution, flags); - return; - } - } - - for (uint i = 0; i < yTokens.length; i++) { - if (toToken == IERC20(yTokens[i])) { - IERC20 underlying = yTokens[i].token(); - super._swap(fromToken, underlying, amount, distribution, flags); - _infiniteApproveIfNeeded(underlying, address(yTokens[i])); - yTokens[i].deposit(underlying.balanceOf(address(this))); - return; - } - } - } - - return super._swap(fromToken, toToken, amount, distribution, flags); - } -} - -// File: contracts/interface/IIdle.sol - -pragma solidity ^0.5.0; - - - -contract IIdle is IERC20 { - function token() - external view returns (IERC20); - - function tokenPrice() - external view returns (uint256); - - function mintIdleToken(uint256 _amount, uint256[] calldata _clientProtocolAmounts) - external returns (uint256 mintedTokens); - - function redeemIdleToken(uint256 _amount, bool _skipRebalance, uint256[] calldata _clientProtocolAmounts) - external returns (uint256 redeemedTokens); -} - -// File: contracts/OneSplitIdle.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitIdleBase { - function _idleTokens() internal pure returns(IIdle[2] memory) { - return [ - IIdle(0x10eC0D497824e342bCB0EDcE00959142aAa766dD), - IIdle(0xeB66ACc3d011056B00ea521F8203580C2E5d3991) - ]; - } -} - - -contract OneSplitIdleView is OneSplitViewWrapBase, OneSplitIdleBase { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns (uint256 /*returnAmount*/, uint256[] memory /*distribution*/) - { - return _idleGetExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function _idleGetExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - internal - view - returns (uint256 returnAmount, uint256[] memory distribution) - { - if (fromToken == toToken) { - return (amount, new uint256[](DEXES_COUNT)); - } - - if (!flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == !flags.check(FLAG_DISABLE_IDLE)) { - IIdle[2] memory tokens = _idleTokens(); - - for (uint i = 0; i < tokens.length; i++) { - if (fromToken == IERC20(tokens[i])) { - return _idleGetExpectedReturn( - tokens[i].token(), - toToken, - amount.mul(tokens[i].tokenPrice()).div(1e18), - parts, - flags - ); - } - } - - for (uint i = 0; i < tokens.length; i++) { - if (toToken == IERC20(tokens[i])) { - (uint256 ret, uint256[] memory dist) = super.getExpectedReturn( - fromToken, - tokens[i].token(), - amount, - parts, - flags - ); - - return ( - ret.mul(1e18).div(tokens[i].tokenPrice()), - dist - ); - } - } - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitIdle is OneSplitBaseWrap, OneSplitIdleBase { - function _superOneSplitIdleSwap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] calldata distribution, - uint256 flags - ) - external - { - require(msg.sender == address(this)); - return super._swap(fromToken, toToken, amount, distribution, flags); - } - - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _idleSwap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } - - function _idleSwap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) public payable { - if (!flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == !flags.check(FLAG_DISABLE_IDLE)) { - IIdle[2] memory tokens = _idleTokens(); - - for (uint i = 0; i < tokens.length; i++) { - if (fromToken == IERC20(tokens[i])) { - IERC20 underlying = tokens[i].token(); - uint256 minted = tokens[i].redeemIdleToken(amount, true, new uint256[](0)); - _idleSwap(underlying, toToken, minted, distribution, flags); - return; - } - } - - for (uint i = 0; i < tokens.length; i++) { - if (toToken == IERC20(tokens[i])) { - IERC20 underlying = tokens[i].token(); - super._swap(fromToken, underlying, amount, distribution, flags); - _infiniteApproveIfNeeded(underlying, address(tokens[i])); - tokens[i].mintIdleToken(underlying.balanceOf(address(this)), new uint256[](0)); - return; - } - } - } - - return super._swap(fromToken, toToken, amount, distribution, flags); - } -} - -// File: contracts/OneSplitAave.sol - -pragma solidity ^0.5.0; - - - - - -contract OneSplitAaveBase { - function _getAaveUnderlyingToken(IERC20 token) internal pure returns(IERC20) { - if (token == IERC20(0x3a3A65aAb0dd2A17E3F1947bA16138cd37d08c04)) { // ETH - return IERC20(0); - } - if (token == IERC20(0xfC1E690f61EFd961294b3e1Ce3313fBD8aa4f85d)) { // DAI - return IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); - } - if (token == IERC20(0x9bA00D6856a4eDF4665BcA2C2309936572473B7E)) { // USDC - return IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); - } - if (token == IERC20(0x625aE63000f46200499120B906716420bd059240)) { // SUSD - return IERC20(0x57Ab1ec28D129707052df4dF418D58a2D46d5f51); - } - if (token == IERC20(0x6Ee0f7BB50a54AB5253dA0667B0Dc2ee526C30a8)) { // BUSD - return IERC20(0x4Fabb145d64652a948d72533023f6E7A623C7C53); - } - if (token == IERC20(0x4DA9b813057D04BAef4e5800E36083717b4a0341)) { // TUSD - return IERC20(0x0000000000085d4780B73119b644AE5ecd22b376); - } - if (token == IERC20(0x71fc860F7D3A592A4a98740e39dB31d25db65ae8)) { // USDT - return IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); - } - if (token == IERC20(0xE1BA0FB44CCb0D11b80F92f4f8Ed94CA3fF51D00)) { // BAT - return IERC20(0x0D8775F648430679A709E98d2b0Cb6250d2887EF); - } - if (token == IERC20(0x9D91BE44C06d373a8a226E1f3b146956083803eB)) { // KNC - return IERC20(0xdd974D5C2e2928deA5F71b9825b8b646686BD200); - } - if (token == IERC20(0x7D2D3688Df45Ce7C552E19c27e007673da9204B8)) { // LEND - return IERC20(0x80fB784B7eD66730e8b1DBd9820aFD29931aab03); - } - if (token == IERC20(0xA64BD6C70Cb9051F6A9ba1F163Fdc07E0DfB5F84)) { // LINK - return IERC20(0x514910771AF9Ca656af840dff83E8264EcF986CA); - } - if (token == IERC20(0x6FCE4A401B6B80ACe52baAefE4421Bd188e76F6f)) { // MANA - return IERC20(0x0F5D2fB29fb7d3CFeE444a200298f468908cC942); - } - if (token == IERC20(0x7deB5e830be29F91E298ba5FF1356BB7f8146998)) { // MKR - return IERC20(0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2); - } - if (token == IERC20(0x71010A9D003445aC60C4e6A7017c1E89A477B438)) { // REP - return IERC20(0x1985365e9f78359a9B6AD760e32412f4a445E862); - } - if (token == IERC20(0x328C4c80BC7aCa0834Db37e6600A6c49E12Da4DE)) { // SNX - return IERC20(0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F); - } - if (token == IERC20(0xFC4B8ED459e00e5400be803A9BB3954234FD50e3)) { // WBTC - return IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); - } - if (token == IERC20(0x6Fb0855c404E09c47C3fBCA25f08d4E41f9F062f)) { // ZRX - return IERC20(0xE41d2489571d322189246DaFA5ebDe1F4699F498); - } - - return IERC20(-1); - } -} - - -contract OneSplitAaveView is OneSplitViewWrapBase, OneSplitAaveBase { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - return _aaveGetExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function _aaveGetExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - private - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - if (fromToken == toToken) { - return (amount, distribution); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_AAVE)) { - IERC20 underlying = _getAaveUnderlyingToken(fromToken); - if (underlying != IERC20(-1)) { - return _aaveGetExpectedReturn( - underlying, - toToken, - amount, - parts, - flags - ); - } - - underlying = _getAaveUnderlyingToken(toToken); - if (underlying != IERC20(-1)) { - return super.getExpectedReturn( - fromToken, - underlying, - amount, - parts, - flags - ); - } - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitAave is OneSplitBaseWrap, OneSplitAaveBase { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _aaveSwap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } - - function _aaveSwap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == toToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_AAVE)) { - IERC20 underlying = _getAaveUnderlyingToken(fromToken); - if (underlying != IERC20(-1)) { - IAaveToken(address(fromToken)).redeem(amount); - - return _aaveSwap( - underlying, - toToken, - amount, - distribution, - flags - ); - } - - underlying = _getAaveUnderlyingToken(toToken); - if (underlying != IERC20(-1)) { - super._swap( - fromToken, - underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - _infiniteApproveIfNeeded(underlying, aave.core()); - aave.deposit.value(underlying.isETH() ? underlyingAmount : 0)( - underlying.isETH() ? ETH_ADDRESS : underlying, - underlyingAmount, - 1101 - ); - return; - } - } - - return super._swap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/OneSplitWeth.sol - -pragma solidity ^0.5.0; - - - - -contract OneSplitWethView is OneSplitViewWrapBase { - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - return _wethGetExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function _wethGetExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - private - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - if (fromToken == toToken) { - return (amount, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_WETH)) { - if (fromToken == weth || fromToken == bancorEtherToken) { - return super.getExpectedReturn(ETH_ADDRESS, toToken, amount, parts, flags); - } - - if (toToken == weth || toToken == bancorEtherToken) { - return super.getExpectedReturn(fromToken, ETH_ADDRESS, amount, parts, flags); - } - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitWeth is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _wethSwap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } - - function _wethSwap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == toToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_WETH)) { - if (fromToken == weth) { - weth.withdraw(weth.balanceOf(address(this))); - super._swap( - ETH_ADDRESS, - toToken, - amount, - distribution, - flags - ); - return; - } - - if (fromToken == bancorEtherToken) { - bancorEtherToken.withdraw(bancorEtherToken.balanceOf(address(this))); - super._swap( - ETH_ADDRESS, - toToken, - amount, - distribution, - flags - ); - return; - } - - if (toToken == weth) { - _wethSwap( - fromToken, - ETH_ADDRESS, - amount, - distribution, - flags - ); - weth.deposit.value(address(this).balance)(); - return; - } - - if (toToken == bancorEtherToken) { - _wethSwap( - fromToken, - ETH_ADDRESS, - amount, - distribution, - flags - ); - bancorEtherToken.deposit.value(address(this).balance)(); - return; - } - } - - return super._swap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } -} - -// File: contracts/OneSplit.sol - -pragma solidity ^0.5.0; - - - - - - - - - - - -//import "./OneSplitSmartToken.sol"; - - -contract OneSplitViewWrap is - OneSplitViewWrapBase, - OneSplitMultiPathView, - OneSplitChaiView, - OneSplitBdaiView, - OneSplitAaveView, - OneSplitFulcrumView, - OneSplitCompoundView, - OneSplitIearnView, - OneSplitIdleView, - OneSplitWethView - //OneSplitSmartTokenView -{ - IOneSplitView public oneSplitView; - - constructor(IOneSplitView _oneSplit) public { - oneSplitView = _oneSplit; - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - if (fromToken == toToken) { - return (amount, new uint256[](DEXES_COUNT)); - } - - return super.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function _getExpectedReturnFloor( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - internal - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - return oneSplitView.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } -} - - -contract OneSplitWrap is - OneSplitBaseWrap, - OneSplitMultiPath, - OneSplitChai, - OneSplitBdai, - OneSplitAave, - OneSplitFulcrum, - OneSplitCompound, - OneSplitIearn, - OneSplitIdle, - OneSplitWeth - //OneSplitSmartToken -{ - IOneSplitView public oneSplitView; - IOneSplit public oneSplit; - - constructor(IOneSplitView _oneSplitView, IOneSplit _oneSplit) public { - oneSplitView = _oneSplitView; - oneSplit = _oneSplit; - } - - function() external payable { - // solium-disable-next-line security/no-tx-origin - require(msg.sender != tx.origin); - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags // 1 - Uniswap, 2 - Kyber, 4 - Bancor, 8 - Oasis, 16 - Compound, 32 - Fulcrum, 64 - Chai, 128 - Aave, 256 - SmartToken, 1024 - bDAI - ) - public - view - returns( - uint256 /*returnAmount*/, - uint256[] memory /*distribution*/ - ) - { - return oneSplitView.getExpectedReturn( - fromToken, - toToken, - amount, - parts, - flags - ); - } - - function swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, // [Uniswap, Kyber, Bancor, Oasis] - uint256 flags // 16 - Compound, 32 - Fulcrum, 64 - Chai, 128 - Aave, 256 - SmartToken, 1024 - bDAI - ) public payable { - fromToken.universalTransferFrom(msg.sender, address(this), amount); - uint256 confirmed = fromToken.universalBalanceOf(address(this)); - _swap(fromToken, toToken, confirmed, distribution, flags); - - uint256 returnAmount = toToken.universalBalanceOf(address(this)); - require(returnAmount >= minReturn, "OneSplit: actual return amount is less than minReturn"); - toToken.universalTransfer(msg.sender, returnAmount); - fromToken.universalTransfer(msg.sender, fromToken.universalBalanceOf(address(this))); - } - - function _swapFloor( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - (bool success, bytes memory data) = address(oneSplit).delegatecall( - abi.encodeWithSelector( - this.swap.selector, - fromToken, - toToken, - amount, - 0, - distribution, - flags - ) - ); - - assembly { - switch success - // delegatecall returns 0 on error. - case 0 { revert(add(data, 32), returndatasize) } - } - } -} diff --git a/README.md b/README.md index ad2385a..fcc8d00 100644 --- a/README.md +++ b/README.md @@ -1,567 +1,6 @@ -# 1inch on-chain DeFi aggregation protocol +# 1inch Router -First ever fully on-chain DEX aggregator protocol by 1inch +[![Build Status](https://github.com/CryptoManiacsZone/1inchRouter/workflows/CI/badge.svg)](https://github.com/CryptoManiacsZone/1inchRouter/actions) +[![Coverage Status](https://coveralls.io/repos/github/CryptoManiacsZone/1inchRouter/badge.svg?branch=master)](https://coveralls.io/github/CryptoManiacsZone/1inchRouter?branch=master) -[![Build Status](https://travis-ci.org/CryptoManiacsZone/1split.svg?branch=master)](https://travis-ci.org/CryptoManiacsZone/1split) -[![Coverage Status](https://coveralls.io/repos/github/CryptoManiacsZone/1split/badge.svg?branch=master)](https://coveralls.io/github/CryptoManiacsZone/1split?branch=master) -[![Built-with openzeppelin](https://img.shields.io/badge/built%20with-OpenZeppelin-3677FF)](https://docs.openzeppelin.com/) - -# Integration - -Latest version is always accessible at [1split.eth](https://etherscan.io/address/1split.eth) (beta on [1proto.eth](https://etherscan.io/address/1proto.eth)) - -Start with checking out solidity interface: [IOneSplit.sol](https://github.com/CryptoManiacsZone/1split/blob/master/contracts/IOneSplit.sol) - -## How it works - -This smart contract allows to get best price for tokens by aggregating prices from several DEXes. - -So far the service works with 2 types of exchages: `split` and `wrap`. - -List of `split` exchanges: -``` -let splitExchanges = [ - "Uniswap", - "Kyber", - "Bancor", - "Oasis", - "Curve Compound", - "Curve USDT", - "Curve Y", - "Curve Binance", - "Curve Synthetix", - "Uniswap Compound", - "Uniswap CHAI", - "Uniswap Aave", - "Mooniswap", - "Uniswap V2", - "Uniswap V2 ETH", - "Uniswap V2 DAI", - "Uniswap V2 USDC", - "Curve Pax", - "Curve renBTC", - "Curve tBTC", - "Dforce XSwap", - "Shell", - "mStable mUSD", - "Curve sBTC", - "Balancer 1", - "Balancer 2", - "Balancer 3", - "Kyber 1", - "Kyber 2", - "Kyber 3", - "Kyber 4" -] -``` - -List of `wrap` exchanges: -``` -let wrapExchanges = [ - "CHAI", - "BDAI", - "Aave", - "Fulcrum", - "Compound", - "Iearn", - "Idle", - "WETH", - "mUSD" -] -``` - -![How it works](./img/howitworks.png) - -## How to use it - -To use this service you have to call methods at [OneSplitAudit](https://github.com/CryptoManiacsZone/1inchProtocol/blob/master/contracts/OneSplitAudit.sol) - -![How to use it](./img/howtouseit.png) - -To swap tokens you have to figure out way from left to right points by one of paths on scheme above. - -For example, first of all call method `getExpectedReturn` (see methods section), it returns `distribution` array. Each element of this array matches element of `splitExchanges` (see above) and represents fraction of trading volume.
-Then call `getExpectedReturnWithGas` to take into account gas when splitting. This method returns more profitable `distribution` array for exchange.
-Then call method `swap` or `swapWithReferral` (see methods section) with param `distribution` which was recieved earlier from method `getExpectedReturn`. - -Swap may be customized by flags (see flags section). There are 2 types of swap: direct swap and swap over transitional token. - -In case of direct swap each element of `distribution` array matches element of `splitExchanges` and represents fraction of trading off token as alerady described above. - -In case of swap with transitional token each element of `distribution` (256 bits) matches 2 swaps: second bytes are equal to swap to transitional token, lowest bytes are equal to swap to the desired token. - -## Supported DEXes - -- [Uniswap](https://v1.uniswap.exchange/) -- [Uniswap V2](https://uniswap.exchange/) -- [Kyber](https://kyber.network/) -- [Bancor](https://bancor.network/) -- [Oasis](https://oasis.app/) -- [Curve](https://curve.fi/) -- [Mooniswap]() -- [Dforce XSwap](https://trade.dforce.network/) -- [Shell](https://www.shellprotocol.io/) -- [mStable](https://app.mstable.org/) -- [CHAI](https://Chai.money/) -- [BDAI](https://btu-protocol.com/) -- [Aave](https://aave.com/) -- [Fulcrum](https://fulcrum.trade/) -- [Compound](https://compound.finance/) -- [Iearn](https://iearn.finance/) -- [Idle](https://idle.finance/) -- [WETH](https://weth.io/ru/) - - -## Methods - -If you need Ether instead of any token use `address(0)` or `address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)` as param `fromToken`/`destToken` - -### getExpectedReturn -``` -function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags -) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) -``` - -Calculate expected returning amount of desired token - -| Params | Type | Description | -| ----- | ----- | ----- | -| fromToken | IERC20 | Address of trading off token | -| destToken | IERC20 | Address of desired token | -| amount | uint256 | Amount for `fromToken` | -| parts | uint256 | Number of pieces source volume could be splitted (Works like granularity, higly affects gas usage. Should be called offchain, but could be called onchain if user swaps not his own funds, but this is still considered as not safe) | -| flags | uint256 | Flags for enabling and disabling some features (default: `0`), see flags description | - -Return values: - -| Params | Type | Description | -| ----- | ----- | ----- | -| returnAmount | uint256 | Expected returning amount of desired token | -| distribution | uint256[] | Array of weights for volume distribution | - -**Notice:** This method is equal to `getExpectedReturnWithGas(fromToken, destToken, amount, parts, flags, 0)` - -**Example:** -``` -let Web3 = require('web3') - -let provider = new Web3.providers.WebsocketProvider('wss://mainnet.infura.io/ws/v3/YOUR_TOKEN') -let web3 = new Web3(provider) - -let ABI = [{"inputs":[{"internalType":"contract IOneSplitMulti","name":"impl","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"newImpl","type":"address"}],"name":"ImplementationUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"contract IERC20","name":"fromToken","type":"address"},{"indexed":true,"internalType":"contract IERC20","name":"destToken","type":"address"},{"indexed":false,"internalType":"uint256","name":"fromTokenAmount","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"destTokenAmount","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"minReturn","type":"uint256"},{"indexed":false,"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"indexed":false,"internalType":"uint256[]","name":"flags","type":"uint256[]"},{"indexed":false,"internalType":"address","name":"referral","type":"address"},{"indexed":false,"internalType":"uint256","name":"feePercent","type":"uint256"}],"name":"Swapped","type":"event"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"constant":true,"inputs":[],"name":"chi","outputs":[{"internalType":"contract IFreeFromUpTo","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"asset","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"claimAsset","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"parts","type":"uint256"},{"internalType":"uint256","name":"flags","type":"uint256"}],"name":"getExpectedReturn","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"parts","type":"uint256"},{"internalType":"uint256","name":"flags","type":"uint256"},{"internalType":"uint256","name":"destTokenEthPriceTimesGasPrice","type":"uint256"}],"name":"getExpectedReturnWithGas","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256","name":"estimateGasAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20[]","name":"tokens","type":"address[]"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256[]","name":"parts","type":"uint256[]"},{"internalType":"uint256[]","name":"flags","type":"uint256[]"},{"internalType":"uint256[]","name":"destTokenEthPriceTimesGasPrices","type":"uint256[]"}],"name":"getExpectedReturnWithGasMulti","outputs":[{"internalType":"uint256[]","name":"returnAmounts","type":"uint256[]"},{"internalType":"uint256","name":"estimateGasAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"isOwner","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"oneSplitImpl","outputs":[{"internalType":"contract IOneSplitMulti","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IOneSplitMulti","name":"impl","type":"address"}],"name":"setNewImpl","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256","name":"flags","type":"uint256"}],"name":"swap","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20[]","name":"tokens","type":"address[]"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256[]","name":"flags","type":"uint256[]"}],"name":"swapMulti","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256","name":"flags","type":"uint256"},{"internalType":"address","name":"referral","type":"address"},{"internalType":"uint256","name":"feePercent","type":"uint256"}],"name":"swapWithReferral","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20[]","name":"tokens","type":"address[]"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256[]","name":"flags","type":"uint256[]"},{"internalType":"address","name":"referral","type":"address"},{"internalType":"uint256","name":"feePercent","type":"uint256"}],"name":"swapWithReferralMulti","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] -let CONTRACT_ADDRESS = "0xC586BeF4a0992C495Cf22e1aeEE4E446CECDee0E" - -let contract = new web3.eth.Contract(ABI, CONTRACT_ADDRESS) -contract.methods.getExpectedReturn( - "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", - "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359", - 100, - 10, - 0 -).call().then(data => { - console.log(`returnAmount: ${data.returnAmount.toString()}`) - console.log(`distribution: ${JSON.stringify(data.distribution)}`) -}).catch(error => { - // TO DO: ... -}); -``` - -### getExpectedReturnWithGas -``` -function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice -) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) -``` - -Calculate expected returning amount of desired token taking into account how gas protocols affect price - -| Params | Type | Description | -| ----- | ----- | ----- | -| fromToken | IERC20 | Address of trading off token | -| destToken | IERC20 | Address of desired token | -| amount | uint256 | Amount for `fromToken` | -| parts | uint256 | Number of pieces source volume could be splitted (Works like granularity, higly affects gas usage. Should be called offchain, but could be called onchain if user swaps not his own funds, but this is still considered as not safe) | -| flags | uint256 | Flags for enabling and disabling some features (default: `0`), see flags description | -| destTokenEthPriceTimesGasPrice | uint256 | `returnAmount * gas_price`, where `returnAmount` is result of `getExpectedReturn(fromToken, destToken, amount, parts, flags)` | - -Return values: - -| Params | Type | Description | -| ----- | ----- | ----- | -| returnAmount | uint256 | Expected returning amount of desired token | -| estimateGasAmount | uint256 | Expected gas amount of exchange | -| distribution | uint256[] | Array of weights for volume distribution | - -**Example:** -``` - // TO DO: ... -``` - -### getExpectedReturnWithGasMulti -``` -function getExpectedReturnWithGasMulti( - IERC20[] memory tokens, - uint256 amount, - uint256[] memory parts, - uint256[] memory flags, - uint256[] memory destTokenEthPriceTimesGasPrices -) - public - view - returns( - uint256[] memory returnAmounts, - uint256 estimateGasAmount, - uint256[] memory distribution - ) -``` - -Calculate expected returning amount of first `tokens` element to last `tokens` element through and the middle tokens with corresponding `parts`, `flags` and `destTokenEthPriceTimesGasPrices` array values of each step.
-The length of each array (`parts`, `flags` and `destTokenEthPriceTimesGasPrices`) should be 1 element less than `tokens` array length. Each element from `parts`, `flags` and `destTokenEthPriceTimesGasPrices` corresponds to 2 neighboring elements from `tokens` array. - -| Params | Type | Description | -| ----- | ----- | ----- | -| tokens | IERC20[] | The sequence of tokens swaps (`tokens[0] -> tokens[1] -> ...`) | -| amount | uint256 | Amount for `tokens[0]` | -| parts | uint256[] | The sequence of number of pieces source volume could be splitted (Works like granularity, higly affects gas usage. Should be called offchain, but could be called onchain if user swaps not his own funds, but this is still considered as not safe) | -| flags | uint256[] | The sequence of flags for enabling and disabling some features (default: `0`), see flags description | -| destTokenEthPriceTimesGasPrice | uint256[] | The sequence of numbers `returnAmount * gas_price`, where `returnAmount` is result of `getExpectedReturn(fromToken, destToken, amount, parts, flags)` | - -Return values: - -| Params | Type | Description | -| ----- | ----- | ----- | -| returnAmount | uint256[] | Expected returning amounts of desired tokens in `tokens` array | -| estimateGasAmount | uint256 | Expected gas amount of exchange | -| distribution | uint256[] | Array of weights for volume distribution | - -**Example:** -``` - // TO DO: ... -``` - -### swap -``` -function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags -) public payable returns(uint256) -``` - -Swap `amount` of `fromToken` to `destToken` - -| Params | Type | Description | -| ----- | ----- | ----- | -| fromToken | IERC20 | Address of trading off token | -| destToken | IERC20 | Address of desired token | -| amount | uint256 | Amount for `fromToken` | -| minReturn | uint256 | Minimum expected return, else revert transaction | -| distribution | uint256[] | Array of weights for volume distribution (returned by `getExpectedReturn`) | -| flags | uint256 | Flags for enabling and disabling some features (default: `0`), see flags description | - -**Notice:** Make sure the `flags` param coincides `flags` param in `getExpectedReturn` method if you want the same result - -**Notice:** This method is equal to `swapWithReferral(fromToken, destToken, amount, minReturn, distribution, flags, address(0), 0)` - -Return values: - -| Params | Type | Description | -| ----- | ----- | ----- | -| returnAmount | uint256 | Recieved amount of desired token | - -**Example:** -``` - // TO DO: ... -``` - -### swapMulti -``` -function swapMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags -) public payable returns(uint256) -``` - -Swap `amount` of first element of `tokens` to the latest element.
-The length of `flags` array should be 1 element less than `tokens` array length. Each element from `flags` array corresponds to 2 neighboring elements from `tokens` array. - -| Params | Type | Description | -| ----- | ----- | ----- | -| tokens | IERC20[] | Addresses of tokens or `address(0)` for Ether | -| amount | uint256 | Amount for `tokens[0]` | -| minReturn | uint256 | Minimum expected return, else revert transaction | -| distribution | uint256[] | Array of weights for volume distribution (returned by `getExpectedReturn`) | -| flags | uint256[] | The sequence of flags for enabling and disabling some features (default: `0`), see flags description | - -**Notice:** Make sure the `flags` param coincides `flags` param in `getExpectedReturnWithGasMulti` method if you want the same result - -**Notice:** This method is equal to `swapWithReferralMulti(fromToken, destToken, amount, minReturn, distribution, flags, address(0), 0)` - -Return values: - -| Params | Type | Description | -| ----- | ----- | ----- | -| returnAmount | uint256 | Recieved amount of desired token | - -**Example:** -``` - // TO DO: ... -``` - -### swapWithReferral -``` -function swapWithReferral( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags, - address referral, - uint256 feePercent -) public payable returns(uint256) -``` - -Swap `amount` of `fromToken` to `destToken` - -| Params | Type | Description | -| ----- | ----- | ----- | -| fromToken | IERC20 | Address of trading off token | -| destToken | IERC20 | Address of desired token | -| amount | uint256 | Amount for `fromToken` | -| minReturn | uint256 | Minimum expected return, else revert transaction | -| distribution | uint256[] | Array of weights for volume distribution (returned by `getExpectedReturn`) | -| flags | uint256 | Flags for enabling and disabling some features (default: `0`), see flags description | -| referral | address | Referrer's address (exception with flag `FLAG_ENABLE_REFERRAL_GAS_SPONSORSHIP`) | -| feePercent | uint256 | Fees percents normalized to 1e18, limited to 0.03e18 (3%) | - -**Notice:** Make sure the `flags` param coincides `flags` param in `getExpectedReturn` method if you want the same result - -Return values: - -| Params | Type | Description | -| ----- | ----- | ----- | -| returnAmount | uint256 | Recieved amount of desired token | - -**Example:** -``` - // TO DO: ... -``` - -### swapWithReferralMulti -``` -function swapWithReferralMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags, - address referral, - uint256 feePercent -) public payable returns(uint256 returnAmount) -``` - -Swap `amount` of first element of `tokens` to the latest element.
-The length of `flags` array should be 1 element less than `tokens` array length. Each element from `flags` array corresponds to 2 neighboring elements from `tokens` array. - - -| Params | Type | Description | -| ----- | ----- | ----- | -| tokens | IERC20[] | Addresses of tokens or `address(0)` for Ether | -| amount | uint256 | Amount for `tokens[0]` | -| minReturn | uint256 | Minimum expected return, else revert transaction | -| distribution | uint256[] | Array of weights for volume distribution (returned by `getExpectedReturn`) | -| flags | uint256[] | The sequence of flags for enabling and disabling some features (default: `0`), see flags description | -| referral | address | Referrer's address (exception with flag `FLAG_ENABLE_REFERRAL_GAS_SPONSORSHIP`) | -| feePercent | uint256 | Fees percents normalized to 1e18, limited to 0.03e18 (3%) | - -**Notice:** Make sure the `flags` param coincides `flags` param in `getExpectedReturnWithGasMulti` method if you want the same result - -Return values: - -| Params | Type | Description | -| ----- | ----- | ----- | -| returnAmount | uint256 | Recieved amount of desired token | - -**Example:** -``` - // TO DO: ... -``` - -### makeGasDiscount -``` -function makeGasDiscount( - uint256 gasSpent, - uint256 returnAmount, - bytes calldata msgSenderCalldata -) -``` - -In case developer wants to manage burning `GAS` or `CHI` tokens with developer's own smartcontract one should implement this method and use `FLAG_ENABLE_REFERRAL_GAS_SPONSORSHIP` flag. `1proto.eth` will call `makeGasDiscount` in developer's smartcontract. - -| Params | Type | Description | -| ----- | ----- | ----- | -| gasSpent | uint256 | How many gas was spent | -| returnAmount | uint256 | Recieved amount of desired token | -| msgSenderCalldata | bytes | Arguments from `swap`, `swapWithReferral` or `swapWithReferralMulti` method | - -**Notice:** There is no such method in `1proto.eth`. - -## Flags -### Flag types - There are basically 3 types of flags: - 1. **Exchange switch**
- This flags allow `1split.eth` to enable or disable using exchange pools for swap. This can be applied for exchanges in genereral, for example: `split`, `wrap`, or this can be applied for a specific exchange type, for example: `bancor`, `oasis`.
- This flags may be used in any combination.
- - 2. **Transitional token selector**
- This flags provide to swap from `fromToken` to `destToken` using transitional token.
- This flags cann't be used in combination with the same type.
- - 3. **Functional flags**
- This flags provide some additional features.
- This flags may be used in any combination. - -### Flags description -`flags` param in `1split.eth` methods is sum of flags values, for example: -``` -flags = FLAG_DISABLE_UNISWAP + FLAG_DISABLE_KYBER + ... -``` - -- **Exchange switch (`Split` exchanges)** - - | Flag | Value | Description | - | ---- | ---- | ---- | - | FLAG_DISABLE_UNISWAP | `0x01` | Exclude `Uniswap` exchange from swap | - | FLAG_ENABLE_KYBER_UNISWAP_RESERVE | `0x100000000` | Permit `Kyber` use `Uniswap`, by default it is forbidden | - | FLAG_ENABLE_KYBER_OASIS_RESERVE | `0x200000000` | Permit `Kyber` use `Oasis`, by default it is forbidden | - | FLAG_ENABLE_KYBER_BANCOR_RESERVE | `0x400000000` | Permit `Kyber` use `Bancor`, by default it is forbidden | - | FLAG_DISABLE_BANCOR | `0x04` | Exclude `Bancor` exchange from swap | - | FLAG_DISABLE_OASIS | `0x08` | Exclude `Oasis` exchange from swap | - | FLAG_DISABLE_CURVE_COMPOUND | `0x1000` | Exclude `CurveCompound` exchange from swap | - | FLAG_DISABLE_CURVE_USDT | `0x2000` | Exclude `CurveUsdt` exchange from swap | - | FLAG_DISABLE_CURVE_Y | `0x4000` | Exclude `CurveY` exchange from swap | - | FLAG_DISABLE_CURVE_BINANCE | `0x8000` | Exclude `CurveBinance` exchange from swap | - | FLAG_DISABLE_CURVE_SYNTHETIX | `0x40000` | Exclude `CurveSynthetix` exchange from swap | - | FLAG_DISABLE_UNISWAP_COMPOUND | `0x100000` | Forbid `Uniswap` use `Compound`, by default it is permitted. Works only when one of assets is `ETH` | - | FLAG_DISABLE_UNISWAP_CHAI | `0x200000` | Forbid `Uniswap` use `Chai`, by default it is permitted. Works only when `ETH<>DAI` | - | FLAG_DISABLE_UNISWAP_AAVE | `0x400000` | Forbid `Uniswap` use `Aave`, by default it is permitted. Works only when one of assets is `ETH` | - | FLAG_DISABLE_MOONISWAP | `0x1000000` | Exclude `Mooniswap` exchange from swap | - | FLAG_DISABLE_UNISWAP_V2_ALL | `0x1E000000` | Exclude all exchanges with `UniswapV2` prefix from swap | - | FLAG_DISABLE_UNISWAP_V2 | `0x2000000` | Exclude `UniswapV2` exchange from swap | - | FLAG_DISABLE_UNISWAP_V2_ETH | `0x4000000` | Exclude `UniswapV2ETH` exchange from swap | - | FLAG_DISABLE_UNISWAP_V2_DAI | `0x8000000` | Exclude `UniswapV2DAI` exchange from swap | - | FLAG_DISABLE_UNISWAP_V2_USDC | `0x10000000` | Exclude `UniswapV2USDC` exchange from swap | - | FLAG_DISABLE_ALL_SPLIT_SOURCES | `0x20000000` | Exclude all `split` exchages from swap. Inverts `split` tokens flag values | - | FLAG_DISABLE_CURVE_PAX | `0x80000000` | Exclude `CurvePax` exchange from swap | - | FLAG_DISABLE_CURVE_RENBTC | `0x100000000` | Exclude `CurveRenBtc` exchange from swap | - | FLAG_DISABLE_CURVE_TBTC | `0x200000000` | Exclude `CurveTBtc` exchange from swap | - | FLAG_DISABLE_DFORCE_SWAP | `0x4000000000` | Exclude `DforceSwap` exchange from swap | - | FLAG_DISABLE_SHELL | `0x8000000000` | Exclude `Shellexchangers` exchange from swap | - | FLAG_DISABLE_MSTABLE_MUSD | `0x20000000000` | Exclude pool `MUSD` in `mStable` exchange from swap | - | FLAG_DISABLE_CURVE_SBTC | `0x40000000000` | Exclude pool `SBTC` in `Curve` exchange from swap | - | FLAG_DISABLE_DMM | `0x80000000000` | Exclude `DMM` exchange from swap | - | FLAG_DISABLE_UNISWAP_ALL | `0x100000000000` | Exclude all pools in `Uniswap` exchange from swap | - | FLAG_DISABLE_CURVE_ALL | `0x200000000000` | Exclude all pools in `Curve` exchange from swap | - | FLAG_DISABLE_BALANCER_ALL | `0x1000000000000` | Exclude all pools in `Balancer` exchange from swap | - | FLAG_DISABLE_BALANCER_1 | `0x2000000000000` | Exclude the first best pool in `Balancer` exchange from swap | - | FLAG_DISABLE_BALANCER_2 | `0x4000000000000` | Exclude the second best pool in `Balancer` exchange from swap | - | FLAG_DISABLE_BALANCER_3 | `0x8000000000000` | Exclude the third best pool in `Balancer` exchange from swap | - | FLAG_DISABLE_KYBER_ALL | `0x200000000000000` | Exclude all pools in `Kyber` exchange from swap | - | FLAG_DISABLE_KYBER_1 | `0x400000000000000` | Exclude the first multi-token `Kyber` reserve (exchange of any token to any is possible) from swap (see [KyberReserves](./KyberReserves.md)) | - | FLAG_DISABLE_KYBER_2 | `0x800000000000000` | Exclude the second multi-token `Kyber` reserve (exchange of any token to any is possible) from swap (see [KyberReserves](./KyberReserves.md)) | - | FLAG_DISABLE_KYBER_3 | `0x1000000000000000` | Exclude the third multi-token `Kyber` reserve (exchange of any token to any is possible) from swap (see [KyberReserves](./KyberReserves.md)) | - | FLAG_DISABLE_KYBER_4 | `0x2000000000000000` | Exclude the single-token `Kyber` reserve (single-token reserves does not intersect and the one that fits is selected) from swap (see [KyberReserves](./KyberReserves.md)) | - - **Example:** - ``` - let Web3 = require('web3') - - let provider = new Web3.providers.WebsocketProvider('wss://mainnet.infura.io/ws/v3/YOUR_TOKEN') - let web3 = new Web3(provider) - - let ABI = [{"inputs":[{"internalType":"contract IOneSplitMulti","name":"impl","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"newImpl","type":"address"}],"name":"ImplementationUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"contract IERC20","name":"fromToken","type":"address"},{"indexed":true,"internalType":"contract IERC20","name":"destToken","type":"address"},{"indexed":false,"internalType":"uint256","name":"fromTokenAmount","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"destTokenAmount","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"minReturn","type":"uint256"},{"indexed":false,"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"indexed":false,"internalType":"uint256[]","name":"flags","type":"uint256[]"},{"indexed":false,"internalType":"address","name":"referral","type":"address"},{"indexed":false,"internalType":"uint256","name":"feePercent","type":"uint256"}],"name":"Swapped","type":"event"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"constant":true,"inputs":[],"name":"chi","outputs":[{"internalType":"contract IFreeFromUpTo","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"asset","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"claimAsset","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"parts","type":"uint256"},{"internalType":"uint256","name":"flags","type":"uint256"}],"name":"getExpectedReturn","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"parts","type":"uint256"},{"internalType":"uint256","name":"flags","type":"uint256"},{"internalType":"uint256","name":"destTokenEthPriceTimesGasPrice","type":"uint256"}],"name":"getExpectedReturnWithGas","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"},{"internalType":"uint256","name":"estimateGasAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"contract IERC20[]","name":"tokens","type":"address[]"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256[]","name":"parts","type":"uint256[]"},{"internalType":"uint256[]","name":"flags","type":"uint256[]"},{"internalType":"uint256[]","name":"destTokenEthPriceTimesGasPrices","type":"uint256[]"}],"name":"getExpectedReturnWithGasMulti","outputs":[{"internalType":"uint256[]","name":"returnAmounts","type":"uint256[]"},{"internalType":"uint256","name":"estimateGasAmount","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"isOwner","outputs":[{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"oneSplitImpl","outputs":[{"internalType":"contract IOneSplitMulti","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IOneSplitMulti","name":"impl","type":"address"}],"name":"setNewImpl","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256","name":"flags","type":"uint256"}],"name":"swap","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20[]","name":"tokens","type":"address[]"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256[]","name":"flags","type":"uint256[]"}],"name":"swapMulti","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20","name":"fromToken","type":"address"},{"internalType":"contract IERC20","name":"destToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256","name":"flags","type":"uint256"},{"internalType":"address","name":"referral","type":"address"},{"internalType":"uint256","name":"feePercent","type":"uint256"}],"name":"swapWithReferral","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"contract IERC20[]","name":"tokens","type":"address[]"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"minReturn","type":"uint256"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"internalType":"uint256[]","name":"flags","type":"uint256[]"},{"internalType":"address","name":"referral","type":"address"},{"internalType":"uint256","name":"feePercent","type":"uint256"}],"name":"swapWithReferralMulti","outputs":[{"internalType":"uint256","name":"returnAmount","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}] - let CONTRACT_ADDRESS = "0xC586BeF4a0992C495Cf22e1aeEE4E446CECDee0E" - - let splitExchanges = [ - "Uniswap", "Kyber", "Bancor", "Oasis", "CurveCompound", "CurveUsdt", "CurveY", "CurveBinance", "CurveSynthetix", "UniswapCompound", "UniswapChai", "UniswapAave", "Mooniswap", "UniswapV2", "UniswapV2ETH", "UniswapV2DAI", "UniswapV2USDC", "CurvePax", "CurveRenBtc", "CurveTBtc", "DforceSwap", "Shellexchangers" - ] - - let parts = 10 - - let contract = new web3.eth.Contract(ABI, CONTRACT_ADDRESS) - contract.methods.getExpectedReturn( - "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", - "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359", - 100, - parts, - 0x04 - ).call().then(data => { - - data.distribution.forEach(function(value, index) { - console.log(`${splitExchanges[index]}: ${value*100/parts}%`) - }) - }).catch(error => { - // TO DO: ... - }); - ``` - -- **Exchange switch (`Wrap` exchanges)** - - | Flag | Value | Description | - | ---- | ---- | ---- | - | FLAG_DISABLE_COMPOUND | `0x10` | Exclude `Compound` exchange from swap | - | FLAG_DISABLE_FULCRUM | `0x20` | Exclude `Fulcrum` exchange from swap | - | FLAG_DISABLE_CHAI | `0x40` | Exclude `Chai` exchange from swap | - | FLAG_DISABLE_AAVE | `0x80` | Exclude `Aave` exchange from swap | - | FLAG_DISABLE_SMART_TOKEN | `0x100` | Exclude `SmartToken` exchange from swap | - | FLAG_DISABLE_BDAI | `0x400` | Exclude `Bdai` exchange from swap | - | FLAG_DISABLE_IEARN | `0x800` | Exclude `Iearn` exchange from swap | - | FLAG_DISABLE_WETH | `0x80000` | Exclude `Weth` exchange from swap | - | FLAG_DISABLE_IDLE | `0x800000` | Exclude `Idle` exchange from swap | - | FLAG_DISABLE_ALL_WRAP_SOURCES | `0x40000000` | Exclude all `wrap` exchages from swap. Inverts `wrap` tokens flag values | - -- **Transitional token selector** - - | Flag | Value | Description | - | ---- | ---- | ---- | - | FLAG_DISABLE_UNISWAP_COMPOUND | `0x100000` | Exclude `Uniswap` pools with `cTokens` | - | FLAG_DISABLE_UNISWAP_CHAI | `0x200000` | Exclude `Uniswap` pools with `Chai` | - | FLAG_DISABLE_UNISWAP_AAVE | `0x400000` | Exclude `Uniswap` pools with `aTokens` | - -- **Functional flags** - - | Flag | Value | Description | - | ---- | ---- | ---- | - | FLAG_ENABLE_CHI_BURN | `0x10000000000` | Burns `CHI` token to save gas. Make sure to approve `CHI` token to `1split.eth` smart contract | - | FLAG_ENABLE_CHI_BURN_BY_ORIGIN | `0x4000000000000000` | This flag extends the functionality of `FLAG_ENABLE_CHI_BURN` flag. Burns `CHI` token from address which sign swap transaction instead of address which call swap method | - | FLAG_ENABLE_REFERRAL_GAS_SPONSORSHIP | `0x80000000000000` | Turning on this flag means that parameter `referral` (methods `swapWithReferral` and `swapWithReferralMulti`) matches the address of the user smartcontract which has `makeGasDiscount` method. So this method can burn `GAS` token, `CHI` token by itself or it can add other functionality.| +Fully on-chain version of 1inch.exchange aggregator: [1router.eth](https://etherscan.io/address/1router.eth) diff --git a/codechecks.yml b/codechecks.yml new file mode 100644 index 0000000..8a63042 --- /dev/null +++ b/codechecks.yml @@ -0,0 +1,2 @@ +checks: + - name: eth-gas-reporter/codechecks diff --git a/contracts/1inchProtocol-audit.pdf b/contracts/1inchProtocol-audit.pdf deleted file mode 100644 index 67d437f0e7cd22c565a235b698e6ec4f62e96ec4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187086 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

aMyO}#<_?aPMwf?pK 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

euiocJIcC!Aa8{-U2RW|Ipaj8#;ECoh-QQhe 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

8ppBg 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 Vu|&;w2Z=;)2}2^KYFSIz{{u4A!N&jq diff --git a/contracts/AaveRegistry.sol b/contracts/AaveRegistry.sol deleted file mode 100644 index a26cada..0000000 --- a/contracts/AaveRegistry.sol +++ /dev/null @@ -1,43 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/ownership/Ownable.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./interface/IAaveRegistry.sol"; -import "./UniversalERC20.sol"; - - -contract AaveRegistry is Ownable, IAaveRegistry { - using UniversalERC20 for IERC20; - - IAaveToken internal constant aETH = IAaveToken(0x3a3A65aAb0dd2A17E3F1947bA16138cd37d08c04); - IERC20 internal constant ETH = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - mapping(address => address) private _tokenByAToken; - mapping(address => address) private _aTokenByToken; - - function tokenByAToken(IAaveToken aToken) external view returns(IERC20) { - if (aToken == aETH) { - return ETH; - } - return IERC20(_tokenByAToken[address(aToken)]); - } - - function aTokenByToken(IERC20 token) external view returns(IAaveToken) { - if (token.isETH()) { - return aETH; - } - return IAaveToken(_aTokenByToken[address(token)]); - } - - function addAToken(IAaveToken aToken) public onlyOwner { - IERC20 token = IERC20(aToken.underlyingAssetAddress()); - _tokenByAToken[address(aToken)] = address(token); - _aTokenByToken[address(token)] = address(aToken); - } - - function addATokens(IAaveToken[] calldata cTokens) external onlyOwner { - for (uint i = 0; i < cTokens.length; i++) { - addAToken(cTokens[i]); - } - } -} diff --git a/contracts/BalancerHelper.sol b/contracts/BalancerHelper.sol deleted file mode 100644 index de17495..0000000 --- a/contracts/BalancerHelper.sol +++ /dev/null @@ -1,40 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/math/SafeMath.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./interface/IBalancerPool.sol"; -import "./BalancerLib.sol"; - - -contract BalancerHelper { - using SafeMath for uint256; - - function getReturns( - IBalancerPool pool, - IERC20 fromToken, - IERC20 destToken, - uint256[] calldata amounts - ) - external - view - returns(uint256[] memory rets) - { - uint256 swapFee = pool.getSwapFee(); - uint256 fromBalance = pool.getBalance(fromToken); - uint256 destBalance = pool.getBalance(destToken); - uint256 fromWeight = pool.getDenormalizedWeight(fromToken); - uint256 destWeight = pool.getDenormalizedWeight(destToken); - - rets = new uint256[](amounts.length); - for (uint i = 0; i < amounts.length && amounts[i].mul(2) <= fromBalance; i++) { - rets[i] = BalancerLib.calcOutGivenIn( - fromBalance, - fromWeight, - destBalance, - destWeight, - amounts[i], - swapFee - ); - } - } -} diff --git a/contracts/BancorFinder.sol b/contracts/BancorFinder.sol deleted file mode 100644 index 34a67c0..0000000 --- a/contracts/BancorFinder.sol +++ /dev/null @@ -1,101 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./interface/IBancorContractRegistry.sol"; -import "./interface/IBancorConverterRegistry.sol"; -import "./UniversalERC20.sol"; - - -contract BancorFinder { - using UniversalERC20 for IERC20; - - IERC20 constant internal ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - IERC20 constant internal bnt = IERC20(0x1F573D6Fb3F13d689FF844B4cE37794d79a7FF1C); - IBancorContractRegistry constant internal bancorContractRegistry = IBancorContractRegistry(0x52Ae12ABe5D8BD778BD5397F99cA900624CfADD4); - - function buildBancorPath( - IERC20 fromToken, - IERC20 destToken - ) - public - view - returns(address[] memory path) - { - if (fromToken == destToken) { - return new address[](0); - } - - if (fromToken.isETH()) { - fromToken = ETH_ADDRESS; - } - if (destToken.isETH()) { - destToken = ETH_ADDRESS; - } - - if (fromToken == bnt || destToken == bnt) { - path = new address[](3); - } else { - path = new address[](5); - } - - address fromConverter; - address toConverter; - - IBancorConverterRegistry bancorConverterRegistry = IBancorConverterRegistry( - bancorContractRegistry.addressOf("BancorConverterRegistry") - ); - - if (fromToken != bnt) { - (bool success, bytes memory data) = address(bancorConverterRegistry).staticcall.gas(100000)(abi.encodeWithSelector( - bancorConverterRegistry.getConvertibleTokenSmartToken.selector, - fromToken.isETH() ? ETH_ADDRESS : fromToken, - 0 - )); - if (!success) { - return new address[](0); - } - - fromConverter = abi.decode(data, (address)); - if (fromConverter == address(0)) { - return new address[](0); - } - } - - if (destToken != bnt) { - (bool success, bytes memory data) = address(bancorConverterRegistry).staticcall.gas(100000)(abi.encodeWithSelector( - bancorConverterRegistry.getConvertibleTokenSmartToken.selector, - destToken.isETH() ? ETH_ADDRESS : destToken, - 0 - )); - if (!success) { - return new address[](0); - } - - toConverter = abi.decode(data, (address)); - if (toConverter == address(0)) { - return new address[](0); - } - } - - if (destToken == bnt) { - path[0] = address(fromToken); - path[1] = fromConverter; - path[2] = address(bnt); - return path; - } - - if (fromToken == bnt) { - path[0] = address(bnt); - path[1] = toConverter; - path[2] = address(destToken); - return path; - } - - path[0] = address(fromToken); - path[1] = fromConverter; - path[2] = address(bnt); - path[3] = toConverter; - path[4] = address(destToken); - return path; - } -} diff --git a/contracts/CompoundRegistry.sol b/contracts/CompoundRegistry.sol deleted file mode 100644 index d8d1a7f..0000000 --- a/contracts/CompoundRegistry.sol +++ /dev/null @@ -1,43 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/ownership/Ownable.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./interface/ICompoundRegistry.sol"; -import "./UniversalERC20.sol"; - - -contract CompoundRegistry is Ownable, ICompoundRegistry { - using UniversalERC20 for IERC20; - - ICompoundToken internal constant cETH = ICompoundToken(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5); - IERC20 internal constant ETH = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - mapping(address => address) private _tokenByCToken; - mapping(address => address) private _cTokenByToken; - - function tokenByCToken(ICompoundToken cToken) external view returns(IERC20) { - if (cToken == cETH) { - return ETH; - } - return IERC20(_tokenByCToken[address(cToken)]); - } - - function cTokenByToken(IERC20 token) external view returns(ICompoundToken) { - if (token.isETH()) { - return cETH; - } - return ICompoundToken(_cTokenByToken[address(token)]); - } - - function addCToken(ICompoundToken cToken) public onlyOwner { - IERC20 token = IERC20(cToken.underlying()); - _tokenByCToken[address(cToken)] = address(token); - _cTokenByToken[address(token)] = address(cToken); - } - - function addCTokens(ICompoundToken[] calldata cTokens) external onlyOwner { - for (uint i = 0; i < cTokens.length; i++) { - addCToken(cTokens[i]); - } - } -} diff --git a/contracts/IOneRouter.sol b/contracts/IOneRouter.sol new file mode 100644 index 0000000..d4a2ba1 --- /dev/null +++ b/contracts/IOneRouter.sol @@ -0,0 +1,122 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + +interface IOneRouterView { + struct Swap { + IERC20 destToken; + uint256 flags; + uint256 destTokenEthPriceTimesGasPrice; + address[] disabledDexes; + } + + struct Path { + Swap[] swaps; + } + + struct SwapResult { + uint256[] returnAmounts; + uint256[] estimateGasAmounts; + uint256[][] distributions; + address[][] dexes; + } + + struct PathResult { + SwapResult[] swaps; + } + + function getReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Swap calldata swap + ) + external + view + returns( + Path[] memory paths, + PathResult[] memory pathResults, + SwapResult memory splitResult + ); + + function getSwapReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Swap calldata swap + ) + external + view + returns(SwapResult memory result); + + function getPathReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Path calldata path + ) + external + view + returns(PathResult memory result); + + function getMultiPathReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Path[] calldata paths + ) + external + view + returns( + PathResult[] memory pathResults, + SwapResult memory splitResult + ); +} + + +abstract contract IOneRouter is IOneRouterView { + struct SwapInput { + IERC20 fromToken; + IERC20 destToken; + uint256 amount; + uint256 minReturn; + } + + struct SwapDistribution { + uint256[] weights; + } + + struct PathDistribution { + SwapDistribution[] swapDistributions; + } + + function makeSwap( + SwapInput calldata input, + Swap calldata swap, + SwapDistribution calldata swapDistribution + ) + external + payable + virtual + returns(uint256 returnAmount); + + function makePathSwap( + SwapInput calldata input, + Path calldata path, + PathDistribution calldata pathDistribution + ) + external + payable + virtual + returns(uint256 returnAmount); + + function makeMultiPathSwap( + SwapInput calldata input, + Path[] calldata paths, + PathDistribution[] calldata pathDistributions, + SwapDistribution calldata interPathsDistribution + ) + external + payable + virtual + returns(uint256 returnAmount); +} diff --git a/contracts/IOneSplit.sol b/contracts/IOneSplit.sol deleted file mode 100644 index e7b8b1e..0000000 --- a/contracts/IOneSplit.sol +++ /dev/null @@ -1,177 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - -// -// [ msg.sender ] -// | | -// | | -// \_/ -// +---------------+ ________________________________ -// | OneSplitAudit | _______________________________ \ -// +---------------+ \ \ -// | | ______________ | | (staticcall) -// | | / ____________ \ | | -// | | (call) / / \ \ | | -// | | / / | | | | -// \_/ | | \_/ \_/ -// +--------------+ | | +----------------------+ -// | OneSplitWrap | | | | OneSplitViewWrap | -// +--------------+ | | +----------------------+ -// | | | | | | -// | | (delegatecall) | | (staticcall) | | (staticcall) -// \_/ | | \_/ -// +--------------+ | | +------------------+ -// | OneSplit | | | | OneSplitView | -// +--------------+ | | +------------------+ -// | | / / -// \ \________________/ / -// \__________________/ -// - - -contract IOneSplitConsts { - // flags = FLAG_DISABLE_UNISWAP + FLAG_DISABLE_BANCOR + ... - uint256 internal constant FLAG_DISABLE_UNISWAP = 0x01; - uint256 internal constant DEPRECATED_FLAG_DISABLE_KYBER = 0x02; // Deprecated - uint256 internal constant FLAG_DISABLE_BANCOR = 0x04; - uint256 internal constant FLAG_DISABLE_OASIS = 0x08; - uint256 internal constant FLAG_DISABLE_COMPOUND = 0x10; - uint256 internal constant FLAG_DISABLE_FULCRUM = 0x20; - uint256 internal constant FLAG_DISABLE_CHAI = 0x40; - uint256 internal constant FLAG_DISABLE_AAVE = 0x80; - uint256 internal constant FLAG_DISABLE_SMART_TOKEN = 0x100; - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_ETH = 0x200; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_BDAI = 0x400; - uint256 internal constant FLAG_DISABLE_IEARN = 0x800; - uint256 internal constant FLAG_DISABLE_CURVE_COMPOUND = 0x1000; - uint256 internal constant FLAG_DISABLE_CURVE_USDT = 0x2000; - uint256 internal constant FLAG_DISABLE_CURVE_Y = 0x4000; - uint256 internal constant FLAG_DISABLE_CURVE_BINANCE = 0x8000; - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_DAI = 0x10000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_USDC = 0x20000; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_CURVE_SYNTHETIX = 0x40000; - uint256 internal constant FLAG_DISABLE_WETH = 0x80000; - uint256 internal constant FLAG_DISABLE_UNISWAP_COMPOUND = 0x100000; // Works only when one of assets is ETH or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_UNISWAP_CHAI = 0x200000; // Works only when ETH<>DAI or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_UNISWAP_AAVE = 0x400000; // Works only when one of assets is ETH or FLAG_ENABLE_MULTI_PATH_ETH - uint256 internal constant FLAG_DISABLE_IDLE = 0x800000; - uint256 internal constant FLAG_DISABLE_MOONISWAP = 0x1000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2 = 0x2000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_ETH = 0x4000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_DAI = 0x8000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_USDC = 0x10000000; - uint256 internal constant FLAG_DISABLE_ALL_SPLIT_SOURCES = 0x20000000; - uint256 internal constant FLAG_DISABLE_ALL_WRAP_SOURCES = 0x40000000; - uint256 internal constant FLAG_DISABLE_CURVE_PAX = 0x80000000; - uint256 internal constant FLAG_DISABLE_CURVE_RENBTC = 0x100000000; - uint256 internal constant FLAG_DISABLE_CURVE_TBTC = 0x200000000; - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_USDT = 0x400000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_WBTC = 0x800000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_TBTC = 0x1000000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_RENBTC = 0x2000000000; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_DFORCE_SWAP = 0x4000000000; - uint256 internal constant FLAG_DISABLE_SHELL = 0x8000000000; - uint256 internal constant FLAG_ENABLE_CHI_BURN = 0x10000000000; - uint256 internal constant FLAG_DISABLE_MSTABLE_MUSD = 0x20000000000; - uint256 internal constant FLAG_DISABLE_CURVE_SBTC = 0x40000000000; - uint256 internal constant FLAG_DISABLE_DMM = 0x80000000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_ALL = 0x100000000000; - uint256 internal constant FLAG_DISABLE_CURVE_ALL = 0x200000000000; - uint256 internal constant FLAG_DISABLE_UNISWAP_V2_ALL = 0x400000000000; - uint256 internal constant FLAG_DISABLE_SPLIT_RECALCULATION = 0x800000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_ALL = 0x1000000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_1 = 0x2000000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_2 = 0x4000000000000; - uint256 internal constant FLAG_DISABLE_BALANCER_3 = 0x8000000000000; - uint256 internal constant DEPRECATED_FLAG_ENABLE_KYBER_UNISWAP_RESERVE = 0x10000000000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_KYBER_OASIS_RESERVE = 0x20000000000000; // Deprecated, Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_KYBER_BANCOR_RESERVE = 0x40000000000000; // Deprecated, Turned off by default - uint256 internal constant FLAG_ENABLE_REFERRAL_GAS_SPONSORSHIP = 0x80000000000000; // Turned off by default - uint256 internal constant DEPRECATED_FLAG_ENABLE_MULTI_PATH_COMP = 0x100000000000000; // Deprecated, Turned off by default - uint256 internal constant FLAG_DISABLE_KYBER_ALL = 0x200000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_1 = 0x400000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_2 = 0x800000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_3 = 0x1000000000000000; - uint256 internal constant FLAG_DISABLE_KYBER_4 = 0x2000000000000000; - uint256 internal constant FLAG_ENABLE_CHI_BURN_BY_ORIGIN = 0x4000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_ALL = 0x8000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_ETH = 0x10000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_DAI = 0x20000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_USDC = 0x40000000000000000; - uint256 internal constant FLAG_DISABLE_MOONISWAP_POOL_TOKEN = 0x80000000000000000; -} - - -contract IOneSplit is IOneSplitConsts { - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ); - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ); - - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags - ) - public - payable - returns(uint256 returnAmount); -} - - -contract IOneSplitMulti is IOneSplit { - function getExpectedReturnWithGasMulti( - IERC20[] memory tokens, - uint256 amount, - uint256[] memory parts, - uint256[] memory flags, - uint256[] memory destTokenEthPriceTimesGasPrices - ) - public - view - returns( - uint256[] memory returnAmounts, - uint256 estimateGasAmount, - uint256[] memory distribution - ); - - function swapMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags - ) - public - payable - returns(uint256 returnAmount); -} diff --git a/contracts/ISource.sol b/contracts/ISource.sol new file mode 100644 index 0000000..6b4576e --- /dev/null +++ b/contracts/ISource.sol @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "./IOneRouter.sol"; + + +interface ISource { + function calculate(IERC20 fromToken, uint256[] calldata amounts, IOneRouterView.Swap calldata swap) + external view returns(uint256[] memory rets, address dex, uint256 gas); + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) external; +} diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol index a885c70..5c5aebf 100644 --- a/contracts/Migrations.sol +++ b/contracts/Migrations.sol @@ -1,4 +1,6 @@ -pragma solidity ^0.5.0; +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; contract Migrations { diff --git a/contracts/OneRouter.sol b/contracts/OneRouter.sol new file mode 100644 index 0000000..cd47435 --- /dev/null +++ b/contracts/OneRouter.sol @@ -0,0 +1,593 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/access/Ownable.sol"; +import "./interfaces/IUniswapV1.sol"; +import "./interfaces/IUniswapV2.sol"; +import "./interfaces/IBalancer.sol"; +import "./interfaces/IAaveRegistry.sol"; +import "./interfaces/ICompoundRegistry.sol"; +import "./IOneRouter.sol"; +import "./ISource.sol"; +import "./OneRouterConstants.sol"; + +import "./libraries/Algo.sol"; +import "./libraries/Address2.sol"; +import "./libraries/UniERC20.sol"; +import "./libraries/RevertReason.sol"; +import "./libraries/FlagsChecker.sol"; +import "./libraries/DynamicMemoryArray.sol"; + +import "./sources/UniswapV1Source.sol"; +import "./sources/UniswapV2Source.sol"; +import "./sources/MooniswapSource.sol"; +import "./sources/KyberSource.sol"; +import "./sources/CurveSource.sol"; +// import "./sources/BalancerSource.sol"; + + +contract PathsAdvisor { + using UniERC20 for IERC20; + + IWETH constant private _WETH = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); + IERC20 constant private DAI = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); + IERC20 constant private USDC = IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); + IERC20 constant private USDT = IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); + IERC20 constant private WBTC = IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); + + IAaveRegistry constant private _AAVE_REGISTRY = IAaveRegistry(0xEd8b133B7B88366E01Bb9E38305Ab11c26521494); + ICompoundRegistry constant private _COMPOUND_REGISTRY = ICompoundRegistry(0xF451Dbd7Ba14BFa7B1B78A766D3Ed438F79EE1D1); + + function getPathsForTokens(IERC20 fromToken, IERC20 destToken) external view returns(IERC20[][] memory paths) { + IERC20[4] memory midTokens = [DAI, USDC, USDT, WBTC]; + paths = new IERC20[][](2 + midTokens.length); + + IERC20 aFromToken = _AAVE_REGISTRY.aTokenByToken(fromToken); + IERC20 aDestToken = _AAVE_REGISTRY.aTokenByToken(destToken); + if (aFromToken != IERC20(0)) { + aFromToken = _COMPOUND_REGISTRY.cTokenByToken(fromToken); + } + if (aDestToken != IERC20(0)) { + aDestToken = _COMPOUND_REGISTRY.cTokenByToken(destToken); + } + + uint index = 0; + paths[index] = new IERC20[](0); + index++; + + if (!fromToken.isETH() && !aFromToken.isETH() && !destToken.isETH() && !aDestToken.isETH()) { + paths[index] = new IERC20[](1); + paths[index][0] = UniERC20.ETH_ADDRESS; + index++; + } + + for (uint i = 0; i < midTokens.length; i++) { + if (fromToken != midTokens[i] && aFromToken != midTokens[i] && destToken != midTokens[i] && aDestToken != midTokens[i]) { + paths[index] = new IERC20[]( + 1 + + ((aFromToken != IERC20(0)) ? 1 : 0) + + ((aDestToken != IERC20(0)) ? 1 : 0) + ); + + paths[index][0] = aFromToken; + paths[index][paths[index].length / 2] = midTokens[i]; + if (aDestToken != IERC20(0)) { + paths[index][paths[index].length - 1] = aDestToken; + } + index++; + } + } + + IERC20[][] memory paths2 = new IERC20[][](index); + for (uint i = 0; i < paths2.length; i++) { + paths2[i] = paths[i]; + } + paths = paths2; + } +} + + +contract HotSwapSources is Ownable { + uint256 public sourcesCount = 15; + mapping(uint256 => ISource) public sources; + PathsAdvisor public pathsAdvisor; + + constructor() public { + pathsAdvisor = new PathsAdvisor(); + } + + function setSource(uint256 index, ISource source) external onlyOwner { + require(index <= sourcesCount, "Router: index is too high"); + sources[index] = source; + sourcesCount = Math.max(sourcesCount, index + 1); + } + + function setPathsForTokens(PathsAdvisor newPathsAdvisor) external onlyOwner { + pathsAdvisor = newPathsAdvisor; + } + + function _getPathsForTokens(IERC20 fromToken, IERC20 destToken) internal view returns(IERC20[][] memory paths) { + return pathsAdvisor.getPathsForTokens(fromToken, destToken); + } +} + + +contract OneRouterView is + OneRouterConstants, + IOneRouterView, + HotSwapSources, + UniswapV1SourceView, + UniswapV2SourceView, + MooniswapSourceView, + KyberSourceView, + CurveSourceView + // BalancerSourceView +{ + using UniERC20 for IERC20; + using SafeMath for uint256; + using FlagsChecker for uint256; + using DynamicMemoryArray for DynamicMemoryArray.Addresses; + + function getReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) + public + view + override + returns( + Path[] memory paths, + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + IERC20[][] memory midTokens = _getPathsForTokens(fromToken, swap.destToken); + + paths = new Path[](midTokens.length); + pathResults = new PathResult[](paths.length); + DynamicMemoryArray.Addresses memory disabledDexes; + for (uint i = 0; i < paths.length; i++) { + paths[i] = Path({swaps: new Swap[](1 + midTokens[i - 1].length)}); + for (uint j = 0; j < midTokens[i - 1].length; j++) { + if (fromToken == midTokens[i - 1][j] || swap.destToken == midTokens[i - 1][j]) { + paths[i] = Path({swaps: new Swap[](1)}); + break; + } + + paths[i].swaps[j] = Swap({ + destToken: midTokens[i - 1][j], + flags: swap.flags, + destTokenEthPriceTimesGasPrice: _scaleDestTokenEthPriceTimesGasPrice(fromToken, midTokens[i - 1][j], swap.destTokenEthPriceTimesGasPrice), + disabledDexes: disabledDexes.copy() + }); + } + paths[i].swaps[paths[i].swaps.length - 1] = swap; + + pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); + for (uint j = 0; j < pathResults[i].swaps.length; j++) { + for (uint k = 0; k < pathResults[i].swaps[j].dexes.length; k++) { + for (uint t = 0; t < pathResults[i].swaps[j].dexes[k].length; t++) { + disabledDexes.push(pathResults[i].swaps[j].dexes[k][t]); + } + } + } + } + + splitResult = bestDistributionAmongPaths(paths, pathResults); + } + + function getMultiPathReturn(IERC20 fromToken, uint256[] memory amounts, Path[] memory paths) + public + view + override + returns( + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + pathResults = new PathResult[](paths.length); + for (uint i = 0; i < paths.length; i++) { + pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); + } + splitResult = bestDistributionAmongPaths(paths, pathResults); + } + + function bestDistributionAmongPaths(Path[] memory paths, PathResult[] memory pathResults) public pure returns(SwapResult memory) { + uint256[][] memory input = new uint256[][](paths.length); + uint256[][] memory gases = new uint256[][](paths.length); + uint256[][] memory costs = new uint256[][](paths.length); + for (uint i = 0; i < pathResults.length; i++) { + Swap memory subSwap = paths[i].swaps[paths[i].swaps.length - 1]; + SwapResult memory swapResult = pathResults[i].swaps[pathResults[i].swaps.length - 1]; + + input[i] = new uint256[](swapResult.returnAmounts.length); + gases[i] = new uint256[](swapResult.returnAmounts.length); + costs[i] = new uint256[](swapResult.returnAmounts.length); + for (uint j = 0; j < swapResult.returnAmounts.length; j++) { + input[i][j] = swapResult.returnAmounts[j]; + gases[i][j] = swapResult.estimateGasAmounts[j]; + costs[i][j] = swapResult.estimateGasAmounts[j].mul(subSwap.destTokenEthPriceTimesGasPrice).div(1e18); + } + } + return _findBestDistribution(input, costs, gases, input[0].length); + } + + function getPathReturn(IERC20 fromToken, uint256[] memory amounts, Path memory path) + public + view + override + returns(PathResult memory result) + { + result.swaps = new SwapResult[](path.swaps.length); + + for (uint i = 0; i < path.swaps.length; i++) { + result.swaps[i] = getSwapReturn(fromToken, amounts, path.swaps[i]); + fromToken = path.swaps[i].destToken; + amounts = result.swaps[i].returnAmounts; + } + } + + function getSwapReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) + public + view + override + returns(SwapResult memory result) + { + if (fromToken == swap.destToken) { + result.returnAmounts = amounts; + return result; + } + + function(IERC20,uint256[] memory,Swap memory) view returns(uint256[] memory, address, uint256)[15] memory reserves = [ + _calculateUniswapV1, + _calculateUniswapV2, + _calculateMooniswap, + _calculateKyber1, + _calculateKyber2, + _calculateKyber3, + _calculateKyber4, + _calculateCurveCompound, + _calculateCurveUSDT, + _calculateCurveY, + _calculateCurveBinance, + _calculateCurveSynthetix, + _calculateCurvePAX, + _calculateCurveRENBTC, + _calculateCurveSBTC + // _calculateBalancer1, + // _calculateBalancer2, + // _calculateBalancer3, + // calculateBancor, + // calculateOasis, + // calculateDforceSwap, + // calculateShell, + // calculateMStableMUSD, + // calculateBlackHoleSwap + ]; + + uint256[][] memory input = new uint256[][](sourcesCount); + uint256[][] memory gases = new uint256[][](sourcesCount); + uint256[][] memory costs = new uint256[][](sourcesCount); + bool invert = swap.flags.check(_FLAG_DISABLE_ALL_SOURCES); + for (uint i = 0; i < sourcesCount; i++) { + uint256 gas; + if (invert == swap.flags.check(1 << i)) { + if (sources[i] != ISource(0)) { + (input[i], , gas) = sources[i].calculate(fromToken, amounts, swap); + } + else if (i < reserves.length) { + (input[i], , gas) = reserves[i](fromToken, amounts, swap); + } + } + + gases[i] = new uint256[](amounts.length); + costs[i] = new uint256[](amounts.length); + uint256 fee = gas.mul(swap.destTokenEthPriceTimesGasPrice).div(1e18); + for (uint j = 0; j < amounts.length; j++) { + gases[i][j] = gas; + costs[i][j] = fee; + } + } + + result = _findBestDistribution(input, costs, gases, amounts.length); + } + + function _calculateNoReturn(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) + private view returns(uint256[] memory rets, uint256 gas) + { + } + + function _scaleDestTokenEthPriceTimesGasPrice(IERC20 fromToken, IERC20 destToken, uint256 destTokenEthPriceTimesGasPrice) private view returns(uint256) { + if (fromToken == destToken) { + return destTokenEthPriceTimesGasPrice; + } + + uint256 mul = _cheapGetPrice(UniERC20.ETH_ADDRESS, destToken, 0.001 ether); + uint256 div = _cheapGetPrice(UniERC20.ETH_ADDRESS, fromToken, 0.001 ether); + return (div == 0) ? 0 : destTokenEthPriceTimesGasPrice.mul(mul).div(div); + } + + function _cheapGetPrice(IERC20 fromToken, IERC20 destToken, uint256 amount) private view returns(uint256 returnAmount) { + uint256[] memory amounts = new uint256[](1); + amounts[0] = amount; + + uint256 flags = _FLAG_DISABLE_RECALCULATION | + _FLAG_DISABLE_ALL_SOURCES | + _FLAG_DISABLE_UNISWAP_V1 | + _FLAG_DISABLE_UNISWAP_V2; + + return this.getSwapReturn( + fromToken, + amounts, + Swap({ + destToken: destToken, + flags: flags, + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: new address[](0) + }) + ).returnAmounts[0]; + } + + function _findBestDistribution(uint256[][] memory input, uint256[][] memory costs, uint256[][] memory gases, uint256 parts) + private pure returns(SwapResult memory result) + { + int256[][] memory matrix = new int256[][](input.length); + for (uint i = 0; i < input.length; i++) { + matrix[i] = new int256[](1 + parts); + matrix[i][0] = Algo.VERY_NEGATIVE_VALUE; + for (uint j = 0; j < parts; j++) { + matrix[i][j + 1] = + (j < input[i].length && input[i][j] != 0) + ? int256(input[i][j]) - int256(costs[i][j]) + : Algo.VERY_NEGATIVE_VALUE; + } + } + + (, result.distributions) = Algo.findBestDistribution(matrix, parts); + + result.returnAmounts = new uint256[](parts); + result.estimateGasAmounts = new uint256[](parts); + for (uint i = 0; i < input.length; i++) { + for (uint j = 0; j < parts; j++) { + if (result.distributions[j][i] > 0) { + uint256 index = result.distributions[j][i] - 1; + result.returnAmounts[j] = result.returnAmounts[j].add(index < input[i].length ? input[i][index] : 0); + result.estimateGasAmounts[j] = result.estimateGasAmounts[j].add(gases[i][j]); + } + } + } + } +} + + +contract OneRouter is + OneRouterConstants, + IOneRouter, + HotSwapSources, + UniswapV1SourceSwap, + UniswapV2SourceSwap, + MooniswapSourceSwap, + KyberSourceSwap, + CurveSourceSwap + // BalancerSourceSwap +{ + using UniERC20 for IERC20; + using SafeMath for uint256; + using Address2 for address; + using FlagsChecker for uint256; + + IOneRouterView public oneRouterView; + + constructor(IOneRouterView _oneRouterView) public { + oneRouterView = _oneRouterView; + } + + receive() external payable { + // solhint-disable-next-line avoid-tx-origin + require(msg.sender != tx.origin, "ETH deposit rejected"); + } + + function getReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Swap calldata swap + ) + external + view + override + returns( + Path[] memory paths, + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + return oneRouterView.getReturn(fromToken, amounts, swap); + } + + function getSwapReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Swap calldata swap + ) + external + view + override + returns(SwapResult memory result) + { + return oneRouterView.getSwapReturn(fromToken, amounts, swap); + } + + function getPathReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Path calldata path + ) + external + view + override + returns(PathResult memory result) + { + return oneRouterView.getPathReturn(fromToken, amounts, path); + } + + function getMultiPathReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Path[] calldata paths + ) + external + view + override + returns( + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + return oneRouterView.getMultiPathReturn(fromToken, amounts, paths); + } + + function makeSwap( + SwapInput memory input, + Swap memory swap, + SwapDistribution memory swapDistribution + ) + public + payable + override + returns(uint256 returnAmount) + { + Path memory path = Path({ + swaps: new IOneRouterView.Swap[](1) + }); + path.swaps[0] = swap; + + PathDistribution memory pathDistribution = PathDistribution({ + swapDistributions: new SwapDistribution[](1) + }); + pathDistribution.swapDistributions[0] = swapDistribution; + + return makePathSwap(input, path, pathDistribution); + } + + function makePathSwap( + SwapInput memory input, + Path memory path, + PathDistribution memory pathDistribution + ) + public + payable + override + returns(uint256 returnAmount) + { + Path[] memory paths = new Path[](1); + paths[0] = path; + + PathDistribution[] memory pathDistributions = new PathDistribution[](1); + pathDistributions[0] = pathDistribution; + + SwapDistribution memory swapDistribution = SwapDistribution({ + weights: new uint256[](1) + }); + swapDistribution.weights[0] = 1; + + return makeMultiPathSwap(input, paths, pathDistributions, swapDistribution); + } + + struct Indexes { + uint p; // path + uint s; // swap + uint i; // index + } + + function makeMultiPathSwap( + SwapInput memory input, + Path[] memory paths, + PathDistribution[] memory pathDistributions, + SwapDistribution memory interPathsDistribution + ) + public + payable + override + returns(uint256 returnAmount) + { + require(msg.value == (input.fromToken.isETH() ? input.amount : 0), "Wrong msg.value"); + require(paths.length == interPathsDistribution.weights.length, "Wrong arrays length"); + + input.fromToken.uniTransferFromSender(address(this), input.amount); + uint256 confirmed = input.fromToken.uniBalanceOf(address(this)); + + uint256 interTotalWeight = 0; + for (uint i = 0; i < interPathsDistribution.weights.length; i++) { + interTotalWeight = interTotalWeight.add(interPathsDistribution.weights[i]); + } + + function(IERC20,IERC20,uint256,uint256)[15] memory reserves = [ + _swapOnUniswapV1, + _swapOnUniswapV2, + _swapOnMooniswap, + _swapOnKyber1, + _swapOnKyber2, + _swapOnKyber3, + _swapOnKyber4, + _swapOnCurveCompound, + _swapOnCurveUSDT, + _swapOnCurveY, + _swapOnCurveBinance, + _swapOnCurveSynthetix, + _swapOnCurvePAX, + _swapOnCurveRENBTC, + _swapOnCurveSBTC + // _swapOnBalancer1, + // _swapOnBalancer2, + // _swapOnBalancer3, + // _swapOnBancor, + // _swapOnOasis, + // _swapOnDforceSwap, + // _swapOnShell, + // _swapOnMStableMUSD, + // _swapOnBlackHoleSwap + ]; + + Indexes memory _; + for (_.p = 0; _.p < pathDistributions.length; _.p++) { + for (_.s = 0; _.s < pathDistributions[_.p].swapDistributions.length; _.s++) { + uint256 totalWeight = 0; + for (_.i = 0; _.i < pathDistributions[_.p].swapDistributions[_.s].weights.length; _.i++) { + totalWeight = totalWeight.add(pathDistributions[_.p].swapDistributions[_.s].weights[_.i]); + } + + for (_.i = 0; _.i < pathDistributions[_.p].swapDistributions[_.s].weights.length; _.i++) { + uint256 amount = confirmed + .mul(interPathsDistribution.weights[_.p]) + .div(interTotalWeight); + amount = amount + .mul(pathDistributions[_.p].swapDistributions[_.s].weights[_.i]) + .div(totalWeight); + totalWeight = totalWeight.sub(pathDistributions[_.p].swapDistributions[_.s].weights[_.i]); + + if (sources[_.i] != ISource(0)) { + address(sources[_.i]).functionDelegateCall( + abi.encodeWithSelector( + sources[_.i].swap.selector, + input.fromToken, + input.destToken, + amount, + paths[_.p].swaps[_.s].flags + ), + "Delegatecall failed" + ); + } + else if (_.i < reserves.length) { + reserves[_.i](input.fromToken, input.destToken, amount, paths[_.p].swaps[_.s].flags); + } + } + } + + interTotalWeight = interTotalWeight.sub(interPathsDistribution.weights[_.p]); + } + + uint256 remaining = input.fromToken.uniBalanceOf(address(this)); + returnAmount = input.destToken.uniBalanceOf(address(this)); + input.fromToken.uniTransfer(msg.sender, remaining); + input.destToken.uniTransfer(msg.sender, returnAmount); + } +} diff --git a/contracts/OneRouterConstants.sol b/contracts/OneRouterConstants.sol new file mode 100644 index 0000000..5f5280c --- /dev/null +++ b/contracts/OneRouterConstants.sol @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + + +contract OneRouterConstants { + uint256 constant internal _FLAG_DISABLE_RECALCULATION = 0x1000000000000000000000000000000000000000000000000; + + uint256 constant internal _FLAG_DISABLE_ALL_SOURCES = 0x100000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_KYBER_ALL = 0x200000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_CURVE_ALL = 0x400000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_BALANCER_ALL = 0x800000000000000000000000000000000; + + uint256 constant internal _FLAG_DISABLE_UNISWAP_V1 = 0x1; + uint256 constant internal _FLAG_DISABLE_UNISWAP_V2 = 0x2; + uint256 constant internal _FLAG_DISABLE_MOONISWAP = 0x4; + uint256 constant internal _FLAG_DISABLE_KYBER_1 = 0x8; + uint256 constant internal _FLAG_DISABLE_KYBER_2 = 0x10; + uint256 constant internal _FLAG_DISABLE_KYBER_3 = 0x20; + uint256 constant internal _FLAG_DISABLE_KYBER_4 = 0x40; + uint256 constant internal _FLAG_DISABLE_CURVE_COMPOUND = 0x80; + uint256 constant internal _FLAG_DISABLE_CURVE_USDT = 0x100; + uint256 constant internal _FLAG_DISABLE_CURVE_Y = 0x200; + uint256 constant internal _FLAG_DISABLE_CURVE_BINANCE = 0x400; + uint256 constant internal _FLAG_DISABLE_CURVE_SYNTHETIX = 0x800; + uint256 constant internal _FLAG_DISABLE_CURVE_PAX = 0x1000; + uint256 constant internal _FLAG_DISABLE_CURVE_RENBTC = 0x2000; + uint256 constant internal _FLAG_DISABLE_CURVE_TBTC = 0x4000; + uint256 constant internal _FLAG_DISABLE_CURVE_SBTC = 0x8000; + uint256 constant internal _FLAG_DISABLE_BALANCER_1 = 0x10000; + uint256 constant internal _FLAG_DISABLE_BALANCER_2 = 0x20000; + uint256 constant internal _FLAG_DISABLE_BALANCER_3 = 0x40000; + uint256 constant internal _FLAG_DISABLE_BANCOR_1 = 0x80000; + uint256 constant internal _FLAG_DISABLE_BANCOR_2 = 0x100000; + uint256 constant internal _FLAG_DISABLE_BANCOR_3 = 0x200000; + uint256 constant internal _FLAG_DISABLE_OASIS = 0x400000; + uint256 constant internal _FLAG_DISABLE_DFORCE_SWAP = 0x800000; + uint256 constant internal _FLAG_DISABLE_SHELL = 0x1000000; + uint256 constant internal _FLAG_DISABLE_MSTABLE_MUSD = 0x2000000; + uint256 constant internal _FLAG_DISABLE_BLACK_HOLE_SWAP = 0x4000000; + + IERC20 constant internal _DAI = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); + IERC20 constant internal _USDC = IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); + IERC20 constant internal _USDT = IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); + IERC20 constant internal _TUSD = IERC20(0x0000000000085d4780B73119b644AE5ecd22b376); + IERC20 constant internal _BUSD = IERC20(0x4Fabb145d64652a948d72533023f6E7A623C7C53); + IERC20 constant internal _SUSD = IERC20(0x57Ab1ec28D129707052df4dF418D58a2D46d5f51); + IERC20 constant internal _PAX = IERC20(0x8E870D67F660D95d5be530380D0eC0bd388289E1); + IERC20 constant internal _RENBTC = IERC20(0xEB4C2781e4ebA804CE9a9803C67d0893436bB27D); + IERC20 constant internal _WBTC = IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); + IERC20 constant internal _SBTC = IERC20(0xfE18be6b3Bd88A2D2A7f928d00292E7a9963CfC6); +} diff --git a/contracts/OneSplit.sol b/contracts/OneSplit.sol deleted file mode 100644 index 8894eef..0000000 --- a/contracts/OneSplit.sol +++ /dev/null @@ -1,316 +0,0 @@ -pragma solidity ^0.5.0; - -import "./IOneSplit.sol"; -import "./OneSplitBase.sol"; -import "./OneSplitCompound.sol"; -import "./OneSplitFulcrum.sol"; -import "./OneSplitChai.sol"; -import "./OneSplitBdai.sol"; -import "./OneSplitIearn.sol"; -import "./OneSplitIdle.sol"; -import "./OneSplitAave.sol"; -import "./OneSplitWeth.sol"; -import "./OneSplitMStable.sol"; -import "./OneSplitDMM.sol"; -import "./OneSplitMooniswapPoolToken.sol"; - - -contract OneSplitViewWrap is - OneSplitViewWrapBase, - OneSplitMStableView, - OneSplitChaiView, - OneSplitBdaiView, - OneSplitAaveView, - OneSplitFulcrumView, - OneSplitCompoundView, - OneSplitIearnView, - OneSplitIdleView, - OneSplitWethView, - OneSplitDMMView, - OneSplitMooniswapTokenView -{ - IOneSplitView public oneSplitView; - - constructor(IOneSplitView _oneSplit) public { - oneSplitView = _oneSplit; - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _getExpectedReturnRespectingGasFloor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - internal - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitView.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitWrap is - OneSplitBaseWrap, - OneSplitMStable, - OneSplitChai, - OneSplitBdai, - OneSplitAave, - OneSplitFulcrum, - OneSplitCompound, - OneSplitIearn, - OneSplitIdle, - OneSplitWeth, - OneSplitDMM, - OneSplitMooniswapToken -{ - IOneSplitView public oneSplitView; - IOneSplit public oneSplit; - - constructor(IOneSplitView _oneSplitView, IOneSplit _oneSplit) public { - oneSplitView = _oneSplitView; - oneSplit = _oneSplit; - } - - function() external payable { - // solium-disable-next-line security/no-tx-origin - require(msg.sender != tx.origin); - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitView.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function getExpectedReturnWithGasMulti( - IERC20[] memory tokens, - uint256 amount, - uint256[] memory parts, - uint256[] memory flags, - uint256[] memory destTokenEthPriceTimesGasPrices - ) - public - view - returns( - uint256[] memory returnAmounts, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - uint256[] memory dist; - - returnAmounts = new uint256[](tokens.length - 1); - for (uint i = 1; i < tokens.length; i++) { - if (tokens[i - 1] == tokens[i]) { - returnAmounts[i - 1] = (i == 1) ? amount : returnAmounts[i - 2]; - continue; - } - - IERC20[] memory _tokens = tokens; - - ( - returnAmounts[i - 1], - amount, - dist - ) = getExpectedReturnWithGas( - _tokens[i - 1], - _tokens[i], - (i == 1) ? amount : returnAmounts[i - 2], - parts[i - 1], - flags[i - 1], - destTokenEthPriceTimesGasPrices[i - 1] - ); - estimateGasAmount = estimateGasAmount.add(amount); - - if (distribution.length == 0) { - distribution = new uint256[](dist.length); - } - for (uint j = 0; j < distribution.length; j++) { - distribution[j] = distribution[j].add(dist[j] << (8 * (i - 1))); - } - } - } - - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags - ) public payable returns(uint256 returnAmount) { - fromToken.universalTransferFrom(msg.sender, address(this), amount); - uint256 confirmed = fromToken.universalBalanceOf(address(this)); - _swap(fromToken, destToken, confirmed, distribution, flags); - - returnAmount = destToken.universalBalanceOf(address(this)); - require(returnAmount >= minReturn, "OneSplit: actual return amount is less than minReturn"); - destToken.universalTransfer(msg.sender, returnAmount); - fromToken.universalTransfer(msg.sender, fromToken.universalBalanceOf(address(this))); - } - - function swapMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags - ) public payable returns(uint256 returnAmount) { - tokens[0].universalTransferFrom(msg.sender, address(this), amount); - - returnAmount = tokens[0].universalBalanceOf(address(this)); - for (uint i = 1; i < tokens.length; i++) { - if (tokens[i - 1] == tokens[i]) { - continue; - } - - uint256[] memory dist = new uint256[](distribution.length); - for (uint j = 0; j < distribution.length; j++) { - dist[j] = (distribution[j] >> (8 * (i - 1))) & 0xFF; - } - - _swap( - tokens[i - 1], - tokens[i], - returnAmount, - dist, - flags[i - 1] - ); - returnAmount = tokens[i].universalBalanceOf(address(this)); - tokens[i - 1].universalTransfer(msg.sender, tokens[i - 1].universalBalanceOf(address(this))); - } - - require(returnAmount >= minReturn, "OneSplit: actual return amount is less than minReturn"); - tokens[tokens.length - 1].universalTransfer(msg.sender, returnAmount); - } - - function _swapFloor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - fromToken.universalApprove(address(oneSplit), amount); - oneSplit.swap.value(fromToken.isETH() ? amount : 0)( - fromToken, - destToken, - amount, - 0, - distribution, - flags - ); - } -} diff --git a/contracts/OneSplitAave.sol b/contracts/OneSplitAave.sol deleted file mode 100644 index 2e4766d..0000000 --- a/contracts/OneSplitAave.sol +++ /dev/null @@ -1,166 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/IAaveToken.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitAaveView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _aaveGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _aaveGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_AAVE)) { - IERC20 underlying = aaveRegistry.tokenByAToken(IAaveToken(address(fromToken))); - if (underlying != IERC20(0)) { - (returnAmount, estimateGasAmount, distribution) = _aaveGetExpectedReturn( - underlying, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 670_000, distribution); - } - - underlying = aaveRegistry.tokenByAToken(IAaveToken(address(destToken))); - if (underlying != IERC20(0)) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - underlying, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 310_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitAave is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _aaveSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _aaveSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_AAVE)) { - IERC20 underlying = aaveRegistry.tokenByAToken(IAaveToken(address(fromToken))); - if (underlying != IERC20(0)) { - IAaveToken(address(fromToken)).redeem(amount); - - return _aaveSwap( - underlying, - destToken, - amount, - distribution, - flags - ); - } - - underlying = aaveRegistry.tokenByAToken(IAaveToken(address(destToken))); - if (underlying != IERC20(0)) { - super._swap( - fromToken, - underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - underlying.universalApprove(aave.core(), underlyingAmount); - aave.deposit.value(underlying.isETH() ? underlyingAmount : 0)( - underlying.isETH() ? ETH_ADDRESS : underlying, - underlyingAmount, - 1101 - ); - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} diff --git a/contracts/OneSplitAudit.sol b/contracts/OneSplitAudit.sol deleted file mode 100644 index 9a4d866..0000000 --- a/contracts/OneSplitAudit.sol +++ /dev/null @@ -1,385 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/math/Math.sol"; -import "@openzeppelin/contracts/ownership/Ownable.sol"; -import "./interface/IWETH.sol"; -import "./interface/IUniswapV2Exchange.sol"; -import "./IOneSplit.sol"; -import "./UniversalERC20.sol"; - - -contract IFreeFromUpTo is IERC20 { - function freeFromUpTo(address from, uint256 value) external returns(uint256 freed); -} - -interface IReferralGasSponsor { - function makeGasDiscount( - uint256 gasSpent, - uint256 returnAmount, - bytes calldata msgSenderCalldata - ) external; -} - - -library Array { - function first(IERC20[] memory arr) internal pure returns(IERC20) { - return arr[0]; - } - - function last(IERC20[] memory arr) internal pure returns(IERC20) { - return arr[arr.length - 1]; - } -} - - -// -// Security assumptions: -// 1. It is safe to have infinite approves of any tokens to this smart contract, -// since it could only call `transferFrom()` with first argument equal to msg.sender -// 2. It is safe to call `swap()` with reliable `minReturn` argument, -// if returning amount will not reach `minReturn` value whole swap will be reverted. -// 3. Additionally CHI tokens could be burned from caller in case of FLAG_ENABLE_CHI_BURN (0x10000000000) -// presented in `flags` or from transaction origin in case of FLAG_ENABLE_CHI_BURN_BY_ORIGIN (0x4000000000000000) -// presented in `flags`. Burned amount would refund up to 43% of gas fees. -// -contract OneSplitAudit is IOneSplit, Ownable { - using SafeMath for uint256; - using UniversalERC20 for IERC20; - using Array for IERC20[]; - - IWETH constant internal weth = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); - IFreeFromUpTo public constant chi = IFreeFromUpTo(0x0000000000004946c0e9F43F4Dee607b0eF1fA1c); - - IOneSplitMulti public oneSplitImpl; - - event ImplementationUpdated(address indexed newImpl); - - event Swapped( - IERC20 indexed fromToken, - IERC20 indexed destToken, - uint256 fromTokenAmount, - uint256 destTokenAmount, - uint256 minReturn, - uint256[] distribution, - uint256[] flags, - address referral, - uint256 feePercent - ); - - constructor(IOneSplitMulti impl) public { - setNewImpl(impl); - } - - function() external payable { - // solium-disable-next-line security/no-tx-origin - require(msg.sender != tx.origin, "OneSplit: do not send ETH directly"); - } - - function setNewImpl(IOneSplitMulti impl) public onlyOwner { - oneSplitImpl = impl; - emit ImplementationUpdated(address(impl)); - } - - /// @notice Calculate expected returning amount of `destToken` - /// @param fromToken (IERC20) Address of token or `address(0)` for Ether - /// @param destToken (IERC20) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param parts (uint256) Number of pieces source volume could be splitted, - /// works like granularity, higly affects gas usage. Should be called offchain, - /// but could be called onchain if user swaps not his own funds, but this is still considered as not safe. - /// @param flags (uint256) Flags for enabling and disabling some features, default 0 - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags // See contants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - /// @notice Calculate expected returning amount of `destToken` - /// @param fromToken (IERC20) Address of token or `address(0)` for Ether - /// @param destToken (IERC20) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param parts (uint256) Number of pieces source volume could be splitted, - /// works like granularity, higly affects gas usage. Should be called offchain, - /// but could be called onchain if user swaps not his own funds, but this is still considered as not safe. - /// @param flags (uint256) Flags for enabling and disabling some features, default 0 - /// @param destTokenEthPriceTimesGasPrice (uint256) destToken price to ETH multiplied by gas price - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitImpl.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - /// @notice Calculate expected returning amount of first `tokens` element to - /// last `tokens` element through ann the middle tokens with corresponding - /// `parts`, `flags` and `destTokenEthPriceTimesGasPrices` array values of each step - /// @param tokens (IERC20[]) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param parts (uint256[]) Number of pieces source volume could be splitted - /// @param flags (uint256[]) Flags for enabling and disabling some features, default 0 - /// @param destTokenEthPriceTimesGasPrices (uint256[]) destToken price to ETH multiplied by gas price - function getExpectedReturnWithGasMulti( - IERC20[] memory tokens, - uint256 amount, - uint256[] memory parts, - uint256[] memory flags, - uint256[] memory destTokenEthPriceTimesGasPrices - ) - public - view - returns( - uint256[] memory returnAmounts, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitImpl.getExpectedReturnWithGasMulti( - tokens, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrices - ); - } - - /// @notice Swap `amount` of `fromToken` to `destToken` - /// @param fromToken (IERC20) Address of token or `address(0)` for Ether - /// @param destToken (IERC20) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param minReturn (uint256) Minimum expected return, else revert - /// @param distribution (uint256[]) Array of weights for volume distribution returned by `getExpectedReturn` - /// @param flags (uint256) Flags for enabling and disabling some features, default 0 - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags // See contants in IOneSplit.sol - ) public payable returns(uint256) { - return swapWithReferral( - fromToken, - destToken, - amount, - minReturn, - distribution, - flags, - address(0), - 0 - ); - } - - /// @notice Swap `amount` of `fromToken` to `destToken` - /// param fromToken (IERC20) Address of token or `address(0)` for Ether - /// param destToken (IERC20) Address of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param minReturn (uint256) Minimum expected return, else revert - /// @param distribution (uint256[]) Array of weights for volume distribution returned by `getExpectedReturn` - /// @param flags (uint256) Flags for enabling and disabling some features, default 0 - /// @param referral (address) Address of referral - /// @param feePercent (uint256) Fees percents normalized to 1e18, limited to 0.03e18 (3%) - function swapWithReferral( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags, // See contants in IOneSplit.sol - address referral, - uint256 feePercent - ) public payable returns(uint256) { - IERC20[] memory tokens = new IERC20[](2); - tokens[0] = fromToken; - tokens[1] = destToken; - - uint256[] memory flagsArray = new uint256[](1); - flagsArray[0] = flags; - - swapWithReferralMulti( - tokens, - amount, - minReturn, - distribution, - flagsArray, - referral, - feePercent - ); - } - - /// @notice Swap `amount` of first element of `tokens` to the latest element of `destToken` - /// @param tokens (IERC20[]) Addresses of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param minReturn (uint256) Minimum expected return, else revert - /// @param distribution (uint256[]) Array of weights for volume distribution returned by `getExpectedReturn` - /// @param flags (uint256[]) Flags for enabling and disabling some features, default 0 - function swapMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags - ) public payable returns(uint256) { - swapWithReferralMulti( - tokens, - amount, - minReturn, - distribution, - flags, - address(0), - 0 - ); - } - - /// @notice Swap `amount` of first element of `tokens` to the latest element of `destToken` - /// @param tokens (IERC20[]) Addresses of token or `address(0)` for Ether - /// @param amount (uint256) Amount for `fromToken` - /// @param minReturn (uint256) Minimum expected return, else revert - /// @param distribution (uint256[]) Array of weights for volume distribution returned by `getExpectedReturn` - /// @param flags (uint256[]) Flags for enabling and disabling some features, default 0 - /// @param referral (address) Address of referral - /// @param feePercent (uint256) Fees percents normalized to 1e18, limited to 0.03e18 (3%) - function swapWithReferralMulti( - IERC20[] memory tokens, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256[] memory flags, - address referral, - uint256 feePercent - ) public payable returns(uint256 returnAmount) { - require(tokens.length >= 2 && amount > 0, "OneSplit: swap makes no sense"); - require(flags.length == tokens.length - 1, "OneSplit: flags array length is invalid"); - require((msg.value != 0) == tokens.first().isETH(), "OneSplit: msg.value should be used only for ETH swap"); - require(feePercent <= 0.03e18, "OneSplit: feePercent out of range"); - - uint256 gasStart = gasleft(); - - Balances memory beforeBalances = _getFirstAndLastBalances(tokens, true); - - // Transfer From - if (amount == uint256(-1)) { - amount = Math.min( - tokens.first().balanceOf(msg.sender), - tokens.first().allowance(msg.sender, address(this)) - ); - } - tokens.first().universalTransferFromSenderToThis(amount); - uint256 confirmed = tokens.first().universalBalanceOf(address(this)).sub(beforeBalances.ofFromToken); - - // Swap - tokens.first().universalApprove(address(oneSplitImpl), confirmed); - oneSplitImpl.swapMulti.value(tokens.first().isETH() ? confirmed : 0)( - tokens, - confirmed, - minReturn, - distribution, - flags - ); - - Balances memory afterBalances = _getFirstAndLastBalances(tokens, false); - - // Return - returnAmount = afterBalances.ofDestToken.sub(beforeBalances.ofDestToken); - require(returnAmount >= minReturn, "OneSplit: actual return amount is less than minReturn"); - tokens.last().universalTransfer(referral, returnAmount.mul(feePercent).div(1e18)); - tokens.last().universalTransfer(msg.sender, returnAmount.sub(returnAmount.mul(feePercent).div(1e18))); - - emit Swapped( - tokens.first(), - tokens.last(), - amount, - returnAmount, - minReturn, - distribution, - flags, - referral, - feePercent - ); - - // Return remainder - if (afterBalances.ofFromToken > beforeBalances.ofFromToken) { - tokens.first().universalTransfer(msg.sender, afterBalances.ofFromToken.sub(beforeBalances.ofFromToken)); - } - - if ((flags[0] & (FLAG_ENABLE_CHI_BURN | FLAG_ENABLE_CHI_BURN_BY_ORIGIN)) > 0) { - uint256 gasSpent = 21000 + gasStart - gasleft() + 16 * msg.data.length; - _chiBurnOrSell( - ((flags[0] & FLAG_ENABLE_CHI_BURN_BY_ORIGIN) > 0) ? tx.origin : msg.sender, - (gasSpent + 14154) / 41947 - ); - } - else if ((flags[0] & FLAG_ENABLE_REFERRAL_GAS_SPONSORSHIP) > 0) { - uint256 gasSpent = 21000 + gasStart - gasleft() + 16 * msg.data.length; - IReferralGasSponsor(referral).makeGasDiscount(gasSpent, returnAmount, msg.data); - } - } - - function claimAsset(IERC20 asset, uint256 amount) public onlyOwner { - asset.universalTransfer(msg.sender, amount); - } - - function _chiBurnOrSell(address payable sponsor, uint256 amount) internal { - IUniswapV2Exchange exchange = IUniswapV2Exchange(0xa6f3ef841d371a82ca757FaD08efc0DeE2F1f5e2); - (uint256 sellRefund,,) = UniswapV2ExchangeLib.getReturn(exchange, chi, weth, amount); - uint256 burnRefund = amount.mul(18_000).mul(tx.gasprice); - - if (sellRefund < burnRefund.add(tx.gasprice.mul(36_000))) { - chi.freeFromUpTo(sponsor, amount); - } - else { - chi.transferFrom(sponsor, address(exchange), amount); - exchange.swap(0, sellRefund, address(this), ""); - weth.withdraw(weth.balanceOf(address(this))); - sponsor.transfer(address(this).balance); - } - } - - struct Balances { - uint256 ofFromToken; - uint256 ofDestToken; - } - - function _getFirstAndLastBalances(IERC20[] memory tokens, bool subValue) internal view returns(Balances memory) { - return Balances({ - ofFromToken: tokens.first().universalBalanceOf(address(this)).sub(subValue ? msg.value : 0), - ofDestToken: tokens.last().universalBalanceOf(address(this)) - }); - } -} diff --git a/contracts/OneSplitBase.sol b/contracts/OneSplitBase.sol deleted file mode 100644 index d47092b..0000000 --- a/contracts/OneSplitBase.sol +++ /dev/null @@ -1,2584 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/math/SafeMath.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./interface/IUniswapFactory.sol"; -import "./interface/IKyberNetworkProxy.sol"; -import "./interface/IKyberStorage.sol"; -import "./interface/IKyberHintHandler.sol"; -import "./interface/IBancorNetwork.sol"; -import "./interface/IBancorContractRegistry.sol"; -import "./interface/IBancorNetworkPathFinder.sol"; -import "./interface/IBancorConverterRegistry.sol"; -import "./interface/IBancorEtherToken.sol"; -import "./interface/IBancorFinder.sol"; -import "./interface/IOasisExchange.sol"; -import "./interface/IWETH.sol"; -import "./interface/ICurve.sol"; -import "./interface/IChai.sol"; -import "./interface/ICompound.sol"; -import "./interface/ICompoundRegistry.sol"; -import "./interface/IAaveToken.sol"; -import "./interface/IAaveRegistry.sol"; -import "./interface/IMooniswap.sol"; -import "./interface/IUniswapV2Factory.sol"; -import "./interface/IDForceSwap.sol"; -import "./interface/IShell.sol"; -import "./interface/IMStable.sol"; -import "./interface/IBalancerRegistry.sol"; -import "./IOneSplit.sol"; -import "./UniversalERC20.sol"; -import "./BalancerLib.sol"; - - -contract IOneSplitView is IOneSplitConsts { - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ); - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ); -} - - -library DisableFlags { - function check(uint256 flags, uint256 flag) internal pure returns(bool) { - return (flags & flag) != 0; - } -} - - -contract OneSplitRoot is IOneSplitView { - using SafeMath for uint256; - using DisableFlags for uint256; - - using UniversalERC20 for IERC20; - using UniversalERC20 for IWETH; - using UniswapV2ExchangeLib for IUniswapV2Exchange; - using ChaiHelper for IChai; - - uint256 constant internal DEXES_COUNT = 34; - IERC20 constant internal ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - IERC20 constant internal ZERO_ADDRESS = IERC20(0); - - IBancorEtherToken constant internal bancorEtherToken = IBancorEtherToken(0xc0829421C1d260BD3cB3E0F06cfE2D52db2cE315); - IWETH constant internal weth = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); - IChai constant internal chai = IChai(0x06AF07097C9Eeb7fD685c692751D5C66dB49c215); - IERC20 constant internal dai = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); - IERC20 constant internal usdc = IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); - IERC20 constant internal usdt = IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); - IERC20 constant internal tusd = IERC20(0x0000000000085d4780B73119b644AE5ecd22b376); - IERC20 constant internal busd = IERC20(0x4Fabb145d64652a948d72533023f6E7A623C7C53); - IERC20 constant internal susd = IERC20(0x57Ab1ec28D129707052df4dF418D58a2D46d5f51); - IERC20 constant internal pax = IERC20(0x8E870D67F660D95d5be530380D0eC0bd388289E1); - IERC20 constant internal renbtc = IERC20(0xEB4C2781e4ebA804CE9a9803C67d0893436bB27D); - IERC20 constant internal wbtc = IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); - IERC20 constant internal tbtc = IERC20(0x1bBE271d15Bb64dF0bc6CD28Df9Ff322F2eBD847); - IERC20 constant internal hbtc = IERC20(0x0316EB71485b0Ab14103307bf65a021042c6d380); - IERC20 constant internal sbtc = IERC20(0xfE18be6b3Bd88A2D2A7f928d00292E7a9963CfC6); - - IKyberNetworkProxy constant internal kyberNetworkProxy = IKyberNetworkProxy(0x9AAb3f75489902f3a48495025729a0AF77d4b11e); - IKyberStorage constant internal kyberStorage = IKyberStorage(0xC8fb12402cB16970F3C5F4b48Ff68Eb9D1289301); - IKyberHintHandler constant internal kyberHintHandler = IKyberHintHandler(0xa1C0Fa73c39CFBcC11ec9Eb1Afc665aba9996E2C); - IUniswapFactory constant internal uniswapFactory = IUniswapFactory(0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95); - IBancorContractRegistry constant internal bancorContractRegistry = IBancorContractRegistry(0x52Ae12ABe5D8BD778BD5397F99cA900624CfADD4); - IBancorNetworkPathFinder constant internal bancorNetworkPathFinder = IBancorNetworkPathFinder(0x6F0cD8C4f6F06eAB664C7E3031909452b4B72861); - //IBancorConverterRegistry constant internal bancorConverterRegistry = IBancorConverterRegistry(0xf6E2D7F616B67E46D708e4410746E9AAb3a4C518); - IBancorFinder constant internal bancorFinder = IBancorFinder(0x2B344e14dc2641D11D338C053C908c7A7D4c30B9); - IOasisExchange constant internal oasisExchange = IOasisExchange(0x794e6e91555438aFc3ccF1c5076A74F42133d08D); - ICurve constant internal curveCompound = ICurve(0xA2B47E3D5c44877cca798226B7B8118F9BFb7A56); - ICurve constant internal curveUSDT = ICurve(0x52EA46506B9CC5Ef470C5bf89f17Dc28bB35D85C); - ICurve constant internal curveY = ICurve(0x45F783CCE6B7FF23B2ab2D70e416cdb7D6055f51); - ICurve constant internal curveBinance = ICurve(0x79a8C46DeA5aDa233ABaFFD40F3A0A2B1e5A4F27); - ICurve constant internal curveSynthetix = ICurve(0xA5407eAE9Ba41422680e2e00537571bcC53efBfD); - ICurve constant internal curvePAX = ICurve(0x06364f10B501e868329afBc005b3492902d6C763); - ICurve constant internal curveRenBTC = ICurve(0x93054188d876f558f4a66B2EF1d97d16eDf0895B); - ICurve constant internal curveTBTC = ICurve(0x9726e9314eF1b96E45f40056bEd61A088897313E); - ICurve constant internal curveSBTC = ICurve(0x7fC77b5c7614E1533320Ea6DDc2Eb61fa00A9714); - IShell constant internal shell = IShell(0xA8253a440Be331dC4a7395B73948cCa6F19Dc97D); - IAaveLendingPool constant internal aave = IAaveLendingPool(0x398eC7346DcD622eDc5ae82352F02bE94C62d119); - ICompound constant internal compound = ICompound(0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B); - ICompoundEther constant internal cETH = ICompoundEther(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5); - IMooniswapRegistry constant internal mooniswapRegistry = IMooniswapRegistry(0x71CD6666064C3A1354a3B4dca5fA1E2D3ee7D303); - IUniswapV2Factory constant internal uniswapV2 = IUniswapV2Factory(0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f); - IDForceSwap constant internal dforceSwap = IDForceSwap(0x03eF3f37856bD08eb47E2dE7ABc4Ddd2c19B60F2); - IMStable constant internal musd = IMStable(0xe2f2a5C287993345a840Db3B0845fbC70f5935a5); - IMassetValidationHelper constant internal musd_helper = IMassetValidationHelper(0xaBcC93c3be238884cc3309C19Afd128fAfC16911); - IBalancerRegistry constant internal balancerRegistry = IBalancerRegistry(0x65e67cbc342712DF67494ACEfc06fe951EE93982); - ICurveCalculator constant internal curveCalculator = ICurveCalculator(0xc1DB00a8E5Ef7bfa476395cdbcc98235477cDE4E); - ICurveRegistry constant internal curveRegistry = ICurveRegistry(0x7002B727Ef8F5571Cb5F9D70D13DBEEb4dFAe9d1); - ICompoundRegistry constant internal compoundRegistry = ICompoundRegistry(0xF451Dbd7Ba14BFa7B1B78A766D3Ed438F79EE1D1); - IAaveRegistry constant internal aaveRegistry = IAaveRegistry(0xEd8b133B7B88366E01Bb9E38305Ab11c26521494); - IBalancerHelper constant internal balancerHelper = IBalancerHelper(0xA961672E8Db773be387e775bc4937C678F3ddF9a); - - int256 internal constant VERY_NEGATIVE_VALUE = -1e72; - - function _findBestDistribution( - uint256 s, // parts - int256[][] memory amounts // exchangesReturns - ) - internal - pure - returns( - int256 returnAmount, - uint256[] memory distribution - ) - { - uint256 n = amounts.length; - - int256[][] memory answer = new int256[][](n); // int[n][s+1] - uint256[][] memory parent = new uint256[][](n); // int[n][s+1] - - for (uint i = 0; i < n; i++) { - answer[i] = new int256[](s + 1); - parent[i] = new uint256[](s + 1); - } - - for (uint j = 0; j <= s; j++) { - answer[0][j] = amounts[0][j]; - for (uint i = 1; i < n; i++) { - answer[i][j] = -1e72; - } - parent[0][j] = 0; - } - - for (uint i = 1; i < n; i++) { - for (uint j = 0; j <= s; j++) { - answer[i][j] = answer[i - 1][j]; - parent[i][j] = j; - - for (uint k = 1; k <= j; k++) { - if (answer[i - 1][j - k] + amounts[i][k] > answer[i][j]) { - answer[i][j] = answer[i - 1][j - k] + amounts[i][k]; - parent[i][j] = j - k; - } - } - } - } - - distribution = new uint256[](DEXES_COUNT); - - uint256 partsLeft = s; - for (uint curExchange = n - 1; partsLeft > 0; curExchange--) { - distribution[curExchange] = partsLeft - parent[curExchange][partsLeft]; - partsLeft = parent[curExchange][partsLeft]; - } - - returnAmount = (answer[n - 1][s] == VERY_NEGATIVE_VALUE) ? 0 : answer[n - 1][s]; - } - - function _kyberReserveIdByTokens( - IERC20 fromToken, - IERC20 destToken - ) internal view returns(bytes32) { - if (!fromToken.isETH() && !destToken.isETH()) { - return 0; - } - - bytes32[] memory reserveIds = kyberStorage.getReserveIdsPerTokenSrc( - fromToken.isETH() ? destToken : fromToken - ); - - for (uint i = 0; i < reserveIds.length; i++) { - if ((uint256(reserveIds[i]) >> 248) != 0xBB && // Bridge - reserveIds[i] != 0xff4b796265722046707200000000000000000000000000000000000000000000 && // Reserve 1 - reserveIds[i] != 0xffabcd0000000000000000000000000000000000000000000000000000000000 && // Reserve 2 - reserveIds[i] != 0xff4f6e65426974205175616e7400000000000000000000000000000000000000) // Reserve 3 - { - return reserveIds[i]; - } - } - - return 0; - } - - function _scaleDestTokenEthPriceTimesGasPrice( - IERC20 fromToken, - IERC20 destToken, - uint256 destTokenEthPriceTimesGasPrice - ) internal view returns(uint256) { - if (fromToken == destToken) { - return destTokenEthPriceTimesGasPrice; - } - - uint256 mul = _cheapGetPrice(ETH_ADDRESS, destToken, 0.01 ether); - uint256 div = _cheapGetPrice(ETH_ADDRESS, fromToken, 0.01 ether); - if (div > 0) { - return destTokenEthPriceTimesGasPrice.mul(mul).div(div); - } - return 0; - } - - function _cheapGetPrice( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) internal view returns(uint256 returnAmount) { - (returnAmount,,) = this.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - 1, - FLAG_DISABLE_SPLIT_RECALCULATION | - FLAG_DISABLE_ALL_SPLIT_SOURCES | - FLAG_DISABLE_UNISWAP_V2_ALL | - FLAG_DISABLE_UNISWAP, - 0 - ); - } - - function _linearInterpolation( - uint256 value, - uint256 parts - ) internal pure returns(uint256[] memory rets) { - rets = new uint256[](parts); - for (uint i = 0; i < parts; i++) { - rets[i] = value.mul(i + 1).div(parts); - } - } - - function _tokensEqual(IERC20 tokenA, IERC20 tokenB) internal pure returns(bool) { - return ((tokenA.isETH() && tokenB.isETH()) || tokenA == tokenB); - } -} - - -contract OneSplitViewWrapBase is IOneSplitView, OneSplitRoot { - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = this.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _getExpectedReturnRespectingGasFloor( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _getExpectedReturnRespectingGasFloor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - internal - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ); -} - - -contract OneSplitView is IOneSplitView, OneSplitRoot { - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags // See constants in IOneSplit.sol - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, // See constants in IOneSplit.sol - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - distribution = new uint256[](DEXES_COUNT); - - if (fromToken == destToken) { - return (amount, 0, distribution); - } - - function(IERC20,IERC20,uint256,uint256,uint256) view returns(uint256[] memory, uint256)[DEXES_COUNT] memory reserves = _getAllReserves(flags); - - int256[][] memory matrix = new int256[][](DEXES_COUNT); - uint256[DEXES_COUNT] memory gases; - bool atLeastOnePositive = false; - for (uint i = 0; i < DEXES_COUNT; i++) { - uint256[] memory rets; - (rets, gases[i]) = reserves[i](fromToken, destToken, amount, parts, flags); - - // Prepend zero and sub gas - int256 gas = int256(gases[i].mul(destTokenEthPriceTimesGasPrice).div(1e18)); - matrix[i] = new int256[](parts + 1); - for (uint j = 0; j < rets.length; j++) { - matrix[i][j + 1] = int256(rets[j]) - gas; - atLeastOnePositive = atLeastOnePositive || (matrix[i][j + 1] > 0); - } - } - - if (!atLeastOnePositive) { - for (uint i = 0; i < DEXES_COUNT; i++) { - for (uint j = 1; j < parts + 1; j++) { - if (matrix[i][j] == 0) { - matrix[i][j] = VERY_NEGATIVE_VALUE; - } - } - } - } - - (, distribution) = _findBestDistribution(parts, matrix); - - (returnAmount, estimateGasAmount) = _getReturnAndGasByDistribution( - Args({ - fromToken: fromToken, - destToken: destToken, - amount: amount, - parts: parts, - flags: flags, - destTokenEthPriceTimesGasPrice: destTokenEthPriceTimesGasPrice, - distribution: distribution, - matrix: matrix, - gases: gases, - reserves: reserves - }) - ); - return (returnAmount, estimateGasAmount, distribution); - } - - struct Args { - IERC20 fromToken; - IERC20 destToken; - uint256 amount; - uint256 parts; - uint256 flags; - uint256 destTokenEthPriceTimesGasPrice; - uint256[] distribution; - int256[][] matrix; - uint256[DEXES_COUNT] gases; - function(IERC20,IERC20,uint256,uint256,uint256) view returns(uint256[] memory, uint256)[DEXES_COUNT] reserves; - } - - function _getReturnAndGasByDistribution( - Args memory args - ) internal view returns(uint256 returnAmount, uint256 estimateGasAmount) { - bool[DEXES_COUNT] memory exact = [ - true, // "Uniswap", - false, // "Kyber", - false, // "Bancor", - false, // "Oasis", - true, // "Curve Compound", - true, // "Curve USDT", - true, // "Curve Y", - true, // "Curve Binance", - true, // "Curve Synthetix", - true, // "Uniswap Compound", - true, // "Uniswap CHAI", - true, // "Uniswap Aave", - true, // "Mooniswap 1", - true, // "Uniswap V2", - true, // "Uniswap V2 (ETH)", - true, // "Uniswap V2 (DAI)", - true, // "Uniswap V2 (USDC)", - true, // "Curve Pax", - true, // "Curve RenBTC", - true, // "Curve tBTC", - true, // "Dforce XSwap", - false, // "Shell", - true, // "mStable", - true, // "Curve sBTC" - true, // "Balancer 1" - true, // "Balancer 2" - true, // "Balancer 3" - true, // "Kyber 1" - true, // "Kyber 2" - true, // "Kyber 3" - true, // "Kyber 4" - true, // "Mooniswap 2" - true, // "Mooniswap 3" - true // "Mooniswap 4" - ]; - - for (uint i = 0; i < DEXES_COUNT; i++) { - if (args.distribution[i] > 0) { - if (args.distribution[i] == args.parts || exact[i] || args.flags.check(FLAG_DISABLE_SPLIT_RECALCULATION)) { - estimateGasAmount = estimateGasAmount.add(args.gases[i]); - int256 value = args.matrix[i][args.distribution[i]]; - returnAmount = returnAmount.add(uint256( - (value == VERY_NEGATIVE_VALUE ? 0 : value) + - int256(args.gases[i].mul(args.destTokenEthPriceTimesGasPrice).div(1e18)) - )); - } - else { - (uint256[] memory rets, uint256 gas) = args.reserves[i](args.fromToken, args.destToken, args.amount.mul(args.distribution[i]).div(args.parts), 1, args.flags); - estimateGasAmount = estimateGasAmount.add(gas); - returnAmount = returnAmount.add(rets[0]); - } - } - } - } - - function _getAllReserves(uint256 flags) - internal - pure - returns(function(IERC20,IERC20,uint256,uint256,uint256) view returns(uint256[] memory, uint256)[DEXES_COUNT] memory) - { - bool invert = flags.check(FLAG_DISABLE_ALL_SPLIT_SOURCES); - return [ - invert != flags.check(FLAG_DISABLE_UNISWAP_ALL | FLAG_DISABLE_UNISWAP) ? _calculateNoReturn : calculateUniswap, - _calculateNoReturn, // invert != flags.check(FLAG_DISABLE_KYBER) ? _calculateNoReturn : calculateKyber, - invert != flags.check(FLAG_DISABLE_BANCOR) ? _calculateNoReturn : calculateBancor, - invert != flags.check(FLAG_DISABLE_OASIS) ? _calculateNoReturn : calculateOasis, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_COMPOUND) ? _calculateNoReturn : calculateCurveCompound, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_USDT) ? _calculateNoReturn : calculateCurveUSDT, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_Y) ? _calculateNoReturn : calculateCurveY, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_BINANCE) ? _calculateNoReturn : calculateCurveBinance, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_SYNTHETIX) ? _calculateNoReturn : calculateCurveSynthetix, - invert != flags.check(FLAG_DISABLE_UNISWAP_ALL | FLAG_DISABLE_UNISWAP_COMPOUND) ? _calculateNoReturn : calculateUniswapCompound, - invert != flags.check(FLAG_DISABLE_UNISWAP_ALL | FLAG_DISABLE_UNISWAP_CHAI) ? _calculateNoReturn : calculateUniswapChai, - invert != flags.check(FLAG_DISABLE_UNISWAP_ALL | FLAG_DISABLE_UNISWAP_AAVE) ? _calculateNoReturn : calculateUniswapAave, - invert != flags.check(FLAG_DISABLE_MOONISWAP_ALL | FLAG_DISABLE_MOONISWAP) ? _calculateNoReturn : calculateMooniswap, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_ALL | FLAG_DISABLE_UNISWAP_V2) ? _calculateNoReturn : calculateUniswapV2, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_ALL | FLAG_DISABLE_UNISWAP_V2_ETH) ? _calculateNoReturn : calculateUniswapV2ETH, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_ALL | FLAG_DISABLE_UNISWAP_V2_DAI) ? _calculateNoReturn : calculateUniswapV2DAI, - invert != flags.check(FLAG_DISABLE_UNISWAP_V2_ALL | FLAG_DISABLE_UNISWAP_V2_USDC) ? _calculateNoReturn : calculateUniswapV2USDC, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_PAX) ? _calculateNoReturn : calculateCurvePAX, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_RENBTC) ? _calculateNoReturn : calculateCurveRenBTC, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_TBTC) ? _calculateNoReturn : calculateCurveTBTC, - invert != flags.check(FLAG_DISABLE_DFORCE_SWAP) ? _calculateNoReturn : calculateDforceSwap, - invert != flags.check(FLAG_DISABLE_SHELL) ? _calculateNoReturn : calculateShell, - invert != flags.check(FLAG_DISABLE_MSTABLE_MUSD) ? _calculateNoReturn : calculateMStableMUSD, - invert != flags.check(FLAG_DISABLE_CURVE_ALL | FLAG_DISABLE_CURVE_SBTC) ? _calculateNoReturn : calculateCurveSBTC, - invert != flags.check(FLAG_DISABLE_BALANCER_ALL | FLAG_DISABLE_BALANCER_1) ? _calculateNoReturn : calculateBalancer1, - invert != flags.check(FLAG_DISABLE_BALANCER_ALL | FLAG_DISABLE_BALANCER_2) ? _calculateNoReturn : calculateBalancer2, - invert != flags.check(FLAG_DISABLE_BALANCER_ALL | FLAG_DISABLE_BALANCER_3) ? _calculateNoReturn : calculateBalancer3, - invert != flags.check(FLAG_DISABLE_KYBER_ALL | FLAG_DISABLE_KYBER_1) ? _calculateNoReturn : calculateKyber1, - invert != flags.check(FLAG_DISABLE_KYBER_ALL | FLAG_DISABLE_KYBER_2) ? _calculateNoReturn : calculateKyber2, - invert != flags.check(FLAG_DISABLE_KYBER_ALL | FLAG_DISABLE_KYBER_3) ? _calculateNoReturn : calculateKyber3, - invert != flags.check(FLAG_DISABLE_KYBER_ALL | FLAG_DISABLE_KYBER_4) ? _calculateNoReturn : calculateKyber4, - invert != flags.check(FLAG_DISABLE_MOONISWAP_ALL | FLAG_DISABLE_MOONISWAP_ETH) ? _calculateNoReturn : calculateMooniswapOverETH, - invert != flags.check(FLAG_DISABLE_MOONISWAP_ALL | FLAG_DISABLE_MOONISWAP_DAI) ? _calculateNoReturn : calculateMooniswapOverDAI, - invert != flags.check(FLAG_DISABLE_MOONISWAP_ALL | FLAG_DISABLE_MOONISWAP_USDC) ? _calculateNoReturn : calculateMooniswapOverUSDC - ]; - } - - function _calculateNoGas( - IERC20 /*fromToken*/, - IERC20 /*destToken*/, - uint256 /*amount*/, - uint256 /*parts*/, - uint256 /*destTokenEthPriceTimesGasPrice*/, - uint256 /*flags*/, - uint256 /*destTokenEthPrice*/ - ) internal view returns(uint256[] memory /*rets*/, uint256 /*gas*/) { - this; - } - - // View Helpers - - struct Balances { - uint256 src; - uint256 dst; - } - - function _calculateBalancer( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 poolIndex - ) internal view returns(uint256[] memory rets, uint256 gas) { - address[] memory pools = balancerRegistry.getBestPoolsWithLimit( - address(fromToken.isETH() ? weth : fromToken), - address(destToken.isETH() ? weth : destToken), - poolIndex + 1 - ); - if (poolIndex >= pools.length) { - return (new uint256[](parts), 0); - } - - rets = balancerHelper.getReturns( - IBalancerPool(pools[poolIndex]), - fromToken.isETH() ? weth : fromToken, - destToken.isETH() ? weth : destToken, - _linearInterpolation(amount, parts) - ); - gas = 75_000 + (fromToken.isETH() || destToken.isETH() ? 0 : 65_000); - } - - function calculateBalancer1( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateBalancer( - fromToken, - destToken, - amount, - parts, - 0 - ); - } - - function calculateBalancer2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateBalancer( - fromToken, - destToken, - amount, - parts, - 1 - ); - } - - function calculateBalancer3( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateBalancer( - fromToken, - destToken, - amount, - parts, - 2 - ); - } - - function calculateMStableMUSD( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = new uint256[](parts); - - if ((fromToken != usdc && fromToken != dai && fromToken != usdt && fromToken != tusd) || - (destToken != usdc && destToken != dai && destToken != usdt && destToken != tusd)) - { - return (rets, 0); - } - - for (uint i = 1; i <= parts; i *= 2) { - (bool success, bytes memory data) = address(musd).staticcall(abi.encodeWithSelector( - musd.getSwapOutput.selector, - fromToken, - destToken, - amount.mul(parts.div(i)).div(parts) - )); - - if (success && data.length > 0) { - (,, uint256 maxRet) = abi.decode(data, (bool,string,uint256)); - if (maxRet > 0) { - for (uint j = 0; j < parts.div(i); j++) { - rets[j] = maxRet.mul(j + 1).div(parts.div(i)); - } - break; - } - } - } - - return ( - rets, - 700_000 - ); - } - - function _getCurvePoolInfo( - ICurve curve, - bool haveUnderlying - ) internal view returns( - uint256[8] memory balances, - uint256[8] memory precisions, - uint256[8] memory rates, - uint256 amp, - uint256 fee - ) { - uint256[8] memory underlying_balances; - uint256[8] memory decimals; - uint256[8] memory underlying_decimals; - - ( - balances, - underlying_balances, - decimals, - underlying_decimals, - /*address lp_token*/, - amp, - fee - ) = curveRegistry.get_pool_info(address(curve)); - - for (uint k = 0; k < 8 && balances[k] > 0; k++) { - precisions[k] = 10 ** (18 - (haveUnderlying ? underlying_decimals : decimals)[k]); - if (haveUnderlying) { - rates[k] = underlying_balances[k].mul(1e18).div(balances[k]); - } else { - rates[k] = 1e18; - } - } - } - - function _calculateCurveSelector( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - ICurve curve, - bool haveUnderlying, - IERC20[] memory tokens - ) internal view returns(uint256[] memory rets) { - rets = new uint256[](parts); - - int128 i = 0; - int128 j = 0; - for (uint t = 0; t < tokens.length; t++) { - if (fromToken == tokens[t]) { - i = int128(t + 1); - } - if (destToken == tokens[t]) { - j = int128(t + 1); - } - } - - if (i == 0 || j == 0) { - return rets; - } - - bytes memory data = abi.encodePacked( - uint256(haveUnderlying ? 1 : 0), - uint256(i - 1), - uint256(j - 1), - _linearInterpolation100(amount, parts) - ); - - ( - uint256[8] memory balances, - uint256[8] memory precisions, - uint256[8] memory rates, - uint256 amp, - uint256 fee - ) = _getCurvePoolInfo(curve, haveUnderlying); - - bool success; - (success, data) = address(curveCalculator).staticcall( - abi.encodePacked( - abi.encodeWithSelector( - curveCalculator.get_dy.selector, - tokens.length, - balances, - amp, - fee, - rates, - precisions - ), - data - ) - ); - - if (!success || data.length == 0) { - return rets; - } - - uint256[100] memory dy = abi.decode(data, (uint256[100])); - for (uint t = 0; t < parts; t++) { - rets[t] = dy[t]; - } - } - - function _linearInterpolation100( - uint256 value, - uint256 parts - ) internal pure returns(uint256[100] memory rets) { - for (uint i = 0; i < parts; i++) { - rets[i] = value.mul(i + 1).div(parts); - } - } - - function calculateCurveCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](2); - tokens[0] = dai; - tokens[1] = usdc; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveCompound, - true, - tokens - ), 720_000); - } - - function calculateCurveUSDT( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](3); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveUSDT, - true, - tokens - ), 720_000); - } - - function calculateCurveY( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = tusd; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveY, - true, - tokens - ), 1_400_000); - } - - function calculateCurveBinance( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = busd; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveBinance, - true, - tokens - ), 1_400_000); - } - - function calculateCurveSynthetix( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = susd; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveSynthetix, - true, - tokens - ), 200_000); - } - - function calculateCurvePAX( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](4); - tokens[0] = dai; - tokens[1] = usdc; - tokens[2] = usdt; - tokens[3] = pax; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curvePAX, - true, - tokens - ), 1_000_000); - } - - function calculateCurveRenBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](2); - tokens[0] = renbtc; - tokens[1] = wbtc; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveRenBTC, - false, - tokens - ), 130_000); - } - - function calculateCurveTBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](3); - tokens[0] = tbtc; - tokens[1] = wbtc; - tokens[2] = hbtc; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveTBTC, - false, - tokens - ), 145_000); - } - - function calculateCurveSBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20[] memory tokens = new IERC20[](3); - tokens[0] = renbtc; - tokens[1] = wbtc; - tokens[2] = sbtc; - return (_calculateCurveSelector( - fromToken, - destToken, - amount, - parts, - curveSBTC, - false, - tokens - ), 150_000); - } - - function calculateShell( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - (bool success, bytes memory data) = address(shell).staticcall(abi.encodeWithSelector( - shell.viewOriginTrade.selector, - fromToken, - destToken, - amount - )); - - if (!success || data.length == 0) { - return (new uint256[](parts), 0); - } - - uint256 maxRet = abi.decode(data, (uint256)); - return (_linearInterpolation(maxRet, parts), 300_000); - } - - function calculateDforceSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - (bool success, bytes memory data) = address(dforceSwap).staticcall( - abi.encodeWithSelector( - dforceSwap.getAmountByInput.selector, - fromToken, - destToken, - amount - ) - ); - if (!success || data.length == 0) { - return (new uint256[](parts), 0); - } - - uint256 maxRet = abi.decode(data, (uint256)); - uint256 available = destToken.universalBalanceOf(address(dforceSwap)); - if (maxRet > available) { - return (new uint256[](parts), 0); - } - - return (_linearInterpolation(maxRet, parts), 160_000); - } - - function _calculateUniswapFormula(uint256 fromBalance, uint256 toBalance, uint256 amount) internal pure returns(uint256) { - if (amount == 0) { - return 0; - } - return amount.mul(toBalance).mul(997).div( - fromBalance.mul(1000).add(amount.mul(997)) - ); - } - - function _calculateUniswap( - IERC20 fromToken, - IERC20 destToken, - uint256[] memory amounts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = amounts; - - if (!fromToken.isETH()) { - IUniswapExchange fromExchange = uniswapFactory.getExchange(fromToken); - if (fromExchange == IUniswapExchange(0)) { - return (new uint256[](rets.length), 0); - } - - uint256 fromTokenBalance = fromToken.universalBalanceOf(address(fromExchange)); - uint256 fromEtherBalance = address(fromExchange).balance; - - for (uint i = 0; i < rets.length; i++) { - rets[i] = _calculateUniswapFormula(fromTokenBalance, fromEtherBalance, rets[i]); - } - } - - if (!destToken.isETH()) { - IUniswapExchange toExchange = uniswapFactory.getExchange(destToken); - if (toExchange == IUniswapExchange(0)) { - return (new uint256[](rets.length), 0); - } - - uint256 toEtherBalance = address(toExchange).balance; - uint256 toTokenBalance = destToken.universalBalanceOf(address(toExchange)); - - for (uint i = 0; i < rets.length; i++) { - rets[i] = _calculateUniswapFormula(toEtherBalance, toTokenBalance, rets[i]); - } - } - - return (rets, fromToken.isETH() || destToken.isETH() ? 60_000 : 100_000); - } - - function calculateUniswap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateUniswap( - fromToken, - destToken, - _linearInterpolation(amount, parts), - flags - ); - } - - function _calculateUniswapWrapped( - IERC20 fromToken, - IERC20 midToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 midTokenPrice, - uint256 flags, - uint256 gas1, - uint256 gas2 - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (!fromToken.isETH() && destToken.isETH()) { - (rets, gas) = _calculateUniswap( - midToken, - destToken, - _linearInterpolation(amount.mul(1e18).div(midTokenPrice), parts), - flags - ); - return (rets, gas + gas1); - } - else if (fromToken.isETH() && !destToken.isETH()) { - (rets, gas) = _calculateUniswap( - fromToken, - midToken, - _linearInterpolation(amount, parts), - flags - ); - - for (uint i = 0; i < parts; i++) { - rets[i] = rets[i].mul(midTokenPrice).div(1e18); - } - return (rets, gas + gas2); - } - - return (new uint256[](parts), 0); - } - - function calculateUniswapCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20 midPreToken; - if (!fromToken.isETH() && destToken.isETH()) { - midPreToken = fromToken; - } - else if (!destToken.isETH() && fromToken.isETH()) { - midPreToken = destToken; - } - - if (!midPreToken.isETH()) { - ICompoundToken midToken = compoundRegistry.cTokenByToken(midPreToken); - if (midToken != ICompoundToken(0)) { - return _calculateUniswapWrapped( - fromToken, - midToken, - destToken, - amount, - parts, - midToken.exchangeRateStored(), - flags, - 200_000, - 200_000 - ); - } - } - - return (new uint256[](parts), 0); - } - - function calculateUniswapChai( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == dai && destToken.isETH() || - fromToken.isETH() && destToken == dai) - { - return _calculateUniswapWrapped( - fromToken, - chai, - destToken, - amount, - parts, - chai.chaiPrice(), - flags, - 180_000, - 160_000 - ); - } - - return (new uint256[](parts), 0); - } - - function calculateUniswapAave( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - IERC20 midPreToken; - if (!fromToken.isETH() && destToken.isETH()) { - midPreToken = fromToken; - } - else if (!destToken.isETH() && fromToken.isETH()) { - midPreToken = destToken; - } - - if (!midPreToken.isETH()) { - IAaveToken midToken = aaveRegistry.aTokenByToken(midPreToken); - if (midToken != IAaveToken(0)) { - return _calculateUniswapWrapped( - fromToken, - midToken, - destToken, - amount, - parts, - 1e18, - flags, - 310_000, - 670_000 - ); - } - } - - return (new uint256[](parts), 0); - } - - function calculateKyber1( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateKyber( - fromToken, - destToken, - amount, - parts, - flags, - 0xff4b796265722046707200000000000000000000000000000000000000000000 // 0x63825c174ab367968EC60f061753D3bbD36A0D8F - ); - } - - function calculateKyber2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateKyber( - fromToken, - destToken, - amount, - parts, - flags, - 0xffabcd0000000000000000000000000000000000000000000000000000000000 // 0x7a3370075a54B187d7bD5DceBf0ff2B5552d4F7D - ); - } - - function calculateKyber3( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateKyber( - fromToken, - destToken, - amount, - parts, - flags, - 0xff4f6e65426974205175616e7400000000000000000000000000000000000000 // 0x4f32BbE8dFc9efD54345Fc936f9fEF1048746fCF - ); - } - - function calculateKyber4( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - bytes32 reserveId = _kyberReserveIdByTokens(fromToken, destToken); - if (reserveId == 0) { - return (new uint256[](parts), 0); - } - - return _calculateKyber( - fromToken, - destToken, - amount, - parts, - flags, - reserveId - ); - } - - function _kyberGetRate( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags, - bytes memory hint - ) private view returns(uint256) { - (, bytes memory data) = address(kyberNetworkProxy).staticcall( - abi.encodeWithSelector( - kyberNetworkProxy.getExpectedRateAfterFee.selector, - fromToken, - destToken, - amount, - (flags >> 255) * 10, - hint - ) - ); - - return (data.length == 32) ? abi.decode(data, (uint256)) : 0; - } - - function _calculateKyber( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - bytes32 reserveId - ) internal view returns(uint256[] memory rets, uint256 gas) { - bytes memory fromHint; - bytes memory destHint; - { - bytes32[] memory reserveIds = new bytes32[](1); - reserveIds[0] = reserveId; - - (bool success, bytes memory data) = address(kyberHintHandler).staticcall( - abi.encodeWithSelector( - kyberHintHandler.buildTokenToEthHint.selector, - fromToken, - IKyberHintHandler.TradeType.MaskIn, - reserveIds, - new uint256[](0) - ) - ); - fromHint = success ? abi.decode(data, (bytes)) : bytes(""); - - (success, data) = address(kyberHintHandler).staticcall( - abi.encodeWithSelector( - kyberHintHandler.buildEthToTokenHint.selector, - destToken, - IKyberHintHandler.TradeType.MaskIn, - reserveIds, - new uint256[](0) - ) - ); - destHint = success ? abi.decode(data, (bytes)) : bytes(""); - } - - uint256 fromTokenDecimals = 10 ** IERC20(fromToken).universalDecimals(); - uint256 destTokenDecimals = 10 ** IERC20(destToken).universalDecimals(); - rets = new uint256[](parts); - for (uint i = 0; i < parts; i++) { - if (i > 0 && rets[i - 1] == 0) { - break; - } - rets[i] = amount.mul(i + 1).div(parts); - - if (!fromToken.isETH()) { - if (fromHint.length == 0) { - rets[i] = 0; - break; - } - uint256 rate = _kyberGetRate( - fromToken, - ETH_ADDRESS, - rets[i], - flags, - fromHint - ); - rets[i] = rate.mul(rets[i]).div(fromTokenDecimals); - } - - if (!destToken.isETH() && rets[i] > 0) { - if (destHint.length == 0) { - rets[i] = 0; - break; - } - uint256 rate = _kyberGetRate( - ETH_ADDRESS, - destToken, - rets[i], - 10, - destHint - ); - rets[i] = rate.mul(rets[i]).mul(destTokenDecimals).div(1e36); - } - } - - return (rets, 100_000); - } - - function calculateBancor( - IERC20 /*fromToken*/, - IERC20 /*destToken*/, - uint256 /*amount*/, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return (new uint256[](parts), 0); - // IBancorNetwork bancorNetwork = IBancorNetwork(bancorContractRegistry.addressOf("BancorNetwork")); - - // address[] memory path = bancorFinder.buildBancorPath( - // fromToken.isETH() ? bancorEtherToken : fromToken, - // destToken.isETH() ? bancorEtherToken : destToken - // ); - - // rets = _linearInterpolation(amount, parts); - // for (uint i = 0; i < parts; i++) { - // (bool success, bytes memory data) = address(bancorNetwork).staticcall.gas(500000)( - // abi.encodeWithSelector( - // bancorNetwork.getReturnByPath.selector, - // path, - // rets[i] - // ) - // ); - // if (!success || data.length == 0) { - // for (; i < parts; i++) { - // rets[i] = 0; - // } - // break; - // } else { - // (uint256 ret,) = abi.decode(data, (uint256,uint256)); - // rets[i] = ret; - // } - // } - - // return (rets, path.length.mul(150_000)); - } - - function calculateOasis( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = _linearInterpolation(amount, parts); - for (uint i = 0; i < parts; i++) { - (bool success, bytes memory data) = address(oasisExchange).staticcall.gas(500000)( - abi.encodeWithSelector( - oasisExchange.getBuyAmount.selector, - destToken.isETH() ? weth : destToken, - fromToken.isETH() ? weth : fromToken, - rets[i] - ) - ); - - if (!success || data.length == 0) { - for (; i < parts; i++) { - rets[i] = 0; - } - break; - } else { - rets[i] = abi.decode(data, (uint256)); - } - } - - return (rets, 500_000); - } - - function calculateMooniswapMany( - IERC20 fromToken, - IERC20 destToken, - uint256[] memory amounts - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = new uint256[](amounts.length); - - IMooniswap mooniswap = mooniswapRegistry.pools( - fromToken.isETH() ? ZERO_ADDRESS : fromToken, - destToken.isETH() ? ZERO_ADDRESS : destToken - ); - if (mooniswap == IMooniswap(0)) { - return (rets, 0); - } - - uint256 fee = mooniswap.fee(); - uint256 fromBalance = mooniswap.getBalanceForAddition(fromToken.isETH() ? ZERO_ADDRESS : fromToken); - uint256 destBalance = mooniswap.getBalanceForRemoval(destToken.isETH() ? ZERO_ADDRESS : destToken); - if (fromBalance == 0 || destBalance == 0) { - return (rets, 0); - } - - for (uint i = 0; i < amounts.length; i++) { - uint256 amount = amounts[i].sub(amounts[i].mul(fee).div(1e18)); - rets[i] = amount.mul(destBalance).div( - fromBalance.add(amount) - ); - } - - return (rets, (fromToken.isETH() || destToken.isETH()) ? 80_000 : 110_000); - } - - function calculateMooniswap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - return calculateMooniswapMany( - fromToken, - destToken, - _linearInterpolation(amount, parts) - ); - } - - function calculateMooniswapOverETH( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken.isETH() || destToken.isETH()) { - return (new uint256[](parts), 0); - } - - (uint256[] memory results, uint256 gas1) = calculateMooniswap(fromToken, ZERO_ADDRESS, amount, parts, flags); - (rets, gas) = calculateMooniswapMany(ZERO_ADDRESS, destToken, results); - gas = gas.add(gas1); - } - - function calculateMooniswapOverDAI( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == dai || destToken == dai) { - return (new uint256[](parts), 0); - } - - (uint256[] memory results, uint256 gas1) = calculateMooniswap(fromToken, dai, amount, parts, flags); - (rets, gas) = calculateMooniswapMany(dai, destToken, results); - gas = gas.add(gas1); - } - - function calculateMooniswapOverUSDC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == usdc || destToken == usdc) { - return (new uint256[](parts), 0); - } - - (uint256[] memory results, uint256 gas1) = calculateMooniswap(fromToken, usdc, amount, parts, flags); - (rets, gas) = calculateMooniswapMany(usdc, destToken, results); - gas = gas.add(gas1); - } - - function calculateUniswapV2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - return _calculateUniswapV2( - fromToken, - destToken, - _linearInterpolation(amount, parts), - flags - ); - } - - function calculateUniswapV2ETH( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken.isETH() || fromToken == weth || destToken.isETH() || destToken == weth) { - return (new uint256[](parts), 0); - } - - return _calculateUniswapV2OverMidToken( - fromToken, - weth, - destToken, - amount, - parts, - flags - ); - } - - function calculateUniswapV2DAI( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == dai || destToken == dai) { - return (new uint256[](parts), 0); - } - - return _calculateUniswapV2OverMidToken( - fromToken, - dai, - destToken, - amount, - parts, - flags - ); - } - - function calculateUniswapV2USDC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - if (fromToken == usdc || destToken == usdc) { - return (new uint256[](parts), 0); - } - - return _calculateUniswapV2OverMidToken( - fromToken, - usdc, - destToken, - amount, - parts, - flags - ); - } - - function _calculateUniswapV2( - IERC20 fromToken, - IERC20 destToken, - uint256[] memory amounts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = new uint256[](amounts.length); - - IERC20 fromTokenReal = fromToken.isETH() ? weth : fromToken; - IERC20 destTokenReal = destToken.isETH() ? weth : destToken; - IUniswapV2Exchange exchange = uniswapV2.getPair(fromTokenReal, destTokenReal); - if (exchange != IUniswapV2Exchange(0)) { - uint256 fromTokenBalance = fromTokenReal.universalBalanceOf(address(exchange)); - uint256 destTokenBalance = destTokenReal.universalBalanceOf(address(exchange)); - for (uint i = 0; i < amounts.length; i++) { - rets[i] = _calculateUniswapFormula(fromTokenBalance, destTokenBalance, amounts[i]); - } - return (rets, 50_000); - } - } - - function _calculateUniswapV2OverMidToken( - IERC20 fromToken, - IERC20 midToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) internal view returns(uint256[] memory rets, uint256 gas) { - rets = _linearInterpolation(amount, parts); - - uint256 gas1; - uint256 gas2; - (rets, gas1) = _calculateUniswapV2(fromToken, midToken, rets, flags); - (rets, gas2) = _calculateUniswapV2(midToken, destToken, rets, flags); - return (rets, gas1 + gas2); - } - - function _calculateNoReturn( - IERC20 /*fromToken*/, - IERC20 /*destToken*/, - uint256 /*amount*/, - uint256 parts, - uint256 /*flags*/ - ) internal view returns(uint256[] memory rets, uint256 gas) { - this; - return (new uint256[](parts), 0); - } -} - - -contract OneSplitBaseWrap is IOneSplit, OneSplitRoot { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags // See constants in IOneSplit.sol - ) internal { - if (fromToken == destToken) { - return; - } - - _swapFloor( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _swapFloor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 /*flags*/ // See constants in IOneSplit.sol - ) internal; -} - - -contract OneSplit is IOneSplit, OneSplitRoot { - IOneSplitView public oneSplitView; - - constructor(IOneSplitView _oneSplitView) public { - oneSplitView = _oneSplitView; - } - - function() external payable { - // solium-disable-next-line security/no-tx-origin - require(msg.sender != tx.origin); - } - - function getExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - public - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - (returnAmount, , distribution) = getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - 0 - ); - } - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return oneSplitView.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - uint256[] memory distribution, - uint256 flags // See constants in IOneSplit.sol - ) public payable returns(uint256 returnAmount) { - if (fromToken == destToken) { - return amount; - } - - function(IERC20,IERC20,uint256,uint256)[DEXES_COUNT] memory reserves = [ - _swapOnUniswap, - _swapOnNowhere, - _swapOnBancor, - _swapOnOasis, - _swapOnCurveCompound, - _swapOnCurveUSDT, - _swapOnCurveY, - _swapOnCurveBinance, - _swapOnCurveSynthetix, - _swapOnUniswapCompound, - _swapOnUniswapChai, - _swapOnUniswapAave, - _swapOnMooniswap, - _swapOnUniswapV2, - _swapOnUniswapV2ETH, - _swapOnUniswapV2DAI, - _swapOnUniswapV2USDC, - _swapOnCurvePAX, - _swapOnCurveRenBTC, - _swapOnCurveTBTC, - _swapOnDforceSwap, - _swapOnShell, - _swapOnMStableMUSD, - _swapOnCurveSBTC, - _swapOnBalancer1, - _swapOnBalancer2, - _swapOnBalancer3, - _swapOnKyber1, - _swapOnKyber2, - _swapOnKyber3, - _swapOnKyber4, - _swapOnMooniswapETH, - _swapOnMooniswapDAI, - _swapOnMooniswapUSDC - ]; - - require(distribution.length <= reserves.length, "OneSplit: Distribution array should not exceed reserves array size"); - - uint256 parts = 0; - uint256 lastNonZeroIndex = 0; - for (uint i = 0; i < distribution.length; i++) { - if (distribution[i] > 0) { - parts = parts.add(distribution[i]); - lastNonZeroIndex = i; - } - } - - if (parts == 0) { - if (fromToken.isETH()) { - msg.sender.transfer(msg.value); - return msg.value; - } - return amount; - } - - fromToken.universalTransferFrom(msg.sender, address(this), amount); - uint256 remainingAmount = fromToken.universalBalanceOf(address(this)); - - for (uint i = 0; i < distribution.length; i++) { - if (distribution[i] == 0) { - continue; - } - - uint256 swapAmount = amount.mul(distribution[i]).div(parts); - if (i == lastNonZeroIndex) { - swapAmount = remainingAmount; - } - remainingAmount -= swapAmount; - reserves[i](fromToken, destToken, swapAmount, flags); - } - - returnAmount = destToken.universalBalanceOf(address(this)); - require(returnAmount >= minReturn, "OneSplit: Return amount was not enough"); - destToken.universalTransfer(msg.sender, returnAmount); - fromToken.universalTransfer(msg.sender, fromToken.universalBalanceOf(address(this))); - } - - // Swap helpers - - function _swapOnCurveCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + (fromToken == usdc ? 2 : 0); - int128 j = (destToken == dai ? 1 : 0) + (destToken == usdc ? 2 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveCompound), amount); - curveCompound.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveUSDT( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveUSDT), amount); - curveUSDT.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveY( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == tusd ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == tusd ? 4 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveY), amount); - curveY.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveBinance( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == busd ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == busd ? 4 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveBinance), amount); - curveBinance.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveSynthetix( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == susd ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == susd ? 4 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveSynthetix), amount); - curveSynthetix.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnCurvePAX( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == dai ? 1 : 0) + - (fromToken == usdc ? 2 : 0) + - (fromToken == usdt ? 3 : 0) + - (fromToken == pax ? 4 : 0); - int128 j = (destToken == dai ? 1 : 0) + - (destToken == usdc ? 2 : 0) + - (destToken == usdt ? 3 : 0) + - (destToken == pax ? 4 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curvePAX), amount); - curvePAX.exchange_underlying(i - 1, j - 1, amount, 0); - } - - function _swapOnShell( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - fromToken.universalApprove(address(shell), amount); - shell.swapByOrigin( - address(fromToken), - address(destToken), - amount, - 0, - now + 50 - ); - } - - function _swapOnMStableMUSD( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - fromToken.universalApprove(address(musd), amount); - musd.swap( - fromToken, - destToken, - amount, - address(this) - ); - } - - function _swapOnCurveRenBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == renbtc ? 1 : 0) + - (fromToken == wbtc ? 2 : 0); - int128 j = (destToken == renbtc ? 1 : 0) + - (destToken == wbtc ? 2 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveRenBTC), amount); - curveRenBTC.exchange(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveTBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == tbtc ? 1 : 0) + - (fromToken == wbtc ? 2 : 0) + - (fromToken == hbtc ? 3 : 0); - int128 j = (destToken == tbtc ? 1 : 0) + - (destToken == wbtc ? 2 : 0) + - (destToken == hbtc ? 3 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveTBTC), amount); - curveTBTC.exchange(i - 1, j - 1, amount, 0); - } - - function _swapOnCurveSBTC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - int128 i = (fromToken == renbtc ? 1 : 0) + - (fromToken == wbtc ? 2 : 0) + - (fromToken == sbtc ? 3 : 0); - int128 j = (destToken == renbtc ? 1 : 0) + - (destToken == wbtc ? 2 : 0) + - (destToken == sbtc ? 3 : 0); - if (i == 0 || j == 0) { - return; - } - - fromToken.universalApprove(address(curveSBTC), amount); - curveSBTC.exchange(i - 1, j - 1, amount, 0); - } - - function _swapOnDforceSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - fromToken.universalApprove(address(dforceSwap), amount); - dforceSwap.swap(fromToken, destToken, amount); - } - - function _swapOnUniswap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - uint256 returnAmount = amount; - - if (!fromToken.isETH()) { - IUniswapExchange fromExchange = uniswapFactory.getExchange(fromToken); - if (fromExchange != IUniswapExchange(0)) { - fromToken.universalApprove(address(fromExchange), returnAmount); - returnAmount = fromExchange.tokenToEthSwapInput(returnAmount, 1, now); - } - } - - if (!destToken.isETH()) { - IUniswapExchange toExchange = uniswapFactory.getExchange(destToken); - if (toExchange != IUniswapExchange(0)) { - returnAmount = toExchange.ethToTokenSwapInput.value(returnAmount)(1, now); - } - } - } - - function _swapOnUniswapCompound( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - if (!fromToken.isETH()) { - ICompoundToken fromCompound = compoundRegistry.cTokenByToken(fromToken); - fromToken.universalApprove(address(fromCompound), amount); - fromCompound.mint(amount); - _swapOnUniswap(IERC20(fromCompound), destToken, IERC20(fromCompound).universalBalanceOf(address(this)), flags); - return; - } - - if (!destToken.isETH()) { - ICompoundToken toCompound = compoundRegistry.cTokenByToken(destToken); - _swapOnUniswap(fromToken, IERC20(toCompound), amount, flags); - toCompound.redeem(IERC20(toCompound).universalBalanceOf(address(this))); - destToken.universalBalanceOf(address(this)); - return; - } - } - - function _swapOnUniswapChai( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - if (fromToken == dai) { - fromToken.universalApprove(address(chai), amount); - chai.join(address(this), amount); - _swapOnUniswap(IERC20(chai), destToken, IERC20(chai).universalBalanceOf(address(this)), flags); - return; - } - - if (destToken == dai) { - _swapOnUniswap(fromToken, IERC20(chai), amount, flags); - chai.exit(address(this), chai.balanceOf(address(this))); - return; - } - } - - function _swapOnUniswapAave( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - if (!fromToken.isETH()) { - IAaveToken fromAave = aaveRegistry.aTokenByToken(fromToken); - fromToken.universalApprove(aave.core(), amount); - aave.deposit(fromToken, amount, 1101); - _swapOnUniswap(IERC20(fromAave), destToken, IERC20(fromAave).universalBalanceOf(address(this)), flags); - return; - } - - if (!destToken.isETH()) { - IAaveToken toAave = aaveRegistry.aTokenByToken(destToken); - _swapOnUniswap(fromToken, IERC20(toAave), amount, flags); - toAave.redeem(toAave.balanceOf(address(this))); - return; - } - } - - function _swapOnMooniswap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - IMooniswap mooniswap = mooniswapRegistry.pools( - fromToken.isETH() ? ZERO_ADDRESS : fromToken, - destToken.isETH() ? ZERO_ADDRESS : destToken - ); - fromToken.universalApprove(address(mooniswap), amount); - mooniswap.swap.value(fromToken.isETH() ? amount : 0)( - fromToken.isETH() ? ZERO_ADDRESS : fromToken, - destToken.isETH() ? ZERO_ADDRESS : destToken, - amount, - 0, - 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5 - ); - } - - function _swapOnMooniswapETH( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnMooniswap(fromToken, ZERO_ADDRESS, amount, flags); - _swapOnMooniswap(ZERO_ADDRESS, destToken, address(this).balance, flags); - } - - function _swapOnMooniswapDAI( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnMooniswap(fromToken, dai, amount, flags); - _swapOnMooniswap(dai, destToken, dai.balanceOf(address(this)), flags); - } - - function _swapOnMooniswapUSDC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnMooniswap(fromToken, usdc, amount, flags); - _swapOnMooniswap(usdc, destToken, usdc.balanceOf(address(this)), flags); - } - - function _swapOnNowhere( - IERC20 /*fromToken*/, - IERC20 /*destToken*/, - uint256 /*amount*/, - uint256 /*flags*/ - ) internal { - revert("This source was deprecated"); - } - - function _swapOnKyber1( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnKyber( - fromToken, - destToken, - amount, - flags, - 0xff4b796265722046707200000000000000000000000000000000000000000000 - ); - } - - function _swapOnKyber2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnKyber( - fromToken, - destToken, - amount, - flags, - 0xffabcd0000000000000000000000000000000000000000000000000000000000 - ); - } - - function _swapOnKyber3( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnKyber( - fromToken, - destToken, - amount, - flags, - 0xff4f6e65426974205175616e7400000000000000000000000000000000000000 - ); - } - - function _swapOnKyber4( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnKyber( - fromToken, - destToken, - amount, - flags, - _kyberReserveIdByTokens(fromToken, destToken) - ); - } - - function _swapOnKyber( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags, - bytes32 reserveId - ) internal { - uint256 returnAmount = amount; - - bytes32[] memory reserveIds = new bytes32[](1); - reserveIds[0] = reserveId; - - if (!fromToken.isETH()) { - bytes memory fromHint = kyberHintHandler.buildTokenToEthHint( - fromToken, - IKyberHintHandler.TradeType.MaskIn, - reserveIds, - new uint256[](0) - ); - - fromToken.universalApprove(address(kyberNetworkProxy), amount); - returnAmount = kyberNetworkProxy.tradeWithHintAndFee( - fromToken, - returnAmount, - ETH_ADDRESS, - address(this), - uint256(-1), - 0, - 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5, - (flags >> 255) * 10, - fromHint - ); - } - - if (!destToken.isETH()) { - bytes memory destHint = kyberHintHandler.buildEthToTokenHint( - destToken, - IKyberHintHandler.TradeType.MaskIn, - reserveIds, - new uint256[](0) - ); - - returnAmount = kyberNetworkProxy.tradeWithHintAndFee.value(returnAmount)( - ETH_ADDRESS, - returnAmount, - destToken, - address(this), - uint256(-1), - 0, - 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5, - (flags >> 255) * 10, - destHint - ); - } - } - - function _swapOnBancor( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - IBancorNetwork bancorNetwork = IBancorNetwork(bancorContractRegistry.addressOf("BancorNetwork")); - address[] memory path = bancorNetworkPathFinder.generatePath( - fromToken.isETH() ? bancorEtherToken : fromToken, - destToken.isETH() ? bancorEtherToken : destToken - ); - fromToken.universalApprove(address(bancorNetwork), amount); - bancorNetwork.convert.value(fromToken.isETH() ? amount : 0)(path, amount, 1); - } - - function _swapOnOasis( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal { - if (fromToken.isETH()) { - weth.deposit.value(amount)(); - } - - IERC20 approveToken = fromToken.isETH() ? weth : fromToken; - approveToken.universalApprove(address(oasisExchange), amount); - oasisExchange.sellAllAmount( - fromToken.isETH() ? weth : fromToken, - amount, - destToken.isETH() ? weth : destToken, - 1 - ); - - if (destToken.isETH()) { - weth.withdraw(weth.balanceOf(address(this))); - } - } - - function _swapOnUniswapV2Internal( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/ - ) internal returns(uint256 returnAmount) { - if (fromToken.isETH()) { - weth.deposit.value(amount)(); - } - - IERC20 fromTokenReal = fromToken.isETH() ? weth : fromToken; - IERC20 toTokenReal = destToken.isETH() ? weth : destToken; - IUniswapV2Exchange exchange = uniswapV2.getPair(fromTokenReal, toTokenReal); - bool needSync; - bool needSkim; - (returnAmount, needSync, needSkim) = exchange.getReturn(fromTokenReal, toTokenReal, amount); - if (needSync) { - exchange.sync(); - } - else if (needSkim) { - exchange.skim(0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5); - } - - fromTokenReal.universalTransfer(address(exchange), amount); - if (uint256(address(fromTokenReal)) < uint256(address(toTokenReal))) { - exchange.swap(0, returnAmount, address(this), ""); - } else { - exchange.swap(returnAmount, 0, address(this), ""); - } - - if (destToken.isETH()) { - weth.withdraw(weth.balanceOf(address(this))); - } - } - - function _swapOnUniswapV2OverMid( - IERC20 fromToken, - IERC20 midToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2Internal( - midToken, - destToken, - _swapOnUniswapV2Internal( - fromToken, - midToken, - amount, - flags - ), - flags - ); - } - - function _swapOnUniswapV2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2Internal( - fromToken, - destToken, - amount, - flags - ); - } - - function _swapOnUniswapV2ETH( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2OverMid( - fromToken, - weth, - destToken, - amount, - flags - ); - } - - function _swapOnUniswapV2DAI( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2OverMid( - fromToken, - dai, - destToken, - amount, - flags - ); - } - - function _swapOnUniswapV2USDC( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnUniswapV2OverMid( - fromToken, - usdc, - destToken, - amount, - flags - ); - } - - function _swapOnBalancerX( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 /*flags*/, - uint256 poolIndex - ) internal { - address[] memory pools = balancerRegistry.getBestPoolsWithLimit( - address(fromToken.isETH() ? weth : fromToken), - address(destToken.isETH() ? weth : destToken), - poolIndex + 1 - ); - - if (fromToken.isETH()) { - weth.deposit.value(amount)(); - } - - (fromToken.isETH() ? weth : fromToken).universalApprove(pools[poolIndex], amount); - IBalancerPool(pools[poolIndex]).swapExactAmountIn( - fromToken.isETH() ? weth : fromToken, - amount, - destToken.isETH() ? weth : destToken, - 0, - uint256(-1) - ); - - if (destToken.isETH()) { - weth.withdraw(weth.balanceOf(address(this))); - } - } - - function _swapOnBalancer1( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnBalancerX(fromToken, destToken, amount, flags, 0); - } - - function _swapOnBalancer2( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnBalancerX(fromToken, destToken, amount, flags, 1); - } - - function _swapOnBalancer3( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 flags - ) internal { - _swapOnBalancerX(fromToken, destToken, amount, flags, 2); - } -} diff --git a/contracts/OneSplitBdai.sol b/contracts/OneSplitBdai.sol deleted file mode 100644 index 6df880d..0000000 --- a/contracts/OneSplitBdai.sol +++ /dev/null @@ -1,128 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/IBdai.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitBdaiBase { - IBdai internal constant bdai = IBdai(0x6a4FFAafa8DD400676Df8076AD6c724867b0e2e8); - IERC20 internal constant btu = IERC20(0xb683D83a532e2Cb7DFa5275eED3698436371cc9f); -} - - -contract OneSplitBdaiView is OneSplitViewWrapBase, OneSplitBdaiBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_BDAI)) { - if (fromToken == IERC20(bdai)) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - dai, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 227_000, distribution); - } - - if (destToken == IERC20(bdai)) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - dai, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 295_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitBdai is OneSplitBaseWrap, OneSplitBdaiBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_BDAI)) { - if (fromToken == IERC20(bdai)) { - bdai.exit(amount); - - uint256 btuBalance = btu.balanceOf(address(this)); - if (btuBalance > 0) { - (,uint256[] memory btuDistribution) = getExpectedReturn( - btu, - destToken, - btuBalance, - 1, - flags - ); - - _swap( - btu, - destToken, - btuBalance, - btuDistribution, - flags - ); - } - - return super._swap( - dai, - destToken, - amount, - distribution, - flags - ); - } - - if (destToken == IERC20(bdai)) { - super._swap(fromToken, dai, amount, distribution, flags); - - uint256 daiBalance = dai.balanceOf(address(this)); - dai.universalApprove(address(bdai), daiBalance); - bdai.join(daiBalance); - return; - } - } - - return super._swap(fromToken, destToken, amount, distribution, flags); - } -} diff --git a/contracts/OneSplitChai.sol b/contracts/OneSplitChai.sol deleted file mode 100644 index 3b001fc..0000000 --- a/contracts/OneSplitChai.sol +++ /dev/null @@ -1,116 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/IChai.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitChaiView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_CHAI)) { - if (fromToken == IERC20(chai)) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - dai, - destToken, - chai.chaiToDai(amount), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 197_000, distribution); - } - - if (destToken == IERC20(chai)) { - uint256 price = chai.chaiPrice(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - dai, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice.mul(1e18).div(price) - ); - return (returnAmount.mul(price).div(1e18), estimateGasAmount + 168_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitChai is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_CHAI)) { - if (fromToken == IERC20(chai)) { - chai.exit(address(this), amount); - - return super._swap( - dai, - destToken, - dai.balanceOf(address(this)), - distribution, - flags - ); - } - - if (destToken == IERC20(chai)) { - super._swap( - fromToken, - dai, - amount, - distribution, - flags - ); - - uint256 daiBalance = dai.balanceOf(address(this)); - dai.universalApprove(address(chai), daiBalance); - chai.join(address(this), daiBalance); - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} diff --git a/contracts/OneSplitCompound.sol b/contracts/OneSplitCompound.sol deleted file mode 100644 index b702b05..0000000 --- a/contracts/OneSplitCompound.sol +++ /dev/null @@ -1,170 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/ICompound.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitCompoundView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _compoundGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _compoundGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_COMPOUND)) { - IERC20 underlying = compoundRegistry.tokenByCToken(ICompoundToken(address(fromToken))); - if (underlying != IERC20(0)) { - uint256 compoundRate = ICompoundToken(address(fromToken)).exchangeRateStored(); - (returnAmount, estimateGasAmount, distribution) = _compoundGetExpectedReturn( - underlying, - destToken, - amount.mul(compoundRate).div(1e18), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 295_000, distribution); - } - - underlying = compoundRegistry.tokenByCToken(ICompoundToken(address(destToken))); - if (underlying != IERC20(0)) { - uint256 _destTokenEthPriceTimesGasPrice = destTokenEthPriceTimesGasPrice; - uint256 compoundRate = ICompoundToken(address(destToken)).exchangeRateStored(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - underlying, - amount, - parts, - flags, - _destTokenEthPriceTimesGasPrice.mul(compoundRate).div(1e18) - ); - return (returnAmount.mul(1e18).div(compoundRate), estimateGasAmount + 430_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitCompound is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _compoundSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _compoundSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_COMPOUND)) { - IERC20 underlying = compoundRegistry.tokenByCToken(ICompoundToken(address(fromToken))); - if (underlying != IERC20(0)) { - ICompoundToken(address(fromToken)).redeem(amount); - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - return _compoundSwap( - underlying, - destToken, - underlyingAmount, - distribution, - flags - ); - } - - underlying = compoundRegistry.tokenByCToken(ICompoundToken(address(destToken))); - if (underlying != IERC20(0)) { - super._swap( - fromToken, - underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - if (underlying.isETH()) { - cETH.mint.value(underlyingAmount)(); - } else { - underlying.universalApprove(address(destToken), underlyingAmount); - ICompoundToken(address(destToken)).mint(underlyingAmount); - } - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} diff --git a/contracts/OneSplitDMM.sol b/contracts/OneSplitDMM.sol deleted file mode 100644 index 3e834e2..0000000 --- a/contracts/OneSplitDMM.sol +++ /dev/null @@ -1,214 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/IDMM.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitDMMBase { - IDMMController internal constant _dmmController = IDMMController(0x4CB120Dd1D33C9A3De8Bc15620C7Cd43418d77E2); - - function _getDMMUnderlyingToken(IERC20 token) internal view returns(IERC20) { - (bool success, bytes memory data) = address(_dmmController).staticcall( - abi.encodeWithSelector( - _dmmController.getUnderlyingTokenForDmm.selector, - token - ) - ); - - if (!success || data.length == 0) { - return IERC20(-1); - } - - return abi.decode(data, (IERC20)); - } - - function _getDMMExchangeRate(IDMM dmm) internal view returns(uint256) { - (bool success, bytes memory data) = address(dmm).staticcall( - abi.encodeWithSelector( - dmm.getCurrentExchangeRate.selector - ) - ); - - if (!success || data.length == 0) { - return 0; - } - - return abi.decode(data, (uint256)); - } -} - - -contract OneSplitDMMView is OneSplitViewWrapBase, OneSplitDMMBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _dmmGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _dmmGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_DMM)) { - IERC20 underlying = _getDMMUnderlyingToken(fromToken); - if (underlying != IERC20(-1)) { - if (underlying == weth) { - underlying = ETH_ADDRESS; - } - IERC20 _fromToken = fromToken; - (returnAmount, estimateGasAmount, distribution) = _dmmGetExpectedReturn( - underlying, - destToken, - amount.mul(_getDMMExchangeRate(IDMM(address(_fromToken)))).div(1e18), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 295_000, distribution); - } - - underlying = _getDMMUnderlyingToken(destToken); - if (underlying != IERC20(-1)) { - if (underlying == weth) { - underlying = ETH_ADDRESS; - } - uint256 price = _getDMMExchangeRate(IDMM(address(destToken))); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - underlying, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice.mul(price).div(1e18) - ); - return ( - returnAmount.mul(1e18).div(price), - estimateGasAmount + 430_000, - distribution - ); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitDMM is OneSplitBaseWrap, OneSplitDMMBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _dmmSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _dmmSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_DMM)) { - IERC20 underlying = _getDMMUnderlyingToken(fromToken); - if (underlying != IERC20(-1)) { - IDMM(address(fromToken)).redeem(amount); - uint256 balance = underlying.universalBalanceOf(address(this)); - if (underlying == weth) { - weth.withdraw(balance); - } - _dmmSwap( - (underlying == weth) ? ETH_ADDRESS : underlying, - destToken, - balance, - distribution, - flags - ); - } - - underlying = _getDMMUnderlyingToken(destToken); - if (underlying != IERC20(-1)) { - super._swap( - fromToken, - (underlying == weth) ? ETH_ADDRESS : underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = ((underlying == weth) ? ETH_ADDRESS : underlying).universalBalanceOf(address(this)); - if (underlying == weth) { - weth.deposit.value(underlyingAmount); - } - - underlying.universalApprove(address(destToken), underlyingAmount); - IDMM(address(destToken)).mint(underlyingAmount); - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} diff --git a/contracts/OneSplitFulcrum.sol b/contracts/OneSplitFulcrum.sol deleted file mode 100644 index 2fb4e62..0000000 --- a/contracts/OneSplitFulcrum.sol +++ /dev/null @@ -1,220 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/IFulcrum.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitFulcrumBase { - using UniversalERC20 for IERC20; - - function _isFulcrumToken(IERC20 token) internal view returns(IERC20) { - if (token.isETH()) { - return IERC20(-1); - } - - (bool success, bytes memory data) = address(token).staticcall.gas(5000)(abi.encodeWithSignature( - "name()" - )); - if (!success) { - return IERC20(-1); - } - - bool foundBZX = false; - for (uint i = 0; i + 6 < data.length; i++) { - if (data[i + 0] == "F" && - data[i + 1] == "u" && - data[i + 2] == "l" && - data[i + 3] == "c" && - data[i + 4] == "r" && - data[i + 5] == "u" && - data[i + 6] == "m") - { - foundBZX = true; - break; - } - } - if (!foundBZX) { - return IERC20(-1); - } - - (success, data) = address(token).staticcall.gas(5000)(abi.encodeWithSelector( - IFulcrumToken(address(token)).loanTokenAddress.selector - )); - if (!success) { - return IERC20(-1); - } - - return abi.decode(data, (IERC20)); - } -} - - -contract OneSplitFulcrumView is OneSplitViewWrapBase, OneSplitFulcrumBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _fulcrumGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _fulcrumGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_FULCRUM)) { - IERC20 underlying = _isFulcrumToken(fromToken); - if (underlying != IERC20(-1)) { - uint256 fulcrumRate = IFulcrumToken(address(fromToken)).tokenPrice(); - (returnAmount, estimateGasAmount, distribution) = _fulcrumGetExpectedReturn( - underlying, - destToken, - amount.mul(fulcrumRate).div(1e18), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 381_000, distribution); - } - - underlying = _isFulcrumToken(destToken); - if (underlying != IERC20(-1)) { - uint256 _destTokenEthPriceTimesGasPrice = destTokenEthPriceTimesGasPrice; - uint256 fulcrumRate = IFulcrumToken(address(destToken)).tokenPrice(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - underlying, - amount, - parts, - flags, - _destTokenEthPriceTimesGasPrice.mul(fulcrumRate).div(1e18) - ); - return (returnAmount.mul(1e18).div(fulcrumRate), estimateGasAmount + 354_000, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitFulcrum is OneSplitBaseWrap, OneSplitFulcrumBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _fulcrumSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _fulcrumSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_FULCRUM)) { - IERC20 underlying = _isFulcrumToken(fromToken); - if (underlying != IERC20(-1)) { - if (underlying.isETH()) { - IFulcrumToken(address(fromToken)).burnToEther(address(this), amount); - } else { - IFulcrumToken(address(fromToken)).burn(address(this), amount); - } - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - return super._swap( - underlying, - destToken, - underlyingAmount, - distribution, - flags - ); - } - - underlying = _isFulcrumToken(destToken); - if (underlying != IERC20(-1)) { - super._swap( - fromToken, - underlying, - amount, - distribution, - flags - ); - - uint256 underlyingAmount = underlying.universalBalanceOf(address(this)); - - if (underlying.isETH()) { - IFulcrumToken(address(destToken)).mintWithEther.value(underlyingAmount)(address(this)); - } else { - underlying.universalApprove(address(destToken), underlyingAmount); - IFulcrumToken(address(destToken)).mint(address(this), underlyingAmount); - } - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} diff --git a/contracts/OneSplitIdle.sol b/contracts/OneSplitIdle.sol deleted file mode 100644 index 9131cd2..0000000 --- a/contracts/OneSplitIdle.sol +++ /dev/null @@ -1,171 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/IIdle.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitIdleBase { - function _idleTokens() internal pure returns(IIdle[8] memory) { - // https://developers.idle.finance/contracts-and-codebase - return [ - // V3 - IIdle(0x78751B12Da02728F467A44eAc40F5cbc16Bd7934), - IIdle(0x12B98C621E8754Ae70d0fDbBC73D6208bC3e3cA6), - IIdle(0x63D27B3DA94A9E871222CB0A32232674B02D2f2D), - IIdle(0x1846bdfDB6A0f5c473dEc610144513bd071999fB), - IIdle(0xcDdB1Bceb7a1979C6caa0229820707429dd3Ec6C), - IIdle(0x42740698959761BAF1B06baa51EfBD88CB1D862B), - // V2 - IIdle(0x10eC0D497824e342bCB0EDcE00959142aAa766dD), - IIdle(0xeB66ACc3d011056B00ea521F8203580C2E5d3991) - ]; - } -} - - -contract OneSplitIdleView is OneSplitViewWrapBase, OneSplitIdleBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _idleGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _idleGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - internal - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (!flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == !flags.check(FLAG_DISABLE_IDLE)) { - IIdle[8] memory tokens = _idleTokens(); - - for (uint i = 0; i < tokens.length; i++) { - if (fromToken == IERC20(tokens[i])) { - (returnAmount, estimateGasAmount, distribution) = _idleGetExpectedReturn( - tokens[i].token(), - destToken, - amount.mul(tokens[i].tokenPrice()).div(1e18), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 2_400_000, distribution); - } - } - - for (uint i = 0; i < tokens.length; i++) { - if (destToken == IERC20(tokens[i])) { - uint256 _destTokenEthPriceTimesGasPrice = destTokenEthPriceTimesGasPrice; - uint256 _price = tokens[i].tokenPrice(); - IERC20 token = tokens[i].token(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - token, - amount, - parts, - flags, - _destTokenEthPriceTimesGasPrice.mul(_price).div(1e18) - ); - return (returnAmount.mul(1e18).div(_price), estimateGasAmount + 1_300_000, distribution); - } - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitIdle is OneSplitBaseWrap, OneSplitIdleBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _idleSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _idleSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (!flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == !flags.check(FLAG_DISABLE_IDLE)) { - IIdle[8] memory tokens = _idleTokens(); - - for (uint i = 0; i < tokens.length; i++) { - if (fromToken == IERC20(tokens[i])) { - IERC20 underlying = tokens[i].token(); - uint256 minted = tokens[i].redeemIdleToken(amount, true, new uint256[](0)); - _idleSwap(underlying, destToken, minted, distribution, flags); - return; - } - } - - for (uint i = 0; i < tokens.length; i++) { - if (destToken == IERC20(tokens[i])) { - IERC20 underlying = tokens[i].token(); - super._swap(fromToken, underlying, amount, distribution, flags); - - uint256 underlyingBalance = underlying.balanceOf(address(this)); - underlying.universalApprove(address(tokens[i]), underlyingBalance); - tokens[i].mintIdleToken(underlyingBalance, new uint256[](0)); - return; - } - } - } - - return super._swap(fromToken, destToken, amount, distribution, flags); - } -} diff --git a/contracts/OneSplitIearn.sol b/contracts/OneSplitIearn.sol deleted file mode 100644 index 5897082..0000000 --- a/contracts/OneSplitIearn.sol +++ /dev/null @@ -1,187 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/IIearn.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitIearnBase { - function _yTokens() internal pure returns(IIearn[13] memory) { - return [ - IIearn(0x16de59092dAE5CcF4A1E6439D611fd0653f0Bd01), - IIearn(0x04Aa51bbcB46541455cCF1B8bef2ebc5d3787EC9), - IIearn(0x73a052500105205d34Daf004eAb301916DA8190f), - IIearn(0x83f798e925BcD4017Eb265844FDDAbb448f1707D), - IIearn(0xd6aD7a6750A7593E092a9B218d66C0A814a3436e), - IIearn(0xF61718057901F84C4eEC4339EF8f0D86D2B45600), - IIearn(0x04bC0Ab673d88aE9dbC9DA2380cB6B79C4BCa9aE), - IIearn(0xC2cB1040220768554cf699b0d863A3cd4324ce32), - IIearn(0xE6354ed5bC4b393a5Aad09f21c46E101e692d447), - IIearn(0x26EA744E5B887E5205727f55dFBE8685e3b21951), - IIearn(0x99d1Fa417f94dcD62BfE781a1213c092a47041Bc), - IIearn(0x9777d7E2b60bB01759D0E2f8be2095df444cb07E), - IIearn(0x1bE5d71F2dA660BFdee8012dDc58D024448A0A59) - ]; - } -} - - -contract OneSplitIearnView is OneSplitViewWrapBase, OneSplitIearnBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _iearnGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _iearnGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (!flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == !flags.check(FLAG_DISABLE_IEARN)) { - IIearn[13] memory yTokens = _yTokens(); - - for (uint i = 0; i < yTokens.length; i++) { - if (fromToken == IERC20(yTokens[i])) { - (returnAmount, estimateGasAmount, distribution) = _iearnGetExpectedReturn( - yTokens[i].token(), - destToken, - amount - .mul(yTokens[i].calcPoolValueInToken()) - .div(yTokens[i].totalSupply()), - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - return (returnAmount, estimateGasAmount + 260_000, distribution); - } - } - - for (uint i = 0; i < yTokens.length; i++) { - if (destToken == IERC20(yTokens[i])) { - uint256 _destTokenEthPriceTimesGasPrice = destTokenEthPriceTimesGasPrice; - IERC20 token = yTokens[i].token(); - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - token, - amount, - parts, - flags, - _destTokenEthPriceTimesGasPrice - .mul(yTokens[i].calcPoolValueInToken()) - .div(yTokens[i].totalSupply()) - ); - - return( - returnAmount - .mul(yTokens[i].totalSupply()) - .div(yTokens[i].calcPoolValueInToken()), - estimateGasAmount + 743_000, - distribution - ); - } - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitIearn is OneSplitBaseWrap, OneSplitIearnBase { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _iearnSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _iearnSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_IEARN)) { - IIearn[13] memory yTokens = _yTokens(); - - for (uint i = 0; i < yTokens.length; i++) { - if (fromToken == IERC20(yTokens[i])) { - IERC20 underlying = yTokens[i].token(); - yTokens[i].withdraw(amount); - _iearnSwap(underlying, destToken, underlying.balanceOf(address(this)), distribution, flags); - return; - } - } - - for (uint i = 0; i < yTokens.length; i++) { - if (destToken == IERC20(yTokens[i])) { - IERC20 underlying = yTokens[i].token(); - super._swap(fromToken, underlying, amount, distribution, flags); - - uint256 underlyingBalance = underlying.balanceOf(address(this)); - underlying.universalApprove(address(yTokens[i]), underlyingBalance); - yTokens[i].deposit(underlyingBalance); - return; - } - } - } - - return super._swap(fromToken, destToken, amount, distribution, flags); - } -} diff --git a/contracts/OneSplitMStable.sol b/contracts/OneSplitMStable.sol deleted file mode 100644 index bc09ee3..0000000 --- a/contracts/OneSplitMStable.sol +++ /dev/null @@ -1,176 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/IChai.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitMStableView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_MSTABLE_MUSD)) { - if (fromToken == IERC20(musd)) { - { - (bool valid1,, uint256 res1,) = musd_helper.getRedeemValidity(musd, amount, destToken); - if (valid1) { - return (res1, 300_000, new uint256[](DEXES_COUNT)); - } - } - - (bool valid,, address token) = musd_helper.suggestRedeemAsset(musd); - if (valid) { - (,, returnAmount,) = musd_helper.getRedeemValidity(musd, amount, IERC20(token)); - if (IERC20(token) != destToken) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - IERC20(token), - destToken, - returnAmount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } else { - distribution = new uint256[](DEXES_COUNT); - } - - return (returnAmount, estimateGasAmount + 300_000, distribution); - } - } - - if (destToken == IERC20(musd)) { - if (fromToken == usdc || fromToken == dai || fromToken == usdt || fromToken == tusd) { - (,, returnAmount) = musd.getSwapOutput(fromToken, destToken, amount); - return (returnAmount, 300_000, new uint256[](DEXES_COUNT)); - } - else { - IERC20 _destToken = destToken; - (bool valid,, address token) = musd_helper.suggestMintAsset(_destToken); - if (valid) { - if (IERC20(token) != fromToken) { - (returnAmount, estimateGasAmount, distribution) = super.getExpectedReturnWithGas( - fromToken, - IERC20(token), - amount, - parts, - flags, - _scaleDestTokenEthPriceTimesGasPrice( - _destToken, - IERC20(token), - destTokenEthPriceTimesGasPrice - ) - ); - } else { - returnAmount = amount; - } - (,, returnAmount) = musd.getSwapOutput(IERC20(token), _destToken, returnAmount); - return (returnAmount, estimateGasAmount + 300_000, distribution); - } - } - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitMStable is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_MSTABLE_MUSD)) { - if (fromToken == IERC20(musd)) { - if (destToken == usdc || destToken == dai || destToken == usdt || destToken == tusd) { - (,,, uint256 result) = musd_helper.getRedeemValidity(fromToken, amount, destToken); - musd.redeem( - destToken, - result - ); - } - else { - (,,, uint256 result) = musd_helper.getRedeemValidity(fromToken, amount, dai); - musd.redeem( - dai, - result - ); - super._swap( - dai, - destToken, - dai.balanceOf(address(this)), - distribution, - flags - ); - } - return; - } - - if (destToken == IERC20(musd)) { - if (fromToken == usdc || fromToken == dai || fromToken == usdt || fromToken == tusd) { - fromToken.universalApprove(address(musd), amount); - musd.swap( - fromToken, - destToken, - amount, - address(this) - ); - } - else { - super._swap( - fromToken, - dai, - amount, - distribution, - flags - ); - musd.swap( - dai, - destToken, - dai.balanceOf(address(this)), - address(this) - ); - } - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} diff --git a/contracts/OneSplitMooniswapPoolToken.sol b/contracts/OneSplitMooniswapPoolToken.sol deleted file mode 100644 index 5b0b5f2..0000000 --- a/contracts/OneSplitMooniswapPoolToken.sol +++ /dev/null @@ -1,401 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/math/Math.sol"; -import "./OneSplitBase.sol"; -import "./interface/IMooniswap.sol"; -import "./UniversalERC20.sol"; - -contract OneSplitMooniswapTokenBase { - using SafeMath for uint256; - using Math for uint256; - using UniversalERC20 for IERC20; - - struct TokenInfo { - IERC20 token; - uint256 reserve; - } - - struct PoolDetails { - TokenInfo[2] tokens; - uint256 totalSupply; - } - - function _getPoolDetails(IMooniswap pool) internal view returns (PoolDetails memory details) { - for (uint i = 0; i < 2; i++) { - IERC20 token = pool.tokens(i); - details.tokens[i] = TokenInfo({ - token: token, - reserve: token.universalBalanceOf(address(pool)) - }); - } - - details.totalSupply = IERC20(address(pool)).totalSupply(); - } -} - - -contract OneSplitMooniswapTokenView is OneSplitViewWrapBase, OneSplitMooniswapTokenBase { - - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns ( - uint256 returnAmount, - uint256, - uint256[] memory distribution - ) - { - if (fromToken.eq(toToken)) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - - if (!flags.check(FLAG_DISABLE_MOONISWAP_POOL_TOKEN)) { - bool isPoolTokenFrom = mooniswapRegistry.isPool(address(fromToken)); - bool isPoolTokenTo = mooniswapRegistry.isPool(address(toToken)); - - if (isPoolTokenFrom && isPoolTokenTo) { - ( - uint256 returnETHAmount, - uint256[] memory poolTokenFromDistribution - ) = _getExpectedReturnFromMooniswapPoolToken( - fromToken, - ETH_ADDRESS, - amount, - parts, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - - ( - uint256 returnPoolTokenToAmount, - uint256[] memory poolTokenToDistribution - ) = _getExpectedReturnToMooniswapPoolToken( - ETH_ADDRESS, - toToken, - returnETHAmount, - parts, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - - for (uint i = 0; i < poolTokenToDistribution.length; i++) { - poolTokenFromDistribution[i] |= poolTokenToDistribution[i] << 128; - } - - return (returnPoolTokenToAmount, 0, poolTokenFromDistribution); - } - - if (isPoolTokenFrom) { - (returnAmount, distribution) = _getExpectedReturnFromMooniswapPoolToken( - fromToken, - toToken, - amount, - parts, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - return (returnAmount, 0, distribution); - } - - if (isPoolTokenTo) { - (returnAmount, distribution) = _getExpectedReturnToMooniswapPoolToken( - fromToken, - toToken, - amount, - parts, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - return (returnAmount, 0, distribution); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - toToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _getExpectedReturnFromMooniswapPoolToken( - IERC20 poolToken, - IERC20 toToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - private - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - distribution = new uint256[](DEXES_COUNT); - - PoolDetails memory details = _getPoolDetails(IMooniswap(address(poolToken))); - - for (uint i = 0; i < 2; i++) { - - uint256 exchangeAmount = amount - .mul(details.tokens[i].reserve) - .div(details.totalSupply); - - if (toToken.eq(details.tokens[i].token)) { - returnAmount = returnAmount.add(exchangeAmount); - continue; - } - - (uint256 ret, ,uint256[] memory dist) = super.getExpectedReturnWithGas( - details.tokens[i].token, - toToken, - exchangeAmount, - parts, - flags, - 0 - ); - - returnAmount = returnAmount.add(ret); - for (uint j = 0; j < distribution.length; j++) { - distribution[j] |= dist[j] << (i * 8); - } - } - - return (returnAmount, distribution); - } - - function _getExpectedReturnToMooniswapPoolToken( - IERC20 fromToken, - IERC20 poolToken, - uint256 amount, - uint256 parts, - uint256 flags - ) - private - view - returns( - uint256 returnAmount, - uint256[] memory distribution - ) - { - distribution = new uint256[](DEXES_COUNT); - - PoolDetails memory details = _getPoolDetails(IMooniswap(address(poolToken))); - - // will overwritten to liquidity amounts - uint256[2] memory amounts; - amounts[0] = amount.div(2); - amounts[1] = amount.sub(amounts[0]); - uint256[] memory dist = new uint256[](distribution.length); - for (uint i = 0; i < 2; i++) { - - if (fromToken.eq(details.tokens[i].token)) { - continue; - } - - (amounts[i], ,dist) = super.getExpectedReturnWithGas( - fromToken, - details.tokens[i].token, - amounts[i], - parts, - flags, - 0 - ); - - for (uint j = 0; j < distribution.length; j++) { - distribution[j] |= dist[j] << (i * 8); - } - } - - returnAmount = uint256(-1); - for (uint i = 0; i < 2; i++) { - returnAmount = Math.min( - returnAmount, - details.totalSupply.mul(amounts[i]).div(details.tokens[i].reserve) - ); - } - - return ( - returnAmount, - distribution - ); - } - -} - - -contract OneSplitMooniswapToken is OneSplitBaseWrap, OneSplitMooniswapTokenBase { - function _swap( - IERC20 fromToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - if (fromToken.eq(toToken)) { - return; - } - - if (!flags.check(FLAG_DISABLE_MOONISWAP_POOL_TOKEN)) { - bool isPoolTokenFrom = mooniswapRegistry.isPool(address(fromToken)); - bool isPoolTokenTo = mooniswapRegistry.isPool(address(toToken)); - - if (isPoolTokenFrom && isPoolTokenTo) { - uint256[] memory dist = new uint256[](distribution.length); - for (uint i = 0; i < distribution.length; i++) { - dist[i] = distribution[i] & ((1 << 128) - 1); - } - - uint256 ethBalanceBefore = ETH_ADDRESS.universalBalanceOf(address(this)); - - _swapFromMooniswapToken( - fromToken, - ETH_ADDRESS, - amount, - dist, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - - for (uint i = 0; i < distribution.length; i++) { - dist[i] = distribution[i] >> 128; - } - - uint256 ethBalanceAfter = ETH_ADDRESS.universalBalanceOf(address(this)); - - return _swapToMooniswapToken( - ETH_ADDRESS, - toToken, - ethBalanceAfter.sub(ethBalanceBefore), - dist, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - } - - if (isPoolTokenFrom) { - return _swapFromMooniswapToken( - fromToken, - toToken, - amount, - distribution, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - } - - if (isPoolTokenTo) { - return _swapToMooniswapToken( - fromToken, - toToken, - amount, - distribution, - FLAG_DISABLE_MOONISWAP_POOL_TOKEN - ); - } - } - - return super._swap( - fromToken, - toToken, - amount, - distribution, - flags - ); - } - - function _swapFromMooniswapToken( - IERC20 poolToken, - IERC20 toToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - IERC20[2] memory tokens = [ - IMooniswap(address(poolToken)).tokens(0), - IMooniswap(address(poolToken)).tokens(1) - ]; - - IMooniswap(address(poolToken)).withdraw( - amount, - new uint256[](0) - ); - - uint256[] memory dist = new uint256[](distribution.length); - for (uint i = 0; i < 2; i++) { - - if (toToken.eq(tokens[i])) { - continue; - } - - for (uint j = 0; j < distribution.length; j++) { - dist[j] = (distribution[j] >> (i * 8)) & 0xFF; - } - - super._swap( - tokens[i], - toToken, - tokens[i].universalBalanceOf(address(this)), - dist, - flags - ); - } - } - - function _swapToMooniswapToken( - IERC20 fromToken, - IERC20 poolToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - IERC20[2] memory tokens = [ - IMooniswap(address(poolToken)).tokens(0), - IMooniswap(address(poolToken)).tokens(1) - ]; - - // will overwritten to liquidity amounts - uint256[] memory amounts = new uint256[](2); - amounts[0] = amount.div(2); - amounts[1] = amount.sub(amounts[0]); - uint256[] memory dist = new uint256[](distribution.length); - for (uint i = 0; i < 2; i++) { - - if (fromToken.eq(tokens[i])) { - continue; - } - - for (uint j = 0; j < distribution.length; j++) { - dist[j] = (distribution[j] >> (i * 8)) & 0xFF; - } - - super._swap( - fromToken, - tokens[i], - amounts[i], - dist, - flags - ); - - amounts[i] = tokens[i].universalBalanceOf(address(this)); - tokens[i].universalApprove(address(poolToken), amounts[i]); - } - - uint256 ethValue = (tokens[0].isETH() ? amounts[0] : 0) + (tokens[1].isETH() ? amounts[1] : 0); - IMooniswap(address(poolToken)).deposit.value(ethValue)( - amounts, - new uint256[](2) - ); - - for (uint i = 0; i < 2; i++) { - tokens[i].universalTransfer( - msg.sender, - tokens[i].universalBalanceOf(address(this)) - ); - } - } -} diff --git a/contracts/OneSplitWeth.sol b/contracts/OneSplitWeth.sol deleted file mode 100644 index fe856a6..0000000 --- a/contracts/OneSplitWeth.sol +++ /dev/null @@ -1,162 +0,0 @@ -pragma solidity ^0.5.0; - -import "./interface/ICompound.sol"; -import "./OneSplitBase.sol"; - - -contract OneSplitWethView is OneSplitViewWrapBase { - function getExpectedReturnWithGas( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - public - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - return _wethGetExpectedReturn( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } - - function _wethGetExpectedReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 parts, - uint256 flags, - uint256 destTokenEthPriceTimesGasPrice - ) - private - view - returns( - uint256 returnAmount, - uint256 estimateGasAmount, - uint256[] memory distribution - ) - { - if (fromToken == destToken) { - return (amount, 0, new uint256[](DEXES_COUNT)); - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_WETH)) { - if (fromToken == weth || fromToken == bancorEtherToken) { - return super.getExpectedReturnWithGas(ETH_ADDRESS, destToken, amount, parts, flags, destTokenEthPriceTimesGasPrice); - } - - if (destToken == weth || destToken == bancorEtherToken) { - return super.getExpectedReturnWithGas(fromToken, ETH_ADDRESS, amount, parts, flags, destTokenEthPriceTimesGasPrice); - } - } - - return super.getExpectedReturnWithGas( - fromToken, - destToken, - amount, - parts, - flags, - destTokenEthPriceTimesGasPrice - ); - } -} - - -contract OneSplitWeth is OneSplitBaseWrap { - function _swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) internal { - _wethSwap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } - - function _wethSwap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256[] memory distribution, - uint256 flags - ) private { - if (fromToken == destToken) { - return; - } - - if (flags.check(FLAG_DISABLE_ALL_WRAP_SOURCES) == flags.check(FLAG_DISABLE_WETH)) { - if (fromToken == weth) { - weth.withdraw(weth.balanceOf(address(this))); - super._swap( - ETH_ADDRESS, - destToken, - amount, - distribution, - flags - ); - return; - } - - if (fromToken == bancorEtherToken) { - bancorEtherToken.withdraw(bancorEtherToken.balanceOf(address(this))); - super._swap( - ETH_ADDRESS, - destToken, - amount, - distribution, - flags - ); - return; - } - - if (destToken == weth) { - _wethSwap( - fromToken, - ETH_ADDRESS, - amount, - distribution, - flags - ); - weth.deposit.value(address(this).balance)(); - return; - } - - if (destToken == bancorEtherToken) { - _wethSwap( - fromToken, - ETH_ADDRESS, - amount, - distribution, - flags - ); - bancorEtherToken.deposit.value(address(this).balance)(); - return; - } - } - - return super._swap( - fromToken, - destToken, - amount, - distribution, - flags - ); - } -} diff --git a/contracts/UniversalERC20.sol b/contracts/UniversalERC20.sol deleted file mode 100644 index 171131e..0000000 --- a/contracts/UniversalERC20.sol +++ /dev/null @@ -1,116 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/math/SafeMath.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; - - -library UniversalERC20 { - - using SafeMath for uint256; - using SafeERC20 for IERC20; - - IERC20 private constant ZERO_ADDRESS = IERC20(0x0000000000000000000000000000000000000000); - IERC20 private constant ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); - - function universalTransfer(IERC20 token, address to, uint256 amount) internal returns(bool) { - if (amount == 0) { - return true; - } - - if (isETH(token)) { - address(uint160(to)).transfer(amount); - } else { - token.safeTransfer(to, amount); - return true; - } - } - - function universalTransferFrom(IERC20 token, address from, address to, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - require(from == msg.sender && msg.value >= amount, "Wrong useage of ETH.universalTransferFrom()"); - if (to != address(this)) { - address(uint160(to)).transfer(amount); - } - if (msg.value > amount) { - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(from, to, amount); - } - } - - function universalTransferFromSenderToThis(IERC20 token, uint256 amount) internal { - if (amount == 0) { - return; - } - - if (isETH(token)) { - if (msg.value > amount) { - // Return remainder if exist - msg.sender.transfer(msg.value.sub(amount)); - } - } else { - token.safeTransferFrom(msg.sender, address(this), amount); - } - } - - function universalApprove(IERC20 token, address to, uint256 amount) internal { - if (!isETH(token)) { - if (amount == 0) { - token.safeApprove(to, 0); - return; - } - - uint256 allowance = token.allowance(address(this), to); - if (allowance < amount) { - if (allowance > 0) { - token.safeApprove(to, 0); - } - token.safeApprove(to, amount); - } - } - } - - function universalBalanceOf(IERC20 token, address who) internal view returns (uint256) { - if (isETH(token)) { - return who.balance; - } else { - return token.balanceOf(who); - } - } - - function universalDecimals(IERC20 token) internal view returns (uint256) { - - if (isETH(token)) { - return 18; - } - - (bool success, bytes memory data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("decimals()") - ); - if (!success || data.length == 0) { - (success, data) = address(token).staticcall.gas(10000)( - abi.encodeWithSignature("DECIMALS()") - ); - } - - return (success && data.length > 0) ? abi.decode(data, (uint256)) : 18; - } - - function isETH(IERC20 token) internal pure returns(bool) { - return (address(token) == address(ZERO_ADDRESS) || address(token) == address(ETH_ADDRESS)); - } - - function eq(IERC20 a, IERC20 b) internal pure returns(bool) { - return a == b || (isETH(a) && isETH(b)); - } - - function notExist(IERC20 token) internal pure returns(bool) { - return (address(token) == address(-1)); - } -} diff --git a/contracts/interface/IAaveRegistry.sol b/contracts/interface/IAaveRegistry.sol deleted file mode 100644 index dc402fc..0000000 --- a/contracts/interface/IAaveRegistry.sol +++ /dev/null @@ -1,10 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./IAaveToken.sol"; - - -contract IAaveRegistry { - function tokenByAToken(IAaveToken aToken) external view returns(IERC20); - function aTokenByToken(IERC20 token) external view returns(IAaveToken); -} diff --git a/contracts/interface/IAaveToken.sol b/contracts/interface/IAaveToken.sol deleted file mode 100644 index c17eee6..0000000 --- a/contracts/interface/IAaveToken.sol +++ /dev/null @@ -1,17 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -contract IAaveToken is IERC20 { - function underlyingAssetAddress() external view returns (IERC20); - - function redeem(uint256 amount) external; -} - - -interface IAaveLendingPool { - function core() external view returns (address); - - function deposit(IERC20 token, uint256 amount, uint16 refCode) external payable; -} diff --git a/contracts/interface/IBalancerPool.sol b/contracts/interface/IBalancerPool.sol deleted file mode 100644 index e9c10b5..0000000 --- a/contracts/interface/IBalancerPool.sol +++ /dev/null @@ -1,39 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IBalancerPool { - function getSwapFee() - external view returns (uint256 balance); - - function getDenormalizedWeight(IERC20 token) - external view returns (uint256 balance); - - function getBalance(IERC20 token) - external view returns (uint256 balance); - - function swapExactAmountIn( - IERC20 tokenIn, - uint256 tokenAmountIn, - IERC20 tokenOut, - uint256 minAmountOut, - uint256 maxPrice - ) - external - returns (uint256 tokenAmountOut, uint256 spotPriceAfter); -} - - -// 0xA961672E8Db773be387e775bc4937C678F3ddF9a -interface IBalancerHelper { - function getReturns( - IBalancerPool pool, - IERC20 fromToken, - IERC20 destToken, - uint256[] calldata amounts - ) - external - view - returns(uint256[] memory rets); -} diff --git a/contracts/interface/IBalancerRegistry.sol b/contracts/interface/IBalancerRegistry.sol deleted file mode 100644 index a684e7a..0000000 --- a/contracts/interface/IBalancerRegistry.sol +++ /dev/null @@ -1,67 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./IBalancerPool.sol"; - - -interface IBalancerRegistry { - event PoolAdded( - address indexed pool - ); - event PoolTokenPairAdded( - address indexed pool, - address indexed fromToken, - address indexed destToken - ); - event IndicesUpdated( - address indexed fromToken, - address indexed destToken, - bytes32 oldIndices, - bytes32 newIndices - ); - - // Get info about pool pair for 1 SLOAD - function getPairInfo(address pool, address fromToken, address destToken) - external view returns(uint256 weight1, uint256 weight2, uint256 swapFee); - - // Pools - function checkAddedPools(address pool) - external view returns(bool); - function getAddedPoolsLength() - external view returns(uint256); - function getAddedPools() - external view returns(address[] memory); - function getAddedPoolsWithLimit(uint256 offset, uint256 limit) - external view returns(address[] memory result); - - // Tokens - function getAllTokensLength() - external view returns(uint256); - function getAllTokens() - external view returns(address[] memory); - function getAllTokensWithLimit(uint256 offset, uint256 limit) - external view returns(address[] memory result); - - // Pairs - function getPoolsLength(address fromToken, address destToken) - external view returns(uint256); - function getPools(address fromToken, address destToken) - external view returns(address[] memory); - function getPoolsWithLimit(address fromToken, address destToken, uint256 offset, uint256 limit) - external view returns(address[] memory result); - function getBestPools(address fromToken, address destToken) - external view returns(address[] memory pools); - function getBestPoolsWithLimit(address fromToken, address destToken, uint256 limit) - external view returns(address[] memory pools); - - // Get swap rates - function getPoolReturn(address pool, address fromToken, address destToken, uint256 amount) - external view returns(uint256); - function getPoolReturns(address pool, address fromToken, address destToken, uint256[] calldata amounts) - external view returns(uint256[] memory result); - - // Add and update registry - function addPool(address pool) external returns(uint256 listed); - function addPools(address[] calldata pools) external returns(uint256[] memory listed); - function updatedIndices(address[] calldata tokens, uint256 lengthLimit) external; -} diff --git a/contracts/interface/IBancorContractRegistry.sol b/contracts/interface/IBancorContractRegistry.sol deleted file mode 100644 index 0335c1e..0000000 --- a/contracts/interface/IBancorContractRegistry.sol +++ /dev/null @@ -1,6 +0,0 @@ -pragma solidity ^0.5.0; - - -contract IBancorContractRegistry { - function addressOf(bytes32 contractName) external view returns (address); -} diff --git a/contracts/interface/IBancorConverterRegistry.sol b/contracts/interface/IBancorConverterRegistry.sol deleted file mode 100644 index bc6d037..0000000 --- a/contracts/interface/IBancorConverterRegistry.sol +++ /dev/null @@ -1,19 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IBancorConverterRegistry { - - function getConvertibleTokenSmartTokenCount(IERC20 convertibleToken) - external view returns(uint256); - - function getConvertibleTokenSmartTokens(IERC20 convertibleToken) - external view returns(address[] memory); - - function getConvertibleTokenSmartToken(IERC20 convertibleToken, uint256 index) - external view returns(address); - - function isConvertibleTokenSmartToken(IERC20 convertibleToken, address value) - external view returns(bool); -} diff --git a/contracts/interface/IBancorEtherToken.sol b/contracts/interface/IBancorEtherToken.sol deleted file mode 100644 index 2b73ce4..0000000 --- a/contracts/interface/IBancorEtherToken.sol +++ /dev/null @@ -1,10 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -contract IBancorEtherToken is IERC20 { - function deposit() external payable; - - function withdraw(uint256 amount) external; -} diff --git a/contracts/interface/IBancorFinder.sol b/contracts/interface/IBancorFinder.sol deleted file mode 100644 index c337426..0000000 --- a/contracts/interface/IBancorFinder.sol +++ /dev/null @@ -1,14 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IBancorFinder { - function buildBancorPath( - IERC20 fromToken, - IERC20 destToken - ) - external - view - returns(address[] memory path); -} diff --git a/contracts/interface/IBancorNetwork.sol b/contracts/interface/IBancorNetwork.sol deleted file mode 100644 index 89a52b3..0000000 --- a/contracts/interface/IBancorNetwork.sol +++ /dev/null @@ -1,18 +0,0 @@ -pragma solidity ^0.5.0; - - -interface IBancorNetwork { - function getReturnByPath(address[] calldata path, uint256 amount) - external - view - returns (uint256 returnAmount, uint256 conversionFee); - - function claimAndConvert(address[] calldata path, uint256 amount, uint256 minReturn) - external - returns (uint256); - - function convert(address[] calldata path, uint256 amount, uint256 minReturn) - external - payable - returns (uint256); -} diff --git a/contracts/interface/IBancorNetworkPathFinder.sol b/contracts/interface/IBancorNetworkPathFinder.sol deleted file mode 100644 index 14f4b93..0000000 --- a/contracts/interface/IBancorNetworkPathFinder.sol +++ /dev/null @@ -1,11 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IBancorNetworkPathFinder { - function generatePath(IERC20 sourceToken, IERC20 targetToken) - external - view - returns (address[] memory); -} diff --git a/contracts/interface/IBdai.sol b/contracts/interface/IBdai.sol deleted file mode 100644 index ece661b..0000000 --- a/contracts/interface/IBdai.sol +++ /dev/null @@ -1,10 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -contract IBdai is IERC20 { - function join(uint256) external; - - function exit(uint256) external; -} diff --git a/contracts/interface/IChai.sol b/contracts/interface/IChai.sol deleted file mode 100644 index 7ba7746..0000000 --- a/contracts/interface/IChai.sol +++ /dev/null @@ -1,123 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IPot { - function dsr() external view returns (uint256); - - function chi() external view returns (uint256); - - function rho() external view returns (uint256); - - function drip() external returns (uint256); - - function join(uint256) external; - - function exit(uint256) external; -} - - -contract IChai is IERC20 { - function POT() public view returns (IPot); - - function join(address dst, uint256 wad) external; - - function exit(address src, uint256 wad) external; -} - - -library ChaiHelper { - IPot private constant POT = IPot(0x197E90f9FAD81970bA7976f33CbD77088E5D7cf7); - uint256 private constant RAY = 10**27; - - function _mul(uint256 x, uint256 y) private pure returns (uint256 z) { - require(y == 0 || (z = x * y) / y == x); - } - - function _rmul(uint256 x, uint256 y) private pure returns (uint256 z) { - // always rounds down - z = _mul(x, y) / RAY; - } - - function _rdiv(uint256 x, uint256 y) private pure returns (uint256 z) { - // always rounds down - z = _mul(x, RAY) / y; - } - - function rpow(uint256 x, uint256 n, uint256 base) private pure returns (uint256 z) { - // solium-disable-next-line security/no-inline-assembly - assembly { - switch x - case 0 { - switch n - case 0 { - z := base - } - default { - z := 0 - } - } - default { - switch mod(n, 2) - case 0 { - z := base - } - default { - z := x - } - let half := div(base, 2) // for rounding. - for { - n := div(n, 2) - } n { - n := div(n, 2) - } { - let xx := mul(x, x) - if iszero(eq(div(xx, x), x)) { - revert(0, 0) - } - let xxRound := add(xx, half) - if lt(xxRound, xx) { - revert(0, 0) - } - x := div(xxRound, base) - if mod(n, 2) { - let zx := mul(z, x) - if and(iszero(iszero(x)), iszero(eq(div(zx, x), z))) { - revert(0, 0) - } - let zxRound := add(zx, half) - if lt(zxRound, zx) { - revert(0, 0) - } - z := div(zxRound, base) - } - } - } - } - } - - function potDrip() private view returns (uint256) { - return _rmul(rpow(POT.dsr(), now - POT.rho(), RAY), POT.chi()); - } - - function chaiPrice(IChai chai) internal view returns(uint256) { - return chaiToDai(chai, 1e18); - } - - function daiToChai( - IChai /*chai*/, - uint256 amount - ) internal view returns (uint256) { - uint256 chi = (now > POT.rho()) ? potDrip() : POT.chi(); - return _rdiv(amount, chi); - } - - function chaiToDai( - IChai /*chai*/, - uint256 amount - ) internal view returns (uint256) { - uint256 chi = (now > POT.rho()) ? potDrip() : POT.chi(); - return _rmul(chi, amount); - } -} diff --git a/contracts/interface/ICompound.sol b/contracts/interface/ICompound.sol deleted file mode 100644 index 591ad18..0000000 --- a/contracts/interface/ICompound.sol +++ /dev/null @@ -1,29 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -contract ICompound { - function markets(address cToken) - external - view - returns (bool isListed, uint256 collateralFactorMantissa); -} - - -contract ICompoundToken is IERC20 { - function underlying() external view returns (address); - - function exchangeRateStored() external view returns (uint256); - - function mint(uint256 mintAmount) external returns (uint256); - - function redeem(uint256 redeemTokens) external returns (uint256); -} - - -contract ICompoundEther is IERC20 { - function mint() external payable; - - function redeem(uint256 redeemTokens) external returns (uint256); -} diff --git a/contracts/interface/ICompoundRegistry.sol b/contracts/interface/ICompoundRegistry.sol deleted file mode 100644 index cc79bde..0000000 --- a/contracts/interface/ICompoundRegistry.sol +++ /dev/null @@ -1,10 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./ICompound.sol"; - - -contract ICompoundRegistry { - function tokenByCToken(ICompoundToken cToken) external view returns(IERC20); - function cTokenByToken(IERC20 token) external view returns(ICompoundToken); -} diff --git a/contracts/interface/IDForceSwap.sol b/contracts/interface/IDForceSwap.sol deleted file mode 100644 index fe3f936..0000000 --- a/contracts/interface/IDForceSwap.sol +++ /dev/null @@ -1,9 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IDForceSwap { - function getAmountByInput(IERC20 input, IERC20 output, uint256 amount) external view returns(uint256); - function swap(IERC20 input, IERC20 output, uint256 amount) external; -} diff --git a/contracts/interface/IDMM.sol b/contracts/interface/IDMM.sol deleted file mode 100644 index d299136..0000000 --- a/contracts/interface/IDMM.sol +++ /dev/null @@ -1,15 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IDMMController { - function getUnderlyingTokenForDmm(IERC20 token) external view returns(IERC20); -} - - -contract IDMM is IERC20 { - function getCurrentExchangeRate() public view returns(uint256); - function mint(uint256 underlyingAmount) public returns(uint256); - function redeem(uint256 amount) public returns(uint256); -} diff --git a/contracts/interface/IFulcrum.sol b/contracts/interface/IFulcrum.sol deleted file mode 100644 index e7f4714..0000000 --- a/contracts/interface/IFulcrum.sol +++ /dev/null @@ -1,20 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -contract IFulcrumToken is IERC20 { - function tokenPrice() external view returns (uint256); - - function loanTokenAddress() external view returns (address); - - function mintWithEther(address receiver) external payable returns (uint256 mintAmount); - - function mint(address receiver, uint256 depositAmount) external returns (uint256 mintAmount); - - function burnToEther(address receiver, uint256 burnAmount) - external - returns (uint256 loanAmountPaid); - - function burn(address receiver, uint256 burnAmount) external returns (uint256 loanAmountPaid); -} diff --git a/contracts/interface/IIdle.sol b/contracts/interface/IIdle.sol deleted file mode 100644 index 6e923a8..0000000 --- a/contracts/interface/IIdle.sol +++ /dev/null @@ -1,18 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -contract IIdle is IERC20 { - function token() - external view returns (IERC20); - - function tokenPrice() - external view returns (uint256); - - function mintIdleToken(uint256 _amount, uint256[] calldata _clientProtocolAmounts) - external returns (uint256 mintedTokens); - - function redeemIdleToken(uint256 _amount, bool _skipRebalance, uint256[] calldata _clientProtocolAmounts) - external returns (uint256 redeemedTokens); -} diff --git a/contracts/interface/IIearn.sol b/contracts/interface/IIearn.sol deleted file mode 100644 index c279f88..0000000 --- a/contracts/interface/IIearn.sol +++ /dev/null @@ -1,14 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -contract IIearn is IERC20 { - function token() external view returns(IERC20); - - function calcPoolValueInToken() external view returns(uint256); - - function deposit(uint256 _amount) external; - - function withdraw(uint256 _shares) external; -} diff --git a/contracts/interface/IKyberHintHandler.sol b/contracts/interface/IKyberHintHandler.sol deleted file mode 100644 index 62e1e94..0000000 --- a/contracts/interface/IKyberHintHandler.sol +++ /dev/null @@ -1,27 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IKyberHintHandler { - enum TradeType { - BestOfAll, - MaskIn, - MaskOut, - Split - } - - function buildTokenToEthHint( - IERC20 tokenSrc, - TradeType tokenToEthType, - bytes32[] calldata tokenToEthReserveIds, - uint256[] calldata tokenToEthSplits - ) external view returns (bytes memory hint); - - function buildEthToTokenHint( - IERC20 tokenDest, - TradeType ethToTokenType, - bytes32[] calldata ethToTokenReserveIds, - uint256[] calldata ethToTokenSplits - ) external view returns (bytes memory hint); -} diff --git a/contracts/interface/IKyberNetworkContract.sol b/contracts/interface/IKyberNetworkContract.sol deleted file mode 100644 index 222ed54..0000000 --- a/contracts/interface/IKyberNetworkContract.sol +++ /dev/null @@ -1,11 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IKyberNetworkContract { - function searchBestRate(IERC20 src, IERC20 dest, uint256 srcAmount, bool usePermissionless) - external - view - returns (address reserve, uint256 rate); -} diff --git a/contracts/interface/IKyberNetworkProxy.sol b/contracts/interface/IKyberNetworkProxy.sol deleted file mode 100644 index 5db2d87..0000000 --- a/contracts/interface/IKyberNetworkProxy.sol +++ /dev/null @@ -1,35 +0,0 @@ -pragma solidity ^0.5.0; - -import "./IKyberNetworkContract.sol"; - - -interface IKyberNetworkProxy { - function getExpectedRateAfterFee( - IERC20 src, - IERC20 dest, - uint256 srcQty, - uint256 platformFeeBps, - bytes calldata hint - ) external view returns (uint256 expectedRate); - - function tradeWithHintAndFee( - IERC20 src, - uint256 srcAmount, - IERC20 dest, - address payable destAddress, - uint256 maxDestAmount, - uint256 minConversionRate, - address payable platformWallet, - uint256 platformFeeBps, - bytes calldata hint - ) external payable returns (uint256 destAmount); - - function kyberNetworkContract() external view returns (IKyberNetworkContract); - - // TODO: Limit usage by tx.gasPrice - // function maxGasPrice() external view returns (uint256); - - // TODO: Limit usage by user cap - // function getUserCapInWei(address user) external view returns (uint256); - // function getUserCapInTokenWei(address user, IERC20 token) external view returns (uint256); -} diff --git a/contracts/interface/IKyberOasisReserve.sol b/contracts/interface/IKyberOasisReserve.sol deleted file mode 100644 index 18954c3..0000000 --- a/contracts/interface/IKyberOasisReserve.sol +++ /dev/null @@ -1,6 +0,0 @@ -pragma solidity ^0.5.0; - - -interface IKyberOasisReserve { - function otc() external view returns (address); -} diff --git a/contracts/interface/IKyberStorage.sol b/contracts/interface/IKyberStorage.sol deleted file mode 100644 index c563290..0000000 --- a/contracts/interface/IKyberStorage.sol +++ /dev/null @@ -1,10 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IKyberStorage { - function getReserveIdsPerTokenSrc( - IERC20 token - ) external view returns (bytes32[] memory); -} diff --git a/contracts/interface/IMStable.sol b/contracts/interface/IMStable.sol deleted file mode 100644 index b6f7320..0000000 --- a/contracts/interface/IMStable.sol +++ /dev/null @@ -1,93 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -contract IMStable is IERC20 { - function getSwapOutput( - IERC20 _input, - IERC20 _output, - uint256 _quantity - ) - external - view - returns (bool, string memory, uint256 output); - - function swap( - IERC20 _input, - IERC20 _output, - uint256 _quantity, - address _recipient - ) - external - returns (uint256 output); - - function redeem( - IERC20 _basset, - uint256 _bassetQuantity - ) - external - returns (uint256 massetRedeemed); -} - -interface IMassetValidationHelper { - /** - * @dev Returns a valid bAsset to redeem - * @param _mAsset Masset addr - * @return valid bool - * @return string message - * @return address of bAsset to redeem - */ - function suggestRedeemAsset( - IERC20 _mAsset - ) - external - view - returns ( - bool valid, - string memory err, - address token - ); - - /** - * @dev Returns a valid bAsset with which to mint - * @param _mAsset Masset addr - * @return valid bool - * @return string message - * @return address of bAsset to mint - */ - function suggestMintAsset( - IERC20 _mAsset - ) - external - view - returns ( - bool valid, - string memory err, - address token - ); - - /** - * @dev Determines if a given Redemption is valid - * @param _mAsset Address of the given mAsset (e.g. mUSD) - * @param _mAssetQuantity Amount of mAsset to redeem (in mUSD units) - * @param _outputBasset Desired output bAsset - * @return valid - * @return validity reason - * @return output in bAsset units - * @return bAssetQuantityArg - required input argument to the 'redeem' call - */ - function getRedeemValidity( - IERC20 _mAsset, - uint256 _mAssetQuantity, - IERC20 _outputBasset - ) - external - view - returns ( - bool valid, - string memory, - uint256 output, - uint256 bassetQuantityArg - ); -} diff --git a/contracts/interface/IOasisExchange.sol b/contracts/interface/IOasisExchange.sol deleted file mode 100644 index 1fe9445..0000000 --- a/contracts/interface/IOasisExchange.sol +++ /dev/null @@ -1,15 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface IOasisExchange { - function getBuyAmount(IERC20 buyGem, IERC20 payGem, uint256 payAmt) - external - view - returns (uint256 fillAmt); - - function sellAllAmount(IERC20 payGem, uint256 payAmt, IERC20 buyGem, uint256 minFillAmount) - external - returns (uint256 fillAmt); -} diff --git a/contracts/interface/IShell.sol b/contracts/interface/IShell.sol deleted file mode 100644 index 9e5585b..0000000 --- a/contracts/interface/IShell.sol +++ /dev/null @@ -1,18 +0,0 @@ -pragma solidity ^0.5.0; - - -interface IShell { - function viewOriginTrade( - address origin, - address target, - uint256 originAmount - ) external view returns (uint256); - - function swapByOrigin( - address origin, - address target, - uint256 originAmount, - uint256 minTargetAmount, - uint256 deadline - ) external returns (uint256); -} diff --git a/contracts/interface/ISmartToken.sol b/contracts/interface/ISmartToken.sol deleted file mode 100644 index 44e1dff..0000000 --- a/contracts/interface/ISmartToken.sol +++ /dev/null @@ -1,9 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./ISmartTokenConverter.sol"; - - -interface ISmartToken { - function owner() external view returns (ISmartTokenConverter); -} diff --git a/contracts/interface/ISmartTokenConverter.sol b/contracts/interface/ISmartTokenConverter.sol deleted file mode 100644 index 45e8927..0000000 --- a/contracts/interface/ISmartTokenConverter.sol +++ /dev/null @@ -1,12 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface ISmartTokenConverter { - function getReserveRatio(IERC20 token) external view returns (uint32); - - function connectorTokenCount() external view returns (uint256); - - function connectorTokens(uint256 i) external view returns (IERC20); -} diff --git a/contracts/interface/ISmartTokenFormula.sol b/contracts/interface/ISmartTokenFormula.sol deleted file mode 100644 index 1dc791c..0000000 --- a/contracts/interface/ISmartTokenFormula.sol +++ /dev/null @@ -1,20 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface ISmartTokenFormula { - function calculateLiquidateReturn( - uint256 supply, - uint256 reserveBalance, - uint32 totalRatio, - uint256 amount - ) external view returns (uint256); - - function calculatePurchaseReturn( - uint256 supply, - uint256 reserveBalance, - uint32 totalRatio, - uint256 amount - ) external view returns (uint256); -} diff --git a/contracts/interface/ISmartTokenRegistry.sol b/contracts/interface/ISmartTokenRegistry.sol deleted file mode 100644 index 05ab0bd..0000000 --- a/contracts/interface/ISmartTokenRegistry.sol +++ /dev/null @@ -1,8 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface ISmartTokenRegistry { - function isSmartToken(IERC20 token) external view returns (bool); -} diff --git a/contracts/interface/IUniswapFactory.sol b/contracts/interface/IUniswapFactory.sol deleted file mode 100644 index bc352fc..0000000 --- a/contracts/interface/IUniswapFactory.sol +++ /dev/null @@ -1,8 +0,0 @@ -pragma solidity ^0.5.0; - -import "./IUniswapExchange.sol"; - - -interface IUniswapFactory { - function getExchange(IERC20 token) external view returns (IUniswapExchange exchange); -} diff --git a/contracts/interface/IUniswapV2Exchange.sol b/contracts/interface/IUniswapV2Exchange.sol deleted file mode 100644 index 4e25bdb..0000000 --- a/contracts/interface/IUniswapV2Exchange.sol +++ /dev/null @@ -1,42 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/math/Math.sol"; -import "@openzeppelin/contracts/math/SafeMath.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "../UniversalERC20.sol"; - - -interface IUniswapV2Exchange { - function getReserves() external view returns(uint112 _reserve0, uint112 _reserve1, uint32 _blockTimestampLast); - function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external; - function skim(address to) external; - function sync() external; -} - - -library UniswapV2ExchangeLib { - using Math for uint256; - using SafeMath for uint256; - using UniversalERC20 for IERC20; - - function getReturn( - IUniswapV2Exchange exchange, - IERC20 fromToken, - IERC20 destToken, - uint amountIn - ) internal view returns (uint256 result, bool needSync, bool needSkim) { - uint256 reserveIn = fromToken.universalBalanceOf(address(exchange)); - uint256 reserveOut = destToken.universalBalanceOf(address(exchange)); - (uint112 reserve0, uint112 reserve1,) = exchange.getReserves(); - if (fromToken > destToken) { - (reserve0, reserve1) = (reserve1, reserve0); - } - needSync = (reserveIn < reserve0 || reserveOut < reserve1); - needSkim = !needSync && (reserveIn > reserve0 || reserveOut > reserve1); - - uint256 amountInWithFee = amountIn.mul(997); - uint256 numerator = amountInWithFee.mul(Math.min(reserveOut, reserve1)); - uint256 denominator = Math.min(reserveIn, reserve0).mul(1000).add(amountInWithFee); - result = (denominator == 0) ? 0 : numerator.div(denominator); - } -} diff --git a/contracts/interface/IUniswapV2Factory.sol b/contracts/interface/IUniswapV2Factory.sol deleted file mode 100644 index 1863244..0000000 --- a/contracts/interface/IUniswapV2Factory.sol +++ /dev/null @@ -1,8 +0,0 @@ -pragma solidity ^0.5.0; - -import "./IUniswapV2Exchange.sol"; - - -interface IUniswapV2Factory { - function getPair(IERC20 tokenA, IERC20 tokenB) external view returns (IUniswapV2Exchange pair); -} diff --git a/contracts/interface/IWETH.sol b/contracts/interface/IWETH.sol deleted file mode 100644 index 54852a7..0000000 --- a/contracts/interface/IWETH.sol +++ /dev/null @@ -1,10 +0,0 @@ -pragma solidity ^0.5.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -contract IWETH is IERC20 { - function deposit() external payable; - - function withdraw(uint256 amount) external; -} diff --git a/contracts/interfaces/IAaveRegistry.sol b/contracts/interfaces/IAaveRegistry.sol new file mode 100644 index 0000000..d31035c --- /dev/null +++ b/contracts/interfaces/IAaveRegistry.sol @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + + +interface IAaveRegistry { + function tokenByAToken(IERC20 aToken) external view returns(IERC20); + function aTokenByToken(IERC20 token) external view returns(IERC20); +} diff --git a/contracts/interfaces/IBalancer.sol b/contracts/interfaces/IBalancer.sol new file mode 100644 index 0000000..f1cb943 --- /dev/null +++ b/contracts/interfaces/IBalancer.sol @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + + +interface IBalancerPool { + function getSwapFee() external view returns (uint256 balance); + function getDenormalizedWeight(IERC20 token) external view returns (uint256 balance); + function getBalance(IERC20 token) external view returns (uint256 balance); + + function swapExactAmountIn( + IERC20 tokenIn, + uint256 tokenAmountIn, + IERC20 tokenOut, + uint256 minAmountOut, + uint256 maxPrice + ) + external + returns (uint256 tokenAmountOut, uint256 spotPriceAfter); +} + +interface IBalancerRegistry { + // Get info about pool pair for 1 SLOAD + function getPairInfo(address pool, IERC20 fromToken, IERC20 destToken) + external view returns(uint256 weight1, uint256 weight2, uint256 swapFee); + + // Pools + function checkAddedPools(address pool) + external view returns(bool); + function getAddedPoolsLength() + external view returns(uint256); + function getAddedPools() + external view returns(address[] memory); + function getAddedPoolsWithLimit(uint256 offset, uint256 limit) + external view returns(address[] memory result); + + // Tokens + function getAllTokensLength() + external view returns(uint256); + function getAllTokens() + external view returns(address[] memory); + function getAllTokensWithLimit(uint256 offset, uint256 limit) + external view returns(address[] memory result); + + // Pairs + function getPoolsLength(IERC20 fromToken, IERC20 destToken) + external view returns(uint256); + function getPools(IERC20 fromToken, IERC20 destToken) + external view returns(IBalancerPool[] memory); + function getPoolsWithLimit(IERC20 fromToken, IERC20 destToken, uint256 offset, uint256 limit) + external view returns(IBalancerPool[] memory result); + function getBestPools(IERC20 fromToken, IERC20 destToken) + external view returns(IBalancerPool[] memory pools); + function getBestPoolsWithLimit(IERC20 fromToken, IERC20 destToken, uint256 limit) + external view returns(IBalancerPool[] memory pools); + + // Get swap rates + function getPoolReturn(address pool, IERC20 fromToken, IERC20 destToken, uint256 amount) + external view returns(uint256); + function getPoolReturns(address pool, IERC20 fromToken, IERC20 destToken, uint256[] calldata amounts) + external view returns(uint256[] memory result); + + // Add and update registry + function addPool(address pool) external returns(uint256 listed); + function addPools(address[] calldata pools) external returns(uint256[] memory listed); + function updatedIndices(address[] calldata tokens, uint256 lengthLimit) external; +} + diff --git a/contracts/interfaces/ICompoundRegistry.sol b/contracts/interfaces/ICompoundRegistry.sol new file mode 100644 index 0000000..aa2d21d --- /dev/null +++ b/contracts/interfaces/ICompoundRegistry.sol @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + + +interface ICompoundRegistry { + function tokenByCToken(IERC20 cToken) external view returns(IERC20); + function cTokenByToken(IERC20 token) external view returns(IERC20); +} diff --git a/contracts/interface/ICurve.sol b/contracts/interfaces/ICurve.sol similarity index 91% rename from contracts/interface/ICurve.sol rename to contracts/interfaces/ICurve.sol index 907a1e1..1b66c8d 100644 --- a/contracts/interface/ICurve.sol +++ b/contracts/interfaces/ICurve.sol @@ -1,4 +1,6 @@ -pragma solidity ^0.5.0; +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; interface ICurve { @@ -16,7 +18,7 @@ interface ICurve { } -contract ICurveRegistry { +interface ICurveRegistry { function get_pool_info(address pool) external view @@ -32,7 +34,7 @@ contract ICurveRegistry { } -contract ICurveCalculator { +interface ICurveCalculator { function get_dy( int128 nCoins, uint256[8] calldata balances, diff --git a/contracts/interfaces/IKyber.sol b/contracts/interfaces/IKyber.sol new file mode 100644 index 0000000..1b9e2ea --- /dev/null +++ b/contracts/interfaces/IKyber.sol @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + + +interface IKyberStorage { + function getReserveIdsPerTokenSrc(IERC20 token) external view returns (bytes32[] memory); + function getReserveAddressesByReserveId(bytes32 reserveId) external view returns (IKyberReserve[] memory reserveAddresses); +} + + +interface IKyberReserve { + function getConversionRate(IERC20 src, IERC20 dest, uint srcQty, uint blockNumber) external view returns(uint); +} + + +interface IKyberHintHandler { + enum TradeType { + BestOfAll, + MaskIn, + MaskOut, + Split + } + + function buildTokenToEthHint( + IERC20 tokenSrc, + TradeType tokenToEthType, + bytes32[] calldata tokenToEthReserveIds, + uint256[] calldata tokenToEthSplits + ) external view returns (bytes memory hint); + + function buildEthToTokenHint( + IERC20 tokenDest, + TradeType ethToTokenType, + bytes32[] calldata ethToTokenReserveIds, + uint256[] calldata ethToTokenSplits + ) external view returns (bytes memory hint); +} + + +interface IKyberNetworkProxy { + function getExpectedRateAfterFee( + IERC20 src, + IERC20 dest, + uint256 srcQty, + uint256 platformFeeBps, + bytes calldata hint + ) external view returns (uint256 expectedRate); + + function tradeWithHintAndFee( + IERC20 src, + uint256 srcAmount, + IERC20 dest, + address payable destAddress, + uint256 maxDestAmount, + uint256 minConversionRate, + address payable platformWallet, + uint256 platformFeeBps, + bytes calldata hint + ) external payable returns (uint256 destAmount); +} diff --git a/contracts/interface/IMooniswap.sol b/contracts/interfaces/IMooniswap.sol similarity index 63% rename from contracts/interface/IMooniswap.sol rename to contracts/interfaces/IMooniswap.sol index cbbdce6..19e4384 100644 --- a/contracts/interface/IMooniswap.sol +++ b/contracts/interfaces/IMooniswap.sol @@ -1,4 +1,6 @@ -pragma solidity ^0.5.0; +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; @@ -11,34 +13,12 @@ interface IMooniswapRegistry { interface IMooniswap { function fee() external view returns (uint256); - function tokens(uint256 i) external view returns (IERC20); - - function deposit(uint256[] calldata amounts, uint256[] calldata minAmounts) external payable returns(uint256 fairSupply); - - function withdraw(uint256 amount, uint256[] calldata minReturns) external; - function getBalanceForAddition(IERC20 token) external view returns(uint256); - function getBalanceForRemoval(IERC20 token) external view returns(uint256); + function getReturn(IERC20 fromToken, IERC20 destToken, uint256 amount) external view returns(uint256 returnAmount); - function getReturn( - IERC20 fromToken, - IERC20 destToken, - uint256 amount - ) - external - view - returns(uint256 returnAmount); - - function swap( - IERC20 fromToken, - IERC20 destToken, - uint256 amount, - uint256 minReturn, - address referral - ) - external - payable - returns(uint256 returnAmount); + function deposit(uint256[] calldata amounts, uint256[] calldata minAmounts) external payable returns(uint256 fairSupply); + function withdraw(uint256 amount, uint256[] calldata minReturns) external; + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 minReturn, address referral) external payable returns(uint256 returnAmount); } diff --git a/contracts/interface/IUniswapExchange.sol b/contracts/interfaces/IUniswapV1.sol similarity index 50% rename from contracts/interface/IUniswapExchange.sol rename to contracts/interfaces/IUniswapV1.sol index f1200c3..2666d00 100644 --- a/contracts/interface/IUniswapExchange.sol +++ b/contracts/interfaces/IUniswapV1.sol @@ -1,27 +1,20 @@ -pragma solidity ^0.5.0; +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -interface IUniswapExchange { - function getEthToTokenInputPrice(uint256 ethSold) external view returns (uint256 tokensBought); +interface IUniswapV1Factory { + function getExchange(IERC20 token) external view returns (IUniswapV1Exchange exchange); +} +interface IUniswapV1Exchange { + function getEthToTokenInputPrice(uint256 ethSold) external view returns (uint256 tokensBought); function getTokenToEthInputPrice(uint256 tokensSold) external view returns (uint256 ethBought); function ethToTokenSwapInput(uint256 minTokens, uint256 deadline) - external - payable - returns (uint256 tokensBought); - + external payable returns (uint256 tokensBought); function tokenToEthSwapInput(uint256 tokensSold, uint256 minEth, uint256 deadline) - external - returns (uint256 ethBought); - - function tokenToTokenSwapInput( - uint256 tokensSold, - uint256 minTokensBought, - uint256 minEthBought, - uint256 deadline, - address tokenAddr - ) external returns (uint256 tokensBought); + external returns (uint256 ethBought); } diff --git a/contracts/interfaces/IUniswapV2.sol b/contracts/interfaces/IUniswapV2.sol new file mode 100644 index 0000000..9ca13f3 --- /dev/null +++ b/contracts/interfaces/IUniswapV2.sol @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + + +interface IUniswapV2Factory { + function getPair(IERC20 tokenA, IERC20 tokenB) external view returns (IUniswapV2Exchange pair); +} + +interface IUniswapV2Exchange { + function getReserves() external view returns(uint112 _reserve0, uint112 _reserve1, uint32 _blockTimestampLast); + function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external; + function skim(address to) external; + function sync() external; +} diff --git a/contracts/interfaces/IWETH.sol b/contracts/interfaces/IWETH.sol new file mode 100644 index 0000000..ccc8853 --- /dev/null +++ b/contracts/interfaces/IWETH.sol @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + + +abstract contract IWETH is IERC20 { + function deposit() external payable virtual; + function withdraw(uint256 amount) external virtual; +} diff --git a/contracts/libraries/Address2.sol b/contracts/libraries/Address2.sol new file mode 100644 index 0000000..fa1a4c9 --- /dev/null +++ b/contracts/libraries/Address2.sol @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/utils/Address.sol"; + + +library Address2 { + function functionDelegateCall(address target, bytes memory data, string memory errorMessage) internal returns (bytes memory) { + require(Address.isContract(target), "Address: call to non-contract"); + + // solhint-disable-next-line avoid-low-level-calls + (bool success, bytes memory returndata) = target.delegatecall(data); + if (success) { + return returndata; + } else { + // Look for revert reason and bubble it up if present + if (returndata.length > 0) { + // The easiest way to bubble the revert reason is using memory via assembly + + // solhint-disable-next-line no-inline-assembly + assembly { + let returndata_size := mload(returndata) + revert(add(32, returndata), returndata_size) + } + } else { + revert(errorMessage); + } + } + } +} diff --git a/contracts/libraries/Algo.sol b/contracts/libraries/Algo.sol new file mode 100644 index 0000000..c21ed39 --- /dev/null +++ b/contracts/libraries/Algo.sol @@ -0,0 +1,67 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/math/SafeMath.sol"; + + +library Algo { + using SafeMath for uint256; + + int256 public constant VERY_NEGATIVE_VALUE = -1e72; + + function findBestDistribution(int256[][] memory amounts, uint256 parts) + internal + pure + returns( + int256[] memory returnAmounts, + uint256[][] memory distributions + ) + { + uint256 n = amounts.length; + + int256[][] memory answer = new int256[][](n); // int[n][parts+1] + uint256[][] memory parent = new uint256[][](n); // int[n][parts+1] + + for (uint i = 0; i < n; i++) { + answer[i] = new int256[](parts + 1); + parent[i] = new uint256[](parts + 1); + } + + for (uint j = 0; j <= parts; j++) { + answer[0][j] = amounts[0][j]; + for (uint i = 1; i < n; i++) { + answer[i][j] = VERY_NEGATIVE_VALUE; + } + parent[0][j] = 0; + } + + for (uint i = 1; i < n; i++) { + for (uint j = 0; j <= parts; j++) { + answer[i][j] = answer[i - 1][j]; + parent[i][j] = j; + + for (uint k = 1; k <= j; k++) { + if (answer[i - 1][j - k] + amounts[i][k] > answer[i][j]) { + answer[i][j] = answer[i - 1][j - k] + amounts[i][k]; + parent[i][j] = j - k; + } + } + } + } + + distributions = new uint256[][](parts); + returnAmounts = new int256[](parts); + for (uint256 i = 1; i <= parts; i++) { + uint256 partsLeft = i; + distributions[i - 1] = new uint256[](n); + for (uint curExchange = n - 1; partsLeft > 0; curExchange--) { + distributions[i - 1][curExchange] = partsLeft - parent[curExchange][partsLeft]; + partsLeft = parent[curExchange][partsLeft]; + } + + returnAmounts[i - 1] = (answer[n - 1][i] == VERY_NEGATIVE_VALUE) ? 0 : answer[n - 1][i]; + } + } +} diff --git a/contracts/BalancerLib.sol b/contracts/libraries/BalancerLib.sol similarity index 99% rename from contracts/BalancerLib.sol rename to contracts/libraries/BalancerLib.sol index c42b031..654717a 100644 --- a/contracts/BalancerLib.sol +++ b/contracts/libraries/BalancerLib.sol @@ -1,4 +1,6 @@ -pragma solidity ^0.5.0; +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; library BalancerLib { @@ -284,7 +286,7 @@ library BalancerLib { returns (uint poolAmountOut) { // Charge the trading fee for the proportion of tokenAi - /// which is implicitly traded to the other pool tokens. + // which is implicitly traded to the other pool tokens. // That proportion is (1- weightTokenIn) // tokenAiAfterFee = tAi * (1 - (1-weightTi) * poolFee); uint normalizedWeight = bdiv(tokenWeightIn, totalWeight); diff --git a/contracts/libraries/DynamicMemoryArray.sol b/contracts/libraries/DynamicMemoryArray.sol new file mode 100644 index 0000000..201eda9 --- /dev/null +++ b/contracts/libraries/DynamicMemoryArray.sol @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/math/SafeMath.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + + +library DynamicMemoryArray { + using SafeMath for uint256; + + struct Addresses { + uint256 length; + address[1000] _arr; + } + + function at(DynamicMemoryArray.Addresses memory self, uint256 index) internal pure returns(address) { + require(index < self.length, "DynMemArr: out of range"); + return self._arr[index]; + } + + function push(DynamicMemoryArray.Addresses memory self, address item) internal pure returns(uint256) { + require(self.length < self._arr.length, "DynMemArr: out of limit"); + self._arr[self.length++] = item; + return self.length; + } + + function pop(DynamicMemoryArray.Addresses memory self) internal pure returns(address) { + require(self.length > 0, "DynMemArr: already empty"); + return self._arr[--self.length]; + } + + function copy(DynamicMemoryArray.Addresses memory self) internal pure returns(address[] memory arr) { + arr = new address[](self.length); + for (uint i = 0; i < arr.length; i++) { + arr[i] = self._arr[i]; + } + } +} diff --git a/contracts/libraries/FlagsChecker.sol b/contracts/libraries/FlagsChecker.sol new file mode 100644 index 0000000..ab584ac --- /dev/null +++ b/contracts/libraries/FlagsChecker.sol @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + + +library FlagsChecker { + function check(uint256 flags, uint256 flag) internal pure returns(bool) { + return (flags & flag) != 0; + } +} diff --git a/contracts/libraries/RevertReason.sol b/contracts/libraries/RevertReason.sol new file mode 100644 index 0000000..dc17df8 --- /dev/null +++ b/contracts/libraries/RevertReason.sol @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + + +library RevertReason { + function parse(bytes memory data, string memory message) internal pure returns (string memory) { + (, string memory reason) = abi.decode(abi.encodePacked(bytes28(0), data), (uint256, string)); + return string(abi.encodePacked(message, reason)); + } +} diff --git a/contracts/libraries/UniERC20.sol b/contracts/libraries/UniERC20.sol new file mode 100644 index 0000000..048fc32 --- /dev/null +++ b/contracts/libraries/UniERC20.sol @@ -0,0 +1,145 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/math/SafeMath.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; + + +library UniERC20 { + using SafeMath for uint256; + using SafeERC20 for IERC20; + + IERC20 public constant ETH_ADDRESS = IERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE); + IERC20 public constant ZERO_ADDRESS = IERC20(0); + + function isETH(IERC20 token) internal pure returns(bool) { + return (token == ZERO_ADDRESS || token == ETH_ADDRESS); + } + + function uniBalanceOf(IERC20 token, address account) internal view returns (uint256) { + if (isETH(token)) { + return account.balance; + } else { + return token.balanceOf(account); + } + } + + function uniTransfer(IERC20 token, address payable to, uint256 amount) internal { + if (amount > 0) { + if (isETH(token)) { + to.transfer(amount); + } else { + token.safeTransfer(to, amount); + } + } + } + + function uniTransferFromSender(IERC20 token, address payable target, uint256 amount) internal { + if (amount > 0) { + if (isETH(token)) { + require(msg.value >= amount, "UniERC20: not enough value"); + target.transfer(amount); + if (msg.value > amount) { + // Return remainder if exist + msg.sender.transfer(msg.value.sub(amount)); + } + } else { + token.safeTransferFrom(msg.sender, target, amount); + } + } + } + + function uniApprove(IERC20 token, address to, uint256 amount) internal { + if (!isETH(token)) { + if (amount == 0) { + token.safeApprove(to, 0); + return; + } + + uint256 allowance = token.allowance(address(this), to); + if (allowance < amount) { + if (allowance > 0) { + token.safeApprove(to, 0); + } + token.safeApprove(to, amount); + } + } + } + + function uniDecimals(IERC20 token) internal view returns (uint256) { + if (isETH(token)) { + return 18; + } + + (bool success, bytes memory data) = address(token).staticcall{ gas: 20000 }( + abi.encodeWithSignature("decimals()") + ); + if (!success) { + (success, data) = address(token).staticcall{ gas: 20000 }( + abi.encodeWithSignature("DECIMALS()") + ); + } + + return success ? abi.decode(data, (uint8)) : 18; + } + + function uniSymbol(IERC20 token) internal view returns(string memory) { + if (isETH(token)) { + return "ETH"; + } + + (bool success, bytes memory data) = address(token).staticcall{ gas: 20000 }( + abi.encodeWithSignature("symbol()") + ); + if (!success) { + (success, data) = address(token).staticcall{ gas: 20000 }( + abi.encodeWithSignature("SYMBOL()") + ); + } + + if (success && data.length >= 96) { + (uint256 offset, uint256 len) = abi.decode(data, (uint256, uint256)); + if (offset == 0x20 && len > 0 && len <= 256) { + return string(abi.decode(data, (bytes))); + } + } + + if (success && data.length == 32) { + uint len = 0; + while (len < data.length && data[len] >= 0x20 && data[len] <= 0x7E) { + len++; + } + + if (len > 0) { + bytes memory result = new bytes(len); + for (uint i = 0; i < len; i++) { + result[i] = data[i]; + } + return string(result); + } + } + + return _toHex(address(token)); + } + + function _toHex(address account) private pure returns(string memory) { + return _toHex(abi.encodePacked(account)); + } + + function _toHex(bytes memory data) private pure returns(string memory) { + bytes memory str = new bytes(2 + data.length * 2); + str[0] = "0"; + str[1] = "x"; + uint j = 2; + for (uint i = 0; i < data.length; i++) { + uint a = uint8(data[i]) >> 4; + uint b = uint8(data[i]) & 0x0f; + str[j++] = byte(uint8(a + 48 + (a/10)*39)); + str[j++] = byte(uint8(b + 48 + (b/10)*39)); + } + + return string(str); + } +} diff --git a/contracts/sources/BalancerSource.sol b/contracts/sources/BalancerSource.sol new file mode 100644 index 0000000..5237bae --- /dev/null +++ b/contracts/sources/BalancerSource.sol @@ -0,0 +1,179 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/math/SafeMath.sol"; + +import "../interfaces/IBalancer.sol"; +import "../interfaces/IWETH.sol"; +import "../IOneRouter.sol"; +import "../ISource.sol"; +import "../OneRouterConstants.sol"; + +import "../libraries/UniERC20.sol"; +import "../libraries/BalancerLib.sol"; +import "../libraries/FlagsChecker.sol"; + + +library BalancerHelper { + IWETH constant public WETH = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); + IBalancerRegistry constant public REGISTRY = IBalancerRegistry(0x65e67cbc342712DF67494ACEfc06fe951EE93982); +} + + +contract BalancerSourceView is OneRouterConstants { + using SafeMath for uint256; + using UniERC20 for IERC20; + using FlagsChecker for uint256; + + struct BalancerPoolInfo { + uint256 swapFee; + uint256 fromBalance; + uint256 destBalance; + uint256 fromWeight; + uint256 destWeight; + } + + function _calculateBalancer1(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateBalancer(fromToken, swap.destToken, amounts, swap.flags, 0); + } + + function _calculateBalancer2(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateBalancer(fromToken, swap.destToken, amounts, swap.flags, 1); + } + + function _calculateBalancer3(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateBalancer(fromToken, swap.destToken, amounts, swap.flags, 2); + } + + function _calculateBalancer( + IERC20 fromToken, + IERC20 destToken, + uint256[] memory amounts, + uint256 flags, + uint256 poolIndex + ) private view returns(uint256[] memory rets, address dex, uint256 gas) { + rets = new uint256[](amounts.length); + if (flags.check(_FLAG_DISABLE_ALL_SOURCES) != flags.check(_FLAG_DISABLE_BALANCER_ALL)) { + return (rets, address(0), 0); + } + + IERC20 fromTokenWrapped = fromToken.isETH() ? BalancerHelper.WETH : fromToken; + IERC20 destTokenWrapped = destToken.isETH() ? BalancerHelper.WETH : destToken; + IBalancerPool[] memory pools = BalancerHelper.REGISTRY.getBestPoolsWithLimit(fromTokenWrapped, destTokenWrapped, poolIndex + 1); + if (poolIndex < pools.length) { + BalancerPoolInfo memory info = BalancerPoolInfo({ + swapFee: pools[poolIndex].getSwapFee(), + fromBalance: pools[poolIndex].getBalance(fromTokenWrapped), + destBalance: pools[poolIndex].getBalance(destTokenWrapped), + fromWeight: pools[poolIndex].getDenormalizedWeight(fromTokenWrapped), + destWeight: pools[poolIndex].getDenormalizedWeight(destTokenWrapped) + }); + + for (uint i = 0; i < amounts.length && amounts[i].mul(2) <= info.fromBalance; i++) { + rets[i] = BalancerLib.calcOutGivenIn( + info.fromBalance, + info.fromWeight, + info.destBalance, + info.destWeight, + amounts[i], + info.swapFee + ); + } + return (rets, address(pools[poolIndex]), 75_000 + (fromToken.isETH() || destToken.isETH() ? 0 : 30_000)); + } + } +} + + +contract BalancerSourceSwap { + using UniERC20 for IERC20; + + function _swapOnBalancer1(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { + _swapOnBalancer(fromToken, destToken, amount, flags, 0); + } + + function _swapOnBalancer2(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { + _swapOnBalancer(fromToken, destToken, amount, flags, 1); + } + + function _swapOnBalancer3(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { + _swapOnBalancer(fromToken, destToken, amount, flags, 2); + } + + function _swapOnBalancer( + IERC20 fromToken, + IERC20 destToken, + uint256 amount, + uint256 flags, + uint256 poolIndex + ) private { + if (fromToken.isETH()) { + BalancerHelper.WETH.deposit{ value: amount }(); + } + + _swapOnBalancerWrapped( + fromToken.isETH() ? BalancerHelper.WETH : fromToken, + destToken.isETH() ? BalancerHelper.WETH : destToken, + amount, + flags, + poolIndex + ); + + if (destToken.isETH()) { + BalancerHelper.WETH.withdraw(BalancerHelper.WETH.balanceOf(address(this))); + } + } + + function _swapOnBalancerWrapped( + IERC20 fromToken, + IERC20 destToken, + uint256 amount, + uint256 /*flags*/, + uint256 poolIndex + ) private { + IBalancerPool[] memory pools = BalancerHelper.REGISTRY.getBestPoolsWithLimit(fromToken, destToken, poolIndex + 1); + fromToken.uniApprove(address(pools[poolIndex]), amount); + IBalancerPool(pools[poolIndex]).swapExactAmountIn( + fromToken, + amount, + destToken, + 0, + uint256(-1) + ); + } +} + + +contract BalancerSourcePublic1 is ISource, BalancerSourceView, BalancerSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateBalancer1(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnBalancer1(fromToken, destToken, amount, flags); + } +} + + +contract BalancerSourcePublic2 is ISource, BalancerSourceView, BalancerSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateBalancer2(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnBalancer2(fromToken, destToken, amount, flags); + } +} + + +contract BalancerSourcePublic3 is ISource, BalancerSourceView, BalancerSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateBalancer3(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnBalancer3(fromToken, destToken, amount, flags); + } +} diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol new file mode 100644 index 0000000..231c4ee --- /dev/null +++ b/contracts/sources/CurveSource.sol @@ -0,0 +1,363 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/math/SafeMath.sol"; + +import "../interfaces/ICurve.sol"; +import "../IOneRouter.sol"; +import "../ISource.sol"; +import "../OneRouterConstants.sol"; + +import "../libraries/UniERC20.sol"; +import "../libraries/FlagsChecker.sol"; + + +library CurveHelper { + ICurve constant public CURVE_COMPOUND = ICurve(0xA2B47E3D5c44877cca798226B7B8118F9BFb7A56); + ICurve constant public CURVE_USDT = ICurve(0x52EA46506B9CC5Ef470C5bf89f17Dc28bB35D85C); + ICurve constant public CURVE_Y = ICurve(0x45F783CCE6B7FF23B2ab2D70e416cdb7D6055f51); + ICurve constant public CURVE_BINANCE = ICurve(0x79a8C46DeA5aDa233ABaFFD40F3A0A2B1e5A4F27); + ICurve constant public CURVE_SYNTHETIX = ICurve(0xA5407eAE9Ba41422680e2e00537571bcC53efBfD); + ICurve constant public CURVE_PAX = ICurve(0x06364f10B501e868329afBc005b3492902d6C763); + ICurve constant public CURVE_RENBTC = ICurve(0x93054188d876f558f4a66B2EF1d97d16eDf0895B); + ICurve constant public CURVE_SBTC = ICurve(0x7fC77b5c7614E1533320Ea6DDc2Eb61fa00A9714); + + function dynarr(IERC20[2] memory tokens) internal pure returns(IERC20[] memory result) { + result = new IERC20[](tokens.length); + for (uint i = 0; i < tokens.length; i++) { + result[i] = tokens[i]; + } + } + + function dynarr(IERC20[3] memory tokens) internal pure returns(IERC20[] memory result) { + result = new IERC20[](tokens.length); + for (uint i = 0; i < tokens.length; i++) { + result[i] = tokens[i]; + } + } + + function dynarr(IERC20[4] memory tokens) internal pure returns(IERC20[] memory result) { + result = new IERC20[](tokens.length); + for (uint i = 0; i < tokens.length; i++) { + result[i] = tokens[i]; + } + } +} + + +contract CurveSourceView is OneRouterConstants { + using SafeMath for uint256; + using UniERC20 for IERC20; + using FlagsChecker for uint256; + + ICurveCalculator constant private _CURVE_CALCULATOR = ICurveCalculator(0xc1DB00a8E5Ef7bfa476395cdbcc98235477cDE4E); + ICurveRegistry constant private _CURVE_REGISTRY = ICurveRegistry(0x7002B727Ef8F5571Cb5F9D70D13DBEEb4dFAe9d1); + + function _calculateCurveCompound(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_COMPOUND, true, CurveHelper.dynarr([_DAI, _USDC])), address(CurveHelper.CURVE_COMPOUND), 720_000); + } + } + + function _calculateCurveUSDT(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_USDT, true, CurveHelper.dynarr([_DAI, _USDC, _USDT])), address(CurveHelper.CURVE_USDT), 720_000); + } + } + + function _calculateCurveY(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_Y, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _TUSD])), address(CurveHelper.CURVE_Y), 1_400_000); + } + } + + function _calculateCurveBinance(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_BINANCE, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _BUSD])), address(CurveHelper.CURVE_BINANCE), 1_400_000); + } + } + + function _calculateCurveSynthetix(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_SYNTHETIX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _SUSD])), address(CurveHelper.CURVE_SYNTHETIX), 200_000); + } + } + + function _calculateCurvePAX(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_PAX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _PAX])), address(CurveHelper.CURVE_PAX), 1_000_000); + } + } + + function _calculateCurveRENBTC(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_RENBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC])), address(CurveHelper.CURVE_RENBTC), 130_000); + } + } + + function _calculateCurveSBTC(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC])), address(CurveHelper.CURVE_SBTC), 150_000); + } + } + + function _calculateCurveSelector( + IERC20 fromToken, + IERC20 destToken, + uint256[] memory amounts, + ICurve curve, + bool haveUnderlying, + IERC20[] memory tokens + ) private view returns(uint256[] memory rets) { + rets = new uint256[](amounts.length); + + int128 i = 0; + int128 j = 0; + for (uint t = 0; t < tokens.length; t++) { + if (fromToken == tokens[t]) { + i = int128(t + 1); + } + if (destToken == tokens[t]) { + j = int128(t + 1); + } + } + + if (i == 0 || j == 0) { + return rets; + } + + bytes memory data = abi.encodePacked( + uint256(haveUnderlying ? 1 : 0), + uint256(i - 1), + uint256(j - 1), + _toFixedArray100(amounts) + ); + + ( + uint256[8] memory balances, + uint256[8] memory precisions, + uint256[8] memory rates, + uint256 amp, + uint256 fee + ) = _getCurvePoolInfo(curve, haveUnderlying); + + bool success; + (success, data) = address(_CURVE_CALCULATOR).staticcall( + abi.encodePacked( + abi.encodeWithSelector( + _CURVE_CALCULATOR.get_dy.selector, + tokens.length, + balances, + amp, + fee, + rates, + precisions + ), + data + ) + ); + + if (!success || data.length == 0) { + return rets; + } + + uint256[100] memory dy = abi.decode(data, (uint256[100])); + for (uint t = 0; t < amounts.length; t++) { + rets[t] = dy[t]; + } + } + + function _getCurvePoolInfo( + ICurve curve, + bool haveUnderlying + ) private view returns( + uint256[8] memory balances, + uint256[8] memory precisions, + uint256[8] memory rates, + uint256 amp, + uint256 fee + ) { + uint256[8] memory underlying_balances; + uint256[8] memory decimals; + uint256[8] memory underlying_decimals; + + ( + balances, + underlying_balances, + decimals, + underlying_decimals, + /*address lp_token*/, + amp, + fee + ) = _CURVE_REGISTRY.get_pool_info(address(curve)); + + for (uint k = 0; k < 8 && balances[k] > 0; k++) { + precisions[k] = 10 ** (18 - (haveUnderlying ? underlying_decimals : decimals)[k]); + if (haveUnderlying) { + rates[k] = underlying_balances[k].mul(1e18).div(balances[k]); + } else { + rates[k] = 1e18; + } + } + } + + function _toFixedArray100(uint256[] memory values) private pure returns(uint256[100] memory rets) { + for (uint i = 0; i < values.length; i++) { + rets[i] = values[i]; + } + } +} + + +contract CurveSourceSwap is OneRouterConstants { + using UniERC20 for IERC20; + + function _swapOnCurveCompound(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_COMPOUND, true, CurveHelper.dynarr([_DAI, _USDC]), fromToken, destToken, amount); + } + + function _swapOnCurveUSDT(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_USDT, true, CurveHelper.dynarr([_DAI, _USDC, _USDT]), fromToken, destToken, amount); + } + + function _swapOnCurveY(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_Y, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _TUSD]), fromToken, destToken, amount); + } + + function _swapOnCurveBinance(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_BINANCE, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _BUSD]), fromToken, destToken, amount); + } + + function _swapOnCurveSynthetix(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_SYNTHETIX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _SUSD]), fromToken, destToken, amount); + } + + function _swapOnCurvePAX(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_PAX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _PAX]), fromToken, destToken, amount); + } + + function _swapOnCurveRENBTC(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_RENBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC]), fromToken, destToken, amount); + } + + function _swapOnCurveSBTC(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC]), fromToken, destToken, amount); + } + + function _swapOnCurve( + ICurve curve, + bool underlying, + IERC20[] memory tokens, + IERC20 fromToken, + IERC20 destToken, + uint256 amount + ) private { + int128 i = 0; + int128 j = 0; + for (uint t = 0; t < tokens.length; t++) { + if (fromToken == tokens[t]) { + i = int128(t + 1); + } + if (destToken == tokens[t]) { + j = int128(t + 1); + } + } + + fromToken.uniApprove(address(curve), amount); + if (underlying) { + curve.exchange_underlying(i - 1, j - 1, amount, 0); + } else { + curve.exchange(i - 1, j - 1, amount, 0); + } + } +} + + +contract CurveourcePublicCompound is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurveCompound(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurveCompound(fromToken, destToken, amount, flags); + } +} + + +contract CurveourcePublicUSDT is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurveUSDT(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurveUSDT(fromToken, destToken, amount, flags); + } +} + + +contract CurveourcePublicY is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurveY(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurveY(fromToken, destToken, amount, flags); + } +} + + +contract CurveourcePublicBinance is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurveBinance(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurveBinance(fromToken, destToken, amount, flags); + } +} + + +contract CurveourcePublicSynthetix is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurveSynthetix(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurveSynthetix(fromToken, destToken, amount, flags); + } +} + + +contract CurveourcePublicPAX is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurvePAX(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurvePAX(fromToken, destToken, amount, flags); + } +} + + +contract CurveourcePublicRENBTC is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurveRENBTC(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurveRENBTC(fromToken, destToken, amount, flags); + } +} + + +contract CurveourcePublicSBTC is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurveSBTC(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurveSBTC(fromToken, destToken, amount, flags); + } +} diff --git a/contracts/sources/KyberSource.sol b/contracts/sources/KyberSource.sol new file mode 100644 index 0000000..0d5690a --- /dev/null +++ b/contracts/sources/KyberSource.sol @@ -0,0 +1,227 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/math/SafeMath.sol"; + +import "../interfaces/IKyber.sol"; +import "../IOneRouter.sol"; +import "../ISource.sol"; +import "../OneRouterConstants.sol"; + +import "../libraries/UniERC20.sol"; +import "../libraries/FlagsChecker.sol"; + + +library KyberHelper { + using UniERC20 for IERC20; + + IKyberNetworkProxy constant public PROXY = IKyberNetworkProxy(0x9AAb3f75489902f3a48495025729a0AF77d4b11e); + IKyberStorage constant public STORAGE = IKyberStorage(0xC8fb12402cB16970F3C5F4b48Ff68Eb9D1289301); + IKyberHintHandler constant public HINT_HANDLER = IKyberHintHandler(0xa1C0Fa73c39CFBcC11ec9Eb1Afc665aba9996E2C); + + // https://github.com/CryptoManiacsZone/1inchProtocol/blob/master/KyberReserves.md + bytes1 constant public RESERVE_BRIDGE_PREFIX = 0xbb; + bytes32 constant public RESERVE_ID_1 = 0xff4b796265722046707200000000000000000000000000000000000000000000; // 0x63825c174ab367968EC60f061753D3bbD36A0D8F + bytes32 constant public RESERVE_ID_2 = 0xffabcd0000000000000000000000000000000000000000000000000000000000; // 0x7a3370075a54B187d7bD5DceBf0ff2B5552d4F7D + bytes32 constant public RESERVE_ID_3 = 0xff4f6e65426974205175616e7400000000000000000000000000000000000000; // 0x4f32BbE8dFc9efD54345Fc936f9fEF1048746fCF + + function getReserveId(IERC20 fromToken, IERC20 destToken) internal view returns(bytes32) { + if (fromToken.isETH() || destToken.isETH()) { + bytes32[] memory reserveIds = STORAGE.getReserveIdsPerTokenSrc( + fromToken.isETH() ? destToken : fromToken + ); + + for (uint i = 0; i < reserveIds.length; i++) { + if (reserveIds[i][0] != RESERVE_BRIDGE_PREFIX && + reserveIds[i] != RESERVE_ID_1 && + reserveIds[i] != RESERVE_ID_2 && + reserveIds[i] != RESERVE_ID_3) + { + return reserveIds[i]; + } + } + } + } +} + + +contract KyberSourceView is OneRouterConstants { + using SafeMath for uint256; + using UniERC20 for IERC20; + using FlagsChecker for uint256; + + function _calculateKyber1(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateKyber(fromToken, amounts, swap, KyberHelper.RESERVE_ID_1); + } + + function _calculateKyber2(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateKyber(fromToken, amounts, swap, KyberHelper.RESERVE_ID_2); + } + + function _calculateKyber3(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateKyber(fromToken, amounts, swap, KyberHelper.RESERVE_ID_3); + } + + function _calculateKyber4(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + bytes32 reserveId = KyberHelper.getReserveId(fromToken, swap.destToken); + if (reserveId != 0) { + return _calculateKyber( + fromToken, + amounts, + swap, + reserveId + ); + } + } + + // Fix for "Stack too deep" + struct Decimals { + uint256 fromTokenDecimals; + uint256 destTokenDecimals; + } + + function _calculateKyber(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap, bytes32 reserveId) private view returns(uint256[] memory rets, address dex, uint256 gas) { + rets = new uint256[](amounts.length); + if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) != swap.flags.check(_FLAG_DISABLE_KYBER_ALL)) { + return (rets, address(0), 0); + } + + IKyberReserve reserve = KyberHelper.STORAGE.getReserveAddressesByReserveId(reserveId)[0]; + + Decimals memory decimals = Decimals({ + fromTokenDecimals: 10 ** IERC20(fromToken).uniDecimals(), + destTokenDecimals: 10 ** IERC20(swap.destToken).uniDecimals() + }); + for (uint i = 0; i < amounts.length; i++) { + if (i > 0 && rets[i - 1] == 0) { + break; + } + + uint256 amount = amounts[0].mul(uint256(1e18).sub((swap.flags >> 255) * 1e15)).div(1e18); + try reserve.getConversionRate( + fromToken.isETH() ? UniERC20.ETH_ADDRESS : fromToken, + swap.destToken.isETH() ? UniERC20.ETH_ADDRESS : swap.destToken, + amount, + block.number + ) + returns(uint256 rate) { + uint256 preResult = amounts[i].mul(rate).mul(decimals.destTokenDecimals); + rets[i] = preResult.div(decimals.fromTokenDecimals).div(1e18); + } catch {} + } + + return (rets, address(reserve), 100_000); + } +} + + +contract KyberSourceSwap { + using UniERC20 for IERC20; + + function _swapOnKyber1(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { + _swapOnKyber(fromToken, destToken, amount, flags, KyberHelper.RESERVE_ID_1); + } + + function _swapOnKyber2(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { + _swapOnKyber(fromToken, destToken, amount, flags, KyberHelper.RESERVE_ID_2); + } + + function _swapOnKyber3(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { + _swapOnKyber(fromToken, destToken, amount, flags, KyberHelper.RESERVE_ID_3); + } + + function _swapOnKyber4(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { + _swapOnKyber(fromToken, destToken, amount, flags, KyberHelper.getReserveId(fromToken, destToken)); + } + + function _swapOnKyber(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags, bytes32 reserveId) internal { + bytes32[] memory reserveIds = new bytes32[](1); + reserveIds[0] = reserveId; + + bytes memory hint; + if (fromToken.isETH()) { + hint = KyberHelper.HINT_HANDLER.buildEthToTokenHint(destToken, IKyberHintHandler.TradeType.MaskIn, reserveIds, new uint256[](0)); + } + else { + hint = KyberHelper.HINT_HANDLER.buildTokenToEthHint(fromToken, IKyberHintHandler.TradeType.MaskIn, reserveIds, new uint256[](0)); + } + + fromToken.uniApprove(address(KyberHelper.PROXY), amount); + KyberHelper.PROXY.tradeWithHintAndFee{ value: fromToken.isETH() ? amount : 0 }( + fromToken, + amount, + destToken, + payable(address(this)), + uint256(-1), + 0, + 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5, + (flags >> 255) * 10, + hint + ); + } + + function _kyberGetHint(IERC20 fromToken, IERC20 destToken, bytes32 reserveId) private view returns(bytes memory) { + bytes32[] memory reserveIds = new bytes32[](1); + reserveIds[0] = reserveId; + + if (fromToken.isETH()) { + try KyberHelper.HINT_HANDLER.buildEthToTokenHint(destToken, IKyberHintHandler.TradeType.MaskIn, reserveIds, new uint256[](0)) + returns (bytes memory data) { + return data; + } catch {} + } + + if (destToken.isETH()) { + try KyberHelper.HINT_HANDLER.buildTokenToEthHint(fromToken, IKyberHintHandler.TradeType.MaskIn, reserveIds, new uint256[](0)) + returns (bytes memory data) { + return data; + } catch {} + } + } +} + + +contract KyberSourcePublic1 is ISource, KyberSourceView, KyberSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateKyber1(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnKyber1(fromToken, destToken, amount, flags); + } +} + + +contract KyberSourcePublic2 is ISource, KyberSourceView, KyberSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateKyber2(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnKyber2(fromToken, destToken, amount, flags); + } +} + + +contract KyberSourcePublic3 is ISource, KyberSourceView, KyberSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateKyber3(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnKyber3(fromToken, destToken, amount, flags); + } +} + + +contract KyberSourcePublic4 is ISource, KyberSourceView, KyberSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateKyber4(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnKyber4(fromToken, destToken, amount, flags); + } +} diff --git a/contracts/sources/MooniswapSource.sol b/contracts/sources/MooniswapSource.sol new file mode 100644 index 0000000..379719e --- /dev/null +++ b/contracts/sources/MooniswapSource.sol @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/math/SafeMath.sol"; + +import "../interfaces/IMooniswap.sol"; +import "../IOneRouter.sol"; +import "../ISource.sol"; + +import "../libraries/UniERC20.sol"; + + +library MooniswapHelper { + IMooniswapRegistry constant public REGISTRY = IMooniswapRegistry(0x71CD6666064C3A1354a3B4dca5fA1E2D3ee7D303); +} + + +contract MooniswapSourceView { + using SafeMath for uint256; + using UniERC20 for IERC20; + + function _calculateMooniswap(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + rets = new uint256[](amounts.length); + + IMooniswap mooniswap = MooniswapHelper.REGISTRY.pools( + fromToken.isETH() ? UniERC20.ZERO_ADDRESS : fromToken, + swap.destToken.isETH() ? UniERC20.ZERO_ADDRESS : swap.destToken + ); + if (mooniswap == IMooniswap(0)) { + return (rets, address(0), 0); + } + + uint256 fee = mooniswap.fee(); + uint256 fromBalance = mooniswap.getBalanceForAddition(fromToken.isETH() ? UniERC20.ZERO_ADDRESS : fromToken); + uint256 destBalance = mooniswap.getBalanceForRemoval(swap.destToken.isETH() ? UniERC20.ZERO_ADDRESS : swap.destToken); + if (fromBalance == 0 || destBalance == 0) { + return (rets, address(0), 0); + } + + for (uint i = 0; i < amounts.length; i++) { + uint256 amount = amounts[i].sub(amounts[i].mul(fee).div(1e18)); + rets[i] = amount.mul(destBalance).div( + fromBalance.add(amount) + ); + } + + return (rets, address(mooniswap), (fromToken.isETH() || swap.destToken.isETH()) ? 80_000 : 110_000); + } +} + + +contract MooniswapSourceSwap { + using UniERC20 for IERC20; + + function _swapOnMooniswap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + IMooniswap mooniswap = MooniswapHelper.REGISTRY.pools( + fromToken.isETH() ? UniERC20.ZERO_ADDRESS : fromToken, + destToken.isETH() ? UniERC20.ZERO_ADDRESS : destToken + ); + + fromToken.uniApprove(address(mooniswap), amount); + mooniswap.swap{ value: fromToken.isETH() ? amount : 0 }( + fromToken.isETH() ? UniERC20.ZERO_ADDRESS : fromToken, + destToken.isETH() ? UniERC20.ZERO_ADDRESS : destToken, + amount, + 0, + 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5 + ); + } +} + + +contract MooniswapSourcePublic is ISource, MooniswapSourceView, MooniswapSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateMooniswap(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnMooniswap(fromToken, destToken, amount, flags); + } +} diff --git a/contracts/sources/UniswapV1Source.sol b/contracts/sources/UniswapV1Source.sol new file mode 100644 index 0000000..90f604c --- /dev/null +++ b/contracts/sources/UniswapV1Source.sol @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/math/SafeMath.sol"; + +import "../interfaces/IUniswapV1.sol"; +import "../IOneRouter.sol"; +import "../ISource.sol"; + +import "../libraries/UniERC20.sol"; + + +contract UniswapV1SourceView { + using SafeMath for uint256; + using UniERC20 for IERC20; + + IUniswapV1Factory constant private _FACTORY = IUniswapV1Factory(0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95); + + function _calculateUniswap1Formula(uint256 fromBalance, uint256 toBalance, uint256 amount) private pure returns(uint256) { + if (amount > 0) { + return amount.mul(toBalance).mul(997).div( + fromBalance.mul(1000).add(amount.mul(997)) + ); + } + } + + function _calculateUniswapV1(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + rets = new uint256[](amounts.length); + + if (fromToken.isETH() || swap.destToken.isETH()) { + IUniswapV1Exchange exchange = _FACTORY.getExchange(fromToken.isETH() ? swap.destToken : fromToken); + if (exchange != IUniswapV1Exchange(0)) { + uint256 fromBalance = fromToken.uniBalanceOf(address(exchange)); + uint256 destBalance = swap.destToken.uniBalanceOf(address(exchange)); + for (uint i = 0; i < amounts.length; i++) { + rets[i] = _calculateUniswap1Formula(fromBalance, destBalance, amounts[i]); + } + return (rets, address(exchange), 60_000); + } + } + } +} + + +contract UniswapV1SourceSwap { + using UniERC20 for IERC20; + + IUniswapV1Factory constant private _FACTORY = IUniswapV1Factory(0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95); + + function _swapOnUniswapV1( + IERC20 fromToken, + IERC20 destToken, + uint256 amount, + uint256 /*flags*/ + ) internal { + IUniswapV1Exchange exchange = _FACTORY.getExchange(fromToken.isETH() ? destToken : fromToken); + fromToken.uniApprove(address(exchange), amount); + if (fromToken.isETH()) { + exchange.tokenToEthSwapInput(amount, 1, block.timestamp); + } else { + exchange.ethToTokenSwapInput{ value: amount }(1, block.timestamp); + } + } +} + + +contract UniswapV1SourcePublic is ISource, UniswapV1SourceView, UniswapV1SourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateUniswapV1(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnUniswapV1(fromToken, destToken, amount, flags); + } +} diff --git a/contracts/sources/UniswapV2Source.sol b/contracts/sources/UniswapV2Source.sol new file mode 100644 index 0000000..6fa6156 --- /dev/null +++ b/contracts/sources/UniswapV2Source.sol @@ -0,0 +1,140 @@ + +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/math/Math.sol"; +import "@openzeppelin/contracts/math/SafeMath.sol"; + +import "../interfaces/IUniswapV2.sol"; +import "../interfaces/IWETH.sol"; +import "../IOneRouter.sol"; +import "../ISource.sol"; + +import "../libraries/UniERC20.sol"; + + +library UniswapV2Helper { + using Math for uint256; + using SafeMath for uint256; + using UniERC20 for IERC20; + + IUniswapV2Factory constant public FACTORY = IUniswapV2Factory(0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f); + IWETH constant public WETH = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); + + function getReturns( + IUniswapV2Exchange exchange, + IERC20 fromToken, + IERC20 destToken, + uint256[] memory amounts + ) internal view returns (uint256[] memory results, bool needSync, bool needSkim) { + return _getReturns( + exchange, + fromToken.isETH() ? UniswapV2Helper.WETH : fromToken, + destToken.isETH() ? UniswapV2Helper.WETH : destToken, + amounts + ); + } + + function _getReturns( + IUniswapV2Exchange exchange, + IERC20 fromToken, + IERC20 destToken, + uint256[] memory amounts + ) private view returns (uint256[] memory results, bool needSync, bool needSkim) { + uint256 reserveIn = fromToken.uniBalanceOf(address(exchange)); + uint256 reserveOut = destToken.uniBalanceOf(address(exchange)); + (uint112 reserve0, uint112 reserve1,) = exchange.getReserves(); + if (fromToken > destToken) { + (reserve0, reserve1) = (reserve1, reserve0); + } + needSync = (reserveIn < reserve0 || reserveOut < reserve1); + needSkim = !needSync && (reserveIn > reserve0 || reserveOut > reserve1); + + reserveOut = Math.min(reserveOut, reserve1); + reserveIn = Math.min(reserveIn, reserve0); + + results = new uint256[](amounts.length); + for (uint i = 0; i < amounts.length; i++) { + uint256 amountInWithFee = amounts[i].mul(997); + uint256 numerator = amountInWithFee.mul(reserveOut); + uint256 denominator = reserveIn.mul(1000).add(amountInWithFee); + results[i] = (denominator == 0) ? 0 : numerator.div(denominator); + } + } +} + + +contract UniswapV2SourceView { + using SafeMath for uint256; + using UniERC20 for IERC20; + using UniswapV2Helper for IUniswapV2Exchange; + + function _calculateUniswapV2(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + rets = new uint256[](amounts.length); + + IERC20 fromTokenWrapped = fromToken.isETH() ? UniswapV2Helper.WETH : fromToken; + IERC20 destTokenWrapped = swap.destToken.isETH() ? UniswapV2Helper.WETH : swap.destToken; + IUniswapV2Exchange exchange = UniswapV2Helper.FACTORY.getPair(fromTokenWrapped, destTokenWrapped); + if (exchange != IUniswapV2Exchange(0)) { + (rets,,) = exchange.getReturns(fromToken, swap.destToken, amounts); + return (rets, address(exchange), 50_000 + (fromToken.isETH() || swap.destToken.isETH() ? 0 : 30_000)); + } + } +} + + +contract UniswapV2SourceSwap { + using UniERC20 for IERC20; + using UniswapV2Helper for IUniswapV2Exchange; + + function _swapOnUniswapV2(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { + if (fromToken.isETH()) { + UniswapV2Helper.WETH.deposit{ value: amount }(); + } + + _swapOnUniswapV2Wrapped( + fromToken.isETH() ? UniswapV2Helper.WETH : fromToken, + destToken.isETH() ? UniswapV2Helper.WETH : destToken, + amount, + flags + ); + + if (destToken.isETH()) { + UniswapV2Helper.WETH.withdraw(UniswapV2Helper.WETH.balanceOf(address(this))); + } + } + + function _swapOnUniswapV2Wrapped(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) private { + uint256[] memory amounts = new uint256[](1); + amounts[0] = amount; + + IUniswapV2Exchange exchange = UniswapV2Helper.FACTORY.getPair(fromToken, destToken); + (uint256[] memory returnAmounts, bool needSync, bool needSkim) = exchange.getReturns(fromToken, destToken, amounts); + if (needSync) { + exchange.sync(); + } + else if (needSkim) { + exchange.skim(0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5); + } + + fromToken.uniTransfer(payable(address(exchange)), amount); + if (fromToken < destToken) { + exchange.swap(0, returnAmounts[0], address(this), ""); + } else { + exchange.swap(returnAmounts[0], 0, address(this), ""); + } + } +} + + +contract UniswapV2SourcePublic is ISource, UniswapV2SourceView, UniswapV2SourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateUniswapV2(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnUniswapV2(fromToken, destToken, amount, flags); + } +} diff --git a/img/howitworks.png b/img/howitworks.png deleted file mode 100644 index efcdb7f9c49d171eb7ce0396e199cddcd60bba23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18689 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 o_h&^y|IaS+`MR1SmXRRIw?Z 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%0Dkg(3nzNyq}!81O&pXexsK&O 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 OneSplit.full.sol && solcjs --bin --abi --optimize OneSplit.full.sol && mv OneSplit_full_sol_OneSplit.bin OneSplit.full.bin && mv OneSplit_full_sol_OneSplit.abi OneSplit.full.abi && rm *_sol_*", - "dist:view": "truffle-flattener ./contracts/OneSplit.sol > OneSplitView.full.sol && solcjs --bin --abi OneSplitView.full.sol && mv OneSplitView_full_sol_OneSplitView.bin OneSplitView.full.bin && mv OneSplitView_full_sol_OneSplitView.abi OneSplitView.full.abi && rm *_sol_*", - "dist:audit": "truffle-flattener ./contracts/OneSplitAudit.sol > OneSplitAudit.full.sol && solcjs --bin --abi --optimize OneSplitAudit.full.sol && mv OneSplitAudit_full_sol_OneSplitAudit.bin OneSplitAudit.full.bin && mv OneSplitAudit_full_sol_OneSplitAudit.abi OneSplitAudit.full.abi && rm *_sol_*", - "dist:bnt": "truffle-flattener ./contracts/BancorFinder.sol > BancorFinder.full.sol && solcjs --bin --abi --optimize BancorFinder.full.sol && mv BancorFinder_full_sol_BancorFinder.bin BancorFinder.full.bin && mv BancorFinder_full_sol_BancorFinder.abi BancorFinder.full.abi && rm *_sol_*", - "dist:comp": "truffle-flattener ./contracts/CompoundRegistry.sol > CompoundRegistry.full.sol && solcjs --bin --abi --optimize CompoundRegistry.full.sol && mv CompoundRegistry_full_sol_CompoundRegistry.bin CompoundRegistry.full.bin && mv CompoundRegistry_full_sol_CompoundRegistry.abi CompoundRegistry.full.abi && rm *_sol_*", - "dist:bal": "truffle-flattener ./contracts/BalancerHelper.sol > BalancerHelper.full.sol && solcjs --bin --abi --optimize BalancerHelper.full.sol && mv BalancerHelper_full_sol_BalancerHelper.bin BalancerHelper.full.bin && mv BalancerHelper_full_sol_BalancerHelper.abi BalancerHelper.full.abi && rm *_sol_*", - "dist:aave": "truffle-flattener ./contracts/AaveRegistry.sol > AaveRegistry.full.sol && solcjs --bin --abi --optimize AaveRegistry.full.sol && mv AaveRegistry_full_sol_AaveRegistry.bin AaveRegistry.full.bin && mv AaveRegistry_full_sol_AaveRegistry.abi AaveRegistry.full.abi && rm *_sol_*" + "lint:sol": "solhint --max-warnings 0 \"contracts/**/*.sol\"", + "lint:sol:fix": "solhint --max-warnings 0 \"contracts/**/*.sol\" --fix", + "lint": "yarn run lint:js && yarn run lint:sol", + "lint:fix": "yarn run lint:js:fix && yarn run lint:sol:fix", + "dist": "truffle-flattener ./contracts/OneRouter.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./OneRouter.full.sol && solcjs --bin --abi --optimize ./OneRouter.full.sol && mv ./__OneRouter_full_sol_OneRouter.bin ./OneRouter.full.bin && mv ./__OneRouter_full_sol_OneRouter.abi ./OneRouter.full.abi && rm ./*_sol_*", + "dist:factory": "truffle-flattener ./contracts/MooniFactory.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./MooniFactory.full.sol && solcjs --bin --abi --optimize ./MooniFactory.full.sol && mv ./__MooniFactory_full_sol_MooniFactory.bin ./MooniFactory.full.bin && mv ./__MooniFactory_full_sol_MooniFactory.abi ./MooniFactory.full.abi && rm ./*_sol_*" } } diff --git a/scripts/coverage.sh b/scripts/coverage.sh deleted file mode 100755 index 8a50f77..0000000 --- a/scripts/coverage.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -SOLIDITY_COVERAGE=true scripts/test.sh diff --git a/scripts/test.sh b/scripts/test.sh deleted file mode 100755 index 0ba0fde..0000000 --- a/scripts/test.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env bash - -# Exit script as soon as a command fails. -set -o errexit - -# Executes cleanup function at script exit. -trap cleanup EXIT - -cleanup() { - # Kill the ganache instance that we started (if we started one and if it's still running). - if [ -n "$ganache_pid" ] && ps -p $ganache_pid > /dev/null; then - kill -9 $ganache_pid - fi -} - -if [ "$SOLIDITY_COVERAGE" = true ]; then - ganache_port=8555 -else - ganache_port=9545 -fi - -ganache_running() { - nc -z localhost "$ganache_port" -} - -start_ganache() { - # We define 10 accounts with balance 1M ether, needed for high-value tests. - local accounts=( - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501200,1000000000000000000000000" - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501201,1000000000000000000000000" - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501202,1000000000000000000000000" - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501203,1000000000000000000000000" - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501204,1000000000000000000000000" - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501205,1000000000000000000000000" - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501206,1000000000000000000000000" - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501207,1000000000000000000000000" - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501208,1000000000000000000000000" - --account="0x2bdd21761a483f71054e14f5b827213567971c676928d9a1808cbfa4b7501209,1000000000000000000000000" - ) - - if [ "$SOLIDITY_COVERAGE" = true ]; then - node_modules/.bin/testrpc-sc --gasLimit 0xfffffffffff --port "$ganache_port" "${accounts[@]}" > /dev/null & - else - [ -z "$ETH_NODE" ] && source .env - echo "Using ETH_NODE env variable to fork Ethereum Mainnet, ensure to define it in .env file" - node_modules/.bin/ganache-cli -f "$ETH_NODE" --allowUnlimitedContractSize --gasLimit 0xfffffffffff --port "$ganache_port" "${accounts[@]}" > /dev/null & - fi - - ganache_pid=$! -} - -if ganache_running; then - echo "Using existing ganache instance" -else - echo "Starting our own ganache instance" - start_ganache -fi - -if [ "$SOLC_NIGHTLY" = true ]; then - echo "Downloading solc nightly" - wget -q https://raw.githubusercontent.com/ethereum/solc-bin/gh-pages/bin/soljson-nightly.js -O /tmp/soljson.js && find . -name soljson.js -exec cp /tmp/soljson.js {} \; -fi - -truffle version - -if [ "$SOLIDITY_COVERAGE" = true ]; then - node_modules/.bin/solidity-coverage - - if [ "$CONTINUOUS_INTEGRATION" = true ]; then - cat coverage/lcov.info | node_modules/.bin/coveralls - fi -else - yarn truffle test --stacktrace "$@" -fi diff --git a/solhint.json b/solhint.json deleted file mode 100644 index 68801e5..0000000 --- a/solhint.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["solhint:recommended"], - "rules": { - "prettier/prettier": "error", - "avoid-throw": false, - "avoid-suicide": "error", - "avoid-sha3": "warn" - }, - "plugins": ["prettier"] -} diff --git a/test/OneRouter.js b/test/OneRouter.js new file mode 100644 index 0000000..d6744cd --- /dev/null +++ b/test/OneRouter.js @@ -0,0 +1,274 @@ +const { ether, BN } = require('@openzeppelin/test-helpers'); +const { expect } = require('chai'); + +const money = { + ether, + eth: ether, + zero: ether('0'), + oneWei: ether('0').addn(1), + weth: ether, + dai: ether, + usdc: (value) => ether(value).divn(1e6).divn(1e6), +}; + +function linear (bn, n) { + const arr = []; + for (let i = 0; i < n; i++) { + arr.push(bn.muln(i + 1).divn(n)); + } + return arr; +} + +// async function trackReceivedToken (token, wallet, txPromise) { +// const preBalance = web3.utils.toBN( +// (token === constants.ZERO_ADDRESS) +// ? await web3.eth.getBalance(wallet) +// : await token.balanceOf(wallet), +// ); + +// let txResult = await txPromise(); +// if (txResult.receipt) { +// // Fix coverage since testrpc-sc gives: { tx: ..., receipt: ...} +// txResult = txResult.receipt; +// } +// let txFees = web3.utils.toBN('0'); +// if (wallet.toLowerCase() === txResult.from.toLowerCase() && token === constants.ZERO_ADDRESS) { +// const receipt = await web3.eth.getTransactionReceipt(txResult.transactionHash); +// const tx = await web3.eth.getTransaction(receipt.transactionHash); +// txFees = web3.utils.toBN(receipt.gasUsed).mul(web3.utils.toBN(tx.gasPrice)); +// } + +// const postBalance = web3.utils.toBN( +// (token === constants.ZERO_ADDRESS) +// ? await web3.eth.getBalance(wallet) +// : await token.balanceOf(wallet), +// ); + +// return postBalance.sub(preBalance).add(txFees); +// } + +const OneRouter = artifacts.require('OneRouter'); +const OneRouterView = artifacts.require('OneRouterView'); +// const Token = artifacts.require('TokenMock'); + +const DISABLE_ALL = new BN('100000000000000000000000000000000', 16); +const DISABLE_UNISWAP_V1 = new BN('1', 16); +const DISABLE_UNISWAP_V2 = new BN('2', 16); +const DISABLE_UNISWAP_ALL = DISABLE_UNISWAP_V1.add(DISABLE_UNISWAP_V2); +const DISABLE_KYBER_ALL = new BN('200000000000000000000000000000000', 16); +const DISABLE_CURVE_ALL = new BN('400000000000000000000000000000000', 16); + +contract('OneRouter', function ([_, wallet1, wallet2]) { + before(async function () { + this.routerView = await OneRouterView.new(); + this.router = await OneRouter.new(this.routerView.address); + }); + + describe('Uniswap V1', async function () { + it('should give DAI amount for 1 ETH', async function () { + const result = await this.router.getSwapReturn( + '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + [money.eth('1')], + { + destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + flags: DISABLE_ALL.add(DISABLE_UNISWAP_V1).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + ); + + expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); + expect(result.estimateGasAmounts[0]).to.be.equal('60000'); + expect(result.distributions[0][0]).to.be.equal('1'); + }); + + it('should give ETH amount for 1 DAI', async function () { + const result = await this.router.getSwapReturn( + '0x6B175474E89094C44Da98b954EedeAC495271d0F', + [money.dai('1')], + { + destToken: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + flags: DISABLE_ALL.add(DISABLE_UNISWAP_V1).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + ); + + expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.0025')); + expect(result.estimateGasAmounts[0]).to.be.equal('60000'); + expect(result.distributions[0][0]).to.be.equal('1'); + }); + }); + + describe('Uniswap V2', async function () { + it('should give DAI amount for 1 ETH', async function () { + const result = await this.router.getSwapReturn( + '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + [money.eth('1')], + { + destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + flags: DISABLE_ALL.add(DISABLE_UNISWAP_V2).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + ); + + expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); + expect(result.estimateGasAmounts[0]).to.be.equal('50000'); + expect(result.distributions[0][1]).to.be.equal('1'); + }); + + it('should give ETH amount for 1 DAI', async function () { + const result = await this.router.getSwapReturn( + '0x6B175474E89094C44Da98b954EedeAC495271d0F', + [money.dai('1')], + { + destToken: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + flags: DISABLE_ALL.add(DISABLE_UNISWAP_V2).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + ); + + expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.0025')); + expect(result.estimateGasAmounts[0]).to.be.equal('50000'); + expect(result.distributions[0][1]).to.be.equal('1'); + }); + }); + + describe('Kyber', async function () { + it('should give DAI amount for 1 ETH', async function () { + const result = await this.router.getSwapReturn( + '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + [money.eth('1')], + { + destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + flags: DISABLE_ALL.add(DISABLE_KYBER_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + ); + + expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); + expect(result.estimateGasAmounts[0]).to.be.equal('100000'); + }); + + it('should give ETH amount for 1 DAI', async function () { + const result = await this.router.getSwapReturn( + '0x6B175474E89094C44Da98b954EedeAC495271d0F', + [money.dai('1')], + { + destToken: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + flags: DISABLE_ALL.add(DISABLE_KYBER_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + ); + + expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.0025')); + expect(result.estimateGasAmounts[0]).to.be.equal('100000'); + }); + }); + + describe('Curve', async function () { + it('should give DAI amount for 1 USDC', async function () { + const result = await this.router.getSwapReturn( + '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + [money.usdc('1')], + { + destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + ); + + expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('0.9')); + expect(result.estimateGasAmounts[0]).to.be.equal('720000'); + }); + }); + + describe('Aggregation', async function () { + it('should give DAI amount for 1000 ETH over USDC', async function () { + const result = await this.router.getPathReturn( + '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + [money.eth('1000')], + { + swaps: [ + { + destToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + flags: DISABLE_ALL.add(DISABLE_UNISWAP_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + { + destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + } + ] + } + ); + + console.log('result', JSON.stringify(result)); + //expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); + //expect(result.estimateGasAmounts[0]).to.be.equal('100000'); + }); + + it('should give DAI amount for 1000 ETH', async function () { + const result = await this.router.getMultiPathReturn( + '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + linear(money.eth('10000'), 10), + [ + { + swaps: [ + { + destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + flags: DISABLE_ALL.add(DISABLE_UNISWAP_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + } + ] + }, + { + swaps: [ + { + destToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + flags: DISABLE_ALL.add(DISABLE_UNISWAP_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + { + destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + } + ] + }, + { + swaps: [ + { + destToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7', + flags: DISABLE_ALL.add(DISABLE_UNISWAP_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + { + destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + } + ] + } + ] + ); + + console.log('result', JSON.stringify(result)); + //expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); + //expect(result.estimateGasAmounts[0]).to.be.equal('100000'); + }); + }); +}); diff --git a/test/OneSplit.js b/test/OneSplit.js deleted file mode 100644 index ef58bfb..0000000 --- a/test/OneSplit.js +++ /dev/null @@ -1,323 +0,0 @@ -const { BN, ether, expectRevert } = require('@openzeppelin/test-helpers'); -const { expect } = require('chai'); -const assert = require('assert'); - -const OneSplitView = artifacts.require('OneSplitView'); -const OneSplitViewWrap = artifacts.require('OneSplitViewWrap'); -const OneSplit = artifacts.require('OneSplit'); -const OneSplitWrap = artifacts.require('OneSplitWrap'); -const IMooniswapRegistry = artifacts.require('IMooniswapRegistry'); -const IMooniswap = artifacts.require('IMooniswap'); - -const DISABLE_ALL = new BN('20000000', 16).add(new BN('40000000', 16)); -const CURVE_SYNTHETIX = new BN('40000', 16); -const CURVE_COMPOUND = new BN('1000', 16); -const CURVE_ALL = new BN('200000000000', 16); -const KYBER_ALL = new BN('200000000000000', 16); -const MOONISWAP_ALL = new BN('8000000000000000', 16); -const BALANCER_ALL = new BN('1000000000000', 16); - -contract('OneSplit', function ([_, addr1]) { - describe('OneSplit', async function () { - before(async function () { - // let mr = await IMooniswapRegistry.at('0xEa579905818Ae70051C057e5E6aF3A5dC85745A4'); - // let addr = await mr.pools('0x0000000000000000000000000000000000000000', '0x6B175474E89094C44Da98b954EedeAC495271d0F'); - // let p = await IMooniswap.at(addr); - // console.log('p.address', addr); - // console.log('add', await p.getBalanceForAddition('0x0000000000000000000000000000000000000000')); - // console.log('rem', await p.getBalanceForRemoval('0x6B175474E89094C44Da98b954EedeAC495271d0F')); - - // exit(1); - this.subSplitView = await OneSplitView.new(); - this.splitView = await OneSplitViewWrap.new(this.subSplitView.address); - - const subSplit = await OneSplit.new(this.splitView.address); - this.split = await OneSplitWrap.new(this.splitView.address, subSplit.address); - }); - - // it.only('should work with ETH => CHAI', async function () { - // const res = await this.split.swap( - // '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', // ETH - // '0x06AF07097C9Eeb7fD685c692751D5C66dB49c215', // CHAI - // '100000000000000000000', // 100.0 - // 10, - // 0, // enable all - // { value: '100000000000000000000' } - // ); - - // console.log('Swap: 100 ETH'); - // console.log('returnAmount:', res.returnAmount.toString() / 1e8 + ' CHAI'); - // // console.log('distribution:', res.distribution.map(a => a.toString())); - // // console.log('raw:', res.returnAmount.toString()); - // }); - - it('should work with Mooniswap ETH => DAI', async function () { - const res = await this.split.getExpectedReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', // ETH - '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', // USDC - '1000000000000000000', // 1.0 - 10, - DISABLE_ALL.add(MOONISWAP_ALL), // enable only Mooniswap - ); - - console.log('Swap: 1 ETH'); - console.log('returnAmount:', res.returnAmount.toString() / 1e6 + ' USDC'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.returnAmount).to.be.bignumber.above('390000000'); - }); - - it('should work with Balancer ETH => DAI', async function () { - const res = await this.split.getExpectedReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', // ETH - '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', // USDC - '1000000000000000000', // 1.0 - 10, - DISABLE_ALL.add(BALANCER_ALL), // enable only Mooniswap - ); - - console.log('Swap: 1 ETH'); - console.log('returnAmount:', res.returnAmount.toString() / 1e6 + ' USDC'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.returnAmount).to.be.bignumber.above('390000000'); - }); - - it('should work with ETH => COMP', async function () { - const res = await this.split.getExpectedReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', // ETH - '0xc00e94Cb662C3520282E6f5717214004A7f26888', // USDC - '1000000000000000000', // 1.0 - 1, - 0, - ); - - console.log('Swap: 1 ETH'); - console.log('returnAmount:', res.returnAmount.toString() / 1e18 + ' COMP'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.returnAmount).to.be.bignumber.above('390000000'); - }); - - it('should work with Uniswap USDT => BAL', async function () { - const res = await this.split.getExpectedReturn( - '0xdAC17F958D2ee523a2206206994597C13D831ec7', // USDT - '0xba100000625a3754423978a60c9317c58a424e3D', // BAL - '100000000', // 1.0 - 10, - DISABLE_ALL.addn(1), // enable only Uniswap V1 - ); - - console.log('Swap: 1 USDT'); - console.log('returnAmount:', res.returnAmount.toString() / 1e8 + ' BAL'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.returnAmount).to.be.bignumber.equals('0'); - }); - - it('should work with DAI => mUSD', async function () { - const res = await this.split.getExpectedReturn( - '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', // USDC - '0xe2f2a5C287993345a840Db3B0845fbC70f5935a5', // mUSD - '2000000', // 2.0 - 1, - DISABLE_ALL.add(web3.utils.toBN('0x20000000000')), // enable only mStable mUSD - ); - - console.log('Swap: 2 USDC'); - console.log('returnAmount:', res.returnAmount.toString() / 1e8 + ' mUSD'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.returnAmount).to.be.bignumber.equals('2000000000000000000'); - }); - - it('should work with Bancor USDT => BAL', async function () { - const res = await this.subSplitView.getExpectedReturn( - '0xdAC17F958D2ee523a2206206994597C13D831ec7', // USDT - '0xba100000625a3754423978a60c9317c58a424e3D', // BAL - '100000000', // 1.0 - 10, - DISABLE_ALL.addn(4), // enable only Bancor - ); - - console.log('Swap: 1 USDT'); - console.log('returnAmount:', res.returnAmount.toString() / 1e8 + ' BAL'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.returnAmount).to.be.bignumber.equals('0'); - }); - - it('should work with Uniswap ETH => DAI', async function () { - const res = await this.split.getExpectedReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', // ETH - '0x6B175474E89094C44Da98b954EedeAC495271d0F', // DAI - '1000000000000000000', // 1.0 - 10, - DISABLE_ALL.addn(1), // enable only Uniswap V1 - ); - - console.log('Swap: 1 ETH'); - console.log('returnAmount:', res.returnAmount.toString() / 1e8 + ' WBTC'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.returnAmount).to.be.bignumber.above('200000000000000000000'); - }); - - it('should work with Kyber ETH => DAI', async function () { - const res = await this.split.getExpectedReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', // ETH - '0x6B175474E89094C44Da98b954EedeAC495271d0F', // DAI - '1000000000000000000', // 1.0 - 10, - DISABLE_ALL.add(KYBER_ALL), // enable only Kyber - ); - - console.log('Swap: 1 ETH'); - console.log('returnAmount:', res.returnAmount.toString() / 1e8 + ' WBTC'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.returnAmount).to.be.bignumber.above('200000000000000000000'); - }); - - it.only('should work with Kyber ETH => USDT', async function () { - const res = await this.split.getExpectedReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', // ETH - '0xdAC17F958D2ee523a2206206994597C13D831ec7', // USDT - '50000000000000000000', // 50.0 - 10, - DISABLE_ALL.add(KYBER_ALL), // enable only Kyber - ); - - console.log('Swap: 1 ETH'); - console.log('returnAmount:', res.returnAmount.toString() / 1e6 + ' USDT'); - console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.returnAmount).to.be.bignumber.above('200000000000000000000'); - }); - - it('should split among BTC Curves', async function () { - const res = await this.split.getExpectedReturn( - '0xEB4C2781e4ebA804CE9a9803C67d0893436bB27D', // renBTC - '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', // WBTC - '100000000000', // 1000.00 - 10, - DISABLE_ALL.add(CURVE_ALL), // enable only all curves - ); - - console.log('Swap: 100 renBTC'); - console.log('returnAmount:', res.returnAmount.toString() / 1e8 + ' WBTC'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.distribution.filter(r => r.gt(new BN(0))).length).to.be.equals(2); - }); - - it('should split among USD Curves', async function () { - const res = await this.split.getExpectedReturn( - '0x6B175474E89094C44Da98b954EedeAC495271d0F', // DAI - '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', // USDC - '1000000000000000000000000', // 1,000,000.00 - 4, - DISABLE_ALL.add(CURVE_COMPOUND).add(CURVE_SYNTHETIX), // enable only all curves - ); - - console.log('Swap: 1,000,000 DAI'); - console.log('returnAmount:', res.returnAmount.toString() / 1e18 + ' USDC'); - console.log('distribution:', res.distribution.map(a => a.toString())); - // console.log('raw:', res.returnAmount.toString()); - expect(res.distribution.filter(r => r.gt(new BN(0))).length).to.be.above(1); - }); - - it('should work', async function () { - // const tx = await this.split.getExpectedReturnMock( - // '0x0000000000000000000000000000000000000000', - // '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359', - // web3.utils.toWei('20'), - // 10 - // ); - const res = await this.split.getExpectedReturn( - '0x0000000000000000000000000000000000000000', // ETH - '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359', // DAI - web3.utils.toWei('20'), - 10, - 4, - ); - console.log('input: 20 ETH'); - console.log('returnAmount:', res.returnAmount.toString() / 1e18 + ' DAI'); - // console.log('distribution:', res.distribution.map(a => a.toString())); - - console.log('raw:', res.returnAmount.toString()); - }); - - it('should return same input (DAI to bDAI)', async function () { - const inputAmount = '84'; - - const res = await this.split.getExpectedReturn( - '0x6B175474E89094C44Da98b954EedeAC495271d0F', // DAI - '0x6a4FFAafa8DD400676Df8076AD6c724867b0e2e8', // bDAI - web3.utils.toWei(inputAmount), - 10, - 0, - ); - - const returnAmount = web3.utils.fromWei(res.returnAmount.toString(), 'ether'); - - assert.strictEqual( - returnAmount, - inputAmount, - 'Invalid swap ratio', - ); - - console.log(`input: ${inputAmount} DAI`); - console.log(`returnAmount: ${returnAmount} bDAI`); - // console.log('distribution:', res.distribution.map(a => a.toString())); - - console.log('raw:', res.returnAmount.toString()); - }); - - it('should return same input (bDAI to DAI)', async function () { - const inputAmount = '84'; - - const res = await this.split.getExpectedReturn( - '0x6a4FFAafa8DD400676Df8076AD6c724867b0e2e8', // bDAI - '0x6B175474E89094C44Da98b954EedeAC495271d0F', // DAI - web3.utils.toWei(inputAmount), - 10, - 4, - ); - - const returnAmount = web3.utils.fromWei(res.returnAmount.toString(), 'ether'); - - assert.strictEqual( - returnAmount, - inputAmount, - 'Invalid swap ratio', - ); - - console.log(`input: ${inputAmount} bDAI`); - console.log(`returnAmount: ${returnAmount} DAI`); - // console.log('distribution:', res.distribution.map(a => a.toString())); - - console.log('raw:', res.returnAmount.toString()); - }); - - it('should give return from ETH to bDAI', async function () { - const inputAmount = '20'; - - const res = await this.split.getExpectedReturn( - '0x0000000000000000000000000000000000000000', // ETH - '0x6a4FFAafa8DD400676Df8076AD6c724867b0e2e8', // bDAI - web3.utils.toWei(inputAmount), - 10, - 4, - ); - - const returnAmount = web3.utils.fromWei(res.returnAmount.toString(), 'ether'); - - console.log(`input: ${inputAmount} ETH`); - console.log(`returnAmount: ${returnAmount} bDAI`); - // console.log('distributionBdai:', res.distribution.map(a => a.toString())); - - console.log('raw:', res.returnAmount.toString()); - }); - }); -}); diff --git a/truffle-config.js b/truffle-config.js index cdd63ae..36a89c3 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -1,41 +1,33 @@ module.exports = { - // See - // to customize your Truffle configuration! - networks: { - development: { - host: 'localhost', - port: 9545, - network_id: '*', - gas: 8000000, - gasPrice: 1000000000, // web3.eth.gasPrice + networks: { + test: { + host: 'localhost', + port: 9545, + network_id: '*', + gas: 8000000000, + gasPrice: 1000000000, // web3.eth.gasPrice + }, }, - coverage: { - host: 'localhost', - port: 8555, - network_id: '*', - gas: 8000000, - gasPrice: 1000000000, // web3.eth.gasPrice - } - }, - compilers: { - solc: { - version: '0.5.17', - settings: { - optimizer: { - enabled: true, - runs: 200, - } - } + compilers: { + solc: { + version: '0.6.12', + settings: { + optimizer: { + enabled: true, + runs: 200, + } + } + }, }, - }, - mocha: { // https://github.com/cgewecke/eth-gas-reporter - reporter: 'eth-gas-reporter', - reporterOptions : { - currency: 'USD', - gasPrice: 10, - onlyCalledMethods: true, - showTimeSpent: true, - excludeContracts: ['Migrations'] + plugins: ["solidity-coverage"], + mocha: { // https://github.com/cgewecke/eth-gas-reporter + reporter: 'eth-gas-reporter', + reporterOptions : { + currency: 'USD', + gasPrice: 10, + onlyCalledMethods: true, + showTimeSpent: true, + excludeContracts: ['Migrations', 'mocks'] + } } - } }; diff --git a/yarn.lock b/yarn.lock index ed97c77..d5a3f4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18,103 +18,128 @@ esutils "^2.0.2" js-tokens "^4.0.0" +"@codechecks/client@^0.1.10": + version "0.1.10" + resolved "https://registry.yarnpkg.com/@codechecks/client/-/client-0.1.10.tgz#41fe736c424976d9feb8116b131fb9c1f099d105" + integrity sha512-rvX+LknmMohsLTU8mHJqIcNTo8fKfw6A5i7JvT6JJWqwCLi+TujHpRO8BLf48iF96+gU5viVvKfRaUyhc3wloA== + dependencies: + bluebird "^3.5.3" + chalk "^2.4.2" + commander "^2.19.0" + debug "^4.1.1" + execa "^1.0.0" + glob "^7.1.3" + graceful-fs "^4.1.15" + js-yaml "^3.13.1" + json5 "^2.1.0" + lodash "^4.17.11" + marked "^0.7.0" + marked-terminal "^3.3.0" + mkdirp "^0.5.1" + ms "^2.1.1" + promise "^8.0.2" + request "^2.88.0" + request-promise "^4.2.2" + ts-essentials "^1.0.2" + ts-node "^8.0.2" + url-join "^4.0.0" + "@ethersproject/abi@^5.0.0-beta.146": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.1.tgz#b6ba2bfb4278fbd6328b608e09741c2475ddad9c" - integrity sha512-9fqSa3jEYV4nN8tijW+jz4UnT/Ma9/b8y4+nHlsvuWqr32E2kYsT9SCIVpk/51iM6NOud7xsA6UxCox9zBeHKg== - dependencies: - "@ethersproject/address" "^5.0.0" - "@ethersproject/bignumber" "^5.0.0" - "@ethersproject/bytes" "^5.0.0" - "@ethersproject/constants" "^5.0.0" - "@ethersproject/hash" "^5.0.0" - "@ethersproject/keccak256" "^5.0.0" - "@ethersproject/logger" "^5.0.0" - "@ethersproject/properties" "^5.0.0" - "@ethersproject/strings" "^5.0.0" - -"@ethersproject/address@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.1.tgz#882424fbbec1111abc1aa3482e647a72683c5377" - integrity sha512-kfQtXpBP2pI2TfoRRAYv8grHGiYw8U0c1KbMsC58/W33TIBy7gFSf/oAzOd94lNzdIUenKU0OuSzrHQfVcDDDA== - dependencies: - "@ethersproject/bignumber" "^5.0.0" - "@ethersproject/bytes" "^5.0.0" - "@ethersproject/keccak256" "^5.0.0" - "@ethersproject/logger" "^5.0.0" - "@ethersproject/rlp" "^5.0.0" + version "5.0.0-beta.152" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.0-beta.152.tgz#371cd363c9d2df7ca23dcf970cd9c47ac776f1e9" + integrity sha512-+1+ukofyBYNJo8IdIK8lBENkEycgXW1ny1zWT7oYD8GKvczYYrgucRQnJPgt3u9MJYZdje4yxDQFoGd6d4BpRA== + dependencies: + "@ethersproject/address" ">=5.0.0-beta.128" + "@ethersproject/bignumber" ">=5.0.0-beta.130" + "@ethersproject/bytes" ">=5.0.0-beta.129" + "@ethersproject/constants" ">=5.0.0-beta.128" + "@ethersproject/hash" ">=5.0.0-beta.128" + "@ethersproject/keccak256" ">=5.0.0-beta.127" + "@ethersproject/logger" ">=5.0.0-beta.129" + "@ethersproject/properties" ">=5.0.0-beta.131" + "@ethersproject/strings" ">=5.0.0-beta.130" + +"@ethersproject/address@>=5.0.0-beta.128": + version "5.0.0-beta.133" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.0-beta.133.tgz#b6bf2c298da5701c61038e4cdfac2e0038b884ce" + integrity sha512-7SjGhZ3xClqlmzqNNzESKlHbBeEzDWXIeKUBbSzK3Ce9PgK6uboiNe53fgqzhrRVOMhD1J4Q+oIm4DsTv37FWg== + dependencies: + "@ethersproject/bignumber" ">=5.0.0-beta.130" + "@ethersproject/bytes" ">=5.0.0-beta.129" + "@ethersproject/keccak256" ">=5.0.0-beta.127" + "@ethersproject/logger" ">=5.0.0-beta.129" + "@ethersproject/rlp" ">=5.0.0-beta.126" bn.js "^4.4.0" -"@ethersproject/bignumber@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.1.tgz#85edb1026310633ef566cc379e3e0026697f6e6e" - integrity sha512-srGDO7ksT0avdDw5pBtj6F81psv5xiJMInwSSatfIKplitubFb6yVwoHGObGRd0Pp3TvrkIDfJkuskoSMj4OHQ== +"@ethersproject/bignumber@>=5.0.0-beta.130": + version "5.0.0-beta.135" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.0-beta.135.tgz#9d464df8967f5d314d109497e4f25ab82314c098" + integrity sha512-7Tw2NgHzK7o+70bwyoaIZCbRycz+saWNU0sLOYnis3qYXwYsdTL+Rm0PMGA2v4jyHJt7BPS2pxGww+akVXbX+w== dependencies: - "@ethersproject/bytes" "^5.0.0" - "@ethersproject/logger" "^5.0.0" - "@ethersproject/properties" "^5.0.0" + "@ethersproject/bytes" ">=5.0.0-beta.129" + "@ethersproject/logger" ">=5.0.0-beta.129" + "@ethersproject/properties" ">=5.0.0-beta.131" bn.js "^4.4.0" -"@ethersproject/bytes@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.1.tgz#da8cd9b3e3b2800be9b46fda7036fc441b334680" - integrity sha512-Y198536UW9Jb9RBXuqmCsCa9mYJUsxJn+5aGr2XjNMpLBc6vEn/44GHnbQXYgRCzh4rnWtJ9bTgSwDjme9Hgnw== +"@ethersproject/bytes@>=5.0.0-beta.129": + version "5.0.0-beta.134" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.0-beta.134.tgz#eb6b9a200be02d6d539f90086fbfad26ec63d0d5" + integrity sha512-2BULy5x0BuHPRzuGjEYWndJieDaRAaZUbMk53fZjH4yjhKMHDGADQQOtaSD4wN+H183YOXMGdtlCrRGJ1N+uNg== dependencies: - "@ethersproject/logger" "^5.0.0" + "@ethersproject/logger" ">=5.0.0-beta.129" -"@ethersproject/constants@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.1.tgz#51426b1d673661e905418ddeefca1f634866860d" - integrity sha512-Xec07hFCPN4wfC3WDiRay7KipkApl2msiKTrBHCuAwNMOM8M92+mlQp8tgfEL51DPwCZkmdk1f02kArc6caVSw== +"@ethersproject/constants@>=5.0.0-beta.128": + version "5.0.0-beta.132" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.0-beta.132.tgz#068cc97493fbc1543299bda79e0e726310e129a4" + integrity sha512-ioO7Ez8Xatk5z3lVzzEhRjXng1le1sTzfuD3v8gUozrzgLXyl0X81Go1Nadj7qPgo68HziIFcm5kRFp4SdJa0A== dependencies: - "@ethersproject/bignumber" "^5.0.0" + "@ethersproject/bignumber" ">=5.0.0-beta.130" -"@ethersproject/hash@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.1.tgz#8190240d250b9442dd25f1e8ec2d66e7d0d38237" - integrity sha512-1ByUXYvkszrSSks07xctBtZfpFnIVmftxWlAAnguxh6Q65vKECd/EPi5uI5xVOvnrYMH9Vb8MK1SofPX/6fArQ== +"@ethersproject/hash@>=5.0.0-beta.128": + version "5.0.0-beta.133" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.0-beta.133.tgz#bda0c74454a82359642033f27c5157963495fcdf" + integrity sha512-tfF11QxFlJCy92rMtUZ0kImchWhlYXkN5Gj5cYfTcCdWEUKwNq1LljDnlrjV2JabO6s5enb8uiUj4RBTo2+Rgw== dependencies: - "@ethersproject/bytes" "^5.0.0" - "@ethersproject/keccak256" "^5.0.0" - "@ethersproject/logger" "^5.0.0" - "@ethersproject/strings" "^5.0.0" + "@ethersproject/bytes" ">=5.0.0-beta.129" + "@ethersproject/keccak256" ">=5.0.0-beta.127" + "@ethersproject/logger" ">=5.0.0-beta.129" + "@ethersproject/strings" ">=5.0.0-beta.130" -"@ethersproject/keccak256@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.1.tgz#be91c11a8bdf4e94c8b900502d2a46b223fbdeb3" - integrity sha512-AtFm/4qHRQUvZcG3WYmaT7zV79dz72+N01w0XphcIBaD/7UZXyW85Uf08sirVlckHmh9fvc4UDWyHiroKsBT6Q== +"@ethersproject/keccak256@>=5.0.0-beta.127": + version "5.0.0-beta.131" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.0-beta.131.tgz#b5778723ee75208065b9b9ad30c71d480f41bb31" + integrity sha512-KQnqMwGV0IMOjAr/UTFO8DuLrmN1uaMvcV3zh9hiXhh3rCuY+WXdeUh49w1VQ94kBKmaP0qfGb7z4SdhUWUHjw== dependencies: - "@ethersproject/bytes" "^5.0.0" + "@ethersproject/bytes" ">=5.0.0-beta.129" js-sha3 "0.5.7" -"@ethersproject/logger@^5.0.0": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.2.tgz#f24aa14a738a428d711c1828b44d50114a461b8b" - integrity sha512-NQe3O1/Nwkcp6bto6hsTvrcCeR/cOGK+RhOMn0Zi2FND6gdWsf1g+5ie8gQ1REqDX4MTGP/Y131dZas985ls/g== +"@ethersproject/logger@>=5.0.0-beta.129": + version "5.0.0-beta.133" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.0-beta.133.tgz#2d62d495ed413c7045054d4f99a0fb4920079b2e" + integrity sha512-1ISf7rFKFbMHlEB37JS7Oy3FgFlvzF2Ze2uFZMJHGKp9xgDvFy1VHNMBM1KrJPK4AqCZXww0//e2keLsN3g/Cw== -"@ethersproject/properties@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.1.tgz#e1fecbfcb24f23bf3b64a2ac74f2751113d116e0" - integrity sha512-b3VZ/NpYIf64/hFXeWNxVCbY1xoMPIYM3n6Qnu6Ayr3bLt1olFPQfAaaRB0aOsLz7tMtmkT3DrA1KG/IrOgBRw== +"@ethersproject/properties@>=5.0.0-beta.131": + version "5.0.0-beta.135" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.0-beta.135.tgz#51a0a5d72ca034b5ae845d43ed409eb3576a3ca7" + integrity sha512-R4ROFaFh86n09eE+MWMPzaB87V5OSgqu0gtQ7LjUvkFF3eqdpdvLVD4N93hvCKNZcjGHI4WmazDUlpuXZVgDkA== dependencies: - "@ethersproject/logger" "^5.0.0" + "@ethersproject/logger" ">=5.0.0-beta.129" -"@ethersproject/rlp@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.1.tgz#3407b0cb78f82a1a219aecff57578c0558ae26c8" - integrity sha512-3F8XE1zS4w8w4xiK1hMtFuVs6UnhQlmrEHLT85GanqK8vG5wGi81IQmkukL9tQIu2a5jykoO46ibja+6N1fpFg== +"@ethersproject/rlp@>=5.0.0-beta.126": + version "5.0.0-beta.131" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.0-beta.131.tgz#4a0c0c314e26ed7f01be6bca16308d629a8022d2" + integrity sha512-sUJUGbywlnuk2frkSWzWiGenTrwOnrKQaNKJqjCGmK35x0WIzcR4/1gC6jWa0hpWJT6Seq6J6SCT5CS+ZWCFNw== dependencies: - "@ethersproject/bytes" "^5.0.0" - "@ethersproject/logger" "^5.0.0" + "@ethersproject/bytes" ">=5.0.0-beta.129" -"@ethersproject/strings@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.1.tgz#a93aafeede100c4aad7f48e25aad1ddc42eeccc7" - integrity sha512-N8LxdHGBT7GZdogkEOV5xKXYTz5PNHuNzcxLNPYfH3kpvWSyXshZBgAz8YE1a8sMZagGj+Ic6d3mHijdCTSkGA== +"@ethersproject/strings@>=5.0.0-beta.130": + version "5.0.0-beta.135" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.0-beta.135.tgz#7754a805831383bf1838cd097d26c6135e96a745" + integrity sha512-MiZSJPhAQggXb3XA/XS4jmwmj5CsknMXk/XIzNZB7eYqEGA2i7sQV7+o6DOE+3lq5k5BhB8OaDziogNCOGAouA== dependencies: - "@ethersproject/bytes" "^5.0.0" - "@ethersproject/constants" "^5.0.0" - "@ethersproject/logger" "^5.0.0" + "@ethersproject/bytes" ">=5.0.0-beta.129" + "@ethersproject/constants" ">=5.0.0-beta.128" + "@ethersproject/logger" ">=5.0.0-beta.129" "@nodelib/fs.scandir@2.1.3": version "2.1.3" @@ -146,10 +171,10 @@ fs-extra "^8.1.0" try-require "^1.2.1" -"@openzeppelin/contracts@^2.5.0": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-2.5.1.tgz#c76e3fc57aa224da3718ec351812a4251289db31" - integrity sha512-qIy6tLx8rtybEsIOAlrM4J/85s2q2nPkDqj/Rx46VakBZ0LwtFhXIVub96LXHczQX0vaqmAueDqNPXtbSXSaYQ== +"@openzeppelin/contracts@^3.0.2": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.1.0.tgz#bcea457ef89069fbe5a617f50b25b6a8272895d5" + integrity sha512-dVXDnUKxrAKLzPdCRkz+N8qsVkK1XxJ6kk3zuI6zaQmcKxN7CkizoDP7lXxcs/Mi2I0mxceTRjJBqlzFffLJrQ== "@openzeppelin/test-helpers@^0.5.6": version "0.5.6" @@ -212,9 +237,9 @@ integrity sha512-uRyvnvVYmgNmTBpWDbBsH/0kPESQhQpEc4KsvMRLVzFJ1o1s0uIv0Y6Y9IB5vI1Dwz2CbS4X/y4Wyw/75cTFnQ== "@solidity-parser/parser@^0.6.0": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.6.2.tgz#49707fc4e06649d39d6b25bdab2e9093d372ce50" - integrity sha512-kUVUvrqttndeprLoXjI5arWHeiP3uh4XODAKbG+ZaWHCVQeelxCbnXBeWxZ2BPHdXgH0xR9dU1b916JhDhbgAA== + version "0.6.0" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.6.0.tgz#deb964a4dbb8c21a342ee35b4acefb505fd04ea1" + integrity sha512-RiJXfS22frulogcfQCFhbKrd5ATu6P4tYUv/daChiIh6VHyKQ1kkVZVfX6aP7c2YGU/Bf9RwGNKdwLjfpaoqYQ== "@szmarczak/http-timer@^1.1.2": version "1.1.2" @@ -231,9 +256,9 @@ source-map-support "^0.5.16" "@truffle/contract-schema@^3.1.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.2.0.tgz#4ddd43cf3eda11ec82bb2661725a19c2f4326e96" - integrity sha512-yeb4UoK9cbrT5/Nuz0I0p2XKbf0K1wEmyyBQmo3Q4JOrLidxf59LtDupo9Uq74RtlTAxZC0cy9DnsfWeWVma4A== + version "3.2.2" + resolved "https://registry.yarnpkg.com/@truffle/contract-schema/-/contract-schema-3.2.2.tgz#c79be86b291e7cffcf7e3d18c6a4ed7371a7185e" + integrity sha512-G+rjOSa+Cbat6KGk9TXQm7PNiwVmYQT7QyETy6EjfKEN7vy3xWAmDWDma8JTHge8d/nyrlWg8ICBtIWqcYPmfw== dependencies: ajv "^6.10.0" crypto-js "^3.1.9-1" @@ -279,9 +304,9 @@ web3 "1.2.2" "@truffle/interface-adapter@^0.4.6": - version "0.4.9" - resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.4.9.tgz#f00cdbeee62a9262c3c53ba5b5d8ae5dd18d08c8" - integrity sha512-2dYccf7lAwx90NVYmn89QABpd3dx7BxvDAaHgzVa2YVOUkTUpkZiaIsD2YlsVQ1rew17wMNi5WXH2RFnmzQ82A== + version "0.4.12" + resolved "https://registry.yarnpkg.com/@truffle/interface-adapter/-/interface-adapter-0.4.12.tgz#d4ee7296e8e0ab4a1293839a70b2e6ee4d17dc03" + integrity sha512-YqPyvUnhBI41MA8ZI97EsXWJbiHyp4qkW41o/FB7VlA4ZDCcGlOeN0UVZD6AQmDrBBhgNR/l0Tg7/aHsbE/Q1A== dependencies: bn.js "^4.11.8" ethers "^4.0.32" @@ -411,12 +436,17 @@ accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-jsx@^5.2.0: +acorn-jsx@^5.0.0, acorn-jsx@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== -acorn@^7.2.0: +acorn@^6.0.7: + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== + +acorn@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== @@ -431,16 +461,6 @@ aes-js@3.0.0: resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d" integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0= -ajv@^5.2.2: - version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: version "6.10.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" @@ -451,6 +471,16 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.6.1, ajv@^6.9.1: + version "6.12.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706" + integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -461,15 +491,20 @@ ansi-colors@3.2.3: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813" integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw== -ansi-colors@^3.2.1, ansi-colors@^3.2.3: +ansi-colors@4.1.1, ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-colors@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= +ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-regex@^3.0.0: version "3.0.0" @@ -501,19 +536,21 @@ ansi-styles@^4.1.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" +ansicolors@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" + integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= + +antlr4@4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.1.tgz#69984014f096e9e775f53dd9744bf994d8959773" + integrity sha512-haHyTW7Y9joE5MVs37P2lNYfU2RWBLfcRDD8OWldcdZm5TiCE91B5Xl1oWSwiDUSd4rlExpt2pu1fksYQjRBYQ== + any-promise@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - anymatch@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" @@ -527,18 +564,10 @@ app-module-path@^2.2.0: resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5" integrity sha1-ZBqlXft9am8KgUHEucCqULbCTdU= -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== argparse@^1.0.7: version "1.0.10" @@ -547,28 +576,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= - dependencies: - arr-flatten "^1.0.1" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= - -arr-flatten@^1.0.1, arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -588,16 +595,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= - array.prototype.flat@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" @@ -606,6 +603,16 @@ array.prototype.flat@^1.2.3: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" +array.prototype.map@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.2.tgz#9a4159f416458a23e9483078de1106b2ef68f8ec" + integrity sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + es-array-method-boxes-properly "^1.0.0" + is-string "^1.0.4" + asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -637,21 +644,16 @@ assertion-error@^1.1.0: resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= +ast-parents@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/ast-parents/-/ast-parents-0.0.1.tgz#508fd0f05d0c48775d9eccda2e174423261e8dd3" + integrity sha1-UI/Q8F0MSHddnszaLhdEIyYejdM= astral-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== -async-each@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" - integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== - async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" @@ -667,11 +669,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -atob@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -692,19 +689,6 @@ base64-js@^1.0.2: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" @@ -722,11 +706,6 @@ bignumber.js@^7.2.1: resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f" integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ== -binary-extensions@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" - integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== - binary-extensions@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c" @@ -754,7 +733,7 @@ bl@^1.0.0: readable-stream "^2.3.5" safe-buffer "^5.1.1" -bluebird@^3.4.7, bluebird@^3.5.0: +bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.3: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -793,31 +772,6 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - braces@^3.0.1, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -830,11 +784,6 @@ brorand@^1.0.1: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= -browser-stdout@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f" - integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8= - browser-stdout@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" @@ -943,21 +892,6 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - cacheable-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" @@ -971,21 +905,43 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" +caller-callsite@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" + integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= + dependencies: + callsites "^2.0.0" + +caller-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" + integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= + dependencies: + caller-callsite "^2.0.0" + +callsites@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" + integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= + callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= - camelcase@^5.0.0: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== +cardinal@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505" + integrity sha1-fMEFXYItISlU0HsIXeolHMe8VQU= + dependencies: + ansicolors "~0.3.2" + redeyed "~2.1.0" + caseless@^0.12.0, caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -1008,7 +964,7 @@ chai@^4.2.0: pathval "^1.1.0" type-detect "^4.0.5" -chalk@^2.0.0, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1025,6 +981,11 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chardet@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" + integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== + "charenc@>= 0.0.1": version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" @@ -1050,21 +1011,20 @@ chokidar@3.3.0: optionalDependencies: fsevents "~2.1.1" -chokidar@^1.6.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= +chokidar@3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450" + integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg== dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.3.0" optionalDependencies: - fsevents "^1.0.0" + fsevents "~2.1.2" chownr@^1.1.1: version "1.1.3" @@ -1079,15 +1039,12 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" + restore-cursor "^2.0.0" cli-table3@^0.5.0: version "0.5.1" @@ -1099,14 +1056,17 @@ cli-table3@^0.5.0: optionalDependencies: colors "^1.1.2" -cliui@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" - integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== +cli-table@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23" + integrity sha1-9TsFJmqLGguTSz0IIebi3FkUriM= dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi "^2.0.0" + colors "1.0.3" + +cli-width@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== cliui@^5.0.0: version "5.0.0" @@ -1124,24 +1084,6 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -1166,6 +1108,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +colors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= + colors@^1.1.2: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -1183,22 +1130,17 @@ command-exists@^1.2.8: resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291" integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw== -commander@2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" - integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ== - -commander@2.15.1: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" - integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== +commander@2.18.0: + version "2.18.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970" + integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ== commander@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== -commander@^2.9.0, commander@~2.20.3: +commander@^2.19.0, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -1210,11 +1152,6 @@ commander@~2.8.1: dependencies: graceful-readlink ">= 1.0.0" -component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -1230,11 +1167,6 @@ concat-stream@^1.6.0, concat-stream@^1.6.2: readable-stream "^2.2.2" typedarray "^0.0.6" -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - contains-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" @@ -1274,11 +1206,6 @@ cookiejar@^2.1.1: resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA== -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= - core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -1292,6 +1219,16 @@ cors@^2.8.1: object-assign "^4" vary "^1" +cosmiconfig@^5.0.7: + version "5.2.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== + dependencies: + import-fresh "^2.0.0" + is-directory "^0.3.1" + js-yaml "^3.13.1" + parse-json "^4.0.0" + coveralls@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.1.0.tgz#13c754d5e7a2dd8b44fe5269e21ca394fb4d615b" @@ -1334,16 +1271,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^6.0.0: +cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== @@ -1410,35 +1338,28 @@ death@^1.1.0: resolved "https://registry.yarnpkg.com/death/-/death-1.1.0.tgz#01aa9c401edd92750514470b8266390c66c67318" integrity sha1-AaqcQB7dknUFFEcLgmY5DGbGcxg= -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.6.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - -debug@3.2.6, debug@^3.1.0, debug@^3.2.6: +debug@3.2.6, debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0: +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== dependencies: ms "^2.1.1" -decamelize@^1.1.1, decamelize@^1.2.0: +decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -1515,11 +1436,6 @@ deep-eql@^3.0.1: dependencies: type-detect "^4.0.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -1537,38 +1453,11 @@ define-properties@^1.1.2, define-properties@^1.1.3: dependencies: object-keys "^1.0.12" -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -1587,11 +1476,6 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-port@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" @@ -1600,16 +1484,16 @@ detect-port@^1.3.0: address "^1.0.1" debug "^2.6.0" -diff@3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" - integrity sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww== - -diff@3.5.0, diff@^3.5.0: +diff@3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== +diff@4.0.2, diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -1714,25 +1598,20 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: once "^1.4.0" enquirer@^2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.5.tgz#3ab2b838df0a9d8ab9e7dff235b0e8712ef92381" - integrity sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA== + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== dependencies: - ansi-colors "^3.2.1" + ansi-colors "^4.1.1" -eol@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/eol/-/eol-0.9.1.tgz#f701912f504074be35c6117a5c4ade49cd547acd" - integrity sha512-Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg== - -error-ex@^1.2.0: +error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0, es-abstract@^1.17.5: +es-abstract@^1.17.0, es-abstract@^1.17.4, es-abstract@^1.17.5: version "1.17.6" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a" integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw== @@ -1766,6 +1645,24 @@ es-abstract@^1.17.0-next.1: string.prototype.trimleft "^2.1.1" string.prototype.trimright "^2.1.1" +es-array-method-boxes-properly@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" + integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== + +es-get-iterator@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8" + integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ== + dependencies: + es-abstract "^1.17.4" + has-symbols "^1.0.1" + is-arguments "^1.0.4" + is-map "^2.0.1" + is-set "^2.0.1" + is-string "^1.0.5" + isarray "^2.0.5" + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -1893,6 +1790,14 @@ eslint-plugin-standard@^4.0.0: resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== +eslint-scope@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" + integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + eslint-scope@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" @@ -1901,6 +1806,13 @@ eslint-scope@^5.1.0: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-utils@^1.3.1: + version "1.4.3" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" + integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== + dependencies: + eslint-visitor-keys "^1.1.0" + eslint-utils@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd" @@ -1908,20 +1820,69 @@ eslint-utils@^2.0.0: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint-visitor-keys@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== +eslint@^5.6.0: + version "5.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" + integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== + dependencies: + "@babel/code-frame" "^7.0.0" + ajv "^6.9.1" + chalk "^2.1.0" + cross-spawn "^6.0.5" + debug "^4.0.1" + doctrine "^3.0.0" + eslint-scope "^4.0.3" + eslint-utils "^1.3.1" + eslint-visitor-keys "^1.0.0" + espree "^5.0.1" + esquery "^1.0.1" + esutils "^2.0.2" + file-entry-cache "^5.0.1" + functional-red-black-tree "^1.0.1" + glob "^7.1.2" + globals "^11.7.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + inquirer "^6.2.2" + js-yaml "^3.13.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.11" + minimatch "^3.0.4" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.2" + path-is-inside "^1.0.2" + progress "^2.0.0" + regexpp "^2.0.1" + semver "^5.5.1" + strip-ansi "^4.0.0" + strip-json-comments "^2.0.1" + table "^5.2.3" + text-table "^0.2.0" -eslint@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.3.1.tgz#76392bd7e44468d046149ba128d1566c59acbe19" - integrity sha512-cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA== +eslint@^7.5.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.5.0.tgz#9ecbfad62216d223b82ac9ffea7ef3444671d135" + integrity sha512-vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q== dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.10.0" @@ -1931,9 +1892,9 @@ eslint@^7.3.1: doctrine "^3.0.0" enquirer "^2.3.5" eslint-scope "^5.1.0" - eslint-utils "^2.0.0" - eslint-visitor-keys "^1.2.0" - espree "^7.1.0" + eslint-utils "^2.1.0" + eslint-visitor-keys "^1.3.0" + espree "^7.2.0" esquery "^1.2.0" esutils "^2.0.2" file-entry-cache "^5.0.1" @@ -1947,7 +1908,7 @@ eslint@^7.3.1: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.14" + lodash "^4.17.19" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -1960,26 +1921,35 @@ eslint@^7.3.1: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.1.0.tgz#a9c7f18a752056735bf1ba14cb1b70adc3a5ce1c" - integrity sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw== +espree@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" + integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A== + dependencies: + acorn "^6.0.7" + acorn-jsx "^5.0.0" + eslint-visitor-keys "^1.0.0" + +espree@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz#1c263d5b513dbad0ac30c4991b93ac354e948d69" + integrity sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g== dependencies: - acorn "^7.2.0" + acorn "^7.3.1" acorn-jsx "^5.2.0" - eslint-visitor-keys "^1.2.0" + eslint-visitor-keys "^1.3.0" esprima@2.7.x, esprima@^2.7.1: version "2.7.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE= -esprima@^4.0.0: +esprima@^4.0.0, esprima@~4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.2.0: +esquery@^1.0.1, esquery@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== @@ -2191,25 +2161,6 @@ ethjs-util@0.1.6: is-hex-prefixed "1.0.0" strip-hex-prefix "1.0.0" -ethlint@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/ethlint/-/ethlint-1.2.5.tgz#375b77d1e5971e7c574037e07ff7ddad8e17858f" - integrity sha512-x2nKK98zmd72SFWL3Ul1S6scWYf5QqG221N6/mFNMO661g7ASvTRINGIWVvHzsvflW6y4tvgMSjnTN5RCTuZug== - dependencies: - ajv "^5.2.2" - chokidar "^1.6.0" - colors "^1.1.2" - commander "^2.9.0" - diff "^3.5.0" - eol "^0.9.1" - js-string-escape "^1.0.1" - lodash "^4.14.2" - sol-digger "0.0.2" - sol-explore "1.6.1" - solium-plugin-security "0.1.1" - solparse "2.2.8" - text-table "^0.2.0" - eventemitter3@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" @@ -2223,19 +2174,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -2259,33 +2197,6 @@ exorcist@^1.0.1: mkdirp "~0.5.1" mold-source-map "~0.4.0" -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= - dependencies: - is-posix-bracket "^0.1.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= - dependencies: - fill-range "^2.1.0" - express@^4.14.0: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -2329,46 +2240,19 @@ ext@^1.1.2: dependencies: type "^2.0.0" -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= +external-editor@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== dependencies: - is-extglob "^1.0.0" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" + chardet "^0.7.0" + iconv-lite "^0.4.24" + tmp "^0.0.33" extsprintf@1.3.0: version "1.3.0" @@ -2380,16 +2264,21 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -fast-deep-equal@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= - fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + fast-glob@^3.0.3: version "3.2.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d" @@ -2413,11 +2302,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= fastq@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" - integrity sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA== + version "1.6.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.1.tgz#4570c74f2ded173e71cf0beb08ac70bb85826791" + integrity sha512-mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw== dependencies: - reusify "^1.0.0" + reusify "^1.0.4" fd-slicer@~1.1.0: version "1.1.0" @@ -2426,6 +2315,13 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + dependencies: + escape-string-regexp "^1.0.5" + file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -2453,32 +2349,6 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= - -fill-range@^2.1.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" - integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^3.0.0" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -2506,14 +2376,7 @@ find-up@3.0.0, find-up@^3.0.0: dependencies: locate-path "^3.0.0" -find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - dependencies: - locate-path "^2.0.0" - -find-up@^4.1.0: +find-up@4.1.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== @@ -2521,6 +2384,13 @@ find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^2.0.0, find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= + dependencies: + locate-path "^2.0.0" + flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" @@ -2542,18 +2412,6 @@ flatted@^2.0.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== -for-in@^1.0.1, for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= - dependencies: - for-in "^1.0.1" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -2582,13 +2440,6 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= - dependencies: - map-cache "^0.2.2" - fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -2645,15 +2496,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^1.0.0: - version "1.2.9" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" - integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== - dependencies: - nan "^2.12.1" - node-pre-gyp "^0.12.0" - -fsevents@~2.1.1: +fsevents@~2.1.1, fsevents@~2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== @@ -2686,25 +2529,6 @@ ganache-cli@^6.9.1: source-map-support "0.5.12" yargs "13.2.4" -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-caller-file@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" - integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== - get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -2747,11 +2571,6 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -2767,21 +2586,6 @@ ghost-testrpc@^0.0.2: chalk "^2.4.2" node-emoji "^1.10.0" -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= - dependencies: - is-glob "^2.0.0" - glob-parent@^5.0.0, glob-parent@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" @@ -2796,10 +2600,10 @@ glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob@7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== +glob@7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" + integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2808,10 +2612,10 @@ glob@7.1.2: once "^1.3.0" path-is-absolute "^1.0.0" -glob@7.1.3: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== +glob@7.1.6, glob@^7.0.0, glob@^7.1.2, glob@^7.1.3: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2831,18 +2635,6 @@ glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.1.3: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - global-modules@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" @@ -2867,6 +2659,11 @@ global@~4.3.0: min-document "^2.19.0" process "~0.5.1" +globals@^11.7.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + globals@^12.1.0: version "12.3.0" resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13" @@ -2925,21 +2722,21 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0: +graceful-fs@^4.1.10, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== +graceful-fs@^4.1.15: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + "graceful-readlink@>= 1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= -growl@1.10.3: - version "1.10.3" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f" - integrity sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q== - growl@1.10.5: version "1.10.5" resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" @@ -3006,42 +2803,6 @@ has-to-string-tag-x@^1.2.0: dependencies: has-symbol-support-x "^1.4.1" -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -3073,11 +2834,6 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -he@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" - integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= - he@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -3155,7 +2911,7 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -iconv-lite@0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3174,13 +2930,6 @@ ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -3191,6 +2940,14 @@ ignore@^5.1.1: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== +import-fresh@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" + integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= + dependencies: + caller-path "^2.0.0" + resolve-from "^3.0.0" + import-fresh@^3.0.0: version "3.2.1" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" @@ -3222,21 +2979,35 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.5, ini@~1.3.0: +ini@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== +inquirer@^6.2.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" + integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== + dependencies: + ansi-escapes "^3.2.0" + chalk "^2.4.2" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^3.0.3" + figures "^2.0.0" + lodash "^4.17.12" + mute-stream "0.0.7" + run-async "^2.2.0" + rxjs "^6.4.0" + string-width "^2.1.0" + strip-ansi "^5.1.0" + through "^2.3.6" + interpret@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - invert-kv@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" @@ -3247,32 +3018,16 @@ ipaddr.js@1.9.0: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" +is-arguments@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" + integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= - dependencies: - binary-extensions "^1.0.0" - is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -3280,11 +3035,6 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - is-buffer@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623" @@ -3305,84 +3055,21 @@ is-callable@^1.2.0: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - is-date-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= +is-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -3393,13 +3080,6 @@ is-function@^1.0.1: resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5" integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU= -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= - dependencies: - is-extglob "^1.0.0" - is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" @@ -3412,30 +3092,16 @@ is-hex-prefixed@1.0.0: resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" integrity sha1-fY035q135dEnFIkTxXPggtd39VQ= +is-map@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" + integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== + is-natural-number@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - dependencies: - kind-of "^3.0.2" - -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== - is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -3451,23 +3117,6 @@ is-plain-obj@^1.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= - is-regex@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" @@ -3487,12 +3136,17 @@ is-retry-allowed@^1.0.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== +is-set@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" + integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== + is-stream@^1.0.0, is-stream@^1.1.0, is-stream@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= -is-string@^1.0.5: +is-string@^1.0.4, is-string@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== @@ -3509,33 +3163,21 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: +isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -3549,6 +3191,19 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" +iterate-iterator@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.1.tgz#1693a768c1ddd79c969051459453f082fe82e9f6" + integrity sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw== + +iterate-value@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/iterate-value/-/iterate-value-1.0.2.tgz#935115bd37d006a52046535ebc8d07e9c9337f57" + integrity sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ== + dependencies: + es-get-iterator "^1.0.2" + iterate-iterator "^1.0.1" + js-sha3@0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.5.tgz#baf0c0e8c54ad5903447df96ade7a4a1bca79a4a" @@ -3564,11 +3219,6 @@ js-sha3@0.8.0, js-sha3@^0.8.0: resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q== -js-string-escape@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" - integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8= - js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -3582,6 +3232,14 @@ js-yaml@3.13.1, js-yaml@3.x, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.12.0, js-yaml@^3.13.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" + integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -3592,10 +3250,10 @@ json-buffer@3.0.0: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A= +json-parse-better-errors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== json-schema-traverse@^0.4.1: version "0.4.1" @@ -3624,6 +3282,13 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +json5@^2.1.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + dependencies: + minimist "^1.2.5" + jsonfile@^2.1.0: version "2.4.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" @@ -3680,26 +3345,7 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== @@ -3711,13 +3357,6 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" - lcid@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" @@ -3730,6 +3369,14 @@ lcov-parse@^1.0.0: resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0" integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A= +levn@^0.3.0, levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + levn@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" @@ -3738,14 +3385,6 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - load-json-file@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" @@ -3789,7 +3428,12 @@ lodash.toarray@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE= -lodash@^4.14.2, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15: +lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.19: + version "4.17.19" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" + integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + +lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -3816,14 +3460,6 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== -lru-cache@^4.0.1: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -3831,6 +3467,11 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" +make-error@^1.1.1: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -3838,27 +3479,27 @@ map-age-cleaner@^0.1.1: dependencies: p-defer "^1.0.0" -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - dependencies: - object-visit "^1.0.0" - markdown-table@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60" integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q== -math-random@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" - integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== +marked-terminal@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-3.3.0.tgz#25ce0c0299285998c7636beaefc87055341ba1bd" + integrity sha512-+IUQJ5VlZoAFsM5MHNT7g3RHSkA3eETqhRCdXv4niUMAKHQ7lb1yvAcuGPmm4soxhmtX13u4Li6ZToXtvSEH+A== + dependencies: + ansi-escapes "^3.1.0" + cardinal "^2.1.1" + chalk "^2.4.1" + cli-table "^0.3.1" + node-emoji "^1.4.1" + supports-hyperlinks "^1.0.1" + +marked@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e" + integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg== md5.js@^1.3.4: version "1.3.5" @@ -3874,13 +3515,6 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= - dependencies: - mimic-fn "^1.0.0" - mem@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" @@ -3910,44 +3544,6 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -micromatch@^3.1.10: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - micromatch@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" @@ -4058,15 +3654,7 @@ minizlib@^1.2.1: resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== dependencies: - minipass "^2.9.0" - -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" + minipass "^2.9.0" mkdirp-promise@^5.0.1: version "5.0.1" @@ -4075,7 +3663,7 @@ mkdirp-promise@^5.0.1: dependencies: mkdirp "*" -mkdirp@*, mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1: +mkdirp@*, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -4094,43 +3682,41 @@ mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" - integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== +mocha@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.0.1.tgz#fe01f0530362df271aa8f99510447bc38b88d8ed" + integrity sha512-vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg== dependencies: + ansi-colors "4.1.1" browser-stdout "1.3.1" - commander "2.15.1" - debug "3.1.0" - diff "3.5.0" + chokidar "3.3.1" + debug "3.2.6" + diff "4.0.2" escape-string-regexp "1.0.5" - glob "7.1.2" + find-up "4.1.0" + glob "7.1.6" growl "1.10.5" - he "1.1.1" + he "1.2.0" + js-yaml "3.13.1" + log-symbols "3.0.0" minimatch "3.0.4" - mkdirp "0.5.1" - supports-color "5.4.0" - -mocha@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794" - integrity sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA== - dependencies: - browser-stdout "1.3.0" - commander "2.11.0" - debug "3.1.0" - diff "3.3.1" - escape-string-regexp "1.0.5" - glob "7.1.2" - growl "1.10.3" - he "1.1.1" - mkdirp "0.5.1" - supports-color "4.4.0" + ms "2.1.2" + object.assign "4.1.0" + promise.allsettled "1.0.2" + serialize-javascript "3.0.0" + strip-json-comments "3.0.1" + supports-color "7.1.0" + which "2.0.2" + wide-align "1.1.3" + workerpool "6.0.0" + yargs "13.3.2" + yargs-parser "13.1.2" + yargs-unparser "1.6.0" mocha@^7.1.1: - version "7.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604" - integrity sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ== + version "7.1.2" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.2.tgz#8e40d198acf91a52ace122cd7599c9ab857b29e6" + integrity sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA== dependencies: ansi-colors "3.2.3" browser-stdout "1.3.1" @@ -4180,12 +3766,17 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -ms@^2.1.1: +ms@2.1.2, ms@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -nan@^2.12.1, nan@^2.14.0, nan@^2.2.1: +mute-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + +nan@^2.14.0, nan@^2.2.1: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== @@ -4195,37 +3786,11 @@ nano-json-stream-parser@^0.1.2: resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f" integrity sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18= -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -4246,7 +3811,7 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-emoji@^1.10.0: +node-emoji@^1.10.0, node-emoji@^1.4.1: version "1.10.0" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da" integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw== @@ -4261,22 +3826,6 @@ node-environment-flags@1.0.6: object.getownpropertydescriptors "^2.0.3" semver "^5.7.0" -node-pre-gyp@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" - integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - nopt@3.x: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -4284,14 +3833,6 @@ nopt@3.x: dependencies: abbrev "1" -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -4302,13 +3843,6 @@ normalize-package-data@^2.3.2: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-path@^2.0.0, normalize-path@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= - dependencies: - remove-trailing-separator "^1.0.1" - normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" @@ -4319,19 +3853,6 @@ normalize-url@^4.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== -npm-bundled@^1.0.1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" - integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g== - -npm-packlist@^1.1.6: - version "1.4.6" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz#53ba3ed11f8523079f1457376dd379ee4ea42ff4" - integrity sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -4339,21 +3860,6 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - number-to-bn@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/number-to-bn/-/number-to-bn-1.7.0.tgz#bb3623592f7e5f9e0030b1977bd41a0c53fe1ea0" @@ -4372,15 +3878,6 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1 resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - object-inspect@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" @@ -4391,13 +3888,6 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - object.assign@4.1.0, object.assign@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" @@ -4416,21 +3906,6 @@ object.getownpropertydescriptors@^2.0.3: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= - dependencies: - isobject "^3.0.1" - object.values@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" @@ -4462,6 +3937,13 @@ once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + dependencies: + mimic-fn "^1.0.0" + optimist@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" @@ -4470,7 +3952,7 @@ optimist@^0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" -optionator@^0.8.1: +optionator@^0.8.1, optionator@^0.8.2: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== @@ -4499,20 +3981,6 @@ original-require@1.0.1: resolved "https://registry.yarnpkg.com/original-require/-/original-require-1.0.1.tgz#0f130471584cd33511c5ec38c8d59213f9ac5e20" integrity sha1-DxMEcVhM0zURxew4yNWSE/msXiA= -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA== - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - os-locale@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" @@ -4522,19 +3990,11 @@ os-locale@^3.1.0: lcid "^2.0.0" mem "^4.0.0" -os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: +os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" @@ -4641,16 +4101,6 @@ parse-cache-control@^1.0.1: resolved "https://registry.yarnpkg.com/parse-cache-control/-/parse-cache-control-1.0.1.tgz#8eeab3e54fa56920fe16ba38f77fa21aacc2d74e" integrity sha1-juqz5U+laSD+Fro493+iGqzC104= -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - parse-headers@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515" @@ -4663,16 +4113,19 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -4688,6 +4141,11 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= +path-is-inside@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= + path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -4736,11 +4194,6 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -pegjs@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/pegjs/-/pegjs-0.10.0.tgz#cf8bafae6eddff4b5a7efb185269eaaf4610ddbd" - integrity sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0= - pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" @@ -4751,7 +4204,7 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4: +picomatch@^2.0.4, picomatch@^2.0.7: version "2.2.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== @@ -4795,11 +4248,6 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -4820,10 +4268,10 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= +prettier@^1.14.3: + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== process-nextick-args@~2.0.0: version "2.0.1" @@ -4840,6 +4288,17 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +promise.allsettled@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.2.tgz#d66f78fbb600e83e863d893e98b3d4376a9c47c9" + integrity sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg== + dependencies: + array.prototype.map "^1.0.1" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + iterate-value "^1.0.0" + promise@^8.0.0: version "8.0.3" resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz#f592e099c6cddc000d538ee7283bb190452b0bf6" @@ -4847,6 +4306,13 @@ promise@^8.0.0: dependencies: asap "~2.0.6" +promise@^8.0.2: + version "8.1.0" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" + integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== + dependencies: + asap "~2.0.6" + proxy-addr@~2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" @@ -4855,11 +4321,6 @@ proxy-addr@~2.0.5: forwarded "~0.1.2" ipaddr.js "1.9.0" -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - psl@^1.1.24, psl@^1.1.28: version "1.6.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110" @@ -4924,15 +4385,6 @@ query-string@^5.0.1: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -randomatic@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" - integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== - dependencies: - is-number "^4.0.0" - kind-of "^6.0.0" - math-random "^1.0.1" - randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -4968,16 +4420,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-pkg-up@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" @@ -4995,7 +4437,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5: +readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -5008,15 +4450,6 @@ readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readdirp@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== - dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" - readdirp@~3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839" @@ -5024,6 +4457,13 @@ readdirp@~3.2.0: dependencies: picomatch "^2.0.4" +readdirp@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17" + integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ== + dependencies: + picomatch "^2.0.7" + rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" @@ -5038,20 +4478,17 @@ recursive-readdir@^2.2.2: dependencies: minimatch "3.0.4" -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== +redeyed@~2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b" + integrity sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs= dependencies: - is-equal-shallow "^0.1.3" + esprima "~4.0.0" -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" +regexpp@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" + integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== regexpp@^3.0.0: version "3.0.0" @@ -5063,21 +4500,6 @@ regexpp@^3.1.0: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - -repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== - -repeat-string@^1.5.2, repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= - req-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/req-cwd/-/req-cwd-2.0.0.tgz#d4082b4d44598036640fb73ddea01ed53db49ebc" @@ -5099,6 +4521,13 @@ request-promise-core@1.1.3: dependencies: lodash "^4.17.15" +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== + dependencies: + lodash "^4.17.19" + request-promise-native@^1.0.5: version "1.0.8" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" @@ -5108,6 +4537,16 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.1" tough-cookie "^2.3.3" +request-promise@^4.2.2: + version "4.2.6" + resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.6.tgz#7e7e5b9578630e6f598e3813c0f8eb342a27f0a2" + integrity sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ== + dependencies: + bluebird "^3.5.0" + request-promise-core "1.1.4" + stealthy-require "^1.1.1" + tough-cookie "^2.3.3" + request@^2.79.0, request@^2.85.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" @@ -5170,11 +4609,6 @@ require-from-string@^2.0.0: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= - require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -5190,11 +4624,6 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= - resolve@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" @@ -5221,12 +4650,15 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" -reusify@^1.0.0: +reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== @@ -5238,7 +4670,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.2.8, rimraf@^2.6.1: +rimraf@^2.2.8: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -5260,11 +4692,23 @@ rlp@^2.0.0, rlp@^2.2.3: dependencies: bn.js "^4.11.1" +run-async@^2.2.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== + run-parallel@^1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q== +rxjs@^6.4.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84" + integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg== + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -5275,23 +4719,11 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= - dependencies: - ret "~0.1.10" - "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - sc-istanbul@^0.4.5: version "0.4.5" resolved "https://registry.yarnpkg.com/sc-istanbul/-/sc-istanbul-0.4.5.tgz#1896066484d55336cf2cdbcc7884dc79da50dc76" @@ -5355,7 +4787,7 @@ seek-bzip@^1.0.5: dependencies: commander "~2.8.1" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0: +"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -5394,6 +4826,11 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" +serialize-javascript@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e" + integrity sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw== + serve-static@1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" @@ -5415,21 +4852,11 @@ servify@^0.1.12: request "^2.79.0" xhr "^2.3.3" -set-blocking@^2.0.0, set-blocking@~2.0.0: +set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - setimmediate@1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.4.tgz#20e81de622d4a02588ce0c8da8973cbcf1d3138f" @@ -5499,6 +4926,11 @@ signal-exit@^3.0.0: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= +signal-exit@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + simple-concat@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6" @@ -5527,50 +4959,10 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -sol-digger@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/sol-digger/-/sol-digger-0.0.2.tgz#406c4a9d31e269e7f88eb1c2ea101318e5e09025" - integrity sha1-QGxKnTHiaef4jrHC6hATGOXgkCU= - -sol-explore@1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/sol-explore/-/sol-explore-1.6.1.tgz#b59f073c69fe332560d5a10c32ba8ca7f2986cfb" - integrity sha1-tZ8HPGn+MyVg1aEMMrqMp/KYbPs= - -solc@^0.5.17: - version "0.5.17" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.17.tgz#8a76c50e98d49ca7610cca2fdc78ff3016540c67" - integrity sha512-qpX+PGaU0Q3c6lh2vDzMoIbhv6bIrecI4bYsx+xUs01xsGFnY6Nr0L8y/QMyutTnrHN6Lb/Yl672ZVRqxka96w== +solc@^0.6.12: + version "0.6.12" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.6.12.tgz#48ac854e0c729361b22a7483645077f58cba080e" + integrity sha512-Lm0Ql2G9Qc7yPP2Ba+WNmzw2jwsrd3u4PobHYlSOxaut3TtUbj9+5ZrT6f4DUpNPEoBaFUOEg9Op9C0mk7ge9g== dependencies: command-exists "^1.2.8" commander "3.0.2" @@ -5581,6 +4973,28 @@ solc@^0.5.17: semver "^5.5.0" tmp "0.0.33" +solhint@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/solhint/-/solhint-3.1.0.tgz#50d58c9af921a01350164350144a9809d5ec2975" + integrity sha512-Cc0wqKzg0NviDF7H5zsrGJ/hVwwkGqi0Hkc3YtedTev4alkJv4YADdJg4y586MpfEvMX4QPp7LugsmJzoeChkQ== + dependencies: + "@solidity-parser/parser" "^0.6.0" + ajv "^6.6.1" + antlr4 "4.7.1" + ast-parents "0.0.1" + chalk "^2.4.2" + commander "2.18.0" + cosmiconfig "^5.0.7" + eslint "^5.6.0" + fast-diff "^1.1.2" + glob "^7.1.3" + ignore "^4.0.6" + js-yaml "^3.12.0" + lodash "^4.17.11" + semver "^6.3.0" + optionalDependencies: + prettier "^1.14.3" + solidity-coverage@^0.7.9: version "0.7.9" resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.7.9.tgz#6d1c40639066b93c67b21da48f4bc27ae01f0e58" @@ -5605,31 +5019,6 @@ solidity-coverage@^0.7.9: shelljs "^0.8.3" web3 "1.2.6" -solium-plugin-security@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/solium-plugin-security/-/solium-plugin-security-0.1.1.tgz#2a87bcf8f8c3abf7d198e292e4ac080284e3f3f6" - integrity sha512-kpLirBwIq4mhxk0Y/nn5cQ6qdJTI+U1LO3gpoNIcqNaW+sI058moXBe2UiHs+9wvF9IzYD49jcKhFTxcR9u9SQ== - -solparse@2.2.8: - version "2.2.8" - resolved "https://registry.yarnpkg.com/solparse/-/solparse-2.2.8.tgz#d13e42dbed95ce32f43894f5ec53f00d14cf9f11" - integrity sha512-Tm6hdfG72DOxD40SD+T5ddbekWglNWjzDRSNq7ZDIOHVsyaJSeeunUuWNj4DE7uDrJK3tGQuX0ZTDZWNYsGPMA== - dependencies: - mocha "^4.0.1" - pegjs "^0.10.0" - yargs "^10.0.3" - -source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== - dependencies: - atob "^2.1.1" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - source-map-support@0.5.12: version "0.5.12" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" @@ -5638,7 +5027,7 @@ source-map-support@0.5.12: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@^0.5.16, source-map-support@^0.5.19: +source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== @@ -5646,16 +5035,6 @@ source-map-support@^0.5.16, source-map-support@^0.5.19: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= - -source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -5694,13 +5073,6 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -5721,14 +5093,6 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -5744,16 +5108,7 @@ strict-uri-encode@^1.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -5809,13 +5164,6 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" @@ -5861,29 +5209,20 @@ strip-hex-prefix@1.0.0: dependencies: is-hex-prefixed "1.0.0" -strip-json-comments@2.0.1, strip-json-comments@~2.0.1: +strip-json-comments@2.0.1, strip-json-comments@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -strip-json-comments@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180" - integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w== - -supports-color@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e" - integrity sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ== - dependencies: - has-flag "^2.0.0" +strip-json-comments@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" + integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== -supports-color@5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w== - dependencies: - has-flag "^3.0.0" +strip-json-comments@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== supports-color@6.0.0: version "6.0.0" @@ -5892,6 +5231,13 @@ supports-color@6.0.0: dependencies: has-flag "^3.0.0" +supports-color@7.1.0, supports-color@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + supports-color@^3.1.0: version "3.2.3" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" @@ -5899,19 +5245,20 @@ supports-color@^3.1.0: dependencies: has-flag "^1.0.0" -supports-color@^5.3.0: +supports-color@^5.0.0, supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" - integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== +supports-hyperlinks@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz#71daedf36cc1060ac5100c351bb3da48c29c0ef7" + integrity sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw== dependencies: - has-flag "^4.0.0" + has-flag "^2.0.0" + supports-color "^5.0.0" swarm-js@0.1.39: version "0.1.39" @@ -5970,7 +5317,7 @@ tar-stream@^1.5.2: to-buffer "^1.1.1" xtend "^4.0.0" -tar@^4, tar@^4.0.2: +tar@^4.0.2: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -6005,7 +5352,7 @@ then-request@^6.0.0: promise "^8.0.0" qs "^6.4.0" -through@^2.3.8: +through@^2.3.6, through@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -6020,7 +5367,7 @@ timed-out@^4.0.0, timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= -tmp@0.0.33: +tmp@0.0.33, tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== @@ -6032,26 +5379,11 @@ to-buffer@^1.1.1: resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= - dependencies: - kind-of "^3.0.2" - to-readable-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -6059,16 +5391,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" @@ -6101,13 +5423,13 @@ truffle-flattener@^1.4.4: mkdirp "^1.0.4" tsort "0.0.1" -truffle@^5.1.32: - version "5.1.32" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.32.tgz#01d73df23f28007ddb8d32c0560e7d0fe8ff60d1" - integrity sha512-wrMQDvZ1P4FrSIc9CUCD6y1mTtK7bUDgJSW1k1r33BBtzqyJ5oKoZ30IgickUW669gABClYDMk6tj5gVrmZCng== +truffle@^5.1.35: + version "5.1.35" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.35.tgz#9b3adfd3aca1a3b6dd00874bc57d7569a3e3b89c" + integrity sha512-N2b/3OF84c/4jqmPJ4JgQU1g91Cai4JMKdJ3HLUsmEKmo1LZ84+Y0UIeVBFjWHtTX6H7/oXlvZ59xUVzxXyAsg== dependencies: app-module-path "^2.2.0" - mocha "5.2.0" + mocha "8.0.1" original-require "1.0.1" try-require@^1.2.1: @@ -6115,6 +5437,22 @@ try-require@^1.2.1: resolved "https://registry.yarnpkg.com/try-require/-/try-require-1.2.1.tgz#34489a2cac0c09c1cc10ed91ba011594d4333be2" integrity sha1-NEiaLKwMCcHMEO2RugEVlNQzO+I= +ts-essentials@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-1.0.4.tgz#ce3b5dade5f5d97cf69889c11bf7d2da8555b15a" + integrity sha512-q3N1xS4vZpRouhYHDPwO0bDW3EZ6SK9CrrDHxi/D6BPReSjpVgWIOpLS2o0gSBZm+7q/wyKp6RVM1AeeW7uyfQ== + +ts-node@^8.0.2: + version "8.10.2" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" + integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA== + dependencies: + arg "^4.1.0" + diff "^4.0.1" + make-error "^1.1.1" + source-map-support "^0.5.17" + yn "3.1.1" + tsconfig-paths@^3.9.0: version "3.9.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" @@ -6125,6 +5463,11 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" +tslib@^1.9.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" + integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== + tsort@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tsort/-/tsort-0.0.1.tgz#e2280f5e817f8bf4275657fd0f9aebd44f5a2786" @@ -6222,16 +5565,6 @@ underscore@1.9.1, underscore@^1.8.3: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg== -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -6242,14 +5575,6 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - uri-js@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" @@ -6257,10 +5582,10 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= +url-join@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" + integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== url-parse-lax@^1.0.0: version "1.0.0" @@ -6286,11 +5611,6 @@ url-to-options@^1.0.1: resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - utf8@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" @@ -7315,14 +6635,14 @@ which@1.3.1, which@^1.1.1, which@^1.2.9, which@^1.3.1: dependencies: isexe "^2.0.0" -which@^2.0.1: +which@2.0.2, which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -wide-align@1.1.3, wide-align@^1.1.0: +wide-align@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== @@ -7344,13 +6664,10 @@ wordwrap@~0.0.2: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" +workerpool@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58" + integrity sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA== wrap-ansi@^5.1.0: version "5.1.0" @@ -7429,11 +6746,6 @@ xtend@^4.0.0: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= - y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" @@ -7444,11 +6756,6 @@ yaeti@^0.0.6: resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" integrity sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc= -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= - yallist@^3.0.0, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" @@ -7470,13 +6777,6 @@ yargs-parser@^13.1.0: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" - integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ== - dependencies: - camelcase "^4.1.0" - yargs-unparser@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f" @@ -7519,24 +6819,6 @@ yargs@13.3.2, yargs@^13.3.0: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^10.0.3: - version "10.1.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" - integrity sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig== - dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^8.1.0" - yauzl@^2.4.2: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" @@ -7544,3 +6826,8 @@ yauzl@^2.4.2: dependencies: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" + +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== From cc976fbc1c8bb79ccea2de1389acca74a5d1581b Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Thu, 20 Aug 2020 20:00:56 +0300 Subject: [PATCH 02/30] Fix bug with flags --- contracts/OneRouter.sol | 4 ++-- contracts/sources/KyberSource.sol | 10 +++------- test/OneRouter.js | 4 ++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/contracts/OneRouter.sol b/contracts/OneRouter.sol index cd47435..bf90a6b 100644 --- a/contracts/OneRouter.sol +++ b/contracts/OneRouter.sol @@ -267,10 +267,10 @@ contract OneRouterView is uint256[][] memory input = new uint256[][](sourcesCount); uint256[][] memory gases = new uint256[][](sourcesCount); uint256[][] memory costs = new uint256[][](sourcesCount); - bool invert = swap.flags.check(_FLAG_DISABLE_ALL_SOURCES); + bool disableAll = swap.flags.check(_FLAG_DISABLE_ALL_SOURCES); for (uint i = 0; i < sourcesCount; i++) { uint256 gas; - if (invert == swap.flags.check(1 << i)) { + if (disableAll || !swap.flags.check(1 << i)) { if (sources[i] != ISource(0)) { (input[i], , gas) = sources[i].calculate(fromToken, amounts, swap); } diff --git a/contracts/sources/KyberSource.sol b/contracts/sources/KyberSource.sol index 0d5690a..e85c6ce 100644 --- a/contracts/sources/KyberSource.sol +++ b/contracts/sources/KyberSource.sol @@ -67,12 +67,7 @@ contract KyberSourceView is OneRouterConstants { function _calculateKyber4(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { bytes32 reserveId = KyberHelper.getReserveId(fromToken, swap.destToken); if (reserveId != 0) { - return _calculateKyber( - fromToken, - amounts, - swap, - reserveId - ); + return _calculateKyber(fromToken, amounts, swap, reserveId); } } @@ -109,7 +104,8 @@ contract KyberSourceView is OneRouterConstants { returns(uint256 rate) { uint256 preResult = amounts[i].mul(rate).mul(decimals.destTokenDecimals); rets[i] = preResult.div(decimals.fromTokenDecimals).div(1e18); - } catch {} + } catch { + } } return (rets, address(reserve), 100_000); diff --git a/test/OneRouter.js b/test/OneRouter.js index d6744cd..e6384a8 100644 --- a/test/OneRouter.js +++ b/test/OneRouter.js @@ -150,7 +150,7 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { ); expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); - expect(result.estimateGasAmounts[0]).to.be.equal('100000'); + expect(result.estimateGasAmounts[0]).to.be.equal('60000'); }); it('should give ETH amount for 1 DAI', async function () { @@ -166,7 +166,7 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { ); expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.0025')); - expect(result.estimateGasAmounts[0]).to.be.equal('100000'); + expect(result.estimateGasAmounts[0]).to.be.equal('60000'); }); }); From 25f1aba7d812385e0a95a569b89408e20931f9e5 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Thu, 20 Aug 2020 20:09:49 +0300 Subject: [PATCH 03/30] Fix CI --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d9c777..c9f58bf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,10 +35,9 @@ jobs: - run: yarn - run: yarn lint - - run: yarn ganache-cli -f "$ETH_NODE" -l 8000000000 -p 9545 & + - run: (yarn ganache-cli -f "$ETH_NODE" -l 8000000000 -p 9545 &>/dev/null &) && while ! nc -z localhost 9545; do sleep 1; done && yarn test env: ETH_NODE: ${{ secrets.ETH_NODE }} - - run: yarn test #- run: yarn coveralls #- run: yarn codechecks # env: From 9887230e0cb7b138b65a7773ec88ade4129cf7af Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Fri, 21 Aug 2020 01:19:11 +0300 Subject: [PATCH 04/30] Fix some bugs --- contracts/OneRouter.sol | 74 ++++++++++++++-------------- contracts/OneRouterConstants.sol | 30 +++++++++-- contracts/interfaces/ICurve.sol | 18 ++++--- contracts/sources/BalancerSource.sol | 5 +- contracts/sources/CurveSource.sol | 46 ++++++----------- contracts/sources/KyberSource.sol | 3 -- test/OneRouter.js | 34 ++++++------- 7 files changed, 105 insertions(+), 105 deletions(-) diff --git a/contracts/OneRouter.sol b/contracts/OneRouter.sol index bf90a6b..ca8d4ae 100644 --- a/contracts/OneRouter.sol +++ b/contracts/OneRouter.sol @@ -28,20 +28,14 @@ import "./sources/CurveSource.sol"; // import "./sources/BalancerSource.sol"; -contract PathsAdvisor { +contract PathsAdvisor is OneRouterConstants { using UniERC20 for IERC20; - IWETH constant private _WETH = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); - IERC20 constant private DAI = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); - IERC20 constant private USDC = IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); - IERC20 constant private USDT = IERC20(0xdAC17F958D2ee523a2206206994597C13D831ec7); - IERC20 constant private WBTC = IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); - IAaveRegistry constant private _AAVE_REGISTRY = IAaveRegistry(0xEd8b133B7B88366E01Bb9E38305Ab11c26521494); ICompoundRegistry constant private _COMPOUND_REGISTRY = ICompoundRegistry(0xF451Dbd7Ba14BFa7B1B78A766D3Ed438F79EE1D1); function getPathsForTokens(IERC20 fromToken, IERC20 destToken) external view returns(IERC20[][] memory paths) { - IERC20[4] memory midTokens = [DAI, USDC, USDT, WBTC]; + IERC20[4] memory midTokens = [_DAI, _USDC, _USDT, _WBTC]; paths = new IERC20[][](2 + midTokens.length); IERC20 aFromToken = _AAVE_REGISTRY.aTokenByToken(fromToken); @@ -270,7 +264,7 @@ contract OneRouterView is bool disableAll = swap.flags.check(_FLAG_DISABLE_ALL_SOURCES); for (uint i = 0; i < sourcesCount; i++) { uint256 gas; - if (disableAll || !swap.flags.check(1 << i)) { + if (disableAll == swap.flags.check(1 << i)) { if (sources[i] != ISource(0)) { (input[i], , gas) = sources[i].calculate(fromToken, amounts, swap); } @@ -510,15 +504,10 @@ contract OneRouter is returns(uint256 returnAmount) { require(msg.value == (input.fromToken.isETH() ? input.amount : 0), "Wrong msg.value"); + require(paths.length == pathDistributions.length, "Wrong arrays length"); require(paths.length == interPathsDistribution.weights.length, "Wrong arrays length"); input.fromToken.uniTransferFromSender(address(this), input.amount); - uint256 confirmed = input.fromToken.uniBalanceOf(address(this)); - - uint256 interTotalWeight = 0; - for (uint i = 0; i < interPathsDistribution.weights.length; i++) { - interTotalWeight = interTotalWeight.add(interPathsDistribution.weights[i]); - } function(IERC20,IERC20,uint256,uint256)[15] memory reserves = [ _swapOnUniswapV1, @@ -547,46 +536,57 @@ contract OneRouter is // _swapOnBlackHoleSwap ]; - Indexes memory _; - for (_.p = 0; _.p < pathDistributions.length; _.p++) { - for (_.s = 0; _.s < pathDistributions[_.p].swapDistributions.length; _.s++) { - uint256 totalWeight = 0; - for (_.i = 0; _.i < pathDistributions[_.p].swapDistributions[_.s].weights.length; _.i++) { - totalWeight = totalWeight.add(pathDistributions[_.p].swapDistributions[_.s].weights[_.i]); + uint256 interTotalWeight = 0; + for (uint i = 0; i < interPathsDistribution.weights.length; i++) { + interTotalWeight = interTotalWeight.add(interPathsDistribution.weights[i]); + } + + Indexes memory z; + for (z.p = 0; z.p < pathDistributions.length; z.p++) { + uint256 confirmed = input.fromToken.uniBalanceOf(address(this)) + .mul(interPathsDistribution.weights[z.p]) + .div(interTotalWeight); + interTotalWeight = interTotalWeight.sub(interPathsDistribution.weights[z.p]); + + IERC20 token = input.fromToken; + for (z.s = 0; z.s < pathDistributions[z.p].swapDistributions.length; z.s++) { + uint256 totalSwapWeight = 0; + for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length; z.i++) { + totalSwapWeight = totalSwapWeight.add(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]); } - for (_.i = 0; _.i < pathDistributions[_.p].swapDistributions[_.s].weights.length; _.i++) { - uint256 amount = confirmed - .mul(interPathsDistribution.weights[_.p]) - .div(interTotalWeight); - amount = amount - .mul(pathDistributions[_.p].swapDistributions[_.s].weights[_.i]) - .div(totalWeight); - totalWeight = totalWeight.sub(pathDistributions[_.p].swapDistributions[_.s].weights[_.i]); - - if (sources[_.i] != ISource(0)) { - address(sources[_.i]).functionDelegateCall( + for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length; z.i++) { + uint256 amount = ((z.s == 0) ? confirmed : token.uniBalanceOf(address(this))) + .mul(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]) + .div(totalSwapWeight); + totalSwapWeight = totalSwapWeight.sub(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]); + + if (sources[z.i] != ISource(0)) { + address(sources[z.i]).functionDelegateCall( abi.encodeWithSelector( - sources[_.i].swap.selector, + sources[z.i].swap.selector, input.fromToken, input.destToken, amount, - paths[_.p].swaps[_.s].flags + paths[z.p].swaps[z.s].flags ), "Delegatecall failed" ); } - else if (_.i < reserves.length) { - reserves[_.i](input.fromToken, input.destToken, amount, paths[_.p].swaps[_.s].flags); + else if (z.i < reserves.length) { + reserves[z.i](input.fromToken, input.destToken, amount, paths[z.p].swaps[z.s].flags); } } + + token = paths[z.p].swaps[z.s].destToken; } - interTotalWeight = interTotalWeight.sub(interPathsDistribution.weights[_.p]); + interTotalWeight = interTotalWeight.sub(interPathsDistribution.weights[z.p]); } uint256 remaining = input.fromToken.uniBalanceOf(address(this)); returnAmount = input.destToken.uniBalanceOf(address(this)); + require(returnAmount >= input.minReturn, "Min returns is not enough"); input.fromToken.uniTransfer(msg.sender, remaining); input.destToken.uniTransfer(msg.sender, returnAmount); } diff --git a/contracts/OneRouterConstants.sol b/contracts/OneRouterConstants.sol index 5f5280c..14574d7 100644 --- a/contracts/OneRouterConstants.sol +++ b/contracts/OneRouterConstants.sol @@ -6,12 +6,32 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; contract OneRouterConstants { - uint256 constant internal _FLAG_DISABLE_RECALCULATION = 0x1000000000000000000000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_ALL_SOURCES = 0x100000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_RECALCULATION = 0x200000000000000000000000000000000; - uint256 constant internal _FLAG_DISABLE_ALL_SOURCES = 0x100000000000000000000000000000000; - uint256 constant internal _FLAG_DISABLE_KYBER_ALL = 0x200000000000000000000000000000000; - uint256 constant internal _FLAG_DISABLE_CURVE_ALL = 0x400000000000000000000000000000000; - uint256 constant internal _FLAG_DISABLE_BALANCER_ALL = 0x800000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_KYBER_ALL = + _FLAG_DISABLE_KYBER_1 + + _FLAG_DISABLE_KYBER_2 + + _FLAG_DISABLE_KYBER_3 + + _FLAG_DISABLE_KYBER_4; + uint256 constant internal _FLAG_DISABLE_CURVE_ALL = + _FLAG_DISABLE_CURVE_COMPOUND + + _FLAG_DISABLE_CURVE_USDT + + _FLAG_DISABLE_CURVE_Y + + _FLAG_DISABLE_CURVE_BINANCE + + _FLAG_DISABLE_CURVE_SYNTHETIX + + _FLAG_DISABLE_CURVE_PAX + + _FLAG_DISABLE_CURVE_RENBTC + + _FLAG_DISABLE_CURVE_TBTC + + _FLAG_DISABLE_CURVE_SBTC; + uint256 constant internal _FLAG_DISABLE_BALANCER_ALL = + _FLAG_DISABLE_BALANCER_1 + + _FLAG_DISABLE_BALANCER_2 + + _FLAG_DISABLE_BALANCER_3; + uint256 constant internal _FLAG_DISABLE_BANCOR_ALL = + _FLAG_DISABLE_BANCOR_1 + + _FLAG_DISABLE_BANCOR_2 + + _FLAG_DISABLE_BANCOR_3; uint256 constant internal _FLAG_DISABLE_UNISWAP_V1 = 0x1; uint256 constant internal _FLAG_DISABLE_UNISWAP_V2 = 0x2; diff --git a/contracts/interfaces/ICurve.sol b/contracts/interfaces/ICurve.sol index 1b66c8d..ebb8bff 100644 --- a/contracts/interfaces/ICurve.sol +++ b/contracts/interfaces/ICurve.sol @@ -4,37 +4,39 @@ pragma solidity ^0.6.0; interface ICurve { - // solium-disable-next-line mixedcase + // solhint-disable-next-line func-name-mixedcase function get_dy_underlying(int128 i, int128 j, uint256 dx) external view returns(uint256 dy); - // solium-disable-next-line mixedcase + // solhint-disable-next-line func-name-mixedcase function get_dy(int128 i, int128 j, uint256 dx) external view returns(uint256 dy); - // solium-disable-next-line mixedcase + // solhint-disable-next-line func-name-mixedcase function exchange_underlying(int128 i, int128 j, uint256 dx, uint256 minDy) external; - // solium-disable-next-line mixedcase + // solhint-disable-next-line func-name-mixedcase function exchange(int128 i, int128 j, uint256 dx, uint256 minDy) external; } interface ICurveRegistry { + // solhint-disable-next-line func-name-mixedcase function get_pool_info(address pool) external view returns( uint256[8] memory balances, - uint256[8] memory underlying_balances, + uint256[8] memory underlyingBalances, uint256[8] memory decimals, - uint256[8] memory underlying_decimals, - address lp_token, - uint256 A, + uint256[8] memory underlyingDecimals, + address lpToken, + uint256 a, uint256 fee ); } interface ICurveCalculator { + // solhint-disable-next-line func-name-mixedcase function get_dy( int128 nCoins, uint256[8] calldata balances, diff --git a/contracts/sources/BalancerSource.sol b/contracts/sources/BalancerSource.sol index 5237bae..f93e964 100644 --- a/contracts/sources/BalancerSource.sol +++ b/contracts/sources/BalancerSource.sol @@ -51,13 +51,10 @@ contract BalancerSourceView is OneRouterConstants { IERC20 fromToken, IERC20 destToken, uint256[] memory amounts, - uint256 flags, + uint256 /*flags*/, uint256 poolIndex ) private view returns(uint256[] memory rets, address dex, uint256 gas) { rets = new uint256[](amounts.length); - if (flags.check(_FLAG_DISABLE_ALL_SOURCES) != flags.check(_FLAG_DISABLE_BALANCER_ALL)) { - return (rets, address(0), 0); - } IERC20 fromTokenWrapped = fromToken.isETH() ? BalancerHelper.WETH : fromToken; IERC20 destTokenWrapped = destToken.isETH() ? BalancerHelper.WETH : destToken; diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol index 231c4ee..6e3c485 100644 --- a/contracts/sources/CurveSource.sol +++ b/contracts/sources/CurveSource.sol @@ -56,51 +56,35 @@ contract CurveSourceView is OneRouterConstants { ICurveRegistry constant private _CURVE_REGISTRY = ICurveRegistry(0x7002B727Ef8F5571Cb5F9D70D13DBEEb4dFAe9d1); function _calculateCurveCompound(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_COMPOUND, true, CurveHelper.dynarr([_DAI, _USDC])), address(CurveHelper.CURVE_COMPOUND), 720_000); - } + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_COMPOUND, true, CurveHelper.dynarr([_DAI, _USDC])), address(CurveHelper.CURVE_COMPOUND), 720_000); } function _calculateCurveUSDT(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_USDT, true, CurveHelper.dynarr([_DAI, _USDC, _USDT])), address(CurveHelper.CURVE_USDT), 720_000); - } + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_USDT, true, CurveHelper.dynarr([_DAI, _USDC, _USDT])), address(CurveHelper.CURVE_USDT), 720_000); } function _calculateCurveY(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_Y, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _TUSD])), address(CurveHelper.CURVE_Y), 1_400_000); - } + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_Y, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _TUSD])), address(CurveHelper.CURVE_Y), 1_400_000); } function _calculateCurveBinance(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_BINANCE, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _BUSD])), address(CurveHelper.CURVE_BINANCE), 1_400_000); - } + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_BINANCE, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _BUSD])), address(CurveHelper.CURVE_BINANCE), 1_400_000); } function _calculateCurveSynthetix(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_SYNTHETIX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _SUSD])), address(CurveHelper.CURVE_SYNTHETIX), 200_000); - } + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_SYNTHETIX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _SUSD])), address(CurveHelper.CURVE_SYNTHETIX), 200_000); } function _calculateCurvePAX(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_PAX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _PAX])), address(CurveHelper.CURVE_PAX), 1_000_000); - } + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_PAX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _PAX])), address(CurveHelper.CURVE_PAX), 1_000_000); } function _calculateCurveRENBTC(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_RENBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC])), address(CurveHelper.CURVE_RENBTC), 130_000); - } + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_RENBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC])), address(CurveHelper.CURVE_RENBTC), 130_000); } function _calculateCurveSBTC(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) == swap.flags.check(_FLAG_DISABLE_CURVE_ALL)) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC])), address(CurveHelper.CURVE_SBTC), 150_000); - } + return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC])), address(CurveHelper.CURVE_SBTC), 150_000); } function _calculateCurveSelector( @@ -179,24 +163,24 @@ contract CurveSourceView is OneRouterConstants { uint256 amp, uint256 fee ) { - uint256[8] memory underlying_balances; + uint256[8] memory underlyingBalances; uint256[8] memory decimals; - uint256[8] memory underlying_decimals; + uint256[8] memory underlyingDecimals; ( balances, - underlying_balances, + underlyingBalances, decimals, - underlying_decimals, - /*address lp_token*/, + underlyingDecimals, + /*address lpToken*/, amp, fee ) = _CURVE_REGISTRY.get_pool_info(address(curve)); for (uint k = 0; k < 8 && balances[k] > 0; k++) { - precisions[k] = 10 ** (18 - (haveUnderlying ? underlying_decimals : decimals)[k]); + precisions[k] = 10 ** (18 - (haveUnderlying ? underlyingDecimals : decimals)[k]); if (haveUnderlying) { - rates[k] = underlying_balances[k].mul(1e18).div(balances[k]); + rates[k] = underlyingBalances[k].mul(1e18).div(balances[k]); } else { rates[k] = 1e18; } diff --git a/contracts/sources/KyberSource.sol b/contracts/sources/KyberSource.sol index e85c6ce..a6ad032 100644 --- a/contracts/sources/KyberSource.sol +++ b/contracts/sources/KyberSource.sol @@ -79,9 +79,6 @@ contract KyberSourceView is OneRouterConstants { function _calculateKyber(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap, bytes32 reserveId) private view returns(uint256[] memory rets, address dex, uint256 gas) { rets = new uint256[](amounts.length); - if (swap.flags.check(_FLAG_DISABLE_ALL_SOURCES) != swap.flags.check(_FLAG_DISABLE_KYBER_ALL)) { - return (rets, address(0), 0); - } IKyberReserve reserve = KyberHelper.STORAGE.getReserveAddressesByReserveId(reserveId)[0]; diff --git a/test/OneRouter.js b/test/OneRouter.js index e6384a8..55ef2af 100644 --- a/test/OneRouter.js +++ b/test/OneRouter.js @@ -55,8 +55,8 @@ const DISABLE_ALL = new BN('100000000000000000000000000000000', 16); const DISABLE_UNISWAP_V1 = new BN('1', 16); const DISABLE_UNISWAP_V2 = new BN('2', 16); const DISABLE_UNISWAP_ALL = DISABLE_UNISWAP_V1.add(DISABLE_UNISWAP_V2); -const DISABLE_KYBER_ALL = new BN('200000000000000000000000000000000', 16); -const DISABLE_CURVE_ALL = new BN('400000000000000000000000000000000', 16); +const DISABLE_KYBER_ALL = new BN('78', 16); +const DISABLE_CURVE_ALL = new BN('FF80', 16); contract('OneRouter', function ([_, wallet1, wallet2]) { before(async function () { @@ -206,14 +206,14 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], - } - ] - } + }, + ], + }, ); console.log('result', JSON.stringify(result)); - //expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); - //expect(result.estimateGasAmounts[0]).to.be.equal('100000'); + // expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); + // expect(result.estimateGasAmounts[0]).to.be.equal('100000'); }); it('should give DAI amount for 1000 ETH', async function () { @@ -228,8 +228,8 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { flags: DISABLE_ALL.add(DISABLE_UNISWAP_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], - } - ] + }, + ], }, { swaps: [ @@ -244,8 +244,8 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], - } - ] + }, + ], }, { swaps: [ @@ -260,15 +260,15 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], - } - ] - } - ] + }, + ], + }, + ], ); console.log('result', JSON.stringify(result)); - //expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); - //expect(result.estimateGasAmounts[0]).to.be.equal('100000'); + // expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); + // expect(result.estimateGasAmounts[0]).to.be.equal('100000'); }); }); }); From 244ccee47eb2f7005ba3dea7b341ac31501c158e Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Fri, 21 Aug 2020 01:33:47 +0300 Subject: [PATCH 05/30] Fix tests --- test/OneRouter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/OneRouter.js b/test/OneRouter.js index 55ef2af..709f437 100644 --- a/test/OneRouter.js +++ b/test/OneRouter.js @@ -150,7 +150,7 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { ); expect(result.returnAmounts[0]).to.be.bignumber.greaterThan(money.dai('100')); - expect(result.estimateGasAmounts[0]).to.be.equal('60000'); + expect(result.estimateGasAmounts[0]).to.be.equal('100000'); }); it('should give ETH amount for 1 DAI', async function () { @@ -166,7 +166,7 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { ); expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.0025')); - expect(result.estimateGasAmounts[0]).to.be.equal('60000'); + expect(result.estimateGasAmounts[0]).to.be.equal('100000'); }); }); From 6eefe7b1eda3bf5acfacb4ecc3feebd6635f728c Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Mon, 24 Aug 2020 14:08:45 +0300 Subject: [PATCH 06/30] Introduce OneRouterAudit and fix disabledDexes --- contracts/OneRouter.sol | 6 +- contracts/OneRouterAudit.sol | 136 +++++++++++++++ contracts/sources/BalancerSource.sol | 57 ++++--- contracts/sources/CurveSource.sol | 26 +-- contracts/sources/KyberSource.sol | 26 +++ contracts/sources/MooniswapSource.sol | 11 ++ contracts/sources/UniswapV1Source.sol | 31 +++- contracts/sources/UniswapV2Source.sol | 66 ++++++-- test/OneRouter.js | 227 +++++++++++++++++++------- 9 files changed, 465 insertions(+), 121 deletions(-) create mode 100644 contracts/OneRouterAudit.sol diff --git a/contracts/OneRouter.sol b/contracts/OneRouter.sol index ca8d4ae..86562d3 100644 --- a/contracts/OneRouter.sol +++ b/contracts/OneRouter.sol @@ -542,7 +542,7 @@ contract OneRouter is } Indexes memory z; - for (z.p = 0; z.p < pathDistributions.length; z.p++) { + for (z.p = 0; z.p < pathDistributions.length && interTotalWeight > 0; z.p++) { uint256 confirmed = input.fromToken.uniBalanceOf(address(this)) .mul(interPathsDistribution.weights[z.p]) .div(interTotalWeight); @@ -555,7 +555,7 @@ contract OneRouter is totalSwapWeight = totalSwapWeight.add(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]); } - for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length; z.i++) { + for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length && totalSwapWeight > 0; z.i++) { uint256 amount = ((z.s == 0) ? confirmed : token.uniBalanceOf(address(this))) .mul(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]) .div(totalSwapWeight); @@ -580,8 +580,6 @@ contract OneRouter is token = paths[z.p].swaps[z.s].destToken; } - - interTotalWeight = interTotalWeight.sub(interPathsDistribution.weights[z.p]); } uint256 remaining = input.fromToken.uniBalanceOf(address(this)); diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol new file mode 100644 index 0000000..0ea0b4a --- /dev/null +++ b/contracts/OneRouterAudit.sol @@ -0,0 +1,136 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@openzeppelin/contracts/math/SafeMath.sol"; +import "@openzeppelin/contracts/access/Ownable.sol"; +import "./IOneRouter.sol"; +import "./libraries/UniERC20.sol"; + + +contract OneRouterAudit is IOneRouter, Ownable { + using UniERC20 for IERC20; + using SafeMath for uint256; + + IOneRouter public oneRouterImpl; + + constructor(IOneRouter oneRouter) public { + oneRouterImpl = oneRouter; + } + + function setOneRouterImpl(IOneRouter oneRouter) public onlyOwner { + oneRouterImpl = oneRouter; + } + + receive() external payable { + // solhint-disable-next-line avoid-tx-origin + require(msg.sender != tx.origin, "ETH deposit rejected"); + } + + function getReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) + public + view + override + returns( + Path[] memory paths, + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + return oneRouterImpl.getReturn(fromToken, amounts, swap); + } + + function getSwapReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) + public + view + override + returns(SwapResult memory result) + { + return oneRouterImpl.getSwapReturn(fromToken, amounts, swap); + } + + function getPathReturn(IERC20 fromToken, uint256[] memory amounts, Path memory path) + public + view + override + returns(PathResult memory result) + { + return oneRouterImpl.getPathReturn(fromToken, amounts, path); + } + + function getMultiPathReturn(IERC20 fromToken, uint256[] memory amounts, Path[] memory paths) + public + view + override + returns( + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + return oneRouterImpl.getMultiPathReturn(fromToken, amounts, paths); + } + + function makeSwap( + SwapInput memory input, + Swap memory swap, + SwapDistribution memory swapDistribution + ) + public + payable + override + returns(uint256 returnAmount) + { + _claimInput(input); + input.fromToken.uniApprove(address(oneRouterImpl), input.amount); + oneRouterImpl.makeSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, swap, swapDistribution); + return _checkMinReturn(input); + } + + function makePathSwap( + SwapInput memory input, + Path memory path, + PathDistribution memory pathDistribution + ) + public + payable + override + returns(uint256 returnAmount) + { + _claimInput(input); + input.fromToken.uniApprove(address(oneRouterImpl), input.amount); + oneRouterImpl.makePathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, path, pathDistribution); + return _checkMinReturn(input); + } + + function makeMultiPathSwap( + SwapInput memory input, + Path[] memory paths, + PathDistribution[] memory pathDistributions, + SwapDistribution memory interPathsDistribution + ) + public + payable + override + returns(uint256 returnAmount) + { + _claimInput(input); + input.fromToken.uniApprove(address(oneRouterImpl), input.amount); + oneRouterImpl.makeMultiPathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, paths, pathDistributions, interPathsDistribution); + return _checkMinReturn(input); + } + + function _claimInput(SwapInput memory input) internal { + input.fromToken.uniTransferFromSender(address(this), input.amount); + input.amount = input.fromToken.uniBalanceOf(address(this)); + } + + function _checkMinReturn(SwapInput memory input) internal returns(uint256 returnAmount) { + uint256 remaining = input.fromToken.uniBalanceOf(address(this)); + returnAmount = input.destToken.uniBalanceOf(address(this)); + require(returnAmount >= input.minReturn, "Min returns is not enough"); + input.fromToken.uniTransfer(msg.sender, remaining); + input.destToken.uniTransfer(msg.sender, returnAmount); + } +} diff --git a/contracts/sources/BalancerSource.sol b/contracts/sources/BalancerSource.sol index f93e964..4b944ce 100644 --- a/contracts/sources/BalancerSource.sol +++ b/contracts/sources/BalancerSource.sol @@ -36,50 +36,57 @@ contract BalancerSourceView is OneRouterConstants { } function _calculateBalancer1(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return _calculateBalancer(fromToken, swap.destToken, amounts, swap.flags, 0); + return _calculateBalancer(fromToken, amounts, swap, 0); } function _calculateBalancer2(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return _calculateBalancer(fromToken, swap.destToken, amounts, swap.flags, 1); + return _calculateBalancer(fromToken, amounts, swap, 1); } function _calculateBalancer3(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return _calculateBalancer(fromToken, swap.destToken, amounts, swap.flags, 2); + return _calculateBalancer(fromToken, amounts, swap, 2); } function _calculateBalancer( IERC20 fromToken, - IERC20 destToken, uint256[] memory amounts, - uint256 /*flags*/, + IOneRouterView.Swap memory swap, uint256 poolIndex ) private view returns(uint256[] memory rets, address dex, uint256 gas) { rets = new uint256[](amounts.length); IERC20 fromTokenWrapped = fromToken.isETH() ? BalancerHelper.WETH : fromToken; - IERC20 destTokenWrapped = destToken.isETH() ? BalancerHelper.WETH : destToken; + IERC20 destTokenWrapped = swap.destToken.isETH() ? BalancerHelper.WETH : swap.destToken; IBalancerPool[] memory pools = BalancerHelper.REGISTRY.getBestPoolsWithLimit(fromTokenWrapped, destTokenWrapped, poolIndex + 1); - if (poolIndex < pools.length) { - BalancerPoolInfo memory info = BalancerPoolInfo({ - swapFee: pools[poolIndex].getSwapFee(), - fromBalance: pools[poolIndex].getBalance(fromTokenWrapped), - destBalance: pools[poolIndex].getBalance(destTokenWrapped), - fromWeight: pools[poolIndex].getDenormalizedWeight(fromTokenWrapped), - destWeight: pools[poolIndex].getDenormalizedWeight(destTokenWrapped) - }); - - for (uint i = 0; i < amounts.length && amounts[i].mul(2) <= info.fromBalance; i++) { - rets[i] = BalancerLib.calcOutGivenIn( - info.fromBalance, - info.fromWeight, - info.destBalance, - info.destWeight, - amounts[i], - info.swapFee - ); + if (poolIndex >= pools.length) { + return (rets, address(0), 0); + } + + for (uint t = 0; t < swap.disabledDexes.length; t++) { + if (swap.disabledDexes[t] == address(pools[poolIndex])) { + return (rets, address(0), 0); } - return (rets, address(pools[poolIndex]), 75_000 + (fromToken.isETH() || destToken.isETH() ? 0 : 30_000)); } + + BalancerPoolInfo memory info = BalancerPoolInfo({ + swapFee: pools[poolIndex].getSwapFee(), + fromBalance: pools[poolIndex].getBalance(fromTokenWrapped), + destBalance: pools[poolIndex].getBalance(destTokenWrapped), + fromWeight: pools[poolIndex].getDenormalizedWeight(fromTokenWrapped), + destWeight: pools[poolIndex].getDenormalizedWeight(destTokenWrapped) + }); + + for (uint i = 0; i < amounts.length && amounts[i].mul(2) <= info.fromBalance; i++) { + rets[i] = BalancerLib.calcOutGivenIn( + info.fromBalance, + info.fromWeight, + info.destBalance, + info.destWeight, + amounts[i], + info.swapFee + ); + } + return (rets, address(pools[poolIndex]), 75_000 + (fromToken.isETH() || swap.destToken.isETH() ? 0 : 30_000)); } } diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol index 6e3c485..318a2ea 100644 --- a/contracts/sources/CurveSource.sol +++ b/contracts/sources/CurveSource.sol @@ -56,40 +56,40 @@ contract CurveSourceView is OneRouterConstants { ICurveRegistry constant private _CURVE_REGISTRY = ICurveRegistry(0x7002B727Ef8F5571Cb5F9D70D13DBEEb4dFAe9d1); function _calculateCurveCompound(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_COMPOUND, true, CurveHelper.dynarr([_DAI, _USDC])), address(CurveHelper.CURVE_COMPOUND), 720_000); + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_COMPOUND, true, CurveHelper.dynarr([_DAI, _USDC])), address(CurveHelper.CURVE_COMPOUND), 720_000); } function _calculateCurveUSDT(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_USDT, true, CurveHelper.dynarr([_DAI, _USDC, _USDT])), address(CurveHelper.CURVE_USDT), 720_000); + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_USDT, true, CurveHelper.dynarr([_DAI, _USDC, _USDT])), address(CurveHelper.CURVE_USDT), 720_000); } function _calculateCurveY(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_Y, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _TUSD])), address(CurveHelper.CURVE_Y), 1_400_000); + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_Y, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _TUSD])), address(CurveHelper.CURVE_Y), 1_400_000); } function _calculateCurveBinance(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_BINANCE, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _BUSD])), address(CurveHelper.CURVE_BINANCE), 1_400_000); + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_BINANCE, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _BUSD])), address(CurveHelper.CURVE_BINANCE), 1_400_000); } function _calculateCurveSynthetix(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_SYNTHETIX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _SUSD])), address(CurveHelper.CURVE_SYNTHETIX), 200_000); + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_SYNTHETIX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _SUSD])), address(CurveHelper.CURVE_SYNTHETIX), 200_000); } function _calculateCurvePAX(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_PAX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _PAX])), address(CurveHelper.CURVE_PAX), 1_000_000); + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_PAX, true, CurveHelper.dynarr([_DAI, _USDC, _USDT, _PAX])), address(CurveHelper.CURVE_PAX), 1_000_000); } function _calculateCurveRENBTC(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_RENBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC])), address(CurveHelper.CURVE_RENBTC), 130_000); + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_RENBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC])), address(CurveHelper.CURVE_RENBTC), 130_000); } function _calculateCurveSBTC(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return (_calculateCurveSelector(fromToken, swap.destToken, amounts, CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC])), address(CurveHelper.CURVE_SBTC), 150_000); + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC])), address(CurveHelper.CURVE_SBTC), 150_000); } function _calculateCurveSelector( IERC20 fromToken, - IERC20 destToken, + IOneRouterView.Swap memory swap, uint256[] memory amounts, ICurve curve, bool haveUnderlying, @@ -97,13 +97,19 @@ contract CurveSourceView is OneRouterConstants { ) private view returns(uint256[] memory rets) { rets = new uint256[](amounts.length); + for (uint t = 0; t < swap.disabledDexes.length; t++) { + if (swap.disabledDexes[t] == address(curve)) { + return rets; + } + } + int128 i = 0; int128 j = 0; for (uint t = 0; t < tokens.length; t++) { if (fromToken == tokens[t]) { i = int128(t + 1); } - if (destToken == tokens[t]) { + if (swap.destToken == tokens[t]) { j = int128(t + 1); } } diff --git a/contracts/sources/KyberSource.sol b/contracts/sources/KyberSource.sol index a6ad032..3fa7162 100644 --- a/contracts/sources/KyberSource.sol +++ b/contracts/sources/KyberSource.sol @@ -82,6 +82,12 @@ contract KyberSourceView is OneRouterConstants { IKyberReserve reserve = KyberHelper.STORAGE.getReserveAddressesByReserveId(reserveId)[0]; + for (uint t = 0; t < swap.disabledDexes.length; t++) { + if (swap.disabledDexes[t] == address(reserve)) { + return (rets, address(0), 0); + } + } + Decimals memory decimals = Decimals({ fromTokenDecimals: 10 ** IERC20(fromToken).uniDecimals(), destTokenDecimals: 10 ** IERC20(swap.destToken).uniDecimals() @@ -177,6 +183,11 @@ contract KyberSourceSwap { contract KyberSourcePublic1 is ISource, KyberSourceView, KyberSourceSwap { + receive() external payable { + // solhint-disable-next-line avoid-tx-origin + require(msg.sender != tx.origin, "ETH deposit rejected"); + } + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateKyber1(fromToken, amounts, swap); } @@ -188,6 +199,11 @@ contract KyberSourcePublic1 is ISource, KyberSourceView, KyberSourceSwap { contract KyberSourcePublic2 is ISource, KyberSourceView, KyberSourceSwap { + receive() external payable { + // solhint-disable-next-line avoid-tx-origin + require(msg.sender != tx.origin, "ETH deposit rejected"); + } + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateKyber2(fromToken, amounts, swap); } @@ -199,6 +215,11 @@ contract KyberSourcePublic2 is ISource, KyberSourceView, KyberSourceSwap { contract KyberSourcePublic3 is ISource, KyberSourceView, KyberSourceSwap { + receive() external payable { + // solhint-disable-next-line avoid-tx-origin + require(msg.sender != tx.origin, "ETH deposit rejected"); + } + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateKyber3(fromToken, amounts, swap); } @@ -210,6 +231,11 @@ contract KyberSourcePublic3 is ISource, KyberSourceView, KyberSourceSwap { contract KyberSourcePublic4 is ISource, KyberSourceView, KyberSourceSwap { + receive() external payable { + // solhint-disable-next-line avoid-tx-origin + require(msg.sender != tx.origin, "ETH deposit rejected"); + } + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateKyber4(fromToken, amounts, swap); } diff --git a/contracts/sources/MooniswapSource.sol b/contracts/sources/MooniswapSource.sol index 379719e..6f75252 100644 --- a/contracts/sources/MooniswapSource.sol +++ b/contracts/sources/MooniswapSource.sol @@ -32,6 +32,12 @@ contract MooniswapSourceView { return (rets, address(0), 0); } + for (uint t = 0; t < swap.disabledDexes.length; t++) { + if (swap.disabledDexes[t] == address(mooniswap)) { + return (rets, address(0), 0); + } + } + uint256 fee = mooniswap.fee(); uint256 fromBalance = mooniswap.getBalanceForAddition(fromToken.isETH() ? UniERC20.ZERO_ADDRESS : fromToken); uint256 destBalance = mooniswap.getBalanceForRemoval(swap.destToken.isETH() ? UniERC20.ZERO_ADDRESS : swap.destToken); @@ -73,6 +79,11 @@ contract MooniswapSourceSwap { contract MooniswapSourcePublic is ISource, MooniswapSourceView, MooniswapSourceSwap { + receive() external payable { + // solhint-disable-next-line avoid-tx-origin + require(msg.sender != tx.origin, "ETH deposit rejected"); + } + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateMooniswap(fromToken, amounts, swap); } diff --git a/contracts/sources/UniswapV1Source.sol b/contracts/sources/UniswapV1Source.sol index 90f604c..2302cc7 100644 --- a/contracts/sources/UniswapV1Source.sol +++ b/contracts/sources/UniswapV1Source.sol @@ -18,7 +18,7 @@ contract UniswapV1SourceView { IUniswapV1Factory constant private _FACTORY = IUniswapV1Factory(0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95); - function _calculateUniswap1Formula(uint256 fromBalance, uint256 toBalance, uint256 amount) private pure returns(uint256) { + function _calculateUniswapV1Formula(uint256 fromBalance, uint256 toBalance, uint256 amount) private pure returns(uint256) { if (amount > 0) { return amount.mul(toBalance).mul(997).div( fromBalance.mul(1000).add(amount.mul(997)) @@ -31,14 +31,22 @@ contract UniswapV1SourceView { if (fromToken.isETH() || swap.destToken.isETH()) { IUniswapV1Exchange exchange = _FACTORY.getExchange(fromToken.isETH() ? swap.destToken : fromToken); - if (exchange != IUniswapV1Exchange(0)) { - uint256 fromBalance = fromToken.uniBalanceOf(address(exchange)); - uint256 destBalance = swap.destToken.uniBalanceOf(address(exchange)); - for (uint i = 0; i < amounts.length; i++) { - rets[i] = _calculateUniswap1Formula(fromBalance, destBalance, amounts[i]); + if (exchange == IUniswapV1Exchange(0)) { + return (rets, address(0), 0); + } + + for (uint t = 0; t < swap.disabledDexes.length; t++) { + if (swap.disabledDexes[t] == address(exchange)) { + return (rets, address(0), 0); } - return (rets, address(exchange), 60_000); } + + uint256 fromBalance = fromToken.uniBalanceOf(address(exchange)); + uint256 destBalance = swap.destToken.uniBalanceOf(address(exchange)); + for (uint i = 0; i < amounts.length; i++) { + rets[i] = _calculateUniswapV1Formula(fromBalance, destBalance, amounts[i]); + } + return (rets, address(exchange), 60_000); } } } @@ -58,15 +66,20 @@ contract UniswapV1SourceSwap { IUniswapV1Exchange exchange = _FACTORY.getExchange(fromToken.isETH() ? destToken : fromToken); fromToken.uniApprove(address(exchange), amount); if (fromToken.isETH()) { - exchange.tokenToEthSwapInput(amount, 1, block.timestamp); - } else { exchange.ethToTokenSwapInput{ value: amount }(1, block.timestamp); + } else { + exchange.tokenToEthSwapInput(amount, 1, block.timestamp); } } } contract UniswapV1SourcePublic is ISource, UniswapV1SourceView, UniswapV1SourceSwap { + receive() external payable { + // solhint-disable-next-line avoid-tx-origin + require(msg.sender != tx.origin, "ETH deposit rejected"); + } + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateUniswapV1(fromToken, amounts, swap); } diff --git a/contracts/sources/UniswapV2Source.sol b/contracts/sources/UniswapV2Source.sol index 6fa6156..9306338 100644 --- a/contracts/sources/UniswapV2Source.sol +++ b/contracts/sources/UniswapV2Source.sol @@ -28,7 +28,13 @@ library UniswapV2Helper { IERC20 fromToken, IERC20 destToken, uint256[] memory amounts - ) internal view returns (uint256[] memory results, bool needSync, bool needSkim) { + ) internal view returns ( + uint256[] memory results, + uint256 reserveIn, + uint256 reverseOut, + bool needSync, + bool needSkim + ) { return _getReturns( exchange, fromToken.isETH() ? UniswapV2Helper.WETH : fromToken, @@ -42,9 +48,15 @@ library UniswapV2Helper { IERC20 fromToken, IERC20 destToken, uint256[] memory amounts - ) private view returns (uint256[] memory results, bool needSync, bool needSkim) { - uint256 reserveIn = fromToken.uniBalanceOf(address(exchange)); - uint256 reserveOut = destToken.uniBalanceOf(address(exchange)); + ) private view returns ( + uint256[] memory results, + uint256 reserveIn, + uint256 reserveOut, + bool needSync, + bool needSkim + ) { + reserveIn = fromToken.uniBalanceOf(address(exchange)); + reserveOut = destToken.uniBalanceOf(address(exchange)); (uint112 reserve0, uint112 reserve1,) = exchange.getReserves(); if (fromToken > destToken) { (reserve0, reserve1) = (reserve1, reserve0); @@ -52,15 +64,20 @@ library UniswapV2Helper { needSync = (reserveIn < reserve0 || reserveOut < reserve1); needSkim = !needSync && (reserveIn > reserve0 || reserveOut > reserve1); - reserveOut = Math.min(reserveOut, reserve1); reserveIn = Math.min(reserveIn, reserve0); + reserveOut = Math.min(reserveOut, reserve1); results = new uint256[](amounts.length); for (uint i = 0; i < amounts.length; i++) { - uint256 amountInWithFee = amounts[i].mul(997); - uint256 numerator = amountInWithFee.mul(reserveOut); - uint256 denominator = reserveIn.mul(1000).add(amountInWithFee); - results[i] = (denominator == 0) ? 0 : numerator.div(denominator); + results[i] = calculateUniswapV2Formula(reserveIn, reserveOut, amounts[i]); + } + } + + function calculateUniswapV2Formula(uint256 reserveIn, uint256 reserveOut, uint256 amount) internal pure returns(uint256) { + if (amount > 0) { + return amount.mul(reserveOut).mul(997).div( + reserveIn.mul(1000).add(amount.mul(997)) + ); } } } @@ -77,16 +94,25 @@ contract UniswapV2SourceView { IERC20 fromTokenWrapped = fromToken.isETH() ? UniswapV2Helper.WETH : fromToken; IERC20 destTokenWrapped = swap.destToken.isETH() ? UniswapV2Helper.WETH : swap.destToken; IUniswapV2Exchange exchange = UniswapV2Helper.FACTORY.getPair(fromTokenWrapped, destTokenWrapped); - if (exchange != IUniswapV2Exchange(0)) { - (rets,,) = exchange.getReturns(fromToken, swap.destToken, amounts); - return (rets, address(exchange), 50_000 + (fromToken.isETH() || swap.destToken.isETH() ? 0 : 30_000)); + if (exchange == IUniswapV2Exchange(0)) { + return (rets, address(0), 0); } + + for (uint t = 0; t < swap.disabledDexes.length; t++) { + if (swap.disabledDexes[t] == address(exchange)) { + return (rets, address(0), 0); + } + } + + (rets,,,,) = exchange.getReturns(fromToken, swap.destToken, amounts); + return (rets, address(exchange), 50_000 + (fromToken.isETH() || swap.destToken.isETH() ? 0 : 30_000)); } } contract UniswapV2SourceSwap { using UniERC20 for IERC20; + using SafeMath for uint256; using UniswapV2Helper for IUniswapV2Exchange; function _swapOnUniswapV2(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { @@ -111,7 +137,14 @@ contract UniswapV2SourceSwap { amounts[0] = amount; IUniswapV2Exchange exchange = UniswapV2Helper.FACTORY.getPair(fromToken, destToken); - (uint256[] memory returnAmounts, bool needSync, bool needSkim) = exchange.getReturns(fromToken, destToken, amounts); + ( + /*uint256[] memory returnAmounts*/, + uint256 reserveIn, + uint256 reserveOut, + bool needSync, + bool needSkim + ) = exchange.getReturns(fromToken, destToken, amounts); + if (needSync) { exchange.sync(); } @@ -120,10 +153,13 @@ contract UniswapV2SourceSwap { } fromToken.uniTransfer(payable(address(exchange)), amount); + uint256 confirmed = fromToken.uniBalanceOf(address(exchange)).sub(reserveIn); + uint256 returnAmount = UniswapV2Helper.calculateUniswapV2Formula(reserveIn, reserveOut, confirmed); + if (fromToken < destToken) { - exchange.swap(0, returnAmounts[0], address(this), ""); + exchange.swap(0, returnAmount, address(this), ""); } else { - exchange.swap(returnAmounts[0], 0, address(this), ""); + exchange.swap(returnAmount, 0, address(this), ""); } } } diff --git a/test/OneRouter.js b/test/OneRouter.js index 709f437..ea3494e 100644 --- a/test/OneRouter.js +++ b/test/OneRouter.js @@ -1,6 +1,16 @@ -const { ether, BN } = require('@openzeppelin/test-helpers'); +const { constants, ether, BN } = require('@openzeppelin/test-helpers'); const { expect } = require('chai'); +const IERC20 = artifacts.require('IERC20'); +const OneRouter = artifacts.require('OneRouter'); +const OneRouterView = artifacts.require('OneRouterView'); + +const tokens = { + ETH: { + address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + }, +} + const money = { ether, eth: ether, @@ -19,37 +29,33 @@ function linear (bn, n) { return arr; } -// async function trackReceivedToken (token, wallet, txPromise) { -// const preBalance = web3.utils.toBN( -// (token === constants.ZERO_ADDRESS) -// ? await web3.eth.getBalance(wallet) -// : await token.balanceOf(wallet), -// ); - -// let txResult = await txPromise(); -// if (txResult.receipt) { -// // Fix coverage since testrpc-sc gives: { tx: ..., receipt: ...} -// txResult = txResult.receipt; -// } -// let txFees = web3.utils.toBN('0'); -// if (wallet.toLowerCase() === txResult.from.toLowerCase() && token === constants.ZERO_ADDRESS) { -// const receipt = await web3.eth.getTransactionReceipt(txResult.transactionHash); -// const tx = await web3.eth.getTransaction(receipt.transactionHash); -// txFees = web3.utils.toBN(receipt.gasUsed).mul(web3.utils.toBN(tx.gasPrice)); -// } - -// const postBalance = web3.utils.toBN( -// (token === constants.ZERO_ADDRESS) -// ? await web3.eth.getBalance(wallet) -// : await token.balanceOf(wallet), -// ); - -// return postBalance.sub(preBalance).add(txFees); -// } +async function trackReceivedToken (token, wallet, txPromise) { + const preBalance = web3.utils.toBN( + (token === constants.ZERO_ADDRESS) + ? await web3.eth.getBalance(wallet) + : await token.balanceOf(wallet), + ); -const OneRouter = artifacts.require('OneRouter'); -const OneRouterView = artifacts.require('OneRouterView'); -// const Token = artifacts.require('TokenMock'); + let txResult = await txPromise(); + if (txResult.receipt) { + // Fix coverage since testrpc-sc gives: { tx: ..., receipt: ...} + txResult = txResult.receipt; + } + let txFees = web3.utils.toBN('0'); + if (wallet.toLowerCase() === txResult.from.toLowerCase() && token === constants.ZERO_ADDRESS) { + const receipt = await web3.eth.getTransactionReceipt(txResult.transactionHash); + const tx = await web3.eth.getTransaction(receipt.transactionHash); + txFees = web3.utils.toBN(receipt.gasUsed).mul(web3.utils.toBN(tx.gasPrice)); + } + + const postBalance = web3.utils.toBN( + (token === constants.ZERO_ADDRESS) + ? await web3.eth.getBalance(wallet) + : await token.balanceOf(wallet), + ); + + return postBalance.sub(preBalance).add(txFees); +} const DISABLE_ALL = new BN('100000000000000000000000000000000', 16); const DISABLE_UNISWAP_V1 = new BN('1', 16); @@ -60,6 +66,9 @@ const DISABLE_CURVE_ALL = new BN('FF80', 16); contract('OneRouter', function ([_, wallet1, wallet2]) { before(async function () { + tokens.DAI = await IERC20.at('0x6B175474E89094C44Da98b954EedeAC495271d0F'); + tokens.USDC = await IERC20.at('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'); + this.routerView = await OneRouterView.new(); this.router = await OneRouter.new(this.routerView.address); }); @@ -67,10 +76,10 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { describe('Uniswap V1', async function () { it('should give DAI amount for 1 ETH', async function () { const result = await this.router.getSwapReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + tokens.ETH.address, [money.eth('1')], { - destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + destToken: tokens.DAI.address, flags: DISABLE_ALL.add(DISABLE_UNISWAP_V1).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], @@ -84,29 +93,131 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { it('should give ETH amount for 1 DAI', async function () { const result = await this.router.getSwapReturn( - '0x6B175474E89094C44Da98b954EedeAC495271d0F', + tokens.DAI.address, [money.dai('1')], { - destToken: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + destToken: tokens.ETH.address, flags: DISABLE_ALL.add(DISABLE_UNISWAP_V1).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], }, ); - expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.0025')); + expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.003')); expect(result.estimateGasAmounts[0]).to.be.equal('60000'); expect(result.distributions[0][0]).to.be.equal('1'); }); + + it('should swap 1 ETH to DAI', async function () { + const result = await this.router.getSwapReturn( + tokens.ETH.address, + [money.eth('1')], + { + destToken: tokens.DAI.address, + flags: DISABLE_ALL.add(DISABLE_UNISWAP_V1).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + ); + + const returnAmount = await trackReceivedToken( + tokens.DAI, + _, + () => this.router.makeSwap( + { // SwapInput + fromToken: tokens.ETH.address, + destToken: tokens.DAI.address, + amount: money.eth('1').toString(), + minReturn: 0 + }, + { // Swap + destToken: tokens.DAI.address, + flags: 0, + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + { // SwapDistribution + weights: result.distributions[0], + }, + { value: money.eth('1').toString() } + ) + ); + + expect(returnAmount).to.be.bignumber.greaterThan(money.dai('100')); + + await tokens.DAI.approve(this.router.address, money.dai('1')); + + const returnAmount2 = await trackReceivedToken( + constants.ZERO_ADDRESS, + _, + () => this.router.makeSwap( + { // SwapInput + fromToken: tokens.DAI.address, + destToken: tokens.ETH.address, + amount: money.dai('1').toString(), + minReturn: 0 + }, + { // Swap + destToken: tokens.ETH.address, + flags: 0, + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + { // SwapDistribution + weights: result.distributions[0], + }, + ) + ); + + expect(returnAmount2).to.be.bignumber.greaterThan(money.dai('0.002')); + }); + + it('should swap 1 DAI to DAI', async function () { + const result = await this.router.getSwapReturn( + tokens.ETH.address, + [money.eth('1')], + { + destToken: tokens.DAI.address, + flags: DISABLE_ALL.add(DISABLE_UNISWAP_V1).toString(), + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + ); + + const returnAmount = await trackReceivedToken( + tokens.DAI, + _, + () => this.router.makeSwap( + { // SwapInput + fromToken: tokens.ETH.address, + destToken: tokens.DAI.address, + amount: money.eth('1').toString(), + minReturn: 0 + }, + { // Swap + destToken: tokens.DAI.address, + flags: 0, + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: [], + }, + { // SwapDistribution + weights: result.distributions[0], + }, + { value: money.eth('1').toString() } + ) + ); + + expect(returnAmount).to.be.bignumber.greaterThan(money.dai('100')); + }); }); describe('Uniswap V2', async function () { it('should give DAI amount for 1 ETH', async function () { const result = await this.router.getSwapReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + tokens.ETH.address, [money.eth('1')], { - destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + destToken: tokens.DAI.address, flags: DISABLE_ALL.add(DISABLE_UNISWAP_V2).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], @@ -120,17 +231,17 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { it('should give ETH amount for 1 DAI', async function () { const result = await this.router.getSwapReturn( - '0x6B175474E89094C44Da98b954EedeAC495271d0F', + tokens.DAI.address, [money.dai('1')], { - destToken: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + destToken: tokens.ETH.address, flags: DISABLE_ALL.add(DISABLE_UNISWAP_V2).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], }, ); - expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.0025')); + expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.003')); expect(result.estimateGasAmounts[0]).to.be.equal('50000'); expect(result.distributions[0][1]).to.be.equal('1'); }); @@ -139,10 +250,10 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { describe('Kyber', async function () { it('should give DAI amount for 1 ETH', async function () { const result = await this.router.getSwapReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + tokens.ETH.address, [money.eth('1')], { - destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + destToken: tokens.DAI.address, flags: DISABLE_ALL.add(DISABLE_KYBER_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], @@ -155,17 +266,17 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { it('should give ETH amount for 1 DAI', async function () { const result = await this.router.getSwapReturn( - '0x6B175474E89094C44Da98b954EedeAC495271d0F', + tokens.DAI.address, [money.dai('1')], { - destToken: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + destToken: tokens.ETH.address, flags: DISABLE_ALL.add(DISABLE_KYBER_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], }, ); - expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.0025')); + expect(result.returnAmounts[0]).to.be.bignumber.lessThan(money.dai('0.003')); expect(result.estimateGasAmounts[0]).to.be.equal('100000'); }); }); @@ -173,10 +284,10 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { describe('Curve', async function () { it('should give DAI amount for 1 USDC', async function () { const result = await this.router.getSwapReturn( - '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + tokens.USDC.address, [money.usdc('1')], { - destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + destToken: tokens.DAI.address, flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], @@ -189,20 +300,20 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { }); describe('Aggregation', async function () { - it('should give DAI amount for 1000 ETH over USDC', async function () { + it('should give DAI amount for 1000 tokens.ETH over tokens.USDC', async function () { const result = await this.router.getPathReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + tokens.ETH.address, [money.eth('1000')], { swaps: [ { - destToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + destToken: tokens.USDC.address, flags: DISABLE_ALL.add(DISABLE_UNISWAP_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], }, { - destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + destToken: tokens.DAI.address, flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], @@ -216,15 +327,15 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { // expect(result.estimateGasAmounts[0]).to.be.equal('100000'); }); - it('should give DAI amount for 1000 ETH', async function () { + it('should give DAI amount for 1000 tokens.ETH', async function () { const result = await this.router.getMultiPathReturn( - '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', + tokens.ETH.address, linear(money.eth('10000'), 10), [ { swaps: [ { - destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + destToken: tokens.DAI.address, flags: DISABLE_ALL.add(DISABLE_UNISWAP_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], @@ -234,13 +345,13 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { { swaps: [ { - destToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + destToken: tokens.USDC.address, flags: DISABLE_ALL.add(DISABLE_UNISWAP_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], }, { - destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + destToken: tokens.DAI.address, flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], @@ -256,7 +367,7 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { disabledDexes: [], }, { - destToken: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + destToken: tokens.DAI.address, flags: DISABLE_ALL.add(DISABLE_CURVE_ALL).toString(), destTokenEthPriceTimesGasPrice: 0, disabledDexes: [], From 638d6ed793cf5ce94a60918b11a7b740fa7ee93d Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Mon, 24 Aug 2020 17:24:12 +0300 Subject: [PATCH 07/30] Add referral and gas burner --- contracts/IOneRouter.sol | 6 +++ contracts/OneRouterAudit.sol | 74 ++++++++++++++++++++++++--- contracts/OneRouterConstants.sol | 9 +++- contracts/sources/MooniswapSource.sol | 60 ++++++++++++++++------ package.json | 2 +- test/OneRouter.js | 18 +++++-- 6 files changed, 141 insertions(+), 28 deletions(-) diff --git a/contracts/IOneRouter.sol b/contracts/IOneRouter.sol index d4a2ba1..bf6b980 100644 --- a/contracts/IOneRouter.sol +++ b/contracts/IOneRouter.sol @@ -74,11 +74,17 @@ interface IOneRouterView { abstract contract IOneRouter is IOneRouterView { + struct Referral { + address payable ref; + uint256 fee; + } + struct SwapInput { IERC20 fromToken; IERC20 destToken; uint256 amount; uint256 minReturn; + Referral referral; } struct SwapDistribution { diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol index 0ea0b4a..c408a32 100644 --- a/contracts/OneRouterAudit.sol +++ b/contracts/OneRouterAudit.sol @@ -8,14 +8,36 @@ import "@openzeppelin/contracts/math/SafeMath.sol"; import "@openzeppelin/contracts/access/Ownable.sol"; import "./IOneRouter.sol"; import "./libraries/UniERC20.sol"; +import "./sources/MooniswapSource.sol"; +import "./OneRouterConstants.sol"; -contract OneRouterAudit is IOneRouter, Ownable { +interface IReferralGasSponsor { + function makeGasDiscount( + uint256 gasSpent, + uint256 returnAmount, + bytes calldata msgSenderCalldata + ) external; +} + + +interface IFreeFromUpTo { + function freeFromUpTo(address from, uint256 value) external returns(uint256 freed); +} + + +contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { using UniERC20 for IERC20; using SafeMath for uint256; IOneRouter public oneRouterImpl; + modifier validateInput(SwapInput memory input) { + require(input.referral.fee <= 0.03e18, "OneSplit: feePercent out of range"); + require(input.fromToken == input.destToken, "OneSplit: invalid input"); + _; + } + constructor(IOneRouter oneRouter) public { oneRouterImpl = oneRouter; } @@ -29,6 +51,8 @@ contract OneRouterAudit is IOneRouter, Ownable { require(msg.sender != tx.origin, "ETH deposit rejected"); } + // View methods + function getReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) public view @@ -72,6 +96,8 @@ contract OneRouterAudit is IOneRouter, Ownable { return oneRouterImpl.getMultiPathReturn(fromToken, amounts, paths); } + // Swap methods + function makeSwap( SwapInput memory input, Swap memory swap, @@ -80,12 +106,14 @@ contract OneRouterAudit is IOneRouter, Ownable { public payable override + validateInput(input) returns(uint256 returnAmount) { + uint256 gasStart = gasleft(); _claimInput(input); input.fromToken.uniApprove(address(oneRouterImpl), input.amount); oneRouterImpl.makeSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, swap, swapDistribution); - return _checkMinReturn(input); + return _checkMinReturn(gasStart, input, swap.flags); } function makePathSwap( @@ -96,12 +124,14 @@ contract OneRouterAudit is IOneRouter, Ownable { public payable override + validateInput(input) returns(uint256 returnAmount) { + uint256 gasStart = gasleft(); _claimInput(input); input.fromToken.uniApprove(address(oneRouterImpl), input.amount); oneRouterImpl.makePathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, path, pathDistribution); - return _checkMinReturn(input); + return _checkMinReturn(gasStart, input, path.swaps[0].flags); } function makeMultiPathSwap( @@ -113,24 +143,56 @@ contract OneRouterAudit is IOneRouter, Ownable { public payable override + validateInput(input) returns(uint256 returnAmount) { + uint256 gasStart = gasleft(); _claimInput(input); input.fromToken.uniApprove(address(oneRouterImpl), input.amount); oneRouterImpl.makeMultiPathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, paths, pathDistributions, interPathsDistribution); - return _checkMinReturn(input); + return _checkMinReturn(gasStart, input, paths[0].swaps[0].flags); } + // Internal methods + function _claimInput(SwapInput memory input) internal { input.fromToken.uniTransferFromSender(address(this), input.amount); input.amount = input.fromToken.uniBalanceOf(address(this)); } - function _checkMinReturn(SwapInput memory input) internal returns(uint256 returnAmount) { + function _checkMinReturn(uint256 gasStart, SwapInput memory input, uint256 flags) internal returns(uint256 returnAmount) { uint256 remaining = input.fromToken.uniBalanceOf(address(this)); returnAmount = input.destToken.uniBalanceOf(address(this)); require(returnAmount >= input.minReturn, "Min returns is not enough"); input.fromToken.uniTransfer(msg.sender, remaining); - input.destToken.uniTransfer(msg.sender, returnAmount); + input.destToken.uniTransfer(input.referral.ref, returnAmount.mul(input.referral.fee).div(1e18)); + input.destToken.uniTransfer(msg.sender, returnAmount.sub(returnAmount.mul(input.referral.fee).div(1e18))); + + if ((flags & (_FLAG_ENABLE_CHI_BURN | _FLAG_ENABLE_CHI_BURN_ORIGIN)) > 0) { + uint256 gasSpent = 21000 + gasStart - gasleft() + 16 * msg.data.length; + _chiBurnOrSell( + ((flags & _FLAG_ENABLE_CHI_BURN_ORIGIN) > 0) ? tx.origin : msg.sender, + (gasSpent + 14154) / 41947 + ); + } + else if ((flags & _FLAG_ENABLE_REFERRAL_GAS_DISCOUNT) > 0) { + uint256 gasSpent = 21000 + gasStart - gasleft() + 16 * msg.data.length; + IReferralGasSponsor(input.referral.ref).makeGasDiscount(gasSpent, returnAmount, msg.data); + } + } + + function _chiBurnOrSell(address payable sponsor, uint256 amount) internal { + IMooniswap exchange = IMooniswap(0x5B1fC2435B1f7C16c206e7968C0e8524eC29b786); + uint256 sellRefund = MooniswapHelper.getReturn(exchange, _CHI, UniERC20.ZERO_ADDRESS, amount); + uint256 burnRefund = amount.mul(18_000).mul(tx.gasprice); + + if (sellRefund < burnRefund.add(tx.gasprice.mul(36_000))) { + IFreeFromUpTo(address(_CHI)).freeFromUpTo(sponsor, amount); + } + else { + _CHI.transferFrom(sponsor, address(exchange), amount); + exchange.swap(_CHI, UniERC20.ZERO_ADDRESS, amount, 0, 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5); + sponsor.transfer(address(this).balance); + } } } diff --git a/contracts/OneRouterConstants.sol b/contracts/OneRouterConstants.sol index 14574d7..87ef3c0 100644 --- a/contracts/OneRouterConstants.sol +++ b/contracts/OneRouterConstants.sol @@ -6,8 +6,12 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; contract OneRouterConstants { - uint256 constant internal _FLAG_DISABLE_ALL_SOURCES = 0x100000000000000000000000000000000; - uint256 constant internal _FLAG_DISABLE_RECALCULATION = 0x200000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_ALL_SOURCES = 0x100000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_RECALCULATION = 0x200000000000000000000000000000000; + uint256 constant internal _FLAG_ENABLE_CHI_BURN = 0x400000000000000000000000000000000; + uint256 constant internal _FLAG_ENABLE_CHI_BURN_ORIGIN = 0x800000000000000000000000000000000; + uint256 constant internal _FLAG_ENABLE_REFERRAL_GAS_DISCOUNT = 0x1000000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_KYBER_ALL = _FLAG_DISABLE_KYBER_1 + @@ -71,4 +75,5 @@ contract OneRouterConstants { IERC20 constant internal _RENBTC = IERC20(0xEB4C2781e4ebA804CE9a9803C67d0893436bB27D); IERC20 constant internal _WBTC = IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); IERC20 constant internal _SBTC = IERC20(0xfE18be6b3Bd88A2D2A7f928d00292E7a9963CfC6); + IERC20 constant internal _CHI = IERC20(0x0000000000004946c0e9F43F4Dee607b0eF1fA1c); } diff --git a/contracts/sources/MooniswapSource.sol b/contracts/sources/MooniswapSource.sol index 6f75252..296e6b1 100644 --- a/contracts/sources/MooniswapSource.sol +++ b/contracts/sources/MooniswapSource.sol @@ -13,43 +13,71 @@ import "../libraries/UniERC20.sol"; library MooniswapHelper { + using SafeMath for uint256; + using UniERC20 for IERC20; + IMooniswapRegistry constant public REGISTRY = IMooniswapRegistry(0x71CD6666064C3A1354a3B4dca5fA1E2D3ee7D303); + + function getReturn( + IMooniswap mooniswap, + IERC20 fromToken, + IERC20 destToken, + uint256 amount + ) internal view returns(uint256 ret) { + uint256[] memory amounts = new uint256[](1); + amounts[0] = amount; + uint256[] memory rets = getReturns(mooniswap, fromToken, destToken, amounts); + if (rets.length > 0) { + return rets[0]; + } + } + + function getReturns( + IMooniswap mooniswap, + IERC20 fromToken, + IERC20 destToken, + uint256[] memory amounts + ) internal view returns(uint256[] memory rets) { + rets = new uint256[](amounts.length); + + uint256 fee = mooniswap.fee(); + uint256 fromBalance = mooniswap.getBalanceForAddition(fromToken.isETH() ? UniERC20.ZERO_ADDRESS : fromToken); + uint256 destBalance = mooniswap.getBalanceForRemoval(destToken.isETH() ? UniERC20.ZERO_ADDRESS : destToken); + if (fromBalance > 0 && destBalance > 0) { + for (uint i = 0; i < amounts.length; i++) { + uint256 amount = amounts[i].sub(amounts[i].mul(fee).div(1e18)); + rets[i] = amount.mul(destBalance).div( + fromBalance.add(amount) + ); + } + } + } } contract MooniswapSourceView { using SafeMath for uint256; using UniERC20 for IERC20; + using MooniswapHelper for IMooniswap; function _calculateMooniswap(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - rets = new uint256[](amounts.length); - IMooniswap mooniswap = MooniswapHelper.REGISTRY.pools( fromToken.isETH() ? UniERC20.ZERO_ADDRESS : fromToken, swap.destToken.isETH() ? UniERC20.ZERO_ADDRESS : swap.destToken ); if (mooniswap == IMooniswap(0)) { - return (rets, address(0), 0); + return (new uint256[](0), address(0), 0); } for (uint t = 0; t < swap.disabledDexes.length; t++) { if (swap.disabledDexes[t] == address(mooniswap)) { - return (rets, address(0), 0); + return (new uint256[](0), address(0), 0); } } - uint256 fee = mooniswap.fee(); - uint256 fromBalance = mooniswap.getBalanceForAddition(fromToken.isETH() ? UniERC20.ZERO_ADDRESS : fromToken); - uint256 destBalance = mooniswap.getBalanceForRemoval(swap.destToken.isETH() ? UniERC20.ZERO_ADDRESS : swap.destToken); - if (fromBalance == 0 || destBalance == 0) { - return (rets, address(0), 0); - } - - for (uint i = 0; i < amounts.length; i++) { - uint256 amount = amounts[i].sub(amounts[i].mul(fee).div(1e18)); - rets[i] = amount.mul(destBalance).div( - fromBalance.add(amount) - ); + rets = mooniswap.getReturns(fromToken, swap.destToken, amounts); + if (rets.length == 0 || rets[0] == 0) { + return (new uint256[](0), address(0), 0); } return (rets, address(mooniswap), (fromToken.isETH() || swap.destToken.isETH()) ? 80_000 : 110_000); diff --git a/package.json b/package.json index ff19e1e..f00dac6 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,6 @@ "lint": "yarn run lint:js && yarn run lint:sol", "lint:fix": "yarn run lint:js:fix && yarn run lint:sol:fix", "dist": "truffle-flattener ./contracts/OneRouter.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./OneRouter.full.sol && solcjs --bin --abi --optimize ./OneRouter.full.sol && mv ./__OneRouter_full_sol_OneRouter.bin ./OneRouter.full.bin && mv ./__OneRouter_full_sol_OneRouter.abi ./OneRouter.full.abi && rm ./*_sol_*", - "dist:factory": "truffle-flattener ./contracts/MooniFactory.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./MooniFactory.full.sol && solcjs --bin --abi --optimize ./MooniFactory.full.sol && mv ./__MooniFactory_full_sol_MooniFactory.bin ./MooniFactory.full.bin && mv ./__MooniFactory_full_sol_MooniFactory.abi ./MooniFactory.full.abi && rm ./*_sol_*" + "dist:audit": "truffle-flattener ./contracts/OneRouterAudit.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./OneRouterAudit.full.sol && solcjs --bin --abi --optimize ./OneRouterAudit.full.sol && mv ./__OneRouterAudit_full_sol_OneRouterAudit.bin ./OneRouterAudit.full.bin && mv ./__OneRouterAudit_full_sol_OneRouterAudit.abi ./OneRouterAudit.full.abi && rm ./*_sol_*" } } diff --git a/test/OneRouter.js b/test/OneRouter.js index ea3494e..8e79209 100644 --- a/test/OneRouter.js +++ b/test/OneRouter.js @@ -128,7 +128,11 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { fromToken: tokens.ETH.address, destToken: tokens.DAI.address, amount: money.eth('1').toString(), - minReturn: 0 + minReturn: 0, + referral: { + ref: constants.ZERO_ADDRESS, + fee: 0 + } }, { // Swap destToken: tokens.DAI.address, @@ -155,7 +159,11 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { fromToken: tokens.DAI.address, destToken: tokens.ETH.address, amount: money.dai('1').toString(), - minReturn: 0 + minReturn: 0, + referral: { + ref: constants.ZERO_ADDRESS, + fee: 0 + } }, { // Swap destToken: tokens.ETH.address, @@ -192,7 +200,11 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { fromToken: tokens.ETH.address, destToken: tokens.DAI.address, amount: money.eth('1').toString(), - minReturn: 0 + minReturn: 0, + referral: { + ref: constants.ZERO_ADDRESS, + fee: 0 + } }, { // Swap destToken: tokens.DAI.address, From bbaa7350eebae5573c79b1c1b080ef567e150ee4 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Mon, 24 Aug 2020 17:24:36 +0300 Subject: [PATCH 08/30] Add Kyber reserves list --- KyberReserves.md | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 KyberReserves.md diff --git a/KyberReserves.md b/KyberReserves.md new file mode 100644 index 0000000..5ddd03b --- /dev/null +++ b/KyberReserves.md @@ -0,0 +1,68 @@ +# Kyber Reserves + +There are 3 different 1-byte prefixes of reserve id: +- `0xAA` for [Automated Price Reserve](https://developer.kyber.network/docs/Reserves-AutomatedPriceReserve/) +- `0xFF` for [Fed Price Reserve](https://developer.kyber.network/docs/Reserves-FedPriceReserve/) +- `0xBB` for Bridged Price Reserves + +## Multiple token reserves + +| Name | Address | Reserve ID | +| ---- | ---- | ---- | +| Reserve 1 | [`0x63825c174ab367968EC60f061753D3bbD36A0D8F`](https://etherscan.io/address/0x63825c174ab367968EC60f061753D3bbD36A0D8F) | `0xff4b796265722046707200000000000000000000000000000000000000000000` | +| Reserve 2 | [`0x7a3370075a54B187d7bD5DceBf0ff2B5552d4F7D`](https://etherscan.io/address/0x7a3370075a54B187d7bD5DceBf0ff2B5552d4F7D) | `0xffabcd0000000000000000000000000000000000000000000000000000000000` | +| Reserve 3 | [`0x4f32BbE8dFc9efD54345Fc936f9fEF1048746fCF`](https://etherscan.io/address/0x4f32BbE8dFc9efD54345Fc936f9fEF1048746fCF) | `0xff4f6e65426974205175616e7400000000000000000000000000000000000000` | + +## Bridged Reserves + +| Name | Address | Reserve ID | +| ---- | ---- | ---- | +| Oasis (Eth2Dai) | [`0x1E158c0e93c30d24e918Ef83d1e0bE23595C3c0f`](https://etherscan.io/address/0x1E158c0e93c30d24e918Ef83d1e0bE23595C3c0f) | `0xbb4f617369730000000000000000000000000000000000000000000000000000` | +| Uniswap | [`0x31E085Afd48a1d6e51Cc193153d625e8f0514C7F`](https://etherscan.io/address/0x31E085Afd48a1d6e51Cc193153d625e8f0514C7F) | `0xbb756e6973776170563100000000000000000000000000000000000000000000` | +| Uniswap V2 | [`0x10908C875D865C66f271F5d3949848971c9595C9`](https://etherscan.io/address/0x10908C875D865C66f271F5d3949848971c9595C9) | `0xbb756e6973776170563200000000000000000000000000000000000000000000` | +| Bancor | [`0x1fE867bFE9cbE0045467605B959A355223E3885D`](https://etherscan.io/address/0x1fE867bFE9cbE0045467605B959A355223E3885D)| `0xbb42414e434f5230305632000000000000000000000000000000000000000000` | + + +## Single token reserves + +| Name | Address | Reserve ID | +| ---- | ---- | ---- | +| [ABYSS](https://etherscan.io/address/0x0E8d6b471e332F140e7d9dbB99E5E3822F728DA6) | [`0x3e9FFBA3C3eB91f501817b031031a71de2d3163B`](https://etherscan.io/address/0x3e9FFBA3C3eB91f501817b031031a71de2d3163B) | `0xaa41627973730000000000000000000000000000000000000000000000000000` | +| [EQUAD](https://etherscan.io/address/0xC28e931814725BbEB9e670676FaBBCb694Fe7DF2) | [`0x0232Ba609782Cea145Ec3663F52CF7aEb4AC773C`](https://etherscan.io/address/0x0232Ba609782Cea145Ec3663F52CF7aEb4AC773C) | `0xaa65515541440000000000000000000000000000000000000000000000000000` | +| [MLN](https://etherscan.io/address/0xec67005c4E498Ec7f55E092bd1d35cbC47C91892) | [`0xa33c7c22d0BB673c2aEa2C048BB883b679fa1BE9`](https://etherscan.io/address/0xa33c7c22d0BB673c2aEa2C048BB883b679fa1BE9) | `0xaa4d656c6f6e706f727400000000000000000000000000000000000000000000` | +| [REN](https://etherscan.io/address/0x408e41876cCCDC0F92210600ef50372656052a38) | [`0x45eb33D008801d547990cAF3b63B4F8aE596EA57`](https://etherscan.io/address/0x45eb33D008801d547990cAF3b63B4F8aE596EA57) | `0xaa72656e00000000000000000000000000000000000000000000000000000000` | +| [USDC](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48) | [`0x1670DFb52806DE7789D5cF7D5c005cf7083f9A5D`](https://etherscan.io/address/0x1670DFb52806DE7789D5cF7D5c005cf7083f9A5D) | `0xaa55534443303041505200000000000000000000000000000000000000000000` | +| [GEN](https://etherscan.io/address/0x543Ff227F64Aa17eA132Bf9886cAb5DB55DCAddf) | [`0xAA14DCAA0AdbE79cBF00edC6cC4ED17ed39240AC`](https://etherscan.io/address/0xAA14DCAA0AdbE79cBF00edC6cC4ED17ed39240AC) | `0xaa47454e00000000000000000000000000000000000000000000000000000000` | +| [GNO](https://etherscan.io/address/0x6810e776880C02933D47DB1b9fc05908e5386b96) | [`0x05461124C86C0AD7C5d8E012e1499fd9109fFb7d`](https://etherscan.io/address/0x05461124C86C0AD7C5d8E012e1499fd9109fFb7d) | `0xaa4b4e4320474e4f000000000000000000000000000000000000000000000000` | +| [MYB](https://etherscan.io/address/0x5d60d8d7eF6d37E16EBABc324de3bE57f135e0BC) | [`0x1833AD67362249823515B59A8aA8b4f6B4358d1B`](https://etherscan.io/address/0x1833AD67362249823515B59A8aA8b4f6B4358d1B) | `0xaa4d594200000000000000000000000000000000000000000000000000000000` | +| [BAM](https://etherscan.io/address/0x22B3FAaa8DF978F6bAFe18aaDe18DC2e3dfA0e0C) | [`0x302B35bd0B01312ec2652783c04955D7200C3D9b`](https://etherscan.io/address/0x302B35bd0B01312ec2652783c04955D7200C3D9b) | `0xaa42414d00000000000000000000000000000000000000000000000000000000` | +| [SPN](https://etherscan.io/address/0x20F7A3DdF244dc9299975b4Da1C39F8D5D75f05A) | [`0x6b84DBd29643294703dBabf8Ed97cDef74EDD227`](https://etherscan.io/address/0x6b84DBd29643294703dBabf8Ed97cDef74EDD227) | `0xaa48756d616e7320466972737400000000000000000000000000000000000000` | +| [UPP](https://etherscan.io/address/0xC86D054809623432210c107af2e3F619DcFbf652) | [`0x7e2fd015616263Add31a2AcC2A437557cEe80Fc4`](https://etherscan.io/address/0x7e2fd015616263Add31a2AcC2A437557cEe80Fc4) | `0xaa55505000000000000000000000000000000000000000000000000000000000` | +| [SNX](https://etherscan.io/address/0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F) | [`0xa107dfa919c3f084a7893A260b99586981beb528`](https://etherscan.io/address/0xa107dfa919c3f084a7893A260b99586981beb528) | `0xaa534e5800000000000000000000000000000000000000000000000000000000` | +| [TKN](https://etherscan.io/address/0xaAAf91D9b90dF800Df4F55c205fd6989c977E73a) | [`0x3480E12B6C2438e02319e34b4c23770679169190`](https://etherscan.io/address/0x3480E12B6C2438e02319e34b4c23770679169190) | `0xaa97aad58d5670d74ffb37e8c6272b3463f08be662718f7681c6e5bffc1b05c0` | +| [RAE](https://etherscan.io/address/0xE5a3229CCb22b6484594973A03a3851dCd948756) | [`0x751Eea622edd1E3D768C18afbCaeC7DcE7750C65`](https://etherscan.io/address/0x751Eea622edd1E3D768C18afbCaeC7DcE7750C65) | `0xaa52414520415052000000000000000000000000000000000000000000000000` | +| [SUSD](https://etherscan.io/address/0x57Ab1ec28D129707052df4dF418D58a2D46d5f51) | [`0x4Cb01bd05E4652CbB9F312aE604f4549D2bf2C99`](https://etherscan.io/address/0x4Cb01bd05E4652CbB9F312aE604f4549D2bf2C99) | `0xaa73555344000000000000000000000000000000000000000000000000000000` | +| [SPIKE](https://etherscan.io/address/0xA7fC5D2453E3F68aF0cc1B78bcFEe94A1B293650) | [`0x8ea5CF9f61824E8A3cA8AA370AB37e0202B2CC7D`](https://etherscan.io/address/0x8ea5CF9f61824E8A3cA8AA370AB37e0202B2CC7D) | `0xaa88888888888888888888888888888888888888888888888888888888888888` | +| [SAN](https://etherscan.io/address/0x7C5A0CE9267ED19B22F8cae653F198e3E8daf098) | [`0xa9742Ee9a5407f4C2f8a49f65E3a440f3694960a`](https://etherscan.io/address/0xa9742Ee9a5407f4C2f8a49f65E3a440f3694960a) | `0xaa53414e20415052000000000000000000000000000000000000000000000000` | +| [KNC](https://etherscan.io/address/0xdd974D5C2e2928deA5F71b9825b8b646686BD200) | [`0x607d7751d9F4845C5a1dE9eeD39c56f4fC0F855d`](https://etherscan.io/address/0x607d7751d9F4845C5a1dE9eeD39c56f4fC0F855d) | `0xaa4b4e435f4d4547414c41444f4e000000000000000000000000000000000000` | +| [EKG](https://etherscan.io/address/0x6A9b3E36436B7abde8C4E2E2a98Ea40455E615cf) | [`0x4e6d0F492fd139151DE4728caC47dAce56C56Af4`](https://etherscan.io/address/0x4e6d0F492fd139151DE4728caC47dAce56C56Af4) | `0xff454b4700000000000000000000000000000000000000000000000000000000` | +| [ANT](https://etherscan.io/address/0x960b236A07cf122663c4303350609A66A7B288C0) | [`0x0994c18Ed0C328F38d2C451B2a2e1cEb1Ae6A812`](https://etherscan.io/address/0x0994c18Ed0C328F38d2C451B2a2e1cEb1Ae6A812) | `0xaa414e5400000000000000000000000000000000000000000000000000000000` | +| [GDC](https://etherscan.io/address/0x301C755bA0fcA00B1923768Fffb3Df7f4E63aF31) | [`0x2485a4e3Dd95a3Ef445B786acf7bacc5C99986F7`](https://etherscan.io/address/0x2485a4e3Dd95a3Ef445B786acf7bacc5C99986F7) | `0xaa676463746f6b656e0000000000000000000000000000000000000000000000` | +| [AMPL](https://etherscan.io/address/0xD46bA6D942050d489DBd938a2C909A5d5039A161) | [`0x977c9ABB01Ed3E99e9953fD1F472aE9f459E7E70`](https://etherscan.io/address/0x977c9ABB01Ed3E99e9953fD1F472aE9f459E7E70) | `0xaad46ba6d942050d489dbd938a2c909a5d5039a1610000000000000000000000` | +| [MET](https://etherscan.io/address/0xa3d58c4E56fedCae3a7c43A725aeE9A71F0ece4e) | [`0x2Ed6F2bC006DA5897A0C3cD2686283C05e50C573`](https://etherscan.io/address/0x2Ed6F2bC006DA5897A0C3cD2686283C05e50C573) | `0xaa4d455400000000000000000000000000000000000000000000000000000000` | +| [MFG](https://etherscan.io/address/0x6710c63432A2De02954fc0f851db07146a6c0312) | [`0x55a8fda671a257b80258d2a03abd6e0e1e3dbe79`](https://etherscan.io/address/0x55a8fda671a257b80258d2a03abd6e0e1e3dbe79) | `0xaa6d6667546f6b656e0000000000000000000000000000000000000000000000` | +| [UBT](https://etherscan.io/address/0x8400D94A5cb0fa0D041a3788e395285d61c9ee5e) | [`0xfe06bc8BC12595C1c871fF7c2ea9CadC42735d7D`](https://etherscan.io/address/0xfe06bc8BC12595C1c871fF7c2ea9CadC42735d7D) | `0xaa55425400000000000000000000000000000000000000000000000000000000` | +| [PBTC](https://etherscan.io/address/0x5228a22e72ccC52d415EcFd199F99D0665E7733b) | [`0x0Ce59E811024C4aA040389fb8917dD9EDAEf1693`](https://etherscan.io/address/0x0Ce59E811024C4aA040389fb8917dD9EDAEf1693) | `0xff50425443000000000000000000000000000000000000000000000000000000` | +| [OGN](https://etherscan.io/address/0x8207c1FfC5B6804F6024322CcF34F29c3541Ae26) | [`0xb89f41CD2C8B6cba8b851289198b06Be8B4Dec65`](https://etherscan.io/address/0xb89f41CD2C8B6cba8b851289198b06Be8B4Dec65) | `0xaa4f474e00000000000000000000000000000000000000000000000000000000` | +| [BAND](https://etherscan.io/address/0xBA11D00c5f74255f56a5E366F4F77f5A186d7f55) | [`0xb06Cf173DA7E297aa6268139c7Cb67C53D8E4f90`](https://etherscan.io/address/0xb06Cf173DA7E297aa6268139c7Cb67C53D8E4f90) | `0xaa42414e44000000000000000000000000000000000000000000000000000000` | +| [RSV](https://etherscan.io/address/0x1C5857e110CD8411054660F60B5De6a6958CfAE2) | [`0x141104687b51985D6210Eb4b398F1DC5b5b9e9F5`](https://etherscan.io/address/0x141104687b51985D6210Eb4b398F1DC5b5b9e9F5) | `0xaa525356546f6b656e0000000000000000000000000000000000000000000000` | +| [KEY](https://etherscan.io/address/0x4CC19356f2D37338b9802aa8E8fc58B0373296E7) | [`0x3e59c69952a4cFEaF653EedF8ff907D4b6b8762D`](https://etherscan.io/address/0x3e59c69952a4cFEaF653EedF8ff907D4b6b8762D) | `0xaa4b455900000000000000000000000000000000000000000000000000000000` | +| [PNK](https://etherscan.io/address/0x93ED3FBe21207Ec2E8f2d3c3de6e058Cb73Bc04d) | [`0x10db2A136ee3E0C963d82aF4C86Ca483199f2816`](https://etherscan.io/address/0x10db2A136ee3E0C963d82aF4C86Ca483199f2816) | `0xaa504e4b00000000000000000000000000000000000000000000000000000000` | +| [CND](https://etherscan.io/address/0xd4c435F5B09F855C3317c8524Cb1F586E42795fa) | [`0xAD84a44a673Be4FdcD5e39Ebd15eBC404E87F314`](https://etherscan.io/address/0xAD84a44a673Be4FdcD5e39Ebd15eBC404E87F314) | `0xaa434e4400000000000000000000000000000000000000000000000000000000` | +| [TRYB](https://etherscan.io/address/0x2C537E5624e4af88A7ae4060C022609376C8D0EB) | [`0xe96b41aF3DA574A991582dC54cC35535550a3f8d`](https://etherscan.io/address/0xe96b41aF3DA574A991582dC54cC35535550a3f8d) | `0xaa54525942000000000000000000000000000000000000000000000000000000` | +| [2KEY](https://etherscan.io/address/0xE48972fCd82a274411c01834e2f031D4377Fa2c0) | [`0x00Cd2388C86C960A646D640bE44FC8F83b78cEC9`](https://etherscan.io/address/0x00Cd2388C86C960A646D640bE44FC8F83b78cEC9) | `0xaacfefe57c1e0f781f9864fe27287980a2097e60c0ee0c5e71083e32cecd1c9c` | +| [PLR](https://etherscan.io/address/0xe3818504c1B32bF1557b16C238B2E01Fd3149C17) | [`0x71eb6edF770b25Fcd60Ad9790AA20C422F0f4a0d`](https://etherscan.io/address/0x71eb6edF770b25Fcd60Ad9790AA20C422F0f4a0d) | `0xaa504c5200000000000000000000000000000000000000000000000000000000` | +| [QNT](https://etherscan.io/address/0x4a220E6096B25EADb88358cb44068A3248254675) | [`0x773A58C0ae122f56d6747BC1264F00174B3144c3`](https://etherscan.io/address/0x773A58C0ae122f56d6747BC1264F00174B3144c3) | `0xaa514e5452657365727665000000000000000000000000000000000000000000` | +| [PNT](https://etherscan.io/address/0x89Ab32156e46F46D02ade3FEcbe5Fc4243B9AAeD) | [`0x89b3F60A17789Aa7c7061Af6f5e9efA407153C03`](https://etherscan.io/address/0x89b3F60A17789Aa7c7061Af6f5e9efA407153C03) | `0xff504e5400000000000000000000000000000000000000000000000000000000` | +| [REQ](https://etherscan.io/address/0x8f8221aFbB33998d8584A2B05749bA73c37a938a) | [`0x23Fe3C603BE19d3a1155766358071CAcEFe14537`](https://etherscan.io/address/0x23Fe3C603BE19d3a1155766358071CAcEFe14537) | `0xaa52455100000000000000000000000000000000000000000000000000000000` | +| [RSR](https://etherscan.io/address/0x8762db106B2c2A0bccB3A80d1Ed41273552616E8) | [`0x0b798B89155eA31f1312791b9fdFAae7c5F48460`](https://etherscan.io/address/0x0b798B89155eA31f1312791b9fdFAae7c5F48460) | `0xaa525352546f6b656e0000000000000000000000000000000000000000000000` | From 20c4b9af716216b071c04e1355f065dc420c66f2 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Mon, 24 Aug 2020 21:04:31 +0300 Subject: [PATCH 09/30] Fixes --- contracts/IOneRouter.sol | 1 + contracts/OneRouter.sol | 4 +++- contracts/OneRouterAudit.sol | 10 +++++----- test/OneRouter.js | 24 ++++++++++++------------ 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/contracts/IOneRouter.sol b/contracts/IOneRouter.sol index bf6b980..f094700 100644 --- a/contracts/IOneRouter.sol +++ b/contracts/IOneRouter.sol @@ -5,6 +5,7 @@ pragma experimental ABIEncoderV2; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + interface IOneRouterView { struct Swap { IERC20 destToken; diff --git a/contracts/OneRouter.sol b/contracts/OneRouter.sol index 86562d3..e609160 100644 --- a/contracts/OneRouter.sol +++ b/contracts/OneRouter.sol @@ -160,7 +160,9 @@ contract OneRouterView is for (uint j = 0; j < pathResults[i].swaps.length; j++) { for (uint k = 0; k < pathResults[i].swaps[j].dexes.length; k++) { for (uint t = 0; t < pathResults[i].swaps[j].dexes[k].length; t++) { - disabledDexes.push(pathResults[i].swaps[j].dexes[k][t]); + if (pathResults[i].swaps[j].dexes[k][t] != address(0)) { + disabledDexes.push(pathResults[i].swaps[j].dexes[k][t]); + } } } } diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol index c408a32..0fd5698 100644 --- a/contracts/OneRouterAudit.sol +++ b/contracts/OneRouterAudit.sol @@ -33,8 +33,8 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { IOneRouter public oneRouterImpl; modifier validateInput(SwapInput memory input) { - require(input.referral.fee <= 0.03e18, "OneSplit: feePercent out of range"); - require(input.fromToken == input.destToken, "OneSplit: invalid input"); + require(input.referral.fee <= 0.03e18, "OneRouter: fee out of range"); + require(input.fromToken == input.destToken, "OneRouter: invalid input"); _; } @@ -48,7 +48,7 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { receive() external payable { // solhint-disable-next-line avoid-tx-origin - require(msg.sender != tx.origin, "ETH deposit rejected"); + require(msg.sender != tx.origin, "OneRouter: ETH deposit rejected"); } // View methods @@ -163,7 +163,7 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { function _checkMinReturn(uint256 gasStart, SwapInput memory input, uint256 flags) internal returns(uint256 returnAmount) { uint256 remaining = input.fromToken.uniBalanceOf(address(this)); returnAmount = input.destToken.uniBalanceOf(address(this)); - require(returnAmount >= input.minReturn, "Min returns is not enough"); + require(returnAmount >= input.minReturn, "OneRouter: less than minReturn"); input.fromToken.uniTransfer(msg.sender, remaining); input.destToken.uniTransfer(input.referral.ref, returnAmount.mul(input.referral.fee).div(1e18)); input.destToken.uniTransfer(msg.sender, returnAmount.sub(returnAmount.mul(input.referral.fee).div(1e18))); @@ -171,7 +171,7 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { if ((flags & (_FLAG_ENABLE_CHI_BURN | _FLAG_ENABLE_CHI_BURN_ORIGIN)) > 0) { uint256 gasSpent = 21000 + gasStart - gasleft() + 16 * msg.data.length; _chiBurnOrSell( - ((flags & _FLAG_ENABLE_CHI_BURN_ORIGIN) > 0) ? tx.origin : msg.sender, + ((flags & _FLAG_ENABLE_CHI_BURN_ORIGIN) > 0) ? tx.origin : msg.sender, // solhint-disable-line avoid-tx-origin (gasSpent + 14154) / 41947 ); } diff --git a/test/OneRouter.js b/test/OneRouter.js index 8e79209..09fba85 100644 --- a/test/OneRouter.js +++ b/test/OneRouter.js @@ -9,7 +9,7 @@ const tokens = { ETH: { address: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', }, -} +}; const money = { ether, @@ -131,8 +131,8 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { minReturn: 0, referral: { ref: constants.ZERO_ADDRESS, - fee: 0 - } + fee: 0, + }, }, { // Swap destToken: tokens.DAI.address, @@ -143,8 +143,8 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { { // SwapDistribution weights: result.distributions[0], }, - { value: money.eth('1').toString() } - ) + { value: money.eth('1').toString() }, + ), ); expect(returnAmount).to.be.bignumber.greaterThan(money.dai('100')); @@ -162,8 +162,8 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { minReturn: 0, referral: { ref: constants.ZERO_ADDRESS, - fee: 0 - } + fee: 0, + }, }, { // Swap destToken: tokens.ETH.address, @@ -174,7 +174,7 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { { // SwapDistribution weights: result.distributions[0], }, - ) + ), ); expect(returnAmount2).to.be.bignumber.greaterThan(money.dai('0.002')); @@ -203,8 +203,8 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { minReturn: 0, referral: { ref: constants.ZERO_ADDRESS, - fee: 0 - } + fee: 0, + }, }, { // Swap destToken: tokens.DAI.address, @@ -215,8 +215,8 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { { // SwapDistribution weights: result.distributions[0], }, - { value: money.eth('1').toString() } - ) + { value: money.eth('1').toString() }, + ), ); expect(returnAmount).to.be.bignumber.greaterThan(money.dai('100')); From bf89d422e77214ee4992bed3cc3ab3cc180a9c8f Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Mon, 24 Aug 2020 21:46:27 +0300 Subject: [PATCH 10/30] Name fix --- contracts/sources/CurveSource.sol | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol index 318a2ea..d7d0d0f 100644 --- a/contracts/sources/CurveSource.sol +++ b/contracts/sources/CurveSource.sol @@ -265,7 +265,7 @@ contract CurveSourceSwap is OneRouterConstants { } -contract CurveourcePublicCompound is ISource, CurveSourceView, CurveSourceSwap { +contract CurveSourcePublicCompound is ISource, CurveSourceView, CurveSourceSwap { function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateCurveCompound(fromToken, amounts, swap); } @@ -276,7 +276,7 @@ contract CurveourcePublicCompound is ISource, CurveSourceView, CurveSourceSwap { } -contract CurveourcePublicUSDT is ISource, CurveSourceView, CurveSourceSwap { +contract CurveSourcePublicUSDT is ISource, CurveSourceView, CurveSourceSwap { function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateCurveUSDT(fromToken, amounts, swap); } @@ -287,7 +287,7 @@ contract CurveourcePublicUSDT is ISource, CurveSourceView, CurveSourceSwap { } -contract CurveourcePublicY is ISource, CurveSourceView, CurveSourceSwap { +contract CurveSourcePublicY is ISource, CurveSourceView, CurveSourceSwap { function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateCurveY(fromToken, amounts, swap); } @@ -298,7 +298,7 @@ contract CurveourcePublicY is ISource, CurveSourceView, CurveSourceSwap { } -contract CurveourcePublicBinance is ISource, CurveSourceView, CurveSourceSwap { +contract CurveSourcePublicBinance is ISource, CurveSourceView, CurveSourceSwap { function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateCurveBinance(fromToken, amounts, swap); } @@ -309,7 +309,7 @@ contract CurveourcePublicBinance is ISource, CurveSourceView, CurveSourceSwap { } -contract CurveourcePublicSynthetix is ISource, CurveSourceView, CurveSourceSwap { +contract CurveSourcePublicSynthetix is ISource, CurveSourceView, CurveSourceSwap { function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateCurveSynthetix(fromToken, amounts, swap); } @@ -320,7 +320,7 @@ contract CurveourcePublicSynthetix is ISource, CurveSourceView, CurveSourceSwap } -contract CurveourcePublicPAX is ISource, CurveSourceView, CurveSourceSwap { +contract CurveSourcePublicPAX is ISource, CurveSourceView, CurveSourceSwap { function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateCurvePAX(fromToken, amounts, swap); } @@ -331,7 +331,7 @@ contract CurveourcePublicPAX is ISource, CurveSourceView, CurveSourceSwap { } -contract CurveourcePublicRENBTC is ISource, CurveSourceView, CurveSourceSwap { +contract CurveSourcePublicRENBTC is ISource, CurveSourceView, CurveSourceSwap { function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateCurveRENBTC(fromToken, amounts, swap); } @@ -342,7 +342,7 @@ contract CurveourcePublicRENBTC is ISource, CurveSourceView, CurveSourceSwap { } -contract CurveourcePublicSBTC is ISource, CurveSourceView, CurveSourceSwap { +contract CurveSourcePublicSBTC is ISource, CurveSourceView, CurveSourceSwap { function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { return _calculateCurveSBTC(fromToken, amounts, swap); } From d1683f92b092a502eaeb6e0009f432524c64174d Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Wed, 26 Aug 2020 23:22:01 +0300 Subject: [PATCH 11/30] Refactoring --- contracts/HotSwapSources.sol | 34 + contracts/IOneRouterSwap.sol | 59 ++ .../{IOneRouter.sol => IOneRouterView.sol} | 55 -- contracts/ISource.sol | 2 +- contracts/KyberMooniswapReserve.sol | 30 + contracts/OneRouter.sol | 593 ------------------ contracts/OneRouterAudit.sol | 46 +- contracts/OneRouterSwap.sol | 189 ++++++ contracts/OneRouterView.sol | 272 ++++++++ contracts/PathsAdvisor.sol | 65 ++ contracts/sources/BalancerSource.sol | 2 +- contracts/sources/CurveSource.sol | 2 +- contracts/sources/KyberSource.sol | 2 +- contracts/sources/MooniswapSource.sol | 2 +- contracts/sources/UniswapV1Source.sol | 2 +- contracts/sources/UniswapV2Source.sol | 2 +- package.json | 10 +- test/OneRouter.js | 6 +- 18 files changed, 695 insertions(+), 678 deletions(-) create mode 100644 contracts/HotSwapSources.sol create mode 100644 contracts/IOneRouterSwap.sol rename contracts/{IOneRouter.sol => IOneRouterView.sol} (56%) create mode 100644 contracts/KyberMooniswapReserve.sol delete mode 100644 contracts/OneRouter.sol create mode 100644 contracts/OneRouterSwap.sol create mode 100644 contracts/OneRouterView.sol create mode 100644 contracts/PathsAdvisor.sol diff --git a/contracts/HotSwapSources.sol b/contracts/HotSwapSources.sol new file mode 100644 index 0000000..b58c916 --- /dev/null +++ b/contracts/HotSwapSources.sol @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/math/Math.sol"; +import "@openzeppelin/contracts/access/Ownable.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "./ISource.sol"; +import "./PathsAdvisor.sol"; + + +contract HotSwapSources is Ownable { + uint256 public sourcesCount = 15; + mapping(uint256 => ISource) public sources; + PathsAdvisor public pathsAdvisor; + + constructor() public { + pathsAdvisor = new PathsAdvisor(); + } + + function setSource(uint256 index, ISource source) external onlyOwner { + require(index <= sourcesCount, "Router: index is too high"); + sources[index] = source; + sourcesCount = Math.max(sourcesCount, index + 1); + } + + function setPathsForTokens(PathsAdvisor newPathsAdvisor) external onlyOwner { + pathsAdvisor = newPathsAdvisor; + } + + function _getPathsForTokens(IERC20 fromToken, IERC20 destToken) internal view returns(IERC20[][] memory paths) { + return pathsAdvisor.getPathsForTokens(fromToken, destToken); + } +} diff --git a/contracts/IOneRouterSwap.sol b/contracts/IOneRouterSwap.sol new file mode 100644 index 0000000..502a855 --- /dev/null +++ b/contracts/IOneRouterSwap.sol @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "./IOneRouterView.sol"; + + +interface IOneRouterSwap { + struct Referral { + address payable ref; + uint256 fee; + } + + struct SwapInput { + IERC20 fromToken; + IERC20 destToken; + uint256 amount; + uint256 minReturn; + Referral referral; + } + + struct SwapDistribution { + uint256[] weights; + } + + struct PathDistribution { + SwapDistribution[] swapDistributions; + } + + function makeSwap( + SwapInput calldata input, + IOneRouterView.Swap calldata swap, + SwapDistribution calldata swapDistribution + ) + external + payable + returns(uint256 returnAmount); + + function makePathSwap( + SwapInput calldata input, + IOneRouterView.Path calldata path, + PathDistribution calldata pathDistribution + ) + external + payable + returns(uint256 returnAmount); + + function makeMultiPathSwap( + SwapInput calldata input, + IOneRouterView.Path[] calldata paths, + PathDistribution[] calldata pathDistributions, + SwapDistribution calldata interPathsDistribution + ) + external + payable + returns(uint256 returnAmount); +} diff --git a/contracts/IOneRouter.sol b/contracts/IOneRouterView.sol similarity index 56% rename from contracts/IOneRouter.sol rename to contracts/IOneRouterView.sol index f094700..a58c454 100644 --- a/contracts/IOneRouter.sol +++ b/contracts/IOneRouterView.sol @@ -72,58 +72,3 @@ interface IOneRouterView { SwapResult memory splitResult ); } - - -abstract contract IOneRouter is IOneRouterView { - struct Referral { - address payable ref; - uint256 fee; - } - - struct SwapInput { - IERC20 fromToken; - IERC20 destToken; - uint256 amount; - uint256 minReturn; - Referral referral; - } - - struct SwapDistribution { - uint256[] weights; - } - - struct PathDistribution { - SwapDistribution[] swapDistributions; - } - - function makeSwap( - SwapInput calldata input, - Swap calldata swap, - SwapDistribution calldata swapDistribution - ) - external - payable - virtual - returns(uint256 returnAmount); - - function makePathSwap( - SwapInput calldata input, - Path calldata path, - PathDistribution calldata pathDistribution - ) - external - payable - virtual - returns(uint256 returnAmount); - - function makeMultiPathSwap( - SwapInput calldata input, - Path[] calldata paths, - PathDistribution[] calldata pathDistributions, - SwapDistribution calldata interPathsDistribution - ) - external - payable - virtual - returns(uint256 returnAmount); -} diff --git a/contracts/ISource.sol b/contracts/ISource.sol index 6b4576e..8b049bd 100644 --- a/contracts/ISource.sol +++ b/contracts/ISource.sol @@ -3,7 +3,7 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import "./IOneRouter.sol"; +import "./IOneRouterView.sol"; interface ISource { diff --git a/contracts/KyberMooniswapReserve.sol b/contracts/KyberMooniswapReserve.sol new file mode 100644 index 0000000..f4361a5 --- /dev/null +++ b/contracts/KyberMooniswapReserve.sol @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "./IOneRouterView.sol"; + + +interface IKyberReserve { + function getConversionRate( + IERC20 src, + IERC20 dst, + uint256 srcQty, + uint256 blockNumber + ) external view returns(uint); + + function trade( + IERC20 srcToken, + uint256 srcAmount, + IERC20 dstToken, + address destAddress, + uint256 conversionRate, + bool validate + ) external payable returns(bool); +} + + +contract KyberMooniswapReserve { + +} diff --git a/contracts/OneRouter.sol b/contracts/OneRouter.sol deleted file mode 100644 index e609160..0000000 --- a/contracts/OneRouter.sol +++ /dev/null @@ -1,593 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity ^0.6.0; -pragma experimental ABIEncoderV2; - -import "@openzeppelin/contracts/access/Ownable.sol"; -import "./interfaces/IUniswapV1.sol"; -import "./interfaces/IUniswapV2.sol"; -import "./interfaces/IBalancer.sol"; -import "./interfaces/IAaveRegistry.sol"; -import "./interfaces/ICompoundRegistry.sol"; -import "./IOneRouter.sol"; -import "./ISource.sol"; -import "./OneRouterConstants.sol"; - -import "./libraries/Algo.sol"; -import "./libraries/Address2.sol"; -import "./libraries/UniERC20.sol"; -import "./libraries/RevertReason.sol"; -import "./libraries/FlagsChecker.sol"; -import "./libraries/DynamicMemoryArray.sol"; - -import "./sources/UniswapV1Source.sol"; -import "./sources/UniswapV2Source.sol"; -import "./sources/MooniswapSource.sol"; -import "./sources/KyberSource.sol"; -import "./sources/CurveSource.sol"; -// import "./sources/BalancerSource.sol"; - - -contract PathsAdvisor is OneRouterConstants { - using UniERC20 for IERC20; - - IAaveRegistry constant private _AAVE_REGISTRY = IAaveRegistry(0xEd8b133B7B88366E01Bb9E38305Ab11c26521494); - ICompoundRegistry constant private _COMPOUND_REGISTRY = ICompoundRegistry(0xF451Dbd7Ba14BFa7B1B78A766D3Ed438F79EE1D1); - - function getPathsForTokens(IERC20 fromToken, IERC20 destToken) external view returns(IERC20[][] memory paths) { - IERC20[4] memory midTokens = [_DAI, _USDC, _USDT, _WBTC]; - paths = new IERC20[][](2 + midTokens.length); - - IERC20 aFromToken = _AAVE_REGISTRY.aTokenByToken(fromToken); - IERC20 aDestToken = _AAVE_REGISTRY.aTokenByToken(destToken); - if (aFromToken != IERC20(0)) { - aFromToken = _COMPOUND_REGISTRY.cTokenByToken(fromToken); - } - if (aDestToken != IERC20(0)) { - aDestToken = _COMPOUND_REGISTRY.cTokenByToken(destToken); - } - - uint index = 0; - paths[index] = new IERC20[](0); - index++; - - if (!fromToken.isETH() && !aFromToken.isETH() && !destToken.isETH() && !aDestToken.isETH()) { - paths[index] = new IERC20[](1); - paths[index][0] = UniERC20.ETH_ADDRESS; - index++; - } - - for (uint i = 0; i < midTokens.length; i++) { - if (fromToken != midTokens[i] && aFromToken != midTokens[i] && destToken != midTokens[i] && aDestToken != midTokens[i]) { - paths[index] = new IERC20[]( - 1 + - ((aFromToken != IERC20(0)) ? 1 : 0) + - ((aDestToken != IERC20(0)) ? 1 : 0) - ); - - paths[index][0] = aFromToken; - paths[index][paths[index].length / 2] = midTokens[i]; - if (aDestToken != IERC20(0)) { - paths[index][paths[index].length - 1] = aDestToken; - } - index++; - } - } - - IERC20[][] memory paths2 = new IERC20[][](index); - for (uint i = 0; i < paths2.length; i++) { - paths2[i] = paths[i]; - } - paths = paths2; - } -} - - -contract HotSwapSources is Ownable { - uint256 public sourcesCount = 15; - mapping(uint256 => ISource) public sources; - PathsAdvisor public pathsAdvisor; - - constructor() public { - pathsAdvisor = new PathsAdvisor(); - } - - function setSource(uint256 index, ISource source) external onlyOwner { - require(index <= sourcesCount, "Router: index is too high"); - sources[index] = source; - sourcesCount = Math.max(sourcesCount, index + 1); - } - - function setPathsForTokens(PathsAdvisor newPathsAdvisor) external onlyOwner { - pathsAdvisor = newPathsAdvisor; - } - - function _getPathsForTokens(IERC20 fromToken, IERC20 destToken) internal view returns(IERC20[][] memory paths) { - return pathsAdvisor.getPathsForTokens(fromToken, destToken); - } -} - - -contract OneRouterView is - OneRouterConstants, - IOneRouterView, - HotSwapSources, - UniswapV1SourceView, - UniswapV2SourceView, - MooniswapSourceView, - KyberSourceView, - CurveSourceView - // BalancerSourceView -{ - using UniERC20 for IERC20; - using SafeMath for uint256; - using FlagsChecker for uint256; - using DynamicMemoryArray for DynamicMemoryArray.Addresses; - - function getReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) - public - view - override - returns( - Path[] memory paths, - PathResult[] memory pathResults, - SwapResult memory splitResult - ) - { - IERC20[][] memory midTokens = _getPathsForTokens(fromToken, swap.destToken); - - paths = new Path[](midTokens.length); - pathResults = new PathResult[](paths.length); - DynamicMemoryArray.Addresses memory disabledDexes; - for (uint i = 0; i < paths.length; i++) { - paths[i] = Path({swaps: new Swap[](1 + midTokens[i - 1].length)}); - for (uint j = 0; j < midTokens[i - 1].length; j++) { - if (fromToken == midTokens[i - 1][j] || swap.destToken == midTokens[i - 1][j]) { - paths[i] = Path({swaps: new Swap[](1)}); - break; - } - - paths[i].swaps[j] = Swap({ - destToken: midTokens[i - 1][j], - flags: swap.flags, - destTokenEthPriceTimesGasPrice: _scaleDestTokenEthPriceTimesGasPrice(fromToken, midTokens[i - 1][j], swap.destTokenEthPriceTimesGasPrice), - disabledDexes: disabledDexes.copy() - }); - } - paths[i].swaps[paths[i].swaps.length - 1] = swap; - - pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); - for (uint j = 0; j < pathResults[i].swaps.length; j++) { - for (uint k = 0; k < pathResults[i].swaps[j].dexes.length; k++) { - for (uint t = 0; t < pathResults[i].swaps[j].dexes[k].length; t++) { - if (pathResults[i].swaps[j].dexes[k][t] != address(0)) { - disabledDexes.push(pathResults[i].swaps[j].dexes[k][t]); - } - } - } - } - } - - splitResult = bestDistributionAmongPaths(paths, pathResults); - } - - function getMultiPathReturn(IERC20 fromToken, uint256[] memory amounts, Path[] memory paths) - public - view - override - returns( - PathResult[] memory pathResults, - SwapResult memory splitResult - ) - { - pathResults = new PathResult[](paths.length); - for (uint i = 0; i < paths.length; i++) { - pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); - } - splitResult = bestDistributionAmongPaths(paths, pathResults); - } - - function bestDistributionAmongPaths(Path[] memory paths, PathResult[] memory pathResults) public pure returns(SwapResult memory) { - uint256[][] memory input = new uint256[][](paths.length); - uint256[][] memory gases = new uint256[][](paths.length); - uint256[][] memory costs = new uint256[][](paths.length); - for (uint i = 0; i < pathResults.length; i++) { - Swap memory subSwap = paths[i].swaps[paths[i].swaps.length - 1]; - SwapResult memory swapResult = pathResults[i].swaps[pathResults[i].swaps.length - 1]; - - input[i] = new uint256[](swapResult.returnAmounts.length); - gases[i] = new uint256[](swapResult.returnAmounts.length); - costs[i] = new uint256[](swapResult.returnAmounts.length); - for (uint j = 0; j < swapResult.returnAmounts.length; j++) { - input[i][j] = swapResult.returnAmounts[j]; - gases[i][j] = swapResult.estimateGasAmounts[j]; - costs[i][j] = swapResult.estimateGasAmounts[j].mul(subSwap.destTokenEthPriceTimesGasPrice).div(1e18); - } - } - return _findBestDistribution(input, costs, gases, input[0].length); - } - - function getPathReturn(IERC20 fromToken, uint256[] memory amounts, Path memory path) - public - view - override - returns(PathResult memory result) - { - result.swaps = new SwapResult[](path.swaps.length); - - for (uint i = 0; i < path.swaps.length; i++) { - result.swaps[i] = getSwapReturn(fromToken, amounts, path.swaps[i]); - fromToken = path.swaps[i].destToken; - amounts = result.swaps[i].returnAmounts; - } - } - - function getSwapReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) - public - view - override - returns(SwapResult memory result) - { - if (fromToken == swap.destToken) { - result.returnAmounts = amounts; - return result; - } - - function(IERC20,uint256[] memory,Swap memory) view returns(uint256[] memory, address, uint256)[15] memory reserves = [ - _calculateUniswapV1, - _calculateUniswapV2, - _calculateMooniswap, - _calculateKyber1, - _calculateKyber2, - _calculateKyber3, - _calculateKyber4, - _calculateCurveCompound, - _calculateCurveUSDT, - _calculateCurveY, - _calculateCurveBinance, - _calculateCurveSynthetix, - _calculateCurvePAX, - _calculateCurveRENBTC, - _calculateCurveSBTC - // _calculateBalancer1, - // _calculateBalancer2, - // _calculateBalancer3, - // calculateBancor, - // calculateOasis, - // calculateDforceSwap, - // calculateShell, - // calculateMStableMUSD, - // calculateBlackHoleSwap - ]; - - uint256[][] memory input = new uint256[][](sourcesCount); - uint256[][] memory gases = new uint256[][](sourcesCount); - uint256[][] memory costs = new uint256[][](sourcesCount); - bool disableAll = swap.flags.check(_FLAG_DISABLE_ALL_SOURCES); - for (uint i = 0; i < sourcesCount; i++) { - uint256 gas; - if (disableAll == swap.flags.check(1 << i)) { - if (sources[i] != ISource(0)) { - (input[i], , gas) = sources[i].calculate(fromToken, amounts, swap); - } - else if (i < reserves.length) { - (input[i], , gas) = reserves[i](fromToken, amounts, swap); - } - } - - gases[i] = new uint256[](amounts.length); - costs[i] = new uint256[](amounts.length); - uint256 fee = gas.mul(swap.destTokenEthPriceTimesGasPrice).div(1e18); - for (uint j = 0; j < amounts.length; j++) { - gases[i][j] = gas; - costs[i][j] = fee; - } - } - - result = _findBestDistribution(input, costs, gases, amounts.length); - } - - function _calculateNoReturn(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) - private view returns(uint256[] memory rets, uint256 gas) - { - } - - function _scaleDestTokenEthPriceTimesGasPrice(IERC20 fromToken, IERC20 destToken, uint256 destTokenEthPriceTimesGasPrice) private view returns(uint256) { - if (fromToken == destToken) { - return destTokenEthPriceTimesGasPrice; - } - - uint256 mul = _cheapGetPrice(UniERC20.ETH_ADDRESS, destToken, 0.001 ether); - uint256 div = _cheapGetPrice(UniERC20.ETH_ADDRESS, fromToken, 0.001 ether); - return (div == 0) ? 0 : destTokenEthPriceTimesGasPrice.mul(mul).div(div); - } - - function _cheapGetPrice(IERC20 fromToken, IERC20 destToken, uint256 amount) private view returns(uint256 returnAmount) { - uint256[] memory amounts = new uint256[](1); - amounts[0] = amount; - - uint256 flags = _FLAG_DISABLE_RECALCULATION | - _FLAG_DISABLE_ALL_SOURCES | - _FLAG_DISABLE_UNISWAP_V1 | - _FLAG_DISABLE_UNISWAP_V2; - - return this.getSwapReturn( - fromToken, - amounts, - Swap({ - destToken: destToken, - flags: flags, - destTokenEthPriceTimesGasPrice: 0, - disabledDexes: new address[](0) - }) - ).returnAmounts[0]; - } - - function _findBestDistribution(uint256[][] memory input, uint256[][] memory costs, uint256[][] memory gases, uint256 parts) - private pure returns(SwapResult memory result) - { - int256[][] memory matrix = new int256[][](input.length); - for (uint i = 0; i < input.length; i++) { - matrix[i] = new int256[](1 + parts); - matrix[i][0] = Algo.VERY_NEGATIVE_VALUE; - for (uint j = 0; j < parts; j++) { - matrix[i][j + 1] = - (j < input[i].length && input[i][j] != 0) - ? int256(input[i][j]) - int256(costs[i][j]) - : Algo.VERY_NEGATIVE_VALUE; - } - } - - (, result.distributions) = Algo.findBestDistribution(matrix, parts); - - result.returnAmounts = new uint256[](parts); - result.estimateGasAmounts = new uint256[](parts); - for (uint i = 0; i < input.length; i++) { - for (uint j = 0; j < parts; j++) { - if (result.distributions[j][i] > 0) { - uint256 index = result.distributions[j][i] - 1; - result.returnAmounts[j] = result.returnAmounts[j].add(index < input[i].length ? input[i][index] : 0); - result.estimateGasAmounts[j] = result.estimateGasAmounts[j].add(gases[i][j]); - } - } - } - } -} - - -contract OneRouter is - OneRouterConstants, - IOneRouter, - HotSwapSources, - UniswapV1SourceSwap, - UniswapV2SourceSwap, - MooniswapSourceSwap, - KyberSourceSwap, - CurveSourceSwap - // BalancerSourceSwap -{ - using UniERC20 for IERC20; - using SafeMath for uint256; - using Address2 for address; - using FlagsChecker for uint256; - - IOneRouterView public oneRouterView; - - constructor(IOneRouterView _oneRouterView) public { - oneRouterView = _oneRouterView; - } - - receive() external payable { - // solhint-disable-next-line avoid-tx-origin - require(msg.sender != tx.origin, "ETH deposit rejected"); - } - - function getReturn( - IERC20 fromToken, - uint256[] calldata amounts, - Swap calldata swap - ) - external - view - override - returns( - Path[] memory paths, - PathResult[] memory pathResults, - SwapResult memory splitResult - ) - { - return oneRouterView.getReturn(fromToken, amounts, swap); - } - - function getSwapReturn( - IERC20 fromToken, - uint256[] calldata amounts, - Swap calldata swap - ) - external - view - override - returns(SwapResult memory result) - { - return oneRouterView.getSwapReturn(fromToken, amounts, swap); - } - - function getPathReturn( - IERC20 fromToken, - uint256[] calldata amounts, - Path calldata path - ) - external - view - override - returns(PathResult memory result) - { - return oneRouterView.getPathReturn(fromToken, amounts, path); - } - - function getMultiPathReturn( - IERC20 fromToken, - uint256[] calldata amounts, - Path[] calldata paths - ) - external - view - override - returns( - PathResult[] memory pathResults, - SwapResult memory splitResult - ) - { - return oneRouterView.getMultiPathReturn(fromToken, amounts, paths); - } - - function makeSwap( - SwapInput memory input, - Swap memory swap, - SwapDistribution memory swapDistribution - ) - public - payable - override - returns(uint256 returnAmount) - { - Path memory path = Path({ - swaps: new IOneRouterView.Swap[](1) - }); - path.swaps[0] = swap; - - PathDistribution memory pathDistribution = PathDistribution({ - swapDistributions: new SwapDistribution[](1) - }); - pathDistribution.swapDistributions[0] = swapDistribution; - - return makePathSwap(input, path, pathDistribution); - } - - function makePathSwap( - SwapInput memory input, - Path memory path, - PathDistribution memory pathDistribution - ) - public - payable - override - returns(uint256 returnAmount) - { - Path[] memory paths = new Path[](1); - paths[0] = path; - - PathDistribution[] memory pathDistributions = new PathDistribution[](1); - pathDistributions[0] = pathDistribution; - - SwapDistribution memory swapDistribution = SwapDistribution({ - weights: new uint256[](1) - }); - swapDistribution.weights[0] = 1; - - return makeMultiPathSwap(input, paths, pathDistributions, swapDistribution); - } - - struct Indexes { - uint p; // path - uint s; // swap - uint i; // index - } - - function makeMultiPathSwap( - SwapInput memory input, - Path[] memory paths, - PathDistribution[] memory pathDistributions, - SwapDistribution memory interPathsDistribution - ) - public - payable - override - returns(uint256 returnAmount) - { - require(msg.value == (input.fromToken.isETH() ? input.amount : 0), "Wrong msg.value"); - require(paths.length == pathDistributions.length, "Wrong arrays length"); - require(paths.length == interPathsDistribution.weights.length, "Wrong arrays length"); - - input.fromToken.uniTransferFromSender(address(this), input.amount); - - function(IERC20,IERC20,uint256,uint256)[15] memory reserves = [ - _swapOnUniswapV1, - _swapOnUniswapV2, - _swapOnMooniswap, - _swapOnKyber1, - _swapOnKyber2, - _swapOnKyber3, - _swapOnKyber4, - _swapOnCurveCompound, - _swapOnCurveUSDT, - _swapOnCurveY, - _swapOnCurveBinance, - _swapOnCurveSynthetix, - _swapOnCurvePAX, - _swapOnCurveRENBTC, - _swapOnCurveSBTC - // _swapOnBalancer1, - // _swapOnBalancer2, - // _swapOnBalancer3, - // _swapOnBancor, - // _swapOnOasis, - // _swapOnDforceSwap, - // _swapOnShell, - // _swapOnMStableMUSD, - // _swapOnBlackHoleSwap - ]; - - uint256 interTotalWeight = 0; - for (uint i = 0; i < interPathsDistribution.weights.length; i++) { - interTotalWeight = interTotalWeight.add(interPathsDistribution.weights[i]); - } - - Indexes memory z; - for (z.p = 0; z.p < pathDistributions.length && interTotalWeight > 0; z.p++) { - uint256 confirmed = input.fromToken.uniBalanceOf(address(this)) - .mul(interPathsDistribution.weights[z.p]) - .div(interTotalWeight); - interTotalWeight = interTotalWeight.sub(interPathsDistribution.weights[z.p]); - - IERC20 token = input.fromToken; - for (z.s = 0; z.s < pathDistributions[z.p].swapDistributions.length; z.s++) { - uint256 totalSwapWeight = 0; - for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length; z.i++) { - totalSwapWeight = totalSwapWeight.add(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]); - } - - for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length && totalSwapWeight > 0; z.i++) { - uint256 amount = ((z.s == 0) ? confirmed : token.uniBalanceOf(address(this))) - .mul(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]) - .div(totalSwapWeight); - totalSwapWeight = totalSwapWeight.sub(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]); - - if (sources[z.i] != ISource(0)) { - address(sources[z.i]).functionDelegateCall( - abi.encodeWithSelector( - sources[z.i].swap.selector, - input.fromToken, - input.destToken, - amount, - paths[z.p].swaps[z.s].flags - ), - "Delegatecall failed" - ); - } - else if (z.i < reserves.length) { - reserves[z.i](input.fromToken, input.destToken, amount, paths[z.p].swaps[z.s].flags); - } - } - - token = paths[z.p].swaps[z.s].destToken; - } - } - - uint256 remaining = input.fromToken.uniBalanceOf(address(this)); - returnAmount = input.destToken.uniBalanceOf(address(this)); - require(returnAmount >= input.minReturn, "Min returns is not enough"); - input.fromToken.uniTransfer(msg.sender, remaining); - input.destToken.uniTransfer(msg.sender, returnAmount); - } -} diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol index 0fd5698..454a9f0 100644 --- a/contracts/OneRouterAudit.sol +++ b/contracts/OneRouterAudit.sol @@ -3,10 +3,11 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@openzeppelin/contracts/math/Math.sol"; import "@openzeppelin/contracts/math/SafeMath.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/access/Ownable.sol"; -import "./IOneRouter.sol"; +import "./IOneRouterSwap.sol"; import "./libraries/UniERC20.sol"; import "./sources/MooniswapSource.sol"; import "./OneRouterConstants.sol"; @@ -26,24 +27,27 @@ interface IFreeFromUpTo { } -contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { +contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, Ownable { using UniERC20 for IERC20; using SafeMath for uint256; - IOneRouter public oneRouterImpl; + IOneRouterView public oneRouterView; + IOneRouterSwap public oneRouterSwap; modifier validateInput(SwapInput memory input) { require(input.referral.fee <= 0.03e18, "OneRouter: fee out of range"); - require(input.fromToken == input.destToken, "OneRouter: invalid input"); + require(input.fromToken != input.destToken, "OneRouter: invalid input"); _; } - constructor(IOneRouter oneRouter) public { - oneRouterImpl = oneRouter; + constructor(IOneRouterView _oneRouterView, IOneRouterSwap _oneRouterSwap) public { + oneRouterView = _oneRouterView; + oneRouterSwap = _oneRouterSwap; } - function setOneRouterImpl(IOneRouter oneRouter) public onlyOwner { - oneRouterImpl = oneRouter; + function setOneRouter(IOneRouterView _oneRouterView, IOneRouterSwap _oneRouterSwap) public onlyOwner { + oneRouterView = _oneRouterView; + oneRouterSwap = _oneRouterSwap; } receive() external payable { @@ -63,7 +67,7 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { SwapResult memory splitResult ) { - return oneRouterImpl.getReturn(fromToken, amounts, swap); + return oneRouterView.getReturn(fromToken, amounts, swap); } function getSwapReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) @@ -72,7 +76,7 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { override returns(SwapResult memory result) { - return oneRouterImpl.getSwapReturn(fromToken, amounts, swap); + return oneRouterView.getSwapReturn(fromToken, amounts, swap); } function getPathReturn(IERC20 fromToken, uint256[] memory amounts, Path memory path) @@ -81,7 +85,7 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { override returns(PathResult memory result) { - return oneRouterImpl.getPathReturn(fromToken, amounts, path); + return oneRouterView.getPathReturn(fromToken, amounts, path); } function getMultiPathReturn(IERC20 fromToken, uint256[] memory amounts, Path[] memory paths) @@ -93,7 +97,7 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { SwapResult memory splitResult ) { - return oneRouterImpl.getMultiPathReturn(fromToken, amounts, paths); + return oneRouterView.getMultiPathReturn(fromToken, amounts, paths); } // Swap methods @@ -111,8 +115,8 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { { uint256 gasStart = gasleft(); _claimInput(input); - input.fromToken.uniApprove(address(oneRouterImpl), input.amount); - oneRouterImpl.makeSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, swap, swapDistribution); + input.fromToken.uniApprove(address(oneRouterSwap), input.amount); + oneRouterSwap.makeSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, swap, swapDistribution); return _checkMinReturn(gasStart, input, swap.flags); } @@ -129,8 +133,8 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { { uint256 gasStart = gasleft(); _claimInput(input); - input.fromToken.uniApprove(address(oneRouterImpl), input.amount); - oneRouterImpl.makePathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, path, pathDistribution); + input.fromToken.uniApprove(address(oneRouterSwap), input.amount); + oneRouterSwap.makePathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, path, pathDistribution); return _checkMinReturn(gasStart, input, path.swaps[0].flags); } @@ -148,8 +152,8 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { { uint256 gasStart = gasleft(); _claimInput(input); - input.fromToken.uniApprove(address(oneRouterImpl), input.amount); - oneRouterImpl.makeMultiPathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, paths, pathDistributions, interPathsDistribution); + input.fromToken.uniApprove(address(oneRouterSwap), input.amount); + oneRouterSwap.makeMultiPathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, paths, pathDistributions, interPathsDistribution); return _checkMinReturn(gasStart, input, paths[0].swaps[0].flags); } @@ -182,6 +186,10 @@ contract OneRouterAudit is IOneRouter, OneRouterConstants, Ownable { } function _chiBurnOrSell(address payable sponsor, uint256 amount) internal { + amount = Math.min(amount, _CHI.balanceOf(sponsor)); + if (amount == 0) { + return; + } IMooniswap exchange = IMooniswap(0x5B1fC2435B1f7C16c206e7968C0e8524eC29b786); uint256 sellRefund = MooniswapHelper.getReturn(exchange, _CHI, UniERC20.ZERO_ADDRESS, amount); uint256 burnRefund = amount.mul(18_000).mul(tx.gasprice); diff --git a/contracts/OneRouterSwap.sol b/contracts/OneRouterSwap.sol new file mode 100644 index 0000000..28cb10e --- /dev/null +++ b/contracts/OneRouterSwap.sol @@ -0,0 +1,189 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "./libraries/Address2.sol"; + +import "./sources/UniswapV1Source.sol"; +import "./sources/UniswapV2Source.sol"; +import "./sources/MooniswapSource.sol"; +import "./sources/KyberSource.sol"; +import "./sources/CurveSource.sol"; +// import "./sources/BalancerSource.sol"; + +import "./IOneRouterSwap.sol"; +import "./HotSwapSources.sol"; + + +contract OneRouterSwap is + OneRouterConstants, + IOneRouterSwap, + HotSwapSources, + UniswapV1SourceSwap, + UniswapV2SourceSwap, + MooniswapSourceSwap, + KyberSourceSwap, + CurveSourceSwap + // BalancerSourceSwap +{ + using UniERC20 for IERC20; + using SafeMath for uint256; + using Address2 for address; + using FlagsChecker for uint256; + + receive() external payable { + // solhint-disable-next-line avoid-tx-origin + require(msg.sender != tx.origin, "ETH deposit rejected"); + } + + function makeSwap( + SwapInput memory input, + IOneRouterView.Swap memory swap, + SwapDistribution memory swapDistribution + ) + public + payable + override + returns(uint256 returnAmount) + { + IOneRouterView.Path memory path = IOneRouterView.Path({ + swaps: new IOneRouterView.Swap[](1) + }); + path.swaps[0] = swap; + + PathDistribution memory pathDistribution = PathDistribution({ + swapDistributions: new SwapDistribution[](1) + }); + pathDistribution.swapDistributions[0] = swapDistribution; + + return makePathSwap(input, path, pathDistribution); + } + + function makePathSwap( + SwapInput memory input, + IOneRouterView.Path memory path, + PathDistribution memory pathDistribution + ) + public + payable + override + returns(uint256 returnAmount) + { + IOneRouterView.Path[] memory paths = new IOneRouterView.Path[](1); + paths[0] = path; + + PathDistribution[] memory pathDistributions = new PathDistribution[](1); + pathDistributions[0] = pathDistribution; + + SwapDistribution memory swapDistribution = SwapDistribution({ + weights: new uint256[](1) + }); + swapDistribution.weights[0] = 1; + + return makeMultiPathSwap(input, paths, pathDistributions, swapDistribution); + } + + struct Indexes { + uint p; // path + uint s; // swap + uint i; // index + } + + function makeMultiPathSwap( + SwapInput memory input, + IOneRouterView.Path[] memory paths, + PathDistribution[] memory pathDistributions, + SwapDistribution memory interPathsDistribution + ) + public + payable + override + returns(uint256 returnAmount) + { + require(msg.value == (input.fromToken.isETH() ? input.amount : 0), "Wrong msg.value"); + require(paths.length == pathDistributions.length, "Wrong arrays length"); + require(paths.length == interPathsDistribution.weights.length, "Wrong arrays length"); + + input.fromToken.uniTransferFromSender(address(this), input.amount); + + function(IERC20,IERC20,uint256,uint256)[15] memory reserves = [ + _swapOnUniswapV1, + _swapOnUniswapV2, + _swapOnMooniswap, + _swapOnKyber1, + _swapOnKyber2, + _swapOnKyber3, + _swapOnKyber4, + _swapOnCurveCompound, + _swapOnCurveUSDT, + _swapOnCurveY, + _swapOnCurveBinance, + _swapOnCurveSynthetix, + _swapOnCurvePAX, + _swapOnCurveRENBTC, + _swapOnCurveSBTC + // _swapOnBalancer1, + // _swapOnBalancer2, + // _swapOnBalancer3, + // _swapOnBancor, + // _swapOnOasis, + // _swapOnDforceSwap, + // _swapOnShell, + // _swapOnMStableMUSD, + // _swapOnBlackHoleSwap + ]; + + uint256 interTotalWeight = 0; + for (uint i = 0; i < interPathsDistribution.weights.length; i++) { + interTotalWeight = interTotalWeight.add(interPathsDistribution.weights[i]); + } + + Indexes memory z; + for (z.p = 0; z.p < pathDistributions.length && interTotalWeight > 0; z.p++) { + uint256 confirmed = input.fromToken.uniBalanceOf(address(this)) + .mul(interPathsDistribution.weights[z.p]) + .div(interTotalWeight); + interTotalWeight = interTotalWeight.sub(interPathsDistribution.weights[z.p]); + + IERC20 token = input.fromToken; + for (z.s = 0; z.s < pathDistributions[z.p].swapDistributions.length; z.s++) { + uint256 totalSwapWeight = 0; + for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length; z.i++) { + totalSwapWeight = totalSwapWeight.add(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]); + } + + for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length && totalSwapWeight > 0; z.i++) { + uint256 amount = ((z.s == 0) ? confirmed : token.uniBalanceOf(address(this))) + .mul(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]) + .div(totalSwapWeight); + totalSwapWeight = totalSwapWeight.sub(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]); + + if (sources[z.i] != ISource(0)) { + address(sources[z.i]).functionDelegateCall( + abi.encodeWithSelector( + sources[z.i].swap.selector, + input.fromToken, + input.destToken, + amount, + paths[z.p].swaps[z.s].flags + ), + "Delegatecall failed" + ); + } + else if (z.i < reserves.length) { + reserves[z.i](input.fromToken, input.destToken, amount, paths[z.p].swaps[z.s].flags); + } + } + + token = paths[z.p].swaps[z.s].destToken; + } + } + + uint256 remaining = input.fromToken.uniBalanceOf(address(this)); + returnAmount = input.destToken.uniBalanceOf(address(this)); + require(returnAmount >= input.minReturn, "Min returns is not enough"); + input.fromToken.uniTransfer(msg.sender, remaining); + input.destToken.uniTransfer(msg.sender, returnAmount); + } +} diff --git a/contracts/OneRouterView.sol b/contracts/OneRouterView.sol new file mode 100644 index 0000000..faaf072 --- /dev/null +++ b/contracts/OneRouterView.sol @@ -0,0 +1,272 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +// import "./interfaces/IUniswapV1.sol"; +// import "./interfaces/IUniswapV2.sol"; +// import "./interfaces/IBalancer.sol"; +import "./IOneRouterView.sol"; +import "./ISource.sol"; +import "./OneRouterConstants.sol"; +import "./HotSwapSources.sol"; + +import "./libraries/Algo.sol"; +import "./libraries/UniERC20.sol"; +import "./libraries/RevertReason.sol"; +import "./libraries/FlagsChecker.sol"; +import "./libraries/DynamicMemoryArray.sol"; + +import "./sources/UniswapV1Source.sol"; +import "./sources/UniswapV2Source.sol"; +import "./sources/MooniswapSource.sol"; +import "./sources/KyberSource.sol"; +import "./sources/CurveSource.sol"; +// import "./sources/BalancerSource.sol"; + + +contract OneRouterView is + OneRouterConstants, + IOneRouterView, + HotSwapSources, + UniswapV1SourceView, + UniswapV2SourceView, + MooniswapSourceView, + KyberSourceView, + CurveSourceView + // BalancerSourceView +{ + using UniERC20 for IERC20; + using SafeMath for uint256; + using FlagsChecker for uint256; + using DynamicMemoryArray for DynamicMemoryArray.Addresses; + + function getReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) + public + view + override + returns( + Path[] memory paths, + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + IERC20[][] memory midTokens = _getPathsForTokens(fromToken, swap.destToken); + + paths = new Path[](midTokens.length); + pathResults = new PathResult[](paths.length); + DynamicMemoryArray.Addresses memory disabledDexes; + for (uint i = 0; i < paths.length; i++) { + paths[i] = Path({swaps: new Swap[](1 + midTokens[i - 1].length)}); + for (uint j = 0; j < midTokens[i - 1].length; j++) { + if (fromToken == midTokens[i - 1][j] || swap.destToken == midTokens[i - 1][j]) { + paths[i] = Path({swaps: new Swap[](1)}); + break; + } + + paths[i].swaps[j] = Swap({ + destToken: midTokens[i - 1][j], + flags: swap.flags, + destTokenEthPriceTimesGasPrice: _scaleDestTokenEthPriceTimesGasPrice(fromToken, midTokens[i - 1][j], swap.destTokenEthPriceTimesGasPrice), + disabledDexes: disabledDexes.copy() + }); + } + paths[i].swaps[paths[i].swaps.length - 1] = swap; + + pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); + for (uint j = 0; j < pathResults[i].swaps.length; j++) { + for (uint k = 0; k < pathResults[i].swaps[j].dexes.length; k++) { + for (uint t = 0; t < pathResults[i].swaps[j].dexes[k].length; t++) { + if (pathResults[i].swaps[j].dexes[k][t] != address(0)) { + disabledDexes.push(pathResults[i].swaps[j].dexes[k][t]); + } + } + } + } + } + + splitResult = bestDistributionAmongPaths(paths, pathResults); + } + + function getMultiPathReturn(IERC20 fromToken, uint256[] memory amounts, Path[] memory paths) + public + view + override + returns( + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + pathResults = new PathResult[](paths.length); + for (uint i = 0; i < paths.length; i++) { + pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); + } + splitResult = bestDistributionAmongPaths(paths, pathResults); + } + + function bestDistributionAmongPaths(Path[] memory paths, PathResult[] memory pathResults) public pure returns(SwapResult memory) { + uint256[][] memory input = new uint256[][](paths.length); + uint256[][] memory gases = new uint256[][](paths.length); + uint256[][] memory costs = new uint256[][](paths.length); + for (uint i = 0; i < pathResults.length; i++) { + Swap memory subSwap = paths[i].swaps[paths[i].swaps.length - 1]; + SwapResult memory swapResult = pathResults[i].swaps[pathResults[i].swaps.length - 1]; + + input[i] = new uint256[](swapResult.returnAmounts.length); + gases[i] = new uint256[](swapResult.returnAmounts.length); + costs[i] = new uint256[](swapResult.returnAmounts.length); + for (uint j = 0; j < swapResult.returnAmounts.length; j++) { + input[i][j] = swapResult.returnAmounts[j]; + gases[i][j] = swapResult.estimateGasAmounts[j]; + costs[i][j] = swapResult.estimateGasAmounts[j].mul(subSwap.destTokenEthPriceTimesGasPrice).div(1e18); + } + } + return _findBestDistribution(input, costs, gases, input[0].length); + } + + function getPathReturn(IERC20 fromToken, uint256[] memory amounts, Path memory path) + public + view + override + returns(PathResult memory result) + { + result.swaps = new SwapResult[](path.swaps.length); + + for (uint i = 0; i < path.swaps.length; i++) { + result.swaps[i] = getSwapReturn(fromToken, amounts, path.swaps[i]); + fromToken = path.swaps[i].destToken; + amounts = result.swaps[i].returnAmounts; + } + } + + function getSwapReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) + public + view + override + returns(SwapResult memory result) + { + if (fromToken == swap.destToken) { + result.returnAmounts = amounts; + return result; + } + + function(IERC20,uint256[] memory,Swap memory) view returns(uint256[] memory, address, uint256)[15] memory reserves = [ + _calculateUniswapV1, + _calculateUniswapV2, + _calculateMooniswap, + _calculateKyber1, + _calculateKyber2, + _calculateKyber3, + _calculateKyber4, + _calculateCurveCompound, + _calculateCurveUSDT, + _calculateCurveY, + _calculateCurveBinance, + _calculateCurveSynthetix, + _calculateCurvePAX, + _calculateCurveRENBTC, + _calculateCurveSBTC + // _calculateBalancer1, + // _calculateBalancer2, + // _calculateBalancer3, + // calculateBancor, + // calculateOasis, + // calculateDforceSwap, + // calculateShell, + // calculateMStableMUSD, + // calculateBlackHoleSwap + ]; + + uint256[][] memory input = new uint256[][](sourcesCount); + uint256[][] memory gases = new uint256[][](sourcesCount); + uint256[][] memory costs = new uint256[][](sourcesCount); + bool disableAll = swap.flags.check(_FLAG_DISABLE_ALL_SOURCES); + for (uint i = 0; i < sourcesCount; i++) { + uint256 gas; + if (disableAll == swap.flags.check(1 << i)) { + if (sources[i] != ISource(0)) { + (input[i], , gas) = sources[i].calculate(fromToken, amounts, swap); + } + else if (i < reserves.length) { + (input[i], , gas) = reserves[i](fromToken, amounts, swap); + } + } + + gases[i] = new uint256[](amounts.length); + costs[i] = new uint256[](amounts.length); + uint256 fee = gas.mul(swap.destTokenEthPriceTimesGasPrice).div(1e18); + for (uint j = 0; j < amounts.length; j++) { + gases[i][j] = gas; + costs[i][j] = fee; + } + } + + result = _findBestDistribution(input, costs, gases, amounts.length); + } + + function _calculateNoReturn(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) + private view returns(uint256[] memory rets, uint256 gas) + { + } + + function _scaleDestTokenEthPriceTimesGasPrice(IERC20 fromToken, IERC20 destToken, uint256 destTokenEthPriceTimesGasPrice) private view returns(uint256) { + if (fromToken == destToken) { + return destTokenEthPriceTimesGasPrice; + } + + uint256 mul = _cheapGetPrice(UniERC20.ETH_ADDRESS, destToken, 0.001 ether); + uint256 div = _cheapGetPrice(UniERC20.ETH_ADDRESS, fromToken, 0.001 ether); + return (div == 0) ? 0 : destTokenEthPriceTimesGasPrice.mul(mul).div(div); + } + + function _cheapGetPrice(IERC20 fromToken, IERC20 destToken, uint256 amount) private view returns(uint256 returnAmount) { + uint256[] memory amounts = new uint256[](1); + amounts[0] = amount; + + uint256 flags = _FLAG_DISABLE_RECALCULATION | + _FLAG_DISABLE_ALL_SOURCES | + _FLAG_DISABLE_UNISWAP_V1 | + _FLAG_DISABLE_UNISWAP_V2; + + return this.getSwapReturn( + fromToken, + amounts, + Swap({ + destToken: destToken, + flags: flags, + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: new address[](0) + }) + ).returnAmounts[0]; + } + + function _findBestDistribution(uint256[][] memory input, uint256[][] memory costs, uint256[][] memory gases, uint256 parts) + private pure returns(SwapResult memory result) + { + int256[][] memory matrix = new int256[][](input.length); + for (uint i = 0; i < input.length; i++) { + matrix[i] = new int256[](1 + parts); + matrix[i][0] = Algo.VERY_NEGATIVE_VALUE; + for (uint j = 0; j < parts; j++) { + matrix[i][j + 1] = + (j < input[i].length && input[i][j] != 0) + ? int256(input[i][j]) - int256(costs[i][j]) + : Algo.VERY_NEGATIVE_VALUE; + } + } + + (, result.distributions) = Algo.findBestDistribution(matrix, parts); + + result.returnAmounts = new uint256[](parts); + result.estimateGasAmounts = new uint256[](parts); + for (uint i = 0; i < input.length; i++) { + for (uint j = 0; j < parts; j++) { + if (result.distributions[j][i] > 0) { + uint256 index = result.distributions[j][i] - 1; + result.returnAmounts[j] = result.returnAmounts[j].add(index < input[i].length ? input[i][index] : 0); + result.estimateGasAmounts[j] = result.estimateGasAmounts[j].add(gases[i][j]); + } + } + } + } +} diff --git a/contracts/PathsAdvisor.sol b/contracts/PathsAdvisor.sol new file mode 100644 index 0000000..6bb1d10 --- /dev/null +++ b/contracts/PathsAdvisor.sol @@ -0,0 +1,65 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "./interfaces/IAaveRegistry.sol"; +import "./interfaces/ICompoundRegistry.sol"; +import "./libraries/UniERC20.sol"; +import "./OneRouterConstants.sol"; + + +contract PathsAdvisor is OneRouterConstants { + using UniERC20 for IERC20; + + IAaveRegistry constant private _AAVE_REGISTRY = IAaveRegistry(0xEd8b133B7B88366E01Bb9E38305Ab11c26521494); + ICompoundRegistry constant private _COMPOUND_REGISTRY = ICompoundRegistry(0xF451Dbd7Ba14BFa7B1B78A766D3Ed438F79EE1D1); + + function getPathsForTokens(IERC20 fromToken, IERC20 destToken) external view returns(IERC20[][] memory paths) { + IERC20[4] memory midTokens = [_DAI, _USDC, _USDT, _WBTC]; + paths = new IERC20[][](2 + midTokens.length); + + IERC20 aFromToken = _AAVE_REGISTRY.aTokenByToken(fromToken); + IERC20 aDestToken = _AAVE_REGISTRY.aTokenByToken(destToken); + if (aFromToken != IERC20(0)) { + aFromToken = _COMPOUND_REGISTRY.cTokenByToken(fromToken); + } + if (aDestToken != IERC20(0)) { + aDestToken = _COMPOUND_REGISTRY.cTokenByToken(destToken); + } + + uint index = 0; + paths[index] = new IERC20[](0); + index++; + + if (!fromToken.isETH() && !aFromToken.isETH() && !destToken.isETH() && !aDestToken.isETH()) { + paths[index] = new IERC20[](1); + paths[index][0] = UniERC20.ETH_ADDRESS; + index++; + } + + for (uint i = 0; i < midTokens.length; i++) { + if (fromToken != midTokens[i] && aFromToken != midTokens[i] && destToken != midTokens[i] && aDestToken != midTokens[i]) { + paths[index] = new IERC20[]( + 1 + + ((aFromToken != IERC20(0)) ? 1 : 0) + + ((aDestToken != IERC20(0)) ? 1 : 0) + ); + + paths[index][0] = aFromToken; + paths[index][paths[index].length / 2] = midTokens[i]; + if (aDestToken != IERC20(0)) { + paths[index][paths[index].length - 1] = aDestToken; + } + index++; + } + } + + IERC20[][] memory paths2 = new IERC20[][](index); + for (uint i = 0; i < paths2.length; i++) { + paths2[i] = paths[i]; + } + paths = paths2; + } +} diff --git a/contracts/sources/BalancerSource.sol b/contracts/sources/BalancerSource.sol index 4b944ce..dc0984e 100644 --- a/contracts/sources/BalancerSource.sol +++ b/contracts/sources/BalancerSource.sol @@ -7,7 +7,7 @@ import "@openzeppelin/contracts/math/SafeMath.sol"; import "../interfaces/IBalancer.sol"; import "../interfaces/IWETH.sol"; -import "../IOneRouter.sol"; +import "../IOneRouterView.sol"; import "../ISource.sol"; import "../OneRouterConstants.sol"; diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol index d7d0d0f..5454878 100644 --- a/contracts/sources/CurveSource.sol +++ b/contracts/sources/CurveSource.sol @@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2; import "@openzeppelin/contracts/math/SafeMath.sol"; import "../interfaces/ICurve.sol"; -import "../IOneRouter.sol"; +import "../IOneRouterView.sol"; import "../ISource.sol"; import "../OneRouterConstants.sol"; diff --git a/contracts/sources/KyberSource.sol b/contracts/sources/KyberSource.sol index 3fa7162..eaa9ccb 100644 --- a/contracts/sources/KyberSource.sol +++ b/contracts/sources/KyberSource.sol @@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2; import "@openzeppelin/contracts/math/SafeMath.sol"; import "../interfaces/IKyber.sol"; -import "../IOneRouter.sol"; +import "../IOneRouterView.sol"; import "../ISource.sol"; import "../OneRouterConstants.sol"; diff --git a/contracts/sources/MooniswapSource.sol b/contracts/sources/MooniswapSource.sol index 296e6b1..d32c54e 100644 --- a/contracts/sources/MooniswapSource.sol +++ b/contracts/sources/MooniswapSource.sol @@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2; import "@openzeppelin/contracts/math/SafeMath.sol"; import "../interfaces/IMooniswap.sol"; -import "../IOneRouter.sol"; +import "../IOneRouterView.sol"; import "../ISource.sol"; import "../libraries/UniERC20.sol"; diff --git a/contracts/sources/UniswapV1Source.sol b/contracts/sources/UniswapV1Source.sol index 2302cc7..c37a25f 100644 --- a/contracts/sources/UniswapV1Source.sol +++ b/contracts/sources/UniswapV1Source.sol @@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2; import "@openzeppelin/contracts/math/SafeMath.sol"; import "../interfaces/IUniswapV1.sol"; -import "../IOneRouter.sol"; +import "../IOneRouterView.sol"; import "../ISource.sol"; import "../libraries/UniERC20.sol"; diff --git a/contracts/sources/UniswapV2Source.sol b/contracts/sources/UniswapV2Source.sol index 9306338..22aaff9 100644 --- a/contracts/sources/UniswapV2Source.sol +++ b/contracts/sources/UniswapV2Source.sol @@ -9,7 +9,7 @@ import "@openzeppelin/contracts/math/SafeMath.sol"; import "../interfaces/IUniswapV2.sol"; import "../interfaces/IWETH.sol"; -import "../IOneRouter.sol"; +import "../IOneRouterView.sol"; import "../ISource.sol"; import "../libraries/UniERC20.sol"; diff --git a/package.json b/package.json index f00dac6..2aab504 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,13 @@ "lint:sol:fix": "solhint --max-warnings 0 \"contracts/**/*.sol\" --fix", "lint": "yarn run lint:js && yarn run lint:sol", "lint:fix": "yarn run lint:js:fix && yarn run lint:sol:fix", - "dist": "truffle-flattener ./contracts/OneRouter.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./OneRouter.full.sol && solcjs --bin --abi --optimize ./OneRouter.full.sol && mv ./__OneRouter_full_sol_OneRouter.bin ./OneRouter.full.bin && mv ./__OneRouter_full_sol_OneRouter.abi ./OneRouter.full.abi && rm ./*_sol_*", - "dist:audit": "truffle-flattener ./contracts/OneRouterAudit.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./OneRouterAudit.full.sol && solcjs --bin --abi --optimize ./OneRouterAudit.full.sol && mv ./__OneRouterAudit_full_sol_OneRouterAudit.bin ./OneRouterAudit.full.bin && mv ./__OneRouterAudit_full_sol_OneRouterAudit.abi ./OneRouterAudit.full.abi && rm ./*_sol_*" + "flat": "truffle-flattener $FLAT_FILE | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1'", + "dist:router-view": "FLAT_FILE=./contracts/OneRouterView.sol yarn --silent flat > ./dist/OneRouterView.full.sol && solcjs --bin --abi --optimize ./dist/OneRouterView.full.sol && mv ./__dist_OneRouterView_full_sol_OneRouterView.bin ./dist/OneRouterView.full.bin && mv ./__dist_OneRouterView_full_sol_OneRouterView.abi ./dist/OneRouterView.full.abi && rm ./*_sol_*", + "dist:router-swap": "FLAT_FILE=./contracts/OneRouterSwap.sol yarn --silent flat > ./dist/OneRouterSwap.full.sol && solcjs --bin --abi --optimize ./dist/OneRouterSwap.full.sol && mv ./__dist_OneRouterSwap_full_sol_OneRouterSwap.bin ./dist/OneRouterSwap.full.bin && mv ./__dist_OneRouterSwap_full_sol_OneRouterSwap.abi ./dist/OneRouterSwap.full.abi && rm ./*_sol_*", + "dist:audit": "truffle-flattener ./contracts/OneRouterAudit.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./dist/OneRouterAudit.full.sol && solcjs --bin --abi --optimize ./dist/OneRouterAudit.full.sol && mv ./__dist_OneRouterAudit_full_sol_OneRouterAudit.bin ./dist/OneRouterAudit.full.bin && mv ./__dist_OneRouterAudit_full_sol_OneRouterAudit.abi ./dist/OneRouterAudit.full.abi && rm ./*_sol_*", + "dist:balancer1": "truffle-flattener ./contracts/sources/BalancerSource.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./dist/BalancerSourcePublic1.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic1.full.sol && mv ./__dist_BalancerSourcePublic1_full_sol_BalancerSourcePublic1.bin ./dist/BalancerSourcePublic1.full.bin && mv ./__dist_BalancerSourcePublic1_full_sol_BalancerSourcePublic1.abi ./dist/BalancerSourcePublic1.full.abi && rm ./*_sol_*", + "dist:balancer2": "truffle-flattener ./contracts/sources/BalancerSource.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./dist/BalancerSourcePublic2.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic2.full.sol && mv ./__dist_BalancerSourcePublic2_full_sol_BalancerSourcePublic2.bin ./dist/BalancerSourcePublic2.full.bin && mv ./__dist_BalancerSourcePublic2_full_sol_BalancerSourcePublic2.abi ./dist/BalancerSourcePublic2.full.abi && rm ./*_sol_*", + "dist:balancer3": "truffle-flattener ./contracts/sources/BalancerSource.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./dist/BalancerSourcePublic3.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic3.full.sol && mv ./__dist_BalancerSourcePublic3_full_sol_BalancerSourcePublic3.bin ./dist/BalancerSourcePublic3.full.bin && mv ./__dist_BalancerSourcePublic3_full_sol_BalancerSourcePublic3.abi ./dist/BalancerSourcePublic3.full.abi && rm ./*_sol_*", + "dist": "yarn dist:router-view && yarn dist:router-swap && yarn dist:audit && yarn dist:balancer1 && yarn dist:balancer2 && yarn dist:balancer3" } } diff --git a/test/OneRouter.js b/test/OneRouter.js index 09fba85..5204f89 100644 --- a/test/OneRouter.js +++ b/test/OneRouter.js @@ -2,8 +2,9 @@ const { constants, ether, BN } = require('@openzeppelin/test-helpers'); const { expect } = require('chai'); const IERC20 = artifacts.require('IERC20'); -const OneRouter = artifacts.require('OneRouter'); +const OneRouterSwap = artifacts.require('OneRouterSwap'); const OneRouterView = artifacts.require('OneRouterView'); +const OneRouter = artifacts.require('OneRouterAudit'); const tokens = { ETH: { @@ -70,7 +71,8 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { tokens.USDC = await IERC20.at('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'); this.routerView = await OneRouterView.new(); - this.router = await OneRouter.new(this.routerView.address); + this.routerSwap = await OneRouterSwap.new(); + this.router = await OneRouter.new(this.routerView.address, this.routerSwap.address); }); describe('Uniswap V1', async function () { From 3efa51613d7ea3197fe5ac523ac7411204a7f6f3 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Thu, 27 Aug 2020 00:29:37 +0300 Subject: [PATCH 12/30] KyberMooniswapReserve --- contracts/KyberMooniswapReserve.sol | 61 ++++++++++++++++++++++++++++- contracts/OneRouterView.sol | 3 -- package.json | 11 +++--- 3 files changed, 65 insertions(+), 10 deletions(-) diff --git a/contracts/KyberMooniswapReserve.sol b/contracts/KyberMooniswapReserve.sol index f4361a5..1577e80 100644 --- a/contracts/KyberMooniswapReserve.sol +++ b/contracts/KyberMooniswapReserve.sol @@ -4,6 +4,8 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; import "./IOneRouterView.sol"; +import "./libraries/UniERC20.sol"; +import "./sources/MooniswapSource.sol"; interface IKyberReserve { @@ -18,13 +20,68 @@ interface IKyberReserve { IERC20 srcToken, uint256 srcAmount, IERC20 dstToken, - address destAddress, + address payable destAddress, uint256 conversionRate, bool validate ) external payable returns(bool); } -contract KyberMooniswapReserve { +contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapSourceSwap { + using UniERC20 for IERC20; + function getConversionRate( + IERC20 src, + IERC20 dst, + uint256 srcQty, + uint256 /*blockNumber*/ + ) external view override returns(uint256) { + uint256[] memory amounts = new uint256[](1); + amounts[0] = srcQty; + (uint256[] memory results,,) = _calculateMooniswap(src, amounts, IOneRouterView.Swap({ + destToken: dst, + flags: 0, + destTokenEthPriceTimesGasPrice: 0, + disabledDexes: new address[](0) + })); + if (results.length == 0 || results[0] == 0) { + return 0; + } + + return _convertAmountToRate(src, dst, results[0]); + } + + function trade( + IERC20 src, + uint256 srcAmount, + IERC20 dst, + address payable destAddress, + uint256 conversionRate, + bool validate + ) external payable override returns(bool) { + src.uniTransferFromSender(payable(address(this)), srcAmount); + if (validate) { + require(conversionRate > 0, "Wrong conversionRate"); + if (src.isETH()) { + require(msg.value == srcAmount, "Wrong msg.value or srcAmount"); + } else { + require(msg.value == 0, "Wrong non zero msg.value"); + } + } + + _swapOnMooniswap(src, dst, srcAmount, 0); + + uint256 returnAmount = dst.uniBalanceOf(address(this)); + uint256 actualRate = _convertAmountToRate(src, dst, returnAmount); + require(actualRate <= conversionRate, "Rate exceeded conversionRate"); + + dst.uniTransfer(destAddress, returnAmount); + return true; + } + + function _convertAmountToRate(IERC20 src, IERC20 dst, uint256 amount) private view returns(uint256) { + return amount.mul(1e18) + .mul(10 ** src.uniDecimals()) + .div(10 ** dst.uniDecimals()); + } } diff --git a/contracts/OneRouterView.sol b/contracts/OneRouterView.sol index faaf072..6fc8268 100644 --- a/contracts/OneRouterView.sol +++ b/contracts/OneRouterView.sol @@ -3,9 +3,6 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -// import "./interfaces/IUniswapV1.sol"; -// import "./interfaces/IUniswapV2.sol"; -// import "./interfaces/IBalancer.sol"; import "./IOneRouterView.sol"; import "./ISource.sol"; import "./OneRouterConstants.sol"; diff --git a/package.json b/package.json index 2aab504..ad92448 100644 --- a/package.json +++ b/package.json @@ -40,12 +40,13 @@ "lint": "yarn run lint:js && yarn run lint:sol", "lint:fix": "yarn run lint:js:fix && yarn run lint:sol:fix", "flat": "truffle-flattener $FLAT_FILE | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1'", - "dist:router-view": "FLAT_FILE=./contracts/OneRouterView.sol yarn --silent flat > ./dist/OneRouterView.full.sol && solcjs --bin --abi --optimize ./dist/OneRouterView.full.sol && mv ./__dist_OneRouterView_full_sol_OneRouterView.bin ./dist/OneRouterView.full.bin && mv ./__dist_OneRouterView_full_sol_OneRouterView.abi ./dist/OneRouterView.full.abi && rm ./*_sol_*", + "dist:router-view": "FLAT_FILE=./contracts/OneRouterView.sol yarn --silent flat > ./dist/OneRouterView.full.sol && solcjs --bin --abi ./dist/OneRouterView.full.sol && mv ./__dist_OneRouterView_full_sol_OneRouterView.bin ./dist/OneRouterView.full.bin && mv ./__dist_OneRouterView_full_sol_OneRouterView.abi ./dist/OneRouterView.full.abi && rm ./*_sol_*", "dist:router-swap": "FLAT_FILE=./contracts/OneRouterSwap.sol yarn --silent flat > ./dist/OneRouterSwap.full.sol && solcjs --bin --abi --optimize ./dist/OneRouterSwap.full.sol && mv ./__dist_OneRouterSwap_full_sol_OneRouterSwap.bin ./dist/OneRouterSwap.full.bin && mv ./__dist_OneRouterSwap_full_sol_OneRouterSwap.abi ./dist/OneRouterSwap.full.abi && rm ./*_sol_*", - "dist:audit": "truffle-flattener ./contracts/OneRouterAudit.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./dist/OneRouterAudit.full.sol && solcjs --bin --abi --optimize ./dist/OneRouterAudit.full.sol && mv ./__dist_OneRouterAudit_full_sol_OneRouterAudit.bin ./dist/OneRouterAudit.full.bin && mv ./__dist_OneRouterAudit_full_sol_OneRouterAudit.abi ./dist/OneRouterAudit.full.abi && rm ./*_sol_*", - "dist:balancer1": "truffle-flattener ./contracts/sources/BalancerSource.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./dist/BalancerSourcePublic1.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic1.full.sol && mv ./__dist_BalancerSourcePublic1_full_sol_BalancerSourcePublic1.bin ./dist/BalancerSourcePublic1.full.bin && mv ./__dist_BalancerSourcePublic1_full_sol_BalancerSourcePublic1.abi ./dist/BalancerSourcePublic1.full.abi && rm ./*_sol_*", - "dist:balancer2": "truffle-flattener ./contracts/sources/BalancerSource.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./dist/BalancerSourcePublic2.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic2.full.sol && mv ./__dist_BalancerSourcePublic2_full_sol_BalancerSourcePublic2.bin ./dist/BalancerSourcePublic2.full.bin && mv ./__dist_BalancerSourcePublic2_full_sol_BalancerSourcePublic2.abi ./dist/BalancerSourcePublic2.full.abi && rm ./*_sol_*", - "dist:balancer3": "truffle-flattener ./contracts/sources/BalancerSource.sol | awk '/SPDX-License-Identifier/&&c++>0 {next} 1' | awk '/pragma experimental ABIEncoderV2;/&&c++>0 {next} 1' > ./dist/BalancerSourcePublic3.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic3.full.sol && mv ./__dist_BalancerSourcePublic3_full_sol_BalancerSourcePublic3.bin ./dist/BalancerSourcePublic3.full.bin && mv ./__dist_BalancerSourcePublic3_full_sol_BalancerSourcePublic3.abi ./dist/BalancerSourcePublic3.full.abi && rm ./*_sol_*", + "dist:audit": "FLAT_FILE=./contracts/OneRouterAudit.sol yarn --silent flat > ./dist/OneRouterAudit.full.sol && solcjs --bin --abi --optimize ./dist/OneRouterAudit.full.sol && mv ./__dist_OneRouterAudit_full_sol_OneRouterAudit.bin ./dist/OneRouterAudit.full.bin && mv ./__dist_OneRouterAudit_full_sol_OneRouterAudit.abi ./dist/OneRouterAudit.full.abi && rm ./*_sol_*", + "dist:balancer1": "FLAT_FILE=./contracts/sources/BalancerSource.sol yarn --silent flat > ./dist/BalancerSourcePublic1.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic1.full.sol && mv ./__dist_BalancerSourcePublic1_full_sol_BalancerSourcePublic1.bin ./dist/BalancerSourcePublic1.full.bin && mv ./__dist_BalancerSourcePublic1_full_sol_BalancerSourcePublic1.abi ./dist/BalancerSourcePublic1.full.abi && rm ./*_sol_*", + "dist:balancer2": "FLAT_FILE=./contracts/sources/BalancerSource.sol yarn --silent flat > ./dist/BalancerSourcePublic2.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic2.full.sol && mv ./__dist_BalancerSourcePublic2_full_sol_BalancerSourcePublic2.bin ./dist/BalancerSourcePublic2.full.bin && mv ./__dist_BalancerSourcePublic2_full_sol_BalancerSourcePublic2.abi ./dist/BalancerSourcePublic2.full.abi && rm ./*_sol_*", + "dist:balancer3": "FLAT_FILE=./contracts/sources/BalancerSource.sol yarn --silent flat > ./dist/BalancerSourcePublic3.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic3.full.sol && mv ./__dist_BalancerSourcePublic3_full_sol_BalancerSourcePublic3.bin ./dist/BalancerSourcePublic3.full.bin && mv ./__dist_BalancerSourcePublic3_full_sol_BalancerSourcePublic3.abi ./dist/BalancerSourcePublic3.full.abi && rm ./*_sol_*", + "dist:kyber-reserve": "FLAT_FILE=./contracts/KyberMooniswapReserve.sol yarn --silent flat > ./dist/KyberMooniswapReserve.full.sol && solcjs --bin --abi --optimize ./dist/KyberMooniswapReserve.full.sol && mv ./__dist_KyberMooniswapReserve_full_sol_KyberMooniswapReserve.bin ./dist/KyberMooniswapReserve.full.bin && mv ./__dist_KyberMooniswapReserve_full_sol_KyberMooniswapReserve.abi ./dist/KyberMooniswapReserve.full.abi && rm ./*_sol_*", "dist": "yarn dist:router-view && yarn dist:router-swap && yarn dist:audit && yarn dist:balancer1 && yarn dist:balancer2 && yarn dist:balancer3" } } From 5713d6e8cb836d1eddc077229162910619b8e218 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Thu, 27 Aug 2020 18:10:42 +0300 Subject: [PATCH 13/30] Fixes --- contracts/HotSwapSources.sol | 2 +- contracts/KyberMooniswapReserve.sol | 4 ++++ contracts/OneRouterAudit.sol | 15 ++++++++------- contracts/OneRouterConstants.sol | 25 ------------------------- contracts/PathsAdvisor.sol | 24 ++++++++++++++---------- contracts/interfaces/IMooniswap.sol | 2 ++ contracts/sources/KyberSource.sol | 2 +- contracts/sources/MooniswapSource.sol | 2 +- 8 files changed, 31 insertions(+), 45 deletions(-) diff --git a/contracts/HotSwapSources.sol b/contracts/HotSwapSources.sol index b58c916..c5b9d80 100644 --- a/contracts/HotSwapSources.sol +++ b/contracts/HotSwapSources.sol @@ -24,7 +24,7 @@ contract HotSwapSources is Ownable { sourcesCount = Math.max(sourcesCount, index + 1); } - function setPathsForTokens(PathsAdvisor newPathsAdvisor) external onlyOwner { + function setPathsAdvisor(PathsAdvisor newPathsAdvisor) external onlyOwner { pathsAdvisor = newPathsAdvisor; } diff --git a/contracts/KyberMooniswapReserve.sol b/contracts/KyberMooniswapReserve.sol index 1577e80..52637d1 100644 --- a/contracts/KyberMooniswapReserve.sol +++ b/contracts/KyberMooniswapReserve.sol @@ -30,6 +30,8 @@ interface IKyberReserve { contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapSourceSwap { using UniERC20 for IERC20; + address public constant KYBER_NETWORK = 0x7C66550C9c730B6fdd4C03bc2e73c5462c5F7ACC; + function getConversionRate( IERC20 src, IERC20 dst, @@ -59,6 +61,8 @@ contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapS uint256 conversionRate, bool validate ) external payable override returns(bool) { + require(msg.sender == KYBER_NETWORK, "Access denied"); + src.uniTransferFromSender(payable(address(this)), srcAmount); if (validate) { require(conversionRate > 0, "Wrong conversionRate"); diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol index 454a9f0..bd1fd86 100644 --- a/contracts/OneRouterAudit.sol +++ b/contracts/OneRouterAudit.sol @@ -117,7 +117,7 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O _claimInput(input); input.fromToken.uniApprove(address(oneRouterSwap), input.amount); oneRouterSwap.makeSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, swap, swapDistribution); - return _checkMinReturn(gasStart, input, swap.flags); + return _processOutput(gasStart, input, swap.flags); } function makePathSwap( @@ -135,7 +135,7 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O _claimInput(input); input.fromToken.uniApprove(address(oneRouterSwap), input.amount); oneRouterSwap.makePathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, path, pathDistribution); - return _checkMinReturn(gasStart, input, path.swaps[0].flags); + return _processOutput(gasStart, input, path.swaps[0].flags); } function makeMultiPathSwap( @@ -154,7 +154,7 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O _claimInput(input); input.fromToken.uniApprove(address(oneRouterSwap), input.amount); oneRouterSwap.makeMultiPathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, paths, pathDistributions, interPathsDistribution); - return _checkMinReturn(gasStart, input, paths[0].swaps[0].flags); + return _processOutput(gasStart, input, paths[0].swaps[0].flags); } // Internal methods @@ -164,7 +164,7 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O input.amount = input.fromToken.uniBalanceOf(address(this)); } - function _checkMinReturn(uint256 gasStart, SwapInput memory input, uint256 flags) internal returns(uint256 returnAmount) { + function _processOutput(uint256 gasStart, SwapInput memory input, uint256 flags) private returns(uint256 returnAmount) { uint256 remaining = input.fromToken.uniBalanceOf(address(this)); returnAmount = input.destToken.uniBalanceOf(address(this)); require(returnAmount >= input.minReturn, "OneRouter: less than minReturn"); @@ -185,7 +185,7 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O } } - function _chiBurnOrSell(address payable sponsor, uint256 amount) internal { + function _chiBurnOrSell(address payable sponsor, uint256 amount) private { amount = Math.min(amount, _CHI.balanceOf(sponsor)); if (amount == 0) { return; @@ -194,11 +194,12 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O uint256 sellRefund = MooniswapHelper.getReturn(exchange, _CHI, UniERC20.ZERO_ADDRESS, amount); uint256 burnRefund = amount.mul(18_000).mul(tx.gasprice); - if (sellRefund < burnRefund.add(tx.gasprice.mul(36_000))) { + if (sellRefund.add(tx.gasprice.mul(36_000)) < burnRefund.add(tx.gasprice.mul(150_000))) { IFreeFromUpTo(address(_CHI)).freeFromUpTo(sponsor, amount); } else { - _CHI.transferFrom(sponsor, address(exchange), amount); + _CHI.transferFrom(sponsor, address(this), amount); + _CHI.approve(address(exchange), amount); exchange.swap(_CHI, UniERC20.ZERO_ADDRESS, amount, 0, 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5); sponsor.transfer(address(this).balance); } diff --git a/contracts/OneRouterConstants.sol b/contracts/OneRouterConstants.sol index 87ef3c0..93d9e8e 100644 --- a/contracts/OneRouterConstants.sol +++ b/contracts/OneRouterConstants.sol @@ -12,31 +12,6 @@ contract OneRouterConstants { uint256 constant internal _FLAG_ENABLE_CHI_BURN_ORIGIN = 0x800000000000000000000000000000000; uint256 constant internal _FLAG_ENABLE_REFERRAL_GAS_DISCOUNT = 0x1000000000000000000000000000000000; - - uint256 constant internal _FLAG_DISABLE_KYBER_ALL = - _FLAG_DISABLE_KYBER_1 + - _FLAG_DISABLE_KYBER_2 + - _FLAG_DISABLE_KYBER_3 + - _FLAG_DISABLE_KYBER_4; - uint256 constant internal _FLAG_DISABLE_CURVE_ALL = - _FLAG_DISABLE_CURVE_COMPOUND + - _FLAG_DISABLE_CURVE_USDT + - _FLAG_DISABLE_CURVE_Y + - _FLAG_DISABLE_CURVE_BINANCE + - _FLAG_DISABLE_CURVE_SYNTHETIX + - _FLAG_DISABLE_CURVE_PAX + - _FLAG_DISABLE_CURVE_RENBTC + - _FLAG_DISABLE_CURVE_TBTC + - _FLAG_DISABLE_CURVE_SBTC; - uint256 constant internal _FLAG_DISABLE_BALANCER_ALL = - _FLAG_DISABLE_BALANCER_1 + - _FLAG_DISABLE_BALANCER_2 + - _FLAG_DISABLE_BALANCER_3; - uint256 constant internal _FLAG_DISABLE_BANCOR_ALL = - _FLAG_DISABLE_BANCOR_1 + - _FLAG_DISABLE_BANCOR_2 + - _FLAG_DISABLE_BANCOR_3; - uint256 constant internal _FLAG_DISABLE_UNISWAP_V1 = 0x1; uint256 constant internal _FLAG_DISABLE_UNISWAP_V2 = 0x2; uint256 constant internal _FLAG_DISABLE_MOONISWAP = 0x4; diff --git a/contracts/PathsAdvisor.sol b/contracts/PathsAdvisor.sol index 6bb1d10..ce7f200 100644 --- a/contracts/PathsAdvisor.sol +++ b/contracts/PathsAdvisor.sol @@ -16,17 +16,17 @@ contract PathsAdvisor is OneRouterConstants { IAaveRegistry constant private _AAVE_REGISTRY = IAaveRegistry(0xEd8b133B7B88366E01Bb9E38305Ab11c26521494); ICompoundRegistry constant private _COMPOUND_REGISTRY = ICompoundRegistry(0xF451Dbd7Ba14BFa7B1B78A766D3Ed438F79EE1D1); - function getPathsForTokens(IERC20 fromToken, IERC20 destToken) external view returns(IERC20[][] memory paths) { + function getPathsForTokens(IERC20 fromToken, IERC20 destToken) external view returns(IERC20[][] memory) { IERC20[4] memory midTokens = [_DAI, _USDC, _USDT, _WBTC]; - paths = new IERC20[][](2 + midTokens.length); + IERC20[][] memory paths = new IERC20[][](2 + midTokens.length); - IERC20 aFromToken = _AAVE_REGISTRY.aTokenByToken(fromToken); - IERC20 aDestToken = _AAVE_REGISTRY.aTokenByToken(destToken); + IERC20 aFromToken = _AAVE_REGISTRY.tokenByAToken(fromToken); + IERC20 aDestToken = _AAVE_REGISTRY.tokenByAToken(destToken); if (aFromToken != IERC20(0)) { - aFromToken = _COMPOUND_REGISTRY.cTokenByToken(fromToken); + aFromToken = _COMPOUND_REGISTRY.tokenByCToken(fromToken); } if (aDestToken != IERC20(0)) { - aDestToken = _COMPOUND_REGISTRY.cTokenByToken(destToken); + aDestToken = _COMPOUND_REGISTRY.tokenByCToken(destToken); } uint index = 0; @@ -47,11 +47,15 @@ contract PathsAdvisor is OneRouterConstants { ((aDestToken != IERC20(0)) ? 1 : 0) ); - paths[index][0] = aFromToken; - paths[index][paths[index].length / 2] = midTokens[i]; + uint pos = 0; + if (aFromToken != IERC20(0)) { + paths[index][pos++] = aFromToken; + } + paths[index][pos++] = midTokens[i]; if (aDestToken != IERC20(0)) { - paths[index][paths[index].length - 1] = aDestToken; + paths[index][pos] = aDestToken; } + index++; } } @@ -60,6 +64,6 @@ contract PathsAdvisor is OneRouterConstants { for (uint i = 0; i < paths2.length; i++) { paths2[i] = paths[i]; } - paths = paths2; + return paths2; } } diff --git a/contracts/interfaces/IMooniswap.sol b/contracts/interfaces/IMooniswap.sol index 19e4384..76d291f 100644 --- a/contracts/interfaces/IMooniswap.sol +++ b/contracts/interfaces/IMooniswap.sol @@ -17,6 +17,8 @@ interface IMooniswap { function getBalanceForAddition(IERC20 token) external view returns(uint256); function getBalanceForRemoval(IERC20 token) external view returns(uint256); function getReturn(IERC20 fromToken, IERC20 destToken, uint256 amount) external view returns(uint256 returnAmount); + function virtualBalancesForAddition(IERC20 token) external view returns(uint216 balance, uint40 time); + function virtualBalancesForRemoval(IERC20 token) external view returns(uint216 balance, uint40 time); function deposit(uint256[] calldata amounts, uint256[] calldata minAmounts) external payable returns(uint256 fairSupply); function withdraw(uint256 amount, uint256[] calldata minReturns) external; diff --git a/contracts/sources/KyberSource.sol b/contracts/sources/KyberSource.sol index eaa9ccb..fc0760b 100644 --- a/contracts/sources/KyberSource.sol +++ b/contracts/sources/KyberSource.sol @@ -135,7 +135,7 @@ contract KyberSourceSwap { _swapOnKyber(fromToken, destToken, amount, flags, KyberHelper.getReserveId(fromToken, destToken)); } - function _swapOnKyber(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags, bytes32 reserveId) internal { + function _swapOnKyber(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags, bytes32 reserveId) private { bytes32[] memory reserveIds = new bytes32[](1); reserveIds[0] = reserveId; diff --git a/contracts/sources/MooniswapSource.sol b/contracts/sources/MooniswapSource.sol index d32c54e..28443dc 100644 --- a/contracts/sources/MooniswapSource.sol +++ b/contracts/sources/MooniswapSource.sol @@ -80,7 +80,7 @@ contract MooniswapSourceView { return (new uint256[](0), address(0), 0); } - return (rets, address(mooniswap), (fromToken.isETH() || swap.destToken.isETH()) ? 80_000 : 110_000); + return (rets, address(mooniswap), (fromToken.isETH() || swap.destToken.isETH()) ? 90_000 : 120_000); } } From 238694df0385f56efebf7d4f17d9f260f56a0df1 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Thu, 27 Aug 2020 20:19:41 +0300 Subject: [PATCH 14/30] Added ref --- contracts/KyberMooniswapReserve.sol | 2 +- contracts/sources/MooniswapSource.sol | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/contracts/KyberMooniswapReserve.sol b/contracts/KyberMooniswapReserve.sol index 52637d1..3d32027 100644 --- a/contracts/KyberMooniswapReserve.sol +++ b/contracts/KyberMooniswapReserve.sol @@ -73,7 +73,7 @@ contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapS } } - _swapOnMooniswap(src, dst, srcAmount, 0); + _swapOnMooniswapRef(src, dst, srcAmount, 0, 0x8180a5CA4E3B94045e05A9313777955f7518D757); uint256 returnAmount = dst.uniBalanceOf(address(this)); uint256 actualRate = _convertAmountToRate(src, dst, returnAmount); diff --git a/contracts/sources/MooniswapSource.sol b/contracts/sources/MooniswapSource.sol index 28443dc..f015e05 100644 --- a/contracts/sources/MooniswapSource.sol +++ b/contracts/sources/MooniswapSource.sol @@ -88,7 +88,13 @@ contract MooniswapSourceView { contract MooniswapSourceSwap { using UniERC20 for IERC20; - function _swapOnMooniswap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + + function _swapOnMooniswap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) internal { + _swapOnMooniswapRef(fromToken, destToken, amount, flags, 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5); + } + + + function _swapOnMooniswapRef(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/, address ref) internal { IMooniswap mooniswap = MooniswapHelper.REGISTRY.pools( fromToken.isETH() ? UniERC20.ZERO_ADDRESS : fromToken, destToken.isETH() ? UniERC20.ZERO_ADDRESS : destToken @@ -100,7 +106,7 @@ contract MooniswapSourceSwap { destToken.isETH() ? UniERC20.ZERO_ADDRESS : destToken, amount, 0, - 0x68a17B587CAF4f9329f0e372e3A78D23A46De6b5 + ref ); } } From de11481fa14ab4a54315d79e2a08e0cea529648b Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Tue, 1 Sep 2020 00:20:23 +0300 Subject: [PATCH 15/30] Fixes --- contracts/IOneRouterView.sol | 38 ++-- contracts/OneRouterAudit.sol | 38 ++-- contracts/OneRouterView.sol | 221 +++++++++++---------- contracts/libraries/DynamicMemoryArray.sol | 21 +- contracts/sources/BalancerSource.sol | 2 +- contracts/sources/CurveSource.sol | 2 +- contracts/sources/KyberSource.sol | 2 +- contracts/sources/MooniswapSource.sol | 2 +- contracts/sources/UniswapV1Source.sol | 2 +- contracts/sources/UniswapV2Source.sol | 2 +- 10 files changed, 186 insertions(+), 144 deletions(-) diff --git a/contracts/IOneRouterView.sol b/contracts/IOneRouterView.sol index a58c454..72ee9fc 100644 --- a/contracts/IOneRouterView.sol +++ b/contracts/IOneRouterView.sol @@ -29,19 +29,6 @@ interface IOneRouterView { SwapResult[] swaps; } - function getReturn( - IERC20 fromToken, - uint256[] calldata amounts, - Swap calldata swap - ) - external - view - returns( - Path[] memory paths, - PathResult[] memory pathResults, - SwapResult memory splitResult - ); - function getSwapReturn( IERC20 fromToken, uint256[] calldata amounts, @@ -71,4 +58,29 @@ interface IOneRouterView { PathResult[] memory pathResults, SwapResult memory splitResult ); + + function getDisjointMultiPathReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Path[] calldata paths + ) + external + view + returns( + PathResult[] memory pathResults, + SwapResult memory splitResult + ); + + function getSuggestedReturn( + IERC20 fromToken, + uint256[] calldata amounts, + Swap calldata swap + ) + external + view + returns( + Path[] memory paths, + PathResult[] memory pathResults, + SwapResult memory splitResult + ); } diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol index bd1fd86..15f2f84 100644 --- a/contracts/OneRouterAudit.sol +++ b/contracts/OneRouterAudit.sol @@ -57,19 +57,6 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O // View methods - function getReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) - public - view - override - returns( - Path[] memory paths, - PathResult[] memory pathResults, - SwapResult memory splitResult - ) - { - return oneRouterView.getReturn(fromToken, amounts, swap); - } - function getSwapReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) public view @@ -100,6 +87,31 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O return oneRouterView.getMultiPathReturn(fromToken, amounts, paths); } + function getDisjointMultiPathReturn(IERC20 fromToken, uint256[] memory amounts, Path[] memory paths) + public + view + override + returns( + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + return oneRouterView.getDisjointMultiPathReturn(fromToken, amounts, paths); + } + + function getSuggestedReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) + public + view + override + returns( + Path[] memory paths, + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + return oneRouterView.getSuggestedReturn(fromToken, amounts, swap); + } + // Swap methods function makeSwap( diff --git a/contracts/OneRouterView.sol b/contracts/OneRouterView.sol index 6fc8268..fdd81fa 100644 --- a/contracts/OneRouterView.sol +++ b/contracts/OneRouterView.sol @@ -38,104 +38,6 @@ contract OneRouterView is using FlagsChecker for uint256; using DynamicMemoryArray for DynamicMemoryArray.Addresses; - function getReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) - public - view - override - returns( - Path[] memory paths, - PathResult[] memory pathResults, - SwapResult memory splitResult - ) - { - IERC20[][] memory midTokens = _getPathsForTokens(fromToken, swap.destToken); - - paths = new Path[](midTokens.length); - pathResults = new PathResult[](paths.length); - DynamicMemoryArray.Addresses memory disabledDexes; - for (uint i = 0; i < paths.length; i++) { - paths[i] = Path({swaps: new Swap[](1 + midTokens[i - 1].length)}); - for (uint j = 0; j < midTokens[i - 1].length; j++) { - if (fromToken == midTokens[i - 1][j] || swap.destToken == midTokens[i - 1][j]) { - paths[i] = Path({swaps: new Swap[](1)}); - break; - } - - paths[i].swaps[j] = Swap({ - destToken: midTokens[i - 1][j], - flags: swap.flags, - destTokenEthPriceTimesGasPrice: _scaleDestTokenEthPriceTimesGasPrice(fromToken, midTokens[i - 1][j], swap.destTokenEthPriceTimesGasPrice), - disabledDexes: disabledDexes.copy() - }); - } - paths[i].swaps[paths[i].swaps.length - 1] = swap; - - pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); - for (uint j = 0; j < pathResults[i].swaps.length; j++) { - for (uint k = 0; k < pathResults[i].swaps[j].dexes.length; k++) { - for (uint t = 0; t < pathResults[i].swaps[j].dexes[k].length; t++) { - if (pathResults[i].swaps[j].dexes[k][t] != address(0)) { - disabledDexes.push(pathResults[i].swaps[j].dexes[k][t]); - } - } - } - } - } - - splitResult = bestDistributionAmongPaths(paths, pathResults); - } - - function getMultiPathReturn(IERC20 fromToken, uint256[] memory amounts, Path[] memory paths) - public - view - override - returns( - PathResult[] memory pathResults, - SwapResult memory splitResult - ) - { - pathResults = new PathResult[](paths.length); - for (uint i = 0; i < paths.length; i++) { - pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); - } - splitResult = bestDistributionAmongPaths(paths, pathResults); - } - - function bestDistributionAmongPaths(Path[] memory paths, PathResult[] memory pathResults) public pure returns(SwapResult memory) { - uint256[][] memory input = new uint256[][](paths.length); - uint256[][] memory gases = new uint256[][](paths.length); - uint256[][] memory costs = new uint256[][](paths.length); - for (uint i = 0; i < pathResults.length; i++) { - Swap memory subSwap = paths[i].swaps[paths[i].swaps.length - 1]; - SwapResult memory swapResult = pathResults[i].swaps[pathResults[i].swaps.length - 1]; - - input[i] = new uint256[](swapResult.returnAmounts.length); - gases[i] = new uint256[](swapResult.returnAmounts.length); - costs[i] = new uint256[](swapResult.returnAmounts.length); - for (uint j = 0; j < swapResult.returnAmounts.length; j++) { - input[i][j] = swapResult.returnAmounts[j]; - gases[i][j] = swapResult.estimateGasAmounts[j]; - costs[i][j] = swapResult.estimateGasAmounts[j].mul(subSwap.destTokenEthPriceTimesGasPrice).div(1e18); - } - } - return _findBestDistribution(input, costs, gases, input[0].length); - } - - function getPathReturn(IERC20 fromToken, uint256[] memory amounts, Path memory path) - public - view - override - returns(PathResult memory result) - { - result.swaps = new SwapResult[](path.swaps.length); - - for (uint i = 0; i < path.swaps.length; i++) { - result.swaps[i] = getSwapReturn(fromToken, amounts, path.swaps[i]); - fromToken = path.swaps[i].destToken; - amounts = result.swaps[i].returnAmounts; - } - } - function getSwapReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) public view @@ -201,15 +103,114 @@ contract OneRouterView is result = _findBestDistribution(input, costs, gases, amounts.length); } - function _calculateNoReturn(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) - private view returns(uint256[] memory rets, uint256 gas) + function getPathReturn(IERC20 fromToken, uint256[] memory amounts, Path memory path) + public + view + override + returns(PathResult memory result) + { + result.swaps = new SwapResult[](path.swaps.length); + + for (uint i = 0; i < path.swaps.length; i++) { + result.swaps[i] = getSwapReturn(fromToken, amounts, path.swaps[i]); + fromToken = path.swaps[i].destToken; + amounts = result.swaps[i].returnAmounts; + } + } + + function getMultiPathReturn(IERC20 fromToken, uint256[] memory amounts, Path[] memory paths) + public + view + override + returns( + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + pathResults = new PathResult[](paths.length); + for (uint i = 0; i < paths.length; i++) { + pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); + } + splitResult = _findBestDistributionAmongPaths(paths, pathResults); + } + + function getDisjointMultiPathReturn(IERC20 fromToken, uint256[] memory amounts, Path[] memory paths) + public + view + override + returns( + PathResult[] memory pathResults, + SwapResult memory splitResult + ) { + pathResults = new PathResult[](paths.length); + DynamicMemoryArray.Addresses memory disabledDexes; + disabledDexes.init(); + for (uint i = 0; i < paths.length; i++) { + for (uint j = 0; j < paths[i].swaps.length; j++) { + paths[i].swaps[j].disabledDexes = disabledDexes.items; + // if (paths[i].swaps[j].destTokenEthPriceTimesGasPrice == 0) { + // Swap memory lastSwap = paths[i].swaps[paths[i].swaps.length - 1]; + // paths[i].swaps[j].destTokenEthPriceTimesGasPrice = _scaleDestTokenEthPriceTimesGasPrice(fromToken, paths[i].swaps[j].destToken, lastSwap.destTokenEthPriceTimesGasPrice); + // } + } + + pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); + for (uint j = 0; j < pathResults[i].swaps.length; j++) { + for (uint k = 0; k < pathResults[i].swaps[j].dexes.length; k++) { + for (uint t = 0; t < pathResults[i].swaps[j].dexes[k].length; t++) { + if (pathResults[i].swaps[j].dexes[k][t] != address(0)) { + disabledDexes.push(pathResults[i].swaps[j].dexes[k][t]); + } + } + } + } + } + + splitResult = _findBestDistributionAmongPaths(paths, pathResults); + } + + function getSuggestedReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) + public + view + override + returns( + Path[] memory paths, + PathResult[] memory pathResults, + SwapResult memory splitResult + ) + { + IERC20[][] memory midTokens = _getPathsForTokens(fromToken, swap.destToken); + + paths = new Path[](midTokens.length); + for (uint i = 0; i < paths.length; i++) { + paths[i] = Path({swaps: new Swap[](1 + midTokens[i - 1].length)}); + for (uint j = 0; j < midTokens[i - 1].length; j++) { + if (fromToken == midTokens[i - 1][j] || swap.destToken == midTokens[i - 1][j]) { + paths[i] = Path({swaps: new Swap[](1)}); + break; + } + + paths[i].swaps[j] = Swap({ + destToken: midTokens[i - 1][j], + flags: swap.flags, + destTokenEthPriceTimesGasPrice: _scaleDestTokenEthPriceTimesGasPrice(fromToken, midTokens[i - 1][j], swap.destTokenEthPriceTimesGasPrice), + disabledDexes: new address[](0) + }); + } + paths[i].swaps[paths[i].swaps.length - 1] = swap; + } + + (pathResults, splitResult) = getDisjointMultiPathReturn(fromToken, amounts, paths); } function _scaleDestTokenEthPriceTimesGasPrice(IERC20 fromToken, IERC20 destToken, uint256 destTokenEthPriceTimesGasPrice) private view returns(uint256) { if (fromToken == destToken) { return destTokenEthPriceTimesGasPrice; } + if (destTokenEthPriceTimesGasPrice == 0) { + return 0; + } uint256 mul = _cheapGetPrice(UniERC20.ETH_ADDRESS, destToken, 0.001 ether); uint256 div = _cheapGetPrice(UniERC20.ETH_ADDRESS, fromToken, 0.001 ether); @@ -266,4 +267,24 @@ contract OneRouterView is } } } + + function _findBestDistributionAmongPaths(Path[] memory paths, PathResult[] memory pathResults) private pure returns(SwapResult memory) { + uint256[][] memory input = new uint256[][](paths.length); + uint256[][] memory gases = new uint256[][](paths.length); + uint256[][] memory costs = new uint256[][](paths.length); + for (uint i = 0; i < pathResults.length; i++) { + Swap memory subSwap = paths[i].swaps[paths[i].swaps.length - 1]; + SwapResult memory swapResult = pathResults[i].swaps[pathResults[i].swaps.length - 1]; + + input[i] = new uint256[](swapResult.returnAmounts.length); + gases[i] = new uint256[](swapResult.returnAmounts.length); + costs[i] = new uint256[](swapResult.returnAmounts.length); + for (uint j = 0; j < swapResult.returnAmounts.length; j++) { + input[i][j] = swapResult.returnAmounts[j]; + gases[i][j] = swapResult.estimateGasAmounts[j]; + costs[i][j] = swapResult.estimateGasAmounts[j].mul(subSwap.destTokenEthPriceTimesGasPrice).div(1e18); + } + } + return _findBestDistribution(input, costs, gases, input[0].length); + } } diff --git a/contracts/libraries/DynamicMemoryArray.sol b/contracts/libraries/DynamicMemoryArray.sol index 201eda9..38074e4 100644 --- a/contracts/libraries/DynamicMemoryArray.sol +++ b/contracts/libraries/DynamicMemoryArray.sol @@ -11,29 +11,26 @@ library DynamicMemoryArray { struct Addresses { uint256 length; - address[1000] _arr; + address[] items; + } + + function init(DynamicMemoryArray.Addresses memory self) internal pure { + self.items = new address[](1000); } function at(DynamicMemoryArray.Addresses memory self, uint256 index) internal pure returns(address) { require(index < self.length, "DynMemArr: out of range"); - return self._arr[index]; + return self.items[index]; } function push(DynamicMemoryArray.Addresses memory self, address item) internal pure returns(uint256) { - require(self.length < self._arr.length, "DynMemArr: out of limit"); - self._arr[self.length++] = item; + require(self.length < self.items.length, "DynMemArr: out of limit"); + self.items[self.length++] = item; return self.length; } function pop(DynamicMemoryArray.Addresses memory self) internal pure returns(address) { require(self.length > 0, "DynMemArr: already empty"); - return self._arr[--self.length]; - } - - function copy(DynamicMemoryArray.Addresses memory self) internal pure returns(address[] memory arr) { - arr = new address[](self.length); - for (uint i = 0; i < arr.length; i++) { - arr[i] = self._arr[i]; - } + return self.items[--self.length]; } } diff --git a/contracts/sources/BalancerSource.sol b/contracts/sources/BalancerSource.sol index dc0984e..2076e08 100644 --- a/contracts/sources/BalancerSource.sol +++ b/contracts/sources/BalancerSource.sol @@ -62,7 +62,7 @@ contract BalancerSourceView is OneRouterConstants { return (rets, address(0), 0); } - for (uint t = 0; t < swap.disabledDexes.length; t++) { + for (uint t = 0; t < swap.disabledDexes.length && swap.disabledDexes[t] != address(0); t++) { if (swap.disabledDexes[t] == address(pools[poolIndex])) { return (rets, address(0), 0); } diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol index 5454878..d8d0d28 100644 --- a/contracts/sources/CurveSource.sol +++ b/contracts/sources/CurveSource.sol @@ -97,7 +97,7 @@ contract CurveSourceView is OneRouterConstants { ) private view returns(uint256[] memory rets) { rets = new uint256[](amounts.length); - for (uint t = 0; t < swap.disabledDexes.length; t++) { + for (uint t = 0; t < swap.disabledDexes.length && swap.disabledDexes[t] != address(0); t++) { if (swap.disabledDexes[t] == address(curve)) { return rets; } diff --git a/contracts/sources/KyberSource.sol b/contracts/sources/KyberSource.sol index fc0760b..5ebc689 100644 --- a/contracts/sources/KyberSource.sol +++ b/contracts/sources/KyberSource.sol @@ -82,7 +82,7 @@ contract KyberSourceView is OneRouterConstants { IKyberReserve reserve = KyberHelper.STORAGE.getReserveAddressesByReserveId(reserveId)[0]; - for (uint t = 0; t < swap.disabledDexes.length; t++) { + for (uint t = 0; t < swap.disabledDexes.length && swap.disabledDexes[t] != address(0); t++) { if (swap.disabledDexes[t] == address(reserve)) { return (rets, address(0), 0); } diff --git a/contracts/sources/MooniswapSource.sol b/contracts/sources/MooniswapSource.sol index f015e05..c7ebb71 100644 --- a/contracts/sources/MooniswapSource.sol +++ b/contracts/sources/MooniswapSource.sol @@ -69,7 +69,7 @@ contract MooniswapSourceView { return (new uint256[](0), address(0), 0); } - for (uint t = 0; t < swap.disabledDexes.length; t++) { + for (uint t = 0; t < swap.disabledDexes.length && swap.disabledDexes[t] != address(0); t++) { if (swap.disabledDexes[t] == address(mooniswap)) { return (new uint256[](0), address(0), 0); } diff --git a/contracts/sources/UniswapV1Source.sol b/contracts/sources/UniswapV1Source.sol index c37a25f..6d8e1d4 100644 --- a/contracts/sources/UniswapV1Source.sol +++ b/contracts/sources/UniswapV1Source.sol @@ -35,7 +35,7 @@ contract UniswapV1SourceView { return (rets, address(0), 0); } - for (uint t = 0; t < swap.disabledDexes.length; t++) { + for (uint t = 0; t < swap.disabledDexes.length && swap.disabledDexes[t] != address(0); t++) { if (swap.disabledDexes[t] == address(exchange)) { return (rets, address(0), 0); } diff --git a/contracts/sources/UniswapV2Source.sol b/contracts/sources/UniswapV2Source.sol index 22aaff9..5735a30 100644 --- a/contracts/sources/UniswapV2Source.sol +++ b/contracts/sources/UniswapV2Source.sol @@ -98,7 +98,7 @@ contract UniswapV2SourceView { return (rets, address(0), 0); } - for (uint t = 0; t < swap.disabledDexes.length; t++) { + for (uint t = 0; t < swap.disabledDexes.length && swap.disabledDexes[t] != address(0); t++) { if (swap.disabledDexes[t] == address(exchange)) { return (rets, address(0), 0); } From 2386c7e2b54ad93747247c47b6898e75ea642326 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Tue, 1 Sep 2020 01:11:50 +0300 Subject: [PATCH 16/30] Improve --- contracts/OneRouterAudit.sol | 1 + contracts/OneRouterSwap.sol | 171 +++++++++++++++++++++-------------- contracts/OneRouterView.sol | 4 - 3 files changed, 102 insertions(+), 74 deletions(-) diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol index 15f2f84..81e1715 100644 --- a/contracts/OneRouterAudit.sol +++ b/contracts/OneRouterAudit.sol @@ -37,6 +37,7 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O modifier validateInput(SwapInput memory input) { require(input.referral.fee <= 0.03e18, "OneRouter: fee out of range"); require(input.fromToken != input.destToken, "OneRouter: invalid input"); + require(msg.value == (input.fromToken.isETH() ? input.amount : 0), "OneRouter: Wrong msg.value"); _; } diff --git a/contracts/OneRouterSwap.sol b/contracts/OneRouterSwap.sol index 28cb10e..978028a 100644 --- a/contracts/OneRouterSwap.sol +++ b/contracts/OneRouterSwap.sol @@ -32,6 +32,12 @@ contract OneRouterSwap is using Address2 for address; using FlagsChecker for uint256; + modifier validateInput(SwapInput memory input) { + require(input.fromToken != input.destToken, "OneRouter: invalid input"); + require(msg.value == (input.fromToken.isETH() ? input.amount : 0), "OneRouter: Wrong msg.value"); + _; + } + receive() external payable { // solhint-disable-next-line avoid-tx-origin require(msg.sender != tx.origin, "ETH deposit rejected"); @@ -45,19 +51,12 @@ contract OneRouterSwap is public payable override + validateInput(input) returns(uint256 returnAmount) { - IOneRouterView.Path memory path = IOneRouterView.Path({ - swaps: new IOneRouterView.Swap[](1) - }); - path.swaps[0] = swap; - - PathDistribution memory pathDistribution = PathDistribution({ - swapDistributions: new SwapDistribution[](1) - }); - pathDistribution.swapDistributions[0] = swapDistribution; - - return makePathSwap(input, path, pathDistribution); + _claimInput(input); + _makeSwap(input, swap, swapDistribution); + return _processOutput(input); } function makePathSwap( @@ -68,26 +67,14 @@ contract OneRouterSwap is public payable override + validateInput(input) returns(uint256 returnAmount) { - IOneRouterView.Path[] memory paths = new IOneRouterView.Path[](1); - paths[0] = path; - - PathDistribution[] memory pathDistributions = new PathDistribution[](1); - pathDistributions[0] = pathDistribution; - - SwapDistribution memory swapDistribution = SwapDistribution({ - weights: new uint256[](1) - }); - swapDistribution.weights[0] = 1; + require(path.swaps.length == pathDistribution.swapDistributions.length, "Wrong arrays length"); - return makeMultiPathSwap(input, paths, pathDistributions, swapDistribution); - } - - struct Indexes { - uint p; // path - uint s; // swap - uint i; // index + _claimInput(input); + _makePathSwap(input, path, pathDistribution); + return _processOutput(input); } function makeMultiPathSwap( @@ -99,14 +86,24 @@ contract OneRouterSwap is public payable override + validateInput(input) returns(uint256 returnAmount) { - require(msg.value == (input.fromToken.isETH() ? input.amount : 0), "Wrong msg.value"); require(paths.length == pathDistributions.length, "Wrong arrays length"); require(paths.length == interPathsDistribution.weights.length, "Wrong arrays length"); - input.fromToken.uniTransferFromSender(address(this), input.amount); + _claimInput(input); + _makeMultiPathSwap(input, paths, pathDistributions, interPathsDistribution); + return _processOutput(input); + } + function _makeSwap( + SwapInput memory input, + IOneRouterView.Swap memory swap, + SwapDistribution memory swapDistribution + ) + private + { function(IERC20,IERC20,uint256,uint256)[15] memory reserves = [ _swapOnUniswapV1, _swapOnUniswapV2, @@ -134,55 +131,89 @@ contract OneRouterSwap is // _swapOnBlackHoleSwap ]; + uint256 totalWeight = 0; + for (uint i = 0; i < swapDistribution.weights.length; i++) { + totalWeight = totalWeight.add(swapDistribution.weights[i]); + } + + for (uint i = 0; i < swapDistribution.weights.length && totalWeight > 0; i++) { + uint256 amount = input.amount.mul(swapDistribution.weights[i]).div(totalWeight); + totalWeight = totalWeight.sub(swapDistribution.weights[i]); + + if (sources[i] != ISource(0)) { + address(sources[i]).functionDelegateCall( + abi.encodeWithSelector( + sources[i].swap.selector, + input.fromToken, + input.destToken, + amount, + swap.flags + ), + "Delegatecall failed" + ); + } + else if (i < reserves.length) { + reserves[i](input.fromToken, input.destToken, amount, swap.flags); + } + } + } + + function _makePathSwap( + SwapInput memory input, + IOneRouterView.Path memory path, + PathDistribution memory pathDistribution + ) + private + { + for (uint s = 0; s < pathDistribution.swapDistributions.length; s++) { + IERC20 fromToken = (s == 0) ? input.fromToken : path.swaps[s - 1].destToken; + SwapInput memory swapInput = SwapInput({ + fromToken: fromToken, + destToken: path.swaps[s].destToken, + amount: fromToken.uniBalanceOf(address(this)), + minReturn: 0, + referral: input.referral + }); + _makeSwap(swapInput, path.swaps[s], pathDistribution.swapDistributions[s]); + } + } + + function _makeMultiPathSwap( + SwapInput memory input, + IOneRouterView.Path[] memory paths, + PathDistribution[] memory pathDistributions, + SwapDistribution memory interPathsDistribution + ) + private + { uint256 interTotalWeight = 0; for (uint i = 0; i < interPathsDistribution.weights.length; i++) { interTotalWeight = interTotalWeight.add(interPathsDistribution.weights[i]); } - Indexes memory z; - for (z.p = 0; z.p < pathDistributions.length && interTotalWeight > 0; z.p++) { - uint256 confirmed = input.fromToken.uniBalanceOf(address(this)) - .mul(interPathsDistribution.weights[z.p]) - .div(interTotalWeight); - interTotalWeight = interTotalWeight.sub(interPathsDistribution.weights[z.p]); - - IERC20 token = input.fromToken; - for (z.s = 0; z.s < pathDistributions[z.p].swapDistributions.length; z.s++) { - uint256 totalSwapWeight = 0; - for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length; z.i++) { - totalSwapWeight = totalSwapWeight.add(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]); - } - - for (z.i = 0; z.i < pathDistributions[z.p].swapDistributions[z.s].weights.length && totalSwapWeight > 0; z.i++) { - uint256 amount = ((z.s == 0) ? confirmed : token.uniBalanceOf(address(this))) - .mul(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]) - .div(totalSwapWeight); - totalSwapWeight = totalSwapWeight.sub(pathDistributions[z.p].swapDistributions[z.s].weights[z.i]); - - if (sources[z.i] != ISource(0)) { - address(sources[z.i]).functionDelegateCall( - abi.encodeWithSelector( - sources[z.i].swap.selector, - input.fromToken, - input.destToken, - amount, - paths[z.p].swaps[z.s].flags - ), - "Delegatecall failed" - ); - } - else if (z.i < reserves.length) { - reserves[z.i](input.fromToken, input.destToken, amount, paths[z.p].swaps[z.s].flags); - } - } - - token = paths[z.p].swaps[z.s].destToken; - } + uint256 confirmed = input.fromToken.uniBalanceOf(address(this)); + for (uint p = 0; p < pathDistributions.length && interTotalWeight > 0; p++) { + SwapInput memory pathInput = SwapInput({ + fromToken: input.fromToken, + destToken: input.destToken, + amount: confirmed.mul(interPathsDistribution.weights[p]).div(interTotalWeight), + minReturn: 0, + referral: input.referral + }); + interTotalWeight = interTotalWeight.sub(interPathsDistribution.weights[p]); + _makePathSwap(pathInput, paths[p], pathDistributions[p]); } + } + + function _claimInput(SwapInput memory input) private { + input.fromToken.uniTransferFromSender(address(this), input.amount); + input.amount = input.fromToken.uniBalanceOf(address(this)); + } + function _processOutput(SwapInput memory input) private returns(uint256 returnAmount) { uint256 remaining = input.fromToken.uniBalanceOf(address(this)); returnAmount = input.destToken.uniBalanceOf(address(this)); - require(returnAmount >= input.minReturn, "Min returns is not enough"); + require(returnAmount >= input.minReturn, "OneRouter: less than minReturn"); input.fromToken.uniTransfer(msg.sender, remaining); input.destToken.uniTransfer(msg.sender, returnAmount); } diff --git a/contracts/OneRouterView.sol b/contracts/OneRouterView.sol index fdd81fa..9495071 100644 --- a/contracts/OneRouterView.sol +++ b/contracts/OneRouterView.sol @@ -149,10 +149,6 @@ contract OneRouterView is for (uint i = 0; i < paths.length; i++) { for (uint j = 0; j < paths[i].swaps.length; j++) { paths[i].swaps[j].disabledDexes = disabledDexes.items; - // if (paths[i].swaps[j].destTokenEthPriceTimesGasPrice == 0) { - // Swap memory lastSwap = paths[i].swaps[paths[i].swaps.length - 1]; - // paths[i].swaps[j].destTokenEthPriceTimesGasPrice = _scaleDestTokenEthPriceTimesGasPrice(fromToken, paths[i].swaps[j].destToken, lastSwap.destTokenEthPriceTimesGasPrice); - // } } pathResults[i] = getPathReturn(fromToken, amounts, paths[i]); From 4537cffe3f10d2957f379cd8943630785a46ae00 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Tue, 1 Sep 2020 01:41:18 +0300 Subject: [PATCH 17/30] Code deduplication --- contracts/OneRouterAudit.sol | 88 +++++++++++++++++++++++++++----- contracts/OneRouterConstants.sol | 1 + contracts/OneRouterSwap.sol | 88 ++++++-------------------------- test/OneRouter.js | 2 +- 4 files changed, 92 insertions(+), 87 deletions(-) diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol index 81e1715..f1c9f29 100644 --- a/contracts/OneRouterAudit.sol +++ b/contracts/OneRouterAudit.sol @@ -42,8 +42,7 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O } constructor(IOneRouterView _oneRouterView, IOneRouterSwap _oneRouterSwap) public { - oneRouterView = _oneRouterView; - oneRouterSwap = _oneRouterSwap; + setOneRouter(_oneRouterView, _oneRouterSwap); } function setOneRouter(IOneRouterView _oneRouterView, IOneRouterSwap _oneRouterSwap) public onlyOwner { @@ -128,9 +127,10 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O { uint256 gasStart = gasleft(); _claimInput(input); - input.fromToken.uniApprove(address(oneRouterSwap), input.amount); - oneRouterSwap.makeSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, swap, swapDistribution); - return _processOutput(gasStart, input, swap.flags); + + swap.flags = _disableFeeAndGasHandlingInImpl(swap.flags); + _makeSwap(input, swap, swapDistribution); + return _processOutput(input, swap.flags, gasStart); } function makePathSwap( @@ -144,11 +144,15 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O validateInput(input) returns(uint256 returnAmount) { + require(path.swaps.length == pathDistribution.swapDistributions.length, "Wrong arrays length"); + uint256 gasStart = gasleft(); _claimInput(input); input.fromToken.uniApprove(address(oneRouterSwap), input.amount); - oneRouterSwap.makePathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, path, pathDistribution); - return _processOutput(gasStart, input, path.swaps[0].flags); + + path.swaps[0].flags = _disableFeeAndGasHandlingInImpl(path.swaps[0].flags); + _makePathSwap(input, path, pathDistribution); + return _processOutput(input, path.swaps[0].flags, gasStart); } function makeMultiPathSwap( @@ -163,27 +167,85 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O validateInput(input) returns(uint256 returnAmount) { + require(paths.length == pathDistributions.length, "Wrong arrays length"); + require(paths.length == interPathsDistribution.weights.length, "Wrong arrays length"); + uint256 gasStart = gasleft(); _claimInput(input); input.fromToken.uniApprove(address(oneRouterSwap), input.amount); - oneRouterSwap.makeMultiPathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, paths, pathDistributions, interPathsDistribution); - return _processOutput(gasStart, input, paths[0].swaps[0].flags); + + paths[0].swaps[0].flags = _disableFeeAndGasHandlingInImpl(paths[0].swaps[0].flags); + _makeMultiPathSwap(input, paths, pathDistributions, interPathsDistribution); + return _processOutput(input, paths[0].swaps[0].flags, gasStart); } // Internal methods - function _claimInput(SwapInput memory input) internal { + function _approveInput(SwapInput memory input) internal virtual { + input.fromToken.uniApprove(address(oneRouterSwap), input.amount); + } + + function _fee(SwapInput memory input, uint256 /*flags*/) internal pure virtual returns(uint256) { + return input.referral.fee; + } + + function _makeSwap( + SwapInput memory input, + Swap memory swap, + SwapDistribution memory swapDistribution + ) + internal + virtual + { + oneRouterSwap.makeSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, swap, swapDistribution); + } + + function _makePathSwap( + SwapInput memory input, + Path memory path, + PathDistribution memory pathDistribution + ) + internal + virtual + { + oneRouterSwap.makePathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, path, pathDistribution); + } + + function _makeMultiPathSwap( + SwapInput memory input, + Path[] memory paths, + PathDistribution[] memory pathDistributions, + SwapDistribution memory interPathsDistribution + ) + internal + virtual + { + oneRouterSwap.makeMultiPathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, paths, pathDistributions, interPathsDistribution); + } + + // Private methods + + function _disableFeeAndGasHandlingInImpl(uint256 flags) private pure returns(uint256) { + return flags + | _FLAG_DISABLE_REFERRAL_FEE + & (~_FLAG_ENABLE_CHI_BURN) + & (~_FLAG_ENABLE_CHI_BURN_ORIGIN) + & (~_FLAG_ENABLE_REFERRAL_GAS_DISCOUNT); + } + + function _claimInput(SwapInput memory input) private { input.fromToken.uniTransferFromSender(address(this), input.amount); input.amount = input.fromToken.uniBalanceOf(address(this)); + _approveInput(input); } - function _processOutput(uint256 gasStart, SwapInput memory input, uint256 flags) private returns(uint256 returnAmount) { + function _processOutput(SwapInput memory input, uint256 flags, uint256 gasStart) private returns(uint256 returnAmount) { uint256 remaining = input.fromToken.uniBalanceOf(address(this)); returnAmount = input.destToken.uniBalanceOf(address(this)); require(returnAmount >= input.minReturn, "OneRouter: less than minReturn"); input.fromToken.uniTransfer(msg.sender, remaining); - input.destToken.uniTransfer(input.referral.ref, returnAmount.mul(input.referral.fee).div(1e18)); - input.destToken.uniTransfer(msg.sender, returnAmount.sub(returnAmount.mul(input.referral.fee).div(1e18))); + input.destToken.uniTransfer(input.referral.ref, returnAmount.mul(_fee(input, flags)).div(1e18)); + input.destToken.uniTransfer(msg.sender, returnAmount.sub(returnAmount.mul(_fee(input, flags)).div(1e18))); if ((flags & (_FLAG_ENABLE_CHI_BURN | _FLAG_ENABLE_CHI_BURN_ORIGIN)) > 0) { uint256 gasSpent = 21000 + gasStart - gasleft() + 16 * msg.data.length; diff --git a/contracts/OneRouterConstants.sol b/contracts/OneRouterConstants.sol index 93d9e8e..60d2caa 100644 --- a/contracts/OneRouterConstants.sol +++ b/contracts/OneRouterConstants.sol @@ -11,6 +11,7 @@ contract OneRouterConstants { uint256 constant internal _FLAG_ENABLE_CHI_BURN = 0x400000000000000000000000000000000; uint256 constant internal _FLAG_ENABLE_CHI_BURN_ORIGIN = 0x800000000000000000000000000000000; uint256 constant internal _FLAG_ENABLE_REFERRAL_GAS_DISCOUNT = 0x1000000000000000000000000000000000; + uint256 constant internal _FLAG_DISABLE_REFERRAL_FEE = 0x2000000000000000000000000000000000; uint256 constant internal _FLAG_DISABLE_UNISWAP_V1 = 0x1; uint256 constant internal _FLAG_DISABLE_UNISWAP_V2 = 0x2; diff --git a/contracts/OneRouterSwap.sol b/contracts/OneRouterSwap.sol index 978028a..51c9274 100644 --- a/contracts/OneRouterSwap.sol +++ b/contracts/OneRouterSwap.sol @@ -13,12 +13,13 @@ import "./sources/CurveSource.sol"; // import "./sources/BalancerSource.sol"; import "./IOneRouterSwap.sol"; +import "./OneRouterAudit.sol"; import "./HotSwapSources.sol"; contract OneRouterSwap is OneRouterConstants, - IOneRouterSwap, + OneRouterAudit, HotSwapSources, UniswapV1SourceSwap, UniswapV2SourceSwap, @@ -32,77 +33,21 @@ contract OneRouterSwap is using Address2 for address; using FlagsChecker for uint256; - modifier validateInput(SwapInput memory input) { - require(input.fromToken != input.destToken, "OneRouter: invalid input"); - require(msg.value == (input.fromToken.isETH() ? input.amount : 0), "OneRouter: Wrong msg.value"); - _; - } - - receive() external payable { - // solhint-disable-next-line avoid-tx-origin - require(msg.sender != tx.origin, "ETH deposit rejected"); - } - - function makeSwap( - SwapInput memory input, - IOneRouterView.Swap memory swap, - SwapDistribution memory swapDistribution - ) - public - payable - override - validateInput(input) - returns(uint256 returnAmount) - { - _claimInput(input); - _makeSwap(input, swap, swapDistribution); - return _processOutput(input); - } - - function makePathSwap( - SwapInput memory input, - IOneRouterView.Path memory path, - PathDistribution memory pathDistribution - ) + constructor(IOneRouterView _oneRouterView) public - payable - override - validateInput(input) - returns(uint256 returnAmount) + OneRouterAudit(_oneRouterView, IOneRouterSwap(0)) { - require(path.swaps.length == pathDistribution.swapDistributions.length, "Wrong arrays length"); - - _claimInput(input); - _makePathSwap(input, path, pathDistribution); - return _processOutput(input); } - function makeMultiPathSwap( - SwapInput memory input, - IOneRouterView.Path[] memory paths, - PathDistribution[] memory pathDistributions, - SwapDistribution memory interPathsDistribution - ) - public - payable - override - validateInput(input) - returns(uint256 returnAmount) - { - require(paths.length == pathDistributions.length, "Wrong arrays length"); - require(paths.length == interPathsDistribution.weights.length, "Wrong arrays length"); - - _claimInput(input); - _makeMultiPathSwap(input, paths, pathDistributions, interPathsDistribution); - return _processOutput(input); - } + // Internal methods function _makeSwap( SwapInput memory input, IOneRouterView.Swap memory swap, SwapDistribution memory swapDistribution ) - private + internal + override { function(IERC20,IERC20,uint256,uint256)[15] memory reserves = [ _swapOnUniswapV1, @@ -163,7 +108,8 @@ contract OneRouterSwap is IOneRouterView.Path memory path, PathDistribution memory pathDistribution ) - private + internal + override { for (uint s = 0; s < pathDistribution.swapDistributions.length; s++) { IERC20 fromToken = (s == 0) ? input.fromToken : path.swaps[s - 1].destToken; @@ -184,7 +130,8 @@ contract OneRouterSwap is PathDistribution[] memory pathDistributions, SwapDistribution memory interPathsDistribution ) - private + internal + override { uint256 interTotalWeight = 0; for (uint i = 0; i < interPathsDistribution.weights.length; i++) { @@ -205,16 +152,11 @@ contract OneRouterSwap is } } - function _claimInput(SwapInput memory input) private { - input.fromToken.uniTransferFromSender(address(this), input.amount); - input.amount = input.fromToken.uniBalanceOf(address(this)); + function _approveInput(SwapInput memory input) internal override { + // No need to approve + transferFrom } - function _processOutput(SwapInput memory input) private returns(uint256 returnAmount) { - uint256 remaining = input.fromToken.uniBalanceOf(address(this)); - returnAmount = input.destToken.uniBalanceOf(address(this)); - require(returnAmount >= input.minReturn, "OneRouter: less than minReturn"); - input.fromToken.uniTransfer(msg.sender, remaining); - input.destToken.uniTransfer(msg.sender, returnAmount); + function _fee(SwapInput memory input, uint256 flags) internal pure override returns(uint256) { + return (flags & _FLAG_DISABLE_REFERRAL_FEE != 0) ? 0 : input.referral.fee; } } diff --git a/test/OneRouter.js b/test/OneRouter.js index 5204f89..a46c37b 100644 --- a/test/OneRouter.js +++ b/test/OneRouter.js @@ -71,7 +71,7 @@ contract('OneRouter', function ([_, wallet1, wallet2]) { tokens.USDC = await IERC20.at('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'); this.routerView = await OneRouterView.new(); - this.routerSwap = await OneRouterSwap.new(); + this.routerSwap = await OneRouterSwap.new(this.routerView.address); this.router = await OneRouter.new(this.routerView.address, this.routerSwap.address); }); From 368f65827e664da8de6d0b929b260d628f0b60d6 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Tue, 1 Sep 2020 01:49:12 +0300 Subject: [PATCH 18/30] Simplify --- contracts/OneRouterAudit.sol | 16 +++++++--------- contracts/OneRouterSwap.sol | 8 -------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol index f1c9f29..49d100c 100644 --- a/contracts/OneRouterAudit.sol +++ b/contracts/OneRouterAudit.sol @@ -181,14 +181,6 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O // Internal methods - function _approveInput(SwapInput memory input) internal virtual { - input.fromToken.uniApprove(address(oneRouterSwap), input.amount); - } - - function _fee(SwapInput memory input, uint256 /*flags*/) internal pure virtual returns(uint256) { - return input.referral.fee; - } - function _makeSwap( SwapInput memory input, Swap memory swap, @@ -197,6 +189,7 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O internal virtual { + input.fromToken.uniApprove(address(oneRouterSwap), input.amount); oneRouterSwap.makeSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, swap, swapDistribution); } @@ -208,6 +201,7 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O internal virtual { + input.fromToken.uniApprove(address(oneRouterSwap), input.amount); oneRouterSwap.makePathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, path, pathDistribution); } @@ -220,11 +214,16 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O internal virtual { + input.fromToken.uniApprove(address(oneRouterSwap), input.amount); oneRouterSwap.makeMultiPathSwap{ value: input.fromToken.isETH() ? input.amount : 0 }(input, paths, pathDistributions, interPathsDistribution); } // Private methods + function _fee(SwapInput memory input, uint256 flags) private pure returns(uint256) { + return (flags & _FLAG_DISABLE_REFERRAL_FEE != 0) ? 0 : input.referral.fee; + } + function _disableFeeAndGasHandlingInImpl(uint256 flags) private pure returns(uint256) { return flags | _FLAG_DISABLE_REFERRAL_FEE @@ -236,7 +235,6 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O function _claimInput(SwapInput memory input) private { input.fromToken.uniTransferFromSender(address(this), input.amount); input.amount = input.fromToken.uniBalanceOf(address(this)); - _approveInput(input); } function _processOutput(SwapInput memory input, uint256 flags, uint256 gasStart) private returns(uint256 returnAmount) { diff --git a/contracts/OneRouterSwap.sol b/contracts/OneRouterSwap.sol index 51c9274..02eec99 100644 --- a/contracts/OneRouterSwap.sol +++ b/contracts/OneRouterSwap.sol @@ -151,12 +151,4 @@ contract OneRouterSwap is _makePathSwap(pathInput, paths[p], pathDistributions[p]); } } - - function _approveInput(SwapInput memory input) internal override { - // No need to approve + transferFrom - } - - function _fee(SwapInput memory input, uint256 flags) internal pure override returns(uint256) { - return (flags & _FLAG_DISABLE_REFERRAL_FEE != 0) ? 0 : input.referral.fee; - } } From 8b9ba2d19a13367ec8af738ba5b7c3fddc867207 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Wed, 2 Sep 2020 22:51:22 +0300 Subject: [PATCH 19/30] Fix KyberMooniswapReserve --- contracts/KyberMooniswapReserve.sol | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/contracts/KyberMooniswapReserve.sol b/contracts/KyberMooniswapReserve.sol index 3d32027..71d593c 100644 --- a/contracts/KyberMooniswapReserve.sol +++ b/contracts/KyberMooniswapReserve.sol @@ -50,7 +50,7 @@ contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapS return 0; } - return _convertAmountToRate(src, dst, results[0]); + return _calcRateFromQty(srcQty, results[0], src.uniDecimals(), dst.uniDecimals()); } function trade( @@ -76,16 +76,23 @@ contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapS _swapOnMooniswapRef(src, dst, srcAmount, 0, 0x8180a5CA4E3B94045e05A9313777955f7518D757); uint256 returnAmount = dst.uniBalanceOf(address(this)); - uint256 actualRate = _convertAmountToRate(src, dst, returnAmount); + uint256 actualRate = _calcRateFromQty(srcAmount, returnAmount, src.uniDecimals(), dst.uniDecimals()); require(actualRate <= conversionRate, "Rate exceeded conversionRate"); dst.uniTransfer(destAddress, returnAmount); return true; } - function _convertAmountToRate(IERC20 src, IERC20 dst, uint256 amount) private view returns(uint256) { - return amount.mul(1e18) - .mul(10 ** src.uniDecimals()) - .div(10 ** dst.uniDecimals()); + function _calcRateFromQty( + uint256 srcAmount, + uint256 destAmount, + uint256 srcDecimals, + uint256 dstDecimals + ) private pure returns (uint256) { + if (dstDecimals >= srcDecimals) { + return ((destAmount * 1e18) / ((10**(dstDecimals - srcDecimals)) * srcAmount)); + } else { + return ((destAmount * 1e18 * (10**(srcDecimals - dstDecimals))) / srcAmount); + } } } From 591a0b4910567abd2f2fcbbf8b85fa3a089d5650 Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Thu, 3 Sep 2020 16:07:17 +0300 Subject: [PATCH 20/30] Add Compound --- contracts/OneRouterView.sol | 2 +- contracts/PathsAdvisor.sol | 2 +- contracts/interfaces/ICompound.sol | 31 +++++++++ contracts/interfaces/ICompoundRegistry.sol | 11 ---- contracts/libraries/UniERC20.sol | 4 ++ contracts/sources/CompoundSource.sol | 73 ++++++++++++++++++++++ package.json | 1 + 7 files changed, 111 insertions(+), 13 deletions(-) create mode 100644 contracts/interfaces/ICompound.sol delete mode 100644 contracts/interfaces/ICompoundRegistry.sol create mode 100644 contracts/sources/CompoundSource.sol diff --git a/contracts/OneRouterView.sol b/contracts/OneRouterView.sol index 9495071..66a5bd4 100644 --- a/contracts/OneRouterView.sol +++ b/contracts/OneRouterView.sol @@ -201,7 +201,7 @@ contract OneRouterView is } function _scaleDestTokenEthPriceTimesGasPrice(IERC20 fromToken, IERC20 destToken, uint256 destTokenEthPriceTimesGasPrice) private view returns(uint256) { - if (fromToken == destToken) { + if (fromToken.eq(destToken)) { return destTokenEthPriceTimesGasPrice; } if (destTokenEthPriceTimesGasPrice == 0) { diff --git a/contracts/PathsAdvisor.sol b/contracts/PathsAdvisor.sol index ce7f200..63555fb 100644 --- a/contracts/PathsAdvisor.sol +++ b/contracts/PathsAdvisor.sol @@ -5,7 +5,7 @@ pragma experimental ABIEncoderV2; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "./interfaces/IAaveRegistry.sol"; -import "./interfaces/ICompoundRegistry.sol"; +import "./interfaces/ICompound.sol"; import "./libraries/UniERC20.sol"; import "./OneRouterConstants.sol"; diff --git a/contracts/interfaces/ICompound.sol b/contracts/interfaces/ICompound.sol new file mode 100644 index 0000000..c290156 --- /dev/null +++ b/contracts/interfaces/ICompound.sol @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + + + +interface ICompoundRegistry { + function tokenByCToken(IERC20 cToken) external view returns(IERC20); + function cTokenByToken(IERC20 token) external view returns(IERC20); +} + + +interface ICompound { + function markets(address cToken) external view returns (bool isListed, uint256 collateralFactorMantissa); +} + + +abstract contract ICompoundToken is IERC20 { + function underlying() external view virtual returns (address); + function exchangeRateStored() external view virtual returns (uint256); + function mint(uint256 mintAmount) external virtual returns (uint256); + function redeem(uint256 redeemTokens) external virtual returns (uint256); +} + + +abstract contract ICompoundEther is IERC20 { + function mint() external payable virtual; + function redeem(uint256 redeemTokens) external virtual returns (uint256); +} diff --git a/contracts/interfaces/ICompoundRegistry.sol b/contracts/interfaces/ICompoundRegistry.sol deleted file mode 100644 index aa2d21d..0000000 --- a/contracts/interfaces/ICompoundRegistry.sol +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity ^0.6.0; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; - - -interface ICompoundRegistry { - function tokenByCToken(IERC20 cToken) external view returns(IERC20); - function cTokenByToken(IERC20 token) external view returns(IERC20); -} diff --git a/contracts/libraries/UniERC20.sol b/contracts/libraries/UniERC20.sol index 048fc32..15b5496 100644 --- a/contracts/libraries/UniERC20.sol +++ b/contracts/libraries/UniERC20.sol @@ -18,6 +18,10 @@ library UniERC20 { return (token == ZERO_ADDRESS || token == ETH_ADDRESS); } + function eq(IERC20 tokenA, IERC20 tokenB) internal pure returns(bool) { + return (isETH(tokenA) && isETH(tokenB)) || (tokenA == tokenB); + } + function uniBalanceOf(IERC20 token, address account) internal view returns (uint256) { if (isETH(token)) { return account.balance; diff --git a/contracts/sources/CompoundSource.sol b/contracts/sources/CompoundSource.sol new file mode 100644 index 0000000..14f3207 --- /dev/null +++ b/contracts/sources/CompoundSource.sol @@ -0,0 +1,73 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +import "@openzeppelin/contracts/math/SafeMath.sol"; + +import "../interfaces/ICompound.sol"; +import "../IOneRouterView.sol"; +import "../ISource.sol"; + +import "../libraries/UniERC20.sol"; + + +library CompoundLib { + ICompoundRegistry constant public COMPOUND_REGISTRY = ICompoundRegistry(0xF451Dbd7Ba14BFa7B1B78A766D3Ed438F79EE1D1); + ICompoundEther constant public CETH = ICompoundEther(0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5); +} + +contract CompoundSourceView { + using UniERC20 for IERC20; + using SafeMath for uint256; + + function _calculateCompound(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + rets = new uint256[](amounts.length); + + if (CompoundLib.COMPOUND_REGISTRY.tokenByCToken(fromToken).eq(swap.destToken)) { + uint256 rate = ICompoundToken(address(fromToken)).exchangeRateStored(); + for (uint i = 0; i < amounts.length; i++) { + rets[i] = amounts[i].mul(rate).div(1e18); + } + dex = address(fromToken); + gas = 295_000; + } + else if (CompoundLib.COMPOUND_REGISTRY.cTokenByToken(fromToken).eq(swap.destToken)) { + uint256 rate = ICompoundToken(address(swap.destToken)).exchangeRateStored(); + for (uint i = 0; i < amounts.length; i++) { + rets[i] = amounts[i].mul(1e18).div(rate); + } + dex = address(swap.destToken); + gas = 430_000; + } + } +} + +contract CompoundSourceSwap { + using UniERC20 for IERC20; + using SafeMath for uint256; + + function _swapOnCompound(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + if (CompoundLib.COMPOUND_REGISTRY.tokenByCToken(fromToken).eq(destToken)) { + ICompoundToken(address(fromToken)).redeem(amount); + } + else if (CompoundLib.COMPOUND_REGISTRY.cTokenByToken(fromToken).eq(destToken)) { + if (fromToken.isETH()) { + CompoundLib.CETH.mint{ value: amount }(); + } else { + fromToken.uniApprove(address(destToken), amount); + ICompoundToken(address(destToken)).mint(amount); + } + } + } +} + +contract CompoundSourcePublic is ISource, CompoundSourceView, CompoundSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCompound(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCompound(fromToken, destToken, amount, flags); + } +} diff --git a/package.json b/package.json index ad92448..0dda722 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "dist:balancer1": "FLAT_FILE=./contracts/sources/BalancerSource.sol yarn --silent flat > ./dist/BalancerSourcePublic1.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic1.full.sol && mv ./__dist_BalancerSourcePublic1_full_sol_BalancerSourcePublic1.bin ./dist/BalancerSourcePublic1.full.bin && mv ./__dist_BalancerSourcePublic1_full_sol_BalancerSourcePublic1.abi ./dist/BalancerSourcePublic1.full.abi && rm ./*_sol_*", "dist:balancer2": "FLAT_FILE=./contracts/sources/BalancerSource.sol yarn --silent flat > ./dist/BalancerSourcePublic2.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic2.full.sol && mv ./__dist_BalancerSourcePublic2_full_sol_BalancerSourcePublic2.bin ./dist/BalancerSourcePublic2.full.bin && mv ./__dist_BalancerSourcePublic2_full_sol_BalancerSourcePublic2.abi ./dist/BalancerSourcePublic2.full.abi && rm ./*_sol_*", "dist:balancer3": "FLAT_FILE=./contracts/sources/BalancerSource.sol yarn --silent flat > ./dist/BalancerSourcePublic3.full.sol && solcjs --bin --abi --optimize ./dist/BalancerSourcePublic3.full.sol && mv ./__dist_BalancerSourcePublic3_full_sol_BalancerSourcePublic3.bin ./dist/BalancerSourcePublic3.full.bin && mv ./__dist_BalancerSourcePublic3_full_sol_BalancerSourcePublic3.abi ./dist/BalancerSourcePublic3.full.abi && rm ./*_sol_*", + "dist:compound": "FLAT_FILE=./contracts/sources/CompoundSource.sol yarn --silent flat > ./dist/CompoundSourcePublic.full.sol && solcjs --bin --abi --optimize ./dist/CompoundSourcePublic.full.sol && mv ./__dist_CompoundSourcePublic_full_sol_CompoundSourcePublic.bin ./dist/CompoundSourcePublic.full.bin && mv ./__dist_CompoundSourcePublic_full_sol_CompoundSourcePublic.abi ./dist/CompoundSourcePublic.full.abi && rm ./*_sol_*", "dist:kyber-reserve": "FLAT_FILE=./contracts/KyberMooniswapReserve.sol yarn --silent flat > ./dist/KyberMooniswapReserve.full.sol && solcjs --bin --abi --optimize ./dist/KyberMooniswapReserve.full.sol && mv ./__dist_KyberMooniswapReserve_full_sol_KyberMooniswapReserve.bin ./dist/KyberMooniswapReserve.full.bin && mv ./__dist_KyberMooniswapReserve_full_sol_KyberMooniswapReserve.abi ./dist/KyberMooniswapReserve.full.abi && rm ./*_sol_*", "dist": "yarn dist:router-view && yarn dist:router-swap && yarn dist:audit && yarn dist:balancer1 && yarn dist:balancer2 && yarn dist:balancer3" } From 47ebf7c58f48560a8a5638de8a32328f1cc3e130 Mon Sep 17 00:00:00 2001 From: ducquangkstn Date: Mon, 7 Sep 2020 22:31:39 +0700 Subject: [PATCH 21/30] fix issue --- contracts/KyberMooniswapReserve.sol | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contracts/KyberMooniswapReserve.sol b/contracts/KyberMooniswapReserve.sol index 71d593c..ec53bf0 100644 --- a/contracts/KyberMooniswapReserve.sol +++ b/contracts/KyberMooniswapReserve.sol @@ -30,7 +30,11 @@ interface IKyberReserve { contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapSourceSwap { using UniERC20 for IERC20; - address public constant KYBER_NETWORK = 0x7C66550C9c730B6fdd4C03bc2e73c5462c5F7ACC; + address public immutable kyberNetwork; + + constructor(address _kyberNetwork) public { + kyberNetwork = _kyberNetwork; + } function getConversionRate( IERC20 src, @@ -61,7 +65,7 @@ contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapS uint256 conversionRate, bool validate ) external payable override returns(bool) { - require(msg.sender == KYBER_NETWORK, "Access denied"); + require(msg.sender == kyberNetwork, "Access denied"); src.uniTransferFromSender(payable(address(this)), srcAmount); if (validate) { @@ -77,12 +81,14 @@ contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapS uint256 returnAmount = dst.uniBalanceOf(address(this)); uint256 actualRate = _calcRateFromQty(srcAmount, returnAmount, src.uniDecimals(), dst.uniDecimals()); - require(actualRate <= conversionRate, "Rate exceeded conversionRate"); + require(actualRate >= conversionRate, "Rate exceeded conversionRate"); dst.uniTransfer(destAddress, returnAmount); return true; } + receive() external payable {} + function _calcRateFromQty( uint256 srcAmount, uint256 destAmount, From b4dab624228f4d1c3581434ba64666c4d0a0067e Mon Sep 17 00:00:00 2001 From: ducquangkstn Date: Tue, 8 Sep 2020 11:52:58 +0700 Subject: [PATCH 22/30] add unit test and change revert msg --- contracts/KyberMooniswapReserve.sol | 2 +- test/KyberMooniswapReserve.js | 76 +++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 test/KyberMooniswapReserve.js diff --git a/contracts/KyberMooniswapReserve.sol b/contracts/KyberMooniswapReserve.sol index ec53bf0..1594bad 100644 --- a/contracts/KyberMooniswapReserve.sol +++ b/contracts/KyberMooniswapReserve.sol @@ -81,7 +81,7 @@ contract KyberMooniswapReserve is IKyberReserve, MooniswapSourceView, MooniswapS uint256 returnAmount = dst.uniBalanceOf(address(this)); uint256 actualRate = _calcRateFromQty(srcAmount, returnAmount, src.uniDecimals(), dst.uniDecimals()); - require(actualRate >= conversionRate, "Rate exceeded conversionRate"); + require(actualRate >= conversionRate, "actualRate below network rate"); dst.uniTransfer(destAddress, returnAmount); return true; diff --git a/test/KyberMooniswapReserve.js b/test/KyberMooniswapReserve.js new file mode 100644 index 0000000..0cbcf6f --- /dev/null +++ b/test/KyberMooniswapReserve.js @@ -0,0 +1,76 @@ +const { BN } = require('@openzeppelin/test-helpers/src/setup'); +const { expect } = require('chai'); + +const IERC20 = artifacts.require('IERC20'); +const KyberMooniswapReserve = artifacts.require('KyberMooniswapReserve.sol'); + +const ethAddress = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'; +const ethDecimals = new BN(18); +const usdtDecimals = new BN(6); + +let usdtToken; +let reserve; + +contract('KyberMooniswapReserve', function (accounts) { + // set kybetNetwork as accounts[0] for permission to trade + const kyberNetwork = accounts[0]; + before('set up', async () => { + usdtToken = await IERC20.at('0xdac17f958d2ee523a2206206994597c13d831ec7'); + reserve = await KyberMooniswapReserve.new(kyberNetwork); + }); + + it('test swap eth to usdt', async () => { + const ethWei = new BN(10).pow(new BN(18)); + const rate = await reserve.getConversionRate( + ethAddress, + usdtToken.address, + ethWei, + new BN(0), + ); + const expectedDstQty = calcDstQty(ethWei, ethDecimals, usdtDecimals, rate); + const oldBalance = await usdtToken.balanceOf(kyberNetwork); + await reserve.trade(ethAddress, ethWei, usdtToken.address, kyberNetwork, rate, true, { + value: ethWei, + }); + const newBalance = await usdtToken.balanceOf(kyberNetwork); + expect(expectedDstQty).to.be.bignumber.most(newBalance.sub(oldBalance)); + }); + + it('test swap usdt to eth', async () => { + const tokenTwei = await usdtToken.balanceOf(kyberNetwork); + const rate = await reserve.getConversionRate( + usdtToken.address, + ethAddress, + tokenTwei, + new BN(0), + ); + // approve from network to reserve + await usdtToken.approve(reserve.address, tokenTwei, { from: kyberNetwork }); + const expectedDstQty = calcDstQty(tokenTwei, usdtDecimals, ethDecimals, rate); + const oldBalance = web3.utils.toBN(await web3.eth.getBalance(kyberNetwork)); + await reserve.trade(usdtToken.address, tokenTwei, ethAddress, kyberNetwork, rate, true, { + gasPrice: new BN(0), + }); + // check new balance as expected + const newBalance = await web3.utils.toBN(await web3.eth.getBalance(kyberNetwork)); + expect(expectedDstQty).to.be.bignumber.most(newBalance.sub(oldBalance)); + }); +}); + +function calcDstQty (srcQty, srcDecimals, dstDecimals, rate) { + srcQty = new BN(srcQty); + srcDecimals = new BN(srcDecimals); + dstDecimals = new BN(dstDecimals); + rate = new BN(rate); + const precisionUnits = new BN(10).pow(new BN(18)); + if (dstDecimals.gte(srcDecimals)) { + return srcQty + .mul(rate) + .mul(new BN(10).pow(new BN(dstDecimals.sub(srcDecimals)))) + .div(precisionUnits); + } else { + return srcQty + .mul(rate) + .div(precisionUnits.mul(new BN(10).pow(new BN(srcDecimals.sub(dstDecimals))))); + } +} From 2faee52e183f2d7b3d4b1b1af3296721579d024b Mon Sep 17 00:00:00 2001 From: "Christopher M. Mitchell" Date: Wed, 9 Sep 2020 20:13:23 -0700 Subject: [PATCH 23/30] Adding Curve HBTC support --- contracts/OneRouterConstants.sol | 24 +++++++++++++----------- contracts/OneRouterSwap.sol | 5 +++-- contracts/OneRouterView.sol | 5 +++-- contracts/sources/CurveSource.sol | 19 +++++++++++++++++++ 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/contracts/OneRouterConstants.sol b/contracts/OneRouterConstants.sol index 60d2caa..6b8a0cc 100644 --- a/contracts/OneRouterConstants.sol +++ b/contracts/OneRouterConstants.sol @@ -29,17 +29,18 @@ contract OneRouterConstants { uint256 constant internal _FLAG_DISABLE_CURVE_RENBTC = 0x2000; uint256 constant internal _FLAG_DISABLE_CURVE_TBTC = 0x4000; uint256 constant internal _FLAG_DISABLE_CURVE_SBTC = 0x8000; - uint256 constant internal _FLAG_DISABLE_BALANCER_1 = 0x10000; - uint256 constant internal _FLAG_DISABLE_BALANCER_2 = 0x20000; - uint256 constant internal _FLAG_DISABLE_BALANCER_3 = 0x40000; - uint256 constant internal _FLAG_DISABLE_BANCOR_1 = 0x80000; - uint256 constant internal _FLAG_DISABLE_BANCOR_2 = 0x100000; - uint256 constant internal _FLAG_DISABLE_BANCOR_3 = 0x200000; - uint256 constant internal _FLAG_DISABLE_OASIS = 0x400000; - uint256 constant internal _FLAG_DISABLE_DFORCE_SWAP = 0x800000; - uint256 constant internal _FLAG_DISABLE_SHELL = 0x1000000; - uint256 constant internal _FLAG_DISABLE_MSTABLE_MUSD = 0x2000000; - uint256 constant internal _FLAG_DISABLE_BLACK_HOLE_SWAP = 0x4000000; + uint256 constant internal _FLAG_DISABLE_CURVE_HBTC = 0x10000; + uint256 constant internal _FLAG_DISABLE_BALANCER_1 = 0x20000; + uint256 constant internal _FLAG_DISABLE_BALANCER_2 = 0x40000; + uint256 constant internal _FLAG_DISABLE_BALANCER_3 = 0x80000; + uint256 constant internal _FLAG_DISABLE_BANCOR_1 = 0x100000; + uint256 constant internal _FLAG_DISABLE_BANCOR_2 = 0x200000; + uint256 constant internal _FLAG_DISABLE_BANCOR_3 = 0x400000; + uint256 constant internal _FLAG_DISABLE_OASIS = 0x800000; + uint256 constant internal _FLAG_DISABLE_DFORCE_SWAP = 0x1000000; + uint256 constant internal _FLAG_DISABLE_SHELL = 0x2000000; + uint256 constant internal _FLAG_DISABLE_MSTABLE_MUSD = 0x4000000; + uint256 constant internal _FLAG_DISABLE_BLACK_HOLE_SWAP = 0x8000000; IERC20 constant internal _DAI = IERC20(0x6B175474E89094C44Da98b954EedeAC495271d0F); IERC20 constant internal _USDC = IERC20(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48); @@ -51,5 +52,6 @@ contract OneRouterConstants { IERC20 constant internal _RENBTC = IERC20(0xEB4C2781e4ebA804CE9a9803C67d0893436bB27D); IERC20 constant internal _WBTC = IERC20(0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599); IERC20 constant internal _SBTC = IERC20(0xfE18be6b3Bd88A2D2A7f928d00292E7a9963CfC6); + IERC20 constant internal _HBTC = IERC20(0x0316EB71485b0Ab14103307bf65a021042c6d380); IERC20 constant internal _CHI = IERC20(0x0000000000004946c0e9F43F4Dee607b0eF1fA1c); } diff --git a/contracts/OneRouterSwap.sol b/contracts/OneRouterSwap.sol index 02eec99..9f73493 100644 --- a/contracts/OneRouterSwap.sol +++ b/contracts/OneRouterSwap.sol @@ -49,7 +49,7 @@ contract OneRouterSwap is internal override { - function(IERC20,IERC20,uint256,uint256)[15] memory reserves = [ + function(IERC20,IERC20,uint256,uint256)[16] memory reserves = [ _swapOnUniswapV1, _swapOnUniswapV2, _swapOnMooniswap, @@ -64,7 +64,8 @@ contract OneRouterSwap is _swapOnCurveSynthetix, _swapOnCurvePAX, _swapOnCurveRENBTC, - _swapOnCurveSBTC + _swapOnCurveSBTC, + _swapOnCurveHBTC // _swapOnBalancer1, // _swapOnBalancer2, // _swapOnBalancer3, diff --git a/contracts/OneRouterView.sol b/contracts/OneRouterView.sol index 66a5bd4..27c8f0b 100644 --- a/contracts/OneRouterView.sol +++ b/contracts/OneRouterView.sol @@ -49,7 +49,7 @@ contract OneRouterView is return result; } - function(IERC20,uint256[] memory,Swap memory) view returns(uint256[] memory, address, uint256)[15] memory reserves = [ + function(IERC20,uint256[] memory,Swap memory) view returns(uint256[] memory, address, uint256)[16] memory reserves = [ _calculateUniswapV1, _calculateUniswapV2, _calculateMooniswap, @@ -64,7 +64,8 @@ contract OneRouterView is _calculateCurveSynthetix, _calculateCurvePAX, _calculateCurveRENBTC, - _calculateCurveSBTC + _calculateCurveSBTC, + _calculateCurveHBTC // _calculateBalancer1, // _calculateBalancer2, // _calculateBalancer3, diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol index d8d0d28..f546af5 100644 --- a/contracts/sources/CurveSource.sol +++ b/contracts/sources/CurveSource.sol @@ -23,6 +23,7 @@ library CurveHelper { ICurve constant public CURVE_PAX = ICurve(0x06364f10B501e868329afBc005b3492902d6C763); ICurve constant public CURVE_RENBTC = ICurve(0x93054188d876f558f4a66B2EF1d97d16eDf0895B); ICurve constant public CURVE_SBTC = ICurve(0x7fC77b5c7614E1533320Ea6DDc2Eb61fa00A9714); + ICurve constant public CURVE_HBTC = ICurve(0x4CA9b3063Ec5866A4B82E437059D2C43d1be596F); function dynarr(IERC20[2] memory tokens) internal pure returns(IERC20[] memory result) { result = new IERC20[](tokens.length); @@ -87,6 +88,10 @@ contract CurveSourceView is OneRouterConstants { return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC])), address(CurveHelper.CURVE_SBTC), 150_000); } + function _calculateCurveHBTC(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_HBTC, false, CurveHelper.dynarr([_HBTC, _WBTC])), address(CurveHelper.CURVE_HBTC), 130_000); + } + function _calculateCurveSelector( IERC20 fromToken, IOneRouterView.Swap memory swap, @@ -236,6 +241,10 @@ contract CurveSourceSwap is OneRouterConstants { _swapOnCurve(CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC]), fromToken, destToken, amount); } + function _swapOnCurveHBTC(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_HBTC, false, CurveHelper.dynarr([_HBTC, _WBTC]), fromToken, destToken, amount); + } + function _swapOnCurve( ICurve curve, bool underlying, @@ -351,3 +360,13 @@ contract CurveSourcePublicSBTC is ISource, CurveSourceView, CurveSourceSwap { return _swapOnCurveSBTC(fromToken, destToken, amount, flags); } } + +contract CurveSourcePublicHBTC is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurveSBTC(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurveHBTC(fromToken, destToken, amount, flags); + } +} \ No newline at end of file From 665b68a539ecc935c709b019df522b57abe5b5dc Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Sun, 13 Sep 2020 14:54:26 +0300 Subject: [PATCH 24/30] New Balancer Registry --- contracts/interfaces/IBalancer.sol | 43 ---------------------------- contracts/sources/BalancerSource.sol | 2 +- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/contracts/interfaces/IBalancer.sol b/contracts/interfaces/IBalancer.sol index f1cb943..c894040 100644 --- a/contracts/interfaces/IBalancer.sol +++ b/contracts/interfaces/IBalancer.sol @@ -22,49 +22,6 @@ interface IBalancerPool { } interface IBalancerRegistry { - // Get info about pool pair for 1 SLOAD - function getPairInfo(address pool, IERC20 fromToken, IERC20 destToken) - external view returns(uint256 weight1, uint256 weight2, uint256 swapFee); - - // Pools - function checkAddedPools(address pool) - external view returns(bool); - function getAddedPoolsLength() - external view returns(uint256); - function getAddedPools() - external view returns(address[] memory); - function getAddedPoolsWithLimit(uint256 offset, uint256 limit) - external view returns(address[] memory result); - - // Tokens - function getAllTokensLength() - external view returns(uint256); - function getAllTokens() - external view returns(address[] memory); - function getAllTokensWithLimit(uint256 offset, uint256 limit) - external view returns(address[] memory result); - - // Pairs - function getPoolsLength(IERC20 fromToken, IERC20 destToken) - external view returns(uint256); - function getPools(IERC20 fromToken, IERC20 destToken) - external view returns(IBalancerPool[] memory); - function getPoolsWithLimit(IERC20 fromToken, IERC20 destToken, uint256 offset, uint256 limit) - external view returns(IBalancerPool[] memory result); - function getBestPools(IERC20 fromToken, IERC20 destToken) - external view returns(IBalancerPool[] memory pools); function getBestPoolsWithLimit(IERC20 fromToken, IERC20 destToken, uint256 limit) external view returns(IBalancerPool[] memory pools); - - // Get swap rates - function getPoolReturn(address pool, IERC20 fromToken, IERC20 destToken, uint256 amount) - external view returns(uint256); - function getPoolReturns(address pool, IERC20 fromToken, IERC20 destToken, uint256[] calldata amounts) - external view returns(uint256[] memory result); - - // Add and update registry - function addPool(address pool) external returns(uint256 listed); - function addPools(address[] calldata pools) external returns(uint256[] memory listed); - function updatedIndices(address[] calldata tokens, uint256 lengthLimit) external; } - diff --git a/contracts/sources/BalancerSource.sol b/contracts/sources/BalancerSource.sol index 2076e08..c8e2fc6 100644 --- a/contracts/sources/BalancerSource.sol +++ b/contracts/sources/BalancerSource.sol @@ -18,7 +18,7 @@ import "../libraries/FlagsChecker.sol"; library BalancerHelper { IWETH constant public WETH = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2); - IBalancerRegistry constant public REGISTRY = IBalancerRegistry(0x65e67cbc342712DF67494ACEfc06fe951EE93982); + IBalancerRegistry constant public REGISTRY = IBalancerRegistry(0x7226DaaF09B3972320Db05f5aB81FF38417Dd687); } From cb9ddcd2a224d202de16e73d6d7310b67bebbbaa Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Sun, 13 Sep 2020 14:56:25 +0300 Subject: [PATCH 25/30] Fix Curve HBTC typo --- contracts/sources/CurveSource.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol index f546af5..2893830 100644 --- a/contracts/sources/CurveSource.sol +++ b/contracts/sources/CurveSource.sol @@ -363,10 +363,10 @@ contract CurveSourcePublicSBTC is ISource, CurveSourceView, CurveSourceSwap { contract CurveSourcePublicHBTC is ISource, CurveSourceView, CurveSourceSwap { function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { - return _calculateCurveSBTC(fromToken, amounts, swap); + return _calculateCurveHBTC(fromToken, amounts, swap); } function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { return _swapOnCurveHBTC(fromToken, destToken, amount, flags); } -} \ No newline at end of file +} From c2c5311a1b5a234eba4baff71cfeb6c1f1a370b4 Mon Sep 17 00:00:00 2001 From: AA Date: Mon, 14 Sep 2020 02:42:04 +0300 Subject: [PATCH 26/30] Add Curve 3pool --- contracts/OneRouterSwap.sol | 5 +- contracts/OneRouterView.sol | 5 +- contracts/sources/CurveSource.sol | 19 + package-lock.json | 11616 ++++++++++++++++++++++++++++ 4 files changed, 11641 insertions(+), 4 deletions(-) create mode 100644 package-lock.json diff --git a/contracts/OneRouterSwap.sol b/contracts/OneRouterSwap.sol index 02eec99..8b442f7 100644 --- a/contracts/OneRouterSwap.sol +++ b/contracts/OneRouterSwap.sol @@ -49,7 +49,7 @@ contract OneRouterSwap is internal override { - function(IERC20,IERC20,uint256,uint256)[15] memory reserves = [ + function(IERC20,IERC20,uint256,uint256)[16] memory reserves = [ _swapOnUniswapV1, _swapOnUniswapV2, _swapOnMooniswap, @@ -64,7 +64,8 @@ contract OneRouterSwap is _swapOnCurveSynthetix, _swapOnCurvePAX, _swapOnCurveRENBTC, - _swapOnCurveSBTC + _swapOnCurveSBTC, + _swapOnCurve3pool // _swapOnBalancer1, // _swapOnBalancer2, // _swapOnBalancer3, diff --git a/contracts/OneRouterView.sol b/contracts/OneRouterView.sol index 66a5bd4..c7d56fa 100644 --- a/contracts/OneRouterView.sol +++ b/contracts/OneRouterView.sol @@ -49,7 +49,7 @@ contract OneRouterView is return result; } - function(IERC20,uint256[] memory,Swap memory) view returns(uint256[] memory, address, uint256)[15] memory reserves = [ + function(IERC20,uint256[] memory,Swap memory) view returns(uint256[] memory, address, uint256)[16] memory reserves = [ _calculateUniswapV1, _calculateUniswapV2, _calculateMooniswap, @@ -64,7 +64,8 @@ contract OneRouterView is _calculateCurveSynthetix, _calculateCurvePAX, _calculateCurveRENBTC, - _calculateCurveSBTC + _calculateCurveSBTC, + _calculateCurve3pool // _calculateBalancer1, // _calculateBalancer2, // _calculateBalancer3, diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol index d8d0d28..13a4631 100644 --- a/contracts/sources/CurveSource.sol +++ b/contracts/sources/CurveSource.sol @@ -23,6 +23,7 @@ library CurveHelper { ICurve constant public CURVE_PAX = ICurve(0x06364f10B501e868329afBc005b3492902d6C763); ICurve constant public CURVE_RENBTC = ICurve(0x93054188d876f558f4a66B2EF1d97d16eDf0895B); ICurve constant public CURVE_SBTC = ICurve(0x7fC77b5c7614E1533320Ea6DDc2Eb61fa00A9714); + ICurve constant public CURVE_3pool = ICurve(0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7); function dynarr(IERC20[2] memory tokens) internal pure returns(IERC20[] memory result) { result = new IERC20[](tokens.length); @@ -87,6 +88,10 @@ contract CurveSourceView is OneRouterConstants { return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC])), address(CurveHelper.CURVE_SBTC), 150_000); } + function _calculateCurve3pool(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_3pool, false, CurveHelper.dynarr([_DAI, _USDC, _USDT])), address(CurveHelper.CURVE_3pool), 130_000); + } + function _calculateCurveSelector( IERC20 fromToken, IOneRouterView.Swap memory swap, @@ -236,6 +241,10 @@ contract CurveSourceSwap is OneRouterConstants { _swapOnCurve(CurveHelper.CURVE_SBTC, false, CurveHelper.dynarr([_RENBTC, _WBTC, _SBTC]), fromToken, destToken, amount); } + function _swapOnCurve3pool(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 /*flags*/) internal { + _swapOnCurve(CurveHelper.CURVE_3pool, false, CurveHelper.dynarr([_DAI, _USDC, _USDT]), fromToken, destToken, amount); + } + function _swapOnCurve( ICurve curve, bool underlying, @@ -351,3 +360,13 @@ contract CurveSourcePublicSBTC is ISource, CurveSourceView, CurveSourceSwap { return _swapOnCurveSBTC(fromToken, destToken, amount, flags); } } + +contract CurveSourcePublic3pool is ISource, CurveSourceView, CurveSourceSwap { + function calculate(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) public view override returns(uint256[] memory rets, address dex, uint256 gas) { + return _calculateCurve3pool(fromToken, amounts, swap); + } + + function swap(IERC20 fromToken, IERC20 destToken, uint256 amount, uint256 flags) public override { + return _swapOnCurve3pool(fromToken, destToken, amount, flags); + } +} diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..470c94a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,11616 @@ +{ + "name": "@1inch/1inchProtocol", + "version": "0.0.1", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@codechecks/client": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/@codechecks/client/-/client-0.1.10.tgz", + "integrity": "sha512-rvX+LknmMohsLTU8mHJqIcNTo8fKfw6A5i7JvT6JJWqwCLi+TujHpRO8BLf48iF96+gU5viVvKfRaUyhc3wloA==", + "dev": true, + "requires": { + "bluebird": "^3.5.3", + "chalk": "^2.4.2", + "commander": "^2.19.0", + "debug": "^4.1.1", + "execa": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.1.15", + "js-yaml": "^3.13.1", + "json5": "^2.1.0", + "lodash": "^4.17.11", + "marked": "^0.7.0", + "marked-terminal": "^3.3.0", + "mkdirp": "^0.5.1", + "ms": "^2.1.1", + "promise": "^8.0.2", + "request": "^2.88.0", + "request-promise": "^4.2.2", + "ts-essentials": "^1.0.2", + "ts-node": "^8.0.2", + "url-join": "^4.0.0" + } + }, + "@eslint/eslintrc": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz", + "integrity": "sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "lodash": "^4.17.19", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + } + }, + "@ethersproject/abi": { + "version": "5.0.0-beta.153", + "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.0-beta.153.tgz", + "integrity": "sha512-aXweZ1Z7vMNzJdLpR1CZUAIgnwjrZeUSvN9syCwlBaEBUFJmFY+HHnfuTI5vIhVs/mRkfJVrbEyl51JZQqyjAg==", + "dev": true, + "requires": { + "@ethersproject/address": ">=5.0.0-beta.128", + "@ethersproject/bignumber": ">=5.0.0-beta.130", + "@ethersproject/bytes": ">=5.0.0-beta.129", + "@ethersproject/constants": ">=5.0.0-beta.128", + "@ethersproject/hash": ">=5.0.0-beta.128", + "@ethersproject/keccak256": ">=5.0.0-beta.127", + "@ethersproject/logger": ">=5.0.0-beta.129", + "@ethersproject/properties": ">=5.0.0-beta.131", + "@ethersproject/strings": ">=5.0.0-beta.130" + } + }, + "@ethersproject/address": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.0.4.tgz", + "integrity": "sha512-CIjAeG6zNehbpJTi0sgwUvaH2ZICiAV9XkCBaFy5tjuEVFpQNeqd6f+B7RowcNO7Eut+QbhcQ5CVLkmP5zhL9A==", + "dev": true, + "requires": { + "@ethersproject/bignumber": "^5.0.7", + "@ethersproject/bytes": "^5.0.4", + "@ethersproject/keccak256": "^5.0.3", + "@ethersproject/logger": "^5.0.5", + "@ethersproject/rlp": "^5.0.3", + "bn.js": "^4.4.0" + } + }, + "@ethersproject/bignumber": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.0.7.tgz", + "integrity": "sha512-wwKgDJ+KA7IpgJwc8Fc0AjKIRuDskKA2cque29/+SgII9/1K/38JpqVNPKIovkLwTC2DDofIyzHcxeaKpMFouQ==", + "dev": true, + "requires": { + "@ethersproject/bytes": "^5.0.4", + "@ethersproject/logger": "^5.0.5", + "bn.js": "^4.4.0" + } + }, + "@ethersproject/bytes": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.0.4.tgz", + "integrity": "sha512-9R6A6l9JN8x1U4s1dJCR+9h3MZTT3xQofr/Xx8wbDvj6NnY4CbBB0o8ZgHXvR74yV90pY2EzCekpkMBJnRzkSw==", + "dev": true, + "requires": { + "@ethersproject/logger": "^5.0.5" + } + }, + "@ethersproject/constants": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.0.4.tgz", + "integrity": "sha512-Df32lcXDHPgZRPgp1dgmByNbNe4Ki1QoXR+wU61on5nggQGTqWR1Bb7pp9VtI5Go9kyE/JflFc4Te6o9MvYt8A==", + "dev": true, + "requires": { + "@ethersproject/bignumber": "^5.0.7" + } + }, + "@ethersproject/hash": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.0.4.tgz", + "integrity": "sha512-VCs/bFBU8AQFhHcT1cQH6x7a4zjulR6fJmAOcPxUgrN7bxOQ7QkpBKF+YCDJhFtkLdaljIsr/r831TuWU4Ysfg==", + "dev": true, + "requires": { + "@ethersproject/bytes": "^5.0.4", + "@ethersproject/keccak256": "^5.0.3", + "@ethersproject/logger": "^5.0.5", + "@ethersproject/strings": "^5.0.4" + } + }, + "@ethersproject/keccak256": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.0.3.tgz", + "integrity": "sha512-VhW3mgZMBZlETV6AyOmjNeNG+Pg68igiKkPpat8/FZl0CKnfgQ+KZQZ/ee1vT+X0IUM8/djqnei6btmtbA27Ug==", + "dev": true, + "requires": { + "@ethersproject/bytes": "^5.0.4", + "js-sha3": "0.5.7" + } + }, + "@ethersproject/logger": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.0.5.tgz", + "integrity": "sha512-gJj72WGzQhUtCk6kfvI8elTaPOQyMvrMghp/nbz0ivTo39fZ7IjypFh/ySDeUSdBNplAwhzWKKejQhdpyefg/w==", + "dev": true + }, + "@ethersproject/properties": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.3.tgz", + "integrity": "sha512-wLCSrbywkQgTO6tIF9ZdKsH9AIxPEqAJF/z5xcPkz1DK4mMAZgAXRNw1MrKYhyb+7CqNHbj3vxenNKFavGY/IA==", + "dev": true, + "requires": { + "@ethersproject/logger": "^5.0.5" + } + }, + "@ethersproject/rlp": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.0.3.tgz", + "integrity": "sha512-Hz4yyA/ilGafASAqtTlLWkA/YqwhQmhbDAq2LSIp1AJNx+wtbKWFAKSckpeZ+WG/xZmT+fw5OFKK7a5IZ4DR5g==", + "dev": true, + "requires": { + "@ethersproject/bytes": "^5.0.4", + "@ethersproject/logger": "^5.0.5" + } + }, + "@ethersproject/signing-key": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.0.4.tgz", + "integrity": "sha512-I6pJoga1IvhtjYK5yXzCjs4ZpxrVbt9ZRAlpEw0SW9UuV020YfJH5EIVEGR2evdRceS3nAQIggqbsXSkP8Y1Dg==", + "dev": true, + "requires": { + "@ethersproject/bytes": "^5.0.4", + "@ethersproject/logger": "^5.0.5", + "@ethersproject/properties": "^5.0.3", + "elliptic": "6.5.3" + } + }, + "@ethersproject/strings": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.0.4.tgz", + "integrity": "sha512-azXFHaNkDXzefhr4LVVzzDMFwj3kH9EOKlATu51HjxabQafuUyVLPFgmxRFmCynnAi0Bmmp7nr+qK1pVDgRDLQ==", + "dev": true, + "requires": { + "@ethersproject/bytes": "^5.0.4", + "@ethersproject/constants": "^5.0.4", + "@ethersproject/logger": "^5.0.5" + } + }, + "@ethersproject/transactions": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.0.5.tgz", + "integrity": "sha512-1Ga/QmbcB74DItggP8/DK1tggu4ErEvwTkIwIlUXUcvIAuRNXXE7kgQhlp+w1xA/SAQFhv56SqCoyqPiiLCvVA==", + "dev": true, + "requires": { + "@ethersproject/address": "^5.0.4", + "@ethersproject/bignumber": "^5.0.7", + "@ethersproject/bytes": "^5.0.4", + "@ethersproject/constants": "^5.0.4", + "@ethersproject/keccak256": "^5.0.3", + "@ethersproject/logger": "^5.0.5", + "@ethersproject/properties": "^5.0.3", + "@ethersproject/rlp": "^5.0.3", + "@ethersproject/signing-key": "^5.0.4" + } + }, + "@nodelib/fs.scandir": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.3", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", + "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.3", + "fastq": "^1.6.0" + } + }, + "@openzeppelin/contract-loader": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contract-loader/-/contract-loader-0.4.0.tgz", + "integrity": "sha512-K+Pl4tn0FbxMSP0H9sgi61ayCbecpqhQmuBshelC7A3q2MlpcqWRJan0xijpwdtv6TORNd5oZNe/+f3l+GD6tw==", + "dev": true, + "requires": { + "find-up": "^4.1.0", + "fs-extra": "^8.1.0", + "try-require": "^1.2.1" + } + }, + "@openzeppelin/contracts": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.2.0.tgz", + "integrity": "sha512-bUOmkSoPkjnUyMiKo6RYnb0VHBk5D9KKDAgNLzF41aqAM3TeE0yGdFF5dVRcV60pZdJLlyFT/jjXIZCWyyEzAQ==" + }, + "@openzeppelin/test-helpers": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@openzeppelin/test-helpers/-/test-helpers-0.5.6.tgz", + "integrity": "sha512-8U4sR4ed4cFmc6UKj7akUxZzQJKU9P3p/3RbF+urQuRLLhBaB8zSya1m9VB7/anYEZnBmTDk8LuVgAmYaCPs9A==", + "dev": true, + "requires": { + "@openzeppelin/contract-loader": "^0.4.0", + "@truffle/contract": "^4.0.35 <4.2.2", + "ansi-colors": "^3.2.3", + "chai": "^4.2.0", + "chai-bn": "^0.2.1", + "ethjs-abi": "^0.2.1", + "lodash.flatten": "^4.4.0", + "semver": "^5.6.0", + "web3": "^1.2.1", + "web3-utils": "^1.2.1" + } + }, + "@resolver-engine/core": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@resolver-engine/core/-/core-0.2.1.tgz", + "integrity": "sha512-nsLQHmPJ77QuifqsIvqjaF5B9aHnDzJjp73Q1z6apY3e9nqYrx4Dtowhpsf7Jwftg/XzVDEMQC+OzUBNTS+S1A==", + "dev": true, + "requires": { + "debug": "^3.1.0", + "request": "^2.85.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@resolver-engine/fs": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@resolver-engine/fs/-/fs-0.2.1.tgz", + "integrity": "sha512-7kJInM1Qo2LJcKyDhuYzh9ZWd+mal/fynfL9BNjWOiTcOpX+jNfqb/UmGUqros5pceBITlWGqS4lU709yHFUbg==", + "dev": true, + "requires": { + "@resolver-engine/core": "^0.2.1", + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@resolver-engine/imports": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@resolver-engine/imports/-/imports-0.2.2.tgz", + "integrity": "sha512-u5/HUkvo8q34AA+hnxxqqXGfby5swnH0Myw91o3Sm2TETJlNKXibFGSKBavAH+wvWdBi4Z5gS2Odu0PowgVOUg==", + "dev": true, + "requires": { + "@resolver-engine/core": "^0.2.1", + "debug": "^3.1.0", + "hosted-git-info": "^2.6.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@resolver-engine/imports-fs": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@resolver-engine/imports-fs/-/imports-fs-0.2.2.tgz", + "integrity": "sha512-gFCgMvCwyppjwq0UzIjde/WI+yDs3oatJhozG9xdjJdewwtd7LiF0T5i9lrHAUtqrQbqoFE4E+ZMRVHWpWHpKQ==", + "dev": true, + "requires": { + "@resolver-engine/fs": "^0.2.1", + "@resolver-engine/imports": "^0.2.2", + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@sindresorhus/is": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", + "dev": true + }, + "@solidity-parser/parser": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.5.2.tgz", + "integrity": "sha512-uRyvnvVYmgNmTBpWDbBsH/0kPESQhQpEc4KsvMRLVzFJ1o1s0uIv0Y6Y9IB5vI1Dwz2CbS4X/y4Wyw/75cTFnQ==", + "dev": true + }, + "@szmarczak/http-timer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", + "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", + "dev": true, + "requires": { + "defer-to-connect": "^1.0.1" + } + }, + "@truffle/blockchain-utils": { + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/@truffle/blockchain-utils/-/blockchain-utils-0.0.18.tgz", + "integrity": "sha512-XnRu5p1QO9krJizOeBY5WfzPDvEOmCnOT5u6qF8uN3Kkq9vcH3ZqW4XTuzz9ERZNpZfWb3UJx4PUosgeHLs5vw==", + "dev": true, + "requires": { + "source-map-support": "^0.5.16" + } + }, + "@truffle/contract": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@truffle/contract/-/contract-4.2.1.tgz", + "integrity": "sha512-af1rUyU/W75GYHt/i7r+NwHozwaCma7V/q/+SRZ3Cw2MFaGOQ0dA/ZGhH8P1F0fmDiUe1DBEIbKxXWai0PWFYg==", + "dev": true, + "requires": { + "@truffle/blockchain-utils": "^0.0.18", + "@truffle/contract-schema": "^3.1.0", + "@truffle/error": "^0.0.8", + "@truffle/interface-adapter": "^0.4.6", + "bignumber.js": "^7.2.1", + "ethereum-ens": "^0.8.0", + "ethers": "^4.0.0-beta.1", + "exorcist": "^1.0.1", + "source-map-support": "^0.5.16", + "web3": "1.2.1", + "web3-core-promievent": "1.2.1", + "web3-eth-abi": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.1.tgz", + "integrity": "sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw==", + "dev": true, + "requires": { + "web3-bzz": "1.2.1", + "web3-core": "1.2.1", + "web3-eth": "1.2.1", + "web3-eth-personal": "1.2.1", + "web3-net": "1.2.1", + "web3-shh": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "@truffle/contract-schema": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/@truffle/contract-schema/-/contract-schema-3.2.5.tgz", + "integrity": "sha512-07lzyYJinGvpaKc/WUm1sigtE5qDjFfUb/wUfV5cNsUmRSd/Ji9vTZ+of/zYP4MztJQLT/ZtuG836oXhWgqntg==", + "dev": true, + "requires": { + "ajv": "^6.10.0", + "crypto-js": "^3.1.9-1", + "debug": "^4.1.0" + } + }, + "@truffle/error": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/@truffle/error/-/error-0.0.8.tgz", + "integrity": "sha512-x55rtRuNfRO1azmZ30iR0pf0OJ6flQqbax1hJz+Avk1K5fdmOv5cr22s9qFnwTWnS6Bw0jvJEoR0ITsM7cPKtQ==", + "dev": true + }, + "@truffle/interface-adapter": { + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/@truffle/interface-adapter/-/interface-adapter-0.4.16.tgz", + "integrity": "sha512-lsxk26Lz/h0n8fe37K1ZxowxokXj0AZeNR10QHltDvkHukuTIC4L6fXvrUi74mCwI9hShl4CSBas1Q8kAyJyOA==", + "dev": true, + "requires": { + "bn.js": "^4.11.8", + "ethers": "^4.0.32", + "source-map-support": "^0.5.19", + "web3": "1.2.1" + }, + "dependencies": { + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.1.tgz", + "integrity": "sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw==", + "dev": true, + "requires": { + "web3-bzz": "1.2.1", + "web3-core": "1.2.1", + "web3-eth": "1.2.1", + "web3-eth-personal": "1.2.1", + "web3-net": "1.2.1", + "web3-shh": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + } + } + } + } + }, + "@truffle/provider": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/@truffle/provider/-/provider-0.1.19.tgz", + "integrity": "sha512-ke8iQmzW4Y99+8iff8xQcc+mCNU4AkwtaZ/iSpmVD8qpLytw8/DSNCm0RiEz9/+I93Q1zqI4Jnij/rXnkS2Njw==", + "dev": true, + "requires": { + "@truffle/error": "^0.0.7", + "@truffle/interface-adapter": "^0.3.0", + "web3": "1.2.1" + }, + "dependencies": { + "@truffle/error": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@truffle/error/-/error-0.0.7.tgz", + "integrity": "sha512-UIfVKsXSXocKnn5+RNklUXNoGd/JVj7V8KmC48TQzmjU33HQI86PX0JDS7SpHMHasI3w9X//1q7Lu7nZtj3Zzg==", + "dev": true + }, + "@truffle/interface-adapter": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@truffle/interface-adapter/-/interface-adapter-0.3.3.tgz", + "integrity": "sha512-l3I4WFTfnBSIfG96IOBRtAIE6AHDAxcOUJE7W5zh9hocQwzQlGWc2yEyyTcLa0656TTM8RxaZZ2S/KdHHMvCaw==", + "dev": true, + "requires": { + "bn.js": "^4.11.8", + "ethers": "^4.0.32", + "lodash": "^4.17.13", + "web3": "1.2.2" + }, + "dependencies": { + "web3": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.2.tgz", + "integrity": "sha512-/ChbmB6qZpfGx6eNpczt5YSUBHEA5V2+iUCbn85EVb3Zv6FVxrOo5Tv7Lw0gE2tW7EEjASbCyp3mZeiZaCCngg==", + "dev": true, + "requires": { + "@types/node": "^12.6.1", + "web3-bzz": "1.2.2", + "web3-core": "1.2.2", + "web3-eth": "1.2.2", + "web3-eth-personal": "1.2.2", + "web3-net": "1.2.2", + "web3-shh": "1.2.2", + "web3-utils": "1.2.2" + } + } + } + }, + "@types/node": { + "version": "12.12.58", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.58.tgz", + "integrity": "sha512-Be46CNIHWAagEfINOjmriSxuv7IVcqbGe+sDSg2SYCEz/0CRBy7LRASGfRbD8KZkqoePU73Wsx3UvOSFcq/9hA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "scrypt-js": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", + "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=", + "dev": true + }, + "semver": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", + "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", + "dev": true + }, + "uuid": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", + "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=", + "dev": true + }, + "web3": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.1.tgz", + "integrity": "sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw==", + "dev": true, + "requires": { + "web3-bzz": "1.2.1", + "web3-core": "1.2.1", + "web3-eth": "1.2.1", + "web3-eth-personal": "1.2.1", + "web3-net": "1.2.1", + "web3-shh": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "@types/node": { + "version": "10.17.32", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.32.tgz", + "integrity": "sha512-EUq+cjH/3KCzQHikGnNbWAGe548IFLSm93Vl8xA7EuYEEATiyOVDyEVuGkowL7c9V69FF/RiZSAOCFPApMs/ig==", + "dev": true + }, + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "elliptic": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", + "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "inherits": "^2.0.1" + } + }, + "ethers": { + "version": "4.0.0-beta.3", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", + "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", + "dev": true, + "requires": { + "@types/node": "^10.3.2", + "aes-js": "3.0.0", + "bn.js": "^4.4.0", + "elliptic": "6.3.3", + "hash.js": "1.1.3", + "js-sha3": "0.5.7", + "scrypt-js": "2.0.3", + "setimmediate": "1.0.4", + "uuid": "2.0.1", + "xmlhttprequest": "1.8.0" + } + }, + "web3-bzz": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.2.1.tgz", + "integrity": "sha512-LdOO44TuYbGIPfL4ilkuS89GQovxUpmLz6C1UC7VYVVRILeZS740FVB3j9V4P4FHUk1RenaDfKhcntqgVCHtjw==", + "dev": true, + "requires": { + "got": "9.6.0", + "swarm-js": "0.1.39", + "underscore": "1.9.1" + } + }, + "web3-core": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.1.tgz", + "integrity": "sha512-5ODwIqgl8oIg/0+Ai4jsLxkKFWJYE0uLuE1yUKHNVCL4zL6n3rFjRMpKPokd6id6nJCNgeA64KdWQ4XfpnjdMg==", + "dev": true, + "requires": { + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-core-requestmanager": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-core-helpers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.1.tgz", + "integrity": "sha512-Gx3sTEajD5r96bJgfuW377PZVFmXIH4TdqDhgGwd2lZQCcMi+DA4TgxJNJGxn0R3aUVzyyE76j4LBrh412mXrw==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-eth-iban": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-core-method": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.1.tgz", + "integrity": "sha512-Ghg2WS23qi6Xj8Od3VCzaImLHseEA7/usvnOItluiIc5cKs00WYWsNy2YRStzU9a2+z8lwQywPYp0nTzR/QXdQ==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1", + "web3-core-promievent": "1.2.1", + "web3-core-subscriptions": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-core-promievent": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.1.tgz", + "integrity": "sha512-IVUqgpIKoeOYblwpex4Hye6npM0aMR+kU49VP06secPeN0rHMyhGF0ZGveWBrGvf8WDPI7jhqPBFIC6Jf3Q3zw==", + "dev": true, + "requires": { + "any-promise": "1.3.0", + "eventemitter3": "3.1.2" + } + }, + "web3-core-requestmanager": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.1.tgz", + "integrity": "sha512-xfknTC69RfYmLKC+83Jz73IC3/sS2ZLhGtX33D4Q5nQ8yc39ElyAolxr9sJQS8kihOcM6u4J+8gyGMqsLcpIBg==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1", + "web3-providers-http": "1.2.1", + "web3-providers-ipc": "1.2.1", + "web3-providers-ws": "1.2.1" + } + }, + "web3-core-subscriptions": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.1.tgz", + "integrity": "sha512-nmOwe3NsB8V8UFsY1r+sW6KjdOS68h8nuh7NzlWxBQT/19QSUGiERRTaZXWu5BYvo1EoZRMxCKyCQpSSXLc08g==", + "dev": true, + "requires": { + "eventemitter3": "3.1.2", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1" + } + }, + "web3-eth": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.2.1.tgz", + "integrity": "sha512-/2xly4Yry5FW1i+uygPjhfvgUP/MS/Dk+PDqmzp5M88tS86A+j8BzKc23GrlA8sgGs0645cpZK/999LpEF5UdA==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-core-subscriptions": "1.2.1", + "web3-eth-abi": "1.2.1", + "web3-eth-accounts": "1.2.1", + "web3-eth-contract": "1.2.1", + "web3-eth-ens": "1.2.1", + "web3-eth-iban": "1.2.1", + "web3-eth-personal": "1.2.1", + "web3-net": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-eth-abi": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz", + "integrity": "sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g==", + "dev": true, + "requires": { + "ethers": "4.0.0-beta.3", + "underscore": "1.9.1", + "web3-utils": "1.2.1" + } + }, + "web3-eth-accounts": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.2.1.tgz", + "integrity": "sha512-26I4qq42STQ8IeKUyur3MdQ1NzrzCqPsmzqpux0j6X/XBD7EjZ+Cs0lhGNkSKH5dI3V8CJasnQ5T1mNKeWB7nQ==", + "dev": true, + "requires": { + "any-promise": "1.3.0", + "crypto-browserify": "3.12.0", + "eth-lib": "0.2.7", + "scryptsy": "2.1.0", + "semver": "6.2.0", + "underscore": "1.9.1", + "uuid": "3.3.2", + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "dev": true + } + } + }, + "web3-eth-contract": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.1.tgz", + "integrity": "sha512-kYFESbQ3boC9bl2rYVghj7O8UKMiuKaiMkxvRH5cEDHil8V7MGEGZNH0slSdoyeftZVlaWSMqkRP/chfnKND0g==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-core-promievent": "1.2.1", + "web3-core-subscriptions": "1.2.1", + "web3-eth-abi": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-eth-ens": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.2.1.tgz", + "integrity": "sha512-lhP1kFhqZr2nnbu3CGIFFrAnNxk2veXpOXBY48Tub37RtobDyHijHgrj+xTh+mFiPokyrapVjpFsbGa+Xzye4Q==", + "dev": true, + "requires": { + "eth-ens-namehash": "2.0.8", + "underscore": "1.9.1", + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-promievent": "1.2.1", + "web3-eth-abi": "1.2.1", + "web3-eth-contract": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-eth-iban": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.1.tgz", + "integrity": "sha512-9gkr4QPl1jCU+wkgmZ8EwODVO3ovVj6d6JKMos52ggdT2YCmlfvFVF6wlGLwi0VvNa/p+0BjJzaqxnnG/JewjQ==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "web3-utils": "1.2.1" + } + }, + "web3-eth-personal": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.2.1.tgz", + "integrity": "sha512-RNDVSiaSoY4aIp8+Hc7z+X72H7lMb3fmAChuSBADoEc7DsJrY/d0R5qQDK9g9t2BO8oxgLrLNyBP/9ub2Hc6Bg==", + "dev": true, + "requires": { + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-net": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-net": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.2.1.tgz", + "integrity": "sha512-Yt1Bs7WgnLESPe0rri/ZoPWzSy55ovioaP35w1KZydrNtQ5Yq4WcrAdhBzcOW7vAkIwrsLQsvA+hrOCy7mNauw==", + "dev": true, + "requires": { + "web3-core": "1.2.1", + "web3-core-method": "1.2.1", + "web3-utils": "1.2.1" + } + }, + "web3-providers-http": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.1.tgz", + "integrity": "sha512-BDtVUVolT9b3CAzeGVA/np1hhn7RPUZ6YYGB/sYky+GjeO311Yoq8SRDUSezU92x8yImSC2B+SMReGhd1zL+bQ==", + "dev": true, + "requires": { + "web3-core-helpers": "1.2.1", + "xhr2-cookies": "1.1.0" + } + }, + "web3-providers-ipc": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.1.tgz", + "integrity": "sha512-oPEuOCwxVx8L4CPD0TUdnlOUZwGBSRKScCz/Ws2YHdr9Ium+whm+0NLmOZjkjQp5wovQbyBzNa6zJz1noFRvFA==", + "dev": true, + "requires": { + "oboe": "2.1.4", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1" + } + }, + "web3-providers-ws": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.1.tgz", + "integrity": "sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1", + "websocket": "github:web3-js/WebSocket-Node#polyfill/globalThis" + } + }, + "web3-shh": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.2.1.tgz", + "integrity": "sha512-/3Cl04nza5kuFn25bV3FJWa0s3Vafr5BlT933h26xovQ6HIIz61LmvNQlvX1AhFL+SNJOTcQmK1SM59vcyC8bA==", + "dev": true, + "requires": { + "web3-core": "1.2.1", + "web3-core-method": "1.2.1", + "web3-core-subscriptions": "1.2.1", + "web3-net": "1.2.1" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-bzz": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.2.2.tgz", + "integrity": "sha512-b1O2ObsqUN1lJxmFSjvnEC4TsaCbmh7Owj3IAIWTKqL9qhVgx7Qsu5O9cD13pBiSPNZJ68uJPaKq380QB4NWeA==", + "dev": true, + "requires": { + "@types/node": "^10.12.18", + "got": "9.6.0", + "swarm-js": "0.1.39", + "underscore": "1.9.1" + }, + "dependencies": { + "@types/node": { + "version": "10.17.32", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.32.tgz", + "integrity": "sha512-EUq+cjH/3KCzQHikGnNbWAGe548IFLSm93Vl8xA7EuYEEATiyOVDyEVuGkowL7c9V69FF/RiZSAOCFPApMs/ig==", + "dev": true + } + } + }, + "web3-core": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.2.tgz", + "integrity": "sha512-miHAX3qUgxV+KYfaOY93Hlc3kLW2j5fH8FJy6kSxAv+d4d5aH0wwrU2IIoJylQdT+FeenQ38sgsCnFu9iZ1hCQ==", + "dev": true, + "requires": { + "@types/bn.js": "^4.11.4", + "@types/node": "^12.6.1", + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-core-requestmanager": "1.2.2", + "web3-utils": "1.2.2" + } + }, + "web3-core-helpers": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.2.tgz", + "integrity": "sha512-HJrRsIGgZa1jGUIhvGz4S5Yh6wtOIo/TMIsSLe+Xay+KVnbseJpPprDI5W3s7H2ODhMQTbogmmUFquZweW2ImQ==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-eth-iban": "1.2.2", + "web3-utils": "1.2.2" + } + }, + "web3-core-method": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.2.tgz", + "integrity": "sha512-szR4fDSBxNHaF1DFqE+j6sFR/afv9Aa36OW93saHZnrh+iXSrYeUUDfugeNcRlugEKeUCkd4CZylfgbK2SKYJA==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.2", + "web3-core-promievent": "1.2.2", + "web3-core-subscriptions": "1.2.2", + "web3-utils": "1.2.2" + } + }, + "web3-core-promievent": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.2.tgz", + "integrity": "sha512-tKvYeT8bkUfKABcQswK6/X79blKTKYGk949urZKcLvLDEaWrM3uuzDwdQT3BNKzQ3vIvTggFPX9BwYh0F1WwqQ==", + "dev": true, + "requires": { + "any-promise": "1.3.0", + "eventemitter3": "3.1.2" + } + }, + "web3-core-requestmanager": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.2.tgz", + "integrity": "sha512-a+gSbiBRHtHvkp78U2bsntMGYGF2eCb6219aMufuZWeAZGXJ63Wc2321PCbA8hF9cQrZI4EoZ4kVLRI4OF15Hw==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.2", + "web3-providers-http": "1.2.2", + "web3-providers-ipc": "1.2.2", + "web3-providers-ws": "1.2.2" + } + }, + "web3-core-subscriptions": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.2.tgz", + "integrity": "sha512-QbTgigNuT4eicAWWr7ahVpJyM8GbICsR1Ys9mJqzBEwpqS+RXTRVSkwZ2IsxO+iqv6liMNwGregbJLq4urMFcQ==", + "dev": true, + "requires": { + "eventemitter3": "3.1.2", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.2" + } + }, + "web3-eth": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.2.2.tgz", + "integrity": "sha512-UXpC74mBQvZzd4b+baD4Ocp7g+BlwxhBHumy9seyE/LMIcMlePXwCKzxve9yReNpjaU16Mmyya6ZYlyiKKV8UA==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-core-subscriptions": "1.2.2", + "web3-eth-abi": "1.2.2", + "web3-eth-accounts": "1.2.2", + "web3-eth-contract": "1.2.2", + "web3-eth-ens": "1.2.2", + "web3-eth-iban": "1.2.2", + "web3-eth-personal": "1.2.2", + "web3-net": "1.2.2", + "web3-utils": "1.2.2" + } + }, + "web3-eth-abi": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz", + "integrity": "sha512-Yn/ZMgoOLxhTVxIYtPJ0eS6pnAnkTAaJgUJh1JhZS4ekzgswMfEYXOwpMaD5eiqPJLpuxmZFnXnBZlnQ1JMXsw==", + "dev": true, + "requires": { + "ethers": "4.0.0-beta.3", + "underscore": "1.9.1", + "web3-utils": "1.2.2" + }, + "dependencies": { + "@types/node": { + "version": "10.17.32", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.32.tgz", + "integrity": "sha512-EUq+cjH/3KCzQHikGnNbWAGe548IFLSm93Vl8xA7EuYEEATiyOVDyEVuGkowL7c9V69FF/RiZSAOCFPApMs/ig==", + "dev": true + }, + "elliptic": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", + "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "inherits": "^2.0.1" + } + }, + "ethers": { + "version": "4.0.0-beta.3", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", + "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", + "dev": true, + "requires": { + "@types/node": "^10.3.2", + "aes-js": "3.0.0", + "bn.js": "^4.4.0", + "elliptic": "6.3.3", + "hash.js": "1.1.3", + "js-sha3": "0.5.7", + "scrypt-js": "2.0.3", + "setimmediate": "1.0.4", + "uuid": "2.0.1", + "xmlhttprequest": "1.8.0" + } + } + } + }, + "web3-eth-accounts": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.2.2.tgz", + "integrity": "sha512-KzHOEyXOEZ13ZOkWN3skZKqSo5f4Z1ogPFNn9uZbKCz+kSp+gCAEKxyfbOsB/JMAp5h7o7pb6eYsPCUBJmFFiA==", + "dev": true, + "requires": { + "any-promise": "1.3.0", + "crypto-browserify": "3.12.0", + "eth-lib": "0.2.7", + "ethereumjs-common": "^1.3.2", + "ethereumjs-tx": "^2.1.1", + "scrypt-shim": "github:web3-js/scrypt-shim", + "underscore": "1.9.1", + "uuid": "3.3.2", + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-utils": "1.2.2" + }, + "dependencies": { + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "dev": true + } + } + }, + "web3-eth-contract": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.2.tgz", + "integrity": "sha512-EKT2yVFws3FEdotDQoNsXTYL798+ogJqR2//CaGwx3p0/RvQIgfzEwp8nbgA6dMxCsn9KOQi7OtklzpnJMkjtA==", + "dev": true, + "requires": { + "@types/bn.js": "^4.11.4", + "underscore": "1.9.1", + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-core-promievent": "1.2.2", + "web3-core-subscriptions": "1.2.2", + "web3-eth-abi": "1.2.2", + "web3-utils": "1.2.2" + } + }, + "web3-eth-ens": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.2.2.tgz", + "integrity": "sha512-CFjkr2HnuyMoMFBoNUWojyguD4Ef+NkyovcnUc/iAb9GP4LHohKrODG4pl76R5u61TkJGobC2ij6TyibtsyVYg==", + "dev": true, + "requires": { + "eth-ens-namehash": "2.0.8", + "underscore": "1.9.1", + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-promievent": "1.2.2", + "web3-eth-abi": "1.2.2", + "web3-eth-contract": "1.2.2", + "web3-utils": "1.2.2" + } + }, + "web3-eth-iban": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.2.tgz", + "integrity": "sha512-gxKXBoUhaTFHr0vJB/5sd4i8ejF/7gIsbM/VvemHT3tF5smnmY6hcwSMmn7sl5Gs+83XVb/BngnnGkf+I/rsrQ==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "web3-utils": "1.2.2" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + } + } + }, + "web3-eth-personal": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.2.2.tgz", + "integrity": "sha512-4w+GLvTlFqW3+q4xDUXvCEMU7kRZ+xm/iJC8gm1Li1nXxwwFbs+Y+KBK6ZYtoN1qqAnHR+plYpIoVo27ixI5Rg==", + "dev": true, + "requires": { + "@types/node": "^12.6.1", + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-net": "1.2.2", + "web3-utils": "1.2.2" + } + }, + "web3-net": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.2.2.tgz", + "integrity": "sha512-K07j2DXq0x4UOJgae65rWZKraOznhk8v5EGSTdFqASTx7vWE/m+NqBijBYGEsQY1lSMlVaAY9UEQlcXK5HzXTw==", + "dev": true, + "requires": { + "web3-core": "1.2.2", + "web3-core-method": "1.2.2", + "web3-utils": "1.2.2" + } + }, + "web3-providers-http": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.2.tgz", + "integrity": "sha512-BNZ7Hguy3eBszsarH5gqr9SIZNvqk9eKwqwmGH1LQS1FL3NdoOn7tgPPdddrXec4fL94CwgNk4rCU+OjjZRNDg==", + "dev": true, + "requires": { + "web3-core-helpers": "1.2.2", + "xhr2-cookies": "1.1.0" + } + }, + "web3-providers-ipc": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.2.tgz", + "integrity": "sha512-t97w3zi5Kn/LEWGA6D9qxoO0LBOG+lK2FjlEdCwDQatffB/+vYrzZ/CLYVQSoyFZAlsDoBasVoYSWZK1n39aHA==", + "dev": true, + "requires": { + "oboe": "2.1.4", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.2" + } + }, + "web3-providers-ws": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.2.tgz", + "integrity": "sha512-Wb1mrWTGMTXOpJkL0yGvL/WYLt8fUIXx8k/l52QB2IiKzvyd42dTWn4+j8IKXGSYYzOm7NMqv6nhA5VDk12VfA==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.2", + "websocket": "github:web3-js/WebSocket-Node#polyfill/globalThis" + } + }, + "web3-shh": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.2.2.tgz", + "integrity": "sha512-og258NPhlBn8yYrDWjoWBBb6zo1OlBgoWGT+LL5/LPqRbjPe09hlOYHgscAAr9zZGtohTOty7RrxYw6Z6oDWCg==", + "dev": true, + "requires": { + "web3-core": "1.2.2", + "web3-core-method": "1.2.2", + "web3-core-subscriptions": "1.2.2", + "web3-net": "1.2.2" + } + }, + "web3-utils": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.2.tgz", + "integrity": "sha512-joF+s3243TY5cL7Z7y4h1JsJpUCf/kmFmj+eJar7Y2yNIGVcW961VyrAms75tjUysSuHaUQ3eQXjBEUJueT52A==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethereum-bloom-filters": "^1.0.6", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randombytes": "^2.1.0", + "underscore": "1.9.1", + "utf8": "3.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + } + } + } + } + }, + "@types/bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true + }, + "@types/concat-stream": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz", + "integrity": "sha1-OU2+C7X+5Gs42JZzXoto7yOQ0A0=", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/form-data": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz", + "integrity": "sha1-yayFsqX9GENbjIXZ7LUObWyJP/g=", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", + "dev": true, + "requires": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, + "@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "dev": true + }, + "@types/node": { + "version": "10.17.32", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.32.tgz", + "integrity": "sha512-EUq+cjH/3KCzQHikGnNbWAGe548IFLSm93Vl8xA7EuYEEATiyOVDyEVuGkowL7c9V69FF/RiZSAOCFPApMs/ig==", + "dev": true + }, + "@types/pbkdf2": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.0.tgz", + "integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/qs": { + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ==", + "dev": true + }, + "@types/secp256k1": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.1.tgz", + "integrity": "sha512-+ZjSA8ELlOp8SlKi0YLB2tz9d5iPNEmOBd+8Rz21wTMdaXQIa9b6TEnD6l5qKOCypE7FSyPyck12qZJxSDNoog==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@web3-js/scrypt-shim": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@web3-js/scrypt-shim/-/scrypt-shim-0.1.0.tgz", + "integrity": "sha512-ZtZeWCc/s0nMcdx/+rZwY1EcuRdemOK9ag21ty9UsHkFxsNb/AaoucUz0iPuyGe0Ku+PFuRmWZG7Z7462p9xPw==", + "dev": true, + "requires": { + "scryptsy": "^2.1.0", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "@web3-js/websocket": { + "version": "1.0.30", + "resolved": "https://registry.npmjs.org/@web3-js/websocket/-/websocket-1.0.30.tgz", + "integrity": "sha512-fDwrD47MiDrzcJdSeTLF75aCcxVVt8B1N74rA+vh2XCAvFy4tEWJjtnUtj2QG7/zlQ6g9cQ88bZFBxwd9/FmtA==", + "dev": true, + "requires": { + "debug": "^2.2.0", + "es5-ext": "^0.10.50", + "nan": "^2.14.0", + "typedarray-to-buffer": "^3.1.5", + "yaeti": "^0.0.6" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "abbrev": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", + "dev": true + }, + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dev": true, + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, + "acorn": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "dev": true + }, + "acorn-jsx": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", + "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "dev": true + }, + "address": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz", + "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==", + "dev": true + }, + "aes-js": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", + "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=", + "dev": true + }, + "ajv": { + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true, + "optional": true + }, + "ansi-colors": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", + "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", + "dev": true + }, + "ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "dev": true + }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "ansicolors": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz", + "integrity": "sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=", + "dev": true + }, + "antlr4": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.7.1.tgz", + "integrity": "sha512-haHyTW7Y9joE5MVs37P2lNYfU2RWBLfcRDD8OWldcdZm5TiCE91B5Xl1oWSwiDUSd4rlExpt2pu1fksYQjRBYQ==", + "dev": true + }, + "any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", + "dev": true + }, + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "app-module-path": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz", + "integrity": "sha1-ZBqlXft9am8KgUHEucCqULbCTdU=", + "dev": true + }, + "arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", + "dev": true + }, + "array-includes": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz", + "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0", + "is-string": "^1.0.5" + } + }, + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true + }, + "array.prototype.flat": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz", + "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, + "array.prototype.map": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz", + "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.4" + } + }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true + }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dev": true, + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dev": true, + "requires": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + }, + "assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true + }, + "ast-parents": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/ast-parents/-/ast-parents-0.0.1.tgz", + "integrity": "sha1-UI/Q8F0MSHddnszaLhdEIyYejdM=", + "dev": true + }, + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true + }, + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", + "dev": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true + }, + "aws4": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", + "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "base-x": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz", + "integrity": "sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "base64-js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dev": true, + "requires": { + "tweetnacl": "^0.14.3" + } + }, + "bignumber.js": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz", + "integrity": "sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==", + "dev": true + }, + "binary-extensions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "dev": true + }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, + "bip66": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz", + "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "bl": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", + "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", + "dev": true, + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, + "blakejs": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz", + "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U=", + "dev": true + }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true + }, + "bn.js": { + "version": "4.11.9", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", + "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", + "dev": true + }, + "body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "dev": true, + "requires": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true + } + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", + "dev": true + }, + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "browserify-aes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "dev": true, + "requires": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "browserify-cipher": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", + "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, + "requires": { + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" + } + }, + "browserify-des": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", + "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "browserify-rsa": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" + } + }, + "browserify-sign": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "dev": true, + "requires": { + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.3", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "bn.js": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", + "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==", + "dev": true + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, + "bs58": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz", + "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=", + "dev": true, + "requires": { + "base-x": "^3.0.2" + } + }, + "bs58check": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz", + "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==", + "dev": true, + "requires": { + "bs58": "^4.0.0", + "create-hash": "^1.1.0", + "safe-buffer": "^5.1.2" + } + }, + "buffer": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", + "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", + "dev": true, + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, + "buffer-alloc": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", + "dev": true, + "requires": { + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" + } + }, + "buffer-alloc-unsafe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", + "dev": true + }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "dev": true + }, + "buffer-fill": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", + "dev": true + }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true + }, + "buffer-to-arraybuffer": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz", + "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=", + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", + "dev": true + }, + "bufferutil": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz", + "integrity": "sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==", + "dev": true, + "requires": { + "node-gyp-build": "~3.7.0" + } + }, + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "dev": true + }, + "cacheable-request": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", + "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "dev": true, + "requires": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^3.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^4.1.0", + "responselike": "^1.0.2" + }, + "dependencies": { + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true + } + } + }, + "caller-callsite": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", + "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", + "dev": true, + "requires": { + "callsites": "^2.0.0" + }, + "dependencies": { + "callsites": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", + "dev": true + } + } + }, + "caller-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", + "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", + "dev": true, + "requires": { + "caller-callsite": "^2.0.0" + } + }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + }, + "cardinal": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz", + "integrity": "sha1-fMEFXYItISlU0HsIXeolHMe8VQU=", + "dev": true, + "requires": { + "ansicolors": "~0.3.2", + "redeyed": "~2.1.0" + } + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true + }, + "chai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", + "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "dev": true, + "requires": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "pathval": "^1.1.0", + "type-detect": "^4.0.5" + } + }, + "chai-bn": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/chai-bn/-/chai-bn-0.2.1.tgz", + "integrity": "sha512-01jt2gSXAw7UYFPT5K8d7HYjdXj2vyeIuE+0T/34FWzlNcVbs1JkPxRu7rYMfQnJhrHT8Nr6qjSf5ZwwLU2EYg==", + "dev": true + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, + "charenc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", + "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=", + "dev": true + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true + }, + "chokidar": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", + "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", + "dev": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.1", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.2.0" + } + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, + "cids": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/cids/-/cids-0.7.5.tgz", + "integrity": "sha512-zT7mPeghoWAu+ppn8+BS1tQ5qGmbMfB4AregnQjA/qHY3GC1m1ptI9GkWNlgeu38r7CuRdXB47uY2XgAYt6QVA==", + "dev": true, + "requires": { + "buffer": "^5.5.0", + "class-is": "^1.1.0", + "multibase": "~0.6.0", + "multicodec": "^1.0.0", + "multihashes": "~0.4.15" + }, + "dependencies": { + "multicodec": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-1.0.4.tgz", + "integrity": "sha512-NDd7FeS3QamVtbgfvu5h7fd1IlbaC4EQ0/pgU4zqE2vdHCmBGsUa0TiM8/TdSeG6BMPC92OOCf8F1ocE/Wkrrg==", + "dev": true, + "requires": { + "buffer": "^5.6.0", + "varint": "^5.0.0" + } + } + } + }, + "cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "class-is": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/class-is/-/class-is-1.1.0.tgz", + "integrity": "sha512-rhjH9AG1fvabIDoGRVH587413LPjTZgmDF9fOFCbFJQV4yuocX1mHxxvXI4g3cGwbVY9wAYIoKlg1N79frJKQw==", + "dev": true + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "^2.0.0" + } + }, + "cli-table": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", + "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=", + "dev": true, + "requires": { + "colors": "1.0.3" + } + }, + "cli-table3": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", + "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", + "dev": true, + "requires": { + "colors": "^1.1.2", + "object-assign": "^4.1.0", + "string-width": "^2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true, + "optional": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "cli-width": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", + "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", + "dev": true + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "dev": true, + "requires": { + "mimic-response": "^1.0.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "colors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", + "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", + "dev": true + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "command-exists": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz", + "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==", + "dev": true + }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "contains-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", + "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", + "dev": true + }, + "content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, + "content-hash": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/content-hash/-/content-hash-2.5.2.tgz", + "integrity": "sha512-FvIQKy0S1JaWV10sMsA7TRx8bpU+pqPkhbsfvOJAdjRXvYxEckAwQWGwtRjiaJfh+E0DvcWUGqcdjwMGFjsSdw==", + "dev": true, + "requires": { + "cids": "^0.7.1", + "multicodec": "^0.5.5", + "multihashes": "^0.4.15" + } + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "dev": true + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, + "cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "dev": true + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "dev": true + }, + "cookiejar": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", + "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dev": true, + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, + "cosmiconfig": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", + "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", + "dev": true, + "requires": { + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" + }, + "dependencies": { + "import-fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", + "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", + "dev": true, + "requires": { + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true + } + } + }, + "coveralls": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.0.tgz", + "integrity": "sha512-sHxOu2ELzW8/NC1UP5XVLbZDzO4S3VxfFye3XYCznopHy02YjNkHcj5bKaVw2O7hVaBdBjEdQGpie4II1mWhuQ==", + "dev": true, + "requires": { + "js-yaml": "^3.13.1", + "lcov-parse": "^1.0.0", + "log-driver": "^1.2.7", + "minimist": "^1.2.5", + "request": "^2.88.2" + } + }, + "create-ecdh": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", + "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "elliptic": "^6.5.3" + } + }, + "create-hash": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } + }, + "create-hmac": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "dev": true, + "requires": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "crypt": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", + "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=", + "dev": true + }, + "crypto-browserify": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", + "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, + "requires": { + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" + } + }, + "crypto-js": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz", + "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==", + "dev": true + }, + "d": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "dev": true, + "requires": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0" + } + }, + "death": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/death/-/death-1.1.0.tgz", + "integrity": "sha1-AaqcQB7dknUFFEcLgmY5DGbGcxg=", + "dev": true + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true + }, + "decompress": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz", + "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==", + "dev": true, + "requires": { + "decompress-tar": "^4.0.0", + "decompress-tarbz2": "^4.0.0", + "decompress-targz": "^4.0.0", + "decompress-unzip": "^4.0.1", + "graceful-fs": "^4.1.10", + "make-dir": "^1.0.0", + "pify": "^2.3.0", + "strip-dirs": "^2.0.0" + } + }, + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "dev": true, + "requires": { + "mimic-response": "^1.0.0" + } + }, + "decompress-tar": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz", + "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==", + "dev": true, + "requires": { + "file-type": "^5.2.0", + "is-stream": "^1.1.0", + "tar-stream": "^1.5.2" + } + }, + "decompress-tarbz2": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", + "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", + "dev": true, + "requires": { + "decompress-tar": "^4.1.0", + "file-type": "^6.1.0", + "is-stream": "^1.1.0", + "seek-bzip": "^1.0.5", + "unbzip2-stream": "^1.0.9" + }, + "dependencies": { + "file-type": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", + "dev": true + } + } + }, + "decompress-targz": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", + "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", + "dev": true, + "requires": { + "decompress-tar": "^4.1.1", + "file-type": "^5.2.0", + "is-stream": "^1.1.0" + } + }, + "decompress-unzip": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", + "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", + "dev": true, + "requires": { + "file-type": "^3.8.0", + "get-stream": "^2.2.0", + "pify": "^2.3.0", + "yauzl": "^2.4.2" + }, + "dependencies": { + "file-type": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "dev": true + }, + "get-stream": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", + "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "dev": true, + "requires": { + "object-assign": "^4.0.1", + "pinkie-promise": "^2.0.0" + } + } + } + }, + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "requires": { + "type-detect": "^4.0.0" + } + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "defer-to-connect": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", + "dev": true + }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "dev": true + }, + "des.js": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", + "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "dev": true + }, + "detect-port": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz", + "integrity": "sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==", + "dev": true, + "requires": { + "address": "^1.0.1", + "debug": "^2.6.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true + }, + "diffie-hellman": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" + } + }, + "dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "requires": { + "path-type": "^4.0.0" + }, + "dependencies": { + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true + } + } + }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, + "dom-walk": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", + "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==", + "dev": true + }, + "drbg.js": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz", + "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=", + "dev": true, + "requires": { + "browserify-aes": "^1.0.6", + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4" + } + }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", + "dev": true + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", + "dev": true + }, + "elliptic": { + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", + "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "dev": true + }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "requires": { + "once": "^1.4.0" + } + }, + "enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "requires": { + "ansi-colors": "^4.1.1" + }, + "dependencies": { + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + } + } + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es-abstract": { + "version": "1.17.6", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", + "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.0", + "is-regex": "^1.1.0", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", + "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", + "dev": true + }, + "es-get-iterator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz", + "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==", + "dev": true, + "requires": { + "es-abstract": "^1.17.4", + "has-symbols": "^1.0.1", + "is-arguments": "^1.0.4", + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-string": "^1.0.5", + "isarray": "^2.0.5" + }, + "dependencies": { + "isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + } + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "es5-ext": { + "version": "0.10.53", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz", + "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==", + "dev": true, + "requires": { + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.3", + "next-tick": "~1.0.0" + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dev": true, + "requires": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "dev": true, + "requires": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "dev": true, + "requires": { + "esprima": "^2.7.1", + "estraverse": "^1.9.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.2.0" + }, + "dependencies": { + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", + "dev": true + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", + "dev": true, + "optional": true, + "requires": { + "amdefine": ">=0.0.4" + } + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2" + } + } + } + }, + "eslint": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz", + "integrity": "sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@eslint/eslintrc": "^0.1.3", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "eslint-scope": "^5.1.0", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^1.3.0", + "espree": "^7.3.0", + "esquery": "^1.2.0", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash": "^4.17.19", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "eslint-config-standard": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz", + "integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==", + "dev": true + }, + "eslint-import-resolver-node": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", + "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", + "dev": true, + "requires": { + "debug": "^2.6.9", + "resolve": "^1.13.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "eslint-module-utils": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", + "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", + "dev": true, + "requires": { + "debug": "^2.6.9", + "pkg-dir": "^2.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "eslint-plugin-es": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", + "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", + "dev": true, + "requires": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + } + }, + "eslint-plugin-import": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz", + "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==", + "dev": true, + "requires": { + "array-includes": "^3.1.1", + "array.prototype.flat": "^1.2.3", + "contains-path": "^0.1.0", + "debug": "^2.6.9", + "doctrine": "1.5.0", + "eslint-import-resolver-node": "^0.3.3", + "eslint-module-utils": "^2.6.0", + "has": "^1.0.3", + "minimatch": "^3.0.4", + "object.values": "^1.1.1", + "read-pkg-up": "^2.0.0", + "resolve": "^1.17.0", + "tsconfig-paths": "^3.9.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "doctrine": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", + "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "isarray": "^1.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "eslint-plugin-node": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", + "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "dev": true, + "requires": { + "eslint-plugin-es": "^3.0.0", + "eslint-utils": "^2.0.0", + "ignore": "^5.1.1", + "minimatch": "^3.0.4", + "resolve": "^1.10.1", + "semver": "^6.1.0" + }, + "dependencies": { + "ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "eslint-plugin-promise": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz", + "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==", + "dev": true + }, + "eslint-plugin-standard": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz", + "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==", + "dev": true + }, + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + }, + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + }, + "espree": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz", + "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==", + "dev": true, + "requires": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.3.0" + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true + }, + "esquery": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", + "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", + "dev": true, + "requires": { + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } + }, + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "requires": { + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "dev": true + }, + "eth-ens-namehash": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz", + "integrity": "sha1-IprEbsqG1S4MmR58sq74P/D2i88=", + "dev": true, + "requires": { + "idna-uts46-hx": "^2.3.1", + "js-sha3": "^0.5.7" + } + }, + "eth-gas-reporter": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/eth-gas-reporter/-/eth-gas-reporter-0.2.17.tgz", + "integrity": "sha512-MsrUqeXTAFU9QEdAIdaVu+QeU1XwFsKvPDEC68iheppVR5xUP11h4SyPhSRZiGfOzXr1CfTtPM/B6wPGtt7/LA==", + "dev": true, + "requires": { + "@ethersproject/abi": "^5.0.0-beta.146", + "@solidity-parser/parser": "^0.5.2", + "cli-table3": "^0.5.0", + "colors": "^1.1.2", + "ethereumjs-util": "6.2.0", + "ethers": "^4.0.40", + "fs-readdir-recursive": "^1.1.0", + "lodash": "^4.17.14", + "markdown-table": "^1.1.3", + "mocha": "^7.1.1", + "req-cwd": "^2.0.0", + "request": "^2.88.0", + "request-promise-native": "^1.0.5", + "sha1": "^1.1.1", + "sync-request": "^6.0.0" + }, + "dependencies": { + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true + }, + "ethereumjs-util": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.0.tgz", + "integrity": "sha512-vb0XN9J2QGdZGIEKG2vXM+kUdEivUfU6Wmi5y0cg+LRhDYKnXIZ/Lz7XjFbHRR9VIKq2lVGLzGBkA++y2nOdOQ==", + "dev": true, + "requires": { + "@types/bn.js": "^4.11.3", + "bn.js": "^4.11.0", + "create-hash": "^1.1.2", + "ethjs-util": "0.1.6", + "keccak": "^2.0.0", + "rlp": "^2.2.3", + "secp256k1": "^3.0.1" + } + }, + "keccak": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/keccak/-/keccak-2.1.0.tgz", + "integrity": "sha512-m1wbJRTo+gWbctZWay9i26v5fFnYkOn7D5PCxJ3fZUGUEb49dE1Pm4BREUYCt/aoO6di7jeoGmhvqN9Nzylm3Q==", + "dev": true, + "requires": { + "bindings": "^1.5.0", + "inherits": "^2.0.4", + "nan": "^2.14.0", + "safe-buffer": "^5.2.0" + } + }, + "secp256k1": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.8.0.tgz", + "integrity": "sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==", + "dev": true, + "requires": { + "bindings": "^1.5.0", + "bip66": "^1.1.5", + "bn.js": "^4.11.8", + "create-hash": "^1.2.0", + "drbg.js": "^1.0.1", + "elliptic": "^6.5.2", + "nan": "^2.14.0", + "safe-buffer": "^5.1.2" + } + } + } + }, + "eth-lib": { + "version": "0.1.29", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.29.tgz", + "integrity": "sha512-bfttrr3/7gG4E02HoWTDUcDDslN003OlOoBxk9virpAZQ1ja/jDgwkWB8QfJF7ojuEowrqy+lzp9VcJG7/k5bQ==", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "nano-json-stream-parser": "^0.1.2", + "servify": "^0.1.12", + "ws": "^3.0.0", + "xhr-request-promise": "^0.1.2" + } + }, + "ethereum-bloom-filters": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.7.tgz", + "integrity": "sha512-cDcJJSJ9GMAcURiAWO3DxIEhTL/uWqlQnvgKpuYQzYPrt/izuGU+1ntQmHt0IRq6ADoSYHFnB+aCEFIldjhkMQ==", + "dev": true, + "requires": { + "js-sha3": "^0.8.0" + }, + "dependencies": { + "js-sha3": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", + "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==", + "dev": true + } + } + }, + "ethereum-cryptography": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz", + "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==", + "dev": true, + "requires": { + "@types/pbkdf2": "^3.0.0", + "@types/secp256k1": "^4.0.1", + "blakejs": "^1.1.0", + "browserify-aes": "^1.2.0", + "bs58check": "^2.1.2", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "hash.js": "^1.1.7", + "keccak": "^3.0.0", + "pbkdf2": "^3.0.17", + "randombytes": "^2.1.0", + "safe-buffer": "^5.1.2", + "scrypt-js": "^3.0.0", + "secp256k1": "^4.0.1", + "setimmediate": "^1.0.5" + }, + "dependencies": { + "hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "scrypt-js": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz", + "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==", + "dev": true + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", + "dev": true + } + } + }, + "ethereum-ens": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/ethereum-ens/-/ethereum-ens-0.8.0.tgz", + "integrity": "sha512-a8cBTF4AWw1Q1Y37V1LSCS9pRY4Mh3f8vCg5cbXCCEJ3eno1hbI/+Ccv9SZLISYpqQhaglP3Bxb/34lS4Qf7Bg==", + "dev": true, + "requires": { + "bluebird": "^3.4.7", + "eth-ens-namehash": "^2.0.0", + "js-sha3": "^0.5.7", + "pako": "^1.0.4", + "underscore": "^1.8.3", + "web3": "^1.0.0-beta.34" + } + }, + "ethereumjs-common": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz", + "integrity": "sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA==", + "dev": true + }, + "ethereumjs-tx": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz", + "integrity": "sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==", + "dev": true, + "requires": { + "ethereumjs-common": "^1.5.0", + "ethereumjs-util": "^6.0.0" + } + }, + "ethereumjs-util": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz", + "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==", + "dev": true, + "requires": { + "@types/bn.js": "^4.11.3", + "bn.js": "^4.11.0", + "create-hash": "^1.1.2", + "elliptic": "^6.5.2", + "ethereum-cryptography": "^0.1.3", + "ethjs-util": "0.1.6", + "rlp": "^2.2.3" + } + }, + "ethers": { + "version": "4.0.48", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.48.tgz", + "integrity": "sha512-sZD5K8H28dOrcidzx9f8KYh8083n5BexIO3+SbE4jK83L85FxtpXZBCQdXb8gkg+7sBqomcLhhkU7UHL+F7I2g==", + "dev": true, + "requires": { + "aes-js": "3.0.0", + "bn.js": "^4.4.0", + "elliptic": "6.5.3", + "hash.js": "1.1.3", + "js-sha3": "0.5.7", + "scrypt-js": "2.0.4", + "setimmediate": "1.0.4", + "uuid": "2.0.1", + "xmlhttprequest": "1.8.0" + }, + "dependencies": { + "uuid": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", + "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=", + "dev": true + } + } + }, + "ethjs-abi": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.1.tgz", + "integrity": "sha1-4KepOn6BFjqUR3utVu3lJKtt5TM=", + "dev": true, + "requires": { + "bn.js": "4.11.6", + "js-sha3": "0.5.5", + "number-to-bn": "1.7.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true + }, + "js-sha3": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=", + "dev": true + } + } + }, + "ethjs-unit": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", + "integrity": "sha1-xmWSHkduh7ziqdWIpv4EBbLEFpk=", + "dev": true, + "requires": { + "bn.js": "4.11.6", + "number-to-bn": "1.7.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true + } + } + }, + "ethjs-util": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz", + "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==", + "dev": true, + "requires": { + "is-hex-prefixed": "1.0.0", + "strip-hex-prefix": "1.0.0" + } + }, + "eventemitter3": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", + "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==", + "dev": true + }, + "evp_bytestokey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", + "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, + "requires": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "exorcist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/exorcist/-/exorcist-1.0.1.tgz", + "integrity": "sha1-eTFuPEiFhFSQ97tAXA5bXbEWfFI=", + "dev": true, + "requires": { + "is-stream": "~1.1.0", + "minimist": "0.0.5", + "mkdirp": "~0.5.1", + "mold-source-map": "~0.4.0" + }, + "dependencies": { + "minimist": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz", + "integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY=", + "dev": true + } + } + }, + "express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "dev": true, + "requires": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, + "ext": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", + "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==", + "dev": true, + "requires": { + "type": "^2.0.0" + }, + "dependencies": { + "type": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz", + "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==", + "dev": true + } + } + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true + }, + "external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, + "fast-glob": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", + "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "fastq": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", + "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", + "dev": true, + "requires": { + "reusify": "^1.0.4" + } + }, + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "dev": true, + "requires": { + "pend": "~1.2.0" + } + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "requires": { + "flat-cache": "^2.0.1" + } + }, + "file-type": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", + "dev": true + }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "dev": true, + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "flat": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", + "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", + "dev": true, + "requires": { + "is-buffer": "~2.0.3" + } + }, + "flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "requires": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + } + }, + "flatted": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", + "dev": true + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "dev": true + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "dev": true + }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "dev": true, + "requires": { + "minipass": "^2.6.0" + } + }, + "fs-readdir-recursive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz", + "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "dev": true, + "optional": true + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "ganache-cli": { + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ganache-cli/-/ganache-cli-6.10.2.tgz", + "integrity": "sha512-wCuQjy7k040J8hii1KQ/dYHv8qjdHIcP3fw331AWPqQjeqNquf5HVVQNJOYXINTDofMDkCMQv3ru4ze/A+WyPQ==", + "dev": true, + "requires": { + "ethereumjs-util": "6.1.0", + "scrypt": "6.0.3", + "source-map-support": "0.5.12", + "yargs": "13.2.4" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "bundled": true, + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "bundled": true, + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "bindings": { + "version": "1.5.0", + "bundled": true, + "dev": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, + "bip66": { + "version": "1.1.5", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "bn.js": { + "version": "4.11.9", + "bundled": true, + "dev": true + }, + "brorand": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "browserify-aes": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "buffer-from": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "bundled": true, + "dev": true + }, + "cipher-base": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "cliui": { + "version": "5.0.0", + "bundled": true, + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "color-convert": { + "version": "1.9.3", + "bundled": true, + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "bundled": true, + "dev": true + }, + "create-hash": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } + }, + "create-hmac": { + "version": "1.1.7", + "bundled": true, + "dev": true, + "requires": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "cross-spawn": { + "version": "6.0.5", + "bundled": true, + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "decamelize": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "drbg.js": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "browserify-aes": "^1.0.6", + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4" + } + }, + "elliptic": { + "version": "6.5.3", + "bundled": true, + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + }, + "emoji-regex": { + "version": "7.0.3", + "bundled": true, + "dev": true + }, + "end-of-stream": { + "version": "1.4.4", + "bundled": true, + "dev": true, + "requires": { + "once": "^1.4.0" + } + }, + "ethereumjs-util": { + "version": "6.1.0", + "bundled": true, + "dev": true, + "requires": { + "bn.js": "^4.11.0", + "create-hash": "^1.1.2", + "ethjs-util": "0.1.6", + "keccak": "^1.0.2", + "rlp": "^2.0.0", + "safe-buffer": "^5.1.1", + "secp256k1": "^3.0.1" + } + }, + "ethjs-util": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "is-hex-prefixed": "1.0.0", + "strip-hex-prefix": "1.0.0" + } + }, + "evp_bytestokey": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "requires": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, + "execa": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "file-uri-to-path": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "find-up": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "get-caller-file": { + "version": "2.0.5", + "bundled": true, + "dev": true + }, + "get-stream": { + "version": "4.1.0", + "bundled": true, + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "hash-base": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + } + }, + "hash.js": { + "version": "1.1.7", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "hmac-drbg": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "inherits": { + "version": "2.0.4", + "bundled": true, + "dev": true + }, + "invert-kv": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-hex-prefixed": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "isexe": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "keccak": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "bindings": "^1.2.1", + "inherits": "^2.0.3", + "nan": "^2.2.1", + "safe-buffer": "^5.1.0" + } + }, + "lcid": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "invert-kv": "^2.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "map-age-cleaner": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "requires": { + "p-defer": "^1.0.0" + } + }, + "md5.js": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "mem": { + "version": "4.3.0", + "bundled": true, + "dev": true, + "requires": { + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "bundled": true, + "dev": true + }, + "minimalistic-assert": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "nan": { + "version": "2.14.1", + "bundled": true, + "dev": true + }, + "nice-try": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "npm-run-path": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "path-key": "^2.0.0" + } + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "os-locale": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + } + }, + "p-defer": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "p-finally": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "p-is-promise": { + "version": "2.1.0", + "bundled": true, + "dev": true + }, + "p-limit": { + "version": "2.3.0", + "bundled": true, + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "bundled": true, + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "path-key": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "pump": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "readable-stream": { + "version": "3.6.0", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "require-directory": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "require-main-filename": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "ripemd160": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } + }, + "rlp": { + "version": "2.2.6", + "bundled": true, + "dev": true, + "requires": { + "bn.js": "^4.11.1" + } + }, + "safe-buffer": { + "version": "5.2.1", + "bundled": true, + "dev": true + }, + "secp256k1": { + "version": "3.8.0", + "bundled": true, + "dev": true, + "requires": { + "bindings": "^1.5.0", + "bip66": "^1.1.5", + "bn.js": "^4.11.8", + "create-hash": "^1.2.0", + "drbg.js": "^1.0.1", + "elliptic": "^6.5.2", + "nan": "^2.14.0", + "safe-buffer": "^5.1.2" + } + }, + "semver": { + "version": "5.7.1", + "bundled": true, + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "sha.js": { + "version": "2.4.11", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "shebang-command": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "signal-exit": { + "version": "3.0.3", + "bundled": true, + "dev": true + }, + "source-map": { + "version": "0.6.1", + "bundled": true, + "dev": true + }, + "source-map-support": { + "version": "0.5.12", + "bundled": true, + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "string-width": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "string_decoder": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "~5.2.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "strip-eof": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "strip-hex-prefix": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-hex-prefixed": "1.0.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "which": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "wrap-ansi": { + "version": "5.1.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "y18n": { + "version": "4.0.0", + "bundled": true, + "dev": true + }, + "yargs": { + "version": "13.2.4", + "bundled": true, + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "os-locale": "^3.1.0", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.0" + } + }, + "yargs-parser": { + "version": "13.1.2", + "bundled": true, + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true + }, + "get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true + }, + "get-port": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", + "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", + "dev": true + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0" + } + }, + "ghost-testrpc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/ghost-testrpc/-/ghost-testrpc-0.0.2.tgz", + "integrity": "sha512-i08dAEgJ2g8z5buJIrCTduwPIhih3DP+hOCTyyryikfV8T0bNvHnGXO67i0DD1H4GBDETTclPy9njZbfluQYrQ==", + "dev": true, + "requires": { + "chalk": "^2.4.2", + "node-emoji": "^1.10.0" + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "global": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", + "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", + "dev": true, + "requires": { + "min-document": "^2.19.0", + "process": "~0.5.1" + } + }, + "global-modules": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", + "dev": true, + "requires": { + "global-prefix": "^3.0.0" + } + }, + "global-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "dev": true, + "requires": { + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" + } + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "globby": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "dev": true, + "requires": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + }, + "dependencies": { + "ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "dev": true + } + } + }, + "got": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", + "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", + "dev": true, + "requires": { + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true + }, + "handlebars": { + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", + "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "dev": true, + "requires": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4", + "wordwrap": "^1.0.0" + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true + }, + "har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "dev": true, + "requires": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "has-symbol-support-x": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "dev": true + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "has-to-string-tag-x": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", + "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "dev": true, + "requires": { + "has-symbol-support-x": "^1.4.1" + } + }, + "hash-base": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", + "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", + "dev": true, + "requires": { + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, + "hash.js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", + "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.0" + } + }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true + }, + "hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "dev": true, + "requires": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "hosted-git-info": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "dev": true + }, + "http-basic": { + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-8.1.3.tgz", + "integrity": "sha512-/EcDMwJZh3mABI2NhGfHOGOeOZITqfkEO4p/xK+l3NpyncIHUQBoMvCSF/b5GqvKtySC2srL/GGG3+EtlqlmCw==", + "dev": true, + "requires": { + "caseless": "^0.12.0", + "concat-stream": "^1.6.2", + "http-response-object": "^3.0.1", + "parse-cache-control": "^1.0.1" + } + }, + "http-cache-semantics": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "dev": true + }, + "http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "dev": true, + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + } + } + }, + "http-https": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz", + "integrity": "sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs=", + "dev": true + }, + "http-response-object": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz", + "integrity": "sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA==", + "dev": true, + "requires": { + "@types/node": "^10.0.3" + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "idna-uts46-hx": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz", + "integrity": "sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==", + "dev": true, + "requires": { + "punycode": "2.1.0" + }, + "dependencies": { + "punycode": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", + "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=", + "dev": true + } + } + }, + "ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", + "dev": true + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, + "inquirer": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", + "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", + "dev": true, + "requires": { + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^2.0.0", + "lodash": "^4.17.12", + "mute-stream": "0.0.7", + "run-async": "^2.2.0", + "rxjs": "^6.4.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.1.0", + "through": "^2.3.6" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + } + } + } + } + }, + "interpret": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true + }, + "ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true + }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", + "dev": true + }, + "is-callable": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz", + "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==", + "dev": true + }, + "is-date-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true + }, + "is-directory": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", + "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", + "dev": true + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "is-function": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz", + "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==", + "dev": true + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-hex-prefixed": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", + "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=", + "dev": true + }, + "is-map": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz", + "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", + "dev": true + }, + "is-natural-number": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", + "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=", + "dev": true + }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "is-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", + "dev": true + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-retry-allowed": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", + "dev": true + }, + "is-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz", + "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true + }, + "is-string": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", + "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "dev": true + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "isurl": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", + "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "dev": true, + "requires": { + "has-to-string-tag-x": "^1.2.0", + "is-object": "^1.0.1" + } + }, + "iterate-iterator": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz", + "integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==", + "dev": true + }, + "iterate-value": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz", + "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==", + "dev": true, + "requires": { + "es-get-iterator": "^1.0.2", + "iterate-iterator": "^1.0.1" + } + }, + "js-sha3": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", + "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=", + "dev": true + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "js-yaml": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true + }, + "json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "dev": true + }, + "json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "jsonschema": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.6.tgz", + "integrity": "sha512-SqhURKZG07JyKKeo/ir24QnS4/BV7a6gQy93bUSe4lUdNp0QNpIz2c9elWJQ9dpc5cQYY6cvCzgRwy0MQCLyqA==", + "dev": true + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "keccak": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz", + "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==", + "dev": true, + "requires": { + "node-addon-api": "^2.0.0", + "node-gyp-build": "^4.2.0" + }, + "dependencies": { + "node-gyp-build": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz", + "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==", + "dev": true + } + } + }, + "keyv": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", + "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "dev": true, + "requires": { + "json-buffer": "3.0.0" + } + }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + }, + "klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.9" + } + }, + "lcov-parse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz", + "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=", + "dev": true + }, + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "dev": true + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true + }, + "lodash.toarray": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", + "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=", + "dev": true + }, + "log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", + "dev": true + }, + "log-symbols": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "dev": true, + "requires": { + "chalk": "^2.4.2" + } + }, + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "dev": true + }, + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "dev": true, + "requires": { + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "markdown-table": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz", + "integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==", + "dev": true + }, + "marked": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz", + "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==", + "dev": true + }, + "marked-terminal": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-3.3.0.tgz", + "integrity": "sha512-+IUQJ5VlZoAFsM5MHNT7g3RHSkA3eETqhRCdXv4niUMAKHQ7lb1yvAcuGPmm4soxhmtX13u4Li6ZToXtvSEH+A==", + "dev": true, + "requires": { + "ansi-escapes": "^3.1.0", + "cardinal": "^2.1.1", + "chalk": "^2.4.1", + "cli-table": "^0.3.1", + "node-emoji": "^1.4.1", + "supports-hyperlinks": "^1.0.1" + } + }, + "md5.js": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "dev": true + }, + "memorystream": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", + "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=", + "dev": true + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "dev": true + }, + "merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "miller-rabin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", + "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", + "dev": true, + "requires": { + "bn.js": "^4.0.0", + "brorand": "^1.0.1" + } + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true + }, + "mime-db": { + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", + "dev": true + }, + "mime-types": { + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "dev": true, + "requires": { + "mime-db": "1.44.0" + } + }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "dev": true + }, + "min-document": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", + "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", + "dev": true, + "requires": { + "dom-walk": "^0.1.0" + } + }, + "minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "minipass": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "dev": true, + "requires": { + "minipass": "^2.9.0" + } + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "mkdirp-promise": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz", + "integrity": "sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE=", + "dev": true, + "requires": { + "mkdirp": "*" + } + }, + "mocha": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz", + "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==", + "dev": true, + "requires": { + "ansi-colors": "3.2.3", + "browser-stdout": "1.3.1", + "chokidar": "3.3.0", + "debug": "3.2.6", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "find-up": "3.0.0", + "glob": "7.1.3", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "3.13.1", + "log-symbols": "3.0.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.5", + "ms": "2.1.1", + "node-environment-flags": "1.0.6", + "object.assign": "4.1.0", + "strip-json-comments": "2.0.1", + "supports-color": "6.0.0", + "which": "1.3.1", + "wide-align": "1.1.3", + "yargs": "13.3.2", + "yargs-parser": "13.1.2", + "yargs-unparser": "1.6.0" + }, + "dependencies": { + "ansi-colors": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", + "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", + "dev": true + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "supports-color": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", + "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "mock-fs": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.13.0.tgz", + "integrity": "sha512-DD0vOdofJdoaRNtnWcrXe6RQbpHkPPmtqGq14uRX0F8ZKJ5nv89CVTYl/BZdppDxBDaV0hl75htg3abpEWlPZA==", + "dev": true + }, + "mold-source-map": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz", + "integrity": "sha1-z2fgsxxHq5uttcnCVlGGISe7gxc=", + "dev": true, + "requires": { + "convert-source-map": "^1.1.0", + "through": "~2.2.7" + }, + "dependencies": { + "through": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz", + "integrity": "sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0=", + "dev": true + } + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "multibase": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.6.1.tgz", + "integrity": "sha512-pFfAwyTjbbQgNc3G7D48JkJxWtoJoBMaR4xQUOuB8RnCgRqaYmWNFeJTTvrJ2w51bjLq2zTby6Rqj9TQ9elSUw==", + "dev": true, + "requires": { + "base-x": "^3.0.8", + "buffer": "^5.5.0" + } + }, + "multicodec": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-0.5.7.tgz", + "integrity": "sha512-PscoRxm3f+88fAtELwUnZxGDkduE2HD9Q6GHUOywQLjOGT/HAdhjLDYNZ1e7VR0s0TP0EwZ16LNUTFpoBGivOA==", + "dev": true, + "requires": { + "varint": "^5.0.0" + } + }, + "multihashes": { + "version": "0.4.21", + "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz", + "integrity": "sha512-uVSvmeCWf36pU2nB4/1kzYZjsXD9vofZKpgudqkceYY5g2aZZXJ5r9lxuzoRLl1OAp28XljXsEJ/X/85ZsKmKw==", + "dev": true, + "requires": { + "buffer": "^5.5.0", + "multibase": "^0.7.0", + "varint": "^5.0.0" + }, + "dependencies": { + "multibase": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz", + "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==", + "dev": true, + "requires": { + "base-x": "^3.0.8", + "buffer": "^5.5.0" + } + } + } + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "nan": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", + "dev": true + }, + "nano-json-stream-parser": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz", + "integrity": "sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18=", + "dev": true + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "dev": true + }, + "neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, + "next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", + "dev": true + }, + "nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true + }, + "node-addon-api": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", + "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==", + "dev": true + }, + "node-emoji": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", + "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==", + "dev": true, + "requires": { + "lodash.toarray": "^4.4.0" + } + }, + "node-environment-flags": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz", + "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==", + "dev": true, + "requires": { + "object.getownpropertydescriptors": "^2.0.3", + "semver": "^5.7.0" + } + }, + "node-gyp-build": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz", + "integrity": "sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==", + "dev": true + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "requires": { + "abbrev": "1" + } + }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "normalize-url": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", + "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", + "dev": true + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "^2.0.0" + } + }, + "number-to-bn": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", + "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=", + "dev": true, + "requires": { + "bn.js": "4.11.6", + "strip-hex-prefix": "1.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true + } + } + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "dev": true + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, + "object.assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", + "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.0", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", + "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.0", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + } + } + }, + "object.getownpropertydescriptors": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", + "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, + "object.values": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", + "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "oboe": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/oboe/-/oboe-2.1.4.tgz", + "integrity": "sha1-IMiM2wwVNxuwQRklfU/dNLCqSfY=", + "dev": true, + "requires": { + "http-https": "^1.0.0" + } + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dev": true, + "requires": { + "ee-first": "1.1.1" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "^1.0.0" + } + }, + "optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, + "requires": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + } + }, + "original-require": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/original-require/-/original-require-1.0.1.tgz", + "integrity": "sha1-DxMEcVhM0zURxew4yNWSE/msXiA=", + "dev": true + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true + }, + "p-cancelable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", + "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", + "dev": true + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-timeout": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", + "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", + "dev": true, + "requires": { + "p-finally": "^1.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, + "parse-asn1": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", + "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", + "dev": true, + "requires": { + "asn1.js": "^5.2.0", + "browserify-aes": "^1.0.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" + } + }, + "parse-cache-control": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz", + "integrity": "sha1-juqz5U+laSD+Fro493+iGqzC104=", + "dev": true + }, + "parse-headers": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.3.tgz", + "integrity": "sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==", + "dev": true + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "^1.2.0" + } + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "dev": true + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", + "dev": true + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "^2.0.0" + } + }, + "pathval": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "dev": true + }, + "pbkdf2": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz", + "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", + "dev": true, + "requires": { + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", + "dev": true + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true + }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "^2.0.0" + } + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true + }, + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + }, + "prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "dev": true, + "optional": true + }, + "process": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", + "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=", + "dev": true + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true + }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, + "promise": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz", + "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==", + "dev": true, + "requires": { + "asap": "~2.0.6" + } + }, + "promise.allsettled": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz", + "integrity": "sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==", + "dev": true, + "requires": { + "array.prototype.map": "^1.0.1", + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "iterate-value": "^1.0.0" + } + }, + "proxy-addr": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", + "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", + "dev": true, + "requires": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.1" + } + }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", + "dev": true + }, + "public-encrypt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", + "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true + }, + "query-string": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", + "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", + "dev": true, + "requires": { + "decode-uri-component": "^0.2.0", + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" + } + }, + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.0" + } + }, + "randomfill": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", + "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", + "dev": true, + "requires": { + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" + } + }, + "randomhex": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/randomhex/-/randomhex-0.1.5.tgz", + "integrity": "sha1-us7vmCMpCRQA8qKRLGzQLxCU9YU=", + "dev": true + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "dev": true + }, + "raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "dev": true, + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, + "readdirp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", + "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", + "dev": true, + "requires": { + "picomatch": "^2.0.4" + } + }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "^1.1.6" + } + }, + "recursive-readdir": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", + "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", + "dev": true, + "requires": { + "minimatch": "3.0.4" + } + }, + "redeyed": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz", + "integrity": "sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs=", + "dev": true, + "requires": { + "esprima": "~4.0.0" + } + }, + "regexpp": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "dev": true + }, + "req-cwd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/req-cwd/-/req-cwd-2.0.0.tgz", + "integrity": "sha1-1AgrTURZgDZkD7c93qAe1T20nrw=", + "dev": true, + "requires": { + "req-from": "^2.0.0" + } + }, + "req-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/req-from/-/req-from-2.0.0.tgz", + "integrity": "sha1-10GI5H+TeW9Kpx327jWuaJ8+DnA=", + "dev": true, + "requires": { + "resolve-from": "^3.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true + } + } + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "dev": true, + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + } + }, + "request-promise": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz", + "integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==", + "dev": true, + "requires": { + "bluebird": "^3.5.0", + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + } + }, + "request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "dev": true, + "requires": { + "lodash": "^4.17.19" + } + }, + "request-promise-native": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "dev": true, + "requires": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, + "require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + }, + "responselike": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "dev": true, + "requires": { + "lowercase-keys": "^1.0.0" + } + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + } + }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true + }, + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "ripemd160": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", + "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } + }, + "rlp": { + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.6.tgz", + "integrity": "sha512-HAfAmL6SDYNWPUOJNrM500x4Thn4PZsEy5pijPh40U9WfNk0z15hUYzO9xVIMAdIHdFtD8CBDHd75Td1g36Mjg==", + "dev": true, + "requires": { + "bn.js": "^4.11.1" + } + }, + "run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true + }, + "run-parallel": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", + "dev": true + }, + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "sc-istanbul": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/sc-istanbul/-/sc-istanbul-0.4.5.tgz", + "integrity": "sha512-7wR5EZFLsC4w0wSm9BUuCgW+OGKAU7PNlW5L0qwVPbh+Q1sfVn2fyzfMXYCm6rkNA5ipaCOt94nApcguQwF5Gg==", + "dev": true, + "requires": { + "abbrev": "1.0.x", + "async": "1.x", + "escodegen": "1.8.x", + "esprima": "2.7.x", + "glob": "^5.0.15", + "handlebars": "^4.0.1", + "js-yaml": "3.x", + "mkdirp": "0.5.x", + "nopt": "3.x", + "once": "1.x", + "resolve": "1.1.x", + "supports-color": "^3.1.0", + "which": "^1.1.1", + "wordwrap": "^1.0.0" + }, + "dependencies": { + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "^1.0.0" + } + } + } + }, + "scrypt": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/scrypt/-/scrypt-6.0.3.tgz", + "integrity": "sha1-BOAUpWgrU/pQwtXM4WfXGcBthw0=", + "dev": true, + "optional": true, + "requires": { + "nan": "^2.0.8" + } + }, + "scrypt-js": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz", + "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==", + "dev": true + }, + "scrypt-shim": { + "version": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb", + "from": "github:web3-js/scrypt-shim", + "dev": true, + "requires": { + "scryptsy": "^2.1.0", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "scryptsy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz", + "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==", + "dev": true + }, + "secp256k1": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz", + "integrity": "sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==", + "dev": true, + "requires": { + "elliptic": "^6.5.2", + "node-addon-api": "^2.0.0", + "node-gyp-build": "^4.2.0" + }, + "dependencies": { + "node-gyp-build": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz", + "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==", + "dev": true + } + } + }, + "seek-bzip": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz", + "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==", + "dev": true, + "requires": { + "commander": "^2.8.1" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "dev": true, + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + } + } + }, + "serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, + "serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "dev": true, + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + } + }, + "servify": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/servify/-/servify-0.1.12.tgz", + "integrity": "sha512-/xE6GvsKKqyo1BAY+KxOWXcLpPsUUyji7Qg3bVD7hh1eRze5bR1uYiuDA/k3Gof1s9BTzQZEJK8sNcNGFIzeWw==", + "dev": true, + "requires": { + "body-parser": "^1.16.0", + "cors": "^2.8.1", + "express": "^4.14.0", + "request": "^2.79.0", + "xhr": "^2.3.3" + } + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, + "setimmediate": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", + "integrity": "sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=", + "dev": true + }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", + "dev": true + }, + "sha.js": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "sha1": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/sha1/-/sha1-1.1.1.tgz", + "integrity": "sha1-rdqnqTFo85PxnrKxUJFhjicA+Eg=", + "dev": true, + "requires": { + "charenc": ">= 0.0.1", + "crypt": ">= 0.0.1" + } + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "shelljs": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", + "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", + "dev": true, + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "dev": true + }, + "simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "dev": true + }, + "simple-get": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz", + "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==", + "dev": true, + "requires": { + "decompress-response": "^3.3.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + } + }, + "solc": { + "version": "0.6.12", + "resolved": "https://registry.npmjs.org/solc/-/solc-0.6.12.tgz", + "integrity": "sha512-Lm0Ql2G9Qc7yPP2Ba+WNmzw2jwsrd3u4PobHYlSOxaut3TtUbj9+5ZrT6f4DUpNPEoBaFUOEg9Op9C0mk7ge9g==", + "dev": true, + "requires": { + "command-exists": "^1.2.8", + "commander": "3.0.2", + "fs-extra": "^0.30.0", + "js-sha3": "0.8.0", + "memorystream": "^0.3.1", + "require-from-string": "^2.0.0", + "semver": "^5.5.0", + "tmp": "0.0.33" + }, + "dependencies": { + "commander": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz", + "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==", + "dev": true + }, + "fs-extra": { + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", + "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" + } + }, + "js-sha3": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", + "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==", + "dev": true + }, + "jsonfile": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + } + } + }, + "solhint": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/solhint/-/solhint-3.2.0.tgz", + "integrity": "sha512-BGp7JnnoLzknGC/arcH33oN/LjOz0hKgdauOcBOO5jNjhjnPQ3cAacSMH64fWYShAg5+HYQaSRubInpSKSvzLg==", + "dev": true, + "requires": { + "@solidity-parser/parser": "^0.7.0", + "ajv": "^6.6.1", + "antlr4": "4.7.1", + "ast-parents": "0.0.1", + "chalk": "^2.4.2", + "commander": "2.18.0", + "cosmiconfig": "^5.0.7", + "eslint": "^5.6.0", + "fast-diff": "^1.1.2", + "glob": "^7.1.3", + "ignore": "^4.0.6", + "js-yaml": "^3.12.0", + "lodash": "^4.17.11", + "prettier": "^1.14.3", + "semver": "^6.3.0" + }, + "dependencies": { + "@solidity-parser/parser": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.7.1.tgz", + "integrity": "sha512-5ma2uuwPAEX1TPl2rAPAAuGlBkKnn2oUKQvnhTFlDIB8U/KDWX77FpHtL6Rcz+OwqSCWx9IClxACgyIEJ/GhIw==", + "dev": true + }, + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "commander": { + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz", + "integrity": "sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==", + "dev": true + }, + "eslint": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", + "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.9.1", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^4.0.3", + "eslint-utils": "^1.3.1", + "eslint-visitor-keys": "^1.0.0", + "espree": "^5.0.1", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.7.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^6.2.2", + "js-yaml": "^3.13.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.11", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^5.5.1", + "strip-ansi": "^4.0.0", + "strip-json-comments": "^2.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, + "espree": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", + "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", + "dev": true, + "requires": { + "acorn": "^6.0.7", + "acorn-jsx": "^5.0.0", + "eslint-visitor-keys": "^1.0.0" + } + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2" + } + } + } + }, + "solidity-coverage": { + "version": "0.7.10", + "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.10.tgz", + "integrity": "sha512-F98rYoD3bscB9qIJJrqkk+o93GbOWTT54VgfO97PrcWAenOFIC1EI5DzGJSrMvmFFfr8fsMPR89on6JR0Xf/Ig==", + "dev": true, + "requires": { + "@solidity-parser/parser": "^0.7.0", + "@truffle/provider": "^0.1.17", + "chalk": "^2.4.2", + "death": "^1.1.0", + "detect-port": "^1.3.0", + "fs-extra": "^8.1.0", + "ganache-cli": "6.9.0", + "ghost-testrpc": "^0.0.2", + "global-modules": "^2.0.0", + "globby": "^10.0.1", + "jsonschema": "^1.2.4", + "lodash": "^4.17.15", + "node-emoji": "^1.10.0", + "pify": "^4.0.1", + "recursive-readdir": "^2.2.2", + "sc-istanbul": "^0.4.5", + "shelljs": "^0.8.3", + "web3": "1.2.6" + }, + "dependencies": { + "@solidity-parser/parser": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.7.1.tgz", + "integrity": "sha512-5ma2uuwPAEX1TPl2rAPAAuGlBkKnn2oUKQvnhTFlDIB8U/KDWX77FpHtL6Rcz+OwqSCWx9IClxACgyIEJ/GhIw==", + "dev": true + }, + "@types/node": { + "version": "12.12.58", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.58.tgz", + "integrity": "sha512-Be46CNIHWAagEfINOjmriSxuv7IVcqbGe+sDSg2SYCEz/0CRBy7LRASGfRbD8KZkqoePU73Wsx3UvOSFcq/9hA==", + "dev": true + }, + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "ethers": { + "version": "4.0.0-beta.3", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", + "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", + "dev": true, + "requires": { + "@types/node": "^10.3.2", + "aes-js": "3.0.0", + "bn.js": "^4.4.0", + "elliptic": "6.3.3", + "hash.js": "1.1.3", + "js-sha3": "0.5.7", + "scrypt-js": "2.0.3", + "setimmediate": "1.0.4", + "uuid": "2.0.1", + "xmlhttprequest": "1.8.0" + }, + "dependencies": { + "@types/node": { + "version": "10.17.32", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.32.tgz", + "integrity": "sha512-EUq+cjH/3KCzQHikGnNbWAGe548IFLSm93Vl8xA7EuYEEATiyOVDyEVuGkowL7c9V69FF/RiZSAOCFPApMs/ig==", + "dev": true + }, + "elliptic": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", + "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "inherits": "^2.0.1" + } + } + } + }, + "ganache-cli": { + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/ganache-cli/-/ganache-cli-6.9.0.tgz", + "integrity": "sha512-ZdL6kPrApXF/O+f6uU431OJcwxMk69H3KPDSHHrMP82ZvZRNpDHbR+rVv7XX/YUeoQ5q6nZ2AFiGiFAVn9pfzA==", + "dev": true, + "requires": { + "ethereumjs-util": "6.1.0", + "source-map-support": "0.5.12", + "yargs": "13.2.4" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "bundled": true, + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "bundled": true, + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "bindings": { + "version": "1.5.0", + "bundled": true, + "dev": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, + "bip66": { + "version": "1.1.5", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "bn.js": { + "version": "4.11.8", + "bundled": true, + "dev": true + }, + "brorand": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "browserify-aes": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "buffer-from": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "bundled": true, + "dev": true + }, + "cipher-base": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "cliui": { + "version": "5.0.0", + "bundled": true, + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "color-convert": { + "version": "1.9.3", + "bundled": true, + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "bundled": true, + "dev": true + }, + "create-hash": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } + }, + "create-hmac": { + "version": "1.1.7", + "bundled": true, + "dev": true, + "requires": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "cross-spawn": { + "version": "6.0.5", + "bundled": true, + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "decamelize": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "drbg.js": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "browserify-aes": "^1.0.6", + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4" + } + }, + "elliptic": { + "version": "6.5.0", + "bundled": true, + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + }, + "emoji-regex": { + "version": "7.0.3", + "bundled": true, + "dev": true + }, + "end-of-stream": { + "version": "1.4.1", + "bundled": true, + "dev": true, + "requires": { + "once": "^1.4.0" + } + }, + "ethereumjs-util": { + "version": "6.1.0", + "bundled": true, + "dev": true, + "requires": { + "bn.js": "^4.11.0", + "create-hash": "^1.1.2", + "ethjs-util": "0.1.6", + "keccak": "^1.0.2", + "rlp": "^2.0.0", + "safe-buffer": "^5.1.1", + "secp256k1": "^3.0.1" + } + }, + "ethjs-util": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "is-hex-prefixed": "1.0.0", + "strip-hex-prefix": "1.0.0" + } + }, + "evp_bytestokey": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "requires": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, + "execa": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "file-uri-to-path": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "find-up": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "get-caller-file": { + "version": "2.0.5", + "bundled": true, + "dev": true + }, + "get-stream": { + "version": "4.1.0", + "bundled": true, + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "hash-base": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "hash.js": { + "version": "1.1.7", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "hmac-drbg": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "inherits": { + "version": "2.0.4", + "bundled": true, + "dev": true + }, + "invert-kv": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-hex-prefixed": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "isexe": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "keccak": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "bindings": "^1.2.1", + "inherits": "^2.0.3", + "nan": "^2.2.1", + "safe-buffer": "^5.1.0" + } + }, + "lcid": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "invert-kv": "^2.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "map-age-cleaner": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "requires": { + "p-defer": "^1.0.0" + } + }, + "md5.js": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "mem": { + "version": "4.3.0", + "bundled": true, + "dev": true, + "requires": { + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "bundled": true, + "dev": true + }, + "minimalistic-assert": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "nan": { + "version": "2.14.0", + "bundled": true, + "dev": true + }, + "nice-try": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "npm-run-path": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "path-key": "^2.0.0" + } + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "os-locale": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + } + }, + "p-defer": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "p-finally": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "p-is-promise": { + "version": "2.1.0", + "bundled": true, + "dev": true + }, + "p-limit": { + "version": "2.2.0", + "bundled": true, + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "bundled": true, + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "path-key": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "pump": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "require-directory": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "require-main-filename": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "ripemd160": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } + }, + "rlp": { + "version": "2.2.3", + "bundled": true, + "dev": true, + "requires": { + "bn.js": "^4.11.1", + "safe-buffer": "^5.1.1" + } + }, + "safe-buffer": { + "version": "5.2.0", + "bundled": true, + "dev": true + }, + "secp256k1": { + "version": "3.7.1", + "bundled": true, + "dev": true, + "requires": { + "bindings": "^1.5.0", + "bip66": "^1.1.5", + "bn.js": "^4.11.8", + "create-hash": "^1.2.0", + "drbg.js": "^1.0.1", + "elliptic": "^6.4.1", + "nan": "^2.14.0", + "safe-buffer": "^5.1.2" + } + }, + "semver": { + "version": "5.7.0", + "bundled": true, + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "sha.js": { + "version": "2.4.11", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "shebang-command": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true + }, + "source-map": { + "version": "0.6.1", + "bundled": true, + "dev": true + }, + "source-map-support": { + "version": "0.5.12", + "bundled": true, + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "string-width": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "strip-eof": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "strip-hex-prefix": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-hex-prefixed": "1.0.0" + } + }, + "which": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "wrap-ansi": { + "version": "5.1.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "y18n": { + "version": "4.0.0", + "bundled": true, + "dev": true + }, + "yargs": { + "version": "13.2.4", + "bundled": true, + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "os-locale": "^3.1.0", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.0" + } + }, + "yargs-parser": { + "version": "13.1.1", + "bundled": true, + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true + }, + "scrypt-js": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", + "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=", + "dev": true + }, + "uuid": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", + "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=", + "dev": true + }, + "web3": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.6.tgz", + "integrity": "sha512-tpu9fLIComgxGrFsD8LUtA4s4aCZk7px8UfcdEy6kS2uDi/ZfR07KJqpXZMij7Jvlq+cQrTAhsPSiBVvoMaivA==", + "dev": true, + "requires": { + "@types/node": "^12.6.1", + "web3-bzz": "1.2.6", + "web3-core": "1.2.6", + "web3-eth": "1.2.6", + "web3-eth-personal": "1.2.6", + "web3-net": "1.2.6", + "web3-shh": "1.2.6", + "web3-utils": "1.2.6" + } + }, + "web3-bzz": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.2.6.tgz", + "integrity": "sha512-9NiHLlxdI1XeFtbPJAmi2jnnIHVF+GNy517wvOS72P7ZfuJTPwZaSNXfT01vWgPPE9R96/uAHDWHOg+T4WaDQQ==", + "dev": true, + "requires": { + "@types/node": "^10.12.18", + "got": "9.6.0", + "swarm-js": "0.1.39", + "underscore": "1.9.1" + }, + "dependencies": { + "@types/node": { + "version": "10.17.32", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.32.tgz", + "integrity": "sha512-EUq+cjH/3KCzQHikGnNbWAGe548IFLSm93Vl8xA7EuYEEATiyOVDyEVuGkowL7c9V69FF/RiZSAOCFPApMs/ig==", + "dev": true + } + } + }, + "web3-core": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.6.tgz", + "integrity": "sha512-y/QNBFtr5cIR8vxebnotbjWJpOnO8LDYEAzZjeRRUJh2ijmhjoYk7dSNx9ExgC0UCfNFRoNCa9dGRu/GAxwRlw==", + "dev": true, + "requires": { + "@types/bn.js": "^4.11.4", + "@types/node": "^12.6.1", + "web3-core-helpers": "1.2.6", + "web3-core-method": "1.2.6", + "web3-core-requestmanager": "1.2.6", + "web3-utils": "1.2.6" + } + }, + "web3-core-helpers": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.6.tgz", + "integrity": "sha512-gYKWmC2HmO7RcDzpo4L1K8EIoy5L8iubNDuTC6q69UxczwqKF/Io0kbK/1Z10Av++NlzOSiuyGp2gc4t4UOsDw==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-eth-iban": "1.2.6", + "web3-utils": "1.2.6" + } + }, + "web3-core-method": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.6.tgz", + "integrity": "sha512-r2dzyPEonqkBg7Mugq5dknhV5PGaZTHBZlS/C+aMxNyQs3T3eaAsCTqlQDitwNUh/sUcYPEGF0Vo7ahYK4k91g==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.6", + "web3-core-promievent": "1.2.6", + "web3-core-subscriptions": "1.2.6", + "web3-utils": "1.2.6" + } + }, + "web3-core-promievent": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.6.tgz", + "integrity": "sha512-km72kJef/qtQNiSjDJJVHIZvoVOm6ytW3FCYnOcCs7RIkviAb5JYlPiye0o4pJOLzCXYID7DK7Q9bhY8qWb1lw==", + "dev": true, + "requires": { + "any-promise": "1.3.0", + "eventemitter3": "3.1.2" + } + }, + "web3-core-requestmanager": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.6.tgz", + "integrity": "sha512-QU2cbsj9Dm0r6om40oSwk8Oqbp3wTa08tXuMpSmeOTkGZ3EMHJ1/4LiJ8shwg1AvPMrKVU0Nri6+uBNCdReZ+g==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.6", + "web3-providers-http": "1.2.6", + "web3-providers-ipc": "1.2.6", + "web3-providers-ws": "1.2.6" + } + }, + "web3-core-subscriptions": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.6.tgz", + "integrity": "sha512-M0PzRrP2Ct13x3wPulFtc5kENH4UtnPxO9YxkfQlX2WRKENWjt4Rfq+BCVGYEk3rTutDfWrjfzjmqMRvXqEY5Q==", + "dev": true, + "requires": { + "eventemitter3": "3.1.2", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.6" + } + }, + "web3-eth": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.2.6.tgz", + "integrity": "sha512-ROWlDPzh4QX6tlGGGlAK6X4kA2n0/cNj/4kb0nNVWkRouGmYO0R8k6s47YxYHvGiXt0s0++FUUv5vAbWovtUQw==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core": "1.2.6", + "web3-core-helpers": "1.2.6", + "web3-core-method": "1.2.6", + "web3-core-subscriptions": "1.2.6", + "web3-eth-abi": "1.2.6", + "web3-eth-accounts": "1.2.6", + "web3-eth-contract": "1.2.6", + "web3-eth-ens": "1.2.6", + "web3-eth-iban": "1.2.6", + "web3-eth-personal": "1.2.6", + "web3-net": "1.2.6", + "web3-utils": "1.2.6" + } + }, + "web3-eth-abi": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.6.tgz", + "integrity": "sha512-w9GAyyikn8nSifSDZxAvU9fxtQSX+W2xQWMmrtTXmBGCaE4/ywKOSPAO78gq8AoU4Wq5yqVGKZLLbfpt7/sHlA==", + "dev": true, + "requires": { + "ethers": "4.0.0-beta.3", + "underscore": "1.9.1", + "web3-utils": "1.2.6" + } + }, + "web3-eth-accounts": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.2.6.tgz", + "integrity": "sha512-cDVtonHRgzqi/ZHOOf8kfCQWFEipcfQNAMzXIaKZwc0UUD9mgSI5oJrN45a89Ze+E6Lz9m77cDG5Ax9zscSkcw==", + "dev": true, + "requires": { + "@web3-js/scrypt-shim": "^0.1.0", + "any-promise": "1.3.0", + "crypto-browserify": "3.12.0", + "eth-lib": "^0.2.8", + "ethereumjs-common": "^1.3.2", + "ethereumjs-tx": "^2.1.1", + "underscore": "1.9.1", + "uuid": "3.3.2", + "web3-core": "1.2.6", + "web3-core-helpers": "1.2.6", + "web3-core-method": "1.2.6", + "web3-utils": "1.2.6" + }, + "dependencies": { + "eth-lib": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz", + "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "dev": true + } + } + }, + "web3-eth-contract": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.6.tgz", + "integrity": "sha512-ak4xbHIhWgsbdPCkSN+HnQc1SH4c856y7Ly+S57J/DQVzhFZemK5HvWdpwadJrQTcHET3ZeId1vq3kmW7UYodw==", + "dev": true, + "requires": { + "@types/bn.js": "^4.11.4", + "underscore": "1.9.1", + "web3-core": "1.2.6", + "web3-core-helpers": "1.2.6", + "web3-core-method": "1.2.6", + "web3-core-promievent": "1.2.6", + "web3-core-subscriptions": "1.2.6", + "web3-eth-abi": "1.2.6", + "web3-utils": "1.2.6" + } + }, + "web3-eth-ens": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.2.6.tgz", + "integrity": "sha512-8UEqt6fqR/dji/jBGPFAyBs16OJjwi0t2dPWXPyGXmty/fH+osnXwWXE4HRUyj4xuafiM5P1YkXMsPhKEadjiw==", + "dev": true, + "requires": { + "eth-ens-namehash": "2.0.8", + "underscore": "1.9.1", + "web3-core": "1.2.6", + "web3-core-helpers": "1.2.6", + "web3-core-promievent": "1.2.6", + "web3-eth-abi": "1.2.6", + "web3-eth-contract": "1.2.6", + "web3-utils": "1.2.6" + } + }, + "web3-eth-iban": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.6.tgz", + "integrity": "sha512-TPMc3BW9Iso7H+9w+ytbqHK9wgOmtocyCD3PaAe5Eie50KQ/j7ThA60dGJnxItVo6yyRv5pZAYxPVob9x/fJlg==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "web3-utils": "1.2.6" + } + }, + "web3-eth-personal": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.2.6.tgz", + "integrity": "sha512-T2NUkh1plY8d7wePXSoHnaiKOd8dLNFaQfgBl9JHU6S7IJrG9jnYD9bVxLEgRUfHs9gKf9tQpDf7AcPFdq/A8g==", + "dev": true, + "requires": { + "@types/node": "^12.6.1", + "web3-core": "1.2.6", + "web3-core-helpers": "1.2.6", + "web3-core-method": "1.2.6", + "web3-net": "1.2.6", + "web3-utils": "1.2.6" + } + }, + "web3-net": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.2.6.tgz", + "integrity": "sha512-hsNHAPddrhgjWLmbESW0KxJi2GnthPcow0Sqpnf4oB6+/+ZnQHU9OsIyHb83bnC1OmunrK2vf9Ye2mLPdFIu3A==", + "dev": true, + "requires": { + "web3-core": "1.2.6", + "web3-core-method": "1.2.6", + "web3-utils": "1.2.6" + } + }, + "web3-providers-http": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.6.tgz", + "integrity": "sha512-2+SaFCspb5f82QKuHB3nEPQOF9iSWxRf7c18fHtmnLNVkfG9SwLN1zh67bYn3tZGUdOI3gj8aX4Uhfpwx9Ezpw==", + "dev": true, + "requires": { + "web3-core-helpers": "1.2.6", + "xhr2-cookies": "1.1.0" + } + }, + "web3-providers-ipc": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.6.tgz", + "integrity": "sha512-b0Es+/GTZyk5FG3SgUDW+2/mBwJAXWt5LuppODptiOas8bB2khLjG6+Gm1K4uwOb+1NJGPt5mZZ8Wi7vibtQ+A==", + "dev": true, + "requires": { + "oboe": "2.1.4", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.6" + } + }, + "web3-providers-ws": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.6.tgz", + "integrity": "sha512-20waSYX+gb5M5yKhug5FIwxBBvkKzlJH7sK6XEgdOx6BZ9YYamLmvg9wcRVtnSZO8hV/3cWenO/tRtTrHVvIgQ==", + "dev": true, + "requires": { + "@web3-js/websocket": "^1.0.29", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.6" + } + }, + "web3-shh": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.2.6.tgz", + "integrity": "sha512-rouWyOOM6YMbLQd65grpj8BBezQfgNeRRX+cGyW4xsn6Xgu+B73Zvr6OtA/ftJwwa9bqHGpnLrrLMeWyy4YLUw==", + "dev": true, + "requires": { + "web3-core": "1.2.6", + "web3-core-method": "1.2.6", + "web3-core-subscriptions": "1.2.6", + "web3-net": "1.2.6" + } + }, + "web3-utils": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.6.tgz", + "integrity": "sha512-8/HnqG/l7dGmKMgEL9JeKPTtjScxOePTzopv5aaKFExPfaBrYRkgoMqhoowCiAl/s16QaTn4DoIF1QC4YsT7Mg==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethereum-bloom-filters": "^1.0.6", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randombytes": "^2.1.0", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "spdx-correct": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "dev": true + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dev": true, + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "dev": true + }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "dev": true + }, + "strict-uri-encode": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, + "string.prototype.trimend": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", + "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "string.prototype.trimstart": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", + "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "strip-dirs": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", + "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", + "dev": true, + "requires": { + "is-natural-number": "^4.0.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, + "strip-hex-prefix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", + "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=", + "dev": true, + "requires": { + "is-hex-prefixed": "1.0.0" + } + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + }, + "supports-hyperlinks": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz", + "integrity": "sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw==", + "dev": true, + "requires": { + "has-flag": "^2.0.0", + "supports-color": "^5.0.0" + }, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + } + } + }, + "swarm-js": { + "version": "0.1.39", + "resolved": "https://registry.npmjs.org/swarm-js/-/swarm-js-0.1.39.tgz", + "integrity": "sha512-QLMqL2rzF6n5s50BptyD6Oi0R1aWlJC5Y17SRIVXRj6OR1DRIPM7nepvrxxkjA1zNzFz6mUOMjfeqeDaWB7OOg==", + "dev": true, + "requires": { + "bluebird": "^3.5.0", + "buffer": "^5.0.5", + "decompress": "^4.0.0", + "eth-lib": "^0.1.26", + "fs-extra": "^4.0.2", + "got": "^7.1.0", + "mime-types": "^2.1.16", + "mkdirp-promise": "^5.0.1", + "mock-fs": "^4.1.0", + "setimmediate": "^1.0.5", + "tar": "^4.0.2", + "xhr-request-promise": "^0.1.2" + }, + "dependencies": { + "fs-extra": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "got": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", + "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", + "dev": true, + "requires": { + "decompress-response": "^3.2.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-plain-obj": "^1.1.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^1.1.1", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "url-parse-lax": "^1.0.0", + "url-to-options": "^1.0.1" + } + }, + "p-cancelable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", + "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==", + "dev": true + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", + "dev": true + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", + "dev": true + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "dev": true, + "requires": { + "prepend-http": "^1.0.1" + } + } + } + }, + "sync-request": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-6.1.0.tgz", + "integrity": "sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw==", + "dev": true, + "requires": { + "http-response-object": "^3.0.1", + "sync-rpc": "^1.2.1", + "then-request": "^6.0.0" + } + }, + "sync-rpc": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/sync-rpc/-/sync-rpc-1.3.6.tgz", + "integrity": "sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==", + "dev": true, + "requires": { + "get-port": "^3.1.0" + } + }, + "table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + } + }, + "tar": { + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", + "dev": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, + "tar-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", + "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", + "dev": true, + "requires": { + "bl": "^1.0.0", + "buffer-alloc": "^1.2.0", + "end-of-stream": "^1.0.0", + "fs-constants": "^1.0.0", + "readable-stream": "^2.3.0", + "to-buffer": "^1.1.1", + "xtend": "^4.0.0" + } + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "then-request": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/then-request/-/then-request-6.0.2.tgz", + "integrity": "sha512-3ZBiG7JvP3wbDzA9iNY5zJQcHL4jn/0BWtXIkagfz7QgOL/LqjCEOBQuJNZfu0XYnv5JhKh+cDxCPM4ILrqruA==", + "dev": true, + "requires": { + "@types/concat-stream": "^1.6.0", + "@types/form-data": "0.0.33", + "@types/node": "^8.0.0", + "@types/qs": "^6.2.31", + "caseless": "~0.12.0", + "concat-stream": "^1.6.0", + "form-data": "^2.2.0", + "http-basic": "^8.1.1", + "http-response-object": "^3.0.1", + "promise": "^8.0.0", + "qs": "^6.4.0" + }, + "dependencies": { + "@types/node": { + "version": "8.10.63", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.63.tgz", + "integrity": "sha512-g+nSkeHFDd2WOQChfmy9SAXLywT47WZBrGS/NC5ym5PJ8c8RC6l4pbGaUW/X0+eZJnXw6/AVNEouXWhV4iz72Q==", + "dev": true + } + } + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "timed-out": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", + "dev": true + }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.2" + } + }, + "to-buffer": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", + "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==", + "dev": true + }, + "to-readable-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "dev": true + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "truffle": { + "version": "5.1.44", + "resolved": "https://registry.npmjs.org/truffle/-/truffle-5.1.44.tgz", + "integrity": "sha512-8NIFw8jJFbi2vYHWGeflFHZByIDtx56r+BDl2CkPjpGEb9arEFDaCmjy70UQe4PBIX+olsl3opSVqpUb16b6tQ==", + "dev": true, + "requires": { + "app-module-path": "^2.2.0", + "mocha": "8.1.2", + "original-require": "1.0.1" + }, + "dependencies": { + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "chokidar": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", + "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", + "dev": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true + }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "log-symbols": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", + "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "dev": true, + "requires": { + "chalk": "^4.0.0" + } + }, + "mocha": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.1.2.tgz", + "integrity": "sha512-I8FRAcuACNMLQn3lS4qeWLxXqLvGf6r2CaLstDpZmMUUSmvW6Cnm1AuHxgbc7ctZVRcfwspCRbDHymPsi3dkJw==", + "dev": true, + "requires": { + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.4.2", + "debug": "4.1.1", + "diff": "4.0.2", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.1.6", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "3.14.0", + "log-symbols": "4.0.0", + "minimatch": "3.0.4", + "ms": "2.1.2", + "object.assign": "4.1.0", + "promise.allsettled": "1.0.2", + "serialize-javascript": "4.0.0", + "strip-json-comments": "3.0.1", + "supports-color": "7.1.0", + "which": "2.0.2", + "wide-align": "1.1.3", + "workerpool": "6.0.0", + "yargs": "13.3.2", + "yargs-parser": "13.1.2", + "yargs-unparser": "1.6.1" + } + }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } + }, + "p-limit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz", + "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, + "readdirp": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "strip-json-comments": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", + "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "yargs-unparser": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz", + "integrity": "sha512-qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "decamelize": "^1.2.0", + "flat": "^4.1.0", + "is-plain-obj": "^1.1.0", + "yargs": "^14.2.3" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "yargs": { + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", + "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^15.0.1" + } + }, + "yargs-parser": { + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz", + "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + } + } + }, + "truffle-flattener": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/truffle-flattener/-/truffle-flattener-1.5.0.tgz", + "integrity": "sha512-vmzWG/L5OXoNruMV6u2l2IaheI091e+t+fFCOR9sl46EE3epkSRIwGCmIP/EYDtPsFBIG7e6exttC9/GlfmxEQ==", + "dev": true, + "requires": { + "@resolver-engine/imports-fs": "^0.2.2", + "@solidity-parser/parser": "^0.8.0", + "find-up": "^2.1.0", + "mkdirp": "^1.0.4", + "tsort": "0.0.1" + }, + "dependencies": { + "@solidity-parser/parser": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.8.0.tgz", + "integrity": "sha512-4Eg1iWe6ZuJC9Ynfd8D2cnu06So0QL6V3i+fgQRqT8twPMr+N+kUvS5K7ILgWpuoAag/jb3r0wBDfmpib+yvaw==", + "dev": true + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "try-require": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/try-require/-/try-require-1.2.1.tgz", + "integrity": "sha1-NEiaLKwMCcHMEO2RugEVlNQzO+I=", + "dev": true + }, + "ts-essentials": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-1.0.4.tgz", + "integrity": "sha512-q3N1xS4vZpRouhYHDPwO0bDW3EZ6SK9CrrDHxi/D6BPReSjpVgWIOpLS2o0gSBZm+7q/wyKp6RVM1AeeW7uyfQ==", + "dev": true + }, + "ts-node": { + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", + "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", + "dev": true, + "requires": { + "arg": "^4.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.17", + "yn": "3.1.1" + } + }, + "tsconfig-paths": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", + "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + } + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + }, + "tsort": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tsort/-/tsort-0.0.1.tgz", + "integrity": "sha1-4igPXoF/i/QnVlf9D5rr1E9aJ4Y=", + "dev": true + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true + }, + "type": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==", + "dev": true + }, + "type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1" + } + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dev": true, + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true + }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "requires": { + "is-typedarray": "^1.0.0" + } + }, + "uglify-js": { + "version": "3.10.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz", + "integrity": "sha512-kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==", + "dev": true, + "optional": true + }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", + "dev": true + }, + "unbzip2-stream": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "dev": true, + "requires": { + "buffer": "^5.2.1", + "through": "^2.3.8" + } + }, + "underscore": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz", + "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==", + "dev": true + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "dev": true + }, + "uri-js": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, + "url-join": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz", + "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==", + "dev": true + }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "dev": true, + "requires": { + "prepend-http": "^2.0.0" + } + }, + "url-set-query": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz", + "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=", + "dev": true + }, + "url-to-options": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", + "dev": true + }, + "utf-8-validate": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz", + "integrity": "sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==", + "dev": true, + "requires": { + "node-gyp-build": "~3.7.0" + } + }, + "utf8": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", + "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==", + "dev": true + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "dev": true + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + }, + "v8-compile-cache": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz", + "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "varint": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz", + "integrity": "sha1-2Ca4n3SQcy+rwMDtaT7Uddyynr8=", + "dev": true + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "dev": true + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "web3": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.11.tgz", + "integrity": "sha512-mjQ8HeU41G6hgOYm1pmeH0mRAeNKJGnJEUzDMoerkpw7QUQT4exVREgF1MYPvL/z6vAshOXei25LE/t/Bxl8yQ==", + "dev": true, + "requires": { + "web3-bzz": "1.2.11", + "web3-core": "1.2.11", + "web3-eth": "1.2.11", + "web3-eth-personal": "1.2.11", + "web3-net": "1.2.11", + "web3-shh": "1.2.11", + "web3-utils": "1.2.11" + }, + "dependencies": { + "@types/node": { + "version": "12.12.58", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.58.tgz", + "integrity": "sha512-Be46CNIHWAagEfINOjmriSxuv7IVcqbGe+sDSg2SYCEz/0CRBy7LRASGfRbD8KZkqoePU73Wsx3UvOSFcq/9hA==", + "dev": true + }, + "bignumber.js": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz", + "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==", + "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "eventemitter3": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", + "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==", + "dev": true + }, + "fs-extra": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "p-cancelable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", + "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==", + "dev": true + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", + "dev": true + }, + "scrypt-js": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz", + "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==", + "dev": true + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", + "dev": true + }, + "swarm-js": { + "version": "0.1.40", + "resolved": "https://registry.npmjs.org/swarm-js/-/swarm-js-0.1.40.tgz", + "integrity": "sha512-yqiOCEoA4/IShXkY3WKwP5PvZhmoOOD8clsKA7EEcRILMkTEYHCQ21HDCAcVpmIxZq4LyZvWeRJ6quIyHk1caA==", + "dev": true, + "requires": { + "bluebird": "^3.5.0", + "buffer": "^5.0.5", + "eth-lib": "^0.1.26", + "fs-extra": "^4.0.2", + "got": "^7.1.0", + "mime-types": "^2.1.16", + "mkdirp-promise": "^5.0.1", + "mock-fs": "^4.1.0", + "setimmediate": "^1.0.5", + "tar": "^4.0.2", + "xhr-request": "^1.0.1" + }, + "dependencies": { + "got": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", + "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", + "dev": true, + "requires": { + "decompress-response": "^3.2.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-plain-obj": "^1.1.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^1.1.1", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "url-parse-lax": "^1.0.0", + "url-to-options": "^1.0.1" + } + } + } + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "dev": true, + "requires": { + "prepend-http": "^1.0.1" + } + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "dev": true + }, + "web3-bzz": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.2.11.tgz", + "integrity": "sha512-XGpWUEElGypBjeFyUhTkiPXFbDVD6Nr/S5jznE3t8cWUA0FxRf1n3n/NuIZeb0H9RkN2Ctd/jNma/k8XGa3YKg==", + "dev": true, + "requires": { + "@types/node": "^12.12.6", + "got": "9.6.0", + "swarm-js": "^0.1.40", + "underscore": "1.9.1" + } + }, + "web3-core": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.11.tgz", + "integrity": "sha512-CN7MEYOY5ryo5iVleIWRE3a3cZqVaLlIbIzDPsvQRUfzYnvzZQRZBm9Mq+ttDi2STOOzc1MKylspz/o3yq/LjQ==", + "dev": true, + "requires": { + "@types/bn.js": "^4.11.5", + "@types/node": "^12.12.6", + "bignumber.js": "^9.0.0", + "web3-core-helpers": "1.2.11", + "web3-core-method": "1.2.11", + "web3-core-requestmanager": "1.2.11", + "web3-utils": "1.2.11" + } + }, + "web3-core-helpers": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.11.tgz", + "integrity": "sha512-PEPoAoZd5ME7UfbnCZBdzIerpe74GEvlwT4AjOmHeCVZoIFk7EqvOZDejJHt+feJA6kMVTdd0xzRNN295UhC1A==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-eth-iban": "1.2.11", + "web3-utils": "1.2.11" + } + }, + "web3-core-method": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.11.tgz", + "integrity": "sha512-ff0q76Cde94HAxLDZ6DbdmKniYCQVtvuaYh+rtOUMB6kssa5FX0q3vPmixi7NPooFnbKmmZCM6NvXg4IreTPIw==", + "dev": true, + "requires": { + "@ethersproject/transactions": "^5.0.0-beta.135", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.11", + "web3-core-promievent": "1.2.11", + "web3-core-subscriptions": "1.2.11", + "web3-utils": "1.2.11" + } + }, + "web3-core-promievent": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.11.tgz", + "integrity": "sha512-il4McoDa/Ox9Agh4kyfQ8Ak/9ABYpnF8poBLL33R/EnxLsJOGQG2nZhkJa3I067hocrPSjEdlPt/0bHXsln4qA==", + "dev": true, + "requires": { + "eventemitter3": "4.0.4" + } + }, + "web3-core-requestmanager": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.11.tgz", + "integrity": "sha512-oFhBtLfOiIbmfl6T6gYjjj9igOvtyxJ+fjS+byRxiwFJyJ5BQOz4/9/17gWR1Cq74paTlI7vDGxYfuvfE/mKvA==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.11", + "web3-providers-http": "1.2.11", + "web3-providers-ipc": "1.2.11", + "web3-providers-ws": "1.2.11" + } + }, + "web3-core-subscriptions": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.11.tgz", + "integrity": "sha512-qEF/OVqkCvQ7MPs1JylIZCZkin0aKK9lDxpAtQ1F8niEDGFqn7DT8E/vzbIa0GsOjL2fZjDhWJsaW+BSoAW1gg==", + "dev": true, + "requires": { + "eventemitter3": "4.0.4", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.11" + } + }, + "web3-eth": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.2.11.tgz", + "integrity": "sha512-REvxW1wJ58AgHPcXPJOL49d1K/dPmuw4LjPLBPStOVkQjzDTVmJEIsiLwn2YeuNDd4pfakBwT8L3bz1G1/wVsQ==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core": "1.2.11", + "web3-core-helpers": "1.2.11", + "web3-core-method": "1.2.11", + "web3-core-subscriptions": "1.2.11", + "web3-eth-abi": "1.2.11", + "web3-eth-accounts": "1.2.11", + "web3-eth-contract": "1.2.11", + "web3-eth-ens": "1.2.11", + "web3-eth-iban": "1.2.11", + "web3-eth-personal": "1.2.11", + "web3-net": "1.2.11", + "web3-utils": "1.2.11" + } + }, + "web3-eth-abi": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.11.tgz", + "integrity": "sha512-PkRYc0+MjuLSgg03QVWqWlQivJqRwKItKtEpRUaxUAeLE7i/uU39gmzm2keHGcQXo3POXAbOnMqkDvOep89Crg==", + "dev": true, + "requires": { + "@ethersproject/abi": "5.0.0-beta.153", + "underscore": "1.9.1", + "web3-utils": "1.2.11" + } + }, + "web3-eth-accounts": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.2.11.tgz", + "integrity": "sha512-6FwPqEpCfKIh3nSSGeo3uBm2iFSnFJDfwL3oS9pyegRBXNsGRVpgiW63yhNzL0796StsvjHWwQnQHsZNxWAkGw==", + "dev": true, + "requires": { + "crypto-browserify": "3.12.0", + "eth-lib": "0.2.8", + "ethereumjs-common": "^1.3.2", + "ethereumjs-tx": "^2.1.1", + "scrypt-js": "^3.0.1", + "underscore": "1.9.1", + "uuid": "3.3.2", + "web3-core": "1.2.11", + "web3-core-helpers": "1.2.11", + "web3-core-method": "1.2.11", + "web3-utils": "1.2.11" + }, + "dependencies": { + "eth-lib": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz", + "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + } + } + }, + "web3-eth-contract": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.11.tgz", + "integrity": "sha512-MzYuI/Rq2o6gn7vCGcnQgco63isPNK5lMAan2E51AJLknjSLnOxwNY3gM8BcKoy4Z+v5Dv00a03Xuk78JowFow==", + "dev": true, + "requires": { + "@types/bn.js": "^4.11.5", + "underscore": "1.9.1", + "web3-core": "1.2.11", + "web3-core-helpers": "1.2.11", + "web3-core-method": "1.2.11", + "web3-core-promievent": "1.2.11", + "web3-core-subscriptions": "1.2.11", + "web3-eth-abi": "1.2.11", + "web3-utils": "1.2.11" + } + }, + "web3-eth-ens": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.2.11.tgz", + "integrity": "sha512-dbW7dXP6HqT1EAPvnniZVnmw6TmQEKF6/1KgAxbo8iBBYrVTMDGFQUUnZ+C4VETGrwwaqtX4L9d/FrQhZ6SUiA==", + "dev": true, + "requires": { + "content-hash": "^2.5.2", + "eth-ens-namehash": "2.0.8", + "underscore": "1.9.1", + "web3-core": "1.2.11", + "web3-core-helpers": "1.2.11", + "web3-core-promievent": "1.2.11", + "web3-eth-abi": "1.2.11", + "web3-eth-contract": "1.2.11", + "web3-utils": "1.2.11" + } + }, + "web3-eth-iban": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.11.tgz", + "integrity": "sha512-ozuVlZ5jwFC2hJY4+fH9pIcuH1xP0HEFhtWsR69u9uDIANHLPQQtWYmdj7xQ3p2YT4bQLq/axKhZi7EZVetmxQ==", + "dev": true, + "requires": { + "bn.js": "^4.11.9", + "web3-utils": "1.2.11" + } + }, + "web3-eth-personal": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.2.11.tgz", + "integrity": "sha512-42IzUtKq9iHZ8K9VN0vAI50iSU9tOA1V7XU2BhF/tb7We2iKBVdkley2fg26TxlOcKNEHm7o6HRtiiFsVK4Ifw==", + "dev": true, + "requires": { + "@types/node": "^12.12.6", + "web3-core": "1.2.11", + "web3-core-helpers": "1.2.11", + "web3-core-method": "1.2.11", + "web3-net": "1.2.11", + "web3-utils": "1.2.11" + } + }, + "web3-net": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.2.11.tgz", + "integrity": "sha512-sjrSDj0pTfZouR5BSTItCuZ5K/oZPVdVciPQ6981PPPIwJJkCMeVjD7I4zO3qDPCnBjBSbWvVnLdwqUBPtHxyg==", + "dev": true, + "requires": { + "web3-core": "1.2.11", + "web3-core-method": "1.2.11", + "web3-utils": "1.2.11" + } + }, + "web3-providers-http": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.11.tgz", + "integrity": "sha512-psh4hYGb1+ijWywfwpB2cvvOIMISlR44F/rJtYkRmQ5jMvG4FOCPlQJPiHQZo+2cc3HbktvvSJzIhkWQJdmvrA==", + "dev": true, + "requires": { + "web3-core-helpers": "1.2.11", + "xhr2-cookies": "1.1.0" + } + }, + "web3-providers-ipc": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.11.tgz", + "integrity": "sha512-yhc7Y/k8hBV/KlELxynWjJDzmgDEDjIjBzXK+e0rHBsYEhdCNdIH5Psa456c+l0qTEU2YzycF8VAjYpWfPnBpQ==", + "dev": true, + "requires": { + "oboe": "2.1.4", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.11" + } + }, + "web3-providers-ws": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.11.tgz", + "integrity": "sha512-ZxnjIY1Er8Ty+cE4migzr43zA/+72AF1myzsLaU5eVgdsfV7Jqx7Dix1hbevNZDKFlSoEyq/3j/jYalh3So1Zg==", + "dev": true, + "requires": { + "eventemitter3": "4.0.4", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.11", + "websocket": "^1.0.31" + } + }, + "web3-shh": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.2.11.tgz", + "integrity": "sha512-B3OrO3oG1L+bv3E1sTwCx66injW1A8hhwpknDUbV+sw3fehFazA06z9SGXUefuFI1kVs4q2vRi0n4oCcI4dZDg==", + "dev": true, + "requires": { + "web3-core": "1.2.11", + "web3-core-method": "1.2.11", + "web3-core-subscriptions": "1.2.11", + "web3-net": "1.2.11" + } + }, + "websocket": { + "version": "1.0.32", + "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.32.tgz", + "integrity": "sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q==", + "dev": true, + "requires": { + "bufferutil": "^4.0.1", + "debug": "^2.2.0", + "es5-ext": "^0.10.50", + "typedarray-to-buffer": "^3.1.5", + "utf-8-validate": "^5.0.2", + "yaeti": "^0.0.6" + } + } + } + }, + "web3-bzz": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.2.1.tgz", + "integrity": "sha512-LdOO44TuYbGIPfL4ilkuS89GQovxUpmLz6C1UC7VYVVRILeZS740FVB3j9V4P4FHUk1RenaDfKhcntqgVCHtjw==", + "dev": true, + "requires": { + "got": "9.6.0", + "swarm-js": "0.1.39", + "underscore": "1.9.1" + } + }, + "web3-core": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.2.1.tgz", + "integrity": "sha512-5ODwIqgl8oIg/0+Ai4jsLxkKFWJYE0uLuE1yUKHNVCL4zL6n3rFjRMpKPokd6id6nJCNgeA64KdWQ4XfpnjdMg==", + "dev": true, + "requires": { + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-core-requestmanager": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-core-helpers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.2.1.tgz", + "integrity": "sha512-Gx3sTEajD5r96bJgfuW377PZVFmXIH4TdqDhgGwd2lZQCcMi+DA4TgxJNJGxn0R3aUVzyyE76j4LBrh412mXrw==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-eth-iban": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-core-method": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.2.1.tgz", + "integrity": "sha512-Ghg2WS23qi6Xj8Od3VCzaImLHseEA7/usvnOItluiIc5cKs00WYWsNy2YRStzU9a2+z8lwQywPYp0nTzR/QXdQ==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1", + "web3-core-promievent": "1.2.1", + "web3-core-subscriptions": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-core-promievent": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-promievent/-/web3-core-promievent-1.2.1.tgz", + "integrity": "sha512-IVUqgpIKoeOYblwpex4Hye6npM0aMR+kU49VP06secPeN0rHMyhGF0ZGveWBrGvf8WDPI7jhqPBFIC6Jf3Q3zw==", + "dev": true, + "requires": { + "any-promise": "1.3.0", + "eventemitter3": "3.1.2" + } + }, + "web3-core-requestmanager": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-requestmanager/-/web3-core-requestmanager-1.2.1.tgz", + "integrity": "sha512-xfknTC69RfYmLKC+83Jz73IC3/sS2ZLhGtX33D4Q5nQ8yc39ElyAolxr9sJQS8kihOcM6u4J+8gyGMqsLcpIBg==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1", + "web3-providers-http": "1.2.1", + "web3-providers-ipc": "1.2.1", + "web3-providers-ws": "1.2.1" + } + }, + "web3-core-subscriptions": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.2.1.tgz", + "integrity": "sha512-nmOwe3NsB8V8UFsY1r+sW6KjdOS68h8nuh7NzlWxBQT/19QSUGiERRTaZXWu5BYvo1EoZRMxCKyCQpSSXLc08g==", + "dev": true, + "requires": { + "eventemitter3": "3.1.2", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1" + } + }, + "web3-eth": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.2.1.tgz", + "integrity": "sha512-/2xly4Yry5FW1i+uygPjhfvgUP/MS/Dk+PDqmzp5M88tS86A+j8BzKc23GrlA8sgGs0645cpZK/999LpEF5UdA==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-core-subscriptions": "1.2.1", + "web3-eth-abi": "1.2.1", + "web3-eth-accounts": "1.2.1", + "web3-eth-contract": "1.2.1", + "web3-eth-ens": "1.2.1", + "web3-eth-iban": "1.2.1", + "web3-eth-personal": "1.2.1", + "web3-net": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-eth-abi": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz", + "integrity": "sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g==", + "dev": true, + "requires": { + "ethers": "4.0.0-beta.3", + "underscore": "1.9.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "elliptic": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz", + "integrity": "sha1-VILZZG1UvLif19mU/J4ulWiHbj8=", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "inherits": "^2.0.1" + } + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + }, + "dependencies": { + "elliptic": { + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", + "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + } + } + }, + "ethers": { + "version": "4.0.0-beta.3", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.3.tgz", + "integrity": "sha512-YYPogooSknTwvHg3+Mv71gM/3Wcrx+ZpCzarBj3mqs9njjRkrOo2/eufzhHloOCo3JSoNI4TQJJ6yU5ABm3Uog==", + "dev": true, + "requires": { + "@types/node": "^10.3.2", + "aes-js": "3.0.0", + "bn.js": "^4.4.0", + "elliptic": "6.3.3", + "hash.js": "1.1.3", + "js-sha3": "0.5.7", + "scrypt-js": "2.0.3", + "setimmediate": "1.0.4", + "uuid": "2.0.1", + "xmlhttprequest": "1.8.0" + } + }, + "scrypt-js": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", + "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=", + "dev": true + }, + "uuid": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", + "integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w=", + "dev": true + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + } + } + } + } + }, + "web3-eth-accounts": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.2.1.tgz", + "integrity": "sha512-26I4qq42STQ8IeKUyur3MdQ1NzrzCqPsmzqpux0j6X/XBD7EjZ+Cs0lhGNkSKH5dI3V8CJasnQ5T1mNKeWB7nQ==", + "dev": true, + "requires": { + "any-promise": "1.3.0", + "crypto-browserify": "3.12.0", + "eth-lib": "0.2.7", + "scryptsy": "2.1.0", + "semver": "6.2.0", + "underscore": "1.9.1", + "uuid": "3.3.2", + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "semver": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz", + "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==", + "dev": true + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "dev": true + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + } + } + } + } + }, + "web3-eth-contract": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.2.1.tgz", + "integrity": "sha512-kYFESbQ3boC9bl2rYVghj7O8UKMiuKaiMkxvRH5cEDHil8V7MGEGZNH0slSdoyeftZVlaWSMqkRP/chfnKND0g==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-core-promievent": "1.2.1", + "web3-core-subscriptions": "1.2.1", + "web3-eth-abi": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-eth-ens": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.2.1.tgz", + "integrity": "sha512-lhP1kFhqZr2nnbu3CGIFFrAnNxk2veXpOXBY48Tub37RtobDyHijHgrj+xTh+mFiPokyrapVjpFsbGa+Xzye4Q==", + "dev": true, + "requires": { + "eth-ens-namehash": "2.0.8", + "underscore": "1.9.1", + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-promievent": "1.2.1", + "web3-eth-abi": "1.2.1", + "web3-eth-contract": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-eth-iban": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.2.1.tgz", + "integrity": "sha512-9gkr4QPl1jCU+wkgmZ8EwODVO3ovVj6d6JKMos52ggdT2YCmlfvFVF6wlGLwi0VvNa/p+0BjJzaqxnnG/JewjQ==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-eth-personal": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.2.1.tgz", + "integrity": "sha512-RNDVSiaSoY4aIp8+Hc7z+X72H7lMb3fmAChuSBADoEc7DsJrY/d0R5qQDK9g9t2BO8oxgLrLNyBP/9ub2Hc6Bg==", + "dev": true, + "requires": { + "web3-core": "1.2.1", + "web3-core-helpers": "1.2.1", + "web3-core-method": "1.2.1", + "web3-net": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-net": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.2.1.tgz", + "integrity": "sha512-Yt1Bs7WgnLESPe0rri/ZoPWzSy55ovioaP35w1KZydrNtQ5Yq4WcrAdhBzcOW7vAkIwrsLQsvA+hrOCy7mNauw==", + "dev": true, + "requires": { + "web3-core": "1.2.1", + "web3-core-method": "1.2.1", + "web3-utils": "1.2.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "eth-lib": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.7.tgz", + "integrity": "sha1-L5Pxex4jrsN1nNSj/iDBKGo/wco=", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + }, + "web3-utils": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.1.tgz", + "integrity": "sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "eth-lib": "0.2.7", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.9.1", + "utf8": "3.0.0" + } + } + } + }, + "web3-providers-http": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-1.2.1.tgz", + "integrity": "sha512-BDtVUVolT9b3CAzeGVA/np1hhn7RPUZ6YYGB/sYky+GjeO311Yoq8SRDUSezU92x8yImSC2B+SMReGhd1zL+bQ==", + "dev": true, + "requires": { + "web3-core-helpers": "1.2.1", + "xhr2-cookies": "1.1.0" + } + }, + "web3-providers-ipc": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-1.2.1.tgz", + "integrity": "sha512-oPEuOCwxVx8L4CPD0TUdnlOUZwGBSRKScCz/Ws2YHdr9Ium+whm+0NLmOZjkjQp5wovQbyBzNa6zJz1noFRvFA==", + "dev": true, + "requires": { + "oboe": "2.1.4", + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1" + } + }, + "web3-providers-ws": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-1.2.1.tgz", + "integrity": "sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA==", + "dev": true, + "requires": { + "underscore": "1.9.1", + "web3-core-helpers": "1.2.1", + "websocket": "github:web3-js/WebSocket-Node#polyfill/globalThis" + } + }, + "web3-shh": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.2.1.tgz", + "integrity": "sha512-/3Cl04nza5kuFn25bV3FJWa0s3Vafr5BlT933h26xovQ6HIIz61LmvNQlvX1AhFL+SNJOTcQmK1SM59vcyC8bA==", + "dev": true, + "requires": { + "web3-core": "1.2.1", + "web3-core-method": "1.2.1", + "web3-core-subscriptions": "1.2.1", + "web3-net": "1.2.1" + } + }, + "web3-utils": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.2.11.tgz", + "integrity": "sha512-3Tq09izhD+ThqHEaWYX4VOT7dNPdZiO+c/1QMA0s5X2lDFKK/xHJb7cyTRRVzN2LvlHbR7baS1tmQhSua51TcQ==", + "dev": true, + "requires": { + "bn.js": "^4.11.9", + "eth-lib": "0.2.8", + "ethereum-bloom-filters": "^1.0.6", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randombytes": "^2.1.0", + "underscore": "1.9.1", + "utf8": "3.0.0" + }, + "dependencies": { + "eth-lib": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz", + "integrity": "sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "xhr-request-promise": "^0.1.2" + } + } + } + }, + "websocket": { + "version": "github:web3-js/WebSocket-Node#ef5ea2f41daf4a2113b80c9223df884b4d56c400", + "from": "github:web3-js/WebSocket-Node#polyfill/globalThis", + "dev": true, + "requires": { + "debug": "^2.2.0", + "es5-ext": "^0.10.50", + "nan": "^2.14.0", + "typedarray-to-buffer": "^3.1.5", + "yaeti": "^0.0.6" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, + "requires": { + "string-width": "^1.0.2 || 2" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + }, + "workerpool": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz", + "integrity": "sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA==", + "dev": true + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "requires": { + "mkdirp": "^0.5.1" + } + }, + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "dev": true, + "requires": { + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, + "xhr": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz", + "integrity": "sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==", + "dev": true, + "requires": { + "global": "~4.3.0", + "is-function": "^1.0.1", + "parse-headers": "^2.0.0", + "xtend": "^4.0.0" + } + }, + "xhr-request": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/xhr-request/-/xhr-request-1.1.0.tgz", + "integrity": "sha512-Y7qzEaR3FDtL3fP30k9wO/e+FBnBByZeybKOhASsGP30NIkRAAkKD/sCnLvgEfAIEC1rcmK7YG8f4oEnIrrWzA==", + "dev": true, + "requires": { + "buffer-to-arraybuffer": "^0.0.5", + "object-assign": "^4.1.1", + "query-string": "^5.0.1", + "simple-get": "^2.7.0", + "timed-out": "^4.0.1", + "url-set-query": "^1.0.0", + "xhr": "^2.0.4" + } + }, + "xhr-request-promise": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/xhr-request-promise/-/xhr-request-promise-0.1.3.tgz", + "integrity": "sha512-YUBytBsuwgitWtdRzXDDkWAXzhdGB8bYm0sSzMPZT7Z2MBjMSTHFsyCT1yCRATY+XC69DUrQraRAEgcoCRaIPg==", + "dev": true, + "requires": { + "xhr-request": "^1.1.0" + } + }, + "xhr2-cookies": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz", + "integrity": "sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=", + "dev": true, + "requires": { + "cookiejar": "^2.1.1" + } + }, + "xmlhttprequest": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=", + "dev": true + }, + "xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true + }, + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true + }, + "yaeti": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", + "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=", + "dev": true + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "yargs-unparser": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", + "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", + "dev": true, + "requires": { + "flat": "^4.1.0", + "lodash": "^4.17.15", + "yargs": "^13.3.0" + } + }, + "yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "dev": true, + "requires": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + }, + "yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true + } + } +} From e43de0de51a082ccc8045b157894ca89ac4644db Mon Sep 17 00:00:00 2001 From: "Christopher M. Mitchell" Date: Mon, 14 Sep 2020 18:32:42 -0700 Subject: [PATCH 27/30] Setting proper sourcesCount value --- contracts/HotSwapSources.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/HotSwapSources.sol b/contracts/HotSwapSources.sol index c5b9d80..fe89202 100644 --- a/contracts/HotSwapSources.sol +++ b/contracts/HotSwapSources.sol @@ -10,7 +10,7 @@ import "./PathsAdvisor.sol"; contract HotSwapSources is Ownable { - uint256 public sourcesCount = 15; + uint256 public sourcesCount = 16; mapping(uint256 => ISource) public sources; PathsAdvisor public pathsAdvisor; From 5f4f6412b7f53100923dbb4f83fde31918d8140f Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Wed, 16 Sep 2020 19:56:11 +0300 Subject: [PATCH 28/30] Fixes --- contracts/OneRouterAudit.sol | 2 -- contracts/OneRouterSwap.sol | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/contracts/OneRouterAudit.sol b/contracts/OneRouterAudit.sol index 49d100c..ba97a5b 100644 --- a/contracts/OneRouterAudit.sol +++ b/contracts/OneRouterAudit.sol @@ -148,7 +148,6 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O uint256 gasStart = gasleft(); _claimInput(input); - input.fromToken.uniApprove(address(oneRouterSwap), input.amount); path.swaps[0].flags = _disableFeeAndGasHandlingInImpl(path.swaps[0].flags); _makePathSwap(input, path, pathDistribution); @@ -172,7 +171,6 @@ contract OneRouterAudit is IOneRouterView, IOneRouterSwap, OneRouterConstants, O uint256 gasStart = gasleft(); _claimInput(input); - input.fromToken.uniApprove(address(oneRouterSwap), input.amount); paths[0].swaps[0].flags = _disableFeeAndGasHandlingInImpl(paths[0].swaps[0].flags); _makeMultiPathSwap(input, paths, pathDistributions, interPathsDistribution); diff --git a/contracts/OneRouterSwap.sol b/contracts/OneRouterSwap.sol index 02eec99..76e1810 100644 --- a/contracts/OneRouterSwap.sol +++ b/contracts/OneRouterSwap.sol @@ -82,6 +82,10 @@ contract OneRouterSwap is } for (uint i = 0; i < swapDistribution.weights.length && totalWeight > 0; i++) { + if (swapDistribution.weights[i] == 0) { + continue; + } + uint256 amount = input.amount.mul(swapDistribution.weights[i]).div(totalWeight); totalWeight = totalWeight.sub(swapDistribution.weights[i]); @@ -140,6 +144,10 @@ contract OneRouterSwap is uint256 confirmed = input.fromToken.uniBalanceOf(address(this)); for (uint p = 0; p < pathDistributions.length && interTotalWeight > 0; p++) { + if (interPathsDistribution.weights[p] == 0) { + continue; + } + SwapInput memory pathInput = SwapInput({ fromToken: input.fromToken, destToken: input.destToken, From 7b7e16f2f0614d12d675e06f5386c811377259db Mon Sep 17 00:00:00 2001 From: Mikhail Melnik Date: Sat, 3 Oct 2020 11:34:46 +0300 Subject: [PATCH 29/30] remove redundant default values --- contracts/libraries/Algo.sol | 3 --- 1 file changed, 3 deletions(-) diff --git a/contracts/libraries/Algo.sol b/contracts/libraries/Algo.sol index c21ed39..7aad981 100644 --- a/contracts/libraries/Algo.sol +++ b/contracts/libraries/Algo.sol @@ -31,9 +31,6 @@ library Algo { for (uint j = 0; j <= parts; j++) { answer[0][j] = amounts[0][j]; - for (uint i = 1; i < n; i++) { - answer[i][j] = VERY_NEGATIVE_VALUE; - } parent[0][j] = 0; } From a9d17adbd4a9bdc94329a30d509f4e2405a6e09d Mon Sep 17 00:00:00 2001 From: Anton Bukov Date: Mon, 5 Oct 2020 16:12:01 +0300 Subject: [PATCH 30/30] Fixes --- contracts/HotSwapSources.sol | 5 +++-- contracts/OneRouterConstants.sol | 2 ++ contracts/OneRouterSwap.sol | 3 ++- contracts/OneRouterView.sol | 5 ++++- contracts/sources/CurveSource.sol | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/contracts/HotSwapSources.sol b/contracts/HotSwapSources.sol index fe89202..aad6816 100644 --- a/contracts/HotSwapSources.sol +++ b/contracts/HotSwapSources.sol @@ -10,11 +10,12 @@ import "./PathsAdvisor.sol"; contract HotSwapSources is Ownable { - uint256 public sourcesCount = 16; + uint256 public sourcesCount; mapping(uint256 => ISource) public sources; PathsAdvisor public pathsAdvisor; - constructor() public { + constructor(uint256 _sourcesCount) public { + sourcesCount = _sourcesCount; pathsAdvisor = new PathsAdvisor(); } diff --git a/contracts/OneRouterConstants.sol b/contracts/OneRouterConstants.sol index 6b8a0cc..7a6cd67 100644 --- a/contracts/OneRouterConstants.sol +++ b/contracts/OneRouterConstants.sol @@ -6,6 +6,8 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; contract OneRouterConstants { + uint256 constant internal _INTERNAL_SOURCES_COUNT = 17; + uint256 constant internal _FLAG_DISABLE_ALL_SOURCES = 0x100000000000000000000000000000000; uint256 constant internal _FLAG_DISABLE_RECALCULATION = 0x200000000000000000000000000000000; uint256 constant internal _FLAG_ENABLE_CHI_BURN = 0x400000000000000000000000000000000; diff --git a/contracts/OneRouterSwap.sol b/contracts/OneRouterSwap.sol index abd8d99..a43f7d4 100644 --- a/contracts/OneRouterSwap.sol +++ b/contracts/OneRouterSwap.sol @@ -35,6 +35,7 @@ contract OneRouterSwap is constructor(IOneRouterView _oneRouterView) public + HotSwapSources(_INTERNAL_SOURCES_COUNT) OneRouterAudit(_oneRouterView, IOneRouterSwap(0)) { } @@ -49,7 +50,7 @@ contract OneRouterSwap is internal override { - function(IERC20,IERC20,uint256,uint256)[16] memory reserves = [ + function(IERC20,IERC20,uint256,uint256)[_INTERNAL_SOURCES_COUNT] memory reserves = [ _swapOnUniswapV1, _swapOnUniswapV2, _swapOnMooniswap, diff --git a/contracts/OneRouterView.sol b/contracts/OneRouterView.sol index 4f0536c..29eea47 100644 --- a/contracts/OneRouterView.sol +++ b/contracts/OneRouterView.sol @@ -38,6 +38,9 @@ contract OneRouterView is using FlagsChecker for uint256; using DynamicMemoryArray for DynamicMemoryArray.Addresses; + constructor() public HotSwapSources(_INTERNAL_SOURCES_COUNT) { + } + function getSwapReturn(IERC20 fromToken, uint256[] memory amounts, Swap memory swap) public view @@ -49,7 +52,7 @@ contract OneRouterView is return result; } - function(IERC20,uint256[] memory,Swap memory) view returns(uint256[] memory, address, uint256)[16] memory reserves = [ + function(IERC20,uint256[] memory,Swap memory) view returns(uint256[] memory, address, uint256)[_INTERNAL_SOURCES_COUNT] memory reserves = [ _calculateUniswapV1, _calculateUniswapV2, _calculateMooniswap, diff --git a/contracts/sources/CurveSource.sol b/contracts/sources/CurveSource.sol index dca39f4..0dd0b87 100644 --- a/contracts/sources/CurveSource.sol +++ b/contracts/sources/CurveSource.sol @@ -94,7 +94,7 @@ contract CurveSourceView is OneRouterConstants { } function _calculateCurve3pool(IERC20 fromToken, uint256[] memory amounts, IOneRouterView.Swap memory swap) internal view returns(uint256[] memory rets, address dex, uint256 gas) { - return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_3POOL, false, CurveHelper.dynarr([_DAI, _USDC, _USDT])), address(CurveHelper.CURVE_3pool), 130_000); + return (_calculateCurveSelector(fromToken, swap, amounts, CurveHelper.CURVE_3POOL, false, CurveHelper.dynarr([_DAI, _USDC, _USDT])), address(CurveHelper.CURVE_3POOL), 130_000); } function _calculateCurveSelector(