diff options
| author | Jacob Evans <dekz@dekz.net> | 2018-07-02 09:21:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-02 09:21:16 +0800 |
| commit | ad570b8ae162a213b4b88c417ecd64d4661df18b (patch) | |
| tree | d9acfb9e2459c4dfcac191061fefebe015ff5771 /packages/subproviders | |
| parent | b9165c03af40983d885af2b18e729f11746de91d (diff) | |
| parent | b9b00e10d39c3c84bc72892ef37f1313e904414d (diff) | |
| download | dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.gz dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.bz2 dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.lz dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.xz dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.zst dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.zip | |
Merge branch 'v2-prototype' into eth-lightwallet-subprovider-final
Diffstat (limited to 'packages/subproviders')
| -rw-r--r-- | packages/subproviders/package.json | 17 | ||||
| -rw-r--r-- | packages/subproviders/src/index.ts | 1 | ||||
| -rw-r--r-- | packages/subproviders/src/subproviders/ganache.ts | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 76b88cee0..5fd7c3c2d 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/" } @@ -50,7 +50,7 @@ "bip39": "^2.5.0", "bn.js": "^4.11.8", "eth-lightwallet": "^3.0.1", - "ethereumjs-tx": "^1.3.3", + "ethereumjs-tx": "^1.3.5", "ethereumjs-util": "^5.1.1", "ganache-core": "0xProject/ganache-core", "hdkey": "^0.7.1", @@ -62,6 +62,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", diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts index 06d5871f9..802a27cb1 100644 --- a/packages/subproviders/src/index.ts +++ b/packages/subproviders/src/index.ts @@ -21,6 +21,7 @@ export { ErrorCallback, NextCallback, LedgerCommunicationClient, + LedgerEthereumClient, NonceSubproviderErrors, LedgerSubproviderConfigs, } from './types'; diff --git a/packages/subproviders/src/subproviders/ganache.ts b/packages/subproviders/src/subproviders/ganache.ts index 61b6bb5e9..79c43bc68 100644 --- a/packages/subproviders/src/subproviders/ganache.ts +++ b/packages/subproviders/src/subproviders/ganache.ts @@ -15,7 +15,7 @@ export class GanacheSubprovider extends Subprovider { * Instantiates a GanacheSubprovider * @param opts The desired opts with which to instantiate the Ganache provider */ - constructor(opts: any) { + constructor(opts: Ganache.GanacheOpts) { super(); this._ganacheProvider = Ganache.provider(opts); } |