forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

core, eth: fix usage of timestamp based hf

Browse source
This commit is contained in:
Manav Darji 2025-03-26 11:07:47 +05:30
parent a648256a74
commit 0aee8d9db7
No known key found for this signature in database
GPG key ID: A426F0124435F36E
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/vm/runtime/runtime.go
View file

@ -75,8 +75,8 @@ func setDefaults(cfg *Config) {
GrayGlacierBlock: nil, GrayGlacierBlock: nil,
TerminalTotalDifficulty: big.NewInt(0), TerminalTotalDifficulty: big.NewInt(0),
MergeNetsplitBlock: nil, MergeNetsplitBlock: nil,
ShanghaiTime: &shanghaiTime, ShanghaiBlock: new(big.Int),
CancunTime: &cancunTime} CancunBlock: new(big.Int)}
} }
if cfg.Difficulty == nil { if cfg.Difficulty == nil {
cfg.Difficulty = new(big.Int) cfg.Difficulty = new(big.Int)

14
eth/catalyst/api_test.go
View file

@ -43,12 +43,14 @@ import (
"github.com/ethereum/go-ethereum/eth/downloader" "github.com/ethereum/go-ethereum/eth/downloader"
"github.com/ethereum/go-ethereum/eth/ethconfig" "github.com/ethereum/go-ethereum/eth/ethconfig"
"github.com/ethereum/go-ethereum/internal/version" "github.com/ethereum/go-ethereum/internal/version"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/miner"
"github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/trie" "github.com/ethereum/go-ethereum/trie"
"github.com/mattn/go-colorable"
) )
var ( var (
@ -1686,13 +1688,15 @@ func TestParentBeaconBlockRoot(t *testing.T) {
} }
func TestWitnessCreationAndConsumption(t *testing.T) { func TestWitnessCreationAndConsumption(t *testing.T) {
t.Skip("This test is not compatible with bor")
genesis, blocks := generateMergeChain(10, true) genesis, blocks := generateMergeChain(10, true)
// Bor doesn't allow timebased hardforks
// Set cancun time to semi-last block + 5 seconds // Set cancun time to semi-last block + 5 seconds
timestamp := blocks[len(blocks)-2].Time() + 5 // timestamp := blocks[len(blocks)-2].Time() + 5
genesis.Config.ShanghaiTime = &timestamp // genesis.Config.ShanghaiTime = &timestamp
genesis.Config.CancunTime = &timestamp // genesis.Config.CancunTime = &timestamp
genesis.Config.BlobScheduleConfig = params.DefaultBlobSchedule
n, ethservice := startEthService(t, genesis, blocks[:9]) n, ethservice := startEthService(t, genesis, blocks[:9])
defer n.Close() defer n.Close()
@ -1702,7 +1706,7 @@ func TestWitnessCreationAndConsumption(t *testing.T) {
// Put the 10th block's tx in the pool and produce a new block // Put the 10th block's tx in the pool and produce a new block
txs := blocks[9].Transactions() txs := blocks[9].Transactions()
ethservice.TxPool().Add(txs, true) ethservice.TxPool().Add(txs, true, true)
blockParams := engine.PayloadAttributes{ blockParams := engine.PayloadAttributes{
Timestamp: blocks[8].Time() + 5, Timestamp: blocks[8].Time() + 5,
Withdrawals: make([]*types.Withdrawal, 0), Withdrawals: make([]*types.Withdrawal, 0),