From a5015ab62443762d1cf850888112b7bedc131bb0 Mon Sep 17 00:00:00 2001 From: masaun Date: Sun, 2 Feb 2020 10:53:27 +0100 Subject: [PATCH] Successful to compile --- .editorconfig | 51 +++++++ .gitignore | 126 ++++++++++++++++++ .python-version | 1 + .../{bancor => bancor-protocol}/.gitignore | 0 .../{bancor => bancor-protocol}/.node-version | 0 contracts/{bancor => bancor-protocol}/.snyk | 0 .../BancorNetwork.sol | 0 .../BancorNetworkPathFinder.sol | 0 .../FeatureIds.sol | 0 .../IBancorNetwork.sol | 0 .../bancorx/BancorX.sol | 0 .../bancorx/XTransferRerouter.sol | 0 .../bancorx/interfaces/IBancorX.sol | 0 .../bancorx/interfaces/IBancorXUpgrader.sol | 0 .../converter/BancorConverter.sol | 0 .../converter/BancorConverterFactory.sol | 0 .../converter/BancorConverterRegistry.sol | 0 .../converter/BancorConverterRegistryData.sol | 0 .../converter/BancorConverterUpgrader.sol | 0 .../converter/BancorFormula.sol | 0 .../converter/interfaces/IBancorConverter.sol | 0 .../interfaces/IBancorConverterFactory.sol | 0 .../interfaces/IBancorConverterRegistry.sol | 0 .../IBancorConverterRegistryData.sol | 0 .../interfaces/IBancorConverterUpgrader.sol | 0 .../converter/interfaces/IBancorFormula.sol | 0 .../crowdsale/CrowdsaleController.sol | 0 .../helpers/Migrations.sol | 0 .../helpers/NonStandardERC20Token.sol | 0 .../helpers/NonStandardSmartToken.sol | 0 .../helpers/TestBancorFormula.sol | 0 .../helpers/TestBancorNetwork.sol | 0 .../helpers/TestCrowdsaleController.sol | 0 .../helpers/TestFeatures.sol | 0 .../helpers/TestNonStandardERC20Token.sol | 0 .../helpers/TestSafeMath.sol | 0 .../legacy/BancorGasPriceLimit.sol | 0 .../legacy/BancorPriceFloor.sol | 0 .../token/ERC20Token.sol | 0 .../token/EtherToken.sol | 0 .../token/SmartToken.sol | 0 .../token/SmartTokenController.sol | 0 .../token/interfaces/IERC20Token.sol | 0 .../token/interfaces/IEtherToken.sol | 0 .../token/interfaces/INonStandardERC20.sol | 0 .../token/interfaces/ISmartToken.sol | 0 .../interfaces/ISmartTokenController.sol | 0 .../utility/ContractFeatures.sol | 0 .../utility/ContractRegistry.sol | 0 .../utility/ContractRegistryClient.sol | 0 .../utility/Managed.sol | 0 .../utility/Owned.sol | 0 .../utility/SafeMath.sol | 0 .../utility/TokenHolder.sol | 0 .../utility/Utils.sol | 0 .../utility/Whitelist.sol | 0 .../utility/interfaces/IAddressList.sol | 0 .../utility/interfaces/IContractFeatures.sol | 0 .../utility/interfaces/IContractRegistry.sol | 0 .../utility/interfaces/IOwned.sol | 0 .../utility/interfaces/ITokenHolder.sol | 0 .../utility/interfaces/IWhitelist.sol | 0 contracts/bancor/solidity/.solcover.js | 12 -- contracts/bancor/solidity/truffle-config.js | 38 ------ package.json | 16 ++- truffle-config.js | 4 +- 66 files changed, 194 insertions(+), 54 deletions(-) create mode 100644 .editorconfig create mode 100644 .python-version rename contracts/{bancor => bancor-protocol}/.gitignore (100%) rename contracts/{bancor => bancor-protocol}/.node-version (100%) rename contracts/{bancor => bancor-protocol}/.snyk (100%) rename contracts/{bancor => bancor-protocol}/BancorNetwork.sol (100%) rename contracts/{bancor => bancor-protocol}/BancorNetworkPathFinder.sol (100%) rename contracts/{bancor => bancor-protocol}/FeatureIds.sol (100%) rename contracts/{bancor => bancor-protocol}/IBancorNetwork.sol (100%) rename contracts/{bancor => bancor-protocol}/bancorx/BancorX.sol (100%) rename contracts/{bancor => bancor-protocol}/bancorx/XTransferRerouter.sol (100%) rename contracts/{bancor => bancor-protocol}/bancorx/interfaces/IBancorX.sol (100%) rename contracts/{bancor => bancor-protocol}/bancorx/interfaces/IBancorXUpgrader.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/BancorConverter.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/BancorConverterFactory.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/BancorConverterRegistry.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/BancorConverterRegistryData.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/BancorConverterUpgrader.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/BancorFormula.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/interfaces/IBancorConverter.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/interfaces/IBancorConverterFactory.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/interfaces/IBancorConverterRegistry.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/interfaces/IBancorConverterRegistryData.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/interfaces/IBancorConverterUpgrader.sol (100%) rename contracts/{bancor => bancor-protocol}/converter/interfaces/IBancorFormula.sol (100%) rename contracts/{bancor => bancor-protocol}/crowdsale/CrowdsaleController.sol (100%) rename contracts/{bancor => bancor-protocol}/helpers/Migrations.sol (100%) rename contracts/{bancor => bancor-protocol}/helpers/NonStandardERC20Token.sol (100%) rename contracts/{bancor => bancor-protocol}/helpers/NonStandardSmartToken.sol (100%) rename contracts/{bancor => bancor-protocol}/helpers/TestBancorFormula.sol (100%) rename contracts/{bancor => bancor-protocol}/helpers/TestBancorNetwork.sol (100%) rename contracts/{bancor => bancor-protocol}/helpers/TestCrowdsaleController.sol (100%) rename contracts/{bancor => bancor-protocol}/helpers/TestFeatures.sol (100%) rename contracts/{bancor => bancor-protocol}/helpers/TestNonStandardERC20Token.sol (100%) rename contracts/{bancor => bancor-protocol}/helpers/TestSafeMath.sol (100%) rename contracts/{bancor => bancor-protocol}/legacy/BancorGasPriceLimit.sol (100%) rename contracts/{bancor => bancor-protocol}/legacy/BancorPriceFloor.sol (100%) rename contracts/{bancor => bancor-protocol}/token/ERC20Token.sol (100%) rename contracts/{bancor => bancor-protocol}/token/EtherToken.sol (100%) rename contracts/{bancor => bancor-protocol}/token/SmartToken.sol (100%) rename contracts/{bancor => bancor-protocol}/token/SmartTokenController.sol (100%) rename contracts/{bancor => bancor-protocol}/token/interfaces/IERC20Token.sol (100%) rename contracts/{bancor => bancor-protocol}/token/interfaces/IEtherToken.sol (100%) rename contracts/{bancor => bancor-protocol}/token/interfaces/INonStandardERC20.sol (100%) rename contracts/{bancor => bancor-protocol}/token/interfaces/ISmartToken.sol (100%) rename contracts/{bancor => bancor-protocol}/token/interfaces/ISmartTokenController.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/ContractFeatures.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/ContractRegistry.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/ContractRegistryClient.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/Managed.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/Owned.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/SafeMath.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/TokenHolder.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/Utils.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/Whitelist.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/interfaces/IAddressList.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/interfaces/IContractFeatures.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/interfaces/IContractRegistry.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/interfaces/IOwned.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/interfaces/ITokenHolder.sol (100%) rename contracts/{bancor => bancor-protocol}/utility/interfaces/IWhitelist.sol (100%) delete mode 100755 contracts/bancor/solidity/.solcover.js delete mode 100755 contracts/bancor/solidity/truffle-config.js diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b76455b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,51 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +indent_style = space +indent_size = 4 + +[*.sol] +indent_style = space +indent_size = 4 + +[*.py] +indent_style = space +indent_size = 4 + +[*.rb] +indent_style = space +indent_size = 2 + +[*.java] +indent_style = space +indent_size = 4 + +[*.php] +indent_style = space +tab_width = 4 + +[*.html] +indent_style = space +indent_size = 2 + +[*.js] +indent_style = space +indent_size = 2 + +[*.jsx] +indent_style = space +indent_size = 2 + +[*.css] +indent_style = space +indent_size = 2 + +[*.md] +trim_trailing_whitespace = false + +[{package.json,.travis.yml}] +indent_style = space +indent_size = 2 diff --git a/.gitignore b/.gitignore index c774fed..b8e5dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,129 @@ solidity/build/TestNonStandardERC20Token.abi solidity/build/TestNonStandardERC20Token.bin solidity/build/TestSafeMath.abi solidity/build/TestSafeMath.bin + + + + +################################### +# Add +################################### +secrets.json + +node_modules +build +ganache +contractAddresses +package-lock.json +.secret +output + +/node_modules + +wallet.json + + +#------------------------------------------ + + +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# Log of ethereum-bridge (for provable-things) +bridge.log + +# lol macs +.DS_Store/ + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* + + +# Logs +.DS_Store +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# next.js build output +.next + +# zos sessions +zos.dev-* + +# contracts build +build + + diff --git a/.python-version b/.python-version new file mode 100644 index 0000000..9bbf492 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +2.7.14 diff --git a/contracts/bancor/.gitignore b/contracts/bancor-protocol/.gitignore similarity index 100% rename from contracts/bancor/.gitignore rename to contracts/bancor-protocol/.gitignore diff --git a/contracts/bancor/.node-version b/contracts/bancor-protocol/.node-version similarity index 100% rename from contracts/bancor/.node-version rename to contracts/bancor-protocol/.node-version diff --git a/contracts/bancor/.snyk b/contracts/bancor-protocol/.snyk similarity index 100% rename from contracts/bancor/.snyk rename to contracts/bancor-protocol/.snyk diff --git a/contracts/bancor/BancorNetwork.sol b/contracts/bancor-protocol/BancorNetwork.sol similarity index 100% rename from contracts/bancor/BancorNetwork.sol rename to contracts/bancor-protocol/BancorNetwork.sol diff --git a/contracts/bancor/BancorNetworkPathFinder.sol b/contracts/bancor-protocol/BancorNetworkPathFinder.sol similarity index 100% rename from contracts/bancor/BancorNetworkPathFinder.sol rename to contracts/bancor-protocol/BancorNetworkPathFinder.sol diff --git a/contracts/bancor/FeatureIds.sol b/contracts/bancor-protocol/FeatureIds.sol similarity index 100% rename from contracts/bancor/FeatureIds.sol rename to contracts/bancor-protocol/FeatureIds.sol diff --git a/contracts/bancor/IBancorNetwork.sol b/contracts/bancor-protocol/IBancorNetwork.sol similarity index 100% rename from contracts/bancor/IBancorNetwork.sol rename to contracts/bancor-protocol/IBancorNetwork.sol diff --git a/contracts/bancor/bancorx/BancorX.sol b/contracts/bancor-protocol/bancorx/BancorX.sol similarity index 100% rename from contracts/bancor/bancorx/BancorX.sol rename to contracts/bancor-protocol/bancorx/BancorX.sol diff --git a/contracts/bancor/bancorx/XTransferRerouter.sol b/contracts/bancor-protocol/bancorx/XTransferRerouter.sol similarity index 100% rename from contracts/bancor/bancorx/XTransferRerouter.sol rename to contracts/bancor-protocol/bancorx/XTransferRerouter.sol diff --git a/contracts/bancor/bancorx/interfaces/IBancorX.sol b/contracts/bancor-protocol/bancorx/interfaces/IBancorX.sol similarity index 100% rename from contracts/bancor/bancorx/interfaces/IBancorX.sol rename to contracts/bancor-protocol/bancorx/interfaces/IBancorX.sol diff --git a/contracts/bancor/bancorx/interfaces/IBancorXUpgrader.sol b/contracts/bancor-protocol/bancorx/interfaces/IBancorXUpgrader.sol similarity index 100% rename from contracts/bancor/bancorx/interfaces/IBancorXUpgrader.sol rename to contracts/bancor-protocol/bancorx/interfaces/IBancorXUpgrader.sol diff --git a/contracts/bancor/converter/BancorConverter.sol b/contracts/bancor-protocol/converter/BancorConverter.sol similarity index 100% rename from contracts/bancor/converter/BancorConverter.sol rename to contracts/bancor-protocol/converter/BancorConverter.sol diff --git a/contracts/bancor/converter/BancorConverterFactory.sol b/contracts/bancor-protocol/converter/BancorConverterFactory.sol similarity index 100% rename from contracts/bancor/converter/BancorConverterFactory.sol rename to contracts/bancor-protocol/converter/BancorConverterFactory.sol diff --git a/contracts/bancor/converter/BancorConverterRegistry.sol b/contracts/bancor-protocol/converter/BancorConverterRegistry.sol similarity index 100% rename from contracts/bancor/converter/BancorConverterRegistry.sol rename to contracts/bancor-protocol/converter/BancorConverterRegistry.sol diff --git a/contracts/bancor/converter/BancorConverterRegistryData.sol b/contracts/bancor-protocol/converter/BancorConverterRegistryData.sol similarity index 100% rename from contracts/bancor/converter/BancorConverterRegistryData.sol rename to contracts/bancor-protocol/converter/BancorConverterRegistryData.sol diff --git a/contracts/bancor/converter/BancorConverterUpgrader.sol b/contracts/bancor-protocol/converter/BancorConverterUpgrader.sol similarity index 100% rename from contracts/bancor/converter/BancorConverterUpgrader.sol rename to contracts/bancor-protocol/converter/BancorConverterUpgrader.sol diff --git a/contracts/bancor/converter/BancorFormula.sol b/contracts/bancor-protocol/converter/BancorFormula.sol similarity index 100% rename from contracts/bancor/converter/BancorFormula.sol rename to contracts/bancor-protocol/converter/BancorFormula.sol diff --git a/contracts/bancor/converter/interfaces/IBancorConverter.sol b/contracts/bancor-protocol/converter/interfaces/IBancorConverter.sol similarity index 100% rename from contracts/bancor/converter/interfaces/IBancorConverter.sol rename to contracts/bancor-protocol/converter/interfaces/IBancorConverter.sol diff --git a/contracts/bancor/converter/interfaces/IBancorConverterFactory.sol b/contracts/bancor-protocol/converter/interfaces/IBancorConverterFactory.sol similarity index 100% rename from contracts/bancor/converter/interfaces/IBancorConverterFactory.sol rename to contracts/bancor-protocol/converter/interfaces/IBancorConverterFactory.sol diff --git a/contracts/bancor/converter/interfaces/IBancorConverterRegistry.sol b/contracts/bancor-protocol/converter/interfaces/IBancorConverterRegistry.sol similarity index 100% rename from contracts/bancor/converter/interfaces/IBancorConverterRegistry.sol rename to contracts/bancor-protocol/converter/interfaces/IBancorConverterRegistry.sol diff --git a/contracts/bancor/converter/interfaces/IBancorConverterRegistryData.sol b/contracts/bancor-protocol/converter/interfaces/IBancorConverterRegistryData.sol similarity index 100% rename from contracts/bancor/converter/interfaces/IBancorConverterRegistryData.sol rename to contracts/bancor-protocol/converter/interfaces/IBancorConverterRegistryData.sol diff --git a/contracts/bancor/converter/interfaces/IBancorConverterUpgrader.sol b/contracts/bancor-protocol/converter/interfaces/IBancorConverterUpgrader.sol similarity index 100% rename from contracts/bancor/converter/interfaces/IBancorConverterUpgrader.sol rename to contracts/bancor-protocol/converter/interfaces/IBancorConverterUpgrader.sol diff --git a/contracts/bancor/converter/interfaces/IBancorFormula.sol b/contracts/bancor-protocol/converter/interfaces/IBancorFormula.sol similarity index 100% rename from contracts/bancor/converter/interfaces/IBancorFormula.sol rename to contracts/bancor-protocol/converter/interfaces/IBancorFormula.sol diff --git a/contracts/bancor/crowdsale/CrowdsaleController.sol b/contracts/bancor-protocol/crowdsale/CrowdsaleController.sol similarity index 100% rename from contracts/bancor/crowdsale/CrowdsaleController.sol rename to contracts/bancor-protocol/crowdsale/CrowdsaleController.sol diff --git a/contracts/bancor/helpers/Migrations.sol b/contracts/bancor-protocol/helpers/Migrations.sol similarity index 100% rename from contracts/bancor/helpers/Migrations.sol rename to contracts/bancor-protocol/helpers/Migrations.sol diff --git a/contracts/bancor/helpers/NonStandardERC20Token.sol b/contracts/bancor-protocol/helpers/NonStandardERC20Token.sol similarity index 100% rename from contracts/bancor/helpers/NonStandardERC20Token.sol rename to contracts/bancor-protocol/helpers/NonStandardERC20Token.sol diff --git a/contracts/bancor/helpers/NonStandardSmartToken.sol b/contracts/bancor-protocol/helpers/NonStandardSmartToken.sol similarity index 100% rename from contracts/bancor/helpers/NonStandardSmartToken.sol rename to contracts/bancor-protocol/helpers/NonStandardSmartToken.sol diff --git a/contracts/bancor/helpers/TestBancorFormula.sol b/contracts/bancor-protocol/helpers/TestBancorFormula.sol similarity index 100% rename from contracts/bancor/helpers/TestBancorFormula.sol rename to contracts/bancor-protocol/helpers/TestBancorFormula.sol diff --git a/contracts/bancor/helpers/TestBancorNetwork.sol b/contracts/bancor-protocol/helpers/TestBancorNetwork.sol similarity index 100% rename from contracts/bancor/helpers/TestBancorNetwork.sol rename to contracts/bancor-protocol/helpers/TestBancorNetwork.sol diff --git a/contracts/bancor/helpers/TestCrowdsaleController.sol b/contracts/bancor-protocol/helpers/TestCrowdsaleController.sol similarity index 100% rename from contracts/bancor/helpers/TestCrowdsaleController.sol rename to contracts/bancor-protocol/helpers/TestCrowdsaleController.sol diff --git a/contracts/bancor/helpers/TestFeatures.sol b/contracts/bancor-protocol/helpers/TestFeatures.sol similarity index 100% rename from contracts/bancor/helpers/TestFeatures.sol rename to contracts/bancor-protocol/helpers/TestFeatures.sol diff --git a/contracts/bancor/helpers/TestNonStandardERC20Token.sol b/contracts/bancor-protocol/helpers/TestNonStandardERC20Token.sol similarity index 100% rename from contracts/bancor/helpers/TestNonStandardERC20Token.sol rename to contracts/bancor-protocol/helpers/TestNonStandardERC20Token.sol diff --git a/contracts/bancor/helpers/TestSafeMath.sol b/contracts/bancor-protocol/helpers/TestSafeMath.sol similarity index 100% rename from contracts/bancor/helpers/TestSafeMath.sol rename to contracts/bancor-protocol/helpers/TestSafeMath.sol diff --git a/contracts/bancor/legacy/BancorGasPriceLimit.sol b/contracts/bancor-protocol/legacy/BancorGasPriceLimit.sol similarity index 100% rename from contracts/bancor/legacy/BancorGasPriceLimit.sol rename to contracts/bancor-protocol/legacy/BancorGasPriceLimit.sol diff --git a/contracts/bancor/legacy/BancorPriceFloor.sol b/contracts/bancor-protocol/legacy/BancorPriceFloor.sol similarity index 100% rename from contracts/bancor/legacy/BancorPriceFloor.sol rename to contracts/bancor-protocol/legacy/BancorPriceFloor.sol diff --git a/contracts/bancor/token/ERC20Token.sol b/contracts/bancor-protocol/token/ERC20Token.sol similarity index 100% rename from contracts/bancor/token/ERC20Token.sol rename to contracts/bancor-protocol/token/ERC20Token.sol diff --git a/contracts/bancor/token/EtherToken.sol b/contracts/bancor-protocol/token/EtherToken.sol similarity index 100% rename from contracts/bancor/token/EtherToken.sol rename to contracts/bancor-protocol/token/EtherToken.sol diff --git a/contracts/bancor/token/SmartToken.sol b/contracts/bancor-protocol/token/SmartToken.sol similarity index 100% rename from contracts/bancor/token/SmartToken.sol rename to contracts/bancor-protocol/token/SmartToken.sol diff --git a/contracts/bancor/token/SmartTokenController.sol b/contracts/bancor-protocol/token/SmartTokenController.sol similarity index 100% rename from contracts/bancor/token/SmartTokenController.sol rename to contracts/bancor-protocol/token/SmartTokenController.sol diff --git a/contracts/bancor/token/interfaces/IERC20Token.sol b/contracts/bancor-protocol/token/interfaces/IERC20Token.sol similarity index 100% rename from contracts/bancor/token/interfaces/IERC20Token.sol rename to contracts/bancor-protocol/token/interfaces/IERC20Token.sol diff --git a/contracts/bancor/token/interfaces/IEtherToken.sol b/contracts/bancor-protocol/token/interfaces/IEtherToken.sol similarity index 100% rename from contracts/bancor/token/interfaces/IEtherToken.sol rename to contracts/bancor-protocol/token/interfaces/IEtherToken.sol diff --git a/contracts/bancor/token/interfaces/INonStandardERC20.sol b/contracts/bancor-protocol/token/interfaces/INonStandardERC20.sol similarity index 100% rename from contracts/bancor/token/interfaces/INonStandardERC20.sol rename to contracts/bancor-protocol/token/interfaces/INonStandardERC20.sol diff --git a/contracts/bancor/token/interfaces/ISmartToken.sol b/contracts/bancor-protocol/token/interfaces/ISmartToken.sol similarity index 100% rename from contracts/bancor/token/interfaces/ISmartToken.sol rename to contracts/bancor-protocol/token/interfaces/ISmartToken.sol diff --git a/contracts/bancor/token/interfaces/ISmartTokenController.sol b/contracts/bancor-protocol/token/interfaces/ISmartTokenController.sol similarity index 100% rename from contracts/bancor/token/interfaces/ISmartTokenController.sol rename to contracts/bancor-protocol/token/interfaces/ISmartTokenController.sol diff --git a/contracts/bancor/utility/ContractFeatures.sol b/contracts/bancor-protocol/utility/ContractFeatures.sol similarity index 100% rename from contracts/bancor/utility/ContractFeatures.sol rename to contracts/bancor-protocol/utility/ContractFeatures.sol diff --git a/contracts/bancor/utility/ContractRegistry.sol b/contracts/bancor-protocol/utility/ContractRegistry.sol similarity index 100% rename from contracts/bancor/utility/ContractRegistry.sol rename to contracts/bancor-protocol/utility/ContractRegistry.sol diff --git a/contracts/bancor/utility/ContractRegistryClient.sol b/contracts/bancor-protocol/utility/ContractRegistryClient.sol similarity index 100% rename from contracts/bancor/utility/ContractRegistryClient.sol rename to contracts/bancor-protocol/utility/ContractRegistryClient.sol diff --git a/contracts/bancor/utility/Managed.sol b/contracts/bancor-protocol/utility/Managed.sol similarity index 100% rename from contracts/bancor/utility/Managed.sol rename to contracts/bancor-protocol/utility/Managed.sol diff --git a/contracts/bancor/utility/Owned.sol b/contracts/bancor-protocol/utility/Owned.sol similarity index 100% rename from contracts/bancor/utility/Owned.sol rename to contracts/bancor-protocol/utility/Owned.sol diff --git a/contracts/bancor/utility/SafeMath.sol b/contracts/bancor-protocol/utility/SafeMath.sol similarity index 100% rename from contracts/bancor/utility/SafeMath.sol rename to contracts/bancor-protocol/utility/SafeMath.sol diff --git a/contracts/bancor/utility/TokenHolder.sol b/contracts/bancor-protocol/utility/TokenHolder.sol similarity index 100% rename from contracts/bancor/utility/TokenHolder.sol rename to contracts/bancor-protocol/utility/TokenHolder.sol diff --git a/contracts/bancor/utility/Utils.sol b/contracts/bancor-protocol/utility/Utils.sol similarity index 100% rename from contracts/bancor/utility/Utils.sol rename to contracts/bancor-protocol/utility/Utils.sol diff --git a/contracts/bancor/utility/Whitelist.sol b/contracts/bancor-protocol/utility/Whitelist.sol similarity index 100% rename from contracts/bancor/utility/Whitelist.sol rename to contracts/bancor-protocol/utility/Whitelist.sol diff --git a/contracts/bancor/utility/interfaces/IAddressList.sol b/contracts/bancor-protocol/utility/interfaces/IAddressList.sol similarity index 100% rename from contracts/bancor/utility/interfaces/IAddressList.sol rename to contracts/bancor-protocol/utility/interfaces/IAddressList.sol diff --git a/contracts/bancor/utility/interfaces/IContractFeatures.sol b/contracts/bancor-protocol/utility/interfaces/IContractFeatures.sol similarity index 100% rename from contracts/bancor/utility/interfaces/IContractFeatures.sol rename to contracts/bancor-protocol/utility/interfaces/IContractFeatures.sol diff --git a/contracts/bancor/utility/interfaces/IContractRegistry.sol b/contracts/bancor-protocol/utility/interfaces/IContractRegistry.sol similarity index 100% rename from contracts/bancor/utility/interfaces/IContractRegistry.sol rename to contracts/bancor-protocol/utility/interfaces/IContractRegistry.sol diff --git a/contracts/bancor/utility/interfaces/IOwned.sol b/contracts/bancor-protocol/utility/interfaces/IOwned.sol similarity index 100% rename from contracts/bancor/utility/interfaces/IOwned.sol rename to contracts/bancor-protocol/utility/interfaces/IOwned.sol diff --git a/contracts/bancor/utility/interfaces/ITokenHolder.sol b/contracts/bancor-protocol/utility/interfaces/ITokenHolder.sol similarity index 100% rename from contracts/bancor/utility/interfaces/ITokenHolder.sol rename to contracts/bancor-protocol/utility/interfaces/ITokenHolder.sol diff --git a/contracts/bancor/utility/interfaces/IWhitelist.sol b/contracts/bancor-protocol/utility/interfaces/IWhitelist.sol similarity index 100% rename from contracts/bancor/utility/interfaces/IWhitelist.sol rename to contracts/bancor-protocol/utility/interfaces/IWhitelist.sol diff --git a/contracts/bancor/solidity/.solcover.js b/contracts/bancor/solidity/.solcover.js deleted file mode 100755 index cfa188d..0000000 --- a/contracts/bancor/solidity/.solcover.js +++ /dev/null @@ -1,12 +0,0 @@ -// See -module.exports = { - port: 7555, - norpc: true, - testCommand: "node ../../node_modules/truffle/build/cli.bundled.js test --network=coverage", - compileCommand: "node ../../node_modules/truffle/build/cli.bundled.js compile --network=coverage", - skipFiles: [ - "helpers/Migrations.sol", - "legacy/BancorGasPriceLimit.sol", - "legacy/BancorPriceFloor.sol" - ] -}; diff --git a/contracts/bancor/solidity/truffle-config.js b/contracts/bancor/solidity/truffle-config.js deleted file mode 100755 index 6c4d7e3..0000000 --- a/contracts/bancor/solidity/truffle-config.js +++ /dev/null @@ -1,38 +0,0 @@ -// See -module.exports = { - networks: { - development: { - host: "localhost", - port: 7545, - network_id: "*", // Match any network id - gasPrice: 20000000000, // Gas price used for deploys - gas: 6721975 // Gas limit used for deploys - }, - production: { - host: "localhost", - port: 7545, - network_id: "*", // Match any network id - gasPrice: 20000000000, // Gas price used for deploys - gas: 6721975 // Gas limit used for deploys - }, - coverage: { // See - host: "localhost", - port: 7555, // Also in .solcover.js - network_id: "*", // Match any network id - gasPrice: 0x1, // Gas price used for deploys - gas: 0x1fffffffffffff // Gas limit used for deploys - } - }, - mocha: { - enableTimeouts: false, - useColors: true, - bail: true, - reporter: "list" // See - }, - solc: { - optimizer: { - enabled: true, - runs: 200 - } - } -}; diff --git a/package.json b/package.json index e66b108..3539efc 100755 --- a/package.json +++ b/package.json @@ -16,7 +16,17 @@ "verify": "node scripts/verify-all.js", "flatten": "node scripts/flatten.js", "snyk-protect": "snyk protect", - "prepare": "npm run snyk-protect" + "prepare": "npm run snyk-protect", + + "test": "echo \"Error: no test specified\" && exit 1", + "test:truffle": "truffle test ./test/*", + "start-blank": "rm -rf client/src && cp -rf barebones/src client/", + "client": "cd client && npm run start", + "console:development": "truffle console --network development", + "compile:development": "truffle compile --network development", + "migrate:development": "truffle migrate --reset --network development", + "compile:ropsten": "truffle compile --network ropsten", + "migrate:ropsten": "truffle migrate --reset --network ropsten" }, "dependencies": { "decimal.js": "10.2.0", @@ -26,7 +36,9 @@ "truffle-contract": "3.0.8", "truffle-flattener": "1.4.2", "web3": "1.2.1", - "snyk": "^1.259.0" + "snyk": "^1.259.0", + "@truffle/hdwallet-provider": "^1.0.29", + "dotenv": "^8.2.0" }, "snyk": true } diff --git a/truffle-config.js b/truffle-config.js index 564295f..fb42dc0 100755 --- a/truffle-config.js +++ b/truffle-config.js @@ -1,6 +1,6 @@ -require('dotenv').config(); +//require('dotenv').config(); -const HDWalletProvider = require('@truffle/hdwallet-provider'); // @notice - Should new module. +//const HDWalletProvider = require('@truffle/hdwallet-provider'); // @notice - Should new module. const mnemonic = process.env.MNEMONIC;