forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'ethereum:master' into patch/typo

Browse source
This commit is contained in:
Zoro 2024-06-10 14:27:37 +08:00 committed by GitHub
commit c28a4caa7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/genesis.go
View file

@ -594,7 +594,7 @@ func DeveloperGenesisBlock(gasLimit uint64, faucet *common.Address) *Genesis {
common.BytesToAddress([]byte{8}): {Balance: big.NewInt(1)}, // ECPairing common.BytesToAddress([]byte{8}): {Balance: big.NewInt(1)}, // ECPairing
common.BytesToAddress([]byte{9}): {Balance: big.NewInt(1)}, // BLAKE2b common.BytesToAddress([]byte{9}): {Balance: big.NewInt(1)}, // BLAKE2b
// Pre-deploy EIP-4788 system contract // Pre-deploy EIP-4788 system contract
params.BeaconRootsAddress: {Nonce: 1, Code: params.BeaconRootsCode}, params.BeaconRootsAddress: {Nonce: 1, Code: params.BeaconRootsCode, Balance: common.Big0},
}, },
} }
if faucet != nil { if faucet != nil {

2
p2p/discover/table.go
View file

@ -452,7 +452,9 @@ func (tab *Table) loadSeedNodes() {
addr, _ := seed.UDPEndpoint() addr, _ := seed.UDPEndpoint()
tab.log.Trace("Found seed node in database", "id", seed.ID(), "addr", addr, "age", age) tab.log.Trace("Found seed node in database", "id", seed.ID(), "addr", addr, "age", age)
} }
tab.mutex.Lock()
tab.handleAddNode(addNodeOp{node: seed, isInbound: false}) tab.handleAddNode(addNodeOp{node: seed, isInbound: false})
tab.mutex.Unlock()
} }
} }

12
p2p/server.go
View file

@ -19,6 +19,7 @@ package p2p
import ( import (
"bytes" "bytes"
"cmp"
"crypto/ecdsa" "crypto/ecdsa"
"encoding/hex" "encoding/hex"
"errors" "errors"
@ -1140,12 +1141,9 @@ func (srv *Server) PeersInfo() []*PeerInfo {
} }
} }
// Sort the result array alphabetically by node identifier // Sort the result array alphabetically by node identifier
for i := 0; i < len(infos); i++ { slices.SortFunc(infos, func(a, b *PeerInfo) int {
for j := i + 1; j < len(infos); j++ { return cmp.Compare(a.ID, b.ID)
if infos[i].ID > infos[j].ID { })
infos[i], infos[j] = infos[j], infos[i]
}
}
}
return infos return infos
} }