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

Split FaultProof initialization to new function initializeAnchorStateRegistry() #286

Open
wants to merge 13 commits into
base: celo10
Choose a base branch
from
+119 −66
Open

Split FaultProof initialization to new function initializeAnchorStateRegistry() #286

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5528f13
Split FaultProof initialization to new function initializeAnchorState…
jcortejoso Dec 16, 2024
4a7ecb6
Refactor deploment, overrading functions to keep compatibility with t…
jcortejoso Dec 17, 2024
9baf008
Conditionally deploy testing FP Games
jcortejoso Dec 17, 2024
93b1ff3
Merge branch 'celo10' into jcortejoso/fault-proofs-deployment
jcortejoso Dec 17, 2024
6ea67fc
Conditionally deploy testing FP Games
jcortejoso Dec 17, 2024
c9297fc
Update cffi python package
jcortejoso Dec 17, 2024
fbc5fb0
Increase withdraw_test before hook timeout
jcortejoso Dec 17, 2024
546c508
Increase tokenduality test before hook timeout
jcortejoso Dec 17, 2024
380a18f
Increase celo devnet test timeouts
jcortejoso Dec 18, 2024
faf9dd9
Merge branch 'celo10' into jcortejoso/fault-proofs-deployment
jcortejoso Jan 10, 2025
a99c4a5
ops: improve update-geth.sh (#290)
karlb Jan 10, 2025
bd20650
Update op-geth for `celo10` branch (#292)
ezdac Jan 13, 2025
31c47a4
Split L2OO initialization conditionally
jcortejoso Jan 22, 2025
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
34 changes: 8 additions & 26 deletions packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,13 +405,16 @@ contract Deploy is Deployer {
deployImplementations();
initializeImplementations();

setAlphabetFaultGameImplementation({ _allowUpgrade: false });
palango marked this conversation as resolved.
Show resolved Hide resolved
setFastFaultGameImplementation({ _allowUpgrade: false });
transferDelayedWETHOwnership();
}

function setupFaultGames() public {
setCannonFaultGameImplementation({ _allowUpgrade: false });
setPermissionedCannonFaultGameImplementation({ _allowUpgrade: false });

initializeAnchorStateRegistry();

transferDisputeGameFactoryOwnership();
transferDelayedWETHOwnership();
}

/// @notice Deploy all of the proxies
Expand Down Expand Up @@ -511,7 +514,7 @@ contract Deploy is Deployer {
initializeDisputeGameFactory();
initializeDelayedWETH();
initializePermissionedDelayedWETH();
initializeAnchorStateRegistry();
// initializeAnchorStateRegistry();

ChainAssertions.checkCustomGasTokenOptimismPortal({ _contracts: _proxies(), _cfg: cfg, _isProxy: true });
}
Expand Down Expand Up @@ -1053,7 +1056,7 @@ contract Deploy is Deployer {
address anchorStateRegistry = mustGetAddress("AnchorStateRegistry");
ISuperchainConfig superchainConfig = ISuperchainConfig(mustGetAddress("SuperchainConfigProxy"));

IAnchorStateRegistry.StartingAnchorRoot[] memory roots = new IAnchorStateRegistry.StartingAnchorRoot[](5);
IAnchorStateRegistry.StartingAnchorRoot[] memory roots = new IAnchorStateRegistry.StartingAnchorRoot[](2);
roots[0] = IAnchorStateRegistry.StartingAnchorRoot({
gameType: GameTypes.CANNON,
outputRoot: OutputRoot({
Expand All @@ -1068,27 +1071,6 @@ contract Deploy is Deployer {
l2BlockNumber: cfg.faultGameGenesisBlock()
})
});
roots[2] = IAnchorStateRegistry.StartingAnchorRoot({
gameType: GameTypes.ALPHABET,
outputRoot: OutputRoot({
root: Hash.wrap(cfg.faultGameGenesisOutputRoot()),
l2BlockNumber: cfg.faultGameGenesisBlock()
})
});
roots[3] = IAnchorStateRegistry.StartingAnchorRoot({
gameType: GameTypes.ASTERISC,
outputRoot: OutputRoot({
root: Hash.wrap(cfg.faultGameGenesisOutputRoot()),
l2BlockNumber: cfg.faultGameGenesisBlock()
})
});
roots[4] = IAnchorStateRegistry.StartingAnchorRoot({
gameType: GameTypes.FAST,
outputRoot: OutputRoot({
root: Hash.wrap(cfg.faultGameGenesisOutputRoot()),
l2BlockNumber: cfg.faultGameGenesisBlock()
})
});

_upgradeAndCallViaSafe({
_proxy: payable(anchorStateRegistryProxy),
Expand Down
Loading