diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-09-05 01:53:18 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-09-05 01:53:18 +0800 |
commit | e61dbbb6cf395d3bf807340cac8f99f224ec616e (patch) | |
tree | 04cbe061658c4062423aa6ac40c0968c5b250c90 /packages/contracts/test/utils/multi_sig_wrapper.ts | |
parent | 11df29fa8e4f355ec438966fa9e40cb09fe97380 (diff) | |
parent | 6a619a4084188d1c48d8030d0fe2a1ba777c55e3 (diff) | |
download | dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.gz dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.bz2 dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.lz dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.xz dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.tar.zst dexon-sol-tools-e61dbbb6cf395d3bf807340cac8f99f224ec616e.zip |
Merge https://github.com/0xProject/0x-monorepo into feature/website/update-portal-v2
Diffstat (limited to 'packages/contracts/test/utils/multi_sig_wrapper.ts')
-rw-r--r-- | packages/contracts/test/utils/multi_sig_wrapper.ts | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/packages/contracts/test/utils/multi_sig_wrapper.ts b/packages/contracts/test/utils/multi_sig_wrapper.ts index e0c27b839..e12a58695 100644 --- a/packages/contracts/test/utils/multi_sig_wrapper.ts +++ b/packages/contracts/test/utils/multi_sig_wrapper.ts @@ -6,7 +6,6 @@ import * as _ from 'lodash'; import { AssetProxyOwnerContract } from '../../generated_contract_wrappers/asset_proxy_owner'; import { MultiSigWalletContract } from '../../generated_contract_wrappers/multi_sig_wallet'; -import { constants } from './constants'; import { LogDecoder } from './log_decoder'; export class MultiSigWrapper { @@ -36,10 +35,19 @@ export class MultiSigWrapper { const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); return tx; } - public async executeTransactionAsync(txId: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> { + public async revokeConfirmationAsync(txId: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> { + const txHash = await this._multiSig.revokeConfirmation.sendTransactionAsync(txId, { from }); + const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); + return tx; + } + public async executeTransactionAsync( + txId: BigNumber, + from: string, + opts: { gas?: number } = {}, + ): Promise<TransactionReceiptWithDecodedLogs> { const txHash = await this._multiSig.executeTransaction.sendTransactionAsync(txId, { from, - gas: constants.MAX_EXECUTE_TRANSACTION_GAS, + gas: opts.gas, }); const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); return tx; @@ -52,7 +60,6 @@ export class MultiSigWrapper { const txHash = await (this ._multiSig as AssetProxyOwnerContract).executeRemoveAuthorizedAddressAtIndex.sendTransactionAsync(txId, { from, - gas: constants.MAX_EXECUTE_TRANSACTION_GAS, }); const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash); return tx; |