crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add old MultiSig to previous contracts, cleanup file structure

Browse Source
This commit is contained in:
Amir Bandeali
2018-05-20 19:14:06 -07:00
parent 84257dac2b
commit 326a566db2
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
packages/contracts/src/contracts/current/multisig/MultiSigWallet/MultiSigWallet.sol → packages/contracts/src/contracts/current/multisig/MultiSigWallet.sol
View File

2
packages/contracts/src/contracts/current/multisig/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol → packages/contracts/src/contracts/current/multisig/MultiSigWalletWithTimeLock.sol
View File

@@ -18,7 +18,7 @@
pragma solidity ^0.4.10;
import { MultiSigWallet } from "../MultiSigWallet/MultiSigWallet.sol";
import "./MultiSigWallet.sol";
/// @title Multisignature wallet with time lock- Allows multiple parties to execute a transaction after a time lock has passed.
/// @author Amir Bandeali - <amir@0xProject.com>

2
packages/contracts/src/contracts/current/protocol/AssetProxyOwner/AssetProxyOwner.sol
View File

@@ -18,7 +18,7 @@
pragma solidity ^0.4.10;
import "../../multisig/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol";
import "../../multisig/MultiSigWalletWithTimeLock.sol";
contract AssetProxyOwner is
MultiSigWalletWithTimeLock

4
packages/contracts/src/contracts/previous/MultiSigWalletWithTImeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol
View File

@@ -1,6 +1,6 @@
/*
Copyright 2017 ZeroEx Intl.
Copyright 2018 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
pragma solidity ^0.4.10;
import "../../current/multisig/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol";
import "../../current/multisig/MultiSigWalletWithTimeLock.sol";
contract MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress is MultiSigWalletWithTimeLock {

10
packages/contracts/src/utils/multi_sig_wrapper.ts
View File

@@ -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));