From b355cc40ae036fee8ca2f756ae299a8cbb03743e Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Sun, 4 Jan 2026 11:34:35 -0800 Subject: [PATCH 1/2] Run go run build/ci.go check_generate Unfortunately, the check_generate script doesn't consider eth/ethconfig, so ci can't catch this. --- core/types/gen_receipt_json.go | 2 -- eth/ethconfig/gen_config.go | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 486acc0370..b3735d7156 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -72,8 +72,6 @@ func (r Receipt) MarshalJSON() ([]byte, error) { enc.OperatorFeeScalar = (*hexutil.Uint64)(r.OperatorFeeScalar) enc.OperatorFeeConstant = (*hexutil.Uint64)(r.OperatorFeeConstant) enc.DAFootprintGasScalar = (*hexutil.Uint64)(r.DAFootprintGasScalar) - enc.OperatorFeeScalar = (*hexutil.Uint64)(r.OperatorFeeScalar) - enc.OperatorFeeConstant = (*hexutil.Uint64)(r.OperatorFeeConstant) return json.Marshal(&enc) } diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index 30ec163a88..3224bcf430 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -77,7 +77,7 @@ func (c Config) MarshalTOML() (interface{}, error) { RollupHistoricalRPC string RollupHistoricalRPCTimeout time.Duration RollupDisableTxPoolGossip bool - RollupNetrestrictTxPoolGossip string + RollupTxPoolNetrestrict string `toml:",omitempty"` RollupTxPoolTrustedPeersOnly bool RollupDisableTxPoolAdmission bool RollupHaltOnIncompatibleProtocolVersion string @@ -145,7 +145,7 @@ func (c Config) MarshalTOML() (interface{}, error) { enc.RollupHistoricalRPC = c.RollupHistoricalRPC enc.RollupHistoricalRPCTimeout = c.RollupHistoricalRPCTimeout enc.RollupDisableTxPoolGossip = c.RollupDisableTxPoolGossip - enc.RollupNetrestrictTxPoolGossip = c.RollupTxPoolNetrestrict + enc.RollupTxPoolNetrestrict = c.RollupTxPoolNetrestrict enc.RollupTxPoolTrustedPeersOnly = c.RollupTxPoolTrustedPeersOnly enc.RollupDisableTxPoolAdmission = c.RollupDisableTxPoolAdmission enc.RollupHaltOnIncompatibleProtocolVersion = c.RollupHaltOnIncompatibleProtocolVersion @@ -217,7 +217,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { RollupHistoricalRPC *string RollupHistoricalRPCTimeout *time.Duration RollupDisableTxPoolGossip *bool - RollupNetrestrictTxPoolGossip *string + RollupTxPoolNetrestrict *string `toml:",omitempty"` RollupTxPoolTrustedPeersOnly *bool RollupDisableTxPoolAdmission *bool RollupHaltOnIncompatibleProtocolVersion *string @@ -408,8 +408,8 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { if dec.RollupDisableTxPoolGossip != nil { c.RollupDisableTxPoolGossip = *dec.RollupDisableTxPoolGossip } - if dec.RollupNetrestrictTxPoolGossip != nil { - c.RollupTxPoolNetrestrict = *dec.RollupNetrestrictTxPoolGossip + if dec.RollupTxPoolNetrestrict != nil { + c.RollupTxPoolNetrestrict = *dec.RollupTxPoolNetrestrict } if dec.RollupTxPoolTrustedPeersOnly != nil { c.RollupTxPoolTrustedPeersOnly = *dec.RollupTxPoolTrustedPeersOnly From b6420b923f12ef116ada6ac750297c57e30b68cd Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Wed, 7 Jan 2026 15:12:58 -0800 Subject: [PATCH 2/2] Fix check_generate script and add it to ci --- .circleci/config.yml | 2 ++ build/ci.go | 4 ++-- internal/build/file.go | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d735288b0..ceb4df70d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -194,6 +194,8 @@ jobs: - checkout - run: command: go run build/ci.go lint + - run: + command: go run build/ci.go check_generate tidy-geth: resource_class: small docker: diff --git a/build/ci.go b/build/ci.go index b35412e657..879448d191 100644 --- a/build/ci.go +++ b/build/ci.go @@ -378,7 +378,7 @@ func doCheckGenerate() { for _, mod := range goModules { // Compute the origin hashes of all the files - hashes, err := build.HashFolder(mod, []string{"tests/testdata", "build/cache", ".git"}) + hashes, err := build.HashFolder(mod, []string{"tests/testdata", "build/cache", ".git", ".jj"}) if err != nil { log.Fatal("Error computing hashes", "err", err) } @@ -388,7 +388,7 @@ func doCheckGenerate() { c.Dir = mod build.MustRun(c) // Check if generate file hashes have changed - generated, err := build.HashFolder(mod, []string{"tests/testdata", "build/cache", ".git"}) + generated, err := build.HashFolder(mod, []string{"tests/testdata", "build/cache", ".git", ".jj"}) if err != nil { log.Fatalf("Error re-computing hashes: %v", err) } diff --git a/internal/build/file.go b/internal/build/file.go index 7490af281e..bc4630da80 100644 --- a/internal/build/file.go +++ b/internal/build/file.go @@ -40,9 +40,11 @@ func HashFolder(folder string, exlude []string) (map[string][32]byte, error) { res := make(map[string][32]byte) err := filepath.WalkDir(folder, func(path string, d os.DirEntry, _ error) error { // Skip anything that's exluded or not a regular file - for _, skip := range exlude { - if strings.HasPrefix(path, filepath.FromSlash(skip)) { - return filepath.SkipDir + if d.IsDir() { + for _, skip := range exlude { + if strings.HasPrefix(path, filepath.FromSlash(skip)) { + return filepath.SkipDir + } } } if !d.Type().IsRegular() {