Skip to content

Refactor MultisigScript #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xenoliss merged 9 commits into from
Jan 13, 2026
Merged

Refactor MultisigScript #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c244f83
refactor MultisigScript
xenoliss Nov 24, 2025
ea2c2b5
chore: remove debug console log
xenoliss Nov 24, 2025
eceb3df
chore: minor naming change
xenoliss Nov 24, 2025
cefc80e
chore: re-add state diff generation
xenoliss Nov 24, 2025
e215ad4
address review comments
xenoliss Nov 24, 2025
82dc35f
chore: remove deprecated MultisigBuilder and clean tests
xenoliss Dec 3, 2025
ee681ab
add support for signing EIP-712 typed data
xenoliss Dec 3, 2025
9e7fb74
skip lint on build (foundry/issues/11668)
xenoliss Dec 4, 2025
36b00a2
address review comments
xenoliss Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ optimizer_runs = 999999
solc_version = "0.8.15"
extra_output_files = ["abi"]

# See more config options https://github.com/foundry-rs/foundry/tree/master/config
[lint]
lint_on_build = false
Copy link
Contributor

@jackchuma jackchuma Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not overly opinionated on this but I'd prefer to leave the linter enabled. I've found it helpful

Copy link
Contributor Author

@xenoliss xenoliss Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a temporary workaround for this issue foundry-rs/foundry#11668


# See more config options https://github.com/foundry-rs/foundry/tree/master/config
13 changes: 7 additions & 6 deletions script/deploy/l1/SetGasLimit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ pragma solidity 0.8.15;
import {Vm} from "lib/forge-std/src/Vm.sol";
import {SystemConfig} from "lib/optimism/packages/contracts-bedrock/src/L1/SystemConfig.sol";

import {MultisigScript, IMulticall3, Simulation} from "../../universal/MultisigScript.sol";
import {Enum} from "../../universal/IGnosisSafe.sol";
import {MultisigScript, Simulation} from "../../universal/MultisigScript.sol";

/// @title SetGasLimit
///
Expand Down Expand Up @@ -34,13 +35,13 @@ contract SetGasLimit is MultisigScript {
assert(SystemConfig(L1_SYSTEM_CONFIG).gasLimit() == _toGasLimit());
}

function _buildCalls() internal view override returns (IMulticall3.Call3Value[] memory) {
IMulticall3.Call3Value[] memory calls = new IMulticall3.Call3Value[](1);
function _buildCalls() internal view override returns (Call[] memory) {
Call[] memory calls = new Call[](1);

calls[0] = IMulticall3.Call3Value({
calls[0] = Call({
operation: Enum.Operation.Call,
target: L1_SYSTEM_CONFIG,
allowFailure: false,
callData: abi.encodeCall(SystemConfig.setGasLimit, (_toGasLimit())),
data: abi.encodeCall(SystemConfig.setGasLimit, (_toGasLimit())),
value: 0
});

Expand Down
38 changes: 0 additions & 38 deletions script/universal/DoubleNestedMultisigBuilder.sol
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions script/universal/MultisigBuilder.sol
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions script/universal/MultisigDeploy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ contract MultisigDeployScript is Script {
console.log(" Salt Nonce:", saltNonce);

// Resolve owner addresses (combine direct owners + referenced safe addresses)
address[] memory resolvedOwners = _resolveOwnerAddresses({config: config, safeWallets: safes});
address[] memory resolvedOwners = _resolveOwnerAddresses({config: config});

console.log(" Total Owners:", resolvedOwners.length);
console.log(" Direct Owners:", config.owners.length);
Expand Down Expand Up @@ -185,11 +185,7 @@ contract MultisigDeployScript is Script {
}
}

function _resolveOwnerAddresses(SafeWallet memory config, SafeWallet[] memory safeWallets)
internal
view
returns (address[] memory)
{
function _resolveOwnerAddresses(SafeWallet memory config) internal view returns (address[] memory) {
uint256 totalOwners = config.owners.length + config.ownerRefIndices.length;
address[] memory resolved = new address[](totalOwners);

Expand All @@ -201,7 +197,7 @@ contract MultisigDeployScript is Script {
// Add referenced safe addresses (they must already be deployed due to array order)
for (uint256 i; i < config.ownerRefIndices.length; i++) {
uint256 refIndex = config.ownerRefIndices[i];
string memory refLabel = safeWallets[refIndex].label;
string memory refLabel = safes[refIndex].label;
address refAddr = deployedSafes[refLabel];
require(refAddr != address(0), string(abi.encodePacked("Reference not deployed: ", refLabel)));
resolved[config.owners.length + i] = refAddr;
Expand Down
Loading