From f816bdf541daf47047dfc734648eebb1b1ea94d8 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 4 Jun 2018 20:52:37 +0100 Subject: Remove compact_artifacts and replace with updated artifacts --- packages/migrations/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/migrations/package.json') diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 8c4cd915d..b6fb0131c 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -24,14 +24,14 @@ "generate_contract_wrappers:v2": "abi-gen --abis ${npm_package_config_abis_v2} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/v2/contract_wrappers --backend ethers && prettier --write 'src/v2/contract_wrappers/**.ts'", "compile:v1": "sol-compiler --artifacts-dir artifacts/1.0.0 --contracts Exchange_v1,DummyERC20Token,ZRXToken,WETH9,TokenTransferProxy_v1,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,TokenRegistry", - "compile:v2": "sol-compiler --artifacts-dir artifacts/2.0.0 --contracts DummyERC20Token,DummyERC721Token,ERC20Proxy,ERC721Proxy,Exchange,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,ZRXToken,WETH9,IWallet,IValidator" + "compile:v2": "sol-compiler --artifacts-dir artifacts/2.0.0 --contracts ERC20Token,DummyERC20Token,ERC721Token,DummyERC721Token,ERC20Proxy,ERC721Proxy,Exchange,MultiSigWallet,MultiSigWalletWithTimeLock,ZRXToken,WETH9,IWallet,IValidator" }, "config": { "abis": { "v1": "artifacts/1.0.0/@(DummyERC20Token|TokenTransferProxy_v1|Exchange_v1|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|WETH9).json", "v2": - "artifacts/2.0.0/@(DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|ZRXToken|WETH9|IWallet|IValidator).json" + "artifacts/2.0.0/@(ERC20Token|DummyERC20Token|ERC721Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|MultiSigWallet|MultiSigWalletWithTimeLock|ZRXToken|WETH9|IWallet|IValidator).json" } }, "license": "Apache-2.0", -- cgit v1.2.3 From f525afa5de56e746f1952ce5e6b5b47d3894a33c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 4 Jun 2018 21:49:04 +0100 Subject: reset multisign --- packages/migrations/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/migrations/package.json') diff --git a/packages/migrations/package.json b/packages/migrations/package.json index b6fb0131c..43a78896a 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -31,7 +31,7 @@ "v1": "artifacts/1.0.0/@(DummyERC20Token|TokenTransferProxy_v1|Exchange_v1|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|WETH9).json", "v2": - "artifacts/2.0.0/@(ERC20Token|DummyERC20Token|ERC721Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|MultiSigWallet|MultiSigWalletWithTimeLock|ZRXToken|WETH9|IWallet|IValidator).json" + "artifacts/2.0.0/@(ERC20Token|DummyERC20Token|ERC721Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|ZRXToken|WETH9|IWallet|IValidator).json" } }, "license": "Apache-2.0", -- cgit v1.2.3 From de532bb2fc9f4b5d709145d659f531823d4c0f8a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 4 Jun 2018 21:54:16 +0100 Subject: revert multisig change --- packages/migrations/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/migrations/package.json') diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 43a78896a..cad64f5ca 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -24,7 +24,7 @@ "generate_contract_wrappers:v2": "abi-gen --abis ${npm_package_config_abis_v2} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/v2/contract_wrappers --backend ethers && prettier --write 'src/v2/contract_wrappers/**.ts'", "compile:v1": "sol-compiler --artifacts-dir artifacts/1.0.0 --contracts Exchange_v1,DummyERC20Token,ZRXToken,WETH9,TokenTransferProxy_v1,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,TokenRegistry", - "compile:v2": "sol-compiler --artifacts-dir artifacts/2.0.0 --contracts ERC20Token,DummyERC20Token,ERC721Token,DummyERC721Token,ERC20Proxy,ERC721Proxy,Exchange,MultiSigWallet,MultiSigWalletWithTimeLock,ZRXToken,WETH9,IWallet,IValidator" + "compile:v2": "sol-compiler --artifacts-dir artifacts/2.0.0 --contracts ERC20Token,DummyERC20Token,ERC721Token,DummyERC721Token,ERC20Proxy,ERC721Proxy,Exchange,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,ZRXToken,WETH9,IWallet,IValidator" }, "config": { "abis": { -- cgit v1.2.3 From 25f62daf146895a1e0e0c966166f08f28467ae2e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 5 Jun 2018 15:38:40 +0200 Subject: - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse running watch from root dir, with sub-package dir - stop using special prebuild script name and run pre_build steps for `watch` and `build` commands - Remove `clean` step from `build`/`watch` --- packages/migrations/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/migrations/package.json') diff --git a/packages/migrations/package.json b/packages/migrations/package.json index cad64f5ca..49014f564 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -8,10 +8,10 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { - "watch": "tsc -w", - "prebuild": "run-s clean copy_artifacts generate_contract_wrappers", + "watch_without_deps": "yarn pre_build && tsc -w", + "build": "yarn pre_build && tsc", + "pre_build": "run-s copy_artifacts generate_contract_wrappers", "copy_artifacts": "copyfiles 'artifacts/**/*' ./lib", - "build": "tsc", "clean": "shx rm -rf lib src/contract_wrappers", "lint": "tslint --project .", "migrate:v1": "run-s build compile:v1 script:migrate:v1", -- cgit v1.2.3 From fe437da7517b4ea8e308a7210a34e66b715d5c78 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 6 Jun 2018 12:23:50 +0200 Subject: Exclude generate contract wrappers from tslint --- packages/migrations/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/migrations/package.json') diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 8c4cd915d..09e3ffad1 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -13,7 +13,7 @@ "copy_artifacts": "copyfiles 'artifacts/**/*' ./lib", "build": "tsc", "clean": "shx rm -rf lib src/contract_wrappers", - "lint": "tslint --project .", + "lint": "tslint --project . --exclude **/src/v2/contract_wrappers/**/* --exclude **/src/v1/contract_wrappers/**/*", "migrate:v1": "run-s build compile:v1 script:migrate:v1", "migrate:v2": "run-s build compile:v2 script:migrate:v2", "script:migrate:v1": "node ./lib/migrate.js --contracts-version 1.0.0", -- cgit v1.2.3 From 42f39de0f93eb9068f574f53b0d71917a27a80a2 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 4 Jun 2018 13:48:06 -0700 Subject: Stop running prettier on generated files --- packages/migrations/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/migrations/package.json') diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 49014f564..cc765a772 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -20,9 +20,9 @@ "script:migrate:v2": "node ./lib/migrate.js --contracts-version 2.0.0", "generate_contract_wrappers": "run-p generate_contract_wrappers:*", "generate_contract_wrappers:v1": - "abi-gen --abis ${npm_package_config_abis_v1} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/v1/contract_wrappers --backend ethers && prettier --write 'src/v1/contract_wrappers/**.ts'", + "abi-gen --abis ${npm_package_config_abis_v1} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/v1/contract_wrappers --backend ethers", "generate_contract_wrappers:v2": - "abi-gen --abis ${npm_package_config_abis_v2} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/v2/contract_wrappers --backend ethers && prettier --write 'src/v2/contract_wrappers/**.ts'", + "abi-gen --abis ${npm_package_config_abis_v2} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/v2/contract_wrappers --backend ethers", "compile:v1": "sol-compiler --artifacts-dir artifacts/1.0.0 --contracts Exchange_v1,DummyERC20Token,ZRXToken,WETH9,TokenTransferProxy_v1,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,TokenRegistry", "compile:v2": "sol-compiler --artifacts-dir artifacts/2.0.0 --contracts ERC20Token,DummyERC20Token,ERC721Token,DummyERC721Token,ERC20Proxy,ERC721Proxy,Exchange,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,ZRXToken,WETH9,IWallet,IValidator" }, -- cgit v1.2.3 From 760bab8f866ec3d5fc7627ce9bbf5c2eaaef1f36 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 8 Jun 2018 11:18:32 -0700 Subject: Implement SolidityProfiler & adapt sol-cov to work with Geth --- packages/migrations/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/migrations/package.json') diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 605cabee3..1b452f937 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -31,7 +31,7 @@ "v1": "artifacts/1.0.0/@(DummyERC20Token|TokenTransferProxy_v1|Exchange_v1|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|WETH9).json", "v2": - "artifacts/2.0.0/@(ERC20Token|DummyERC20Token|ERC721Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|ZRXToken|WETH9|IWallet|IValidator).json" + "artifacts/2.0.0/@(ERC20Token|DummyERC20Token|ERC721Token|DummyERC721Token|ERC20Proxy|ERC721Proxy|Exchange|AssetProxyOwner|ZRXToken|WETH9|IWallet|IValidator).json" } }, "license": "Apache-2.0", -- cgit v1.2.3