crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Amir Bandeali 2019-03-07 19:36:26 -08:00
parent 2f7dd177c1
commit 22af796302
36 changed files with 56 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/asset-proxy/compiler.json
View File

@ -8,12 +8,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {

4
contracts/asset-proxy/test/proxies.ts
View File

@ -568,7 +568,7 @@ describe('Asset Transfer Proxies', () => {
erc721Receiver.address, erc721Receiver.address,
amount, amount,
); );
const logDecoder = new LogDecoder(web3Wrapper, artifacts); const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc721Artifacts });
const tx = await logDecoder.getTxWithDecodedLogsAsync( const tx = await logDecoder.getTxWithDecodedLogsAsync(
await web3Wrapper.sendTransactionAsync({ await web3Wrapper.sendTransactionAsync({
to: erc721Proxy.address, to: erc721Proxy.address,
@ -760,7 +760,7 @@ describe('Asset Transfer Proxies', () => {
inputAmount, inputAmount,
); );
const erc20Balances = await erc20Wrapper.getBalancesAsync(); const erc20Balances = await erc20Wrapper.getBalancesAsync();
const logDecoder = new LogDecoder(web3Wrapper, artifacts); const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts });
const tx = await logDecoder.getTxWithDecodedLogsAsync( const tx = await logDecoder.getTxWithDecodedLogsAsync(
await web3Wrapper.sendTransactionAsync({ await web3Wrapper.sendTransactionAsync({
to: multiAssetProxy.address, to: multiAssetProxy.address,

5
contracts/asset-proxy/tsconfig.json
View File

@ -3,11 +3,6 @@
"compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [ "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/ERC20Proxy.json",
"generated-artifacts/ERC721Proxy.json", "generated-artifacts/ERC721Proxy.json",
"generated-artifacts/IAssetData.json", "generated-artifacts/IAssetData.json",

7
contracts/coordinator/compiler.json
View File

@ -7,12 +7,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {

3
contracts/coordinator/contracts/src/registry/CoordinatorRegistry.sol
View File

@ -16,8 +16,7 @@
*/ */
pragma solidity 0.5.3; pragma solidity 0.5.5;
pragma experimental ABIEncoderV2;
import "./MixinCoordinatorRegistryCore.sol"; import "./MixinCoordinatorRegistryCore.sol";

3
contracts/coordinator/contracts/src/registry/MixinCoordinatorRegistryCore.sol
View File

@ -16,8 +16,7 @@
*/ */
pragma solidity 0.5.3; pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "./interfaces/ICoordinatorRegistryCore.sol"; import "./interfaces/ICoordinatorRegistryCore.sol";

3
contracts/coordinator/contracts/src/registry/interfaces/ICoordinatorRegistryCore.sol
View File

@ -16,8 +16,7 @@
*/ */
pragma solidity 0.5.3; pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
// solhint-disable no-empty-blocks // solhint-disable no-empty-blocks

7
contracts/erc20/compiler.json
View File

@ -8,12 +8,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {

2
contracts/erc20/package.json
View File

@ -33,7 +33,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
}, },
"config": { "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." "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
}, },
"repository": { "repository": {

1
contracts/erc20/tsconfig.json
View File

@ -10,7 +10,6 @@
"generated-artifacts/IERC20Token.json", "generated-artifacts/IERC20Token.json",
"generated-artifacts/IEtherToken.json", "generated-artifacts/IEtherToken.json",
"generated-artifacts/MintableERC20Token.json", "generated-artifacts/MintableERC20Token.json",
"generated-artifacts/ReentrantERC20Token.json",
"generated-artifacts/UnlimitedAllowanceERC20Token.json", "generated-artifacts/UnlimitedAllowanceERC20Token.json",
"generated-artifacts/WETH9.json", "generated-artifacts/WETH9.json",
"generated-artifacts/ZRXToken.json" "generated-artifacts/ZRXToken.json"

7
contracts/erc721/compiler.json
View File

@ -8,12 +8,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {

7
contracts/exchange-forwarder/compiler.json
View File

@ -8,12 +8,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {

2
contracts/exchange-forwarder/package.json
View File

@ -33,7 +33,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
}, },
"config": { "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." "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
}, },
"repository": { "repository": {

4
contracts/exchange-forwarder/src/artifacts.ts
View File

@ -6,6 +6,4 @@
import { ContractArtifact } from 'ethereum-types'; import { ContractArtifact } from 'ethereum-types';
import * as Forwarder from '../generated-artifacts/Forwarder.json'; import * as Forwarder from '../generated-artifacts/Forwarder.json';
export const artifacts = { export const artifacts = { Forwarder: Forwarder as ContractArtifact };
Forwarder: Forwarder as ContractArtifact,
};

8
contracts/exchange-forwarder/tsconfig.json
View File

@ -2,12 +2,6 @@
"extends": "../../tsconfig", "extends": "../../tsconfig",
"compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [ "files": ["generated-artifacts/Forwarder.json"],
"generated-artifacts/DummyERC20Token.json",
"generated-artifacts/DummyERC721Token.json",
"generated-artifacts/Exchange.json",
"generated-artifacts/Forwarder.json",
"generated-artifacts/WETH9.json"
],
"exclude": ["./deploy/solc/solc_bin"] "exclude": ["./deploy/solc/solc_bin"]
} }

7
contracts/exchange-libs/compiler.json
View File

@ -8,12 +8,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {

11
contracts/exchange/compiler.json
View File

@ -8,12 +8,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {
@ -42,10 +37,10 @@
"src/interfaces/IValidator.sol", "src/interfaces/IValidator.sol",
"src/interfaces/IWallet.sol", "src/interfaces/IWallet.sol",
"src/interfaces/IWrapperFunctions.sol", "src/interfaces/IWrapperFunctions.sol",
"test/ReentrantERC20Token.sol",
"test/TestAssetProxyDispatcher.sol", "test/TestAssetProxyDispatcher.sol",
"test/TestExchangeInternals.sol", "test/TestExchangeInternals.sol",
"test/TestSignatureValidator.sol", "test/TestSignatureValidator.sol",
"test/TestStaticCallReceiver.sol", "test/TestStaticCallReceiver.sol"
"test/ReentrantERC20Token.sol"
] ]
} }

2
contracts/exchange/package.json
View File

@ -33,7 +33,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
}, },
"config": { "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." "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
}, },
"repository": { "repository": {

16
contracts/exchange/src/artifacts.ts
View File

@ -5,11 +5,6 @@
*/ */
import { ContractArtifact } from 'ethereum-types'; 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 Exchange from '../generated-artifacts/Exchange.json';
import * as ExchangeWrapper from '../generated-artifacts/ExchangeWrapper.json'; import * as ExchangeWrapper from '../generated-artifacts/ExchangeWrapper.json';
import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispatcher.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 IValidator from '../generated-artifacts/IValidator.json';
import * as IWallet from '../generated-artifacts/IWallet.json'; import * as IWallet from '../generated-artifacts/IWallet.json';
import * as IWrapperFunctions from '../generated-artifacts/IWrapperFunctions.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 ReentrantERC20Token from '../generated-artifacts/ReentrantERC20Token.json';
import * as TestAssetProxyDispatcher from '../generated-artifacts/TestAssetProxyDispatcher.json'; import * as TestAssetProxyDispatcher from '../generated-artifacts/TestAssetProxyDispatcher.json';
import * as TestExchangeInternals from '../generated-artifacts/TestExchangeInternals.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 TestSignatureValidator from '../generated-artifacts/TestSignatureValidator.json';
import * as TestStaticCallReceiver from '../generated-artifacts/TestStaticCallReceiver.json'; import * as TestStaticCallReceiver from '../generated-artifacts/TestStaticCallReceiver.json';
import * as Validator from '../generated-artifacts/Validator.json'; import * as Validator from '../generated-artifacts/Validator.json';
import * as Wallet from '../generated-artifacts/Wallet.json'; import * as Wallet from '../generated-artifacts/Wallet.json';
import * as Whitelist from '../generated-artifacts/Whitelist.json'; import * as Whitelist from '../generated-artifacts/Whitelist.json';
export const artifacts = { 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, ExchangeWrapper: ExchangeWrapper as ContractArtifact,
Validator: Validator as ContractArtifact, Validator: Validator as ContractArtifact,
Wallet: Wallet as ContractArtifact, Wallet: Wallet as ContractArtifact,
@ -58,4 +43,5 @@ export const artifacts = {
TestExchangeInternals: TestExchangeInternals as ContractArtifact, TestExchangeInternals: TestExchangeInternals as ContractArtifact,
TestSignatureValidator: TestSignatureValidator as ContractArtifact, TestSignatureValidator: TestSignatureValidator as ContractArtifact,
TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact, TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact,
ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
}; };

7
contracts/exchange/src/wrappers.ts
View File

@ -3,11 +3,6 @@
* Warning: This file is auto-generated by contracts-gen. Don't edit manually. * 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';
export * from '../generated-wrappers/exchange_wrapper'; export * from '../generated-wrappers/exchange_wrapper';
export * from '../generated-wrappers/i_asset_proxy_dispatcher'; 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_validator';
export * from '../generated-wrappers/i_wallet'; export * from '../generated-wrappers/i_wallet';
export * from '../generated-wrappers/i_wrapper_functions'; 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/reentrant_erc20_token';
export * from '../generated-wrappers/test_asset_proxy_dispatcher'; export * from '../generated-wrappers/test_asset_proxy_dispatcher';
export * from '../generated-wrappers/test_exchange_internals'; 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_signature_validator';
export * from '../generated-wrappers/test_static_call_receiver'; export * from '../generated-wrappers/test_static_call_receiver';
export * from '../generated-wrappers/validator'; export * from '../generated-wrappers/validator';

6
contracts/exchange/test/core.ts
View File

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

10
contracts/exchange/test/dispatcher.ts
View File

@ -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 { DummyERC20TokenContract } from '@0x/contracts-erc20';
import { import {
chaiSetup, chaiSetup,
@ -125,7 +131,7 @@ describe('AssetProxyDispatcher', () => {
expect(proxyAddress).to.be.equal(erc20Proxy.address); expect(proxyAddress).to.be.equal(erc20Proxy.address);
// Deploy a new version of the ERC20 Transfer Proxy contract // Deploy a new version of the ERC20 Transfer Proxy contract
const newErc20TransferProxy = await ERC20ProxyContract.deployFrom0xArtifactAsync( const newErc20TransferProxy = await ERC20ProxyContract.deployFrom0xArtifactAsync(
artifacts.ERC20Proxy, proxyArtifacts.ERC20Proxy,
provider, provider,
txDefaults, txDefaults,
); );

4
contracts/exchange/test/utils/exchange_wrapper.ts
View File

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

9
contracts/exchange/test/utils/fill_order_combinatorial_utils.ts
View File

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

7
contracts/exchange/tsconfig.json
View File

@ -3,11 +3,6 @@
"compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [ "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/Exchange.json",
"generated-artifacts/ExchangeWrapper.json", "generated-artifacts/ExchangeWrapper.json",
"generated-artifacts/IAssetProxyDispatcher.json", "generated-artifacts/IAssetProxyDispatcher.json",
@ -19,11 +14,9 @@
"generated-artifacts/IValidator.json", "generated-artifacts/IValidator.json",
"generated-artifacts/IWallet.json", "generated-artifacts/IWallet.json",
"generated-artifacts/IWrapperFunctions.json", "generated-artifacts/IWrapperFunctions.json",
"generated-artifacts/MultiAssetProxy.json",
"generated-artifacts/ReentrantERC20Token.json", "generated-artifacts/ReentrantERC20Token.json",
"generated-artifacts/TestAssetProxyDispatcher.json", "generated-artifacts/TestAssetProxyDispatcher.json",
"generated-artifacts/TestExchangeInternals.json", "generated-artifacts/TestExchangeInternals.json",
"generated-artifacts/TestLibs.json",
"generated-artifacts/TestSignatureValidator.json", "generated-artifacts/TestSignatureValidator.json",
"generated-artifacts/TestStaticCallReceiver.json", "generated-artifacts/TestStaticCallReceiver.json",
"generated-artifacts/Validator.json", "generated-artifacts/Validator.json",

7
contracts/extensions/compiler.json
View File

@ -8,12 +8,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {

2
contracts/extensions/package.json
View File

@ -33,7 +33,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
}, },
"config": { "config": {
"abis": "./generated-artifacts/@(BalanceThresholdFilter|DummyERC20Token|DummyERC721Token|DutchAuction|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|OrderMatcher|OrderValidator|WETH9).json", "abis": "./generated-artifacts/@(BalanceThresholdFilter|DutchAuction|Exchange|ExchangeWrapper|OrderMatcher|OrderValidator|WETH9).json",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
}, },
"repository": { "repository": {

7
contracts/extensions/test/utils/dutch_auction_test_wrapper.ts
View File

@ -1,3 +1,4 @@
import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange'; import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
import { LogDecoder, Web3ProviderEngine } from '@0x/contracts-test-utils'; import { LogDecoder, Web3ProviderEngine } from '@0x/contracts-test-utils';
import { DutchAuctionDetails, SignedOrder } from '@0x/types'; import { DutchAuctionDetails, SignedOrder } from '@0x/types';
@ -16,7 +17,11 @@ export class DutchAuctionTestWrapper {
constructor(contractInstance: DutchAuctionContract, provider: Web3ProviderEngine) { constructor(contractInstance: DutchAuctionContract, provider: Web3ProviderEngine) {
this._dutchAuctionContract = contractInstance; this._dutchAuctionContract = contractInstance;
this._web3Wrapper = new Web3Wrapper(provider); this._web3Wrapper = new Web3Wrapper(provider);
this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...exchangeArtifacts }); this._logDecoder = new LogDecoder(this._web3Wrapper, {
...artifacts,
...exchangeArtifacts,
...erc721Artifacts,
});
} }
/** /**
* Matches the buy and sell orders at an amount given the following: the current block time, the auction * Matches the buy and sell orders at an amount given the following: the current block time, the auction

4
contracts/extensions/tsconfig.json
View File

@ -4,11 +4,7 @@
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [ "files": [
"generated-artifacts/BalanceThresholdFilter.json", "generated-artifacts/BalanceThresholdFilter.json",
"generated-artifacts/DummyERC20Token.json",
"generated-artifacts/DummyERC721Token.json",
"generated-artifacts/DutchAuction.json", "generated-artifacts/DutchAuction.json",
"generated-artifacts/ERC20Proxy.json",
"generated-artifacts/ERC721Proxy.json",
"generated-artifacts/Exchange.json", "generated-artifacts/Exchange.json",
"generated-artifacts/ExchangeWrapper.json", "generated-artifacts/ExchangeWrapper.json",
"generated-artifacts/OrderMatcher.json", "generated-artifacts/OrderMatcher.json",

7
contracts/multisig/compiler.json
View File

@ -8,12 +8,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {

2
contracts/multisig/package.json
View File

@ -33,7 +33,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
}, },
"config": { "config": {
"abis": "./generated-artifacts/@(AssetProxyOwner|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestRejectEther).json", "abis": "./generated-artifacts/@(AssetProxyOwner|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestRejectEther).json",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
}, },
"repository": { "repository": {

1
contracts/multisig/tsconfig.json
View File

@ -4,7 +4,6 @@
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [ "files": [
"generated-artifacts/AssetProxyOwner.json", "generated-artifacts/AssetProxyOwner.json",
"generated-artifacts/MixinAuthorizable.json",
"generated-artifacts/MultiSigWallet.json", "generated-artifacts/MultiSigWallet.json",
"generated-artifacts/MultiSigWalletWithTimeLock.json", "generated-artifacts/MultiSigWalletWithTimeLock.json",
"generated-artifacts/TestAssetProxyOwner.json", "generated-artifacts/TestAssetProxyOwner.json",

7
contracts/utils/compiler.json
View File

@ -8,12 +8,7 @@
"optimizer": { "optimizer": {
"enabled": true, "enabled": true,
"runs": 1000000, "runs": 1000000,
"details": { "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
"yul": true,
"deduplicate": true,
"cse": true,
"constantOptimizer": true
}
}, },
"outputSelection": { "outputSelection": {
"*": { "*": {

2
packages/ethereum-types/package.json
View File

@ -36,7 +36,7 @@
"typescript": "3.0.1" "typescript": "3.0.1"
}, },
"dependencies": { "dependencies": {
"@types/node": "10.9.4", "@types/node": "*",
"bignumber.js": "~8.0.2" "bignumber.js": "~8.0.2"
}, },
"publishConfig": { "publishConfig": {

2
packages/sol-tracing-utils/package.json
View File

@ -61,7 +61,7 @@
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"rimraf": "^2.6.2", "rimraf": "^2.6.2",
"semaphore-async-await": "^1.5.1", "semaphore-async-await": "^1.5.1",
"solc": "^0.5.2", "solc": "^0.5.5",
"solidity-parser-antlr": "^0.2.12" "solidity-parser-antlr": "^0.2.12"
}, },
"devDependencies": { "devDependencies": {

15
yarn.lock
View File

@ -1610,7 +1610,7 @@
version "2.2.48" version "2.2.48"
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab"
"@types/node@*", "@types/node@10.9.4", "@types/node@^10.3.2": "@types/node@*", "@types/node@^10.3.2":
version "10.9.4" version "10.9.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
@ -15185,19 +15185,6 @@ solc@^0.4.2:
semver "^5.3.0" semver "^5.3.0"
yargs "^4.7.1" yargs "^4.7.1"
solc@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.2.tgz#45d5d11569e41c2b2535f3a50fe0616ca771a347"
dependencies:
command-exists "^1.2.8"
fs-extra "^0.30.0"
keccak "^1.0.2"
memorystream "^0.3.1"
require-from-string "^2.0.0"
semver "^5.5.0"
tmp "0.0.33"
yargs "^11.0.0"
solc@^0.5.5: solc@^0.5.5:
version "0.5.5" version "0.5.5"
resolved "https://registry.npmjs.org/solc/-/solc-0.5.5.tgz#bdedd988e1a958f48bb8d84df5414f0ae9f62764" resolved "https://registry.npmjs.org/solc/-/solc-0.5.5.tgz#bdedd988e1a958f48bb8d84df5414f0ae9f62764"