From 447776765caf71cad5eeb1fd7a37d521fe333d9b Mon Sep 17 00:00:00 2001 From: jagdeep sidhu Date: Wed, 9 Oct 2024 22:13:54 -0700 Subject: [PATCH] sync params to mainnet --- core/txpool/blobpool/blobpool.go | 4 ++-- params/config.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go index 82df09a4bf..9dd0285da9 100644 --- a/core/txpool/blobpool/blobpool.go +++ b/core/txpool/blobpool/blobpool.go @@ -816,8 +816,8 @@ func (p *BlobPool) Reset(oldHead, newHead *types.Header) { p.insertFeed.Send(core.NewTxsEvent{Txs: adds}) } } - // Flush out any blobs from limbo that are older than the latest finality - if p.chain.Config().IsCancun(p.head.Number, p.head.Time) { + // SYSCOIN Flush out any blobs from limbo that are older than the latest finality + if !p.chain.Config().IsSyscoin(p.head.Number) && p.chain.Config().IsCancun(p.head.Number, p.head.Time) { p.limbo.finalize(p.chain.CurrentFinalBlock()) } // Reset the price heap for the new set of basefee/blobfee pairs diff --git a/params/config.go b/params/config.go index d0acc6209c..346a1caaff 100644 --- a/params/config.go +++ b/params/config.go @@ -86,7 +86,7 @@ var ( TerminalTotalDifficulty: big.NewInt(1), TerminalTotalDifficultyPassed: true, ShanghaiTime: newUint64(1679618404), - CancunTime: newUint64(1679618404), + //CancunTime: newUint64(1679618404), Ethash: nil, } TanenbaumChainConfig = &ChainConfig{