diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-02-06 23:37:42 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-02-07 09:27:47 +0800 |
commit | eea8b15180d3e6616a908a8eb4c537df7d87a6ab (patch) | |
tree | b257751abc8cb16f84133493b043616c7d801fa8 /packages/contracts/contract_templates/partials/tx.handlebars | |
parent | 600a2b40af0430d4037f86f6ffe21d6edf3fb166 (diff) | |
download | dexon-sol-tools-eea8b15180d3e6616a908a8eb4c537df7d87a6ab.tar dexon-sol-tools-eea8b15180d3e6616a908a8eb4c537df7d87a6ab.tar.gz dexon-sol-tools-eea8b15180d3e6616a908a8eb4c537df7d87a6ab.tar.bz2 dexon-sol-tools-eea8b15180d3e6616a908a8eb4c537df7d87a6ab.tar.lz dexon-sol-tools-eea8b15180d3e6616a908a8eb4c537df7d87a6ab.tar.xz dexon-sol-tools-eea8b15180d3e6616a908a8eb4c537df7d87a6ab.tar.zst dexon-sol-tools-eea8b15180d3e6616a908a8eb4c537df7d87a6ab.zip |
Change contract templates
Diffstat (limited to 'packages/contracts/contract_templates/partials/tx.handlebars')
-rw-r--r-- | packages/contracts/contract_templates/partials/tx.handlebars | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/packages/contracts/contract_templates/partials/tx.handlebars b/packages/contracts/contract_templates/partials/tx.handlebars index 9df83266a..69ae982d6 100644 --- a/packages/contracts/contract_templates/partials/tx.handlebars +++ b/packages/contracts/contract_templates/partials/tx.handlebars @@ -9,43 +9,28 @@ public {{this.name}} = { {{/this.payable}} ): Promise<string> { const self = this as {{contractName}}Contract; - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - txData, - self.{{this.name}}.estimateGasAsync.bind( - self, - {{> params inputs=inputs}} - ), - ); - const txHash = await promisify<string>( - self._web3ContractInstance.{{this.name}}, self._web3ContractInstance, - )( + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(txData); + const txHash = await self._web3ContractInstance.{{this.name}}( {{> params inputs=inputs}} txDataWithDefaults, ); return txHash; }, - async estimateGasAsync( + async callAsync( {{> typed_params inputs=inputs}} + {{#this.payable}} + txData: TxDataPayable = {}, + {{/this.payable}} + {{^this.payable}} txData: TxData = {}, - ): Promise<number> { + {{/this.payable}} + ): Promise<{{> return_type outputs=outputs}}> { const self = this as {{contractName}}Contract; - const txDataWithDefaults = await self._applyDefaultsToTxDataAsync( - txData, - ); - const gas = await promisify<number>( - self._web3ContractInstance.{{this.name}}.estimateGas, self._web3ContractInstance, - )( + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(txData); + const returnValue = await self._web3ContractInstance.{{this.name}}.call( {{> params inputs=inputs}} txDataWithDefaults, ); - return gas; - }, - getABIEncodedTransactionData( - {{> typed_params inputs=inputs}} - txData: TxData = {}, - ): string { - const self = this as {{contractName}}Contract; - const abiEncodedTransactionData = self._web3ContractInstance.{{this.name}}.getData(); - return abiEncodedTransactionData; + return returnValue; }, }; |