aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/package.json
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-26 14:07:37 +0800
committerFabio Berger <me@fabioberger.com>2018-06-26 14:07:37 +0800
commite051743a3d9b92c8a5b275dc5843b98c37830b8c (patch)
treebcf434332365afe773ab5f6cef2e6e42356e8258 /packages/contracts/package.json
parentf811c07454c87775f18374e8d955583dc157627f (diff)
parentcba92a01b6dee208b497817445b7ae4048e299c0 (diff)
downloaddexon-sol-tools-e051743a3d9b92c8a5b275dc5843b98c37830b8c.tar
dexon-sol-tools-e051743a3d9b92c8a5b275dc5843b98c37830b8c.tar.gz
dexon-sol-tools-e051743a3d9b92c8a5b275dc5843b98c37830b8c.tar.bz2
dexon-sol-tools-e051743a3d9b92c8a5b275dc5843b98c37830b8c.tar.lz
dexon-sol-tools-e051743a3d9b92c8a5b275dc5843b98c37830b8c.tar.xz
dexon-sol-tools-e051743a3d9b92c8a5b275dc5843b98c37830b8c.tar.zst
dexon-sol-tools-e051743a3d9b92c8a5b275dc5843b98c37830b8c.zip
Merge branch 'v2-prototype' into refactor/check-revert-reasons
* v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts
Diffstat (limited to 'packages/contracts/package.json')
-rw-r--r--packages/contracts/package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 8249b9e0c..95f2dbb4e 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -34,7 +34,7 @@
},
"config": {
"abis":
- "../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestAssetDataDecoders|TestAssetProxyDispatcher|TestLibBytes|TestLibs|TestSignatureValidator|TestValidator|TestWallet|TokenRegistry|Whitelist|WETH9|ZRXToken).json"
+ "../migrations/artifacts/2.0.0/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|IAssetData|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestAssetDataDecoders|TestAssetProxyDispatcher|TestLibBytes|TestLibs|TestSignatureValidator|TestValidator|TestWallet|TokenRegistry|Whitelist|WETH9|ZRXToken).json"
},
"repository": {
"type": "git",