aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/tokens
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2019-01-09 22:19:59 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2019-01-09 22:19:59 +0800
commit39786c3ad53c1579c4f22bd19f519589b9646287 (patch)
tree2aa8485525267ab6bd879465197d124d06bae36e /contracts/tokens
parent7f2727236dc13b1053463b3dd48103b6532e1698 (diff)
parent5b7eff217e9c8d09d64ff8721d7a16e1df8a7c58 (diff)
downloaddexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.gz
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.bz2
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.lz
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.xz
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.tar.zst
dexon-sol-tools-39786c3ad53c1579c4f22bd19f519589b9646287.zip
Merge development
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.json33
3 files changed, 29 insertions, 17 deletions
diff --git a/contracts/tokens/CHANGELOG.json b/contracts/tokens/CHANGELOG.json
index 19ac770af..50872eb07 100644
--- a/contracts/tokens/CHANGELOG.json
+++ b/contracts/tokens/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547040760,
+ "version": "1.0.3",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1544741676,
"version": "1.0.2",
"changes": [
diff --git a/contracts/tokens/CHANGELOG.md b/contracts/tokens/CHANGELOG.md
index 716353d05..4732f1746 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.3 - _January 9, 2019_
+
+ * Dependencies updated
+
## v1.0.2 - _December 13, 2018_
* Dependencies updated
diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json
index 79afc4820..2fc5013a0 100644
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-tokens",
- "version": "1.0.2",
+ "version": "1.0.3",
"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.19",
- "@0x/contracts-test-utils": "^1.0.2",
- "@0x/dev-utils": "^1.0.21",
- "@0x/sol-compiler": "^1.1.16",
- "@0x/sol-cov": "^2.1.16",
- "@0x/subproviders": "^2.1.8",
+ "@0x/abi-gen": "^1.0.20",
+ "@0x/contracts-test-utils": "^1.0.3",
+ "@0x/dev-utils": "^1.0.22",
+ "@0x/sol-compiler": "^2.0.0",
+ "@0x/sol-cov": "^2.1.17",
+ "@0x/subproviders": "^2.1.9",
"@0x/tslint-config": "^2.0.0",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
@@ -64,23 +64,22 @@
"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-interfaces": "^1.0.2",
- "@0x/contracts-libs": "^1.0.2",
- "@0x/contracts-multisig": "^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-interfaces": "^1.0.3",
+ "@0x/contracts-libs": "^1.0.3",
+ "@0x/contracts-multisig": "^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",