aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/tokens
diff options
context:
space:
mode:
authorSteve Klebanoff <steve.klebanoff@gmail.com>2019-01-16 02:38:23 +0800
committerSteve Klebanoff <steve.klebanoff@gmail.com>2019-01-16 02:38:23 +0800
commit7a2b312d64994f96db75864e9a61bb319efdda3a (patch)
tree6d7b030abe774c619067ae52e0ef1cf7ebdd0963 /contracts/tokens
parent64a78149aa4a35aa339fb9ef80faea613ebaeffd (diff)
parentf570f80674c22f69712c45e8e3c48e948b51f357 (diff)
downloaddexon-sol-tools-7a2b312d64994f96db75864e9a61bb319efdda3a.tar
dexon-sol-tools-7a2b312d64994f96db75864e9a61bb319efdda3a.tar.gz
dexon-sol-tools-7a2b312d64994f96db75864e9a61bb319efdda3a.tar.bz2
dexon-sol-tools-7a2b312d64994f96db75864e9a61bb319efdda3a.tar.lz
dexon-sol-tools-7a2b312d64994f96db75864e9a61bb319efdda3a.tar.xz
dexon-sol-tools-7a2b312d64994f96db75864e9a61bb319efdda3a.tar.zst
dexon-sol-tools-7a2b312d64994f96db75864e9a61bb319efdda3a.zip
Merge branch 'development' into fix/asset-buyer/zero-amount-available-test
Diffstat (limited to 'contracts/tokens')
-rw-r--r--contracts/tokens/CHANGELOG.json9
-rw-r--r--contracts/tokens/CHANGELOG.md4
-rw-r--r--contracts/tokens/package.json36
3 files changed, 31 insertions, 18 deletions
diff --git a/contracts/tokens/CHANGELOG.json b/contracts/tokens/CHANGELOG.json
index 7f3908990..ee239b318 100644
--- a/contracts/tokens/CHANGELOG.json
+++ b/contracts/tokens/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547561734,
+ "version": "1.0.5",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547225310,
"version": "1.0.4",
"changes": [
diff --git a/contracts/tokens/CHANGELOG.md b/contracts/tokens/CHANGELOG.md
index 6aa89cd76..6d53a0b9c 100644
--- a/contracts/tokens/CHANGELOG.md
+++ b/contracts/tokens/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.5 - _January 15, 2019_
+
+ * Dependencies updated
+
## v1.0.4 - _January 11, 2019_
* Dependencies updated
diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json
index 4601566e3..c896d122d 100644
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-tokens",
- "version": "1.0.4",
+ "version": "1.0.5",
"engines": {
"node": ">=6.12"
},
@@ -44,12 +44,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.21",
- "@0x/contracts-test-utils": "^1.0.4",
- "@0x/dev-utils": "^1.0.23",
- "@0x/sol-compiler": "^2.0.1",
- "@0x/subproviders": "^2.1.10",
- "@0x/tslint-config": "^2.0.1",
+ "@0x/abi-gen": "^1.0.22",
+ "@0x/contracts-test-utils": "^2.0.0",
+ "@0x/dev-utils": "^1.0.24",
+ "@0x/sol-compiler": "^2.0.2",
+ "@0x/subproviders": "^2.1.11",
+ "@0x/tslint-config": "^2.0.2",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@@ -69,19 +69,19 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.12",
- "@0x/contracts-interfaces": "^1.0.4",
- "@0x/contracts-libs": "^1.0.4",
- "@0x/contracts-multisig": "^1.0.4",
- "@0x/contracts-utils": "^1.0.4",
- "@0x/order-utils": "^3.1.1",
- "@0x/types": "^1.5.1",
- "@0x/typescript-typings": "^3.0.7",
- "@0x/utils": "^3.0.0",
- "@0x/web3-wrapper": "^3.2.3",
+ "@0x/base-contract": "^3.0.13",
+ "@0x/contracts-interfaces": "^1.0.5",
+ "@0x/contracts-libs": "^1.0.5",
+ "@0x/contracts-multisig": "^1.0.5",
+ "@0x/contracts-utils": "^1.0.5",
+ "@0x/order-utils": "^3.1.2",
+ "@0x/types": "^1.5.2",
+ "@0x/typescript-typings": "^3.0.8",
+ "@0x/utils": "^3.0.1",
+ "@0x/web3-wrapper": "^3.2.4",
"@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8",
- "ethereum-types": "^1.1.5",
+ "ethereum-types": "^1.1.6",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5"
},