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

move generated contract wrappers from contract_wrappers/generated/ to generated_contract_wrappers in package with no non-generated contract wrappers

Browse Source
This commit is contained in:
Fabio Berger
2018-06-06 15:39:38 +02:00
parent af1d5fce6e
commit cb754ee125
27 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -80,8 +80,8 @@ packages/order-watcher/test/artifacts/
packages/contract-wrappers/test/artifacts/ packages/contract-wrappers/test/artifacts/
# generated contract wrappers # generated contract wrappers
packages/0x.js/src/contract_wrappers/generated/ packages/0x.js/src/generated_contract_wrappers/
packages/contracts/src/contract_wrappers/generated/ packages/contracts/src/generated_contract_wrappers/
packages/contract-wrappers/src/contract_wrappers/generated/ packages/contract-wrappers/src/contract_wrappers/generated/
packages/metacoin/src/contract_wrappers packages/metacoin/src/contract_wrappers
packages/fill-scenarios/src/generated_contract_wrappers/ packages/fill-scenarios/src/generated_contract_wrappers/

10
packages/0x.js/package.json
View File

@@ -20,14 +20,14 @@
"build:all": "run-p build:umd:prod build:commonjs; exit 0;", "build:all": "run-p build:umd:prod build:commonjs; exit 0;",
"pre_build": "run-s generate_contract_wrappers copy_artifacts", "pre_build": "run-s generate_contract_wrappers copy_artifacts",
"copy_artifacts": "copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts", "copy_artifacts": "copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts",
"generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers && prettier --write 'src/generated_contract_wrappers/**.ts'",
"lint": "tslint --project .", "lint": "tslint --project .",
"test:circleci": "run-s test:coverage", "test:circleci": "run-s test:coverage",
"test": "yarn run_mocha", "test": "yarn run_mocha",
"rebuild_and_test": "run-s build test", "rebuild_and_test": "run-s build test",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"clean": "shx rm -rf _bundles lib test_temp scripts src/contract_wrappers/generated", "clean": "shx rm -rf _bundles lib test_temp scripts src/generated_contract_wrappers",
"build:umd:prod": "NODE_ENV=production webpack", "build:umd:prod": "NODE_ENV=production webpack",
"build:commonjs": "tsc && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "build:commonjs": "tsc && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit", "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
@@ -54,9 +54,9 @@
"../contract-wrappers/src/contract_wrappers/token_transfer_proxy_wrapper.ts", "../contract-wrappers/src/contract_wrappers/token_transfer_proxy_wrapper.ts",
"../contract-wrappers/src/contract_wrappers/token_wrapper.ts", "../contract-wrappers/src/contract_wrappers/token_wrapper.ts",
"../order-watcher/src/order_watcher/order_watcher.ts", "../order-watcher/src/order_watcher/order_watcher.ts",
"./src/contract_wrappers/generated/ether_token.ts", "./src/generated_contract_wrappers/ether_token.ts",
"./src/contract_wrappers/generated/token.ts", "./src/generated_contract_wrappers/token.ts",
"./src/contract_wrappers/generated/exchange.ts" "./src/generated_contract_wrappers/exchange.ts"
], ],
"s3BucketPath": "s3://doc-jsons/0x.js/", "s3BucketPath": "s3://doc-jsons/0x.js/",
"s3StagingBucketPath": "s3://staging-doc-jsons/0x.js/" "s3StagingBucketPath": "s3://staging-doc-jsons/0x.js/"

4
packages/contracts/package.json
View File

@@ -20,9 +20,9 @@
"test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
"run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit", "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit",
"compile": "sol-compiler", "compile": "sol-compiler",
"clean": "shx rm -rf lib src/contract_wrappers/generated", "clean": "shx rm -rf lib src/generated_contract_wrappers",
"generate_contract_wrappers": "generate_contract_wrappers":
"abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers && prettier --write 'src/generated_contract_wrappers/**.ts'",
"lint": "tslint --project .", "lint": "tslint --project .",
"coverage:report:text": "istanbul report text", "coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html", "coverage:report:html": "istanbul report html && open coverage/index.html",

4
packages/contracts/src/utils/erc20_wrapper.ts
View File

@@ -3,8 +3,8 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
import { Provider } from 'ethereum-types'; import { Provider } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { DummyERC20TokenContract } from '../contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC20TokenContract } from '../generated_contract_wrappers/dummy_e_r_c20_token';
import { ERC20ProxyContract } from '../contract_wrappers/generated/e_r_c20_proxy'; import { ERC20ProxyContract } from '../generated_contract_wrappers/e_r_c20_proxy';
import { artifacts } from './artifacts'; import { artifacts } from './artifacts';
import { constants } from './constants'; import { constants } from './constants';

4
packages/contracts/src/utils/erc721_wrapper.ts
View File

@@ -4,8 +4,8 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
import { Provider } from 'ethereum-types'; import { Provider } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { DummyERC721TokenContract } from '../contract_wrappers/generated/dummy_e_r_c721_token'; import { DummyERC721TokenContract } from '../generated_contract_wrappers/dummy_e_r_c721_token';
import { ERC721ProxyContract } from '../contract_wrappers/generated/e_r_c721_proxy'; import { ERC721ProxyContract } from '../generated_contract_wrappers/e_r_c721_proxy';
import { artifacts } from './artifacts'; import { artifacts } from './artifacts';
import { constants } from './constants'; import { constants } from './constants';

2
packages/contracts/src/utils/exchange_wrapper.ts
View File

@@ -4,7 +4,7 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
import { LogEntry, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import { LogEntry, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { ExchangeContract } from '../contract_wrappers/generated/exchange'; import { ExchangeContract } from '../generated_contract_wrappers/exchange';
import { constants } from './constants'; import { constants } from './constants';
import { formatters } from './formatters'; import { formatters } from './formatters';

10
packages/contracts/src/utils/match_order_tester.ts
View File

@@ -7,15 +7,15 @@ import { LogWithDecodedArgs } from 'ethereum-types';
import ethUtil = require('ethereumjs-util'); import ethUtil = require('ethereumjs-util');
import * as _ from 'lodash'; import * as _ from 'lodash';
import { DummyERC20TokenContract } from '../contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC20TokenContract } from '../generated_contract_wrappers/dummy_e_r_c20_token';
import { DummyERC721TokenContract } from '../contract_wrappers/generated/dummy_e_r_c721_token'; import { DummyERC721TokenContract } from '../generated_contract_wrappers/dummy_e_r_c721_token';
import { ERC20ProxyContract } from '../contract_wrappers/generated/e_r_c20_proxy'; import { ERC20ProxyContract } from '../generated_contract_wrappers/e_r_c20_proxy';
import { ERC721ProxyContract } from '../contract_wrappers/generated/e_r_c721_proxy'; import { ERC721ProxyContract } from '../generated_contract_wrappers/e_r_c721_proxy';
import { import {
CancelContractEventArgs, CancelContractEventArgs,
ExchangeContract, ExchangeContract,
FillContractEventArgs, FillContractEventArgs,
} from '../contract_wrappers/generated/exchange'; } from '../generated_contract_wrappers/exchange';
import { chaiSetup } from '../utils/chai_setup'; import { chaiSetup } from '../utils/chai_setup';
import { constants } from '../utils/constants'; import { constants } from '../utils/constants';
import { ERC20Wrapper } from '../utils/erc20_wrapper'; import { ERC20Wrapper } from '../utils/erc20_wrapper';

4
packages/contracts/src/utils/multi_sig_wrapper.ts
View File

@@ -3,8 +3,8 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { AssetProxyOwnerContract } from '../contract_wrappers/generated/asset_proxy_owner'; import { AssetProxyOwnerContract } from '../generated_contract_wrappers/asset_proxy_owner';
import { MultiSigWalletContract } from '../contract_wrappers/generated/multi_sig_wallet'; import { MultiSigWalletContract } from '../generated_contract_wrappers/multi_sig_wallet';
import { constants } from './constants'; import { constants } from './constants';
import { LogDecoder } from './log_decoder'; import { LogDecoder } from './log_decoder';

2
packages/contracts/src/utils/token_registry_wrapper.ts
View File

@@ -1,7 +1,7 @@
import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Web3Wrapper } from '@0xproject/web3-wrapper';
import { Provider } from 'ethereum-types'; import { Provider } from 'ethereum-types';
import { TokenRegistryContract } from '../contract_wrappers/generated/token_registry'; import { TokenRegistryContract } from '../generated_contract_wrappers/token_registry';
import { Token } from './types'; import { Token } from './types';

2
packages/contracts/test/asset_proxy/authorizable.ts
View File

@@ -4,7 +4,7 @@ import * as chai from 'chai';
import 'make-promises-safe'; import 'make-promises-safe';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import { MixinAuthorizableContract } from '../../src/contract_wrappers/generated/mixin_authorizable'; import { MixinAuthorizableContract } from '../../src/generated_contract_wrappers/mixin_authorizable';
import { artifacts } from '../../src/utils/artifacts'; import { artifacts } from '../../src/utils/artifacts';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants'; import { constants } from '../../src/utils/constants';

8
packages/contracts/test/asset_proxy/proxies.ts
View File

@@ -6,10 +6,10 @@ import * as chai from 'chai';
import * as _ from 'lodash'; import * as _ from 'lodash';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC20TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c20_token';
import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token'; import { DummyERC721TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c721_token';
import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_proxy'; import { ERC20ProxyContract } from '../../src/generated_contract_wrappers/e_r_c20_proxy';
import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_proxy'; import { ERC721ProxyContract } from '../../src/generated_contract_wrappers/e_r_c721_proxy';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants'; import { constants } from '../../src/utils/constants';
import { ERC20Wrapper } from '../../src/utils/erc20_wrapper'; import { ERC20Wrapper } from '../../src/utils/erc20_wrapper';

4
packages/contracts/test/asset_proxy_owner.ts
View File

@@ -12,8 +12,8 @@ import {
ExecutionContractEventArgs, ExecutionContractEventArgs,
ExecutionFailureContractEventArgs, ExecutionFailureContractEventArgs,
SubmissionContractEventArgs, SubmissionContractEventArgs,
} from '../src/contract_wrappers/generated/asset_proxy_owner'; } from '../src/generated_contract_wrappers/asset_proxy_owner';
import { MixinAuthorizableContract } from '../src/contract_wrappers/generated/mixin_authorizable'; import { MixinAuthorizableContract } from '../src/generated_contract_wrappers/mixin_authorizable';
import { artifacts } from '../src/utils/artifacts'; import { artifacts } from '../src/utils/artifacts';
import { chaiSetup } from '../src/utils/chai_setup'; import { chaiSetup } from '../src/utils/chai_setup';
import { constants } from '../src/utils/constants'; import { constants } from '../src/utils/constants';

2
packages/contracts/test/ether_token.ts
View File

@@ -4,7 +4,7 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai'; import * as chai from 'chai';
import 'make-promises-safe'; import 'make-promises-safe';
import { WETH9Contract } from '../src/contract_wrappers/generated/weth9'; import { WETH9Contract } from '../src/generated_contract_wrappers/weth9';
import { artifacts } from '../src/utils/artifacts'; import { artifacts } from '../src/utils/artifacts';
import { chaiSetup } from '../src/utils/chai_setup'; import { chaiSetup } from '../src/utils/chai_setup';
import { constants } from '../src/utils/constants'; import { constants } from '../src/utils/constants';

10
packages/contracts/test/exchange/core.ts
View File

@@ -8,15 +8,15 @@ import { LogWithDecodedArgs } from 'ethereum-types';
import ethUtil = require('ethereumjs-util'); import ethUtil = require('ethereumjs-util');
import 'make-promises-safe'; import 'make-promises-safe';
import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC20TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c20_token';
import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token'; import { DummyERC721TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c721_token';
import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_proxy'; import { ERC20ProxyContract } from '../../src/generated_contract_wrappers/e_r_c20_proxy';
import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_proxy'; import { ERC721ProxyContract } from '../../src/generated_contract_wrappers/e_r_c721_proxy';
import { import {
CancelContractEventArgs, CancelContractEventArgs,
ExchangeContract, ExchangeContract,
FillContractEventArgs, FillContractEventArgs,
} from '../../src/contract_wrappers/generated/exchange'; } from '../../src/generated_contract_wrappers/exchange';
import { artifacts } from '../../src/utils/artifacts'; import { artifacts } from '../../src/utils/artifacts';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants'; import { constants } from '../../src/utils/constants';

8
packages/contracts/test/exchange/dispatcher.ts
View File

@@ -5,10 +5,10 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC20TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c20_token';
import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_proxy'; import { ERC20ProxyContract } from '../../src/generated_contract_wrappers/e_r_c20_proxy';
import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_proxy'; import { ERC721ProxyContract } from '../../src/generated_contract_wrappers/e_r_c721_proxy';
import { TestAssetProxyDispatcherContract } from '../../src/contract_wrappers/generated/test_asset_proxy_dispatcher'; import { TestAssetProxyDispatcherContract } from '../../src/generated_contract_wrappers/test_asset_proxy_dispatcher';
import { artifacts } from '../../src/utils/artifacts'; import { artifacts } from '../../src/utils/artifacts';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants'; import { constants } from '../../src/utils/constants';

2
packages/contracts/test/exchange/libs.ts
View File

@@ -5,7 +5,7 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import ethUtil = require('ethereumjs-util'); import ethUtil = require('ethereumjs-util');
import { TestLibsContract } from '../../src/contract_wrappers/generated/test_libs'; import { TestLibsContract } from '../../src/generated_contract_wrappers/test_libs';
import { addressUtils } from '../../src/utils/address_utils'; import { addressUtils } from '../../src/utils/address_utils';
import { artifacts } from '../../src/utils/artifacts'; import { artifacts } from '../../src/utils/artifacts';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';

10
packages/contracts/test/exchange/match_orders.ts
View File

@@ -8,15 +8,15 @@ import { LogWithDecodedArgs } from 'ethereum-types';
import ethUtil = require('ethereumjs-util'); import ethUtil = require('ethereumjs-util');
import * as _ from 'lodash'; import * as _ from 'lodash';
import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC20TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c20_token';
import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token'; import { DummyERC721TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c721_token';
import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_proxy'; import { ERC20ProxyContract } from '../../src/generated_contract_wrappers/e_r_c20_proxy';
import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_proxy'; import { ERC721ProxyContract } from '../../src/generated_contract_wrappers/e_r_c721_proxy';
import { import {
CancelContractEventArgs, CancelContractEventArgs,
ExchangeContract, ExchangeContract,
FillContractEventArgs, FillContractEventArgs,
} from '../../src/contract_wrappers/generated/exchange'; } from '../../src/generated_contract_wrappers/exchange';
import { artifacts } from '../../src/utils/artifacts'; import { artifacts } from '../../src/utils/artifacts';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants'; import { constants } from '../../src/utils/constants';

2
packages/contracts/test/exchange/signature_validator.ts
View File

@@ -5,7 +5,7 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai'; import * as chai from 'chai';
import ethUtil = require('ethereumjs-util'); import ethUtil = require('ethereumjs-util');
import { TestSignatureValidatorContract } from '../../src/contract_wrappers/generated/test_signature_validator'; import { TestSignatureValidatorContract } from '../../src/generated_contract_wrappers/test_signature_validator';
import { addressUtils } from '../../src/utils/address_utils'; import { addressUtils } from '../../src/utils/address_utils';
import { artifacts } from '../../src/utils/artifacts'; import { artifacts } from '../../src/utils/artifacts';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';

8
packages/contracts/test/exchange/transactions.ts
View File

@@ -6,10 +6,10 @@ import * as chai from 'chai';
import * as ethUtil from 'ethereumjs-util'; import * as ethUtil from 'ethereumjs-util';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC20TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c20_token';
import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_proxy'; import { ERC20ProxyContract } from '../../src/generated_contract_wrappers/e_r_c20_proxy';
import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange'; import { ExchangeContract } from '../../src/generated_contract_wrappers/exchange';
import { WhitelistContract } from '../../src/contract_wrappers/generated/whitelist'; import { WhitelistContract } from '../../src/generated_contract_wrappers/whitelist';
import { artifacts } from '../../src/utils/artifacts'; import { artifacts } from '../../src/utils/artifacts';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants'; import { constants } from '../../src/utils/constants';

12
packages/contracts/test/exchange/wrapper.ts
View File

@@ -8,12 +8,12 @@ import * as _ from 'lodash';
import 'make-promises-safe'; import 'make-promises-safe';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC20TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c20_token';
import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token'; import { DummyERC721TokenContract } from '../../src/generated_contract_wrappers/dummy_e_r_c721_token';
import { ERC20ProxyContract } from '../../src/contract_wrappers/generated/e_r_c20_proxy'; import { ERC20ProxyContract } from '../../src/generated_contract_wrappers/e_r_c20_proxy';
import { ERC721ProxyContract } from '../../src/contract_wrappers/generated/e_r_c721_proxy'; import { ERC721ProxyContract } from '../../src/generated_contract_wrappers/e_r_c721_proxy';
import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange'; import { ExchangeContract } from '../../src/generated_contract_wrappers/exchange';
import { TokenRegistryContract } from '../../src/contract_wrappers/generated/token_registry'; import { TokenRegistryContract } from '../../src/generated_contract_wrappers/token_registry';
import { artifacts } from '../../src/utils/artifacts'; import { artifacts } from '../../src/utils/artifacts';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants'; import { constants } from '../../src/utils/constants';

2
packages/contracts/test/libraries/lib_bytes.ts
View File

@@ -8,7 +8,7 @@ import { LogWithDecodedArgs, TransactionReceiptWithDecodedLogs } from 'ethereum-
import ethUtil = require('ethereumjs-util'); import ethUtil = require('ethereumjs-util');
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import { TestLibBytesContract } from '../../src/contract_wrappers/generated/test_lib_bytes'; import { TestLibBytesContract } from '../../src/generated_contract_wrappers/test_lib_bytes';
import { artifacts } from '../../src/utils/artifacts'; import { artifacts } from '../../src/utils/artifacts';
import { chaiSetup } from '../../src/utils/chai_setup'; import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants'; import { constants } from '../../src/utils/constants';

2
packages/contracts/test/multi_sig_with_time_lock.ts
View File

@@ -10,7 +10,7 @@ import * as Web3 from 'web3';
import { import {
MultiSigWalletWithTimeLockContract, MultiSigWalletWithTimeLockContract,
SubmissionContractEventArgs, SubmissionContractEventArgs,
} from '../src/contract_wrappers/generated/multi_sig_wallet_with_time_lock'; } from '../src/generated_contract_wrappers/multi_sig_wallet_with_time_lock';
import { artifacts } from '../src/utils/artifacts'; import { artifacts } from '../src/utils/artifacts';
import { chaiSetup } from '../src/utils/chai_setup'; import { chaiSetup } from '../src/utils/chai_setup';
import { constants } from '../src/utils/constants'; import { constants } from '../src/utils/constants';

2
packages/contracts/test/token_registry.ts
View File

@@ -7,7 +7,7 @@ import * as _ from 'lodash';
import 'make-promises-safe'; import 'make-promises-safe';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import { TokenRegistryContract } from '../src/contract_wrappers/generated/token_registry'; import { TokenRegistryContract } from '../src/generated_contract_wrappers/token_registry';
import { artifacts } from '../src/utils/artifacts'; import { artifacts } from '../src/utils/artifacts';
import { chaiSetup } from '../src/utils/chai_setup'; import { chaiSetup } from '../src/utils/chai_setup';
import { constants } from '../src/utils/constants'; import { constants } from '../src/utils/constants';

12
packages/contracts/test/tutorials/arbitrage.ts
View File

@@ -8,12 +8,12 @@
// import ethUtil = require('ethereumjs-util'); // import ethUtil = require('ethereumjs-util');
// import * as Web3 from 'web3'; // import * as Web3 from 'web3';
// import { AccountLevelsContract } from '../../src/contract_wrappers/generated/account_levels'; // import { AccountLevelsContract } from '../../src/generated_contract_wrappers/account_levels';
// import { ArbitrageContract } from '../../src/contract_wrappers/generated/arbitrage'; // import { ArbitrageContract } from '../../src/generated_contract_wrappers/arbitrage';
// import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token'; // import { DummyTokenContract } from '../../src/generated_contract_wrappers/dummy_token';
// import { EtherDeltaContract } from '../../src/contract_wrappers/generated/ether_delta'; // import { EtherDeltaContract } from '../../src/generated_contract_wrappers/ether_delta';
// import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange'; // import { ExchangeContract } from '../../src/generated_contract_wrappers/exchange';
// import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy'; // import { TokenTransferProxyContract } from '../../src/generated_contract_wrappers/token_transfer_proxy';
// import { artifacts } from '../../util/artifacts'; // import { artifacts } from '../../util/artifacts';
// import { Balances } from '../../util/balances'; // import { Balances } from '../../util/balances';
// import { constants } from '../../util/constants'; // import { constants } from '../../util/constants';

2
packages/contracts/test/unlimited_allowance_token.ts
View File

@@ -5,7 +5,7 @@ import * as chai from 'chai';
import 'make-promises-safe'; import 'make-promises-safe';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import { DummyERC20TokenContract } from '../src/contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC20TokenContract } from '../src/generated_contract_wrappers/dummy_e_r_c20_token';
import { artifacts } from '../src/utils/artifacts'; import { artifacts } from '../src/utils/artifacts';
import { chaiSetup } from '../src/utils/chai_setup'; import { chaiSetup } from '../src/utils/chai_setup';
import { constants } from '../src/utils/constants'; import { constants } from '../src/utils/constants';

2
packages/contracts/test/zrx_token.ts
View File

@@ -5,7 +5,7 @@ import * as chai from 'chai';
import 'make-promises-safe'; import 'make-promises-safe';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import { ZRXTokenContract } from '../src/contract_wrappers/generated/zrx_token'; import { ZRXTokenContract } from '../src/generated_contract_wrappers/zrx_token';
import { artifacts } from '../src/utils/artifacts'; import { artifacts } from '../src/utils/artifacts';
import { chaiSetup } from '../src/utils/chai_setup'; import { chaiSetup } from '../src/utils/chai_setup';
import { constants } from '../src/utils/constants'; import { constants } from '../src/utils/constants';

3
packages/website/ts/containers/zero_ex_js_documentation.ts
View File

@@ -103,6 +103,9 @@ const docsInfoConfig: DocsInfoConfig = {
'"0x.js/src/contract_wrappers/generated/ether_token"', '"0x.js/src/contract_wrappers/generated/ether_token"',
'"0x.js/src/contract_wrappers/generated/token"', '"0x.js/src/contract_wrappers/generated/token"',
'"0x.js/src/contract_wrappers/generated/exchange"', '"0x.js/src/contract_wrappers/generated/exchange"',
'"0x.js/src/generated_contract_wrappers/ether_token"',
'"0x.js/src/generated_contract_wrappers/token"',
'"0x.js/src/generated_contract_wrappers/exchange"',
], ],
}, },
menuSubsectionToVersionWhenIntroduced: { menuSubsectionToVersionWhenIntroduced: {