Skip to content
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

Update base-org/contracts dependency #356

Merged
merged 6 commits into from
Nov 4, 2024
Merged

Update base-org/contracts dependency #356

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dfdd231
Update base-contracts dependency
mdehoog Oct 29, 2024
693cb7b
Upgrade all the tasks
mdehoog Oct 29, 2024
11a1b61
forge fmt
mdehoog Oct 29, 2024
9dd4e2a
Replace _nestedPostCheck with _postCheck
mdehoog Oct 29, 2024
2f2f1d1
Bump deps again
mdehoog Oct 29, 2024
5f7cd28
fix: update most recent presigned pause task to serve as a future tem…
mds1 Nov 4, 2024
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
2 changes: 1 addition & 1 deletion foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ remappings = [
'@eth-optimism-bedrock/=lib/optimism/packages/contracts-bedrock/',
'@rari-capital/solmate/=lib/solmate',
'@eth-optimism-superchain-registry/=lib/superchain-registry/',
'@solady=lib/optimism/packages/contracts-bedrock/lib/solady/src',
'@solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src/',
'ds-test/=lib/optimism/packages/contracts-bedrock/lib/forge-std/lib/ds-test/src',
'forge-std/=lib/forge-std/src/',
]
Expand Down
2 changes: 1 addition & 1 deletion lib/base-contracts
Open in desktop
Submodule base-contracts updated 45 files
+2 −0 .env
+0 −2 .env.example
+47 −0 .github/workflows/test.yml
+1 −1 .gitignore
+1 −1 remappings.txt
+7 −8 script/deploy/Utils.sol
+22 −0 script/deploy/l1/RollbackGasLimit.sol
+64 −0 script/deploy/l1/SetGasLimitBuilder.sol
+22 −0 script/deploy/l1/UpgradeGasLimit.sol
+6 −4 script/deploy/l1/tests/DeployTestTokenContracts.s.sol
+4 −15 script/deploy/l1/tests/TestDeposits.s.sol
+5 −15 script/deploy/l2/tests/DeployTestTokenContracts.s.sol
+3 −19 script/deploy/l2/tests/TestWithdraw.s.sol
+117 −0 script/universal/IGnosisSafe.sol
+132 −171 script/universal/MultisigBase.sol
+65 −89 script/universal/MultisigBuilder.sol
+119 −181 script/universal/NestedMultisigBuilder.sol
+158 −0 script/universal/Signatures.sol
+190 −0 script/universal/Simulation.sol
+0 −190 script/universal/Simulator.sol
+6 −17 src/Challenger1of2.sol
+1 −1 src/TestOwner.sol
+1 −1 src/fee-vault-fixes/FeeVault.sol
+36 −42 src/revenue-share/BalanceTracker.sol
+28 −34 src/revenue-share/FeeDisburser.sol
+9 −10 src/smart-escrow/SmartEscrow.sol
+21 −43 test/Challenger1of2.t.sol
+1 −1 test/CommonTest.t.sol
+2 −3 test/MockERC20.t.sol
+18 −21 test/fee-vault-fixes/e2e/FeeVault.t.sol
+54 −112 test/revenue-share/BalanceTracker.t.sol
+71 −89 test/revenue-share/FeeDisburser.t.sol
+6 −6 test/revenue-share/mocks/FeeVaultRevert.sol
+1 −1 test/revenue-share/mocks/ReenterProcessFees.sol
+3 −3 test/smart-escrow/BaseSmartEscrow.t.sol
+3 −21 test/smart-escrow/Constructor.t.sol
+1 −1 test/smart-escrow/Release.t.sol
+2 −2 test/smart-escrow/Resume.t.sol
+2 −2 test/smart-escrow/Terminate.t.sol
+3 −3 test/smart-escrow/UpdateBenefactor.t.sol
+3 −3 test/smart-escrow/UpdateBeneficiary.t.sol
+3 −3 test/smart-escrow/WithdrawUnvestedTokens.t.sol
+16 −0 test/universal/Counter.sol
+69 −0 test/universal/MultisigBuilder.t.sol
+119 −0 test/universal/NestedMultisigBuilder.t.sol
23 changes: 1 addition & 22 deletions script/NestedSignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {stdJson} from "forge-std/StdJson.sol";
import {console} from "forge-std/console.sol";
import {Vm} from "forge-std/Vm.sol";

contract NestedSignFromJson is NestedMultisigBuilder, JsonTxBuilderBase {
abstract contract NestedSignFromJson is NestedMultisigBuilder, JsonTxBuilderBase {
address globalSignerSafe; // Hack to avoid passing signerSafe as an input to many functions.

/// @dev Signs the approveHash transaction from the Nested Safe to the System Owner Safe.
Expand Down Expand Up @@ -36,25 +36,4 @@ contract NestedSignFromJson is NestedMultisigBuilder, JsonTxBuilderBase {
function _ownerSafe() internal view override returns (address) {
return vm.envAddress("OWNER_SAFE");
}

function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory simPayload)
internal
virtual
override
{
if (msg.sig == this.approveJson.selector) {
console.log("Skipping assertions on the approval call");
return;
}
mdehoog marked this conversation as resolved.
Show resolved Hide resolved
_nestedPostCheck(accesses, simPayload);
}

function _nestedPostCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory simPayload)
internal
virtual
{
accesses; // Silences compiler warnings.
simPayload;
require(false, "_nestedPostCheck not implemented");
}
mdehoog marked this conversation as resolved.
Show resolved Hide resolved
}
26 changes: 20 additions & 6 deletions script/PresignPauseFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pragma solidity ^0.8.15;

import {JsonTxBuilderBase} from "src/JsonTxBuilderBase.sol";
import {MultisigBuilder} from "@base-contracts/script/universal/MultisigBuilder.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {IGnosisSafe} from "@eth-optimism-bedrock/scripts/interfaces/IGnosisSafe.sol";
import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
import {stdJson} from "forge-std/StdJson.sol";
Expand All @@ -19,25 +20,38 @@ contract PresignPauseFromJson is MultisigBuilder, JsonTxBuilderBase {
allowed[1] = _ownerSafe(); // The nonce is updated in the Foundation Operations Safe (FOS).
}

function _addGenericOverrides() internal view virtual override returns (SimulationStateOverride memory override_) {
function _simulationOverrides()
mds1 marked this conversation as resolved.
Show resolved Hide resolved
internal
view
virtual
override
returns (Simulation.StateOverride[] memory overrides_)
{
// If SIMULATE_WITHOUT_LEDGER is set, we add an override to allow the script to run using the same
// test address as defined in presigned-pause.just. This is necessary because the presigner tool requires
// access to the private key of the address that will sign the transaction. Therefore we must insert a test
// address into the owners list.
if (vm.envOr("SIMULATE_WITHOUT_LEDGER", false) || vm.envOr("SIMULATE_WITHOUT_LEDGER", uint256(0)) == 1) {
console.log("Adding override for test sender");
uint256 nonce = _getNonce(IGnosisSafe(_ownerSafe()));
override_ = overrideSafeThresholdOwnerAndNonce(_ownerSafe(), vm.envAddress("TEST_SENDER"), nonce);
address safe = _ownerSafe();
uint256 nonce = _getNonce(safe);
overrides_ = new Simulation.StateOverride[](1);
overrides_[0] = Simulation.overrideSafeThresholdOwnerAndNonce(safe, vm.envAddress("TEST_SENDER"), nonce);
}
}

/// @notice Overrides the MultisigBuilder's _addOverrides function to prevent creating multiple separate state
/// overrides for the owner safe when using SIMULATE_WITHOUT_LEDGER.
function _addOverrides(address _safe) internal view override returns (SimulationStateOverride memory override_) {
function _safeOverrides(address _safe, address _owner)
internal
view
override
returns (Simulation.StateOverride memory override_)
{
if (vm.envOr("SIMULATE_WITHOUT_LEDGER", false) || vm.envOr("SIMULATE_WITHOUT_LEDGER", uint256(0)) == 1) {
override_;
} else {
override_ = super._addOverrides(_safe);
override_ = super._safeOverrides(_safe, _owner);
}
}

Expand All @@ -54,7 +68,7 @@ contract PresignPauseFromJson is MultisigBuilder, JsonTxBuilderBase {
/// @notice This function is called after the simulation of the transactions is done.
/// It checks that the transactions only write to the nonce of the PRESIGNER_SAFE contract and the paused slot of
/// the SuperchainConfig contract.
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory simPayload)
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory simPayload)
internal
view
virtual
Expand Down
12 changes: 1 addition & 11 deletions script/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {stdJson} from "forge-std/StdJson.sol";
import {console} from "forge-std/console.sol";
import {Vm} from "forge-std/Vm.sol";

contract SignFromJson is MultisigBuilder, JsonTxBuilderBase {
abstract contract SignFromJson is MultisigBuilder, JsonTxBuilderBase {
function signJson(string memory _path) public {
_loadJson(_path);
sign();
Expand All @@ -27,14 +27,4 @@ contract SignFromJson is MultisigBuilder, JsonTxBuilderBase {
function _ownerSafe() internal view override returns (address) {
return vm.envAddress("OWNER_SAFE");
}

function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory simPayload)
internal
virtual
override
{
accesses; // Silences compiler warnings.
simPayload;
require(false, "_postCheck not implemented");
}
}
3 changes: 2 additions & 1 deletion security-council-rehearsals/templates/r1-hello-council/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ pragma solidity ^0.8.15;
// which is one level above the current location in
// repo_root/security-council-rehearsals/<rehearsal-dir>/SignFromJson.s.sol
import {SignFromJson as OriginalSignFromJson} from "../../script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Vm, VmSafe} from "forge-std/Vm.sol";

contract SignFromJson is OriginalSignFromJson {
// Since after _postCheck hook `require(false)`, the transaction will revert
// contract extending `SignFromJson` must implement its own `_postCheck` method, thus enforcing a more robust implementation pattern.
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory simPayload)
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory simPayload)
internal
virtual
override
Expand Down
3 changes: 2 additions & 1 deletion security-council-rehearsals/templates/r2-remove-signer/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ pragma solidity ^0.8.15;
// which is one level above the current location in
// repo_root/security-council-rehearsals/<rehearsal-dir>/SignFromJson.s.sol
import {SignFromJson as OriginalSignFromJson} from "../../script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Vm, VmSafe} from "forge-std/Vm.sol";

contract SignFromJson is OriginalSignFromJson {
// Since after _postCheck hook `require(false)`, the transaction will revert
// contract extending SignFromJson must implement its own _postCheck method, thus enforcing a more robust implementation pattern.
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory simPayload)
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory simPayload)
internal
virtual
override
Expand Down
3 changes: 2 additions & 1 deletion security-council-rehearsals/templates/r4-jointly-upgrade/NestedSignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ pragma solidity ^0.8.15;
// which is one level above the current location in
// repo_root/security-council-rehearsals/<rehearsal-dir>/NestedSignFromJson.s.sol
import {NestedSignFromJson as OriginalNestedSignFromJson} from "../../script/NestedSignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Vm, VmSafe} from "forge-std/Vm.sol";

contract NestedSignFromJson is OriginalNestedSignFromJson {
// Since after _postCheck hook `require(false)`, the transaction will revert
// contract extending NestedSignFromJson must implement its own _postCheck method, thus enforcing a more robust implementation pattern.
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory simPayload)
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory simPayload)
internal
virtual
override
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/009-fp-upgrade/NestedSignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {NestedSignFromJson as OriginalNestedSignFromJson} from "script/NestedSignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
import {L1StandardBridge} from "@eth-optimism-bedrock/src/L1/L1StandardBridge.sol";
import {ProtocolVersion, ProtocolVersions} from "@eth-optimism-bedrock/src/L1/ProtocolVersions.sol";
Expand Down Expand Up @@ -121,7 +122,7 @@ contract NestedSignFromJson is OriginalNestedSignFromJson {
_proxies.SuperchainConfig = stdJson.readAddress(addressesJson, "$.superchain_config_addr");
}

function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory) internal view override {
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal view override {
console.log("Running post-deploy assertions");
checkSemvers();
checkStateDiff(accesses);
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/010-1-guardian-upgrade/NestedSignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {NestedSignFromJson as OriginalNestedSignFromJson} from "script/NestedSignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Proxy} from "@eth-optimism-bedrock/src/universal/Proxy.sol";
import {ProxyAdmin} from "@eth-optimism-bedrock/src/universal/ProxyAdmin.sol";
import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
Expand Down Expand Up @@ -119,7 +120,7 @@ contract NestedSignFromJson is OriginalNestedSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
override
{
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/010-2-sc-changes/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {SignFromJson as OriginalSignFromJson} from "script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Proxy} from "@eth-optimism-bedrock/src/universal/Proxy.sol";
import {ProxyAdmin} from "@eth-optimism-bedrock/src/universal/ProxyAdmin.sol";
import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
Expand Down Expand Up @@ -269,7 +270,7 @@ contract SignFromJson is OriginalSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
override
{
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/011-proto-ver+ownership-transfers/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {SignFromJson as OriginalSignFromJson} from "script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Proxy} from "@eth-optimism-bedrock/src/universal/Proxy.sol";
import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
import {ProtocolVersions, ProtocolVersion} from "@eth-optimism-bedrock/src/L1/ProtocolVersions.sol";
Expand Down Expand Up @@ -41,7 +42,7 @@ contract SignFromJson is OriginalSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
view
override
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/012-proto-ver-required/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {SignFromJson as OriginalSignFromJson} from "script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Proxy} from "@eth-optimism-bedrock/src/universal/Proxy.sol";
import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
import {ProtocolVersions, ProtocolVersion} from "@eth-optimism-bedrock/src/L1/ProtocolVersions.sol";
Expand Down Expand Up @@ -37,7 +38,7 @@ contract SignFromJson is OriginalSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
view
override
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/013-fp-upgrade-fjord/NestedSignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {NestedSignFromJson as OriginalNestedSignFromJson} from "script/NestedSignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Types} from "@eth-optimism-bedrock/scripts/Types.sol";
import {console2 as console} from "forge-std/console2.sol";
import {stdJson} from "forge-std/StdJson.sol";
Expand Down Expand Up @@ -55,7 +56,7 @@ contract NestedSignFromJson is OriginalNestedSignFromJson {
allowed[4] = livenessGuard;
}

function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory) internal view override {
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory) internal view override {
console.log("Running post-deploy assertions");
checkStateDiff(accesses);
checkDGFProxy();
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/014-fjord-gas-config/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {SignFromJson as OriginalSignFromJson} from "script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Proxy} from "@eth-optimism-bedrock/src/universal/Proxy.sol";
import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
import {ProtocolVersions, ProtocolVersion} from "@eth-optimism-bedrock/src/L1/ProtocolVersions.sol";
Expand Down Expand Up @@ -37,7 +38,7 @@ contract SignFromJson is OriginalSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
view
override
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/015-fallback-permissioned-game/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {SignFromJson as OriginalSignFromJson} from "script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {OptimismPortal2, IDisputeGame} from "@eth-optimism-bedrock/src/L1/OptimismPortal2.sol";
import {Types} from "@eth-optimism-bedrock/scripts/Types.sol";
import {Vm, VmSafe} from "forge-std/Vm.sol";
Expand Down Expand Up @@ -55,7 +56,7 @@ contract SignFromJson is OriginalSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
view
override
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/016-granite-protocol-versions/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {SignFromJson as OriginalSignFromJson} from "script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {Proxy} from "@eth-optimism-bedrock/src/universal/Proxy.sol";
import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
import {ProtocolVersions, ProtocolVersion} from "@eth-optimism-bedrock/src/L1/ProtocolVersions.sol";
Expand Down Expand Up @@ -37,7 +38,7 @@ contract SignFromJson is OriginalSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
view
override
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/018-granite-upgrade/NestedSignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {NestedSignFromJson as OriginalNestedSignFromJson} from "script/NestedSignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {OptimismPortal2, IDisputeGame} from "@eth-optimism-bedrock/src/L1/OptimismPortal2.sol";
import {Types} from "@eth-optimism-bedrock/scripts/Types.sol";
import {Vm, VmSafe} from "forge-std/Vm.sol";
Expand Down Expand Up @@ -106,7 +107,7 @@ contract NestedSignFromJson is OriginalNestedSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
view
override
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/019-permissionless-games+upgrade-dgm/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {SignFromJson as OriginalSignFromJson} from "script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {OptimismPortal2, IDisputeGame} from "@eth-optimism-bedrock/src/L1/OptimismPortal2.sol";
import {Types} from "@eth-optimism-bedrock/scripts/Types.sol";
import {Vm, VmSafe} from "forge-std/Vm.sol";
Expand Down Expand Up @@ -64,7 +65,7 @@ contract SignFromJson is OriginalSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
view
override
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/020-set-gas-target/SignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {SignFromJson as OriginalSignFromJson} from "script/SignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {console2 as console} from "forge-std/console2.sol";
import {stdJson} from "forge-std/StdJson.sol";
import {Vm, VmSafe} from "forge-std/Vm.sol";
Expand All @@ -25,7 +26,7 @@ contract SignFromJson is OriginalSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
view
override
Expand Down
3 changes: 2 additions & 1 deletion tasks/eth/base-001-MCP-L1/NestedSignFromJson.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.15;

import {NestedSignFromJson as OriginalSignFromJson} from "script/NestedSignFromJson.s.sol";
import {Simulation} from "@base-contracts/script/universal/Simulation.sol";
import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
import {Constants, ResourceMetering} from "@eth-optimism-bedrock/src/libraries/Constants.sol";
import {L1StandardBridge} from "@eth-optimism-bedrock/src/L1/L1StandardBridge.sol";
Expand Down Expand Up @@ -354,7 +355,7 @@ contract NestedSignFromJson is OriginalSignFromJson {
}

/// @notice Checks the correctness of the deployment
function _postCheck(Vm.AccountAccess[] memory accesses, SimulationPayload memory /* simPayload */ )
function _postCheck(Vm.AccountAccess[] memory accesses, Simulation.Payload memory /* simPayload */ )
internal
view
override
Expand Down
Loading