From 0a873641010a4d13294c41d2549074c83935781b Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Mon, 25 Jun 2018 16:40:33 -0700 Subject: Use ethereumjs-tx@1.3.5 instead of our fork --- packages/subproviders/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/subproviders/package.json') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index a04546bc1..782d1b046 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -49,7 +49,7 @@ "ethereum-types": "^0.0.1", "bip39": "^2.5.0", "bn.js": "^4.11.8", - "ethereumjs-tx": "^1.3.3", + "ethereumjs-tx": "^1.3.5", "ethereumjs-util": "^5.1.1", "ganache-core": "0xProject/ganache-core", "hdkey": "^0.7.1", -- cgit From e58e35e098952259c0c3f59ea1132669aab7d36d Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Fri, 29 Jun 2018 12:38:57 -0700 Subject: Move ledgerhq module declarations to typescript-typings --- packages/subproviders/package.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'packages/subproviders/package.json') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 782d1b046..31b6ffed6 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -12,8 +12,10 @@ "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", "lint": "tslint --project .", - "run_mocha_unit": "mocha --require source-map-support/register --require make-promises-safe lib/test/unit/**/*_test.js --timeout 10000 --bail --exit", - "run_mocha_integration": "mocha --require source-map-support/register --require make-promises-safe lib/test/integration/**/*_test.js --timeout 10000 --bail --exit", + "run_mocha_unit": + "mocha --require source-map-support/register --require make-promises-safe lib/test/unit/**/*_test.js --timeout 10000 --bail --exit", + "run_mocha_integration": + "mocha --require source-map-support/register --require make-promises-safe lib/test/integration/**/*_test.js --timeout 10000 --bail --exit", "test": "npm run test:unit", "test:unit:coverage": "nyc npm run test:unit --all && yarn coverage:report:lcov", "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", @@ -24,16 +26,14 @@ "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "node scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", - "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" + "upload_docs_json": + "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" }, "config": { "postpublish": { "assets": [], "docPublishConfigs": { - "extraFileIncludes": [ - "../types/src/index.ts", - "../ethereum-types/src/index.ts" - ], + "extraFileIncludes": ["../types/src/index.ts", "../ethereum-types/src/index.ts"], "s3BucketPath": "s3://doc-jsons/subproviders/", "s3StagingBucketPath": "s3://staging-doc-jsons/subproviders/" } @@ -61,6 +61,7 @@ "devDependencies": { "@0xproject/monorepo-scripts": "^0.2.1", "@0xproject/tslint-config": "^0.4.20", + "@0xproject/typescript-typings": "^0.4.2", "@0xproject/utils": "^0.7.1", "@types/bip39": "^2.4.0", "@types/bn.js": "^4.11.0", -- cgit