aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/multisig
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2019-01-17 22:59:00 +0800
committerFabio Berger <me@fabioberger.com>2019-01-17 22:59:00 +0800
commit293e93729176b06f7e3cf78c798f48ddf360e311 (patch)
treee47909d281ae7da6b7c9e6af76757373ad485705 /contracts/multisig
parentfe2f97dabd1511918051161c882c57bcc1d41ac2 (diff)
parent0b23aaca2619b888dd4e15774d5c543f79f4588d (diff)
downloaddexon-0x-contracts-293e93729176b06f7e3cf78c798f48ddf360e311.tar
dexon-0x-contracts-293e93729176b06f7e3cf78c798f48ddf360e311.tar.gz
dexon-0x-contracts-293e93729176b06f7e3cf78c798f48ddf360e311.tar.bz2
dexon-0x-contracts-293e93729176b06f7e3cf78c798f48ddf360e311.tar.lz
dexon-0x-contracts-293e93729176b06f7e3cf78c798f48ddf360e311.tar.xz
dexon-0x-contracts-293e93729176b06f7e3cf78c798f48ddf360e311.tar.zst
dexon-0x-contracts-293e93729176b06f7e3cf78c798f48ddf360e311.zip
Merge branch 'development' into fix/dev-tools-pages/finalTouches
* development: (22 commits) Fix linter Update packages/sol-tracing-utils/src/trace_collection_subprovider.ts Update packages/sol-tracing-utils/CHANGELOG.json Update packages/sol-tracing-utils/CHANGELOG.json Add PR numbers Fix/simplify handling of revert trace snippets Fix a bug when TraceCollectionSubprovider was hanging on the fake Geth snapshot transaction Fix a bug when a custom Geth tracer didn't return stack entries for DELEGATECALL Revert devnet mining period from 1 to 0 update team info, add brent Publish Updated CHANGELOGS Add commented-out pre-publish checks Add additional check to make sure user was added to our DockerHub org Update test for required amountAvailableToFill Add actual error message thrown Flag order-watcher as having a Docker image to publish Add publish to DockerHub step to publish flow Flesh out postpublish configs in packageJSON type Add pre-publish check to ensure publisher is logged in to docker cmdline ...
Diffstat (limited to 'contracts/multisig')
-rw-r--r--contracts/multisig/CHANGELOG.json9
-rw-r--r--contracts/multisig/CHANGELOG.md4
-rw-r--r--contracts/multisig/package.json28
3 files changed, 27 insertions, 14 deletions
diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json
index 7f3908990..ee239b318 100644
--- a/contracts/multisig/CHANGELOG.json
+++ b/contracts/multisig/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/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md
index 6aa89cd76..6d53a0b9c 100644
--- a/contracts/multisig/CHANGELOG.md
+++ b/contracts/multisig/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/multisig/package.json b/contracts/multisig/package.json
index 030323cbf..f819c59f8 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-multisig",
- "version": "1.0.4",
+ "version": "1.0.5",
"engines": {
"node": ">=6.12"
},
@@ -44,12 +44,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/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/ethereumjs-abi": "^0.6.0",
"@types/lodash": "4.14.104",
@@ -69,13 +69,13 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.12",
- "@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",
- "ethereum-types": "^1.1.5",
+ "@0x/base-contract": "^3.0.13",
+ "@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",
+ "ethereum-types": "^1.1.6",
"lodash": "^4.17.5"
},
"publishConfig": {