From 0b326a8bbefd7efee4ebc8b56cbc3faab52e93d6 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 23 Feb 2018 10:50:41 -0800 Subject: Add web3Wrapper.callAsync and remove web3Wrapper.getContractInstance --- .prettierignore | 1 - packages/web3-wrapper/CHANGELOG.md | 9 ++++++--- packages/web3-wrapper/src/index.ts | 12 ++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.prettierignore b/.prettierignore index c3738481a..385c15654 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,4 @@ lib -generated .nyc_output /packages/contracts/src/artifacts package.json diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index 387aafb3a..eef665d24 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -1,9 +1,12 @@ # CHANGELOG -## v0.2.XX - _TBD_ 2018 +## v0.2.0 _TBD, 2018_ - * Ensure all returned user addresses are lowercase (#373) + * Ensure all returned user addresses are lowercase (#373) + * Add `web3Wrapper.callAsync` (#413) + * Make `web3Wrapper.estimateGas` accept whole `txData` instead of `data` (#413) + * Remove `web3Wrapper.getContractInstance` (#413) -## v0.1.12 - _February 9, 2018_ +## v0.1.12 _February 9, 2018_ * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index 7f3452c98..e7c875430 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -128,14 +128,14 @@ export class Web3Wrapper { const web3Contract = this._web3.eth.contract(abi); return web3Contract; } - public getContractInstance(abi: Web3.ContractAbi, address: string): Web3.ContractInstance { - const web3ContractInstance = this.getContractFromAbi(abi).at(address); - return web3ContractInstance; - } - public async estimateGasAsync(data: string): Promise { - const gas = await promisify(this._web3.eth.estimateGas)({ data }); + public async estimateGasAsync(txData: Partial): Promise { + const gas = await promisify(this._web3.eth.estimateGas)(txData); return gas; } + public async callAsync(callData: Web3.CallData): Promise { + const rawCalllResult = await promisify(this._web3.eth.call)(callData); + return rawCalllResult; + } public async sendTransactionAsync(txData: Web3.TxData): Promise { const txHash = await promisify(this._web3.eth.sendTransaction)(txData); return txHash; -- cgit v1.2.3