diff options
author | Fabio Berger <me@fabioberger.com> | 2018-12-19 22:16:35 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-12-19 22:16:35 +0800 |
commit | 293dadc22aedcaf540f2dc17c8c38087e7ace037 (patch) | |
tree | 79f624ab03071a28da83c7bf542acfe0dd7af8cb /contracts/multisig | |
parent | ddf3bb7c0446f2d85b6fa55cbe0b00b227f08af7 (diff) | |
parent | 040b402b6d558d13f2f4e032297b6723cdf2aafe (diff) | |
download | dexon-sol-tools-293dadc22aedcaf540f2dc17c8c38087e7ace037.tar dexon-sol-tools-293dadc22aedcaf540f2dc17c8c38087e7ace037.tar.gz dexon-sol-tools-293dadc22aedcaf540f2dc17c8c38087e7ace037.tar.bz2 dexon-sol-tools-293dadc22aedcaf540f2dc17c8c38087e7ace037.tar.lz dexon-sol-tools-293dadc22aedcaf540f2dc17c8c38087e7ace037.tar.xz dexon-sol-tools-293dadc22aedcaf540f2dc17c8c38087e7ace037.tar.zst dexon-sol-tools-293dadc22aedcaf540f2dc17c8c38087e7ace037.zip |
Merge branch 'development' into website/addPySRA
* development: (141 commits)
Add missing CHANGELOG entry for OrderWatcher WS interface
Bump up stale to close to 30 days
Move onMessageAsync outside of tests and add comments
Fix WS tests to remove race-condition and be more specific about the message expected
Add temporary console.log to test failing on CI
Make @0x/contracts-test-utils a dependency instead of a devDependency
Fix test-publish failure in contracts packages
Fixed solhint errors
Added documentation to `LibAddressArray.append` and switched `if` to `require` smt
Updated changelogs for new contracts
Added `gas` field so tests pass on Geth;
Added Changelog for new Extensions
Updated comment `Execute fillOrder` -> `Execute exchange function`
Explicit returns
Prettier / Linter on contracts + TS
Refactoring balance threshold filter
Moved exchange calldata functions to separate mixin
Less Assembly. More Solidity. Less Efficiency. More Readability.
Run all tests for extensions
Cleaned up tests for balance threshold filter
...
Diffstat (limited to 'contracts/multisig')
-rw-r--r-- | contracts/multisig/CHANGELOG.json | 12 | ||||
-rw-r--r-- | contracts/multisig/CHANGELOG.md | 10 | ||||
-rw-r--r-- | contracts/multisig/package.json | 31 | ||||
-rw-r--r-- | contracts/multisig/src/index.ts | 2 |
4 files changed, 38 insertions, 17 deletions
diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index fe51488c7..19ac770af 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -1 +1,11 @@ -[] +[ + { + "timestamp": 1544741676, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + } +] diff --git a/contracts/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md new file mode 100644 index 000000000..716353d05 --- /dev/null +++ b/contracts/multisig/CHANGELOG.md @@ -0,0 +1,10 @@ +<!-- +changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly. +Edit the package's CHANGELOG.json file only. +--> + +CHANGELOG + +## v1.0.2 - _December 13, 2018_ + + * Dependencies updated diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 84285aec3..b338f67f7 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,7 +1,6 @@ { - "private": true, "name": "@0x/contracts-multisig", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, @@ -44,13 +43,13 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "devDependencies": { - "@0x/abi-gen": "^1.0.18", - "@0x/contracts-test-utils": "^1.0.1", - "@0x/dev-utils": "^1.0.20", - "@0x/sol-compiler": "^1.1.15", - "@0x/sol-cov": "^2.1.15", - "@0x/subproviders": "^2.1.7", - "@0x/tslint-config": "^1.0.10", + "@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/tslint-config": "^2.0.0", "@types/bn.js": "^4.11.0", "@types/ethereumjs-abi": "^0.6.0", "@types/lodash": "4.14.104", @@ -71,13 +70,13 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0x/base-contract": "^3.0.9", - "@0x/order-utils": "^3.0.6", - "@0x/types": "^1.4.0", - "@0x/typescript-typings": "^3.0.5", - "@0x/utils": "^2.0.7", - "@0x/web3-wrapper": "^3.2.0", - "ethereum-types": "^1.1.3", + "@0x/base-contract": "^3.0.10", + "@0x/order-utils": "^3.0.7", + "@0x/types": "^1.4.1", + "@0x/typescript-typings": "^3.0.6", + "@0x/utils": "^2.0.8", + "@0x/web3-wrapper": "^3.2.1", + "ethereum-types": "^1.1.4", "lodash": "^4.17.5" }, "publishConfig": { diff --git a/contracts/multisig/src/index.ts b/contracts/multisig/src/index.ts new file mode 100644 index 000000000..d55f08ea2 --- /dev/null +++ b/contracts/multisig/src/index.ts @@ -0,0 +1,2 @@ +export * from './artifacts'; +export * from './wrappers'; |