aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--.prettierignore4
-rw-r--r--CODEOWNERS2
-rw-r--r--README.md2
-rw-r--r--contracts/core/.solhint.json (renamed from packages/contracts/.solhint.json)0
-rw-r--r--contracts/core/.solhintignore (renamed from packages/contracts/.solhintignore)0
-rw-r--r--contracts/core/CHANGELOG.json (renamed from packages/contracts/CHANGELOG.json)0
-rw-r--r--contracts/core/README.md (renamed from packages/contracts/README.md)0
-rw-r--r--contracts/core/compiler.json (renamed from packages/contracts/compiler.json)0
-rw-r--r--contracts/core/contracts/examples/ExchangeWrapper/ExchangeWrapper.sol (renamed from packages/contracts/contracts/examples/ExchangeWrapper/ExchangeWrapper.sol)0
-rw-r--r--contracts/core/contracts/examples/Validator/Validator.sol (renamed from packages/contracts/contracts/examples/Validator/Validator.sol)0
-rw-r--r--contracts/core/contracts/examples/Wallet/Wallet.sol (renamed from packages/contracts/contracts/examples/Wallet/Wallet.sol)0
-rw-r--r--contracts/core/contracts/examples/Whitelist/Whitelist.sol (renamed from packages/contracts/contracts/examples/Whitelist/Whitelist.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/Forwarder.sol (renamed from packages/contracts/contracts/extensions/Forwarder/Forwarder.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/MixinAssets.sol (renamed from packages/contracts/contracts/extensions/Forwarder/MixinAssets.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/MixinExchangeWrapper.sol (renamed from packages/contracts/contracts/extensions/Forwarder/MixinExchangeWrapper.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/MixinForwarderCore.sol (renamed from packages/contracts/contracts/extensions/Forwarder/MixinForwarderCore.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/MixinWeth.sol (renamed from packages/contracts/contracts/extensions/Forwarder/MixinWeth.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/interfaces/IAssets.sol (renamed from packages/contracts/contracts/extensions/Forwarder/interfaces/IAssets.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/interfaces/IForwarder.sol (renamed from packages/contracts/contracts/extensions/Forwarder/interfaces/IForwarder.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/interfaces/IForwarderCore.sol (renamed from packages/contracts/contracts/extensions/Forwarder/interfaces/IForwarderCore.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/libs/LibConstants.sol (renamed from packages/contracts/contracts/extensions/Forwarder/libs/LibConstants.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/libs/LibForwarderErrors.sol (renamed from packages/contracts/contracts/extensions/Forwarder/libs/LibForwarderErrors.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/mixins/MAssets.sol (renamed from packages/contracts/contracts/extensions/Forwarder/mixins/MAssets.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/mixins/MExchangeWrapper.sol (renamed from packages/contracts/contracts/extensions/Forwarder/mixins/MExchangeWrapper.sol)0
-rw-r--r--contracts/core/contracts/extensions/Forwarder/mixins/MWeth.sol (renamed from packages/contracts/contracts/extensions/Forwarder/mixins/MWeth.sol)0
-rw-r--r--contracts/core/contracts/extensions/OrderValidator/OrderValidator.sol (renamed from packages/contracts/contracts/extensions/OrderValidator/OrderValidator.sol)0
-rw-r--r--contracts/core/contracts/multisig/MultiSigWallet.sol (renamed from packages/contracts/contracts/multisig/MultiSigWallet.sol)0
-rw-r--r--contracts/core/contracts/multisig/MultiSigWalletWithTimeLock.sol (renamed from packages/contracts/contracts/multisig/MultiSigWalletWithTimeLock.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxy/ERC20Proxy.sol (renamed from packages/contracts/contracts/protocol/AssetProxy/ERC20Proxy.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxy/ERC721Proxy.sol (renamed from packages/contracts/contracts/protocol/AssetProxy/ERC721Proxy.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxy/MixinAuthorizable.sol (renamed from packages/contracts/contracts/protocol/AssetProxy/MixinAuthorizable.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxy/MultiAssetProxy.sol (renamed from packages/contracts/contracts/protocol/AssetProxy/MultiAssetProxy.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxy/interfaces/IAssetData.sol (renamed from packages/contracts/contracts/protocol/AssetProxy/interfaces/IAssetData.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxy/interfaces/IAssetProxy.sol (renamed from packages/contracts/contracts/protocol/AssetProxy/interfaces/IAssetProxy.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxy/interfaces/IAuthorizable.sol (renamed from packages/contracts/contracts/protocol/AssetProxy/interfaces/IAuthorizable.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxy/libs/LibAssetProxyErrors.sol (renamed from packages/contracts/contracts/protocol/AssetProxy/libs/LibAssetProxyErrors.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol (renamed from packages/contracts/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol)0
-rw-r--r--contracts/core/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol (renamed from packages/contracts/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/Exchange.sol (renamed from packages/contracts/contracts/protocol/Exchange/Exchange.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol (renamed from packages/contracts/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/MixinExchangeCore.sol (renamed from packages/contracts/contracts/protocol/Exchange/MixinExchangeCore.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/MixinMatchOrders.sol (renamed from packages/contracts/contracts/protocol/Exchange/MixinMatchOrders.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/MixinSignatureValidator.sol (renamed from packages/contracts/contracts/protocol/Exchange/MixinSignatureValidator.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/MixinTransactions.sol (renamed from packages/contracts/contracts/protocol/Exchange/MixinTransactions.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/MixinWrapperFunctions.sol (renamed from packages/contracts/contracts/protocol/Exchange/MixinWrapperFunctions.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/interfaces/IAssetProxyDispatcher.sol (renamed from packages/contracts/contracts/protocol/Exchange/interfaces/IAssetProxyDispatcher.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/interfaces/IExchange.sol (renamed from packages/contracts/contracts/protocol/Exchange/interfaces/IExchange.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/interfaces/IExchangeCore.sol (renamed from packages/contracts/contracts/protocol/Exchange/interfaces/IExchangeCore.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/interfaces/IMatchOrders.sol (renamed from packages/contracts/contracts/protocol/Exchange/interfaces/IMatchOrders.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/interfaces/ISignatureValidator.sol (renamed from packages/contracts/contracts/protocol/Exchange/interfaces/ISignatureValidator.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/interfaces/ITransactions.sol (renamed from packages/contracts/contracts/protocol/Exchange/interfaces/ITransactions.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/interfaces/IValidator.sol (renamed from packages/contracts/contracts/protocol/Exchange/interfaces/IValidator.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/interfaces/IWallet.sol (renamed from packages/contracts/contracts/protocol/Exchange/interfaces/IWallet.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/interfaces/IWrapperFunctions.sol (renamed from packages/contracts/contracts/protocol/Exchange/interfaces/IWrapperFunctions.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/libs/LibAbiEncoder.sol (renamed from packages/contracts/contracts/protocol/Exchange/libs/LibAbiEncoder.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/libs/LibConstants.sol (renamed from packages/contracts/contracts/protocol/Exchange/libs/LibConstants.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/libs/LibEIP712.sol (renamed from packages/contracts/contracts/protocol/Exchange/libs/LibEIP712.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/libs/LibExchangeErrors.sol (renamed from packages/contracts/contracts/protocol/Exchange/libs/LibExchangeErrors.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/libs/LibFillResults.sol (renamed from packages/contracts/contracts/protocol/Exchange/libs/LibFillResults.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/libs/LibMath.sol (renamed from packages/contracts/contracts/protocol/Exchange/libs/LibMath.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/libs/LibOrder.sol (renamed from packages/contracts/contracts/protocol/Exchange/libs/LibOrder.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol (renamed from packages/contracts/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/mixins/MExchangeCore.sol (renamed from packages/contracts/contracts/protocol/Exchange/mixins/MExchangeCore.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/mixins/MMatchOrders.sol (renamed from packages/contracts/contracts/protocol/Exchange/mixins/MMatchOrders.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/mixins/MSignatureValidator.sol (renamed from packages/contracts/contracts/protocol/Exchange/mixins/MSignatureValidator.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/mixins/MTransactions.sol (renamed from packages/contracts/contracts/protocol/Exchange/mixins/MTransactions.sol)0
-rw-r--r--contracts/core/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol (renamed from packages/contracts/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol)0
-rw-r--r--contracts/core/contracts/test/DummyERC20Token/DummyERC20Token.sol (renamed from packages/contracts/contracts/test/DummyERC20Token/DummyERC20Token.sol)0
-rw-r--r--contracts/core/contracts/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol (renamed from packages/contracts/contracts/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol)0
-rw-r--r--contracts/core/contracts/test/DummyERC20Token/DummyNoReturnERC20Token.sol (renamed from packages/contracts/contracts/test/DummyERC20Token/DummyNoReturnERC20Token.sol)0
-rw-r--r--contracts/core/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol (renamed from packages/contracts/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol)0
-rw-r--r--contracts/core/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol (renamed from packages/contracts/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol)0
-rw-r--r--contracts/core/contracts/test/DummyERC721Token/DummyERC721Token.sol (renamed from packages/contracts/contracts/test/DummyERC721Token/DummyERC721Token.sol)0
-rw-r--r--contracts/core/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol (renamed from packages/contracts/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol)28
-rw-r--r--contracts/core/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol (renamed from packages/contracts/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol)0
-rw-r--r--contracts/core/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol (renamed from packages/contracts/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol)0
-rw-r--r--contracts/core/contracts/test/TestConstants/TestConstants.sol (renamed from packages/contracts/contracts/test/TestConstants/TestConstants.sol)0
-rw-r--r--contracts/core/contracts/test/TestExchangeInternals/TestExchangeInternals.sol (renamed from packages/contracts/contracts/test/TestExchangeInternals/TestExchangeInternals.sol)0
-rw-r--r--contracts/core/contracts/test/TestLibBytes/TestLibBytes.sol (renamed from packages/contracts/contracts/test/TestLibBytes/TestLibBytes.sol)0
-rw-r--r--contracts/core/contracts/test/TestLibs/TestLibs.sol (renamed from packages/contracts/contracts/test/TestLibs/TestLibs.sol)0
-rw-r--r--contracts/core/contracts/test/TestSignatureValidator/TestSignatureValidator.sol (renamed from packages/contracts/contracts/test/TestSignatureValidator/TestSignatureValidator.sol)0
-rw-r--r--contracts/core/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol (renamed from packages/contracts/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol)0
-rw-r--r--contracts/core/contracts/tokens/ERC20Token/ERC20Token.sol (renamed from packages/contracts/contracts/tokens/ERC20Token/ERC20Token.sol)0
-rw-r--r--contracts/core/contracts/tokens/ERC20Token/IERC20Token.sol (renamed from packages/contracts/contracts/tokens/ERC20Token/IERC20Token.sol)0
-rw-r--r--contracts/core/contracts/tokens/ERC20Token/MintableERC20Token.sol (renamed from packages/contracts/contracts/tokens/ERC20Token/MintableERC20Token.sol)0
-rw-r--r--contracts/core/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol (renamed from packages/contracts/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol)0
-rw-r--r--contracts/core/contracts/tokens/ERC721Token/ERC721Token.sol (renamed from packages/contracts/contracts/tokens/ERC721Token/ERC721Token.sol)0
-rw-r--r--contracts/core/contracts/tokens/ERC721Token/IERC721Receiver.sol (renamed from packages/contracts/contracts/tokens/ERC721Token/IERC721Receiver.sol)0
-rw-r--r--contracts/core/contracts/tokens/ERC721Token/IERC721Token.sol (renamed from packages/contracts/contracts/tokens/ERC721Token/IERC721Token.sol)0
-rw-r--r--contracts/core/contracts/tokens/ERC721Token/MintableERC721Token.sol (renamed from packages/contracts/contracts/tokens/ERC721Token/MintableERC721Token.sol)0
-rw-r--r--contracts/core/contracts/tokens/EtherToken/IEtherToken.sol (renamed from packages/contracts/contracts/tokens/EtherToken/IEtherToken.sol)0
-rw-r--r--contracts/core/contracts/tokens/EtherToken/WETH9.sol (renamed from packages/contracts/contracts/tokens/EtherToken/WETH9.sol)0
-rw-r--r--contracts/core/contracts/tokens/ZRXToken/ERC20Token_v1.sol (renamed from packages/contracts/contracts/tokens/ZRXToken/ERC20Token_v1.sol)0
-rw-r--r--contracts/core/contracts/tokens/ZRXToken/Token_v1.sol (renamed from packages/contracts/contracts/tokens/ZRXToken/Token_v1.sol)0
-rw-r--r--contracts/core/contracts/tokens/ZRXToken/UnlimitedAllowanceToken_v1.sol (renamed from packages/contracts/contracts/tokens/ZRXToken/UnlimitedAllowanceToken_v1.sol)0
-rw-r--r--contracts/core/contracts/tokens/ZRXToken/ZRXToken.sol (renamed from packages/contracts/contracts/tokens/ZRXToken/ZRXToken.sol)0
-rw-r--r--contracts/core/contracts/utils/LibBytes/LibBytes.sol (renamed from packages/contracts/contracts/utils/LibBytes/LibBytes.sol)0
-rw-r--r--contracts/core/contracts/utils/Ownable/IOwnable.sol (renamed from packages/contracts/contracts/utils/Ownable/IOwnable.sol)0
-rw-r--r--contracts/core/contracts/utils/Ownable/Ownable.sol (renamed from packages/contracts/contracts/utils/Ownable/Ownable.sol)0
-rw-r--r--contracts/core/contracts/utils/ReentrancyGuard/ReentrancyGuard.sol (renamed from packages/contracts/contracts/utils/ReentrancyGuard/ReentrancyGuard.sol)0
-rw-r--r--contracts/core/contracts/utils/SafeMath/SafeMath.sol (renamed from packages/contracts/contracts/utils/SafeMath/SafeMath.sol)0
-rw-r--r--contracts/core/package.json (renamed from packages/contracts/package.json)2
-rw-r--r--contracts/core/src/artifacts/index.ts (renamed from packages/contracts/src/artifacts/index.ts)0
-rw-r--r--contracts/core/src/wrappers/index.ts (renamed from packages/contracts/src/wrappers/index.ts)0
-rw-r--r--contracts/core/test/asset_proxy/authorizable.ts (renamed from packages/contracts/test/asset_proxy/authorizable.ts)0
-rw-r--r--contracts/core/test/asset_proxy/proxies.ts (renamed from packages/contracts/test/asset_proxy/proxies.ts)0
-rw-r--r--contracts/core/test/exchange/core.ts (renamed from packages/contracts/test/exchange/core.ts)0
-rw-r--r--contracts/core/test/exchange/dispatcher.ts (renamed from packages/contracts/test/exchange/dispatcher.ts)0
-rw-r--r--contracts/core/test/exchange/fill_order.ts (renamed from packages/contracts/test/exchange/fill_order.ts)0
-rw-r--r--contracts/core/test/exchange/internal.ts (renamed from packages/contracts/test/exchange/internal.ts)0
-rw-r--r--contracts/core/test/exchange/libs.ts (renamed from packages/contracts/test/exchange/libs.ts)0
-rw-r--r--contracts/core/test/exchange/match_orders.ts (renamed from packages/contracts/test/exchange/match_orders.ts)0
-rw-r--r--contracts/core/test/exchange/signature_validator.ts (renamed from packages/contracts/test/exchange/signature_validator.ts)0
-rw-r--r--contracts/core/test/exchange/transactions.ts (renamed from packages/contracts/test/exchange/transactions.ts)0
-rw-r--r--contracts/core/test/exchange/wrapper.ts (renamed from packages/contracts/test/exchange/wrapper.ts)0
-rw-r--r--contracts/core/test/extensions/forwarder.ts (renamed from packages/contracts/test/extensions/forwarder.ts)0
-rw-r--r--contracts/core/test/extensions/order_validator.ts (renamed from packages/contracts/test/extensions/order_validator.ts)0
-rw-r--r--contracts/core/test/global_hooks.ts (renamed from packages/contracts/test/global_hooks.ts)0
-rw-r--r--contracts/core/test/libraries/lib_bytes.ts (renamed from packages/contracts/test/libraries/lib_bytes.ts)0
-rw-r--r--contracts/core/test/multisig/asset_proxy_owner.ts (renamed from packages/contracts/test/multisig/asset_proxy_owner.ts)0
-rw-r--r--contracts/core/test/multisig/multi_sig_with_time_lock.ts (renamed from packages/contracts/test/multisig/multi_sig_with_time_lock.ts)0
-rw-r--r--contracts/core/test/tokens/erc721_token.ts (renamed from packages/contracts/test/tokens/erc721_token.ts)0
-rw-r--r--contracts/core/test/tokens/unlimited_allowance_token.ts (renamed from packages/contracts/test/tokens/unlimited_allowance_token.ts)0
-rw-r--r--contracts/core/test/tokens/weth9.ts (renamed from packages/contracts/test/tokens/weth9.ts)0
-rw-r--r--contracts/core/test/tokens/zrx_token.ts (renamed from packages/contracts/test/tokens/zrx_token.ts)0
-rw-r--r--contracts/core/test/tutorials/arbitrage.ts (renamed from packages/contracts/test/tutorials/arbitrage.ts)0
-rw-r--r--contracts/core/test/utils/abstract_asset_wrapper.ts (renamed from packages/contracts/test/utils/abstract_asset_wrapper.ts)0
-rw-r--r--contracts/core/test/utils/address_utils.ts (renamed from packages/contracts/test/utils/address_utils.ts)0
-rw-r--r--contracts/core/test/utils/assertions.ts (renamed from packages/contracts/test/utils/assertions.ts)0
-rw-r--r--contracts/core/test/utils/asset_wrapper.ts (renamed from packages/contracts/test/utils/asset_wrapper.ts)0
-rw-r--r--contracts/core/test/utils/block_timestamp.ts (renamed from packages/contracts/test/utils/block_timestamp.ts)0
-rw-r--r--contracts/core/test/utils/chai_setup.ts (renamed from packages/contracts/test/utils/chai_setup.ts)0
-rw-r--r--contracts/core/test/utils/combinatorial_utils.ts (renamed from packages/contracts/test/utils/combinatorial_utils.ts)0
-rw-r--r--contracts/core/test/utils/constants.ts (renamed from packages/contracts/test/utils/constants.ts)0
-rw-r--r--contracts/core/test/utils/coverage.ts (renamed from packages/contracts/test/utils/coverage.ts)0
-rw-r--r--contracts/core/test/utils/erc20_wrapper.ts (renamed from packages/contracts/test/utils/erc20_wrapper.ts)0
-rw-r--r--contracts/core/test/utils/erc721_wrapper.ts (renamed from packages/contracts/test/utils/erc721_wrapper.ts)0
-rw-r--r--contracts/core/test/utils/exchange_wrapper.ts (renamed from packages/contracts/test/utils/exchange_wrapper.ts)0
-rw-r--r--contracts/core/test/utils/fill_order_combinatorial_utils.ts (renamed from packages/contracts/test/utils/fill_order_combinatorial_utils.ts)0
-rw-r--r--contracts/core/test/utils/formatters.ts (renamed from packages/contracts/test/utils/formatters.ts)0
-rw-r--r--contracts/core/test/utils/forwarder_wrapper.ts (renamed from packages/contracts/test/utils/forwarder_wrapper.ts)0
-rw-r--r--contracts/core/test/utils/log_decoder.ts (renamed from packages/contracts/test/utils/log_decoder.ts)0
-rw-r--r--contracts/core/test/utils/match_order_tester.ts (renamed from packages/contracts/test/utils/match_order_tester.ts)0
-rw-r--r--contracts/core/test/utils/multi_sig_wrapper.ts (renamed from packages/contracts/test/utils/multi_sig_wrapper.ts)0
-rw-r--r--contracts/core/test/utils/order_factory.ts (renamed from packages/contracts/test/utils/order_factory.ts)0
-rw-r--r--contracts/core/test/utils/order_factory_from_scenario.ts (renamed from packages/contracts/test/utils/order_factory_from_scenario.ts)0
-rw-r--r--contracts/core/test/utils/order_utils.ts (renamed from packages/contracts/test/utils/order_utils.ts)0
-rw-r--r--contracts/core/test/utils/profiler.ts (renamed from packages/contracts/test/utils/profiler.ts)0
-rw-r--r--contracts/core/test/utils/revert_trace.ts (renamed from packages/contracts/test/utils/revert_trace.ts)0
-rw-r--r--contracts/core/test/utils/signing_utils.ts (renamed from packages/contracts/test/utils/signing_utils.ts)0
-rw-r--r--contracts/core/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts (renamed from packages/contracts/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts)0
-rw-r--r--contracts/core/test/utils/simple_order_filled_cancelled_fetcher.ts (renamed from packages/contracts/test/utils/simple_order_filled_cancelled_fetcher.ts)0
-rw-r--r--contracts/core/test/utils/test_with_reference.ts (renamed from packages/contracts/test/utils/test_with_reference.ts)0
-rw-r--r--contracts/core/test/utils/transaction_factory.ts (renamed from packages/contracts/test/utils/transaction_factory.ts)0
-rw-r--r--contracts/core/test/utils/type_encoding_utils.ts (renamed from packages/contracts/test/utils/type_encoding_utils.ts)0
-rw-r--r--contracts/core/test/utils/types.ts (renamed from packages/contracts/test/utils/types.ts)0
-rw-r--r--contracts/core/test/utils/web3_wrapper.ts (renamed from packages/contracts/test/utils/web3_wrapper.ts)0
-rw-r--r--contracts/core/test/utils_test/test_with_reference.ts (renamed from packages/contracts/test/utils_test/test_with_reference.ts)0
-rw-r--r--contracts/core/tsconfig.json (renamed from packages/contracts/tsconfig.json)0
-rw-r--r--contracts/core/tslint.json (renamed from packages/contracts/tslint.json)0
-rw-r--r--lerna.json2
-rw-r--r--package.json3
-rw-r--r--packages/website/md/docs/smart_contracts/1/introduction.md2
-rw-r--r--packages/website/md/docs/smart_contracts/2/introduction.md2
-rw-r--r--tsconfig.json2
-rw-r--r--yarn.lock377
167 files changed, 263 insertions, 167 deletions
diff --git a/.gitignore b/.gitignore
index 9e43f20b0..0e483dc0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,13 +79,13 @@ packages/react-docs/example/public/bundle*
packages/testnet-faucets/server/
# generated contract artifacts/
-packages/contracts/generated-artifacts/
+contracts/core/generated-artifacts/
packages/sol-cov/test/fixtures/artifacts/
packages/metacoin/artifacts/
# generated contract wrappers
packages/abi-gen-wrappers/wrappers
-packages/contracts/generated-wrappers/
+contracts/core/generated-wrappers/
packages/metacoin/src/contract_wrappers
# solc-bin in sol-compiler
diff --git a/.prettierignore b/.prettierignore
index db389bdb9..9dbb83e27 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,7 +1,7 @@
lib
.nyc_output
-/packages/contracts/generated-wrappers
-/packages/contracts/generated-artifacts
+/contracts/core/generated-wrappers
+/contracts/core/generated-artifacts
/packages/abi-gen-wrappers/src/generated-wrappers
/packages/contract-artifacts/artifacts
/python-packages/order_utils/src/zero_ex/contract_artifacts/artifacts
diff --git a/CODEOWNERS b/CODEOWNERS
index 3cf75fb2d..346e42ac0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -32,4 +32,4 @@ packages/web3-wrapper/ @LogvinovLeon @fabioberger
python-packages/ @feuGeneA
# Protocol/smart contracts
-packages/contracts/test/ @albrow
+contracts/core/test/ @albrow
diff --git a/README.md b/README.md
index 421299371..5e99b4788 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr
| Package | Description |
| -------------------------------------------------- | ---------------------------------------------------------------- |
-| [`@0x/contracts`](/packages/contracts) | 0x protocol solidity smart contracts & tests |
+| [`@0x/contracts`](/contracts/core) | 0x protocol solidity smart contracts & tests |
| [`@0x/testnet-faucets`](/packages/testnet-faucets) | A faucet micro-service that dispenses test ERC20 tokens or Ether |
| [`@0x/website`](/packages/website) | 0x website |
diff --git a/packages/contracts/.solhint.json b/contracts/core/.solhint.json
index 076afe9f3..076afe9f3 100644
--- a/packages/contracts/.solhint.json
+++ b/contracts/core/.solhint.json
diff --git a/packages/contracts/.solhintignore b/contracts/core/.solhintignore
index 1e33ec53b..1e33ec53b 100644
--- a/packages/contracts/.solhintignore
+++ b/contracts/core/.solhintignore
diff --git a/packages/contracts/CHANGELOG.json b/contracts/core/CHANGELOG.json
index 7dfa06990..7dfa06990 100644
--- a/packages/contracts/CHANGELOG.json
+++ b/contracts/core/CHANGELOG.json
diff --git a/packages/contracts/README.md b/contracts/core/README.md
index 97a2816ff..97a2816ff 100644
--- a/packages/contracts/README.md
+++ b/contracts/core/README.md
diff --git a/packages/contracts/compiler.json b/contracts/core/compiler.json
index c824e4645..c824e4645 100644
--- a/packages/contracts/compiler.json
+++ b/contracts/core/compiler.json
diff --git a/packages/contracts/contracts/examples/ExchangeWrapper/ExchangeWrapper.sol b/contracts/core/contracts/examples/ExchangeWrapper/ExchangeWrapper.sol
index 2fa0e3c5e..2fa0e3c5e 100644
--- a/packages/contracts/contracts/examples/ExchangeWrapper/ExchangeWrapper.sol
+++ b/contracts/core/contracts/examples/ExchangeWrapper/ExchangeWrapper.sol
diff --git a/packages/contracts/contracts/examples/Validator/Validator.sol b/contracts/core/contracts/examples/Validator/Validator.sol
index 72ed528ba..72ed528ba 100644
--- a/packages/contracts/contracts/examples/Validator/Validator.sol
+++ b/contracts/core/contracts/examples/Validator/Validator.sol
diff --git a/packages/contracts/contracts/examples/Wallet/Wallet.sol b/contracts/core/contracts/examples/Wallet/Wallet.sol
index b75021a31..b75021a31 100644
--- a/packages/contracts/contracts/examples/Wallet/Wallet.sol
+++ b/contracts/core/contracts/examples/Wallet/Wallet.sol
diff --git a/packages/contracts/contracts/examples/Whitelist/Whitelist.sol b/contracts/core/contracts/examples/Whitelist/Whitelist.sol
index e4e25038c..e4e25038c 100644
--- a/packages/contracts/contracts/examples/Whitelist/Whitelist.sol
+++ b/contracts/core/contracts/examples/Whitelist/Whitelist.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/Forwarder.sol b/contracts/core/contracts/extensions/Forwarder/Forwarder.sol
index 94dec40ed..94dec40ed 100644
--- a/packages/contracts/contracts/extensions/Forwarder/Forwarder.sol
+++ b/contracts/core/contracts/extensions/Forwarder/Forwarder.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/MixinAssets.sol b/contracts/core/contracts/extensions/Forwarder/MixinAssets.sol
index 43efb5ff3..43efb5ff3 100644
--- a/packages/contracts/contracts/extensions/Forwarder/MixinAssets.sol
+++ b/contracts/core/contracts/extensions/Forwarder/MixinAssets.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/MixinExchangeWrapper.sol b/contracts/core/contracts/extensions/Forwarder/MixinExchangeWrapper.sol
index 4991c0ea5..4991c0ea5 100644
--- a/packages/contracts/contracts/extensions/Forwarder/MixinExchangeWrapper.sol
+++ b/contracts/core/contracts/extensions/Forwarder/MixinExchangeWrapper.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/MixinForwarderCore.sol b/contracts/core/contracts/extensions/Forwarder/MixinForwarderCore.sol
index 54487f726..54487f726 100644
--- a/packages/contracts/contracts/extensions/Forwarder/MixinForwarderCore.sol
+++ b/contracts/core/contracts/extensions/Forwarder/MixinForwarderCore.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/MixinWeth.sol b/contracts/core/contracts/extensions/Forwarder/MixinWeth.sol
index d2814a49b..d2814a49b 100644
--- a/packages/contracts/contracts/extensions/Forwarder/MixinWeth.sol
+++ b/contracts/core/contracts/extensions/Forwarder/MixinWeth.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/interfaces/IAssets.sol b/contracts/core/contracts/extensions/Forwarder/interfaces/IAssets.sol
index 1e034c003..1e034c003 100644
--- a/packages/contracts/contracts/extensions/Forwarder/interfaces/IAssets.sol
+++ b/contracts/core/contracts/extensions/Forwarder/interfaces/IAssets.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/interfaces/IForwarder.sol b/contracts/core/contracts/extensions/Forwarder/interfaces/IForwarder.sol
index f5a26e2ba..f5a26e2ba 100644
--- a/packages/contracts/contracts/extensions/Forwarder/interfaces/IForwarder.sol
+++ b/contracts/core/contracts/extensions/Forwarder/interfaces/IForwarder.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/interfaces/IForwarderCore.sol b/contracts/core/contracts/extensions/Forwarder/interfaces/IForwarderCore.sol
index 74c7da01d..74c7da01d 100644
--- a/packages/contracts/contracts/extensions/Forwarder/interfaces/IForwarderCore.sol
+++ b/contracts/core/contracts/extensions/Forwarder/interfaces/IForwarderCore.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/libs/LibConstants.sol b/contracts/core/contracts/extensions/Forwarder/libs/LibConstants.sol
index 704e42ce3..704e42ce3 100644
--- a/packages/contracts/contracts/extensions/Forwarder/libs/LibConstants.sol
+++ b/contracts/core/contracts/extensions/Forwarder/libs/LibConstants.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/libs/LibForwarderErrors.sol b/contracts/core/contracts/extensions/Forwarder/libs/LibForwarderErrors.sol
index fb3ade1db..fb3ade1db 100644
--- a/packages/contracts/contracts/extensions/Forwarder/libs/LibForwarderErrors.sol
+++ b/contracts/core/contracts/extensions/Forwarder/libs/LibForwarderErrors.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/mixins/MAssets.sol b/contracts/core/contracts/extensions/Forwarder/mixins/MAssets.sol
index 9e7f80d97..9e7f80d97 100644
--- a/packages/contracts/contracts/extensions/Forwarder/mixins/MAssets.sol
+++ b/contracts/core/contracts/extensions/Forwarder/mixins/MAssets.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/mixins/MExchangeWrapper.sol b/contracts/core/contracts/extensions/Forwarder/mixins/MExchangeWrapper.sol
index 13c26b03a..13c26b03a 100644
--- a/packages/contracts/contracts/extensions/Forwarder/mixins/MExchangeWrapper.sol
+++ b/contracts/core/contracts/extensions/Forwarder/mixins/MExchangeWrapper.sol
diff --git a/packages/contracts/contracts/extensions/Forwarder/mixins/MWeth.sol b/contracts/core/contracts/extensions/Forwarder/mixins/MWeth.sol
index 88e77be4e..88e77be4e 100644
--- a/packages/contracts/contracts/extensions/Forwarder/mixins/MWeth.sol
+++ b/contracts/core/contracts/extensions/Forwarder/mixins/MWeth.sol
diff --git a/packages/contracts/contracts/extensions/OrderValidator/OrderValidator.sol b/contracts/core/contracts/extensions/OrderValidator/OrderValidator.sol
index 3385d35ef..3385d35ef 100644
--- a/packages/contracts/contracts/extensions/OrderValidator/OrderValidator.sol
+++ b/contracts/core/contracts/extensions/OrderValidator/OrderValidator.sol
diff --git a/packages/contracts/contracts/multisig/MultiSigWallet.sol b/contracts/core/contracts/multisig/MultiSigWallet.sol
index 516e7391c..516e7391c 100644
--- a/packages/contracts/contracts/multisig/MultiSigWallet.sol
+++ b/contracts/core/contracts/multisig/MultiSigWallet.sol
diff --git a/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLock.sol b/contracts/core/contracts/multisig/MultiSigWalletWithTimeLock.sol
index 9513d3b30..9513d3b30 100644
--- a/packages/contracts/contracts/multisig/MultiSigWalletWithTimeLock.sol
+++ b/contracts/core/contracts/multisig/MultiSigWalletWithTimeLock.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxy/ERC20Proxy.sol b/contracts/core/contracts/protocol/AssetProxy/ERC20Proxy.sol
index 258443bca..258443bca 100644
--- a/packages/contracts/contracts/protocol/AssetProxy/ERC20Proxy.sol
+++ b/contracts/core/contracts/protocol/AssetProxy/ERC20Proxy.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxy/ERC721Proxy.sol b/contracts/core/contracts/protocol/AssetProxy/ERC721Proxy.sol
index 65b664b8b..65b664b8b 100644
--- a/packages/contracts/contracts/protocol/AssetProxy/ERC721Proxy.sol
+++ b/contracts/core/contracts/protocol/AssetProxy/ERC721Proxy.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxy/MixinAuthorizable.sol b/contracts/core/contracts/protocol/AssetProxy/MixinAuthorizable.sol
index fe9bbf848..fe9bbf848 100644
--- a/packages/contracts/contracts/protocol/AssetProxy/MixinAuthorizable.sol
+++ b/contracts/core/contracts/protocol/AssetProxy/MixinAuthorizable.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxy/MultiAssetProxy.sol b/contracts/core/contracts/protocol/AssetProxy/MultiAssetProxy.sol
index 42231e73b..42231e73b 100644
--- a/packages/contracts/contracts/protocol/AssetProxy/MultiAssetProxy.sol
+++ b/contracts/core/contracts/protocol/AssetProxy/MultiAssetProxy.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxy/interfaces/IAssetData.sol b/contracts/core/contracts/protocol/AssetProxy/interfaces/IAssetData.sol
index e2da68919..e2da68919 100644
--- a/packages/contracts/contracts/protocol/AssetProxy/interfaces/IAssetData.sol
+++ b/contracts/core/contracts/protocol/AssetProxy/interfaces/IAssetData.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxy/interfaces/IAssetProxy.sol b/contracts/core/contracts/protocol/AssetProxy/interfaces/IAssetProxy.sol
index b25d2d75a..b25d2d75a 100644
--- a/packages/contracts/contracts/protocol/AssetProxy/interfaces/IAssetProxy.sol
+++ b/contracts/core/contracts/protocol/AssetProxy/interfaces/IAssetProxy.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxy/interfaces/IAuthorizable.sol b/contracts/core/contracts/protocol/AssetProxy/interfaces/IAuthorizable.sol
index ba1d4aa77..ba1d4aa77 100644
--- a/packages/contracts/contracts/protocol/AssetProxy/interfaces/IAuthorizable.sol
+++ b/contracts/core/contracts/protocol/AssetProxy/interfaces/IAuthorizable.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxy/libs/LibAssetProxyErrors.sol b/contracts/core/contracts/protocol/AssetProxy/libs/LibAssetProxyErrors.sol
index 1d9a70cc1..1d9a70cc1 100644
--- a/packages/contracts/contracts/protocol/AssetProxy/libs/LibAssetProxyErrors.sol
+++ b/contracts/core/contracts/protocol/AssetProxy/libs/LibAssetProxyErrors.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol b/contracts/core/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol
index d63fb7f6d..d63fb7f6d 100644
--- a/packages/contracts/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol
+++ b/contracts/core/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol
diff --git a/packages/contracts/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol b/contracts/core/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol
index edb788fab..edb788fab 100644
--- a/packages/contracts/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol
+++ b/contracts/core/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/Exchange.sol b/contracts/core/contracts/protocol/Exchange/Exchange.sol
index ead36009f..ead36009f 100644
--- a/packages/contracts/contracts/protocol/Exchange/Exchange.sol
+++ b/contracts/core/contracts/protocol/Exchange/Exchange.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol b/contracts/core/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol
index 87b09b6b3..87b09b6b3 100644
--- a/packages/contracts/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol
+++ b/contracts/core/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/MixinExchangeCore.sol b/contracts/core/contracts/protocol/Exchange/MixinExchangeCore.sol
index 736dcd0b1..736dcd0b1 100644
--- a/packages/contracts/contracts/protocol/Exchange/MixinExchangeCore.sol
+++ b/contracts/core/contracts/protocol/Exchange/MixinExchangeCore.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/MixinMatchOrders.sol b/contracts/core/contracts/protocol/Exchange/MixinMatchOrders.sol
index b4f6bdb26..b4f6bdb26 100644
--- a/packages/contracts/contracts/protocol/Exchange/MixinMatchOrders.sol
+++ b/contracts/core/contracts/protocol/Exchange/MixinMatchOrders.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/MixinSignatureValidator.sol b/contracts/core/contracts/protocol/Exchange/MixinSignatureValidator.sol
index 176e28351..176e28351 100644
--- a/packages/contracts/contracts/protocol/Exchange/MixinSignatureValidator.sol
+++ b/contracts/core/contracts/protocol/Exchange/MixinSignatureValidator.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/MixinTransactions.sol b/contracts/core/contracts/protocol/Exchange/MixinTransactions.sol
index 3a76ca202..3a76ca202 100644
--- a/packages/contracts/contracts/protocol/Exchange/MixinTransactions.sol
+++ b/contracts/core/contracts/protocol/Exchange/MixinTransactions.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/MixinWrapperFunctions.sol b/contracts/core/contracts/protocol/Exchange/MixinWrapperFunctions.sol
index cddff0e5f..cddff0e5f 100644
--- a/packages/contracts/contracts/protocol/Exchange/MixinWrapperFunctions.sol
+++ b/contracts/core/contracts/protocol/Exchange/MixinWrapperFunctions.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/interfaces/IAssetProxyDispatcher.sol b/contracts/core/contracts/protocol/Exchange/interfaces/IAssetProxyDispatcher.sol
index 8db8d6f6c..8db8d6f6c 100644
--- a/packages/contracts/contracts/protocol/Exchange/interfaces/IAssetProxyDispatcher.sol
+++ b/contracts/core/contracts/protocol/Exchange/interfaces/IAssetProxyDispatcher.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/interfaces/IExchange.sol b/contracts/core/contracts/protocol/Exchange/interfaces/IExchange.sol
index b92abba04..b92abba04 100644
--- a/packages/contracts/contracts/protocol/Exchange/interfaces/IExchange.sol
+++ b/contracts/core/contracts/protocol/Exchange/interfaces/IExchange.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/interfaces/IExchangeCore.sol b/contracts/core/contracts/protocol/Exchange/interfaces/IExchangeCore.sol
index 9995e0385..9995e0385 100644
--- a/packages/contracts/contracts/protocol/Exchange/interfaces/IExchangeCore.sol
+++ b/contracts/core/contracts/protocol/Exchange/interfaces/IExchangeCore.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/interfaces/IMatchOrders.sol b/contracts/core/contracts/protocol/Exchange/interfaces/IMatchOrders.sol
index 73447f3ae..73447f3ae 100644
--- a/packages/contracts/contracts/protocol/Exchange/interfaces/IMatchOrders.sol
+++ b/contracts/core/contracts/protocol/Exchange/interfaces/IMatchOrders.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/interfaces/ISignatureValidator.sol b/contracts/core/contracts/protocol/Exchange/interfaces/ISignatureValidator.sol
index 1fd0eccf0..1fd0eccf0 100644
--- a/packages/contracts/contracts/protocol/Exchange/interfaces/ISignatureValidator.sol
+++ b/contracts/core/contracts/protocol/Exchange/interfaces/ISignatureValidator.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/interfaces/ITransactions.sol b/contracts/core/contracts/protocol/Exchange/interfaces/ITransactions.sol
index 4446c55ce..4446c55ce 100644
--- a/packages/contracts/contracts/protocol/Exchange/interfaces/ITransactions.sol
+++ b/contracts/core/contracts/protocol/Exchange/interfaces/ITransactions.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/interfaces/IValidator.sol b/contracts/core/contracts/protocol/Exchange/interfaces/IValidator.sol
index 2dd69100c..2dd69100c 100644
--- a/packages/contracts/contracts/protocol/Exchange/interfaces/IValidator.sol
+++ b/contracts/core/contracts/protocol/Exchange/interfaces/IValidator.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/interfaces/IWallet.sol b/contracts/core/contracts/protocol/Exchange/interfaces/IWallet.sol
index c97161ca6..c97161ca6 100644
--- a/packages/contracts/contracts/protocol/Exchange/interfaces/IWallet.sol
+++ b/contracts/core/contracts/protocol/Exchange/interfaces/IWallet.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/interfaces/IWrapperFunctions.sol b/contracts/core/contracts/protocol/Exchange/interfaces/IWrapperFunctions.sol
index 56a533646..56a533646 100644
--- a/packages/contracts/contracts/protocol/Exchange/interfaces/IWrapperFunctions.sol
+++ b/contracts/core/contracts/protocol/Exchange/interfaces/IWrapperFunctions.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/libs/LibAbiEncoder.sol b/contracts/core/contracts/protocol/Exchange/libs/LibAbiEncoder.sol
index 4aad37709..4aad37709 100644
--- a/packages/contracts/contracts/protocol/Exchange/libs/LibAbiEncoder.sol
+++ b/contracts/core/contracts/protocol/Exchange/libs/LibAbiEncoder.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/libs/LibConstants.sol b/contracts/core/contracts/protocol/Exchange/libs/LibConstants.sol
index 8d2732cd3..8d2732cd3 100644
--- a/packages/contracts/contracts/protocol/Exchange/libs/LibConstants.sol
+++ b/contracts/core/contracts/protocol/Exchange/libs/LibConstants.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/libs/LibEIP712.sol b/contracts/core/contracts/protocol/Exchange/libs/LibEIP712.sol
index 203edc1fd..203edc1fd 100644
--- a/packages/contracts/contracts/protocol/Exchange/libs/LibEIP712.sol
+++ b/contracts/core/contracts/protocol/Exchange/libs/LibEIP712.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/libs/LibExchangeErrors.sol b/contracts/core/contracts/protocol/Exchange/libs/LibExchangeErrors.sol
index a0f75bc06..a0f75bc06 100644
--- a/packages/contracts/contracts/protocol/Exchange/libs/LibExchangeErrors.sol
+++ b/contracts/core/contracts/protocol/Exchange/libs/LibExchangeErrors.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/libs/LibFillResults.sol b/contracts/core/contracts/protocol/Exchange/libs/LibFillResults.sol
index 659ae9a69..659ae9a69 100644
--- a/packages/contracts/contracts/protocol/Exchange/libs/LibFillResults.sol
+++ b/contracts/core/contracts/protocol/Exchange/libs/LibFillResults.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/libs/LibMath.sol b/contracts/core/contracts/protocol/Exchange/libs/LibMath.sol
index c0b85ea10..c0b85ea10 100644
--- a/packages/contracts/contracts/protocol/Exchange/libs/LibMath.sol
+++ b/contracts/core/contracts/protocol/Exchange/libs/LibMath.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/libs/LibOrder.sol b/contracts/core/contracts/protocol/Exchange/libs/LibOrder.sol
index 0fe7c2161..0fe7c2161 100644
--- a/packages/contracts/contracts/protocol/Exchange/libs/LibOrder.sol
+++ b/contracts/core/contracts/protocol/Exchange/libs/LibOrder.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol b/contracts/core/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
index 0ddfca270..0ddfca270 100644
--- a/packages/contracts/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
+++ b/contracts/core/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/mixins/MExchangeCore.sol b/contracts/core/contracts/protocol/Exchange/mixins/MExchangeCore.sol
index 742499568..742499568 100644
--- a/packages/contracts/contracts/protocol/Exchange/mixins/MExchangeCore.sol
+++ b/contracts/core/contracts/protocol/Exchange/mixins/MExchangeCore.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/mixins/MMatchOrders.sol b/contracts/core/contracts/protocol/Exchange/mixins/MMatchOrders.sol
index 96fa34bc0..96fa34bc0 100644
--- a/packages/contracts/contracts/protocol/Exchange/mixins/MMatchOrders.sol
+++ b/contracts/core/contracts/protocol/Exchange/mixins/MMatchOrders.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/mixins/MSignatureValidator.sol b/contracts/core/contracts/protocol/Exchange/mixins/MSignatureValidator.sol
index 1fe88b908..1fe88b908 100644
--- a/packages/contracts/contracts/protocol/Exchange/mixins/MSignatureValidator.sol
+++ b/contracts/core/contracts/protocol/Exchange/mixins/MSignatureValidator.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/mixins/MTransactions.sol b/contracts/core/contracts/protocol/Exchange/mixins/MTransactions.sol
index 4f61a4945..4f61a4945 100644
--- a/packages/contracts/contracts/protocol/Exchange/mixins/MTransactions.sol
+++ b/contracts/core/contracts/protocol/Exchange/mixins/MTransactions.sol
diff --git a/packages/contracts/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol b/contracts/core/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol
index 4adfbde01..4adfbde01 100644
--- a/packages/contracts/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol
+++ b/contracts/core/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol
diff --git a/packages/contracts/contracts/test/DummyERC20Token/DummyERC20Token.sol b/contracts/core/contracts/test/DummyERC20Token/DummyERC20Token.sol
index 412c5d1ad..412c5d1ad 100644
--- a/packages/contracts/contracts/test/DummyERC20Token/DummyERC20Token.sol
+++ b/contracts/core/contracts/test/DummyERC20Token/DummyERC20Token.sol
diff --git a/packages/contracts/contracts/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol b/contracts/core/contracts/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol
index 733d4437e..733d4437e 100644
--- a/packages/contracts/contracts/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol
+++ b/contracts/core/contracts/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol
diff --git a/packages/contracts/contracts/test/DummyERC20Token/DummyNoReturnERC20Token.sol b/contracts/core/contracts/test/DummyERC20Token/DummyNoReturnERC20Token.sol
index e16825a16..e16825a16 100644
--- a/packages/contracts/contracts/test/DummyERC20Token/DummyNoReturnERC20Token.sol
+++ b/contracts/core/contracts/test/DummyERC20Token/DummyNoReturnERC20Token.sol
diff --git a/packages/contracts/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol b/contracts/core/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol
index 6c8371559..6c8371559 100644
--- a/packages/contracts/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol
+++ b/contracts/core/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol
diff --git a/packages/contracts/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol b/contracts/core/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol
index 309633bf5..309633bf5 100644
--- a/packages/contracts/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol
+++ b/contracts/core/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol
diff --git a/packages/contracts/contracts/test/DummyERC721Token/DummyERC721Token.sol b/contracts/core/contracts/test/DummyERC721Token/DummyERC721Token.sol
index ac9068d1d..ac9068d1d 100644
--- a/packages/contracts/contracts/test/DummyERC721Token/DummyERC721Token.sol
+++ b/contracts/core/contracts/test/DummyERC721Token/DummyERC721Token.sol
diff --git a/packages/contracts/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol b/contracts/core/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
index 99dd47a78..aa3bf9ab8 100644
--- a/packages/contracts/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
+++ b/contracts/core/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
@@ -92,53 +92,53 @@ contract ReentrantERC20Token is
LibOrder.Order[] memory orders;
uint256[] memory takerAssetFillAmounts;
bytes[] memory signatures;
- bytes memory calldata;
+ bytes memory callData;
- // Create calldata for function that corresponds to currentFunctionId
+ // Create callData for function that corresponds to currentFunctionId
if (currentFunctionId == uint8(ExchangeFunction.FILL_ORDER)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.fillOrder.selector,
order,
0,
signature
);
} else if (currentFunctionId == uint8(ExchangeFunction.FILL_OR_KILL_ORDER)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.fillOrKillOrder.selector,
order,
0,
signature
);
} else if (currentFunctionId == uint8(ExchangeFunction.BATCH_FILL_ORDERS)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.batchFillOrders.selector,
orders,
takerAssetFillAmounts,
signatures
);
} else if (currentFunctionId == uint8(ExchangeFunction.BATCH_FILL_OR_KILL_ORDERS)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.batchFillOrKillOrders.selector,
orders,
takerAssetFillAmounts,
signatures
);
} else if (currentFunctionId == uint8(ExchangeFunction.MARKET_BUY_ORDERS)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.marketBuyOrders.selector,
orders,
0,
signatures
);
} else if (currentFunctionId == uint8(ExchangeFunction.MARKET_SELL_ORDERS)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.marketSellOrders.selector,
orders,
0,
signatures
);
} else if (currentFunctionId == uint8(ExchangeFunction.MATCH_ORDERS)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.matchOrders.selector,
order,
order,
@@ -146,22 +146,22 @@ contract ReentrantERC20Token is
signature
);
} else if (currentFunctionId == uint8(ExchangeFunction.CANCEL_ORDER)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.cancelOrder.selector,
order
);
} else if (currentFunctionId == uint8(ExchangeFunction.BATCH_CANCEL_ORDERS)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.batchCancelOrders.selector,
orders
);
} else if (currentFunctionId == uint8(ExchangeFunction.CANCEL_ORDERS_UP_TO)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.cancelOrdersUpTo.selector,
0
);
} else if (currentFunctionId == uint8(ExchangeFunction.SET_SIGNATURE_VALIDATOR_APPROVAL)) {
- calldata = abi.encodeWithSelector(
+ callData = abi.encodeWithSelector(
EXCHANGE.setSignatureValidatorApproval.selector,
address(0),
false
@@ -169,7 +169,7 @@ contract ReentrantERC20Token is
}
// Call Exchange function, swallow error
- address(EXCHANGE).call(calldata);
+ address(EXCHANGE).call(callData);
// Revert reason is 100 bytes
bytes memory returnData = new bytes(100);
diff --git a/packages/contracts/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol b/contracts/core/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
index ad71fc9a1..ad71fc9a1 100644
--- a/packages/contracts/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
+++ b/contracts/core/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
diff --git a/packages/contracts/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol b/contracts/core/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol
index 52c66cb56..52c66cb56 100644
--- a/packages/contracts/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol
+++ b/contracts/core/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol
diff --git a/packages/contracts/contracts/test/TestConstants/TestConstants.sol b/contracts/core/contracts/test/TestConstants/TestConstants.sol
index 1275d007b..1275d007b 100644
--- a/packages/contracts/contracts/test/TestConstants/TestConstants.sol
+++ b/contracts/core/contracts/test/TestConstants/TestConstants.sol
diff --git a/packages/contracts/contracts/test/TestExchangeInternals/TestExchangeInternals.sol b/contracts/core/contracts/test/TestExchangeInternals/TestExchangeInternals.sol
index 27187f8f8..27187f8f8 100644
--- a/packages/contracts/contracts/test/TestExchangeInternals/TestExchangeInternals.sol
+++ b/contracts/core/contracts/test/TestExchangeInternals/TestExchangeInternals.sol
diff --git a/packages/contracts/contracts/test/TestLibBytes/TestLibBytes.sol b/contracts/core/contracts/test/TestLibBytes/TestLibBytes.sol
index 00d861e61..00d861e61 100644
--- a/packages/contracts/contracts/test/TestLibBytes/TestLibBytes.sol
+++ b/contracts/core/contracts/test/TestLibBytes/TestLibBytes.sol
diff --git a/packages/contracts/contracts/test/TestLibs/TestLibs.sol b/contracts/core/contracts/test/TestLibs/TestLibs.sol
index a10f981fc..a10f981fc 100644
--- a/packages/contracts/contracts/test/TestLibs/TestLibs.sol
+++ b/contracts/core/contracts/test/TestLibs/TestLibs.sol
diff --git a/packages/contracts/contracts/test/TestSignatureValidator/TestSignatureValidator.sol b/contracts/core/contracts/test/TestSignatureValidator/TestSignatureValidator.sol
index ea3e2de59..ea3e2de59 100644
--- a/packages/contracts/contracts/test/TestSignatureValidator/TestSignatureValidator.sol
+++ b/contracts/core/contracts/test/TestSignatureValidator/TestSignatureValidator.sol
diff --git a/packages/contracts/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol b/contracts/core/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol
index 41aab01c8..41aab01c8 100644
--- a/packages/contracts/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol
+++ b/contracts/core/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol
diff --git a/packages/contracts/contracts/tokens/ERC20Token/ERC20Token.sol b/contracts/core/contracts/tokens/ERC20Token/ERC20Token.sol
index 725d304df..725d304df 100644
--- a/packages/contracts/contracts/tokens/ERC20Token/ERC20Token.sol
+++ b/contracts/core/contracts/tokens/ERC20Token/ERC20Token.sol
diff --git a/packages/contracts/contracts/tokens/ERC20Token/IERC20Token.sol b/contracts/core/contracts/tokens/ERC20Token/IERC20Token.sol
index 258d47393..258d47393 100644
--- a/packages/contracts/contracts/tokens/ERC20Token/IERC20Token.sol
+++ b/contracts/core/contracts/tokens/ERC20Token/IERC20Token.sol
diff --git a/packages/contracts/contracts/tokens/ERC20Token/MintableERC20Token.sol b/contracts/core/contracts/tokens/ERC20Token/MintableERC20Token.sol
index 9dc924422..9dc924422 100644
--- a/packages/contracts/contracts/tokens/ERC20Token/MintableERC20Token.sol
+++ b/contracts/core/contracts/tokens/ERC20Token/MintableERC20Token.sol
diff --git a/packages/contracts/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol b/contracts/core/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol
index 2e5bd4348..2e5bd4348 100644
--- a/packages/contracts/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol
+++ b/contracts/core/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol
diff --git a/packages/contracts/contracts/tokens/ERC721Token/ERC721Token.sol b/contracts/core/contracts/tokens/ERC721Token/ERC721Token.sol
index 530f080c0..530f080c0 100644
--- a/packages/contracts/contracts/tokens/ERC721Token/ERC721Token.sol
+++ b/contracts/core/contracts/tokens/ERC721Token/ERC721Token.sol
diff --git a/packages/contracts/contracts/tokens/ERC721Token/IERC721Receiver.sol b/contracts/core/contracts/tokens/ERC721Token/IERC721Receiver.sol
index 8e0e32ab2..8e0e32ab2 100644
--- a/packages/contracts/contracts/tokens/ERC721Token/IERC721Receiver.sol
+++ b/contracts/core/contracts/tokens/ERC721Token/IERC721Receiver.sol
diff --git a/packages/contracts/contracts/tokens/ERC721Token/IERC721Token.sol b/contracts/core/contracts/tokens/ERC721Token/IERC721Token.sol
index ac992c80d..ac992c80d 100644
--- a/packages/contracts/contracts/tokens/ERC721Token/IERC721Token.sol
+++ b/contracts/core/contracts/tokens/ERC721Token/IERC721Token.sol
diff --git a/packages/contracts/contracts/tokens/ERC721Token/MintableERC721Token.sol b/contracts/core/contracts/tokens/ERC721Token/MintableERC721Token.sol
index bc5cd2cc2..bc5cd2cc2 100644
--- a/packages/contracts/contracts/tokens/ERC721Token/MintableERC721Token.sol
+++ b/contracts/core/contracts/tokens/ERC721Token/MintableERC721Token.sol
diff --git a/packages/contracts/contracts/tokens/EtherToken/IEtherToken.sol b/contracts/core/contracts/tokens/EtherToken/IEtherToken.sol
index 9e2e68766..9e2e68766 100644
--- a/packages/contracts/contracts/tokens/EtherToken/IEtherToken.sol
+++ b/contracts/core/contracts/tokens/EtherToken/IEtherToken.sol
diff --git a/packages/contracts/contracts/tokens/EtherToken/WETH9.sol b/contracts/core/contracts/tokens/EtherToken/WETH9.sol
index 17876b86d..17876b86d 100644
--- a/packages/contracts/contracts/tokens/EtherToken/WETH9.sol
+++ b/contracts/core/contracts/tokens/EtherToken/WETH9.sol
diff --git a/packages/contracts/contracts/tokens/ZRXToken/ERC20Token_v1.sol b/contracts/core/contracts/tokens/ZRXToken/ERC20Token_v1.sol
index 4920c4aac..4920c4aac 100644
--- a/packages/contracts/contracts/tokens/ZRXToken/ERC20Token_v1.sol
+++ b/contracts/core/contracts/tokens/ZRXToken/ERC20Token_v1.sol
diff --git a/packages/contracts/contracts/tokens/ZRXToken/Token_v1.sol b/contracts/core/contracts/tokens/ZRXToken/Token_v1.sol
index de619fb7e..de619fb7e 100644
--- a/packages/contracts/contracts/tokens/ZRXToken/Token_v1.sol
+++ b/contracts/core/contracts/tokens/ZRXToken/Token_v1.sol
diff --git a/packages/contracts/contracts/tokens/ZRXToken/UnlimitedAllowanceToken_v1.sol b/contracts/core/contracts/tokens/ZRXToken/UnlimitedAllowanceToken_v1.sol
index bf1b0335a..bf1b0335a 100644
--- a/packages/contracts/contracts/tokens/ZRXToken/UnlimitedAllowanceToken_v1.sol
+++ b/contracts/core/contracts/tokens/ZRXToken/UnlimitedAllowanceToken_v1.sol
diff --git a/packages/contracts/contracts/tokens/ZRXToken/ZRXToken.sol b/contracts/core/contracts/tokens/ZRXToken/ZRXToken.sol
index 831e1822c..831e1822c 100644
--- a/packages/contracts/contracts/tokens/ZRXToken/ZRXToken.sol
+++ b/contracts/core/contracts/tokens/ZRXToken/ZRXToken.sol
diff --git a/packages/contracts/contracts/utils/LibBytes/LibBytes.sol b/contracts/core/contracts/utils/LibBytes/LibBytes.sol
index 369f588ad..369f588ad 100644
--- a/packages/contracts/contracts/utils/LibBytes/LibBytes.sol
+++ b/contracts/core/contracts/utils/LibBytes/LibBytes.sol
diff --git a/packages/contracts/contracts/utils/Ownable/IOwnable.sol b/contracts/core/contracts/utils/Ownable/IOwnable.sol
index 5deb13497..5deb13497 100644
--- a/packages/contracts/contracts/utils/Ownable/IOwnable.sol
+++ b/contracts/core/contracts/utils/Ownable/IOwnable.sol
diff --git a/packages/contracts/contracts/utils/Ownable/Ownable.sol b/contracts/core/contracts/utils/Ownable/Ownable.sol
index 0c830be68..0c830be68 100644
--- a/packages/contracts/contracts/utils/Ownable/Ownable.sol
+++ b/contracts/core/contracts/utils/Ownable/Ownable.sol
diff --git a/packages/contracts/contracts/utils/ReentrancyGuard/ReentrancyGuard.sol b/contracts/core/contracts/utils/ReentrancyGuard/ReentrancyGuard.sol
index 9f98a7a16..9f98a7a16 100644
--- a/packages/contracts/contracts/utils/ReentrancyGuard/ReentrancyGuard.sol
+++ b/contracts/core/contracts/utils/ReentrancyGuard/ReentrancyGuard.sol
diff --git a/packages/contracts/contracts/utils/SafeMath/SafeMath.sol b/contracts/core/contracts/utils/SafeMath/SafeMath.sol
index 2855edb9d..2855edb9d 100644
--- a/packages/contracts/contracts/utils/SafeMath/SafeMath.sol
+++ b/contracts/core/contracts/utils/SafeMath/SafeMath.sol
diff --git a/packages/contracts/package.json b/contracts/core/package.json
index 16dd3c9c1..b20b0ef3f 100644
--- a/packages/contracts/package.json
+++ b/contracts/core/package.json
@@ -45,7 +45,7 @@
"bugs": {
"url": "https://github.com/0xProject/0x-monorepo/issues"
},
- "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
+ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md",
"devDependencies": {
"@0x/abi-gen": "^1.0.17",
"@0x/dev-utils": "^1.0.19",
diff --git a/packages/contracts/src/artifacts/index.ts b/contracts/core/src/artifacts/index.ts
index 97c1b6209..97c1b6209 100644
--- a/packages/contracts/src/artifacts/index.ts
+++ b/contracts/core/src/artifacts/index.ts
diff --git a/packages/contracts/src/wrappers/index.ts b/contracts/core/src/wrappers/index.ts
index 9ca676b56..9ca676b56 100644
--- a/packages/contracts/src/wrappers/index.ts
+++ b/contracts/core/src/wrappers/index.ts
diff --git a/packages/contracts/test/asset_proxy/authorizable.ts b/contracts/core/test/asset_proxy/authorizable.ts
index e21af9b81..e21af9b81 100644
--- a/packages/contracts/test/asset_proxy/authorizable.ts
+++ b/contracts/core/test/asset_proxy/authorizable.ts
diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/contracts/core/test/asset_proxy/proxies.ts
index 8fa1e602a..8fa1e602a 100644
--- a/packages/contracts/test/asset_proxy/proxies.ts
+++ b/contracts/core/test/asset_proxy/proxies.ts
diff --git a/packages/contracts/test/exchange/core.ts b/contracts/core/test/exchange/core.ts
index 9159b0d8f..9159b0d8f 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/contracts/core/test/exchange/core.ts
diff --git a/packages/contracts/test/exchange/dispatcher.ts b/contracts/core/test/exchange/dispatcher.ts
index 3d3aa42c2..3d3aa42c2 100644
--- a/packages/contracts/test/exchange/dispatcher.ts
+++ b/contracts/core/test/exchange/dispatcher.ts
diff --git a/packages/contracts/test/exchange/fill_order.ts b/contracts/core/test/exchange/fill_order.ts
index 37efaad2b..37efaad2b 100644
--- a/packages/contracts/test/exchange/fill_order.ts
+++ b/contracts/core/test/exchange/fill_order.ts
diff --git a/packages/contracts/test/exchange/internal.ts b/contracts/core/test/exchange/internal.ts
index 109be29c6..109be29c6 100644
--- a/packages/contracts/test/exchange/internal.ts
+++ b/contracts/core/test/exchange/internal.ts
diff --git a/packages/contracts/test/exchange/libs.ts b/contracts/core/test/exchange/libs.ts
index 503ef0e0f..503ef0e0f 100644
--- a/packages/contracts/test/exchange/libs.ts
+++ b/contracts/core/test/exchange/libs.ts
diff --git a/packages/contracts/test/exchange/match_orders.ts b/contracts/core/test/exchange/match_orders.ts
index eea9992d9..eea9992d9 100644
--- a/packages/contracts/test/exchange/match_orders.ts
+++ b/contracts/core/test/exchange/match_orders.ts
diff --git a/packages/contracts/test/exchange/signature_validator.ts b/contracts/core/test/exchange/signature_validator.ts
index 756c72766..756c72766 100644
--- a/packages/contracts/test/exchange/signature_validator.ts
+++ b/contracts/core/test/exchange/signature_validator.ts
diff --git a/packages/contracts/test/exchange/transactions.ts b/contracts/core/test/exchange/transactions.ts
index 1b5eef295..1b5eef295 100644
--- a/packages/contracts/test/exchange/transactions.ts
+++ b/contracts/core/test/exchange/transactions.ts
diff --git a/packages/contracts/test/exchange/wrapper.ts b/contracts/core/test/exchange/wrapper.ts
index 6b660aac5..6b660aac5 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/contracts/core/test/exchange/wrapper.ts
diff --git a/packages/contracts/test/extensions/forwarder.ts b/contracts/core/test/extensions/forwarder.ts
index c006be0fe..c006be0fe 100644
--- a/packages/contracts/test/extensions/forwarder.ts
+++ b/contracts/core/test/extensions/forwarder.ts
diff --git a/packages/contracts/test/extensions/order_validator.ts b/contracts/core/test/extensions/order_validator.ts
index 37d7c4c5a..37d7c4c5a 100644
--- a/packages/contracts/test/extensions/order_validator.ts
+++ b/contracts/core/test/extensions/order_validator.ts
diff --git a/packages/contracts/test/global_hooks.ts b/contracts/core/test/global_hooks.ts
index 2e9ac9e21..2e9ac9e21 100644
--- a/packages/contracts/test/global_hooks.ts
+++ b/contracts/core/test/global_hooks.ts
diff --git a/packages/contracts/test/libraries/lib_bytes.ts b/contracts/core/test/libraries/lib_bytes.ts
index b1a389f00..b1a389f00 100644
--- a/packages/contracts/test/libraries/lib_bytes.ts
+++ b/contracts/core/test/libraries/lib_bytes.ts
diff --git a/packages/contracts/test/multisig/asset_proxy_owner.ts b/contracts/core/test/multisig/asset_proxy_owner.ts
index 087152316..087152316 100644
--- a/packages/contracts/test/multisig/asset_proxy_owner.ts
+++ b/contracts/core/test/multisig/asset_proxy_owner.ts
diff --git a/packages/contracts/test/multisig/multi_sig_with_time_lock.ts b/contracts/core/test/multisig/multi_sig_with_time_lock.ts
index 1c0cb0515..1c0cb0515 100644
--- a/packages/contracts/test/multisig/multi_sig_with_time_lock.ts
+++ b/contracts/core/test/multisig/multi_sig_with_time_lock.ts
diff --git a/packages/contracts/test/tokens/erc721_token.ts b/contracts/core/test/tokens/erc721_token.ts
index 72407748f..72407748f 100644
--- a/packages/contracts/test/tokens/erc721_token.ts
+++ b/contracts/core/test/tokens/erc721_token.ts
diff --git a/packages/contracts/test/tokens/unlimited_allowance_token.ts b/contracts/core/test/tokens/unlimited_allowance_token.ts
index ea5a50522..ea5a50522 100644
--- a/packages/contracts/test/tokens/unlimited_allowance_token.ts
+++ b/contracts/core/test/tokens/unlimited_allowance_token.ts
diff --git a/packages/contracts/test/tokens/weth9.ts b/contracts/core/test/tokens/weth9.ts
index 9a31dc3f2..9a31dc3f2 100644
--- a/packages/contracts/test/tokens/weth9.ts
+++ b/contracts/core/test/tokens/weth9.ts
diff --git a/packages/contracts/test/tokens/zrx_token.ts b/contracts/core/test/tokens/zrx_token.ts
index cab62c205..cab62c205 100644
--- a/packages/contracts/test/tokens/zrx_token.ts
+++ b/contracts/core/test/tokens/zrx_token.ts
diff --git a/packages/contracts/test/tutorials/arbitrage.ts b/contracts/core/test/tutorials/arbitrage.ts
index 78e0bc238..78e0bc238 100644
--- a/packages/contracts/test/tutorials/arbitrage.ts
+++ b/contracts/core/test/tutorials/arbitrage.ts
diff --git a/packages/contracts/test/utils/abstract_asset_wrapper.ts b/contracts/core/test/utils/abstract_asset_wrapper.ts
index 4b56a8502..4b56a8502 100644
--- a/packages/contracts/test/utils/abstract_asset_wrapper.ts
+++ b/contracts/core/test/utils/abstract_asset_wrapper.ts
diff --git a/packages/contracts/test/utils/address_utils.ts b/contracts/core/test/utils/address_utils.ts
index 634da0c16..634da0c16 100644
--- a/packages/contracts/test/utils/address_utils.ts
+++ b/contracts/core/test/utils/address_utils.ts
diff --git a/packages/contracts/test/utils/assertions.ts b/contracts/core/test/utils/assertions.ts
index 5b1cedfcc..5b1cedfcc 100644
--- a/packages/contracts/test/utils/assertions.ts
+++ b/contracts/core/test/utils/assertions.ts
diff --git a/packages/contracts/test/utils/asset_wrapper.ts b/contracts/core/test/utils/asset_wrapper.ts
index 4e7696066..4e7696066 100644
--- a/packages/contracts/test/utils/asset_wrapper.ts
+++ b/contracts/core/test/utils/asset_wrapper.ts
diff --git a/packages/contracts/test/utils/block_timestamp.ts b/contracts/core/test/utils/block_timestamp.ts
index 66c13eed1..66c13eed1 100644
--- a/packages/contracts/test/utils/block_timestamp.ts
+++ b/contracts/core/test/utils/block_timestamp.ts
diff --git a/packages/contracts/test/utils/chai_setup.ts b/contracts/core/test/utils/chai_setup.ts
index 1a8733093..1a8733093 100644
--- a/packages/contracts/test/utils/chai_setup.ts
+++ b/contracts/core/test/utils/chai_setup.ts
diff --git a/packages/contracts/test/utils/combinatorial_utils.ts b/contracts/core/test/utils/combinatorial_utils.ts
index bb1b55b4d..bb1b55b4d 100644
--- a/packages/contracts/test/utils/combinatorial_utils.ts
+++ b/contracts/core/test/utils/combinatorial_utils.ts
diff --git a/packages/contracts/test/utils/constants.ts b/contracts/core/test/utils/constants.ts
index d2c3ab512..d2c3ab512 100644
--- a/packages/contracts/test/utils/constants.ts
+++ b/contracts/core/test/utils/constants.ts
diff --git a/packages/contracts/test/utils/coverage.ts b/contracts/core/test/utils/coverage.ts
index 5becfa1b6..5becfa1b6 100644
--- a/packages/contracts/test/utils/coverage.ts
+++ b/contracts/core/test/utils/coverage.ts
diff --git a/packages/contracts/test/utils/erc20_wrapper.ts b/contracts/core/test/utils/erc20_wrapper.ts
index c281a2abf..c281a2abf 100644
--- a/packages/contracts/test/utils/erc20_wrapper.ts
+++ b/contracts/core/test/utils/erc20_wrapper.ts
diff --git a/packages/contracts/test/utils/erc721_wrapper.ts b/contracts/core/test/utils/erc721_wrapper.ts
index e9da553d0..e9da553d0 100644
--- a/packages/contracts/test/utils/erc721_wrapper.ts
+++ b/contracts/core/test/utils/erc721_wrapper.ts
diff --git a/packages/contracts/test/utils/exchange_wrapper.ts b/contracts/core/test/utils/exchange_wrapper.ts
index c28989d3f..c28989d3f 100644
--- a/packages/contracts/test/utils/exchange_wrapper.ts
+++ b/contracts/core/test/utils/exchange_wrapper.ts
diff --git a/packages/contracts/test/utils/fill_order_combinatorial_utils.ts b/contracts/core/test/utils/fill_order_combinatorial_utils.ts
index 8046771f9..8046771f9 100644
--- a/packages/contracts/test/utils/fill_order_combinatorial_utils.ts
+++ b/contracts/core/test/utils/fill_order_combinatorial_utils.ts
diff --git a/packages/contracts/test/utils/formatters.ts b/contracts/core/test/utils/formatters.ts
index 813eb45db..813eb45db 100644
--- a/packages/contracts/test/utils/formatters.ts
+++ b/contracts/core/test/utils/formatters.ts
diff --git a/packages/contracts/test/utils/forwarder_wrapper.ts b/contracts/core/test/utils/forwarder_wrapper.ts
index a0bfcfe1d..a0bfcfe1d 100644
--- a/packages/contracts/test/utils/forwarder_wrapper.ts
+++ b/contracts/core/test/utils/forwarder_wrapper.ts
diff --git a/packages/contracts/test/utils/log_decoder.ts b/contracts/core/test/utils/log_decoder.ts
index 05b0a9204..05b0a9204 100644
--- a/packages/contracts/test/utils/log_decoder.ts
+++ b/contracts/core/test/utils/log_decoder.ts
diff --git a/packages/contracts/test/utils/match_order_tester.ts b/contracts/core/test/utils/match_order_tester.ts
index 6c2c84959..6c2c84959 100644
--- a/packages/contracts/test/utils/match_order_tester.ts
+++ b/contracts/core/test/utils/match_order_tester.ts
diff --git a/packages/contracts/test/utils/multi_sig_wrapper.ts b/contracts/core/test/utils/multi_sig_wrapper.ts
index 74fd3b4d6..74fd3b4d6 100644
--- a/packages/contracts/test/utils/multi_sig_wrapper.ts
+++ b/contracts/core/test/utils/multi_sig_wrapper.ts
diff --git a/packages/contracts/test/utils/order_factory.ts b/contracts/core/test/utils/order_factory.ts
index 2449d1a8a..2449d1a8a 100644
--- a/packages/contracts/test/utils/order_factory.ts
+++ b/contracts/core/test/utils/order_factory.ts
diff --git a/packages/contracts/test/utils/order_factory_from_scenario.ts b/contracts/core/test/utils/order_factory_from_scenario.ts
index 60c8606c4..60c8606c4 100644
--- a/packages/contracts/test/utils/order_factory_from_scenario.ts
+++ b/contracts/core/test/utils/order_factory_from_scenario.ts
diff --git a/packages/contracts/test/utils/order_utils.ts b/contracts/core/test/utils/order_utils.ts
index 4f7a34011..4f7a34011 100644
--- a/packages/contracts/test/utils/order_utils.ts
+++ b/contracts/core/test/utils/order_utils.ts
diff --git a/packages/contracts/test/utils/profiler.ts b/contracts/core/test/utils/profiler.ts
index 2c7c1d66c..2c7c1d66c 100644
--- a/packages/contracts/test/utils/profiler.ts
+++ b/contracts/core/test/utils/profiler.ts
diff --git a/packages/contracts/test/utils/revert_trace.ts b/contracts/core/test/utils/revert_trace.ts
index 3f74fd28b..3f74fd28b 100644
--- a/packages/contracts/test/utils/revert_trace.ts
+++ b/contracts/core/test/utils/revert_trace.ts
diff --git a/packages/contracts/test/utils/signing_utils.ts b/contracts/core/test/utils/signing_utils.ts
index 21f864bfa..21f864bfa 100644
--- a/packages/contracts/test/utils/signing_utils.ts
+++ b/contracts/core/test/utils/signing_utils.ts
diff --git a/packages/contracts/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts b/contracts/core/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts
index 64b7dedbe..64b7dedbe 100644
--- a/packages/contracts/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts
+++ b/contracts/core/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts
diff --git a/packages/contracts/test/utils/simple_order_filled_cancelled_fetcher.ts b/contracts/core/test/utils/simple_order_filled_cancelled_fetcher.ts
index af959e00e..af959e00e 100644
--- a/packages/contracts/test/utils/simple_order_filled_cancelled_fetcher.ts
+++ b/contracts/core/test/utils/simple_order_filled_cancelled_fetcher.ts
diff --git a/packages/contracts/test/utils/test_with_reference.ts b/contracts/core/test/utils/test_with_reference.ts
index b80be4a6c..b80be4a6c 100644
--- a/packages/contracts/test/utils/test_with_reference.ts
+++ b/contracts/core/test/utils/test_with_reference.ts
diff --git a/packages/contracts/test/utils/transaction_factory.ts b/contracts/core/test/utils/transaction_factory.ts
index dbab3ade4..dbab3ade4 100644
--- a/packages/contracts/test/utils/transaction_factory.ts
+++ b/contracts/core/test/utils/transaction_factory.ts
diff --git a/packages/contracts/test/utils/type_encoding_utils.ts b/contracts/core/test/utils/type_encoding_utils.ts
index bfd9c9ef5..bfd9c9ef5 100644
--- a/packages/contracts/test/utils/type_encoding_utils.ts
+++ b/contracts/core/test/utils/type_encoding_utils.ts
diff --git a/packages/contracts/test/utils/types.ts b/contracts/core/test/utils/types.ts
index 9fc9e1570..9fc9e1570 100644
--- a/packages/contracts/test/utils/types.ts
+++ b/contracts/core/test/utils/types.ts
diff --git a/packages/contracts/test/utils/web3_wrapper.ts b/contracts/core/test/utils/web3_wrapper.ts
index f7b1a732a..f7b1a732a 100644
--- a/packages/contracts/test/utils/web3_wrapper.ts
+++ b/contracts/core/test/utils/web3_wrapper.ts
diff --git a/packages/contracts/test/utils_test/test_with_reference.ts b/contracts/core/test/utils_test/test_with_reference.ts
index 8d633cd1f..8d633cd1f 100644
--- a/packages/contracts/test/utils_test/test_with_reference.ts
+++ b/contracts/core/test/utils_test/test_with_reference.ts
diff --git a/packages/contracts/tsconfig.json b/contracts/core/tsconfig.json
index e0f85079a..e0f85079a 100644
--- a/packages/contracts/tsconfig.json
+++ b/contracts/core/tsconfig.json
diff --git a/packages/contracts/tslint.json b/contracts/core/tslint.json
index 1bb3ac2a2..1bb3ac2a2 100644
--- a/packages/contracts/tslint.json
+++ b/contracts/core/tslint.json
diff --git a/lerna.json b/lerna.json
index e2147be85..fa9ef5aff 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
{
"lerna": "3.0.0-beta.23",
- "packages": ["packages/*"],
+ "packages": ["packages/*", "contracts/*"],
"version": "independent",
"command": {
"publish": {
diff --git a/package.json b/package.json
index 7307bea5d..81208dcd2 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
"node": ">=6.12"
},
"workspaces": [
- "packages/*"
+ "packages/*",
+ "contracts/*"
],
"scripts": {
"ganache": "ganache-cli -p 8545 --gasLimit 10000000 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
diff --git a/packages/website/md/docs/smart_contracts/1/introduction.md b/packages/website/md/docs/smart_contracts/1/introduction.md
index 79a8f00fd..81715a3d1 100644
--- a/packages/website/md/docs/smart_contracts/1/introduction.md
+++ b/packages/website/md/docs/smart_contracts/1/introduction.md
@@ -1 +1 @@
-Welcome to the [0x smart contracts](https://github.com/0xProject/0x-monorepo/tree/development/packages/contracts) documentation! This documentation is intended for dApp developers who want to integrate 0x exchange functionality directly into their own smart contracts.
+Welcome to the [0x smart contracts](https://github.com/0xProject/0x-monorepo/tree/development/contracts/core) documentation! This documentation is intended for dApp developers who want to integrate 0x exchange functionality directly into their own smart contracts.
diff --git a/packages/website/md/docs/smart_contracts/2/introduction.md b/packages/website/md/docs/smart_contracts/2/introduction.md
index 4aa31db3d..0b4e2aac6 100644
--- a/packages/website/md/docs/smart_contracts/2/introduction.md
+++ b/packages/website/md/docs/smart_contracts/2/introduction.md
@@ -1,4 +1,4 @@
-Welcome to the [0x smart contracts](https://github.com/0xProject/0x-monorepo/tree/development/packages/contracts) documentation! This documentation is intended for dApp developers who want to integrate 0x exchange functionality directly into their own smart contracts.
+Welcome to the [0x smart contracts](https://github.com/0xProject/0x-monorepo/tree/development/contracts/core) documentation! This documentation is intended for dApp developers who want to integrate 0x exchange functionality directly into their own smart contracts.
### Helpful wiki articles:
diff --git a/tsconfig.json b/tsconfig.json
index 0e2fefbac..3d2dc6da7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -30,7 +30,7 @@
{ "path": "./packages/contract-addresses" },
{ "path": "./packages/contract-artifacts" },
{ "path": "./packages/contract-wrappers" },
- { "path": "./packages/contracts" },
+ { "path": "./contracts/core" },
{ "path": "./packages/dev-utils" },
{ "path": "./packages/ethereum-types" },
{ "path": "./packages/fill-scenarios" },
diff --git a/yarn.lock b/yarn.lock
index a7a55a7b3..dff01f1b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -478,7 +478,7 @@
dependencies:
npm-registry-client "7.0.9"
-"@babel/code-frame@^7.0.0-beta.35":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35":
version "7.0.0"
resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
dependencies:
@@ -1248,8 +1248,8 @@
bignumber.js "7.2.1"
"@types/ethereumjs-abi@^0.6.0":
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/@types/ethereumjs-abi/-/ethereumjs-abi-0.6.0.tgz#72d21083a36d9288821b62905e04b15e0c12175d"
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/@types/ethereumjs-abi/-/ethereumjs-abi-0.6.1.tgz#68dad80888a6e9f12b04f85adcb9cad2cb825e5c"
dependencies:
"@types/node" "*"
@@ -1342,7 +1342,7 @@
"@types/js-combinatorics@^0.5.29":
version "0.5.29"
- resolved "https://registry.yarnpkg.com/@types/js-combinatorics/-/js-combinatorics-0.5.29.tgz#47a7819a0b6925b6dc4bd2c2278a7e6329b29387"
+ resolved "http://registry.npmjs.org/@types/js-combinatorics/-/js-combinatorics-0.5.29.tgz#47a7819a0b6925b6dc4bd2c2278a7e6329b29387"
"@types/jsonschema@^1.1.1":
version "1.1.1"
@@ -1868,28 +1868,18 @@ acorn-globals@^4.1.0:
acorn "^6.0.1"
acorn-walk "^6.0.1"
-acorn-jsx@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
- dependencies:
- acorn "^3.0.4"
+acorn-jsx@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
acorn-walk@^6.0.1:
version "6.1.0"
resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.0.tgz#c957f4a1460da46af4a0388ce28b4c99355b0cbc"
-acorn@^3.0.4:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-
acorn@^5.0.0:
version "5.5.3"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
-acorn@^5.5.0:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
-
acorn@^5.5.3, acorn@^5.6.2:
version "5.7.3"
resolved "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
@@ -1898,6 +1888,10 @@ acorn@^6.0.1:
version "6.0.2"
resolved "https://registry.npmjs.org/acorn/-/acorn-6.0.2.tgz#6a459041c320ab17592c6317abbfdf4bbaa98ca4"
+acorn@^6.0.2:
+ version "6.0.4"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"
+
aes-js@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
@@ -1906,6 +1900,10 @@ aes-js@^0.2.3:
version "0.2.4"
resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-0.2.4.tgz#94b881ab717286d015fa219e08fb66709dda5a3d"
+aes-js@^3.1.1:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a"
+
agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
@@ -1922,10 +1920,6 @@ ajv-errors@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
-ajv-keywords@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-
ajv-keywords@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
@@ -1937,7 +1931,7 @@ ajv@^4.9.1:
co "^4.6.0"
json-stable-stringify "^1.0.1"
-ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.1.0, ajv@^5.3.0:
version "5.5.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
@@ -1955,6 +1949,15 @@ ajv@^6.1.0:
json-schema-traverse "^0.3.0"
uri-js "^3.0.2"
+ajv@^6.5.3:
+ version "6.5.5"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.5.tgz#cf97cdade71c6399a92c6d6c4177381291b781a1"
+ dependencies:
+ fast-deep-equal "^2.0.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
+
align-text@^0.1.1, align-text@^0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -2029,9 +2032,9 @@ ansi@^0.3.0, ansi@~0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
-antlr4@4.7.0:
- version "4.7.0"
- resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.0.tgz#297f956ddc06f83397fc0990ecf2e0cf20bfbbee"
+antlr4@4.7.1:
+ version "4.7.1"
+ resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.7.1.tgz#69984014f096e9e775f53dd9744bf994d8959773"
any-observable@^0.3.0:
version "0.3.0"
@@ -3351,7 +3354,7 @@ bs-logger@0.x:
dependencies:
fast-json-stable-stringify "^2.0.0"
-bs58@=4.0.1:
+bs58@=4.0.1, bs58@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
dependencies:
@@ -3374,6 +3377,14 @@ bs58check@^1.0.8:
bs58 "^3.1.0"
create-hash "^1.1.0"
+bs58check@^2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
+ dependencies:
+ bs58 "^4.0.0"
+ create-hash "^1.1.0"
+ safe-buffer "^5.1.2"
+
bser@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -3575,7 +3586,7 @@ caller-path@^0.1.0:
callsites@^0.2.0:
version "0.2.0"
- resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+ resolved "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
callsites@^2.0.0:
version "2.0.0"
@@ -4087,6 +4098,10 @@ commander@2.15.1, commander@^2.12.1, commander@^2.8.1:
version "2.15.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+commander@2.18.0:
+ version "2.18.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
+
commander@^2.15.1:
version "2.19.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -4512,7 +4527,7 @@ cross-spawn@^4:
lru-cache "^4.0.1"
which "^1.2.9"
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.0.1:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
dependencies:
@@ -4812,6 +4827,12 @@ debug@3.1.0, debug@=3.1.0, debug@^3.1.0:
dependencies:
ms "2.0.0"
+debug@^4.0.1:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
+ dependencies:
+ ms "^2.1.1"
+
debuglog@^1.0.1:
version "1.0.1"
resolved "http://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -5002,18 +5023,6 @@ defined@^1.0.0, defined@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-del@^2.0.2:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
- dependencies:
- globby "^5.0.0"
- is-path-cwd "^1.0.0"
- is-path-in-cwd "^1.0.0"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
- rimraf "^2.2.8"
-
del@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
@@ -5573,13 +5582,6 @@ escodegen@^1.9.1:
optionalDependencies:
source-map "~0.6.1"
-eslint-scope@^3.7.1:
- version "3.7.1"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
- dependencies:
- esrecurse "^4.1.0"
- estraverse "^4.1.1"
-
eslint-scope@^4.0.0:
version "4.0.0"
resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
@@ -5587,59 +5589,70 @@ eslint-scope@^4.0.0:
esrecurse "^4.1.0"
estraverse "^4.1.1"
+eslint-utils@^1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+
eslint-visitor-keys@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
-eslint@^4.19.1:
- version "4.19.1"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
+eslint@^5.6.0:
+ version "5.9.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.9.0.tgz#b234b6d15ef84b5849c6de2af43195a2d59d408e"
dependencies:
- ajv "^5.3.0"
- babel-code-frame "^6.22.0"
+ "@babel/code-frame" "^7.0.0"
+ ajv "^6.5.3"
chalk "^2.1.0"
- concat-stream "^1.6.0"
- cross-spawn "^5.1.0"
- debug "^3.1.0"
+ cross-spawn "^6.0.5"
+ debug "^4.0.1"
doctrine "^2.1.0"
- eslint-scope "^3.7.1"
+ eslint-scope "^4.0.0"
+ eslint-utils "^1.3.1"
eslint-visitor-keys "^1.0.0"
- espree "^3.5.4"
- esquery "^1.0.0"
+ espree "^4.0.0"
+ esquery "^1.0.1"
esutils "^2.0.2"
file-entry-cache "^2.0.0"
functional-red-black-tree "^1.0.1"
glob "^7.1.2"
- globals "^11.0.1"
- ignore "^3.3.3"
+ globals "^11.7.0"
+ ignore "^4.0.6"
imurmurhash "^0.1.4"
- inquirer "^3.0.6"
- is-resolvable "^1.0.0"
- js-yaml "^3.9.1"
+ inquirer "^6.1.0"
+ is-resolvable "^1.1.0"
+ js-yaml "^3.12.0"
json-stable-stringify-without-jsonify "^1.0.1"
levn "^0.3.0"
- lodash "^4.17.4"
- minimatch "^3.0.2"
+ lodash "^4.17.5"
+ minimatch "^3.0.4"
mkdirp "^0.5.1"
natural-compare "^1.4.0"
optionator "^0.8.2"
path-is-inside "^1.0.2"
pluralize "^7.0.0"
progress "^2.0.0"
- regexpp "^1.0.1"
+ regexpp "^2.0.1"
require-uncached "^1.0.3"
- semver "^5.3.0"
+ semver "^5.5.1"
strip-ansi "^4.0.0"
- strip-json-comments "~2.0.1"
- table "4.0.2"
- text-table "~0.2.0"
+ strip-json-comments "^2.0.1"
+ table "^5.0.2"
+ text-table "^0.2.0"
-espree@^3.5.4:
- version "3.5.4"
- resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+espree@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f"
dependencies:
- acorn "^5.5.0"
- acorn-jsx "^3.0.0"
+ acorn "^6.0.2"
+ acorn-jsx "^5.0.0"
+ eslint-visitor-keys "^1.0.0"
+
+esprima-extract-comments@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/esprima-extract-comments/-/esprima-extract-comments-1.1.0.tgz#0dacab567a5900240de6d344cf18c33617becbc9"
+ dependencies:
+ esprima "^4.0.0"
esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
version "2.7.3"
@@ -5653,7 +5666,7 @@ esprima@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
-esquery@^1.0.0:
+esquery@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
dependencies:
@@ -5970,6 +5983,19 @@ ethereumjs-wallet@0.6.0:
utf8 "^2.1.1"
uuid "^2.0.1"
+ethereumjs-wallet@~0.6.0:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda"
+ dependencies:
+ aes-js "^3.1.1"
+ bs58check "^2.1.2"
+ ethereumjs-util "^5.2.0"
+ hdkey "^1.0.0"
+ safe-buffer "^5.1.2"
+ scrypt.js "^0.2.0"
+ utf8 "^3.0.0"
+ uuid "^3.3.2"
+
ethers@~4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.4.tgz#d3f85e8b27f4b59537e06526439b0fb15b44dc65"
@@ -6266,6 +6292,13 @@ extglob@^2.0.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"
+extract-comments@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/extract-comments/-/extract-comments-1.0.0.tgz#ad4e640704d8a9a124faf8776b47735ff092a593"
+ dependencies:
+ esprima-extract-comments "^1.0.1"
+ parse-code-context "^0.2.2"
+
extsprintf@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -6296,6 +6329,14 @@ 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"
+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"
+
+fast-diff@^1.1.2:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+
fast-glob@^2.0.2:
version "2.2.1"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.1.tgz#686c2345be88f3741e174add0be6f2e5b6078889"
@@ -6534,12 +6575,12 @@ flagged-respawn@^1.0.0:
resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
flat-cache@^1.2.1:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+ version "1.3.4"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
dependencies:
circular-json "^0.3.1"
- del "^2.0.2"
graceful-fs "^4.1.2"
+ rimraf "~2.6.2"
write "^0.2.1"
flatten@^1.0.2:
@@ -6778,7 +6819,7 @@ ganache-core@0xProject/ganache-core#monorepo-dep:
ethereumjs-tx "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default"
ethereumjs-util "^5.2.0"
ethereumjs-vm "2.3.5"
- ethereumjs-wallet "0.6.0"
+ ethereumjs-wallet "~0.6.0"
fake-merkle-patricia-tree "~1.0.1"
heap "~0.2.6"
js-scrypt "^0.2.0"
@@ -7073,6 +7114,17 @@ glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo
once "^1.3.0"
path-is-absolute "^1.0.0"
+glob@7.1.3, glob@^7.1.3:
+ version "7.1.3"
+ resolved "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+ 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"
+
glob@^4.3.1:
version "4.5.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
@@ -7092,17 +7144,6 @@ glob@^5.0.15:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.1.3:
- version "7.1.3"
- resolved "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
- 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"
-
glob@~3.1.21:
version "3.1.21"
resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
@@ -7146,25 +7187,14 @@ global@^4.3.0, global@~4.3.0:
min-document "^2.19.0"
process "~0.5.1"
-globals@^11.0.1:
- version "11.7.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
+globals@^11.7.0:
+ version "11.9.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
globals@^9.18.0:
version "9.18.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-globby@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
- dependencies:
- array-union "^1.0.1"
- arrify "^1.0.0"
- glob "^7.0.3"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
-
globby@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -7503,6 +7533,14 @@ hdkey@^0.7.0, hdkey@^0.7.1:
coinstring "^2.0.0"
secp256k1 "^3.0.1"
+hdkey@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-1.1.0.tgz#e74e7b01d2c47f797fa65d1d839adb7a44639f29"
+ dependencies:
+ coinstring "^2.0.0"
+ safe-buffer "^5.1.1"
+ secp256k1 "^3.0.1"
+
he@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -7775,14 +7813,14 @@ ignore-walk@^3.0.1:
dependencies:
minimatch "^3.0.4"
-ignore@^3.3.3, ignore@^3.3.7:
- version "3.3.10"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-
ignore@^3.3.5:
version "3.3.7"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+ignore@^4.0.6:
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+
image-size@~0.5.0:
version "0.5.5"
resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
@@ -7897,7 +7935,7 @@ inquirer@^0.8.2:
rx "^2.4.3"
through "^2.3.6"
-inquirer@^3.0.6, inquirer@^3.3.0:
+inquirer@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
dependencies:
@@ -7934,7 +7972,7 @@ inquirer@^5.1.0:
strip-ansi "^4.0.0"
through "^2.3.6"
-inquirer@^6.2.0:
+inquirer@^6.1.0, inquirer@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
dependencies:
@@ -8314,7 +8352,7 @@ is-relative@^1.0.0:
dependencies:
is-unc-path "^1.0.0"
-is-resolvable@^1.0.0:
+is-resolvable@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -8870,8 +8908,8 @@ js-base64@^2.1.9:
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
js-combinatorics@^0.5.3:
- version "0.5.3"
- resolved "https://registry.yarnpkg.com/js-combinatorics/-/js-combinatorics-0.5.3.tgz#5da5a1c4632ec59fdf8d49dccfe59ef088122b15"
+ version "0.5.4"
+ resolved "https://registry.yarnpkg.com/js-combinatorics/-/js-combinatorics-0.5.4.tgz#c92916b8f8171b64ecd7c4435b72cfabc803c756"
js-scrypt@^0.2.0:
version "0.2.0"
@@ -8910,7 +8948,7 @@ js-yaml@3.x, js-yaml@^3.4.2, js-yaml@^3.6.1, js-yaml@^3.7.0:
argparse "^1.0.7"
esprima "^4.0.0"
-js-yaml@^3.12.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
+js-yaml@^3.12.0, js-yaml@^3.9.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
dependencies:
@@ -9010,6 +9048,10 @@ 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"
+json-schema-traverse@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+
json-schema@0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -9782,7 +9824,7 @@ lodash@^3.3.1, lodash@^3.6.0, lodash@^3.7.0:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0:
+lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.11:
version "4.17.11"
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
@@ -10460,7 +10502,7 @@ ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-ms@^2.0.0:
+ms@^2.0.0, ms@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
@@ -11432,6 +11474,10 @@ parse-asn1@^5.0.0:
evp_bytestokey "^1.0.0"
pbkdf2 "^3.0.3"
+parse-code-context@^0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/parse-code-context/-/parse-code-context-0.2.2.tgz#144b8afb7219482d7e88c1eb6a765596f3a6ac0d"
+
parse-entities@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.1.1.tgz#8112d88471319f27abae4d64964b122fe4e1b890"
@@ -11999,10 +12045,28 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+prettier-linter-helpers@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+ dependencies:
+ fast-diff "^1.1.2"
+
+prettier-plugin-solidity@^1.0.0-alpha.4:
+ version "1.0.0-alpha.11"
+ resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-alpha.11.tgz#ef078a80dd471437693a0508de7691dd3ba814af"
+ dependencies:
+ extract-comments "^1.0.0"
+ prettier "^1.14.2"
+ solidity-parser-antlr "^0.3.1"
+
prettier@^1.11.1:
version "1.12.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
+prettier@^1.14.2, prettier@^1.14.3:
+ version "1.15.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.2.tgz#d31abe22afa4351efa14c7f8b94b58bb7452205e"
+
pretty-bytes@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84"
@@ -12942,9 +13006,9 @@ regex-not@^1.0.0, regex-not@^1.0.2:
extend-shallow "^3.0.2"
safe-regex "^1.1.0"
-regexpp@^1.0.1:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+regexpp@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
regexpu-core@^1.0.0:
version "1.0.0"
@@ -13196,7 +13260,7 @@ require-package-name@^2.0.1:
require-uncached@^1.0.3:
version "1.0.3"
- resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+ resolved "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
dependencies:
caller-path "^0.1.0"
resolve-from "^1.0.0"
@@ -13306,7 +13370,7 @@ right-align@^0.1.1:
dependencies:
align-text "^0.1.1"
-rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
version "2.6.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
dependencies:
@@ -13612,6 +13676,10 @@ semver@^4.1.0:
version "4.3.6"
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+semver@^5.5.1:
+ version "5.6.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+
semver@~5.1.0:
version "5.1.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.1.tgz#a3292a373e6f3e0798da0b20641b9a9c5bc47e19"
@@ -13951,7 +14019,7 @@ socks@~2.2.0:
ip "^1.1.5"
smart-buffer "^4.0.1"
-solc@0.4.24, solc@^0.4.24:
+solc@0.4.24:
version "0.4.24"
resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.24.tgz#354f14b269b38cbaa82a47d1ff151723502b954e"
dependencies:
@@ -13981,21 +14049,40 @@ solc@^0.4.23:
semver "^5.3.0"
yargs "^4.7.1"
-solhint@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/solhint/-/solhint-1.2.1.tgz#59a1416cef94da38d587f768a73536d6e3403dd3"
+solc@^0.4.24:
+ version "0.4.25"
+ resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.25.tgz#06b8321f7112d95b4b903639b1138a4d292f5faa"
dependencies:
- antlr4 "4.7.0"
- commander "2.11.0"
- eslint "^4.19.1"
- glob "7.1.2"
- ignore "^3.3.7"
- lodash "^4.17.10"
+ fs-extra "^0.30.0"
+ memorystream "^0.3.1"
+ require-from-string "^1.1.0"
+ semver "^5.3.0"
+ yargs "^4.7.1"
+
+solhint@^1.2.1:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/solhint/-/solhint-1.4.0.tgz#59018cfc86e2fc268c8b520322ab1e0db1fdb94b"
+ dependencies:
+ antlr4 "4.7.1"
+ commander "2.18.0"
+ eslint "^5.6.0"
+ fast-diff "^1.1.2"
+ glob "7.1.3"
+ ignore "^4.0.6"
+ lodash "^4.17.11"
+ prettier-linter-helpers "^1.0.0"
+ optionalDependencies:
+ prettier "^1.14.3"
+ prettier-plugin-solidity "^1.0.0-alpha.4"
solidity-parser-antlr@^0.2.12:
version "0.2.12"
resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.2.12.tgz#1154f183d5cdda2c7677549ee584dbdb7fb2269c"
+solidity-parser-antlr@^0.3.1:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.3.2.tgz#1cf9d019280550a31299dc380e87a310dc4ca154"
+
sort-keys@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -14426,7 +14513,7 @@ strip-indent@^2.0.0:
version "2.0.0"
resolved "http://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-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"
@@ -14629,14 +14716,12 @@ symbol-tree@^3.2.2:
version "3.2.2"
resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-table@4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+table@^5.0.2:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/table/-/table-5.1.0.tgz#69a54644f6f01ad1628f8178715b408dc6bf11f7"
dependencies:
- ajv "^5.2.3"
- ajv-keywords "^2.1.0"
- chalk "^2.1.0"
- lodash "^4.17.4"
+ ajv "^6.5.3"
+ lodash "^4.17.10"
slice-ansi "1.0.0"
string-width "^2.1.1"
@@ -14815,7 +14900,7 @@ text-extensions@^1.0.0:
version "1.7.0"
resolved "http://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
-text-table@~0.2.0:
+text-table@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -15558,6 +15643,12 @@ uri-js@^3.0.2:
dependencies:
punycode "^2.1.0"
+uri-js@^4.2.2:
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+ 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"
@@ -15622,6 +15713,10 @@ utf8@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96"
+utf8@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1"
+
util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"