Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions builder/files/genesis-mainnet-v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"madhugiriBlock": 80084800,
"madhugiriProBlock": 80084800,
"dandeliBlock": 81424000,
"lisovoBlock": 83756500,
"lisovoProBlock": 83756500,
"stateSyncConfirmationDelay": {
"44934656": 128
},
Expand Down Expand Up @@ -112,7 +114,8 @@
},
"burntContract": {
"23850000": "0x70bca57f4579f58670ab2d18ef16e02c17553c38",
"50523000": "0x7A8ed27F4C30512326878652d20fC85727401854"
"50523000": "0x7A8ed27F4C30512326878652d20fC85727401854",
"83756500": "0x3ef57def668054dd750bd260526105c4eeef104f"
}
}
},
Expand Down Expand Up @@ -161,4 +164,4 @@
"number": "0x0",
"gasUsed": "0x0",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
}
}
1 change: 0 additions & 1 deletion consensus/bor/bor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1680,4 +1680,3 @@ func TestVerifyHeaderRejectsInvalidBlockNumber(t *testing.T) {
t.Fatalf("expected ErrInvalidNumber for overflow, got %v", err)
}
}

44 changes: 0 additions & 44 deletions core/blockchain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions internal/cli/server/chains/mainnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down Expand Up @@ -84,6 +86,7 @@ var mainnetBor = &Chain{
BurntContract: map[string]string{
"23850000": "0x70bca57f4579f58670ab2d18ef16e02c17553c38",
"50523000": "0x7A8ed27F4C30512326878652d20fC85727401854",
"83756500": "0x3ef57def668054dd750bd260526105c4eeef104f",
},
Coinbase: map[string]string{
"0": "0x0000000000000000000000000000000000000000",
Expand Down
3 changes: 3 additions & 0 deletions params/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand Down Expand Up @@ -474,6 +476,7 @@ var (
BurntContract: map[string]string{
"23850000": "0x70bca57f4579f58670ab2d18ef16e02c17553c38",
"50523000": "0x7A8ed27F4C30512326878652d20fC85727401854",
"83756500": "0x3ef57def668054dd750bd260526105c4eeef104f",
},
Coinbase: map[string]string{
"0": "0x0000000000000000000000000000000000000000",
Expand Down
8 changes: 4 additions & 4 deletions params/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Loading