aboutsummaryrefslogtreecommitdiffstats
path: root/packages/json-schemas
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2019-02-07 22:28:24 +0800
committerFabio Berger <me@fabioberger.com>2019-02-07 22:28:24 +0800
commit3dd652e7cf6da63831da143b73c13231a46da376 (patch)
tree52218d0b88717360fa8bfadf4bbf7e35b9ab5f66 /packages/json-schemas
parent8de955f3d891620c90c668b4ac0b046e772d4da8 (diff)
parentf003298ce4c7a2201d2d59685b0d5d0411aeb55d (diff)
downloaddexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.gz
dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.zst
dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.zip
Merge branch 'development' into addAnalyticsToDevToolsPages
* development: (51 commits) Publish Updated CHANGELOGS Updated CHANGELOGS Update packages/sol-compiler/CHANGELOG.json Update packages/sol-compiler/CHANGELOG.json Move from devDep to dep Fix linter Update CHANGELOG Re-run yarn since fails again on first run Add PR numbers Omit remapping in compiler settings equality checks Omit remapping in compiler settings equality checks Fix a bug when ast and legacyAST were not present in the artifacts even if requested Update yarn.lock Remove the bin_paths and fetch the solidity release list from github repo Remove postinstall hack Fix the undefined opts bug Fix sol-compiler bug with remappings causing smart recompilation to now work re-add postinstall hack Fix deps versions ...
Diffstat (limited to 'packages/json-schemas')
-rw-r--r--packages/json-schemas/CHANGELOG.json22
-rw-r--r--packages/json-schemas/CHANGELOG.md9
-rw-r--r--packages/json-schemas/package.json4
-rw-r--r--packages/json-schemas/schemas/zero_ex_transaction_schema.json3
4 files changed, 35 insertions, 3 deletions
diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json
index 869f8bdf1..a6ae0160f 100644
--- a/packages/json-schemas/CHANGELOG.json
+++ b/packages/json-schemas/CHANGELOG.json
@@ -1,10 +1,32 @@
[
{
+ "version": "3.0.2",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ],
+ "timestamp": 1549547375
+ },
+ {
+ "timestamp": 1549452781,
+ "version": "3.0.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "3.0.0",
"changes": [
{
"note": "Upgrade the bignumber.js to v8.0.2",
"pr": 1517
+ },
+ {
+ "note": "Add `verifyingContractAddress` to `zeroExTransactionSchema`",
+ "pr": 1576
}
],
"timestamp": 1549373905
diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md
index ea94cbaf4..91426a687 100644
--- a/packages/json-schemas/CHANGELOG.md
+++ b/packages/json-schemas/CHANGELOG.md
@@ -5,9 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v3.0.2 - _February 7, 2019_
+
+ * Dependencies updated
+
+## v3.0.1 - _February 6, 2019_
+
+ * Dependencies updated
+
## v3.0.0 - _February 5, 2019_
* Upgrade the bignumber.js to v8.0.2 (#1517)
+ * Add `verifyingContractAddress` to `zeroExTransactionSchema` (#1576)
## v2.1.7 - _January 15, 2019_
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index a1966897f..0c101aa28 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/json-schemas",
- "version": "3.0.0",
+ "version": "3.0.2",
"engines": {
"node": ">=6.12"
},
@@ -46,7 +46,7 @@
},
"devDependencies": {
"@0x/tslint-config": "^3.0.0",
- "@0x/utils": "^4.0.1",
+ "@0x/utils": "^4.0.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/zero_ex_transaction_schema.json b/packages/json-schemas/schemas/zero_ex_transaction_schema.json
index 0c714f14d..ffdf1f229 100644
--- a/packages/json-schemas/schemas/zero_ex_transaction_schema.json
+++ b/packages/json-schemas/schemas/zero_ex_transaction_schema.json
@@ -1,10 +1,11 @@
{
"id": "/zeroExTransactionSchema",
"properties": {
+ "verifyingContractAddress": { "$ref": "/addressSchema" },
"data": { "$ref": "/hexSchema" },
"signerAddress": { "$ref": "/addressSchema" },
"salt": { "$ref": "/wholeNumberSchema" }
},
- "required": ["data", "salt", "signerAddress"],
+ "required": ["verifyingContractAddress", "data", "salt", "signerAddress"],
"type": "object"
}