diff --git a/contracts/asset-proxy/compiler.json b/contracts/asset-proxy/compiler.json index 51ff4efa9b..6b74c612c2 100644 --- a/contracts/asset-proxy/compiler.json +++ b/contracts/asset-proxy/compiler.json @@ -22,17 +22,5 @@ ] } } - }, - "contracts": [ - "archive/MixinAuthorizable.sol", - "src/ERC1155Proxy.sol", - "src/ERC20Proxy.sol", - "src/ERC721Proxy.sol", - "src/MultiAssetProxy.sol", - "src/StaticCallProxy.sol", - "src/interfaces/IAssetData.sol", - "src/interfaces/IAssetProxy.sol", - "src/interfaces/IAuthorizable.sol", - "test/TestStaticCallTarget.sol" - ] + } } diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index 1c4ed19af1..8f8b2a64e1 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", @@ -34,7 +34,7 @@ "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy|StaticCallProxy|TestStaticCallTarget).json", + "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|MixinAssetProxyDispatcher|MixinAuthorizable|MultiAssetProxy|Ownable|StaticCallProxy|TestStaticCallTarget).json", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { diff --git a/contracts/asset-proxy/src/artifacts.ts b/contracts/asset-proxy/src/artifacts.ts index 6942df8793..85f9cbc640 100644 --- a/contracts/asset-proxy/src/artifacts.ts +++ b/contracts/asset-proxy/src/artifacts.ts @@ -10,20 +10,26 @@ import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json'; import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json'; import * as IAssetData from '../generated-artifacts/IAssetData.json'; import * as IAssetProxy from '../generated-artifacts/IAssetProxy.json'; +import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispatcher.json'; import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json'; +import * as MixinAssetProxyDispatcher from '../generated-artifacts/MixinAssetProxyDispatcher.json'; import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json'; import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json'; +import * as Ownable from '../generated-artifacts/Ownable.json'; import * as StaticCallProxy from '../generated-artifacts/StaticCallProxy.json'; import * as TestStaticCallTarget from '../generated-artifacts/TestStaticCallTarget.json'; export const artifacts = { + MixinAssetProxyDispatcher: MixinAssetProxyDispatcher as ContractArtifact, + MixinAuthorizable: MixinAuthorizable as ContractArtifact, + Ownable: Ownable as ContractArtifact, ERC1155Proxy: ERC1155Proxy as ContractArtifact, ERC20Proxy: ERC20Proxy as ContractArtifact, ERC721Proxy: ERC721Proxy as ContractArtifact, - MixinAuthorizable: MixinAuthorizable as ContractArtifact, MultiAssetProxy: MultiAssetProxy as ContractArtifact, StaticCallProxy: StaticCallProxy as ContractArtifact, IAssetData: IAssetData as ContractArtifact, IAssetProxy: IAssetProxy as ContractArtifact, + IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact, IAuthorizable: IAuthorizable as ContractArtifact, TestStaticCallTarget: TestStaticCallTarget as ContractArtifact, }; diff --git a/contracts/asset-proxy/src/wrappers.ts b/contracts/asset-proxy/src/wrappers.ts index 4a7968fc12..a1d2bcb46d 100644 --- a/contracts/asset-proxy/src/wrappers.ts +++ b/contracts/asset-proxy/src/wrappers.ts @@ -8,8 +8,11 @@ export * from '../generated-wrappers/erc20_proxy'; export * from '../generated-wrappers/erc721_proxy'; export * from '../generated-wrappers/i_asset_data'; export * from '../generated-wrappers/i_asset_proxy'; +export * from '../generated-wrappers/i_asset_proxy_dispatcher'; export * from '../generated-wrappers/i_authorizable'; +export * from '../generated-wrappers/mixin_asset_proxy_dispatcher'; export * from '../generated-wrappers/mixin_authorizable'; export * from '../generated-wrappers/multi_asset_proxy'; +export * from '../generated-wrappers/ownable'; export * from '../generated-wrappers/static_call_proxy'; export * from '../generated-wrappers/test_static_call_target'; diff --git a/contracts/asset-proxy/tsconfig.json b/contracts/asset-proxy/tsconfig.json index c410288969..b601856b16 100644 --- a/contracts/asset-proxy/tsconfig.json +++ b/contracts/asset-proxy/tsconfig.json @@ -8,9 +8,12 @@ "generated-artifacts/ERC721Proxy.json", "generated-artifacts/IAssetData.json", "generated-artifacts/IAssetProxy.json", + "generated-artifacts/IAssetProxyDispatcher.json", "generated-artifacts/IAuthorizable.json", + "generated-artifacts/MixinAssetProxyDispatcher.json", "generated-artifacts/MixinAuthorizable.json", "generated-artifacts/MultiAssetProxy.json", + "generated-artifacts/Ownable.json", "generated-artifacts/StaticCallProxy.json", "generated-artifacts/TestStaticCallTarget.json" ], diff --git a/contracts/coordinator/compiler.json b/contracts/coordinator/compiler.json index 96e1dbe630..0edd285700 100644 --- a/contracts/coordinator/compiler.json +++ b/contracts/coordinator/compiler.json @@ -21,6 +21,5 @@ ] } } - }, - "contracts": ["src/Coordinator.sol", "src/registry/CoordinatorRegistry.sol"] + } } diff --git a/contracts/coordinator/package.json b/contracts/coordinator/package.json index c64bd9c263..3cfdf27df0 100644 --- a/contracts/coordinator/package.json +++ b/contracts/coordinator/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/contracts/dev-utils/compiler.json b/contracts/dev-utils/compiler.json index 2f174501e5..6b74c612c2 100644 --- a/contracts/dev-utils/compiler.json +++ b/contracts/dev-utils/compiler.json @@ -22,12 +22,5 @@ ] } } - }, - "contracts": [ - "src/DevUtils.sol", - "src/EthBalanceChecker.sol", - "src/LibAssetData.sol", - "src/LibTransactionDecoder.sol", - "src/OrderTransferSimulationUtils.sol" - ] + } } diff --git a/contracts/dev-utils/package.json b/contracts/dev-utils/package.json index 5d6d68a906..0f5e18e359 100644 --- a/contracts/dev-utils/package.json +++ b/contracts/dev-utils/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", @@ -34,7 +34,7 @@ "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "./generated-artifacts/@(DevUtils|EthBalanceChecker|LibAssetData|LibTransactionDecoder|OrderTransferSimulationUtils).json", + "abis": "./generated-artifacts/@(DevUtils|EthBalanceChecker|LibAssetData|LibTransactionDecoder|OrderTransferSimulationUtils|OrderValidationUtils).json", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { diff --git a/contracts/dev-utils/src/artifacts.ts b/contracts/dev-utils/src/artifacts.ts index 6a8002013c..6d4be86321 100644 --- a/contracts/dev-utils/src/artifacts.ts +++ b/contracts/dev-utils/src/artifacts.ts @@ -10,10 +10,12 @@ import * as EthBalanceChecker from '../generated-artifacts/EthBalanceChecker.jso import * as LibAssetData from '../generated-artifacts/LibAssetData.json'; import * as LibTransactionDecoder from '../generated-artifacts/LibTransactionDecoder.json'; import * as OrderTransferSimulationUtils from '../generated-artifacts/OrderTransferSimulationUtils.json'; +import * as OrderValidationUtils from '../generated-artifacts/OrderValidationUtils.json'; export const artifacts = { DevUtils: DevUtils as ContractArtifact, + EthBalanceChecker: EthBalanceChecker as ContractArtifact, LibAssetData: LibAssetData as ContractArtifact, LibTransactionDecoder: LibTransactionDecoder as ContractArtifact, - EthBalanceChecker: EthBalanceChecker as ContractArtifact, OrderTransferSimulationUtils: OrderTransferSimulationUtils as ContractArtifact, + OrderValidationUtils: OrderValidationUtils as ContractArtifact, }; diff --git a/contracts/dev-utils/src/wrappers.ts b/contracts/dev-utils/src/wrappers.ts index 53bf08c126..a457a7998e 100644 --- a/contracts/dev-utils/src/wrappers.ts +++ b/contracts/dev-utils/src/wrappers.ts @@ -8,3 +8,4 @@ export * from '../generated-wrappers/eth_balance_checker'; export * from '../generated-wrappers/lib_asset_data'; export * from '../generated-wrappers/lib_transaction_decoder'; export * from '../generated-wrappers/order_transfer_simulation_utils'; +export * from '../generated-wrappers/order_validation_utils'; diff --git a/contracts/dev-utils/tsconfig.json b/contracts/dev-utils/tsconfig.json index 9918b06d4a..d160f0c58d 100644 --- a/contracts/dev-utils/tsconfig.json +++ b/contracts/dev-utils/tsconfig.json @@ -7,7 +7,8 @@ "generated-artifacts/EthBalanceChecker.json", "generated-artifacts/LibAssetData.json", "generated-artifacts/LibTransactionDecoder.json", - "generated-artifacts/OrderTransferSimulationUtils.json" + "generated-artifacts/OrderTransferSimulationUtils.json", + "generated-artifacts/OrderValidationUtils.json" ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/contracts/erc1155/compiler.json b/contracts/erc1155/compiler.json index 1fce0b95f6..6b74c612c2 100644 --- a/contracts/erc1155/compiler.json +++ b/contracts/erc1155/compiler.json @@ -22,14 +22,5 @@ ] } } - }, - "contracts": [ - "src/ERC1155.sol", - "src/ERC1155Mintable.sol", - "src/MixinNonFungibleToken.sol", - "src/interfaces/IERC1155.sol", - "src/interfaces/IERC1155Mintable.sol", - "src/interfaces/IERC1155Receiver.sol", - "test/DummyERC1155Receiver.sol" - ] + } } diff --git a/contracts/erc1155/package.json b/contracts/erc1155/package.json index 5e9d1c9d9d..41295f7c5f 100644 --- a/contracts/erc1155/package.json +++ b/contracts/erc1155/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/contracts/erc20/compiler.json b/contracts/erc20/compiler.json index 46964b425a..ac8f2ed76d 100644 --- a/contracts/erc20/compiler.json +++ b/contracts/erc20/compiler.json @@ -23,18 +23,5 @@ ] } } - }, - "contracts": [ - "src/ERC20Token.sol", - "src/MintableERC20Token.sol", - "src/UnlimitedAllowanceERC20Token.sol", - "src/WETH9.sol", - "src/ZRXToken.sol", - "src/interfaces/IERC20Token.sol", - "src/interfaces/IEtherToken.sol", - "test/DummyERC20Token.sol", - "test/DummyMultipleReturnERC20Token.sol", - "test/DummyNoReturnERC20Token.sol", - "test/UntransferrableDummyERC20Token.sol" - ] + } } diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index 7137b8f95b..bbb5ff93e6 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json index 680ca18982..6b74c612c2 100644 --- a/contracts/erc721/compiler.json +++ b/contracts/erc721/compiler.json @@ -22,14 +22,5 @@ ] } } - }, - "contracts": [ - "src/ERC721Token.sol", - "src/MintableERC721Token.sol", - "src/interfaces/IERC721Receiver.sol", - "src/interfaces/IERC721Token.sol", - "test/DummyERC721Receiver.sol", - "test/DummyERC721Token.sol", - "test/InvalidERC721Receiver.sol" - ] + } } diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 4444ebc1cc..ac34172fd3 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/contracts/exchange-forwarder/compiler.json b/contracts/exchange-forwarder/compiler.json index 0968c6246f..6b74c612c2 100644 --- a/contracts/exchange-forwarder/compiler.json +++ b/contracts/exchange-forwarder/compiler.json @@ -22,6 +22,5 @@ ] } } - }, - "contracts": ["src/Forwarder.sol"] + } } diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index 230b8b9ea4..b0338cbcbf 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json index a4650cf212..6b74c612c2 100644 --- a/contracts/exchange-libs/compiler.json +++ b/contracts/exchange-libs/compiler.json @@ -22,17 +22,5 @@ ] } } - }, - "contracts": [ - "src/LibEIP712ExchangeDomain.sol", - "src/LibFillResults.sol", - "src/LibMath.sol", - "src/LibOrder.sol", - "src/LibZeroExTransaction.sol", - "test/TestLibEIP712ExchangeDomain.sol", - "test/TestLibFillResults.sol", - "test/TestLibMath.sol", - "test/TestLibOrder.sol", - "test/TestLibZeroExTransaction.sol" - ] + } } diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index aad2666afd..d58d032698 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", @@ -35,7 +35,7 @@ "generate-exchange-selectors": "node lib/scripts/generate-exchange-selectors.js ../../../exchange/generated-artifacts/Exchange.json ./contracts/src/LibExchangeSelectors.sol" }, "config": { - "abis": "./generated-artifacts/@(LibEIP712ExchangeDomain|LibFillResults|LibMath|LibOrder|LibZeroExTransaction|TestLibEIP712ExchangeDomain|TestLibFillResults|TestLibMath|TestLibOrder|TestLibZeroExTransaction).json", + "abis": "./generated-artifacts/@(LibEIP712ExchangeDomain|LibFillResults|LibMath|LibMathRichErrors|LibOrder|LibZeroExTransaction|TestLibEIP712ExchangeDomain|TestLibFillResults|TestLibMath|TestLibOrder|TestLibZeroExTransaction).json", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { diff --git a/contracts/exchange-libs/src/artifacts.ts b/contracts/exchange-libs/src/artifacts.ts index ce0c9ae643..2f1aeb9142 100644 --- a/contracts/exchange-libs/src/artifacts.ts +++ b/contracts/exchange-libs/src/artifacts.ts @@ -8,6 +8,7 @@ import { ContractArtifact } from 'ethereum-types'; import * as LibEIP712ExchangeDomain from '../generated-artifacts/LibEIP712ExchangeDomain.json'; import * as LibFillResults from '../generated-artifacts/LibFillResults.json'; import * as LibMath from '../generated-artifacts/LibMath.json'; +import * as LibMathRichErrors from '../generated-artifacts/LibMathRichErrors.json'; import * as LibOrder from '../generated-artifacts/LibOrder.json'; import * as LibZeroExTransaction from '../generated-artifacts/LibZeroExTransaction.json'; import * as TestLibEIP712ExchangeDomain from '../generated-artifacts/TestLibEIP712ExchangeDomain.json'; @@ -19,11 +20,12 @@ export const artifacts = { LibEIP712ExchangeDomain: LibEIP712ExchangeDomain as ContractArtifact, LibFillResults: LibFillResults as ContractArtifact, LibMath: LibMath as ContractArtifact, + LibMathRichErrors: LibMathRichErrors as ContractArtifact, LibOrder: LibOrder as ContractArtifact, LibZeroExTransaction: LibZeroExTransaction as ContractArtifact, + TestLibEIP712ExchangeDomain: TestLibEIP712ExchangeDomain as ContractArtifact, + TestLibFillResults: TestLibFillResults as ContractArtifact, TestLibMath: TestLibMath as ContractArtifact, TestLibOrder: TestLibOrder as ContractArtifact, TestLibZeroExTransaction: TestLibZeroExTransaction as ContractArtifact, - TestLibFillResults: TestLibFillResults as ContractArtifact, - TestLibEIP712ExchangeDomain: TestLibEIP712ExchangeDomain as ContractArtifact, }; diff --git a/contracts/exchange-libs/src/wrappers.ts b/contracts/exchange-libs/src/wrappers.ts index 7797ec906a..face7b79cd 100644 --- a/contracts/exchange-libs/src/wrappers.ts +++ b/contracts/exchange-libs/src/wrappers.ts @@ -6,6 +6,7 @@ export * from '../generated-wrappers/lib_e_i_p712_exchange_domain'; export * from '../generated-wrappers/lib_fill_results'; export * from '../generated-wrappers/lib_math'; +export * from '../generated-wrappers/lib_math_rich_errors'; export * from '../generated-wrappers/lib_order'; export * from '../generated-wrappers/lib_zero_ex_transaction'; export * from '../generated-wrappers/test_lib_e_i_p712_exchange_domain'; diff --git a/contracts/exchange-libs/tsconfig.json b/contracts/exchange-libs/tsconfig.json index 732f53889a..f6279d6940 100644 --- a/contracts/exchange-libs/tsconfig.json +++ b/contracts/exchange-libs/tsconfig.json @@ -6,6 +6,7 @@ "generated-artifacts/LibEIP712ExchangeDomain.json", "generated-artifacts/LibFillResults.json", "generated-artifacts/LibMath.json", + "generated-artifacts/LibMathRichErrors.json", "generated-artifacts/LibOrder.json", "generated-artifacts/LibZeroExTransaction.json", "generated-artifacts/TestLibEIP712ExchangeDomain.json", diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json index c5d0606d2d..6b74c612c2 100644 --- a/contracts/exchange/compiler.json +++ b/contracts/exchange/compiler.json @@ -22,27 +22,5 @@ ] } } - }, - "contracts": [ - "examples/ExchangeWrapper.sol", - "examples/Whitelist.sol", - "src/Exchange.sol", - "src/interfaces/IAssetProxyDispatcher.sol", - "src/interfaces/IEIP1271Wallet.sol", - "src/interfaces/IExchange.sol", - "src/interfaces/IExchangeCore.sol", - "src/interfaces/IMatchOrders.sol", - "src/interfaces/ISignatureValidator.sol", - "src/interfaces/ITransactions.sol", - "src/interfaces/IWallet.sol", - "src/interfaces/IWrapperFunctions.sol", - "test/IsolatedExchange.sol", - "test/ReentrancyTester.sol", - "test/TestAssetProxyDispatcher.sol", - "test/TestExchangeInternals.sol", - "test/TestLibExchangeRichErrorDecoder.sol", - "test/TestSignatureValidator.sol", - "test/TestValidatorWallet.sol", - "test/TestWrapperFunctions.sol" - ] + } } diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index 351f0a4f0a..49b187bbb9 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/contracts/exchange/src/artifacts.ts b/contracts/exchange/src/artifacts.ts index ef5184ade7..dccfcd9c8e 100644 --- a/contracts/exchange/src/artifacts.ts +++ b/contracts/exchange/src/artifacts.ts @@ -7,16 +7,28 @@ import { ContractArtifact } from 'ethereum-types'; import * as Exchange from '../generated-artifacts/Exchange.json'; import * as ExchangeWrapper from '../generated-artifacts/ExchangeWrapper.json'; +import * as IAssetProxy from '../generated-artifacts/IAssetProxy.json'; import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispatcher.json'; import * as IEIP1271Wallet from '../generated-artifacts/IEIP1271Wallet.json'; import * as IExchange from '../generated-artifacts/IExchange.json'; import * as IExchangeCore from '../generated-artifacts/IExchangeCore.json'; +import * as IExchangeRichErrors from '../generated-artifacts/IExchangeRichErrors.json'; import * as IMatchOrders from '../generated-artifacts/IMatchOrders.json'; import * as ISignatureValidator from '../generated-artifacts/ISignatureValidator.json'; import * as ITransactions from '../generated-artifacts/ITransactions.json'; +import * as ITransferSimulator from '../generated-artifacts/ITransferSimulator.json'; import * as IWallet from '../generated-artifacts/IWallet.json'; import * as IWrapperFunctions from '../generated-artifacts/IWrapperFunctions.json'; import * as IsolatedExchange from '../generated-artifacts/IsolatedExchange.json'; +import * as LibExchangeRichErrorDecoder from '../generated-artifacts/LibExchangeRichErrorDecoder.json'; +import * as LibExchangeRichErrors from '../generated-artifacts/LibExchangeRichErrors.json'; +import * as MixinAssetProxyDispatcher from '../generated-artifacts/MixinAssetProxyDispatcher.json'; +import * as MixinExchangeCore from '../generated-artifacts/MixinExchangeCore.json'; +import * as MixinMatchOrders from '../generated-artifacts/MixinMatchOrders.json'; +import * as MixinSignatureValidator from '../generated-artifacts/MixinSignatureValidator.json'; +import * as MixinTransactions from '../generated-artifacts/MixinTransactions.json'; +import * as MixinTransferSimulator from '../generated-artifacts/MixinTransferSimulator.json'; +import * as MixinWrapperFunctions from '../generated-artifacts/MixinWrapperFunctions.json'; import * as ReentrancyTester from '../generated-artifacts/ReentrancyTester.json'; import * as TestAssetProxyDispatcher from '../generated-artifacts/TestAssetProxyDispatcher.json'; import * as TestExchangeInternals from '../generated-artifacts/TestExchangeInternals.json'; @@ -29,15 +41,27 @@ export const artifacts = { ExchangeWrapper: ExchangeWrapper as ContractArtifact, Whitelist: Whitelist as ContractArtifact, Exchange: Exchange as ContractArtifact, + LibExchangeRichErrors: LibExchangeRichErrors as ContractArtifact, + MixinAssetProxyDispatcher: MixinAssetProxyDispatcher as ContractArtifact, + MixinExchangeCore: MixinExchangeCore as ContractArtifact, + MixinMatchOrders: MixinMatchOrders as ContractArtifact, + MixinSignatureValidator: MixinSignatureValidator as ContractArtifact, + MixinTransactions: MixinTransactions as ContractArtifact, + MixinTransferSimulator: MixinTransferSimulator as ContractArtifact, + MixinWrapperFunctions: MixinWrapperFunctions as ContractArtifact, + IAssetProxy: IAssetProxy as ContractArtifact, IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact, IEIP1271Wallet: IEIP1271Wallet as ContractArtifact, IExchange: IExchange as ContractArtifact, IExchangeCore: IExchangeCore as ContractArtifact, + IExchangeRichErrors: IExchangeRichErrors as ContractArtifact, IMatchOrders: IMatchOrders as ContractArtifact, ISignatureValidator: ISignatureValidator as ContractArtifact, ITransactions: ITransactions as ContractArtifact, + ITransferSimulator: ITransferSimulator as ContractArtifact, IWallet: IWallet as ContractArtifact, IWrapperFunctions: IWrapperFunctions as ContractArtifact, + LibExchangeRichErrorDecoder: LibExchangeRichErrorDecoder as ContractArtifact, IsolatedExchange: IsolatedExchange as ContractArtifact, ReentrancyTester: ReentrancyTester as ContractArtifact, TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact, diff --git a/contracts/exchange/src/wrappers.ts b/contracts/exchange/src/wrappers.ts index 63165e9a40..e3dcaabf84 100644 --- a/contracts/exchange/src/wrappers.ts +++ b/contracts/exchange/src/wrappers.ts @@ -5,16 +5,28 @@ */ export * from '../generated-wrappers/exchange'; export * from '../generated-wrappers/exchange_wrapper'; +export * from '../generated-wrappers/i_asset_proxy'; export * from '../generated-wrappers/i_asset_proxy_dispatcher'; export * from '../generated-wrappers/i_e_i_p1271_wallet'; export * from '../generated-wrappers/i_exchange'; export * from '../generated-wrappers/i_exchange_core'; +export * from '../generated-wrappers/i_exchange_rich_errors'; export * from '../generated-wrappers/i_match_orders'; export * from '../generated-wrappers/i_signature_validator'; export * from '../generated-wrappers/i_transactions'; +export * from '../generated-wrappers/i_transfer_simulator'; export * from '../generated-wrappers/i_wallet'; export * from '../generated-wrappers/i_wrapper_functions'; export * from '../generated-wrappers/isolated_exchange'; +export * from '../generated-wrappers/lib_exchange_rich_error_decoder'; +export * from '../generated-wrappers/lib_exchange_rich_errors'; +export * from '../generated-wrappers/mixin_asset_proxy_dispatcher'; +export * from '../generated-wrappers/mixin_exchange_core'; +export * from '../generated-wrappers/mixin_match_orders'; +export * from '../generated-wrappers/mixin_signature_validator'; +export * from '../generated-wrappers/mixin_transactions'; +export * from '../generated-wrappers/mixin_transfer_simulator'; +export * from '../generated-wrappers/mixin_wrapper_functions'; export * from '../generated-wrappers/reentrancy_tester'; export * from '../generated-wrappers/test_asset_proxy_dispatcher'; export * from '../generated-wrappers/test_exchange_internals'; diff --git a/contracts/exchange/tsconfig.json b/contracts/exchange/tsconfig.json index c2cb29514d..9902e10cef 100644 --- a/contracts/exchange/tsconfig.json +++ b/contracts/exchange/tsconfig.json @@ -5,17 +5,30 @@ "files": [ "generated-artifacts/Exchange.json", "generated-artifacts/ExchangeWrapper.json", + "generated-artifacts/IAssetProxy.json", "generated-artifacts/IAssetProxyDispatcher.json", "generated-artifacts/IEIP1271Wallet.json", "generated-artifacts/IExchange.json", "generated-artifacts/IExchangeCore.json", + "generated-artifacts/IExchangeRichErrors.json", "generated-artifacts/IMatchOrders.json", "generated-artifacts/ISignatureValidator.json", "generated-artifacts/ITransactions.json", + "generated-artifacts/ITransferSimulator.json", "generated-artifacts/IWallet.json", "generated-artifacts/IWrapperFunctions.json", "generated-artifacts/IsolatedExchange.json", "generated-artifacts/ReentrancyTester.json", + "generated-artifacts/LibExchangeRichErrorDecoder.json", + "generated-artifacts/LibExchangeRichErrors.json", + "generated-artifacts/MixinAssetProxyDispatcher.json", + "generated-artifacts/MixinExchangeCore.json", + "generated-artifacts/MixinMatchOrders.json", + "generated-artifacts/MixinSignatureValidator.json", + "generated-artifacts/MixinTransactions.json", + "generated-artifacts/MixinTransferSimulator.json", + "generated-artifacts/MixinWrapperFunctions.json", + "generated-artifacts/ReentrantERC20Token.json", "generated-artifacts/TestAssetProxyDispatcher.json", "generated-artifacts/TestExchangeInternals.json", "generated-artifacts/TestLibExchangeRichErrorDecoder.json", diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json index c0b4437500..6b74c612c2 100644 --- a/contracts/extensions/compiler.json +++ b/contracts/extensions/compiler.json @@ -22,13 +22,5 @@ ] } } - }, - "contracts": [ - "@0x/contracts-erc20/contracts/src/WETH9.sol", - "@0x/contracts-exchange/contracts/examples/ExchangeWrapper.sol", - "@0x/contracts-exchange/contracts/src/Exchange.sol", - "src/BalanceThresholdFilter/BalanceThresholdFilter.sol", - "src/DutchAuction/DutchAuction.sol", - "src/OrderMatcher/OrderMatcher.sol" - ] + } } diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index 72293c9d02..b541141ede 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/contracts/multisig/compiler.json b/contracts/multisig/compiler.json index 4a7bf2d3bf..6b74c612c2 100644 --- a/contracts/multisig/compiler.json +++ b/contracts/multisig/compiler.json @@ -22,12 +22,5 @@ ] } } - }, - "contracts": [ - "src/AssetProxyOwner.sol", - "src/MultiSigWallet.sol", - "src/MultiSigWalletWithTimeLock.sol", - "test/TestAssetProxyOwner.sol", - "test/TestRejectEther.sol" - ] + } } diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 864618515c..a5652fe4eb 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/contracts/staking/compiler.json b/contracts/staking/compiler.json index 31b20970a6..f432301d36 100644 --- a/contracts/staking/compiler.json +++ b/contracts/staking/compiler.json @@ -21,6 +21,5 @@ ] } } - }, - "contracts": ["src/IStaking.sol", "src/Staking.sol"] + } } diff --git a/contracts/staking/package.json b/contracts/staking/package.json index 1273b0c1c9..f016f820bf 100644 --- a/contracts/staking/package.json +++ b/contracts/staking/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", diff --git a/contracts/utils/compiler.json b/contracts/utils/compiler.json index bf60cf6ad5..6b74c612c2 100644 --- a/contracts/utils/compiler.json +++ b/contracts/utils/compiler.json @@ -22,25 +22,5 @@ ] } } - }, - "contracts": [ - "src/Authorizable.sol", - "src/LibAddress.sol", - "src/LibBytes.sol", - "src/LibEIP1271.sol", - "src/LibEIP712.sol", - "src/Ownable.sol", - "src/ReentrancyGuard.sol", - "src/SafeMath.sol", - "src/interfaces/IAuthorizable.sol", - "src/interfaces/IOwnable.sol", - "test/TestLibAddress.sol", - "test/TestLibAddressArray.sol", - "test/TestLibBytes.sol", - "test/TestLibEIP712.sol", - "test/TestLibRichErrors.sol", - "test/TestOwnable.sol", - "test/TestReentrancyGuard.sol", - "test/TestSafeMath.sol" - ] + } } diff --git a/contracts/utils/package.json b/contracts/utils/package.json index 2d9a6c475a..a80aa90c4b 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile generate_contract_wrappers", + "pre_build": "run-s compile contracts:gen generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", @@ -34,7 +34,7 @@ "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "./generated-artifacts/@(Authorizable|IAuthorizable|IOwnable|LibAddress|LibBytes|LibEIP1271|LibEIP712|Ownable|ReentrancyGuard|SafeMath|TestLibAddress|TestLibAddressArray|TestLibBytes|TestLibEIP712|TestLibRichErrors|TestOwnable|TestReentrancyGuard|TestSafeMath).json", + "abis": "./generated-artifacts/@(Authorizable|IAuthorizable|IOwnable|LibAddress|LibAddressArray|LibAddressArrayRichErrors|LibAuthorizableRichErrors|LibBytes|LibBytesRichErrors|LibEIP1271|LibEIP712|LibOwnableRichErrors|LibReentrancyGuardRichErrors|LibRichErrors|LibSafeMath|LibSafeMathRichErrors|Ownable|ReentrancyGuard|SafeMath|TestLibAddress|TestLibAddressArray|TestLibBytes|TestLibEIP712|TestLibRichErrors|TestOwnable|TestReentrancyGuard|TestSafeMath).json", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { diff --git a/contracts/utils/src/artifacts.ts b/contracts/utils/src/artifacts.ts index 200c6c8946..8c91c30ca1 100644 --- a/contracts/utils/src/artifacts.ts +++ b/contracts/utils/src/artifacts.ts @@ -9,9 +9,18 @@ import * as Authorizable from '../generated-artifacts/Authorizable.json'; import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json'; import * as IOwnable from '../generated-artifacts/IOwnable.json'; import * as LibAddress from '../generated-artifacts/LibAddress.json'; +import * as LibAddressArray from '../generated-artifacts/LibAddressArray.json'; +import * as LibAddressArrayRichErrors from '../generated-artifacts/LibAddressArrayRichErrors.json'; +import * as LibAuthorizableRichErrors from '../generated-artifacts/LibAuthorizableRichErrors.json'; import * as LibBytes from '../generated-artifacts/LibBytes.json'; +import * as LibBytesRichErrors from '../generated-artifacts/LibBytesRichErrors.json'; import * as LibEIP1271 from '../generated-artifacts/LibEIP1271.json'; import * as LibEIP712 from '../generated-artifacts/LibEIP712.json'; +import * as LibOwnableRichErrors from '../generated-artifacts/LibOwnableRichErrors.json'; +import * as LibReentrancyGuardRichErrors from '../generated-artifacts/LibReentrancyGuardRichErrors.json'; +import * as LibRichErrors from '../generated-artifacts/LibRichErrors.json'; +import * as LibSafeMath from '../generated-artifacts/LibSafeMath.json'; +import * as LibSafeMathRichErrors from '../generated-artifacts/LibSafeMathRichErrors.json'; import * as Ownable from '../generated-artifacts/Ownable.json'; import * as ReentrancyGuard from '../generated-artifacts/ReentrancyGuard.json'; import * as SafeMath from '../generated-artifacts/SafeMath.json'; @@ -26,9 +35,18 @@ import * as TestSafeMath from '../generated-artifacts/TestSafeMath.json'; export const artifacts = { Authorizable: Authorizable as ContractArtifact, LibAddress: LibAddress as ContractArtifact, + LibAddressArray: LibAddressArray as ContractArtifact, + LibAddressArrayRichErrors: LibAddressArrayRichErrors as ContractArtifact, + LibAuthorizableRichErrors: LibAuthorizableRichErrors as ContractArtifact, LibBytes: LibBytes as ContractArtifact, + LibBytesRichErrors: LibBytesRichErrors as ContractArtifact, LibEIP1271: LibEIP1271 as ContractArtifact, LibEIP712: LibEIP712 as ContractArtifact, + LibOwnableRichErrors: LibOwnableRichErrors as ContractArtifact, + LibReentrancyGuardRichErrors: LibReentrancyGuardRichErrors as ContractArtifact, + LibRichErrors: LibRichErrors as ContractArtifact, + LibSafeMath: LibSafeMath as ContractArtifact, + LibSafeMathRichErrors: LibSafeMathRichErrors as ContractArtifact, Ownable: Ownable as ContractArtifact, ReentrancyGuard: ReentrancyGuard as ContractArtifact, SafeMath: SafeMath as ContractArtifact, diff --git a/contracts/utils/src/wrappers.ts b/contracts/utils/src/wrappers.ts index 0e3eb5afce..f2562b9d7e 100644 --- a/contracts/utils/src/wrappers.ts +++ b/contracts/utils/src/wrappers.ts @@ -7,9 +7,18 @@ export * from '../generated-wrappers/authorizable'; export * from '../generated-wrappers/i_authorizable'; export * from '../generated-wrappers/i_ownable'; export * from '../generated-wrappers/lib_address'; +export * from '../generated-wrappers/lib_address_array'; +export * from '../generated-wrappers/lib_address_array_rich_errors'; +export * from '../generated-wrappers/lib_authorizable_rich_errors'; export * from '../generated-wrappers/lib_bytes'; +export * from '../generated-wrappers/lib_bytes_rich_errors'; export * from '../generated-wrappers/lib_e_i_p1271'; export * from '../generated-wrappers/lib_e_i_p712'; +export * from '../generated-wrappers/lib_ownable_rich_errors'; +export * from '../generated-wrappers/lib_reentrancy_guard_rich_errors'; +export * from '../generated-wrappers/lib_rich_errors'; +export * from '../generated-wrappers/lib_safe_math'; +export * from '../generated-wrappers/lib_safe_math_rich_errors'; export * from '../generated-wrappers/ownable'; export * from '../generated-wrappers/reentrancy_guard'; export * from '../generated-wrappers/safe_math'; diff --git a/contracts/utils/tsconfig.json b/contracts/utils/tsconfig.json index 252ed38f93..61768eaa2f 100644 --- a/contracts/utils/tsconfig.json +++ b/contracts/utils/tsconfig.json @@ -7,9 +7,18 @@ "generated-artifacts/IAuthorizable.json", "generated-artifacts/IOwnable.json", "generated-artifacts/LibAddress.json", + "generated-artifacts/LibAddressArray.json", + "generated-artifacts/LibAddressArrayRichErrors.json", + "generated-artifacts/LibAuthorizableRichErrors.json", "generated-artifacts/LibBytes.json", + "generated-artifacts/LibBytesRichErrors.json", "generated-artifacts/LibEIP1271.json", "generated-artifacts/LibEIP712.json", + "generated-artifacts/LibOwnableRichErrors.json", + "generated-artifacts/LibReentrancyGuardRichErrors.json", + "generated-artifacts/LibRichErrors.json", + "generated-artifacts/LibSafeMath.json", + "generated-artifacts/LibSafeMathRichErrors.json", "generated-artifacts/Ownable.json", "generated-artifacts/ReentrancyGuard.json", "generated-artifacts/SafeMath.json",