mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-19 02:12:23 +00:00
sync params to mainnet
This commit is contained in:
parent
8bb0cc0ffc
commit
447776765c
2 changed files with 3 additions and 3 deletions
|
|
@ -816,8 +816,8 @@ func (p *BlobPool) Reset(oldHead, newHead *types.Header) {
|
||||||
p.insertFeed.Send(core.NewTxsEvent{Txs: adds})
|
p.insertFeed.Send(core.NewTxsEvent{Txs: adds})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Flush out any blobs from limbo that are older than the latest finality
|
// SYSCOIN Flush out any blobs from limbo that are older than the latest finality
|
||||||
if p.chain.Config().IsCancun(p.head.Number, p.head.Time) {
|
if !p.chain.Config().IsSyscoin(p.head.Number) && p.chain.Config().IsCancun(p.head.Number, p.head.Time) {
|
||||||
p.limbo.finalize(p.chain.CurrentFinalBlock())
|
p.limbo.finalize(p.chain.CurrentFinalBlock())
|
||||||
}
|
}
|
||||||
// Reset the price heap for the new set of basefee/blobfee pairs
|
// Reset the price heap for the new set of basefee/blobfee pairs
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ var (
|
||||||
TerminalTotalDifficulty: big.NewInt(1),
|
TerminalTotalDifficulty: big.NewInt(1),
|
||||||
TerminalTotalDifficultyPassed: true,
|
TerminalTotalDifficultyPassed: true,
|
||||||
ShanghaiTime: newUint64(1679618404),
|
ShanghaiTime: newUint64(1679618404),
|
||||||
CancunTime: newUint64(1679618404),
|
//CancunTime: newUint64(1679618404),
|
||||||
Ethash: nil,
|
Ethash: nil,
|
||||||
}
|
}
|
||||||
TanenbaumChainConfig = &ChainConfig{
|
TanenbaumChainConfig = &ChainConfig{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue