From 81c48872415998e53ad653aabf183e18257ec327 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Mon, 1 Oct 2018 16:44:13 -0700 Subject: Move generated contract wrappers and artifacts into contracts package --- packages/contracts/package.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 01d04e645..b147e8827 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -6,34 +6,33 @@ "node": ">=6.12" }, "description": "Smart contract components of 0x protocol", - "main": "index.js", + "main": "lib/src/index.js", "directories": { "test": "test" }, "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", - "pre_build": "run-s compile copy_artifacts generate_contract_wrappers", - "copy_artifacts": "copyfiles -u 4 '../migrations/artifacts/development/**/*' ./lib/artifacts;", + "pre_build": "run-s compile generate_contract_wrappers", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html", "test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha", "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit", - "compile": "sol-compiler --contracts-dir src", - "clean": "shx rm -rf lib generated_contract_wrappers", - "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output generated_contract_wrappers --backend ethers", - "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/* --exclude **/lib/**/* && yarn lint-contracts", + "compile": "sol-compiler --contracts-dir contracts", + "clean": "shx rm -rf lib generated-artifacts generated-wrappers", + "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers", + "lint": "tslint --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts", "coverage:report:text": "istanbul report text", "coverage:report:html": "istanbul report html && open coverage/index.html", "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", - "lint-contracts": "solhint src/2.0.0/**/**/**/**/*.sol" + "lint-contracts": "solhint contracts/**/**/**/**/*.sol" }, "config": { - "abis": "../migrations/artifacts/development/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|InvalidERC721Receiver|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|OrderValidator|ReentrantERC20Token|TestAssetProxyOwner|TestAssetProxyDispatcher|TestConstants|TestExchangeInternals|TestLibBytes|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|TokenRegistry|Whitelist|WETH9|ZRXToken).json" + "abis": "generated-artifacts/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|InvalidERC721Receiver|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|OrderValidator|ReentrantERC20Token|TestAssetProxyOwner|TestAssetProxyDispatcher|TestConstants|TestExchangeInternals|TestLibBytes|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist|WETH9|ZRXToken).json" }, "repository": { "type": "git", -- cgit v1.2.3 From 026ad1f9a10359723eed54f37c067ee2a61d8fcd Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Mon, 1 Oct 2018 18:22:42 -0700 Subject: Update contract-wrappers package to use new contracts package for generated files --- packages/contracts/package.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index b147e8827..087e35a41 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,7 +1,6 @@ { - "private": true, - "name": "contracts", - "version": "2.1.49", + "name": "@0xproject/contracts", + "version": "2.0.0", "engines": { "node": ">=6.12" }, @@ -32,7 +31,7 @@ "lint-contracts": "solhint contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|InvalidERC721Receiver|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|OrderValidator|ReentrantERC20Token|TestAssetProxyOwner|TestAssetProxyDispatcher|TestConstants|TestExchangeInternals|TestLibBytes|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist|WETH9|ZRXToken).json" + "abis": "generated-artifacts/@(AssetProxyOwner|DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|ERC20Proxy|ERC721Token|ERC721Proxy|Forwarder|Exchange|ExchangeWrapper|IAssetData|IAssetProxy|InvalidERC721Receiver|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|OrderValidator|ReentrantERC20Token|TestAssetProxyOwner|TestAssetProxyDispatcher|TestConstants|TestExchangeInternals|TestLibBytes|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist|WETH9|ZRXToken).json" }, "repository": { "type": "git", @@ -86,5 +85,8 @@ "ethers": "~4.0.4", "js-combinatorics": "^0.5.3", "lodash": "^4.17.5" + }, + "publishConfig": { + "access": "public" } } -- cgit v1.2.3 From 5b1b423b5e3a4c2623028021490a0874e555e1ad Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 2 Oct 2018 13:11:34 -0700 Subject: Change @0xproject/contracts version number back to 2.1.48 --- packages/contracts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 087e35a41..fcb9f70f0 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/contracts", - "version": "2.0.0", + "version": "2.1.48", "engines": { "node": ">=6.12" }, -- cgit v1.2.3 From 17c6661e2d3adf115cdc39371ec33bee1e8cd108 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Thu, 4 Oct 2018 17:35:57 -0700 Subject: Cleanup migrations and contracts package. Make contracts private again. --- packages/contracts/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index fcb9f70f0..284c42977 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,7 @@ { - "name": "@0xproject/contracts", - "version": "2.1.48", + "private": true, + "name": "contracts", + "version": "2.1.49", "engines": { "node": ">=6.12" }, -- cgit v1.2.3 From 770cf529334543a1d23cdfa0fad1672879cda974 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 9 Oct 2018 14:21:56 -0700 Subject: Remove unused copyfiles dependencies --- packages/contracts/package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 284c42977..33ae3db9a 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -59,7 +59,6 @@ "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-bignumber": "^2.0.1", - "copyfiles": "^2.0.0", "dirty-chai": "^2.0.1", "make-promises-safe": "^1.1.0", "mocha": "^4.1.0", -- cgit v1.2.3