forked from safe-global/safe-smart-account
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
enhances rules about module and transaction guards to include the pro…
…position that the correct guard is called
- Loading branch information
Derek Sorensen
authored and
Derek Sorensen
committed
Jan 7, 2025
1 parent
853c03b
commit 0644d7a
Showing
4 changed files
with
175 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // SPDX-License-Identifier: LGPL-3.0-only | ||
| /* solhint-disable one-contract-per-file */ | ||
| pragma solidity >=0.7.0 <0.9.0; | ||
| import {IModuleGuard} from "../munged/base/ModuleManager.sol"; | ||
| import {IERC165} from "../munged/interfaces/IERC165.sol"; | ||
| import "../munged/libraries/Enum.sol"; | ||
|
|
||
| contract ModuleGuardMockDuplicate is IModuleGuard { | ||
|
|
||
| constructor(){ | ||
| preCheckedTransactions = false ; | ||
| postCheckedTransactions = false ; | ||
| } | ||
|
|
||
| // some mock variables | ||
| bool public preCheckedTransactions ; | ||
| bool public postCheckedTransactions ; | ||
|
|
||
| function resetChecks() external { | ||
| preCheckedTransactions = false ; | ||
| postCheckedTransactions = false ; | ||
| } | ||
|
|
||
| /** | ||
| * @notice Checks the module transaction details. | ||
| * @dev The function needs to implement module transaction validation logic. | ||
| * @param to The address to which the transaction is intended. | ||
| * @param value The value of the transaction in Wei. | ||
| * @param data The transaction data. | ||
| * @param operation The type of operation of the module transaction. | ||
| * @param module The module involved in the transaction. | ||
| * @return moduleTxHash The hash of the module transaction. | ||
| */ | ||
| function checkModuleTransaction( | ||
| address to, | ||
| uint256 value, | ||
| bytes memory data, | ||
| Enum.Operation operation, | ||
| address module | ||
| ) external override returns (bytes32 moduleTxHash) { | ||
| // updates transaction checked | ||
| preCheckedTransactions = true ; | ||
| // if it passes, it returns a string of bytes | ||
| return bytes32(0); | ||
| } | ||
|
|
||
| /** | ||
| * @notice Checks after execution of module transaction. | ||
| * @dev The function needs to implement a check after the execution of the module transaction. | ||
| * @param txHash The hash of the module transaction. | ||
| * @param success The status of the module transaction execution. | ||
| */ | ||
| function checkAfterModuleExecution(bytes32 txHash, bool success) external override { | ||
| postCheckedTransactions = true; | ||
| } | ||
|
|
||
| /** | ||
| * @dev Returns true if this contract implements the interface defined by `interfaceId`. | ||
| * See the corresponding EIP section | ||
| * https://eips.ethereum.org/EIPS/eip-165#how-interfaces-are-identified | ||
| * to learn more about how these ids are created. | ||
| * | ||
| * This function call must use less than 30 000 gas. | ||
| */ | ||
| function supportsInterface(bytes4 interfaceId) external view virtual override returns (bool) { | ||
| return | ||
| interfaceId == type(IModuleGuard).interfaceId || // 0x58401ed8 | ||
| interfaceId == type(IERC165).interfaceId; // 0x01ffc9a7 | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // SPDX-License-Identifier: LGPL-3.0-only | ||
| /* solhint-disable one-contract-per-file */ | ||
| pragma solidity >=0.7.0 <0.9.0; | ||
| import {ITransactionGuard} from "../munged/base/GuardManager.sol"; | ||
| import {IERC165} from "../munged/interfaces/IERC165.sol"; | ||
| import "../munged/libraries/Enum.sol"; | ||
|
|
||
| contract TxnGuardMockDuplicate is ITransactionGuard { | ||
|
|
||
| constructor(){} | ||
|
|
||
| // some mock variables | ||
| bool public preCheckedTransactions ; | ||
| bool public postCheckedTransactions ; | ||
|
|
||
| function resetChecks() external { | ||
| preCheckedTransactions = false ; | ||
| postCheckedTransactions = false ; | ||
| } | ||
|
|
||
| /** | ||
| * @notice Checks the transaction details. | ||
| * @dev The function needs to implement transaction validation logic. | ||
| * @param to The address to which the transaction is intended. | ||
| * @param value The value of the transaction in Wei. | ||
| * @param data The transaction data. | ||
| * @param operation The type of operation of the transaction. | ||
| * @param safeTxGas Gas used for the transaction. | ||
| * @param baseGas The base gas for the transaction. | ||
| * @param gasPrice The price of gas in Wei for the transaction. | ||
| * @param gasToken The token used to pay for gas. | ||
| * @param refundReceiver The address which should receive the refund. | ||
| * @param signatures The signatures of the transaction. | ||
| * @param msgSender The address of the message sender. | ||
| */ | ||
| function checkTransaction( | ||
| address to, | ||
| uint256 value, | ||
| bytes memory data, | ||
| Enum.Operation operation, | ||
| uint256 safeTxGas, | ||
| uint256 baseGas, | ||
| uint256 gasPrice, | ||
| address gasToken, | ||
| address payable refundReceiver, | ||
| bytes memory signatures, | ||
| address msgSender | ||
| ) external override { | ||
| // updates transaction checked | ||
| preCheckedTransactions = true; | ||
| } | ||
|
|
||
| /** | ||
| * @notice Checks after execution of the transaction. | ||
| * @dev The function needs to implement a check after the execution of the transaction. | ||
| * @param hash The hash of the transaction. | ||
| * @param success The status of the transaction execution. | ||
| */ | ||
| function checkAfterExecution(bytes32 hash, bool success) external override { | ||
| // updates transaction checked | ||
| postCheckedTransactions = true ; | ||
| } | ||
|
|
||
| /** | ||
| * @dev Returns true if this contract implements the interface defined by `interfaceId`. | ||
| * See the corresponding EIP section | ||
| * https://eips.ethereum.org/EIPS/eip-165#how-interfaces-are-identified | ||
| * to learn more about how these ids are created. | ||
| * | ||
| * This function call must use less than 30 000 gas. | ||
| */ | ||
| function supportsInterface(bytes4 interfaceId) external view virtual override returns (bool) { | ||
| return | ||
| interfaceId == type(ITransactionGuard).interfaceId || // 0xe6d7a83a | ||
| interfaceId == type(IERC165).interfaceId; // 0x01ffc9a7 | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters