Commit 8829be92 authored by clabby's avatar clabby Committed by GitHub

FPACOPS edits (#9903)

parent f3d0102a
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
"eip1559Denominator": 250, "eip1559Denominator": 250,
"eip1559DenominatorCanyon": 250, "eip1559DenominatorCanyon": 250,
"systemConfigStartBlock": 4071248, "systemConfigStartBlock": 4071248,
"faultGameAbsolutePrestate": "0x038942ec840131a63c49fa514a3f0577ae401fd5584d56ad50cdf5a8b41d4538", "faultGameAbsolutePrestate": "0x031e3b504740d0b1264e8cf72b6dde0d497184cfb3f98e451c6be8b33bd3f808",
"faultGameMaxDepth": 73, "faultGameMaxDepth": 73,
"faultGameMaxDuration": 604800, "faultGameMaxDuration": 604800,
"faultGameGenesisBlock": 0, "faultGameGenesisBlock": 0,
......
...@@ -3,7 +3,8 @@ pragma solidity 0.8.15; ...@@ -3,7 +3,8 @@ pragma solidity 0.8.15;
import { Proxy } from "src/universal/Proxy.sol"; import { Proxy } from "src/universal/Proxy.sol";
import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol"; import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
import { AnchorStateRegistry } from "src/dispute/AnchorStateRegistry.sol"; import { AnchorStateRegistry, IAnchorStateRegistry } from "src/dispute/AnchorStateRegistry.sol";
import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
import { StdAssertions } from "forge-std/StdAssertions.sol"; import { StdAssertions } from "forge-std/StdAssertions.sol";
import "src/libraries/DisputeTypes.sol"; import "src/libraries/DisputeTypes.sol";
import "scripts/Deploy.s.sol"; import "scripts/Deploy.s.sol";
...@@ -50,6 +51,7 @@ contract FPACOPS is Deploy, StdAssertions { ...@@ -50,6 +51,7 @@ contract FPACOPS is Deploy, StdAssertions {
// of the DisputeGameFactoryProxy to the ProxyAdmin. // of the DisputeGameFactoryProxy to the ProxyAdmin.
transferDGFOwnershipFinal({ _proxyAdmin: _proxyAdmin, _systemOwnerSafe: _systemOwnerSafe }); transferDGFOwnershipFinal({ _proxyAdmin: _proxyAdmin, _systemOwnerSafe: _systemOwnerSafe });
transferWethOwnershipFinal({ _proxyAdmin: _proxyAdmin, _systemOwnerSafe: _systemOwnerSafe }); transferWethOwnershipFinal({ _proxyAdmin: _proxyAdmin, _systemOwnerSafe: _systemOwnerSafe });
transferAnchorStateOwnershipFinal({ _proxyAdmin: _proxyAdmin });
// Run post-deployment assertions. // Run post-deployment assertions.
postDeployAssertions({ _proxyAdmin: _proxyAdmin, _systemOwnerSafe: _systemOwnerSafe }); postDeployAssertions({ _proxyAdmin: _proxyAdmin, _systemOwnerSafe: _systemOwnerSafe });
...@@ -70,6 +72,11 @@ contract FPACOPS is Deploy, StdAssertions { ...@@ -70,6 +72,11 @@ contract FPACOPS is Deploy, StdAssertions {
Proxy(payable(dgfProxy)).upgradeToAndCall( Proxy(payable(dgfProxy)).upgradeToAndCall(
mustGetAddress("DisputeGameFactory"), abi.encodeCall(DisputeGameFactory.initialize, msg.sender) mustGetAddress("DisputeGameFactory"), abi.encodeCall(DisputeGameFactory.initialize, msg.sender)
); );
// Set the initialization bonds for the FaultDisputeGame and PermissionedDisputeGame.
DisputeGameFactory dgf = DisputeGameFactory(dgfProxy);
dgf.setInitBond(GameTypes.CANNON, 0.08 ether);
dgf.setInitBond(GameTypes.PERMISSIONED_CANNON, 0.08 ether);
} }
function initializeDelayedWETHProxy() internal broadcast { function initializeDelayedWETHProxy() internal broadcast {
...@@ -134,6 +141,15 @@ contract FPACOPS is Deploy, StdAssertions { ...@@ -134,6 +141,15 @@ contract FPACOPS is Deploy, StdAssertions {
prox.changeAdmin(_proxyAdmin); prox.changeAdmin(_proxyAdmin);
} }
/// @notice Transfers admin rights of the `AnchorStateRegistryProxy` to the `ProxyAdmin`.
function transferAnchorStateOwnershipFinal(address _proxyAdmin) internal broadcast {
AnchorStateRegistry asr = AnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy"));
// Transfer the admin rights of the AnchorStateRegistryProxy to the ProxyAdmin.
Proxy prox = Proxy(payable(address(asr)));
prox.changeAdmin(_proxyAdmin);
}
/// @notice Checks that the deployed system is configured correctly. /// @notice Checks that the deployed system is configured correctly.
function postDeployAssertions(address _proxyAdmin, address _systemOwnerSafe) internal { function postDeployAssertions(address _proxyAdmin, address _systemOwnerSafe) internal {
Types.ContractSet memory contracts = _proxiesUnstrict(); Types.ContractSet memory contracts = _proxiesUnstrict();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment