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

Add revert reasons to bbase MultiSigWallet

Browse Source
This commit is contained in:
Amir Bandeali
2019-09-13 12:32:40 -04:00
parent 2f07fcc81c
commit 585adef75d
2 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
contracts/multisig/contracts/src/MultiSigWallet.sol
View File

@@ -45,50 +45,77 @@ contract MultiSigWallet {
* Modifiers
*/
modifier onlyWallet() {
require(msg.sender == address(this));
require(
msg.sender == address(this),
"ONLY_CALLABLE_BY_WALLET"
);
_;
}
modifier ownerDoesNotExist(address owner) {
require(!isOwner[owner]);
require(
!isOwner[owner],
"OWNER_EXISTS"
);
_;
}
modifier ownerExists(address owner) {
require(isOwner[owner]);
require(
isOwner[owner],
"OWNER_DOESNT_EXIST"
);
_;
}
modifier transactionExists(uint transactionId) {
require(transactions[transactionId].destination != address(0));
require(
transactions[transactionId].destination != address(0),
"TX_DOESNT_EXIST"
);
_;
}
modifier confirmed(uint transactionId, address owner) {
require(confirmations[transactionId][owner]);
require(
confirmations[transactionId][owner],
"TX_NOT_CONFIRMED"
);
_;
}
modifier notConfirmed(uint transactionId, address owner) {
require(!confirmations[transactionId][owner]);
require(
!confirmations[transactionId][owner],
"TX_ALREADY_CONFIRMED"
);
_;
}
modifier notExecuted(uint transactionId) {
require(!transactions[transactionId].executed);
require(
!transactions[transactionId].executed,
"TX_ALREADY_EXECUTED"
);
_;
}
modifier notNull(address _address) {
require(_address != address(0));
require(
_address != address(0),
"NULL_ADDRESS"
);
_;
}
modifier validRequirement(uint ownerCount, uint _required) {
require(ownerCount <= MAX_OWNER_COUNT
require(
ownerCount <= MAX_OWNER_COUNT
&& _required <= ownerCount
&& _required != 0
&& ownerCount != 0);
&& ownerCount != 0,
"INVALID_REQUIREMENTS"
);
_;
}