diff --git a/.gitmodules b/.gitmodules index 2019e40..7bd3b9e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,6 @@ path = lib/openzeppelin-contracts-upgradeable url = https://github.com/openzeppelin/openzeppelin-contracts-upgradeable branch = release-v5.3 +[submodule "lib/safe-utils"] + path = lib/safe-utils + url = https://github.com/Recon-Fuzz/safe-utils diff --git a/foundry.toml b/foundry.toml index 05ba800..51c7c12 100644 --- a/foundry.toml +++ b/foundry.toml @@ -18,6 +18,9 @@ block_timestamp = 1_689_934_508 # Ignore base test files to avoid running tests twice no_match_path = "./test/base/*.t.sol" +[lint] +lint_on_build = false + [profile.default.fuzz] runs = 256 diff --git a/lib/safe-utils b/lib/safe-utils new file mode 160000 index 0000000..eccb79f --- /dev/null +++ b/lib/safe-utils @@ -0,0 +1 @@ +Subproject commit eccb79f80cad0f3ad98137cf3e859aac5d66e425 diff --git a/script/MultiSigBatchBase.sol b/script/MultiSigBatchBase.sol new file mode 100644 index 0000000..d3ec99b --- /dev/null +++ b/script/MultiSigBatchBase.sol @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: UNLICENSED + +pragma solidity >=0.8.20 <0.9.0; + +import { Safe } from "../lib/safe-utils/src/Safe.sol"; +import { Script } from "../lib/forge-std/src/Script.sol"; + +abstract contract MultiSigBatchBase is Script { + using Safe for *; + + Safe.Client internal _safeMultiSig; + address[] internal _targets; + bytes[] internal _data; + + function _addToBatch(address target_, bytes memory data_) internal { + _targets.push(target_); + _data.push(data_); + } + + function _proposeBatch(address safe_, address sender) internal { + _safeMultiSig.initialize(safe_); + _safeMultiSig.proposeTransactions(_targets, _data, sender, ""); + } + + function _simulateBatch(address safe_) internal { + vm.startPrank(safe_); + + for (uint256 i = 0; i < _targets.length; i++) { + (bool success, ) = _targets[i].call(_data[i]); + require(success, "Simulation failed"); + } + + vm.stopPrank(); + } +}