From b65f3b5b4ec60fe024bbcce3c6c5226e500a46e8 Mon Sep 17 00:00:00 2001 From: Raneet Debnath Date: Wed, 4 Jun 2025 10:40:32 +0530 Subject: [PATCH 1/5] consensus,miner: allow mining in case of no peers if DevFakeAuthor is enabled --- consensus/bor/bor.go | 6 +++--- miner/worker.go | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go index 5303be53e2..8128dba111 100644 --- a/consensus/bor/bor.go +++ b/consensus/bor/bor.go @@ -231,7 +231,7 @@ type Bor struct { // The fields below are for testing only fakeDiff bool // Skip difficulty verifications - devFakeAuthor bool + DevFakeAuthor bool closeOnce sync.Once } @@ -276,7 +276,7 @@ func New( GenesisContractsClient: genesisContracts, HeimdallClient: heimdallClient, spanStore: spanStore, - devFakeAuthor: devFakeAuthor, + DevFakeAuthor: devFakeAuthor, } c.authorizedSigner.Store(&signer{ @@ -539,7 +539,7 @@ func (c *Bor) verifyCascadingFields(chain consensus.ChainHeaderReader, header *t func (c *Bor) snapshot(chain consensus.ChainHeaderReader, number uint64, hash common.Hash, parents []*types.Header) (*Snapshot, error) { // Search for a snapshot in memory or on disk for checkpoints signer := common.BytesToAddress(c.authorizedSigner.Load().signer.Bytes()) - if c.devFakeAuthor && signer.String() != "0x0000000000000000000000000000000000000000" { + if c.DevFakeAuthor && signer.String() != "0x0000000000000000000000000000000000000000" { log.Info("👨‍💻Using DevFakeAuthor", "signer", signer) val := valset.NewValidator(signer, 1000) diff --git a/miner/worker.go b/miner/worker.go index 94a99a7a16..77185b24d6 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -594,11 +594,12 @@ func (w *worker) mainLoop() { } }() + bor, _ := w.engine.(*bor.Bor) for { select { case req := <-w.newWorkCh: if w.chainConfig.ChainID.Cmp(params.BorMainnetChainConfig.ChainID) == 0 || w.chainConfig.ChainID.Cmp(params.MumbaiChainConfig.ChainID) == 0 || w.chainConfig.ChainID.Cmp(params.AmoyChainConfig.ChainID) == 0 { - if w.eth.PeerCount() > 0 { + if w.eth.PeerCount() > 0 || bor.DevFakeAuthor { //nolint:contextcheck w.commitWork(req.interrupt, req.noempty, req.timestamp) } From b1a23a37513d5994c5a9f284e6b9edda4571d526 Mon Sep 17 00:00:00 2001 From: Raneet Debnath Date: Wed, 4 Jun 2025 16:18:18 +0530 Subject: [PATCH 2/5] miner: explicitly assert consensus engine type --- miner/worker.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/miner/worker.go b/miner/worker.go index 77185b24d6..8d6f7dec5e 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -594,12 +594,13 @@ func (w *worker) mainLoop() { } }() - bor, _ := w.engine.(*bor.Bor) + bor, isBor := w.engine.(*bor.Bor) + devFakeAuthor := isBor && bor != nil && bor.DevFakeAuthor for { select { case req := <-w.newWorkCh: if w.chainConfig.ChainID.Cmp(params.BorMainnetChainConfig.ChainID) == 0 || w.chainConfig.ChainID.Cmp(params.MumbaiChainConfig.ChainID) == 0 || w.chainConfig.ChainID.Cmp(params.AmoyChainConfig.ChainID) == 0 { - if w.eth.PeerCount() > 0 || bor.DevFakeAuthor { + if w.eth.PeerCount() > 0 || devFakeAuthor { //nolint:contextcheck w.commitWork(req.interrupt, req.noempty, req.timestamp) } From ccb9fd83508cc29814857d5a4c3419eed584f0ef Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Thu, 12 Jun 2025 04:18:26 +0530 Subject: [PATCH 3/5] params: version bump to v2.1.0 --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index 68db928f80..626d88b465 100644 --- a/params/version.go +++ b/params/version.go @@ -23,10 +23,10 @@ import ( ) const ( - VersionMajor = 2 // Major version component of the current release - VersionMinor = 1 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta4" // Version metadata to append to the version string + VersionMajor = 2 // Major version component of the current release + VersionMinor = 1 // Minor version component of the current release + VersionPatch = 0 // Patch version component of the current release + VersionMeta = "" // Version metadata to append to the version string ) var ( From 1ad23ecd641ac966c8cbd835e04a4ec259e70460 Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Tue, 17 Jun 2025 15:06:54 +0530 Subject: [PATCH 4/5] added Bhilai and Prague block for mainnet (#1581) --- builder/files/genesis-mainnet-v1.json | 2 ++ internal/cli/server/chains/mainnet.go | 2 ++ params/config.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/builder/files/genesis-mainnet-v1.json b/builder/files/genesis-mainnet-v1.json index 8e6e4d055e..967b4fab67 100644 --- a/builder/files/genesis-mainnet-v1.json +++ b/builder/files/genesis-mainnet-v1.json @@ -15,11 +15,13 @@ "londonBlock": 23850000, "shanghaiBlock": 50523000, "cancunBlock": 54876000, + "pragueBlock": 73440256, "bor": { "jaipurBlock": 23850000, "delhiBlock": 38189056, "indoreBlock": 44934656, "ahmedabadBlock": 62278656, + "bhilaiBlock": 73440256, "stateSyncConfirmationDelay": { "44934656": 128 }, diff --git a/internal/cli/server/chains/mainnet.go b/internal/cli/server/chains/mainnet.go index 8c6a1093c9..9549c85638 100644 --- a/internal/cli/server/chains/mainnet.go +++ b/internal/cli/server/chains/mainnet.go @@ -29,11 +29,13 @@ var mainnetBor = &Chain{ LondonBlock: big.NewInt(23850000), ShanghaiBlock: big.NewInt(50523000), CancunBlock: big.NewInt(54876000), + PragueBlock: big.NewInt(73440256), Bor: ¶ms.BorConfig{ JaipurBlock: big.NewInt(23850000), DelhiBlock: big.NewInt(38189056), IndoreBlock: big.NewInt(44934656), AhmedabadBlock: big.NewInt(62278656), + BhilaiBlock: big.NewInt(73440256), StateSyncConfirmationDelay: map[string]uint64{ "44934656": 128, }, diff --git a/params/config.go b/params/config.go index 851218dffd..3acfb476ca 100644 --- a/params/config.go +++ b/params/config.go @@ -390,11 +390,13 @@ var ( LondonBlock: big.NewInt(23850000), ShanghaiBlock: big.NewInt(50523000), CancunBlock: big.NewInt(54876000), + PragueBlock: big.NewInt(73440256), Bor: &BorConfig{ JaipurBlock: big.NewInt(23850000), DelhiBlock: big.NewInt(38189056), IndoreBlock: big.NewInt(44934656), AhmedabadBlock: big.NewInt(62278656), + BhilaiBlock: big.NewInt(73440256), StateSyncConfirmationDelay: map[string]uint64{ "44934656": 128, }, From cec664be7ad646a4485031d4e0c5ef6ddf34201c Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Tue, 17 Jun 2025 15:07:35 +0530 Subject: [PATCH 5/5] params: version bump to v2.1.1 --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index 626d88b465..5966bb2f95 100644 --- a/params/version.go +++ b/params/version.go @@ -25,7 +25,7 @@ import ( const ( VersionMajor = 2 // Major version component of the current release VersionMinor = 1 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release + VersionPatch = 1 // Patch version component of the current release VersionMeta = "" // Version metadata to append to the version string )