From 9f5eeed30930eea59e9922569a15cb5d689f3eeb Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 10 Dec 2018 14:37:48 -0800 Subject: Rename core package to protocol --- contracts/multisig/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contracts/multisig') diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 37d064fef..5b8b8dc14 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -42,7 +42,7 @@ "bugs": { "url": "https://github.com/0xProject/0x-monorepo/issues" }, - "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md", + "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "devDependencies": { "@0x/contracts-test-utils": "^1.0.0", "@0x/abi-gen": "^1.0.17", -- cgit v1.2.3 From c580f4ddcb61844e590e0829c32cbdd15ab03beb Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 10 Dec 2018 15:13:36 -0800 Subject: Change contracts publish config --- contracts/multisig/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contracts/multisig') diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 5b8b8dc14..e659d39ba 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -81,6 +81,6 @@ "lodash": "^4.17.5" }, "publishConfig": { - "access": "public" + "access": "private" } } -- cgit v1.2.3 From 5e6d1779cb51fc1687c46f687a2140e05b0a6559 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 10 Dec 2018 15:20:52 -0800 Subject: Re-use solhint configuration --- contracts/multisig/.solhint.json | 20 -------------------- contracts/multisig/package.json | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 contracts/multisig/.solhint.json (limited to 'contracts/multisig') diff --git a/contracts/multisig/.solhint.json b/contracts/multisig/.solhint.json deleted file mode 100644 index 076afe9f3..000000000 --- a/contracts/multisig/.solhint.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "default", - "rules": { - "avoid-low-level-calls": false, - "avoid-tx-origin": "warn", - "bracket-align": false, - "code-complexity": false, - "const-name-snakecase": "error", - "expression-indent": "error", - "function-max-lines": false, - "func-order": "error", - "indent": ["error", 4], - "max-line-length": ["warn", 160], - "no-inline-assembly": false, - "quotes": ["error", "double"], - "separate-by-one-line-in-contract": "error", - "space-after-comma": "error", - "statement-indent": "error" - } -} diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index e659d39ba..2114099f1 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -29,7 +29,7 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", - "lint-contracts": "solhint contracts/**/**/**/**/*.sol" + "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { "abis": "generated-artifacts/@(MultiSigWallet|MultiSigWalletWithTimeLock|TestRejectEther).json" @@ -65,7 +65,7 @@ "npm-run-all": "^4.1.2", "shx": "^0.2.2", "solc": "^0.4.24", - "solhint": "^1.2.1", + "solhint": "^1.4.1", "tslint": "5.11.0", "typescript": "3.0.1", "yargs": "^10.0.3" -- cgit v1.2.3 From 928b253c81971eb6f59efd09ab6a9063d4e6e4ca Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 10 Dec 2018 15:47:13 -0800 Subject: Revert access changes --- contracts/multisig/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contracts/multisig') diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 2114099f1..936473142 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -81,6 +81,6 @@ "lodash": "^4.17.5" }, "publishConfig": { - "access": "private" + "access": "public" } } -- cgit v1.2.3 From 96b8100a787d00142dcf875d940c9125571cbde6 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 11 Dec 2018 15:38:43 -0800 Subject: Publish - 0x.js@2.0.7 - @0x/abi-gen@1.0.18 - @0x/abi-gen-wrappers@2.0.1 - @0x/assert@1.0.19 - @0x/asset-buyer@3.0.3 - @0x/base-contract@3.0.9 - @0x/connect@3.0.9 - @0x/contract-wrappers@4.1.2 - @0x/dev-tools-pages@0.0.9 - @0x/dev-utils@1.0.20 - ethereum-types@1.1.3 - @0x/fill-scenarios@1.0.15 - @0x/instant@1.0.3 - @0x/json-schemas@2.1.3 - @0x/metacoin@0.0.31 - @0x/migrations@2.2.1 - @0x/monorepo-scripts@1.0.15 - @0x/order-utils@3.0.6 - @0x/order-watcher@2.2.7 - @0x/pipeline@1.0.1 - @0x/react-docs@1.0.21 - @0x/react-shared@1.0.24 - @0x/sol-compiler@1.1.15 - @0x/sol-cov@2.1.15 - @0x/sol-doc@1.0.10 - @0x/sol-resolver@1.1.0 - @0x/sra-spec@1.0.12 - @0x/subproviders@2.1.7 - @0x/testnet-faucets@1.0.59 - @0x/types@1.4.0 - @0x/typescript-typings@3.0.5 - @0x/utils@2.0.7 - @0x/web3-wrapper@3.2.0 - @0x/website@0.0.62 - @0x/contracts-examples@1.0.1 - @0x/contracts-extensions@1.0.1 - @0x/contracts-interfaces@1.0.1 - @0x/contracts-libs@1.0.1 - @0x/contracts-multisig@1.0.1 - @0x/contracts-protocol@2.1.57 - @0x/contracts-test-utils@1.0.1 - @0x/contracts-tokens@1.0.1 - @0x/contracts-utils@1.0.1 --- contracts/multisig/package.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'contracts/multisig') diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 936473142..84285aec3 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0x/contracts-multisig", - "version": "1.0.0", + "version": "1.0.1", "engines": { "node": ">=6.12" }, @@ -44,12 +44,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "devDependencies": { - "@0x/contracts-test-utils": "^1.0.0", - "@0x/abi-gen": "^1.0.17", - "@0x/dev-utils": "^1.0.18", - "@0x/sol-compiler": "^1.1.13", - "@0x/sol-cov": "^2.1.13", - "@0x/subproviders": "^2.1.5", + "@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", "@types/bn.js": "^4.11.0", "@types/ethereumjs-abi": "^0.6.0", @@ -71,13 +71,13 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0x/base-contract": "^3.0.7", - "@0x/order-utils": "^3.0.3", - "@0x/types": "^1.3.0", - "@0x/typescript-typings": "^3.0.4", - "@0x/utils": "^2.0.6", - "@0x/web3-wrapper": "^3.1.5", - "ethereum-types": "^1.1.2", + "@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", "lodash": "^4.17.5" }, "publishConfig": { -- cgit v1.2.3 From 5a45bc5e7ba3945fe5788b7f86f885768f034f4b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 13 Dec 2018 11:10:24 -0800 Subject: Revert version bump to unpublished contracts packages --- contracts/multisig/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contracts/multisig') diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 84285aec3..23eb4f305 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0x/contracts-multisig", - "version": "1.0.1", + "version": "1.0.0", "engines": { "node": ">=6.12" }, @@ -45,7 +45,7 @@ "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/contracts-test-utils": "^1.0.0", "@0x/dev-utils": "^1.0.20", "@0x/sol-compiler": "^1.1.15", "@0x/sol-cov": "^2.1.15", -- cgit v1.2.3 From f8e84260b59c367d4f99c03b69b7c63a42735116 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 13 Dec 2018 11:33:55 -0800 Subject: Bump contracts-test-utils version to match the one on npm --- contracts/multisig/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contracts/multisig') diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 23eb4f305..a9972546d 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -45,7 +45,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "devDependencies": { "@0x/abi-gen": "^1.0.18", - "@0x/contracts-test-utils": "^1.0.0", + "@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", -- cgit v1.2.3 From 2abd8fe4ee860e5a4008a9f92f6d29239d14b2bc Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 13 Dec 2018 14:28:27 -0800 Subject: Publish - 0x.js@2.0.8 - @0x/abi-gen@1.0.19 - @0x/abi-gen-wrappers@2.0.2 - @0x/assert@1.0.20 - @0x/asset-buyer@3.0.4 - @0x/base-contract@3.0.10 - @0x/connect@3.0.10 - @0x/contract-wrappers@4.1.3 - @0x/dev-tools-pages@0.0.10 - @0x/dev-utils@1.0.21 - ethereum-types@1.1.4 - @0x/fill-scenarios@1.0.16 - @0x/instant@1.0.4 - @0x/json-schemas@2.1.4 - @0x/metacoin@0.0.32 - @0x/migrations@2.2.2 - @0x/order-utils@3.0.7 - @0x/order-watcher@2.2.8 - @0x/pipeline@1.0.2 - @0x/react-docs@1.0.22 - @0x/react-shared@1.0.25 - @0x/sol-compiler@1.1.16 - @0x/sol-cov@2.1.16 - @0x/sol-doc@1.0.11 - @0x/sol-resolver@1.1.1 - @0x/sra-spec@1.0.13 - @0x/subproviders@2.1.8 - @0x/testnet-faucets@1.0.60 - @0x/tslint-config@2.0.0 - @0x/types@1.4.1 - @0x/typescript-typings@3.0.6 - @0x/utils@2.0.8 - @0x/web3-wrapper@3.2.1 - @0x/website@0.0.63 - @0x/contracts-examples@1.0.1 - @0x/contracts-extensions@1.0.1 - @0x/contracts-interfaces@1.0.1 - @0x/contracts-libs@1.0.1 - @0x/contracts-multisig@1.0.1 - @0x/contracts-protocol@2.1.58 - @0x/contracts-test-utils@1.0.2 - @0x/contracts-tokens@1.0.1 - @0x/contracts-utils@1.0.1 --- contracts/multisig/package.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'contracts/multisig') diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index a9972546d..40641da8e 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0x/contracts-multisig", - "version": "1.0.0", + "version": "1.0.1", "engines": { "node": ">=6.12" }, @@ -44,13 +44,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 +71,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": { -- cgit v1.2.3 From 545101f7a5155fed77f9c65153bd13bdc23387bf Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 13 Dec 2018 14:36:34 -0800 Subject: Make contracts packages not private --- contracts/multisig/package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'contracts/multisig') diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 40641da8e..eb8d6a9bb 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,5 +1,4 @@ { - "private": true, "name": "@0x/contracts-multisig", "version": "1.0.1", "engines": { -- cgit v1.2.3 From d018f6d9ccb6fd31e9dacb845a68bf6851a4cd4c Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 13 Dec 2018 14:58:48 -0800 Subject: Updated CHANGELOGS --- contracts/multisig/CHANGELOG.json | 12 +++++++++++- contracts/multisig/CHANGELOG.md | 10 ++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 contracts/multisig/CHANGELOG.md (limited to 'contracts/multisig') 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 @@ + + +CHANGELOG + +## v1.0.2 - _December 13, 2018_ + + * Dependencies updated -- cgit v1.2.3 From 44e516ac65d4923cc83b0112c509317c6a6d87b6 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 13 Dec 2018 14:58:57 -0800 Subject: Publish - @0x/contracts-examples@1.0.2 - @0x/contracts-extensions@1.0.2 - @0x/contracts-interfaces@1.0.2 - @0x/contracts-libs@1.0.2 - @0x/contracts-multisig@1.0.2 - @0x/contracts-protocol@2.1.59 - @0x/contracts-tokens@1.0.2 - @0x/contracts-utils@1.0.2 --- contracts/multisig/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contracts/multisig') diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index eb8d6a9bb..b338f67f7 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-multisig", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, -- cgit v1.2.3