Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

peer, main, netsync, blockchain: parallel block downloads #2226

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

peer, main, netsync, blockchain: parallel block downloads #2226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4b9b121
netsync: don't add peer if we're not current and the peer is not a sync
kcalvinalvin Dec 9, 2024
e562196
peer: make peer meet query.Peer interface
kcalvinalvin Aug 6, 2024
91a3414
main: add ConnectedPeers() to server
kcalvinalvin Aug 6, 2024
20060bb
netsync: refactor handleBlockMsg
kcalvinalvin Aug 7, 2024
132aecf
netsync: add peerDisconnectMsg
kcalvinalvin Dec 10, 2024
94e1f22
netsync: add checkpointedBlocksQuery
kcalvinalvin Aug 7, 2024
224abe9
netsync: add peerSubscription
kcalvinalvin Aug 7, 2024
3d68761
netsync, main: add ConnectedPeers to Manager
kcalvinalvin Aug 7, 2024
21c241f
netsync: add fetchManager and request blocks from it
kcalvinalvin Aug 7, 2024
720fa5e
netsync: don't reset the requestedBlocks in headersFirst
kcalvinalvin Sep 5, 2024
dd160eb
main: include query logging
kcalvinalvin Sep 5, 2024
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
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ require (
github.com/gorilla/websocket v1.5.0
github.com/jessevdk/go-flags v1.4.0
github.com/jrick/logrotate v1.0.0
github.com/lightninglabs/neutrino v0.16.0
github.com/stretchr/testify v1.8.4
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
golang.org/x/crypto v0.22.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 h1:FOOIBWrEkLgmlgGfMuZT83xIwfPDxEI2OHu6xUmJMFE=
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
github.com/lightninglabs/neutrino v0.16.0 h1:YNTQG32fPR/Zg0vvJVI65OBH8l3U18LSXXtX91hx0q0=
github.com/lightninglabs/neutrino v0.16.0/go.mod h1:x3OmY2wsA18+Kc3TSV2QpSUewOCiscw2mKpXgZv2kZk=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down
34 changes: 19 additions & 15 deletions log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/btcsuite/btcd/netsync"
"github.com/btcsuite/btcd/peer"
"github.com/btcsuite/btcd/txscript"
"github.com/lightninglabs/neutrino/query"

"github.com/btcsuite/btclog"
"github.com/jrick/logrotate/rotator"
Expand Down Expand Up @@ -54,21 +55,22 @@ var (
// application shutdown.
logRotator *rotator.Rotator

adxrLog = backendLog.Logger("ADXR")
amgrLog = backendLog.Logger("AMGR")
cmgrLog = backendLog.Logger("CMGR")
bcdbLog = backendLog.Logger("BCDB")
btcdLog = backendLog.Logger("BTCD")
chanLog = backendLog.Logger("CHAN")
discLog = backendLog.Logger("DISC")
indxLog = backendLog.Logger("INDX")
minrLog = backendLog.Logger("MINR")
peerLog = backendLog.Logger("PEER")
rpcsLog = backendLog.Logger("RPCS")
scrpLog = backendLog.Logger("SCRP")
srvrLog = backendLog.Logger("SRVR")
syncLog = backendLog.Logger("SYNC")
txmpLog = backendLog.Logger("TXMP")
adxrLog = backendLog.Logger("ADXR")
amgrLog = backendLog.Logger("AMGR")
cmgrLog = backendLog.Logger("CMGR")
bcdbLog = backendLog.Logger("BCDB")
btcdLog = backendLog.Logger("BTCD")
chanLog = backendLog.Logger("CHAN")
discLog = backendLog.Logger("DISC")
indxLog = backendLog.Logger("INDX")
minrLog = backendLog.Logger("MINR")
peerLog = backendLog.Logger("PEER")
rpcsLog = backendLog.Logger("RPCS")
scrpLog = backendLog.Logger("SCRP")
srvrLog = backendLog.Logger("SRVR")
syncLog = backendLog.Logger("SYNC")
txmpLog = backendLog.Logger("TXMP")
queryLog = backendLog.Logger("QURY")
)

// Initialize package-global logger variables.
Expand All @@ -84,6 +86,7 @@ func init() {
txscript.UseLogger(scrpLog)
netsync.UseLogger(syncLog)
mempool.UseLogger(txmpLog)
query.UseLogger(queryLog)
}

// subsystemLoggers maps each subsystem identifier to its associated logger.
Expand All @@ -103,6 +106,7 @@ var subsystemLoggers = map[string]btclog.Logger{
"SRVR": srvrLog,
"SYNC": syncLog,
"TXMP": txmpLog,
"QURY": queryLog,
}

// initLogRotator initializes the logging rotater to write logs to logFile and
Expand Down
3 changes: 3 additions & 0 deletions netsync/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,7 @@ type Config struct {
MaxPeers int

FeeEstimator *mempool.FeeEstimator

// ConnectedPeers returns all the currently connected peers.
ConnectedPeers func() []*peer.Peer
}
Loading