Cleanup

0xProject · Mar 8, 2019 · 4555310 · 4555310
1 parent 2f7dd17
commit 4555310
Show file tree

Hide file tree

Showing 35 changed files with 54 additions and 147 deletions.
diff --git a/contracts/asset-proxy/compiler.json b/contracts/asset-proxy/compiler.json
@@ -8,12 +8,7 @@
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
-            "details": {
-                "yul": true,
-                "deduplicate": true,
-                "cse": true,
-                "constantOptimizer": true
-            }
+            "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
         },
         "outputSelection": {
             "*": {

diff --git a/contracts/asset-proxy/tsconfig.json b/contracts/asset-proxy/tsconfig.json
@@ -3,11 +3,6 @@
     "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "generated-artifacts/DummyERC20Token.json",
-        "generated-artifacts/DummyERC721Receiver.json",
-        "generated-artifacts/DummyERC721Token.json",
-        "generated-artifacts/DummyMultipleReturnERC20Token.json",
-        "generated-artifacts/DummyNoReturnERC20Token.json",
         "generated-artifacts/ERC20Proxy.json",
         "generated-artifacts/ERC721Proxy.json",
         "generated-artifacts/IAssetData.json",

diff --git a/contracts/coordinator/compiler.json b/contracts/coordinator/compiler.json
@@ -7,12 +7,7 @@
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
-            "details": {
-                "yul": true,
-                "deduplicate": true,
-                "cse": true,
-                "constantOptimizer": true
-            }
+            "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
         },
         "outputSelection": {
             "*": {

diff --git a/contracts/coordinator/contracts/src/registry/CoordinatorRegistry.sol b/contracts/coordinator/contracts/src/registry/CoordinatorRegistry.sol
@@ -16,8 +16,7 @@
 
 */
 
-pragma solidity 0.5.3;
-pragma experimental ABIEncoderV2;
+pragma solidity 0.5.5;
 
 import "./MixinCoordinatorRegistryCore.sol";
 

diff --git a/contracts/coordinator/contracts/src/registry/MixinCoordinatorRegistryCore.sol b/contracts/coordinator/contracts/src/registry/MixinCoordinatorRegistryCore.sol
@@ -16,8 +16,7 @@
 
 */
 
-pragma solidity 0.5.3;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.5;
 
 import "./interfaces/ICoordinatorRegistryCore.sol";
 

diff --git a/contracts/coordinator/contracts/src/registry/interfaces/ICoordinatorRegistryCore.sol b/contracts/coordinator/contracts/src/registry/interfaces/ICoordinatorRegistryCore.sol
@@ -16,8 +16,7 @@
 
 */
 
-pragma solidity 0.5.3;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.5;
 
 
 // solhint-disable no-empty-blocks

diff --git a/contracts/erc20/compiler.json b/contracts/erc20/compiler.json
@@ -8,12 +8,7 @@
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
-            "details": {
-                "yul": true,
-                "deduplicate": true,
-                "cse": true,
-                "constantOptimizer": true
-            }
+            "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
         },
         "outputSelection": {
             "*": {

diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json
@@ -33,7 +33,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IEtherToken|MintableERC20Token|ReentrantERC20Token|UnlimitedAllowanceERC20Token|WETH9|ZRXToken).json",
+        "abis": "./generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IEtherToken|MintableERC20Token|UnlimitedAllowanceERC20Token|WETH9|ZRXToken).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

diff --git a/contracts/erc20/tsconfig.json b/contracts/erc20/tsconfig.json
@@ -10,7 +10,6 @@
         "generated-artifacts/IERC20Token.json",
         "generated-artifacts/IEtherToken.json",
         "generated-artifacts/MintableERC20Token.json",
-        "generated-artifacts/ReentrantERC20Token.json",
         "generated-artifacts/UnlimitedAllowanceERC20Token.json",
         "generated-artifacts/WETH9.json",
         "generated-artifacts/ZRXToken.json"

diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json
@@ -8,12 +8,7 @@
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
-            "details": {
-                "yul": true,
-                "deduplicate": true,
-                "cse": true,
-                "constantOptimizer": true
-            }
+            "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
         },
         "outputSelection": {
             "*": {

diff --git a/contracts/exchange-forwarder/compiler.json b/contracts/exchange-forwarder/compiler.json
@@ -8,12 +8,7 @@
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
-            "details": {
-                "yul": true,
-                "deduplicate": true,
-                "cse": true,
-                "constantOptimizer": true
-            }
+            "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
         },
         "outputSelection": {
             "*": {

diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json
@@ -33,7 +33,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Token|Exchange|Forwarder|WETH9).json",
+        "abis": "./generated-artifacts/@(Forwarder).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

diff --git a/contracts/exchange-forwarder/src/artifacts.ts b/contracts/exchange-forwarder/src/artifacts.ts
@@ -6,6 +6,4 @@
 import { ContractArtifact } from 'ethereum-types';
 
 import * as Forwarder from '../generated-artifacts/Forwarder.json';
-export const artifacts = {
-    Forwarder: Forwarder as ContractArtifact,
-};
+export const artifacts = { Forwarder: Forwarder as ContractArtifact };
diff --git a/contracts/exchange-forwarder/tsconfig.json b/contracts/exchange-forwarder/tsconfig.json
@@ -2,12 +2,6 @@
     "extends": "../../tsconfig",
     "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
-    "files": [
-        "generated-artifacts/DummyERC20Token.json",
-        "generated-artifacts/DummyERC721Token.json",
-        "generated-artifacts/Exchange.json",
-        "generated-artifacts/Forwarder.json",
-        "generated-artifacts/WETH9.json"
-    ],
+    "files": ["generated-artifacts/Forwarder.json"],
     "exclude": ["./deploy/solc/solc_bin"]
 }
diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json
@@ -8,12 +8,7 @@
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
-            "details": {
-                "yul": true,
-                "deduplicate": true,
-                "cse": true,
-                "constantOptimizer": true
-            }
+            "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
         },
         "outputSelection": {
             "*": {

diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json
@@ -8,12 +8,7 @@
         "optimizer": {
             "enabled": true,
             "runs": 1000000,
-            "details": {
-                "yul": true,
-                "deduplicate": true,
-                "cse": true,
-                "constantOptimizer": true
-            }
+            "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
         },
         "outputSelection": {
             "*": {
@@ -42,10 +37,10 @@
         "src/interfaces/IValidator.sol",
         "src/interfaces/IWallet.sol",
         "src/interfaces/IWrapperFunctions.sol",
+        "test/ReentrantERC20Token.sol",
         "test/TestAssetProxyDispatcher.sol",
         "test/TestExchangeInternals.sol",
         "test/TestSignatureValidator.sol",
-        "test/TestStaticCallReceiver.sol",
-        "test/ReentrantERC20Token.sol"
+        "test/TestStaticCallReceiver.sol"
     ]
 }
diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json
@@ -33,7 +33,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IValidator|IWallet|IWrapperFunctions|MultiAssetProxy|ReentrantERC20Token|TestAssetProxyDispatcher|TestExchangeInternals|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist).json",
+        "abis": "./generated-artifacts/@(Exchange|ExchangeWrapper|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IValidator|IWallet|IWrapperFunctions|ReentrantERC20Token|TestAssetProxyDispatcher|TestExchangeInternals|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

diff --git a/contracts/exchange/src/artifacts.ts b/contracts/exchange/src/artifacts.ts
@@ -5,11 +5,6 @@
  */
 import { ContractArtifact } from 'ethereum-types';
 
-import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
-import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
-import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json';
-import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json';
-import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
 import * as Exchange from '../generated-artifacts/Exchange.json';
 import * as ExchangeWrapper from '../generated-artifacts/ExchangeWrapper.json';
 import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispatcher.json';
@@ -21,25 +16,15 @@ import * as ITransactions from '../generated-artifacts/ITransactions.json';
 import * as IValidator from '../generated-artifacts/IValidator.json';
 import * as IWallet from '../generated-artifacts/IWallet.json';
 import * as IWrapperFunctions from '../generated-artifacts/IWrapperFunctions.json';
-import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json';
 import * as ReentrantERC20Token from '../generated-artifacts/ReentrantERC20Token.json';
 import * as TestAssetProxyDispatcher from '../generated-artifacts/TestAssetProxyDispatcher.json';
 import * as TestExchangeInternals from '../generated-artifacts/TestExchangeInternals.json';
-import * as TestLibs from '../generated-artifacts/TestLibs.json';
 import * as TestSignatureValidator from '../generated-artifacts/TestSignatureValidator.json';
 import * as TestStaticCallReceiver from '../generated-artifacts/TestStaticCallReceiver.json';
 import * as Validator from '../generated-artifacts/Validator.json';
 import * as Wallet from '../generated-artifacts/Wallet.json';
 import * as Whitelist from '../generated-artifacts/Whitelist.json';
 export const artifacts = {
-    ERC20Proxy: ERC20Proxy as ContractArtifact,
-    ERC721Proxy: ERC721Proxy as ContractArtifact,
-    MultiAssetProxy: MultiAssetProxy as ContractArtifact,
-    DummyERC20Token: DummyERC20Token as ContractArtifact,
-    DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
-    ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
-    DummyERC721Token: DummyERC721Token as ContractArtifact,
-    TestLibs: TestLibs as ContractArtifact,
     ExchangeWrapper: ExchangeWrapper as ContractArtifact,
     Validator: Validator as ContractArtifact,
     Wallet: Wallet as ContractArtifact,
@@ -58,4 +43,5 @@ export const artifacts = {
     TestExchangeInternals: TestExchangeInternals as ContractArtifact,
     TestSignatureValidator: TestSignatureValidator as ContractArtifact,
     TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact,
+    ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
 };
diff --git a/contracts/exchange/src/wrappers.ts b/contracts/exchange/src/wrappers.ts
@@ -3,11 +3,6 @@
  * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
  * -----------------------------------------------------------------------------
  */
-export * from '../generated-wrappers/dummy_erc20_token';
-export * from '../generated-wrappers/dummy_erc721_token';
-export * from '../generated-wrappers/dummy_no_return_erc20_token';
-export * from '../generated-wrappers/erc20_proxy';
-export * from '../generated-wrappers/erc721_proxy';
 export * from '../generated-wrappers/exchange';
 export * from '../generated-wrappers/exchange_wrapper';
 export * from '../generated-wrappers/i_asset_proxy_dispatcher';
@@ -19,11 +14,9 @@ export * from '../generated-wrappers/i_transactions';
 export * from '../generated-wrappers/i_validator';
 export * from '../generated-wrappers/i_wallet';
 export * from '../generated-wrappers/i_wrapper_functions';
-export * from '../generated-wrappers/multi_asset_proxy';
 export * from '../generated-wrappers/reentrant_erc20_token';
 export * from '../generated-wrappers/test_asset_proxy_dispatcher';
 export * from '../generated-wrappers/test_exchange_internals';
-export * from '../generated-wrappers/test_libs';
 export * from '../generated-wrappers/test_signature_validator';
 export * from '../generated-wrappers/test_static_call_receiver';
 export * from '../generated-wrappers/validator';

diff --git a/contracts/exchange/test/core.ts b/contracts/exchange/test/core.ts
@@ -1,11 +1,13 @@
 import {
+    artifacts as proxyArtifacts,
     ERC20ProxyContract,
     ERC20Wrapper,
     ERC721ProxyContract,
     ERC721Wrapper,
     MultiAssetProxyContract,
 } from '@0x/contracts-asset-proxy';
 import {
+    artifacts as erc20Artifacts,
     DummyERC20TokenContract,
     DummyERC20TokenTransferEventArgs,
     DummyNoReturnERC20TokenContract,
@@ -96,7 +98,7 @@ describe('Exchange core', () => {
         erc20Proxy = await erc20Wrapper.deployProxyAsync();
         erc721Proxy = await erc721Wrapper.deployProxyAsync();
         multiAssetProxy = await MultiAssetProxyContract.deployFrom0xArtifactAsync(
-            artifacts.MultiAssetProxy,
+            proxyArtifacts.MultiAssetProxy,
             provider,
             txDefaults,
         );
@@ -343,7 +345,7 @@ describe('Exchange core', () => {
     describe('Testing exchange of ERC20 tokens with no return values', () => {
         before(async () => {
             noReturnErc20Token = await DummyNoReturnERC20TokenContract.deployFrom0xArtifactAsync(
-                artifacts.DummyNoReturnERC20Token,
+                erc20Artifacts.DummyNoReturnERC20Token,
                 provider,
                 txDefaults,
                 constants.DUMMY_TOKEN_NAME,

diff --git a/contracts/exchange/test/dispatcher.ts b/contracts/exchange/test/dispatcher.ts
@@ -1,4 +1,10 @@
-import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
+import {
+    artifacts as proxyArtifacts,
+    ERC20ProxyContract,
+    ERC20Wrapper,
+    ERC721ProxyContract,
+    ERC721Wrapper,
+} from '@0x/contracts-asset-proxy';
 import { DummyERC20TokenContract } from '@0x/contracts-erc20';
 import {
     chaiSetup,
@@ -125,7 +131,7 @@ describe('AssetProxyDispatcher', () => {
             expect(proxyAddress).to.be.equal(erc20Proxy.address);
             // Deploy a new version of the ERC20 Transfer Proxy contract
             const newErc20TransferProxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(
-                artifacts.ERC20Proxy,
+                proxyArtifacts.ERC20Proxy,
                 provider,
                 txDefaults,
             );

diff --git a/contracts/exchange/test/utils/exchange_wrapper.ts b/contracts/exchange/test/utils/exchange_wrapper.ts
@@ -1,3 +1,5 @@
+import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
+import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
 import {
     FillResults,
     formatters,
@@ -23,7 +25,7 @@ export class ExchangeWrapper {
     constructor(exchangeContract: ExchangeContract, provider: Web3ProviderEngine | ZeroExProvider) {
         this._exchange = exchangeContract;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
+        this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...erc20Artifacts, ...erc721Artifacts });
     }
     public async fillOrderAsync(
         signedOrder: SignedOrder,

diff --git a/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts b/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts
@@ -1,4 +1,5 @@
 import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
+import { artifacts as libsArtifacts, TestLibsContract } from '@0x/contracts-exchange-libs';
 import {
     AllowanceAmountScenario,
     AssetDataScenario,
@@ -33,7 +34,7 @@ import { LogWithDecodedArgs, TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 import 'make-promises-safe';
 
-import { artifacts, ExchangeContract, ExchangeFillEventArgs, TestLibsContract } from '../../src';
+import { artifacts, ExchangeContract, ExchangeFillEventArgs } from '../../src';
 
 import { AssetWrapper } from './asset_wrapper';
 import { ExchangeWrapper } from './exchange_wrapper';
@@ -130,7 +131,11 @@ export async function fillOrderCombinatorialUtilsFactoryAsync(
         exchangeContract.address,
     );
 
-    const testLibsContract = await TestLibsContract.deployFrom0xArtifactAsync(artifacts.TestLibs, provider, txDefaults);
+    const testLibsContract = await TestLibsContract.deployFrom0xArtifactAsync(
+        libsArtifacts.TestLibs,
+        provider,
+        txDefaults,
+    );
 
     const fillOrderCombinatorialUtils = new FillOrderCombinatorialUtils(
         orderFactory,

diff --git a/contracts/exchange/tsconfig.json b/contracts/exchange/tsconfig.json
@@ -3,11 +3,6 @@
     "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "generated-artifacts/DummyERC20Token.json",
-        "generated-artifacts/DummyERC721Token.json",
-        "generated-artifacts/DummyNoReturnERC20Token.json",
-        "generated-artifacts/ERC20Proxy.json",
-        "generated-artifacts/ERC721Proxy.json",
         "generated-artifacts/Exchange.json",
         "generated-artifacts/ExchangeWrapper.json",
         "generated-artifacts/IAssetProxyDispatcher.json",
@@ -19,11 +14,9 @@
         "generated-artifacts/IValidator.json",
         "generated-artifacts/IWallet.json",
         "generated-artifacts/IWrapperFunctions.json",
-        "generated-artifacts/MultiAssetProxy.json",
         "generated-artifacts/ReentrantERC20Token.json",
         "generated-artifacts/TestAssetProxyDispatcher.json",
         "generated-artifacts/TestExchangeInternals.json",
-        "generated-artifacts/TestLibs.json",
         "generated-artifacts/TestSignatureValidator.json",
         "generated-artifacts/TestStaticCallReceiver.json",
         "generated-artifacts/Validator.json",