diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-07-19 22:38:33 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-07-19 22:38:33 +0800 |
| commit | b6de0bdd43d53204fbbe9a13d44658963a7f2725 (patch) | |
| tree | 45a7084ff4de40deab8b79fc689e4718e365e7b2 /packages/contracts/compiler.json | |
| parent | a2b62fd8085df2121424fd8a9defee42879971ce (diff) | |
| parent | 886a03fdcd4893a57f88fa407de94852cb0a2285 (diff) | |
| download | dexon-sol-tools-b6de0bdd43d53204fbbe9a13d44658963a7f2725.tar dexon-sol-tools-b6de0bdd43d53204fbbe9a13d44658963a7f2725.tar.gz dexon-sol-tools-b6de0bdd43d53204fbbe9a13d44658963a7f2725.tar.bz2 dexon-sol-tools-b6de0bdd43d53204fbbe9a13d44658963a7f2725.tar.lz dexon-sol-tools-b6de0bdd43d53204fbbe9a13d44658963a7f2725.tar.xz dexon-sol-tools-b6de0bdd43d53204fbbe9a13d44658963a7f2725.tar.zst dexon-sol-tools-b6de0bdd43d53204fbbe9a13d44658963a7f2725.zip | |
Merge branch 'v2-prototype' into update-lerna
* v2-prototype: (48 commits)
Update CHANGELOG
Rename call data schema id to CallData. Check for TypedArray when hashing data in order-utils crypto
Fix broken links in sol-cov documentation
Fix 0x.js ts warnings
Update yarn.lock
Fix 0x.js ts warnings
Fix 0x.js tests on CI
Fix a bad merge
Update package versions
Merge
Update changelogs
Add a test for ERC721 Allowance
Use allowance instead of approval for all in fill-scenarios
Upgrade sha3 to 1.2.2 to work with node v10
Check if the token doesn't exist before minting in fill scenarios
Make downlevelIteration a global config
Fix tests descriptions
DRY up the code in order-watcher collision-resistant abi decoder
Await transactions in fillScenarios
Rename decodeAssetData to decodeAssetDataOrThrow
...
Diffstat (limited to 'packages/contracts/compiler.json')
| -rw-r--r-- | packages/contracts/compiler.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/contracts/compiler.json b/packages/contracts/compiler.json index 5ace566d8..2a7f8bbb9 100644 --- a/packages/contracts/compiler.json +++ b/packages/contracts/compiler.json @@ -25,6 +25,7 @@ "DummyERC721Token", "ERC20Proxy", "ERC20Token", + "ERC721Token", "ERC721Proxy", "Exchange", "ExchangeWrapper", |