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

Jump to bottom

Added initializeAnchorStateRegistry config. Update Fault Proof config #260

Draft
wants to merge 2 commits into
base: celo10
Choose a base branch
from
Draft

Added initializeAnchorStateRegistry config. Update Fault Proof config #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45b2941
Added initializeAnchorStateRegistry config. Update Fault Proof config
jcortejoso Oct 16, 2024
6dcd792
Add missing flag
jcortejoso Oct 16, 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
3 changes: 3 additions & 0 deletions op-chain-ops/genesis/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,9 @@ type DeployConfig struct {

// DeployCeloContracts indicates whether to deploy Celo contracts.
DeployCeloContracts bool `json:"deployCeloContracts"`

// InitializeAnchorStateRegistry indicates whether to initialize the AnchorStateRegistry.
InitializeAnchorStateRegistry bool `json:"initializeAnchorStateRegistry"`
}

// Copy will deeply copy the DeployConfig. This does a JSON roundtrip to copy
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -511,7 +511,9 @@ contract Deploy is Deployer {
initializeDisputeGameFactory();
initializeDelayedWETH();
initializePermissionedDelayedWETH();
initializeAnchorStateRegistry();
if (cfg.initializeAnchorStateRegistry()) {
initializeAnchorStateRegistry();
}

ChainAssertions.checkCustomGasTokenOptimismPortal({ _contracts: _proxies(), _cfg: cfg, _isProxy: true });
}
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ contract DeployConfig is Script {
uint256 public disputeGameFinalityDelaySeconds;
uint256 public respectedGameType;
bool public useFaultProofs;
bool public initializeAnchorStateRegistry;
bool public useAltDA;
string public daCommitmentType;
uint256 public daChallengeWindow;
Expand Down Expand Up @@ -151,6 +152,7 @@ contract DeployConfig is Script {
recommendedProtocolVersion = stdJson.readUint(_json, "$.recommendedProtocolVersion");

useFaultProofs = _readOr(_json, "$.useFaultProofs", false);
initializeAnchorStateRegistry = _readOr(_json, "$.initializeAnchorStateRegistry", true);
proofMaturityDelaySeconds = _readOr(_json, "$.proofMaturityDelaySeconds", 0);
disputeGameFinalityDelaySeconds = _readOr(_json, "$.disputeGameFinalityDelaySeconds", 0);
respectedGameType = _readOr(_json, "$.respectedGameType", 0);
Expand Down
19 changes: 10 additions & 9 deletions packages/contracts-bedrock/scripts/getting-started/config-vars-celo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ cat << EOL > tmp_config.json
"batchInboxAddress": "$batchInboxAddress",
"batchSenderAddress": "$GS_BATCHER_ADDRESS",

"l2OutputOracleSubmissionInterval": 120,
"l2OutputOracleSubmissionInterval": 300,
"l2OutputOracleStartingBlockNumber": 0,
"l2OutputOracleStartingTimestamp": $timestamp,

Expand Down Expand Up @@ -142,20 +142,21 @@ cat << EOL >> tmp_config.json
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",

"faultGameAbsolutePrestate": "0x03c7ae758795765c6664a5d39bf63841c71ff191e9189522bad8ebff5d4eca98",
"faultGameMaxDepth": 44,
"faultGameClockExtension": 0,
"faultGameMaxClockDuration": 1200,
"faultGameAbsolutePrestate": "0x037ef3c1a487960b0e633d3e513df020c43432769f41a634d18a9595cbf53c55",
"faultGameMaxDepth": 73,
"faultGameClockExtension": 10800,
"faultGameMaxClockDuration": 302400,
"faultGameGenesisBlock": 0,
"faultGameGenesisOutputRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"faultGameSplitDepth": 14,
"faultGameWithdrawalDelay": 600,
"faultGameSplitDepth": 30,
"faultGameWithdrawalDelay": 604800,

"preimageOracleMinProposalSize": 1800000,
"preimageOracleChallengePeriod": 300,
"preimageOracleMinProposalSize": 126000,
"preimageOracleChallengePeriod": 86400,

"fundDevAccounts": $FUNDS_DEV_ACCOUNTS,
"useFaultProofs": false,
"initializeAnchorStateRegistry": false,
"proofMaturityDelaySeconds": 604800,
"disputeGameFinalityDelaySeconds": 302400,
"respectedGameType": 0,
Expand Down
Loading