diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-26 06:39:02 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-26 06:39:02 +0800 |
| commit | 790af0fd72754314025c2c396a785167671f8bb6 (patch) | |
| tree | 38a1d2dd86316268f6afcc2e01c4afaf3ee03c49 /packages/contracts/package.json | |
| parent | 4e5bfae332279acbb58d76a32102b5a27dde069d (diff) | |
| parent | c7f5e77b3fe7c1805202a5b1e1e1ce1e9d31a6b0 (diff) | |
| download | dexon-sol-tools-790af0fd72754314025c2c396a785167671f8bb6.tar.gz dexon-sol-tools-790af0fd72754314025c2c396a785167671f8bb6.tar.zst dexon-sol-tools-790af0fd72754314025c2c396a785167671f8bb6.zip | |
Merge branch 'v2-prototype' into refactor/order-utils/for-v2
* v2-prototype:
Fix imports in order_utils
Use web3-wrapper instead of 0x.js, update logDecoder
Cleanup tests
Add errMsg when throwing on unrecognized error
Move readFirst4 to LibBytes
Add old MultiSig to previous contracts, cleanup file structure
Fix build
Address feedback, rename contract to AssetProxyOwner
Update multisig tests and utils
Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a mapping of registered proxies
Implement design for relayers with no volume or tokens
Diffstat (limited to 'packages/contracts/package.json')
| -rw-r--r-- | packages/contracts/package.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index c36d991e1..180b8058a 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -20,7 +20,8 @@ "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit", "compile": "sol-compiler", "clean": "shx rm -rf lib src/contract_wrappers/generated", - "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'", + "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'", "lint": "tslint --project .", "coverage:report:text": "istanbul report text", "coverage:report:html": "istanbul report html && open coverage/index.html", @@ -28,7 +29,7 @@ "test:circleci": "yarn test" }, "config": { - "abis": "../migrations/artifacts/2.0.0/@(DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TestAssetProxyDispatcher|TestLibBytes|TestLibs|TestSignatureValidator|TokenRegistry|WETH9|ZRXToken).json" + "abis": "../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock||TestAssetProxyDispatcher|TestLibBytes|TestLibs|TestSignatureValidator|TokenRegistry|WETH9|ZRXToken).json" }, "repository": { "type": "git", |