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/json-schemas | |
| 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/json-schemas')
| -rw-r--r-- | packages/json-schemas/CHANGELOG.json | 13 | ||||
| -rw-r--r-- | packages/json-schemas/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | packages/json-schemas/package.json | 4 | ||||
| -rw-r--r-- | packages/json-schemas/schemas/call_data_schema.ts | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 42ef2065e..b69b440cf 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -9,6 +9,19 @@ { "note": "Added CallData schema", "pr": 821 + }, + { + "note": "Update CallData schema id to CallData", + "pr": 894 + } + ] + }, + { + "timestamp": 1531919263, + "version": "0.8.3", + "changes": [ + { + "note": "Dependencies updated" } ] }, diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md index 2524cd768..df3150dba 100644 --- a/packages/json-schemas/CHANGELOG.md +++ b/packages/json-schemas/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v0.8.3 - _July 18, 2018_ + + * Dependencies updated + ## v0.8.2 - _July 9, 2018_ * Dependencies updated diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index e15faeeb5..09360fa05 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -47,7 +47,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md", "dependencies": { - "@0xproject/typescript-typings": "^0.4.2", + "@0xproject/typescript-typings": "^0.4.3", "@types/node": "^8.0.53", "jsonschema": "^1.2.0", "lodash.values": "^4.3.0" @@ -55,7 +55,7 @@ "devDependencies": { "@0xproject/monorepo-scripts": "^0.2.2", "@0xproject/tslint-config": "^0.4.21", - "@0xproject/utils": "^0.7.2", + "@0xproject/utils": "^0.7.3", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", diff --git a/packages/json-schemas/schemas/call_data_schema.ts b/packages/json-schemas/schemas/call_data_schema.ts index e8fcc7512..b9d00ad2a 100644 --- a/packages/json-schemas/schemas/call_data_schema.ts +++ b/packages/json-schemas/schemas/call_data_schema.ts @@ -1,5 +1,5 @@ export const callDataSchema = { - id: '/TxData', + id: '/CallData', properties: { from: { $ref: '/Address' }, to: { $ref: '/Address' }, |