aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/package.json
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-26 14:13:59 +0800
committerFabio Berger <me@fabioberger.com>2018-06-26 14:13:59 +0800
commit9219f9d8ae2166c7c7b1d0a4ede78890094a3831 (patch)
tree85f1d4cb4b8a4dbcc8491c93cdbfafbf6cf00edc /packages/contracts/package.json
parentfb03003b3a9e7beb1054a50bad4320e60ca52e04 (diff)
parentcba92a01b6dee208b497817445b7ae4048e299c0 (diff)
downloaddexon-sol-tools-9219f9d8ae2166c7c7b1d0a4ede78890094a3831.tar
dexon-sol-tools-9219f9d8ae2166c7c7b1d0a4ede78890094a3831.tar.gz
dexon-sol-tools-9219f9d8ae2166c7c7b1d0a4ede78890094a3831.tar.bz2
dexon-sol-tools-9219f9d8ae2166c7c7b1d0a4ede78890094a3831.tar.lz
dexon-sol-tools-9219f9d8ae2166c7c7b1d0a4ede78890094a3831.tar.xz
dexon-sol-tools-9219f9d8ae2166c7c7b1d0a4ede78890094a3831.tar.zst
dexon-sol-tools-9219f9d8ae2166c7c7b1d0a4ede78890094a3831.zip
Merge branch 'v2-prototype' into feature/combinatorial-testing
* 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",