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

Allow transactions to be over confirmed without resetting the confirmation time

Browse Source
This commit is contained in:
Amir Bandeali 2019-10-28 09:42:29 -07:00
parent ea9f535a7c
commit 091f5ed8b8
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contracts/multisig/contracts/src/MultiSigWalletWithTimeLock.sol
View File

@ -37,14 +37,6 @@ contract MultiSigWalletWithTimeLock is
mapping (uint256 => uint256) public confirmationTimes; mapping (uint256 => uint256) public confirmationTimes;
modifier notFullyConfirmed(uint256 transactionId) {
require(
!isConfirmed(transactionId),
"TX_FULLY_CONFIRMED"
);
_;
}
modifier fullyConfirmed(uint256 transactionId) { modifier fullyConfirmed(uint256 transactionId) {
require( require(
isConfirmed(transactionId), isConfirmed(transactionId),
@ -93,11 +85,13 @@ contract MultiSigWalletWithTimeLock is
ownerExists(msg.sender) ownerExists(msg.sender)
transactionExists(transactionId) transactionExists(transactionId)
notConfirmed(transactionId, msg.sender) notConfirmed(transactionId, msg.sender)
notFullyConfirmed(transactionId)
{ {
bool isTxFullyConfirmedBeforeConfirmation = isConfirmed(transactionId);
confirmations[transactionId][msg.sender] = true; confirmations[transactionId][msg.sender] = true;
emit Confirmation(msg.sender, transactionId); emit Confirmation(msg.sender, transactionId);
if (isConfirmed(transactionId)) {
if (!isTxFullyConfirmedBeforeConfirmation && isConfirmed(transactionId)) {
_setConfirmationTime(transactionId, block.timestamp); _setConfirmationTime(transactionId, block.timestamp);
} }
} }

21
contracts/multisig/test/multi_sig_with_time_lock.ts
View File

@ -108,26 +108,33 @@ describe('MultiSigWalletWithTimeLock', () => {
}); });
it('should confirm transaction for caller and log a Confirmation event', async () => { it('should confirm transaction for caller and log a Confirmation event', async () => {
const txReceipt = await multiSigWrapper.confirmTransactionAsync(txId, owners[1]); const txReceipt = await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
expect(txReceipt.logs.length).to.equal(2);
const log = txReceipt.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockConfirmationEventArgs>; const log = txReceipt.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockConfirmationEventArgs>;
expect(log.event).to.be.equal('Confirmation'); expect(log.event).to.be.equal('Confirmation');
expect(log.args.sender).to.be.equal(owners[1]); expect(log.args.sender).to.be.equal(owners[1]);
expect(log.args.transactionId).to.be.bignumber.equal(txId); expect(log.args.transactionId).to.be.bignumber.equal(txId);
}); });
it('should revert if fully confirmed', async () => {
await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
await expectTransactionFailedAsync(
multiSigWrapper.confirmTransactionAsync(txId, owners[2]),
RevertReason.TxFullyConfirmed,
);
});
it('should set the confirmation time of the transaction if it becomes fully confirmed', async () => { it('should set the confirmation time of the transaction if it becomes fully confirmed', async () => {
const txReceipt = await multiSigWrapper.confirmTransactionAsync(txId, owners[1]); const txReceipt = await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
expect(txReceipt.logs.length).to.equal(2);
const blockNum = await web3Wrapper.getBlockNumberAsync(); const blockNum = await web3Wrapper.getBlockNumberAsync();
const timestamp = new BigNumber(await web3Wrapper.getBlockTimestampAsync(blockNum)); const timestamp = new BigNumber(await web3Wrapper.getBlockTimestampAsync(blockNum));
const log = txReceipt.logs[1] as LogWithDecodedArgs<MultiSigWalletWithTimeLockConfirmationTimeSetEventArgs>; const log = txReceipt.logs[1] as LogWithDecodedArgs<MultiSigWalletWithTimeLockConfirmationTimeSetEventArgs>;
expect(log.args.confirmationTime).to.be.bignumber.equal(timestamp); expect(log.args.confirmationTime).to.be.bignumber.equal(timestamp);
expect(log.args.transactionId).to.be.bignumber.equal(txId); expect(log.args.transactionId).to.be.bignumber.equal(txId);
}); });
it('should confirm transaction for caller but not reset the confirmation time if tx is already fully confirmed', async () => {
await multiSigWrapper.confirmTransactionAsync(txId, owners[1]);
const confirmationTimeBefore = await multiSig.confirmationTimes.callAsync(txId);
const txReceipt = await multiSigWrapper.confirmTransactionAsync(txId, owners[2]);
const confirmationTimeAfter = await multiSig.confirmationTimes.callAsync(txId);
expect(confirmationTimeBefore).to.bignumber.equal(confirmationTimeAfter);
expect(txReceipt.logs.length).to.equal(1);
const log = txReceipt.logs[0] as LogWithDecodedArgs<MultiSigWalletWithTimeLockConfirmationEventArgs>;
expect(log.event).to.be.equal('Confirmation');
expect(log.args.sender).to.be.equal(owners[2]);
expect(log.args.transactionId).to.be.bignumber.equal(txId);
});
}); });
describe('executeTransaction', () => { describe('executeTransaction', () => {
let txId: BigNumber; let txId: BigNumber;