diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-05-21 10:14:06 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-05-25 06:39:19 +0800 |
commit | 326a566db29031edf21320923e67dde309573efd (patch) | |
tree | ab6f6d1964f407dc8b4e00ca5440fbb748941485 /packages/contracts/src/utils | |
parent | 84257dac2be92192d5b99dd31617aaebeddb285b (diff) | |
download | dexon-0x-contracts-326a566db29031edf21320923e67dde309573efd.tar dexon-0x-contracts-326a566db29031edf21320923e67dde309573efd.tar.gz dexon-0x-contracts-326a566db29031edf21320923e67dde309573efd.tar.bz2 dexon-0x-contracts-326a566db29031edf21320923e67dde309573efd.tar.lz dexon-0x-contracts-326a566db29031edf21320923e67dde309573efd.tar.xz dexon-0x-contracts-326a566db29031edf21320923e67dde309573efd.tar.zst dexon-0x-contracts-326a566db29031edf21320923e67dde309573efd.zip |
Add old MultiSig to previous contracts, cleanup file structure
Diffstat (limited to 'packages/contracts/src/utils')
-rw-r--r-- | packages/contracts/src/utils/multi_sig_wrapper.ts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/contracts/src/utils/multi_sig_wrapper.ts b/packages/contracts/src/utils/multi_sig_wrapper.ts index c33e7bb47..730cdcbef 100644 --- a/packages/contracts/src/utils/multi_sig_wrapper.ts +++ b/packages/contracts/src/utils/multi_sig_wrapper.ts @@ -27,17 +27,17 @@ export class MultiSigWrapper { const txHash = await this._multiSig.submitTransaction.sendTransactionAsync(destination, value, data, { from, }); - const tx = await this._getTxWithDecodedMultiSigLogs(txHash); + const tx = await this._getTxWithDecodedMultiSigLogsAsync(txHash); return tx; } public async confirmTransactionAsync(txId: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> { const txHash = await this._multiSig.confirmTransaction.sendTransactionAsync(txId, { from }); - const tx = await this._getTxWithDecodedMultiSigLogs(txHash); + const tx = await this._getTxWithDecodedMultiSigLogsAsync(txHash); return tx; } public async executeTransactionAsync(txId: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> { const txHash = await this._multiSig.executeTransaction.sendTransactionAsync(txId, { from }); - const tx = await this._getTxWithDecodedMultiSigLogs(txHash); + const tx = await this._getTxWithDecodedMultiSigLogsAsync(txHash); return tx; } public async executeRemoveAuthorizedAddressAsync( @@ -46,10 +46,10 @@ export class MultiSigWrapper { ): Promise<TransactionReceiptWithDecodedLogs> { const txHash = await (this ._multiSig as AssetProxyOwnerContract).executeRemoveAuthorizedAddress.sendTransactionAsync(txId, { from }); - const tx = await this._getTxWithDecodedMultiSigLogs(txHash); + const tx = await this._getTxWithDecodedMultiSigLogsAsync(txHash); return tx; } - private async _getTxWithDecodedMultiSigLogs(txHash: string) { + private async _getTxWithDecodedMultiSigLogsAsync(txHash: string): Promise<TransactionReceiptWithDecodedLogs> { const tx = await this._zeroEx.awaitTransactionMinedAsync(txHash); tx.logs = _.filter(tx.logs, log => log.address === this._multiSig.address); tx.logs = _.map(tx.logs, log => this._logDecoder.decodeLogOrThrow(log)); |