Commit 206fba80 authored by BE Water's avatar BE Water Committed by GitHub

op-chain-ops: Fix the wrong variable in 'checkUpgradeTxs' (#11001)

* Fix the wrong variable in 'checkUpgradeTxs'

* Update op-chain-ops/genesis/config.go
Co-authored-by: default avatarprotolambda <proto@protolambda.com>

* Update op-chain-ops/genesis/testdata/test-deploy-config-full.json
Co-authored-by: default avatarprotolambda <proto@protolambda.com>

---------
Co-authored-by: default avatarprotolambda <proto@protolambda.com>
parent 45200bba
...@@ -667,7 +667,7 @@ func checkUpgradeTxs(ctx context.Context, env *actionEnv) error { ...@@ -667,7 +667,7 @@ func checkUpgradeTxs(ctx context.Context, env *actionEnv) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to create eth client") return fmt.Errorf("failed to create eth client")
} }
activBlock, txs, err := l2EthCl.InfoAndTxsByNumber(ctx, activationBlockNum) activeBlock, txs, err := l2EthCl.InfoAndTxsByNumber(ctx, activationBlockNum)
if err != nil { if err != nil {
return fmt.Errorf("failed to get activation block: %w", err) return fmt.Errorf("failed to get activation block: %w", err)
} }
...@@ -679,7 +679,7 @@ func checkUpgradeTxs(ctx context.Context, env *actionEnv) error { ...@@ -679,7 +679,7 @@ func checkUpgradeTxs(ctx context.Context, env *actionEnv) error {
return fmt.Errorf("unexpected non-deposit tx in activation block, index %d, hash %s", i, tx.Hash()) return fmt.Errorf("unexpected non-deposit tx in activation block, index %d, hash %s", i, tx.Hash())
} }
} }
_, receipts, err := l2EthCl.FetchReceipts(ctx, activBlock.Hash()) _, receipts, err := l2EthCl.FetchReceipts(ctx, activeBlock.Hash())
if err != nil { if err != nil {
return fmt.Errorf("failed to fetch receipts of activation block: %w", err) return fmt.Errorf("failed to fetch receipts of activation block: %w", err)
} }
...@@ -725,11 +725,11 @@ func checkGPO(ctx context.Context, env *actionEnv) error { ...@@ -725,11 +725,11 @@ func checkGPO(ctx context.Context, env *actionEnv) error {
} }
_, err = cl.Overhead(nil) _, err = cl.Overhead(nil)
if err == nil || !strings.Contains(err.Error(), "revert") { if err == nil || !strings.Contains(err.Error(), "revert") {
return fmt.Errorf("expected revert on legacy overhead attribute acccess, but got %w", err) return fmt.Errorf("expected revert on legacy overhead attribute access, but got %w", err)
} }
_, err = cl.Scalar(nil) _, err = cl.Scalar(nil)
if err == nil || !strings.Contains(err.Error(), "revert") { if err == nil || !strings.Contains(err.Error(), "revert") {
return fmt.Errorf("expected revert on legacy scalar attribute acccess, but got %w", err) return fmt.Errorf("expected revert on legacy scalar attribute access, but got %w", err)
} }
isEcotone, err := cl.IsEcotone(nil) isEcotone, err := cl.IsEcotone(nil)
if err != nil { if err != nil {
......
...@@ -444,7 +444,7 @@ func (d *DeployConfig) Check() error { ...@@ -444,7 +444,7 @@ func (d *DeployConfig) Check() error {
return fmt.Errorf("%w: DAResolveWindow cannot be 0 when using alt-da mode", ErrInvalidDeployConfig) return fmt.Errorf("%w: DAResolveWindow cannot be 0 when using alt-da mode", ErrInvalidDeployConfig)
} }
if !(d.DACommitmentType == plasma.KeccakCommitmentString || d.DACommitmentType == plasma.GenericCommitmentString) { if !(d.DACommitmentType == plasma.KeccakCommitmentString || d.DACommitmentType == plasma.GenericCommitmentString) {
return fmt.Errorf("%w: DACommitmentType must be either KeccakCommtiment or GenericCommitment", ErrInvalidDeployConfig) return fmt.Errorf("%w: DACommitmentType must be either KeccakCommitment or GenericCommitment", ErrInvalidDeployConfig)
} }
} }
if d.UseCustomGasToken { if d.UseCustomGasToken {
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
"useFaultProofs": false, "useFaultProofs": false,
"usePlasma": false, "usePlasma": false,
"daBondSize": 0, "daBondSize": 0,
"daCommitmentType": "KeccakCommtiment", "daCommitmentType": "KeccakCommitment",
"daChallengeProxy": "0x0000000000000000000000000000000000000000", "daChallengeProxy": "0x0000000000000000000000000000000000000000",
"daChallengeWindow": 0, "daChallengeWindow": 0,
"daResolveWindow": 0, "daResolveWindow": 0,
......
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