From e639713347366f9347fd6467c79a7332e4fa1ef1 Mon Sep 17 00:00:00 2001 From: marcello33 Date: Wed, 18 Feb 2026 16:09:39 +0100 Subject: [PATCH 1/2] builder, internal, params: implement new burnContract in lisovo / define lisovo height for mainnet / bump version --- builder/files/genesis-mainnet-v1.json | 7 +++++-- internal/cli/server/chains/mainnet.go | 3 +++ params/config.go | 3 +++ params/version.go | 8 ++++---- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/builder/files/genesis-mainnet-v1.json b/builder/files/genesis-mainnet-v1.json index db03197a09..f2e18ed80b 100644 --- a/builder/files/genesis-mainnet-v1.json +++ b/builder/files/genesis-mainnet-v1.json @@ -26,6 +26,8 @@ "madhugiriBlock": 80084800, "madhugiriProBlock": 80084800, "dandeliBlock": 81424000, + "lisovoBlock": 83756500, + "lisovoProBlock": 83756500, "stateSyncConfirmationDelay": { "44934656": 128 }, @@ -112,7 +114,8 @@ }, "burntContract": { "23850000": "0x70bca57f4579f58670ab2d18ef16e02c17553c38", - "50523000": "0x7A8ed27F4C30512326878652d20fC85727401854" + "50523000": "0x7A8ed27F4C30512326878652d20fC85727401854", + "83756500": "0x3ef57def668054dd750bd260526105c4eeef104f" } } }, @@ -161,4 +164,4 @@ "number": "0x0", "gasUsed": "0x0", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000" -} \ No newline at end of file +} diff --git a/internal/cli/server/chains/mainnet.go b/internal/cli/server/chains/mainnet.go index dd624c2260..de4955598c 100644 --- a/internal/cli/server/chains/mainnet.go +++ b/internal/cli/server/chains/mainnet.go @@ -40,6 +40,8 @@ var mainnetBor = &Chain{ MadhugiriBlock: big.NewInt(80084800), MadhugiriProBlock: big.NewInt(80084800), DandeliBlock: big.NewInt(81424000), + LisovoBlock: big.NewInt(83756500), + LisovoProBlock: big.NewInt(83756500), StateSyncConfirmationDelay: map[string]uint64{ "44934656": 128, }, @@ -84,6 +86,7 @@ var mainnetBor = &Chain{ BurntContract: map[string]string{ "23850000": "0x70bca57f4579f58670ab2d18ef16e02c17553c38", "50523000": "0x7A8ed27F4C30512326878652d20fC85727401854", + "83756500": "0x3ef57def668054dd750bd260526105c4eeef104f", }, Coinbase: map[string]string{ "0": "0x0000000000000000000000000000000000000000", diff --git a/params/config.go b/params/config.go index b6db170b3f..bba5889e6f 100644 --- a/params/config.go +++ b/params/config.go @@ -429,6 +429,8 @@ var ( MadhugiriBlock: big.NewInt(80084800), MadhugiriProBlock: big.NewInt(80084800), DandeliBlock: big.NewInt(81424000), + LisovoBlock: big.NewInt(83756500), + LisovoProBlock: big.NewInt(83756500), StateSyncConfirmationDelay: map[string]uint64{ "44934656": 128, }, @@ -474,6 +476,7 @@ var ( BurntContract: map[string]string{ "23850000": "0x70bca57f4579f58670ab2d18ef16e02c17553c38", "50523000": "0x7A8ed27F4C30512326878652d20fC85727401854", + "83756500": "0x3ef57def668054dd750bd260526105c4eeef104f", }, Coinbase: map[string]string{ "0": "0x0000000000000000000000000000000000000000", diff --git a/params/version.go b/params/version.go index b51cffc4f2..c1dac7824a 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 = 6 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta2" // Version metadata to append to the version string + VersionMajor = 2 // Major version component of the current release + VersionMinor = 6 // 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 4af299023513b0d2c29e0d190d96a8e19f18e829 Mon Sep 17 00:00:00 2001 From: marcello33 Date: Wed, 18 Feb 2026 16:26:33 +0100 Subject: [PATCH 2/2] fix lint --- consensus/bor/bor_test.go | 1 - core/blockchain_test.go | 44 --------------------------------------- 2 files changed, 45 deletions(-) diff --git a/consensus/bor/bor_test.go b/consensus/bor/bor_test.go index de77f80db8..d3f6f5be27 100644 --- a/consensus/bor/bor_test.go +++ b/consensus/bor/bor_test.go @@ -1680,4 +1680,3 @@ func TestVerifyHeaderRejectsInvalidBlockNumber(t *testing.T) { t.Fatalf("expected ErrInvalidNumber for overflow, got %v", err) } } - diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 4358922c42..e36676c6e9 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -4737,50 +4737,6 @@ func TestPragueRequests(t *testing.T) { } } -// mockChainValidator is a mock implementation of ethereum.ChainValidator for testing -type mockChainValidator struct { - hasMilestone bool - milestoneNumber uint64 - milestoneHash common.Hash -} - -func (m *mockChainValidator) IsValidPeer(fetchHeadersByNumber func(number uint64, amount int, skip int, reverse bool) ([]*types.Header, []common.Hash, error)) (bool, error) { - return true, nil -} - -func (m *mockChainValidator) IsValidChain(currentHeader *types.Header, chain []*types.Header) (bool, error) { - return true, nil -} - -func (m *mockChainValidator) GetWhitelistedCheckpoint() (bool, uint64, common.Hash) { - return false, 0, common.Hash{} -} - -func (m *mockChainValidator) GetWhitelistedMilestone() (bool, uint64, common.Hash) { - return m.hasMilestone, m.milestoneNumber, m.milestoneHash -} - -func (m *mockChainValidator) ProcessCheckpoint(endBlockNum uint64, endBlockHash common.Hash) {} - -func (m *mockChainValidator) ProcessMilestone(endBlockNum uint64, endBlockHash common.Hash) {} - -func (m *mockChainValidator) ProcessFutureMilestone(num uint64, hash common.Hash) {} - -func (m *mockChainValidator) PurgeWhitelistedCheckpoint() {} - -func (m *mockChainValidator) PurgeWhitelistedMilestone() {} - -func (m *mockChainValidator) LockMutex(endBlockNum uint64) bool { return true } - -func (m *mockChainValidator) UnlockMutex(doLock bool, milestoneId string, endBlockNum uint64, endBlockHash common.Hash) { -} - -func (m *mockChainValidator) UnlockSprint(endBlockNum uint64) {} - -func (m *mockChainValidator) RemoveMilestoneID(milestoneId string) {} - -func (m *mockChainValidator) GetMilestoneIDsList() []string { return nil } - // mockEngine that can fail header verification for specific block numbers type mockFailingEngine struct { *ethash.Ethash