Skip to content

Commit

Permalink
Merge branch 'ethereum:master' into portal
Browse files Browse the repository at this point in the history
  • Loading branch information
GrapeBaBa authored Apr 19, 2024
2 parents be7fc97 + cce879b commit bcc4d59
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion eth/catalyst/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ func (api *ConsensusAPI) delayPayloadImport(block *types.Block) engine.PayloadSt
api.remoteBlocks.put(block.Hash(), block.Header())

// Although we don't want to trigger a sync, if there is one already in
// progress, try to extend if with the current payload request to relieve
// progress, try to extend it with the current payload request to relieve
// some strain from the forkchoice update.
err := api.eth.Downloader().BeaconExtend(api.eth.SyncMode(), block.Header())
if err == nil {
Expand Down
20 changes: 20 additions & 0 deletions tests/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,26 @@ var Forks = map[string]*params.ChainConfig{
CancunTime: u64(0),
PragueTime: u64(0),
},
"CancunToPragueAtTime15k": {
ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(0),
EIP150Block: big.NewInt(0),
EIP155Block: big.NewInt(0),
EIP158Block: big.NewInt(0),
ByzantiumBlock: big.NewInt(0),
ConstantinopleBlock: big.NewInt(0),
PetersburgBlock: big.NewInt(0),
IstanbulBlock: big.NewInt(0),
MuirGlacierBlock: big.NewInt(0),
BerlinBlock: big.NewInt(0),
LondonBlock: big.NewInt(0),
ArrowGlacierBlock: big.NewInt(0),
MergeNetsplitBlock: big.NewInt(0),
TerminalTotalDifficulty: big.NewInt(0),
ShanghaiTime: u64(0),
CancunTime: u64(0),
PragueTime: u64(15_000),
},
}

// AvailableForks returns the set of defined fork names
Expand Down

0 comments on commit bcc4d59

Please sign in to comment.