diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-20 19:25:29 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-20 19:25:29 +0800 |
| commit | 2ffab2218584fac5d3ea2b264a7c746d963083d9 (patch) | |
| tree | f7558147b811c06300e2c7697591466ae7cf48ba /packages/contracts/package.json | |
| parent | 5541327968ad6f974a37c49057253746f738a709 (diff) | |
| parent | 096eaa20d785baee07b06b3f0848797e470fbda0 (diff) | |
| download | dexon-sol-tools-2ffab2218584fac5d3ea2b264a7c746d963083d9.tar dexon-sol-tools-2ffab2218584fac5d3ea2b264a7c746d963083d9.tar.gz dexon-sol-tools-2ffab2218584fac5d3ea2b264a7c746d963083d9.tar.bz2 dexon-sol-tools-2ffab2218584fac5d3ea2b264a7c746d963083d9.tar.lz dexon-sol-tools-2ffab2218584fac5d3ea2b264a7c746d963083d9.tar.xz dexon-sol-tools-2ffab2218584fac5d3ea2b264a7c746d963083d9.tar.zst dexon-sol-tools-2ffab2218584fac5d3ea2b264a7c746d963083d9.zip | |
Merge branch 'v2-prototype' into feature/combinatorial-testing
* v2-prototype: (22 commits)
Fix closing parens in liborder
Update after rebase
ERC721Proxy Always call safeTransferFrom
Rename makerEpoch => orderEpoch
Make cancelOrdersUpTo compatible with sender abstraction
Update PR template
Use Image component instead of img tag
Assembler orderHash function
Optimize and remove redundant encodePacked
Fix linting issue
Fix bug where we do fetch balances on wallet login
Check network state immediately instead of waiting for delay
Fix onboarding persisting when changing routes
Consolidate account state messaging logic
Only elevate wallet zIndex when onboarding is in progress
Rebase and update feedback
Run linter
Add Portal v2 logging
Simplified handling of source < 32 edge case
Basic EIP712 encoder
...
Diffstat (limited to 'packages/contracts/package.json')
| -rw-r--r-- | packages/contracts/package.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 8807c727e..cf3f6f01d 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -33,7 +33,8 @@ "test:circleci": "yarn test" }, "config": { - "abis": "../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetDataDecoders|TestAssetProxyDispatcher|TestLibBytes|TestLibMem|TestLibs|TestSignatureValidator|TokenRegistry|Whitelist|WETH9|ZRXToken).json" + "abis": + "../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetDataDecoders|TestAssetProxyDispatcher|TestLibBytes|TestLibMem|TestLibs|TestSignatureValidator|TokenRegistry|Whitelist|WETH9|ZRXToken).json" }, "repository": { "type": "git", |