[FPS] multisig task tests

src/fps/task/MultisigTask.sol

@@ -194,9 +194,9 @@ abstract contract MultisigTask is Test, Script, ITask {
                 multisig == addresses.getAddress(config.safeAddressString, chains[i].chainId),
                 string.concat(
                     "MultisigTask: safe address mismatch. Caller: ",
-                    vm.getLabel(multisig),
+                    getAddressLabel(multisig),
                     ". Actual address: ",
-                    vm.getLabel(addresses.getAddress(config.safeAddressString, chains[i].chainId))
+                    getAddressLabel(addresses.getAddress(config.safeAddressString, chains[i].chainId))
                 )
             );
         }
@@ -250,7 +250,7 @@ abstract contract MultisigTask is Test, Script, ITask {
 
     /// @notice print the data to sig by EOA for single multisig
     function printDataToSign() public view {
-        console.logBytes(_getDataToSign(multisig, getCalldata()));
+        console.logBytes(getDataToSign(multisig, getCalldata()));
     }
 
     /// @notice print the hash to approve by EOA for single multisig
@@ -261,7 +261,7 @@ abstract contract MultisigTask is Test, Script, ITask {
     /// @notice get the data to sign by EOA for single multisig
     /// @param data The calldata to be executed
     /// @return The data to sign
-    function _getDataToSign(address safe, bytes memory data) internal view returns (bytes memory) {
+    function getDataToSign(address safe, bytes memory data) public view returns (bytes memory) {
         uint256 useNonce;
 
         if (safe == multisig) {
@@ -339,7 +339,7 @@ abstract contract MultisigTask is Test, Script, ITask {
                 _allowedStorageAccesses.contains(addr),
                 string(
                     abi.encodePacked(
-                        "MultisigTask: address ", _getAddressLabel(addr), " not in allowed storage accesses"
+                        "MultisigTask: address ", getAddressLabel(addr), " not in allowed storage accesses"
                     )
                 )
             );
@@ -352,7 +352,7 @@ abstract contract MultisigTask is Test, Script, ITask {
                 _taskStateChangeAddresses.contains(addr),
                 string(
                     abi.encodePacked(
-                        "MultisigTask: address ", _getAddressLabel(addr), " not in task state change addresses"
+                        "MultisigTask: address ", getAddressLabel(addr), " not in task state change addresses"
                     )
                 )
             );
@@ -429,7 +429,7 @@ abstract contract MultisigTask is Test, Script, ITask {
         console.log("\n------------------ Proposal Actions ------------------");
         for (uint256 i; i < actions.length; i++) {
             console.log("%d). %s", i + 1, actions[i].description);
-            console.log("target: %s\npayload", _getAddressLabel(actions[i].target));
+            console.log("target: %s\npayload", getAddressLabel(actions[i].target));
             console.logBytes(actions[i].arguments);
             console.log("\n");
         }
@@ -441,7 +441,7 @@ abstract contract MultisigTask is Test, Script, ITask {
         for (uint256 i; i < _taskTransferFromAddresses.length(); i++) {
             address account = _taskTransferFromAddresses.at(i);
 
-            console.log("\n\n", string(abi.encodePacked(_getAddressLabel(account), ":")));
+            console.log("\n\n", string(abi.encodePacked(getAddressLabel(account), ":")));
 
             // print token transfers
             TransferInfo[] memory transfers = _taskTransfers[account];
@@ -453,7 +453,7 @@ abstract contract MultisigTask is Test, Script, ITask {
                     console.log(
                         string(
                             abi.encodePacked(
-                                "Sent ", vm.toString(transfers[j].value), " ETH to ", _getAddressLabel(transfers[j].to)
+                                "Sent ", vm.toString(transfers[j].value), " ETH to ", getAddressLabel(transfers[j].to)
                             )
                         )
                     );
@@ -464,9 +464,9 @@ abstract contract MultisigTask is Test, Script, ITask {
                                 "Sent ",
                                 vm.toString(transfers[j].value),
                                 " ",
-                                _getAddressLabel(transfers[j].tokenAddress),
+                                getAddressLabel(transfers[j].tokenAddress),
                                 " to ",
-                                _getAddressLabel(transfers[j].to)
+                                getAddressLabel(transfers[j].to)
                             )
                         )
                     );
@@ -480,7 +480,7 @@ abstract contract MultisigTask is Test, Script, ITask {
             address account = _taskStateChangeAddresses.at(k);
             StateInfo[] memory stateChanges = _stateInfos[account];
             if (stateChanges.length > 0) {
-                console.log("\n State Changes for account:", _getAddressLabel(account));
+                console.log("\n State Changes for account:", getAddressLabel(account));
             }
             for (uint256 j; j < stateChanges.length; j++) {
                 console.log("Slot:", vm.toString(stateChanges[j].slot));
@@ -508,21 +508,21 @@ abstract contract MultisigTask is Test, Script, ITask {
 
     /// @notice print the data to sign by EOA for nested multisig
     function printNestedDataToSign() public view {
-        bytes memory callData = _generateApproveMulticallData();
+        bytes memory callData = generateApproveMulticallData();
 
         for (uint256 i; i < startingOwners.length; i++) {
-            bytes memory dataToSign = _getDataToSign(startingOwners[i], callData);
-            console.log("Nested multisig: %s", _getAddressLabel(startingOwners[i]));
+            bytes memory dataToSign = getDataToSign(startingOwners[i], callData);
+            console.log("Nested multisig: %s", getAddressLabel(startingOwners[i]));
             console.logBytes(dataToSign);
         }
     }
 
     /// @notice print the hash to approve by EOA for nested multisig
     function printNestedHashToApprove() public view {
-        bytes memory callData = _generateApproveMulticallData();
+        bytes memory callData = generateApproveMulticallData();
         for (uint256 i; i < startingOwners.length; i++) {
-            bytes32 hash = keccak256(_getDataToSign(startingOwners[i], callData));
-            console.log("Nested multisig: %s", _getAddressLabel(startingOwners[i]));
+            bytes32 hash = keccak256(getDataToSign(startingOwners[i], callData));
+            console.log("Nested multisig: %s", getAddressLabel(startingOwners[i]));
             console.logBytes32(hash);
         }
     }
@@ -535,9 +535,9 @@ abstract contract MultisigTask is Test, Script, ITask {
 
     /// @notice get the hash for this safe transaction
     /// can only be called after the build function, otherwise it reverts
-    function getHash() internal view returns (bytes32) {
+    function getHash() public view returns (bytes32) {
         bytes memory data = getCalldata();
-        return keccak256(_getDataToSign(multisig, data));
+        return keccak256(getDataToSign(multisig, data));
     }
 
     /// @notice validate actions inclusion
@@ -561,7 +561,7 @@ abstract contract MultisigTask is Test, Script, ITask {
     }
 
     /// @notice helper function to generate the approveHash calldata to be executed by child multisig owner on parent multisig
-    function _generateApproveMulticallData() internal view returns (bytes memory) {
+    function generateApproveMulticallData() public view returns (bytes memory) {
         bytes32 hash = getHash();
         Call3Value memory call = Call3Value({
             target: multisig,
@@ -647,7 +647,7 @@ abstract contract MultisigTask is Test, Script, ITask {
                         description: string(
                             abi.encodePacked(
                                 "calling ",
-                                _getAddressLabel(accountAccesses[i].account),
+                                getAddressLabel(accountAccesses[i].account),
                                 " with ",
                                 vm.toString(accountAccesses[i].value),
                                 " eth and ",
@@ -753,7 +753,7 @@ abstract contract MultisigTask is Test, Script, ITask {
     }
 
     /// @notice helper method to get labels for addresses
-    function _getAddressLabel(address contractAddress) internal view returns (string memory) {
+    function getAddressLabel(address contractAddress) public view returns (string memory) {
         string memory label = vm.getLabel(contractAddress);
 
         bytes memory prefix = bytes("unlabeled:");

test/AddressRegistry.t.sol → test/registry/AddressRegistry.t.sol

@@ -126,7 +126,7 @@ contract MainnetAddressRegistryTest is Test {
     /// Construction failure tests
 
     function testInvalidChainIdInSuperchainsFails() public {
-        string memory networkConfigFilePath = "test/mock/invalidChainIdNetworkConfig.toml";
+        string memory networkConfigFilePath = "test/registry/mock/invalidChainIdNetworkConfig.toml";
 
         vm.expectRevert("Invalid chain ID in config");
         new AddressRegistry(networkConfigFilePath);

test/task/NestedMultisigTask.t.sol

@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import {Test} from "forge-std/Test.sol";
+
+import {AddressRegistry as Addresses} from "src/fps/AddressRegistry.sol";
+import {MultisigTask} from "src/fps/task/MultisigTask.sol";
+import {DisputeGameUpgradeTemplate} from "src/fps/example/template/DisputeGameUpgradeTemplate.sol";
+import {IGnosisSafe, Enum} from "@base-contracts/script/universal/IGnosisSafe.sol";
+import {MULTICALL3_ADDRESS} from "src/fps/utils/Constants.sol";
+
+contract NestedMultisigTaskTest is Test {
+    struct Call3Value {
+        address target;
+        bool allowFailure;
+        uint256 value;
+        bytes callData;
+    }
+
+    MultisigTask private multisigTask;
+    Addresses private addresses;
+    string taskConfigFilePath = "src/fps/example/task-01/mainnetConfig.toml";
+
+    function setUp() public {
+        vm.createSelectFork("mainnet");
+        multisigTask = new DisputeGameUpgradeTemplate();
+        multisigTask.run(taskConfigFilePath);
+        addresses = multisigTask.addresses();
+    }
+
+    function testSafeNested() public view {
+        assertEq(multisigTask.isNestedSafe(), true, "Expected isNestedSafe to be false");
+    }
+
+    function testNestedDataToSignAndHashToApprove() public view {
+        IGnosisSafe parentMultisig = IGnosisSafe(multisigTask.multisig());
+        address[] memory childOwnerMultisigs = parentMultisig.getOwners();
+
+        bytes32 hashToApproveByChildMultisig = parentMultisig.getTransactionHash(
+            MULTICALL3_ADDRESS,
+            0,
+            multisigTask.getCalldata(),
+            Enum.Operation.DelegateCall,
+            0,
+            0,
+            0,
+            address(0),
+            address(0),
+            parentMultisig.nonce() - 1
+        );
+
+        Call3Value memory call = Call3Value({
+            target: address(parentMultisig),
+            allowFailure: false,
+            value: 0,
+            callData: abi.encodeCall(parentMultisig.approveHash, (hashToApproveByChildMultisig))
+        });
+
+        Call3Value[] memory calls = new Call3Value[](1);
+        calls[0] = call;
+
+        bytes memory callDataToApprove =
+            abi.encodeWithSignature("aggregate3Value((address,bool,uint256,bytes)[])", calls);
+        assertEq(callDataToApprove, multisigTask.generateApproveMulticallData(), "Wrong callDataToApprove");
+
+        for (uint256 i; i < childOwnerMultisigs.length; i++) {
+            bytes memory dataToSign = getNestedDataToSign(childOwnerMultisigs[i]);
+            bytes memory expectedDataToSign = IGnosisSafe(childOwnerMultisigs[i]).encodeTransactionData({
+                to: MULTICALL3_ADDRESS,
+                value: 0,
+                data: callDataToApprove,
+                operation: Enum.Operation.DelegateCall,
+                safeTxGas: 0,
+                baseGas: 0,
+                gasPrice: 0,
+                gasToken: address(0),
+                refundReceiver: address(0),
+                _nonce: IGnosisSafe(childOwnerMultisigs[i]).nonce()
+            });
+            assertEq(dataToSign, expectedDataToSign, "Wrong data to sign");
+
+            bytes32 nestedHashToApprove = keccak256(getNestedDataToSign(childOwnerMultisigs[i]));
+            bytes32 expectedNestedHashToApprove = IGnosisSafe(childOwnerMultisigs[i]).getTransactionHash(
+                MULTICALL3_ADDRESS,
+                0,
+                callDataToApprove,
+                Enum.Operation.DelegateCall,
+                0,
+                0,
+                0,
+                address(0),
+                address(0),
+                IGnosisSafe(childOwnerMultisigs[i]).nonce()
+            );
+            assertEq(nestedHashToApprove, expectedNestedHashToApprove, "Wrong nested hash to approve");
+        }
+    }
+
+    function getNestedDataToSign(address owner) public view returns (bytes memory) {
+        bytes memory callData = multisigTask.generateApproveMulticallData();
+        return multisigTask.getDataToSign(owner, callData);
+    }
+}