Commit 9d41b8cb authored by Matthew Slipper's avatar Matthew Slipper Committed by GitHub

op-deployer: Update proof params JSON to match deploy config (#13616)

parent 83fb599d
...@@ -96,7 +96,6 @@ func (d *deployerKey) String() string { ...@@ -96,7 +96,6 @@ func (d *deployerKey) String() string {
func TestEndToEndApply(t *testing.T) { func TestEndToEndApply(t *testing.T) {
op_e2e.InitParallel(t) op_e2e.InitParallel(t)
kurtosisutil.Test(t)
lgr := testlog.Logger(t, slog.LevelDebug) lgr := testlog.Logger(t, slog.LevelDebug)
...@@ -651,12 +650,12 @@ func TestProofParamOverrides(t *testing.T) { ...@@ -651,12 +650,12 @@ func TestProofParamOverrides(t *testing.T) {
"proofMaturityDelaySeconds": standard.ProofMaturityDelaySeconds + 1, "proofMaturityDelaySeconds": standard.ProofMaturityDelaySeconds + 1,
"disputeGameFinalityDelaySeconds": standard.DisputeGameFinalityDelaySeconds + 1, "disputeGameFinalityDelaySeconds": standard.DisputeGameFinalityDelaySeconds + 1,
"mipsVersion": standard.MIPSVersion + 1, "mipsVersion": standard.MIPSVersion + 1,
"disputeGameType": standard.DisputeGameType, // This must be set to the permissioned game "respectedGameType": standard.DisputeGameType, // This must be set to the permissioned game
"disputeAbsolutePrestate": common.Hash{'A', 'B', 'S', 'O', 'L', 'U', 'T', 'E'}, "faultGameAbsolutePrestate": common.Hash{'A', 'B', 'S', 'O', 'L', 'U', 'T', 'E'},
"disputeMaxGameDepth": standard.DisputeMaxGameDepth + 1, "faultGameMaxDepth": standard.DisputeMaxGameDepth + 1,
"disputeSplitDepth": standard.DisputeSplitDepth + 1, "faultGameSplitDepth": standard.DisputeSplitDepth + 1,
"disputeClockExtension": standard.DisputeClockExtension + 1, "faultGameClockExtension": standard.DisputeClockExtension + 1,
"disputeMaxClockDuration": standard.DisputeMaxClockDuration + 1, "faultGameMaxClockDuration": standard.DisputeMaxClockDuration + 1,
"dangerouslyAllowCustomDisputeParameters": true, "dangerouslyAllowCustomDisputeParameters": true,
} }
...@@ -700,29 +699,29 @@ func TestProofParamOverrides(t *testing.T) { ...@@ -700,29 +699,29 @@ func TestProofParamOverrides(t *testing.T) {
st.ImplementationsDeployment.OptimismPortalImplAddress, st.ImplementationsDeployment.OptimismPortalImplAddress,
}, },
{ {
"disputeAbsolutePrestate", "faultGameAbsolutePrestate",
func(t *testing.T, val any) common.Hash { func(t *testing.T, val any) common.Hash {
return val.(common.Hash) return val.(common.Hash)
}, },
chainState.PermissionedDisputeGameAddress, chainState.PermissionedDisputeGameAddress,
}, },
{ {
"disputeMaxGameDepth", "faultGameMaxDepth",
uint64Caster, uint64Caster,
chainState.PermissionedDisputeGameAddress, chainState.PermissionedDisputeGameAddress,
}, },
{ {
"disputeSplitDepth", "faultGameSplitDepth",
uint64Caster, uint64Caster,
chainState.PermissionedDisputeGameAddress, chainState.PermissionedDisputeGameAddress,
}, },
{ {
"disputeClockExtension", "faultGameClockExtension",
uint64Caster, uint64Caster,
chainState.PermissionedDisputeGameAddress, chainState.PermissionedDisputeGameAddress,
}, },
{ {
"disputeMaxClockDuration", "faultGameMaxClockDuration",
uint64Caster, uint64Caster,
chainState.PermissionedDisputeGameAddress, chainState.PermissionedDisputeGameAddress,
}, },
......
...@@ -17,12 +17,12 @@ const ( ...@@ -17,12 +17,12 @@ const (
) )
type ChainProofParams struct { type ChainProofParams struct {
DisputeGameType uint32 `json:"disputeGameType" toml:"disputeGameType"` DisputeGameType uint32 `json:"respectedGameType" toml:"respectedGameType"`
DisputeAbsolutePrestate common.Hash `json:"disputeAbsolutePrestate" toml:"disputeAbsolutePrestate"` DisputeAbsolutePrestate common.Hash `json:"faultGameAbsolutePrestate" toml:"faultGameAbsolutePrestate"`
DisputeMaxGameDepth uint64 `json:"disputeMaxGameDepth" toml:"disputeMaxGameDepth"` DisputeMaxGameDepth uint64 `json:"faultGameMaxDepth" toml:"faultGameMaxDepth"`
DisputeSplitDepth uint64 `json:"disputeSplitDepth" toml:"disputeSplitDepth"` DisputeSplitDepth uint64 `json:"faultGameSplitDepth" toml:"faultGameSplitDepth"`
DisputeClockExtension uint64 `json:"disputeClockExtension" toml:"disputeClockExtension"` DisputeClockExtension uint64 `json:"faultGameClockExtension" toml:"faultGameClockExtension"`
DisputeMaxClockDuration uint64 `json:"disputeMaxClockDuration" toml:"disputeMaxClockDuration"` DisputeMaxClockDuration uint64 `json:"faultGameMaxClockDuration" toml:"faultGameMaxClockDuration"`
DangerouslyAllowCustomDisputeParameters bool `json:"dangerouslyAllowCustomDisputeParameters" toml:"dangerouslyAllowCustomDisputeParameters"` DangerouslyAllowCustomDisputeParameters bool `json:"dangerouslyAllowCustomDisputeParameters" toml:"dangerouslyAllowCustomDisputeParameters"`
} }
......
...@@ -401,6 +401,7 @@ func defaultIntent(root string, loc *artifacts.Locator, deployer common.Address, ...@@ -401,6 +401,7 @@ func defaultIntent(root string, loc *artifacts.Locator, deployer common.Address,
"faultGameGenesisBlock": 0, "faultGameGenesisBlock": 0,
"faultGameGenesisOutputRoot": genesisOutputRoot.Hex(), "faultGameGenesisOutputRoot": genesisOutputRoot.Hex(),
"faultGameSplitDepth": 14, "faultGameSplitDepth": 14,
"dangerouslyAllowCustomDisputeParameters": true,
"faultGameWithdrawalDelay": 604800, "faultGameWithdrawalDelay": 604800,
"preimageOracleMinProposalSize": 10000, "preimageOracleMinProposalSize": 10000,
"preimageOracleChallengePeriod": 120, "preimageOracleChallengePeriod": 120,
......
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