From 8db3a22ef409dab0e7b812ffee878e8d2687ba49 Mon Sep 17 00:00:00 2001 From: cuiweixie Date: Thu, 27 Nov 2025 14:14:19 +0800 Subject: [PATCH 1/2] fix: inherit fork time from input genesis config --- cmd/prysmctl/testnet/generate_genesis.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/cmd/prysmctl/testnet/generate_genesis.go b/cmd/prysmctl/testnet/generate_genesis.go index 3508c7ab0156..64200b4dc790 100644 --- a/cmd/prysmctl/testnet/generate_genesis.go +++ b/cmd/prysmctl/testnet/generate_genesis.go @@ -261,10 +261,18 @@ func generateGenesis(ctx context.Context) (state.BeaconState, error) { // set timestamps for genesis and shanghai fork gen.Timestamp = f.GenesisTime genesis := time.Unix(int64(f.GenesisTime), 0) - gen.Config.ShanghaiTime = interop.GethShanghaiTime(genesis, params.BeaconConfig()) - gen.Config.CancunTime = interop.GethCancunTime(genesis, params.BeaconConfig()) - gen.Config.PragueTime = interop.GethPragueTime(genesis, params.BeaconConfig()) - gen.Config.OsakaTime = interop.GethOsakaTime(genesis, params.BeaconConfig()) + if gen.Config.ShanghaiTime == nil { + gen.Config.ShanghaiTime = interop.GethShanghaiTime(genesis, params.BeaconConfig()) + } + if gen.Config.CancunTime == nil { + gen.Config.CancunTime = interop.GethCancunTime(genesis, params.BeaconConfig()) + } + if gen.Config.PragueTime == nil { + gen.Config.PragueTime = interop.GethPragueTime(genesis, params.BeaconConfig()) + } + if gen.Config.OsakaTime == nil { + gen.Config.OsakaTime = interop.GethOsakaTime(genesis, params.BeaconConfig()) + } fields := logrus.Fields{} if gen.Config.ShanghaiTime != nil { From 7b81c728ba84ac9ad37dc75bda0af52c84c262bf Mon Sep 17 00:00:00 2001 From: cuiweixie Date: Sat, 29 Nov 2025 13:56:37 +0800 Subject: [PATCH 2/2] feat: add change log --- changelog/inherit-fork-time-from-input-genesis.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/inherit-fork-time-from-input-genesis.md diff --git a/changelog/inherit-fork-time-from-input-genesis.md b/changelog/inherit-fork-time-from-input-genesis.md new file mode 100644 index 000000000000..6c1bbc3e8f96 --- /dev/null +++ b/changelog/inherit-fork-time-from-input-genesis.md @@ -0,0 +1,3 @@ +### Changed + +- Inherit fork activation times (Shanghai, Cancun, Prague, Osaka) from input genesis file during chain initialization. \ No newline at end of file