Skip to content

Commit 07a6044

Browse files
alcuecaJosepBove
andauthored
Upgrade Gnosis Safe libs to 1.4.1 (#17962)
* Updated the gnosis safe libs to 1.5.0 * Mass renaming * Added ERC165 support to TimelockGuard * Removed LivenessGuard and LivenessModule as they are deprecated * REimplemented safe.encodeTransactionData * Fix overrides and validator.isValidSignature call * Updated .gitmodules to 1.5.0 * fixed test_changeOwnershipToFallback_withOtherGuard_succeeds * fixed eip-1271 magic value * Revert Enum to common * Revert `isValidSignature` * ITransactionGuard -> Guard * Revert `encodeTransactionData` * Revert EIP1271_MAGIC_VALUE * fix: submodule version bug * fix: compile * fix: conflicts and bring old liveness back * fix: rm unused var * fix: guard to baseguard and versions * feat: dummyguard * feat: optimizer on op-service * feat: timelockguard guard to baseguard --------- Co-authored-by: JosepBove <[email protected]>
1 parent a3f8850 commit 07a6044

33 files changed

+161
-1213
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[submodule "packages/contracts-bedrock/lib/safe-contracts"]
1414
path = packages/contracts-bedrock/lib/safe-contracts
1515
url = https://github.com/safe-global/safe-contracts
16-
branch = v1.4.0
16+
branch = v1.4.1
1717
[submodule "packages/contracts-bedrock/lib/kontrol-cheatcodes"]
1818
path = packages/contracts-bedrock/lib/kontrol-cheatcodes
1919
url = https://github.com/runtimeverification/kontrol-cheatcodes

op-service/gnosis/contracts/foundry.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ src = "src"
33
out = "out"
44
libs = ["../../../packages/contracts-bedrock/lib"]
55

6+
optimizer = true
7+
optimizer_runs = 999999
8+
69
remappings = [
710
'forge-std/=../../../packages/contracts-bedrock/lib/forge-std/src',
811
'safe-contracts/=../../../packages/contracts-bedrock/lib/safe-contracts/contracts',
9-
]
12+
]

op-service/gnosis/contracts/script/DeploySafe.s.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.19;
33

44
import { Script } from "forge-std/Script.sol";
55
import { console } from "forge-std/console.sol";
6-
import { GnosisSafe } from "safe-contracts/GnosisSafe.sol";
7-
import { GnosisSafeProxyFactory } from "safe-contracts/proxies/GnosisSafeProxyFactory.sol";
6+
import { Safe as GnosisSafe } from "safe-contracts/Safe.sol";
7+
import { SafeProxyFactory as GnosisSafeProxyFactory } from "safe-contracts/proxies/SafeProxyFactory.sol";
88
import { TestDelegateCall } from "src/TestDelegateCall.sol";
99

1010
contract DeploySafe is Script {

packages/contracts-bedrock/interfaces/safe/IDeputyPauseModule.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.0;
33

4-
import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
4+
import { Safe } from "safe-contracts/Safe.sol";
55
import { ISemver } from "interfaces/universal/ISemver.sol";
66
import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
77

packages/contracts-bedrock/interfaces/safe/ILivenessGuard.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.0;
33

4-
import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
4+
import { Safe } from "safe-contracts/Safe.sol";
55
import { Enum } from "safe-contracts/common/Enum.sol";
66
import { ISemver } from "interfaces/universal/ISemver.sol";
77

packages/contracts-bedrock/interfaces/safe/ILivenessModule.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.0;
33

4-
import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
4+
import { Safe } from "safe-contracts/Safe.sol";
55
import { LivenessGuard } from "src/safe/LivenessGuard.sol";
66
import { ISemver } from "interfaces/universal/ISemver.sol";
77

packages/contracts-bedrock/scripts/deploy/DeployAuthSystem.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Script } from "forge-std/Script.sol";
55
import { CommonBase } from "forge-std/Base.sol";
66
import { stdToml } from "forge-std/StdToml.sol";
77

8-
import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
8+
import { Safe } from "safe-contracts/Safe.sol";
99

1010
import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
1111
import { Solarray } from "scripts/libraries/Solarray.sol";

packages/contracts-bedrock/scripts/deploy/DeployAuthSystem2.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
33

44
import { Script } from "forge-std/Script.sol";
55

6-
import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
6+
import { Safe } from "safe-contracts/Safe.sol";
77

88
import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
99

packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ pragma solidity ^0.8.0;
33

44
import { console2 as console } from "forge-std/console2.sol";
55

6-
import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
7-
import { GnosisSafeProxyFactory as SafeProxyFactory } from "safe-contracts/proxies/GnosisSafeProxyFactory.sol";
6+
import { Safe } from "safe-contracts/Safe.sol";
7+
import { SafeProxyFactory } from "safe-contracts/proxies/SafeProxyFactory.sol";
8+
import { Enum } from "safe-contracts/common/Enum.sol";
89
import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
910
import { ModuleManager } from "safe-contracts/base/ModuleManager.sol";
10-
import { Enum as SafeOps } from "safe-contracts/common/Enum.sol";
1111

1212
import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
1313

@@ -119,7 +119,7 @@ contract DeployOwnership is Deploy {
119119
to: _target,
120120
value: 0,
121121
data: _data,
122-
operation: SafeOps.Operation.Call,
122+
operation: Enum.Operation.Call,
123123
safeTxGas: 0,
124124
baseGas: 0,
125125
gasPrice: 0,

0 commit comments

Comments
 (0)