aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/protocol
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2019-01-10 18:51:13 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2019-01-10 18:56:15 +0800
commitcee29542451d3bf8c99bd08963a2108768072195 (patch)
treef3d657be53459ce3851fcf9632bd94f32ee80184 /contracts/protocol
parenta8d9263062e586b90ee4c303d3d3aca72e428edc (diff)
parent686f27a96f0cd749f6315d7edd2bb56cf1819245 (diff)
downloaddexon-sol-tools-cee29542451d3bf8c99bd08963a2108768072195.tar
dexon-sol-tools-cee29542451d3bf8c99bd08963a2108768072195.tar.gz
dexon-sol-tools-cee29542451d3bf8c99bd08963a2108768072195.tar.bz2
dexon-sol-tools-cee29542451d3bf8c99bd08963a2108768072195.tar.lz
dexon-sol-tools-cee29542451d3bf8c99bd08963a2108768072195.tar.xz
dexon-sol-tools-cee29542451d3bf8c99bd08963a2108768072195.tar.zst
dexon-sol-tools-cee29542451d3bf8c99bd08963a2108768072195.zip
Merge development
Diffstat (limited to 'contracts/protocol')
-rw-r--r--contracts/protocol/CHANGELOG.json3
-rw-r--r--contracts/protocol/CHANGELOG.md6
-rw-r--r--contracts/protocol/package.json35
3 files changed, 25 insertions, 19 deletions
diff --git a/contracts/protocol/CHANGELOG.json b/contracts/protocol/CHANGELOG.json
index e283d7917..6672ce9c3 100644
--- a/contracts/protocol/CHANGELOG.json
+++ b/contracts/protocol/CHANGELOG.json
@@ -14,7 +14,8 @@
"note": "Move OrderValidator to extensions",
"pr": 1464
}
- ]
+ ],
+ "timestamp": 1547040760
},
{
"timestamp": 1544741676,
diff --git a/contracts/protocol/CHANGELOG.md b/contracts/protocol/CHANGELOG.md
index d90b1b2cc..a8ad921a2 100644
--- a/contracts/protocol/CHANGELOG.md
+++ b/contracts/protocol/CHANGELOG.md
@@ -5,6 +5,12 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v2.2.0 - _January 9, 2019_
+
+ * Added LibAddressArray (#1383)
+ * Add validation and comments to MultiAssetProxy (#1455)
+ * Move OrderValidator to extensions (#1464)
+
## v2.1.59 - _December 13, 2018_
* Dependencies updated
diff --git a/contracts/protocol/package.json b/contracts/protocol/package.json
index 987a1e589..7d49dfbe8 100644
--- a/contracts/protocol/package.json
+++ b/contracts/protocol/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-protocol",
- "version": "2.1.59",
+ "version": "2.2.0",
"engines": {
"node": ">=6.12"
},
@@ -44,10 +44,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.19",
- "@0x/dev-utils": "^1.0.21",
- "@0x/sol-compiler": "^1.1.16",
- "@0x/subproviders": "^2.1.8",
+ "@0x/abi-gen": "^1.0.20",
+ "@0x/dev-utils": "^1.0.22",
+ "@0x/sol-compiler": "^2.0.0",
+ "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
@@ -62,26 +62,25 @@
"mocha": "^4.1.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
- "solc": "^0.4.24",
"solhint": "^1.4.1",
"tslint": "5.11.0",
"typescript": "3.0.1",
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.10",
- "@0x/contracts-examples": "^1.0.2",
- "@0x/contracts-interfaces": "^1.0.2",
- "@0x/contracts-libs": "^1.0.2",
- "@0x/contracts-multisig": "^1.0.2",
- "@0x/contracts-test-utils": "^1.0.2",
- "@0x/contracts-tokens": "^1.0.2",
- "@0x/contracts-utils": "^1.0.2",
- "@0x/order-utils": "^3.0.7",
- "@0x/types": "^1.4.1",
+ "@0x/base-contract": "^3.0.11",
+ "@0x/contracts-examples": "^1.0.3",
+ "@0x/contracts-interfaces": "^1.0.3",
+ "@0x/contracts-libs": "^1.0.3",
+ "@0x/contracts-multisig": "^1.0.3",
+ "@0x/contracts-test-utils": "^1.0.3",
+ "@0x/contracts-tokens": "^1.0.3",
+ "@0x/contracts-utils": "^1.0.3",
+ "@0x/order-utils": "^3.1.0",
+ "@0x/types": "^1.5.0",
"@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.0.8",
- "@0x/web3-wrapper": "^3.2.1",
+ "@0x/utils": "^2.1.1",
+ "@0x/web3-wrapper": "^3.2.2",
"@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8",
"ethereum-types": "^1.1.4",