From 209266dbed9d7d038c90c2da8d9b99acab77c80c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 9 May 2018 20:36:28 +0200 Subject: Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a unifying library with the same interface --- packages/web3-wrapper/src/web3_wrapper.ts | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index 5e6ff3239..49fddb27b 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -324,6 +324,13 @@ export class Web3Wrapper { const txHash = await promisify(this._web3.eth.sendTransaction)(txData); return txHash; } + /** + * Waits for a transaction to be mined and returns the transaction receipt. + * @param txHash Transaction hash + * @param pollingIntervalMs How often (in ms) should we check if the transaction is mined. + * @param timeoutMs How long (in ms) to poll for transaction mined until aborting. + * @return Transaction receipt with decoded log args. + */ public async awaitTransactionMinedAsync( txHash: string, pollingIntervalMs = 1000, -- cgit v1.2.3 From 28e83c21e239ff790c8a9844ee1c23542c8c6c3f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 10 May 2018 15:22:13 +0200 Subject: Remove uneeded tslint config --- packages/web3-wrapper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 3ee9631cc..b75bf8a56 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -8,7 +8,7 @@ "build:watch": "tsc -w", "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", - "lint": "tslint --project . 'src/**/*.ts'", + "lint": "tslint --project ., "test": "run-s clean build run_mocha", "test:circleci": "yarn test:coverage", "run_mocha": "mocha lib/test/**/*_test.js --bail --exit", -- cgit v1.2.3 From 832e1e2cf7daa94c900a2f0bd37fb9a85e995f3e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 10 May 2018 15:26:19 +0200 Subject: Add missing quote --- packages/web3-wrapper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index b75bf8a56..bc38df00d 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -8,7 +8,7 @@ "build:watch": "tsc -w", "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", - "lint": "tslint --project ., + "lint": "tslint --project .", "test": "run-s clean build run_mocha", "test:circleci": "yarn test:coverage", "run_mocha": "mocha lib/test/**/*_test.js --bail --exit", -- cgit v1.2.3 From 3f6876c4199353b597e1b0ebcf3907d6b8cce284 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 11 May 2018 17:41:35 +0200 Subject: Remove gitkeeps --- packages/web3-wrapper/coverage/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packages/web3-wrapper/coverage/.gitkeep (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/coverage/.gitkeep b/packages/web3-wrapper/coverage/.gitkeep deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.3 From 31763a018c18106aac11d8a3d82b3ccd9676f9c8 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 11 May 2018 18:50:50 +0200 Subject: Revert "Remove gitkeeps" This reverts commit 3f6876c4199353b597e1b0ebcf3907d6b8cce284. --- packages/web3-wrapper/coverage/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/web3-wrapper/coverage/.gitkeep (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/coverage/.gitkeep b/packages/web3-wrapper/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.3