mirror of
https://source.quilibrium.com/quilibrium/ceremonyclient.git
synced 2024-12-24 23:55:18 +00:00
v1.4.20-p1
This commit is contained in:
parent
6c567a04c1
commit
09b04402df
@ -214,7 +214,7 @@ func NewBlossomSubWithRouter(ctx context.Context, h host.Host, rt PubSubRouter,
|
||||
}
|
||||
|
||||
// NewBlossomSubRouter returns a new BlossomSubRouter with custom parameters.
|
||||
func NewBlossomSubRouter(h host.Host, params BlossomSubParams) *BlossomSubRouter {
|
||||
func NewBlossomSubRouter(h host.Host, params BlossomSubParams, addrBook peerstore.AddrBook) *BlossomSubRouter {
|
||||
return &BlossomSubRouter{
|
||||
peers: make(map[peer.ID]protocol.ID),
|
||||
mesh: make(map[string]map[peer.ID]struct{}),
|
||||
@ -222,7 +222,7 @@ func NewBlossomSubRouter(h host.Host, params BlossomSubParams) *BlossomSubRouter
|
||||
lastpub: make(map[string]int64),
|
||||
gossip: make(map[peer.ID][]*pb.ControlIHave),
|
||||
control: make(map[peer.ID]*pb.ControlMessage),
|
||||
cab: pstoremem.NewAddrBook(),
|
||||
cab: addrBook,
|
||||
backoff: make(map[string]map[peer.ID]time.Time),
|
||||
peerhave: make(map[peer.ID]int),
|
||||
iasked: make(map[peer.ID]int),
|
||||
|
@ -36,5 +36,5 @@ func FormatVersion(version []byte) string {
|
||||
}
|
||||
|
||||
func GetPatchNumber() byte {
|
||||
return 0x00
|
||||
return 0x01
|
||||
}
|
||||
|
@ -146,7 +146,7 @@ func NewMasterClockConsensusEngine(
|
||||
report: report,
|
||||
frameValidationCh: make(chan *protobufs.ClockFrame),
|
||||
bandwidthTestCh: make(chan []byte),
|
||||
verifyTestCh: make(chan verifyChallenge),
|
||||
verifyTestCh: make(chan verifyChallenge, 120000),
|
||||
engineConfig: engineConfig,
|
||||
}
|
||||
|
||||
@ -403,9 +403,11 @@ func (e *MasterClockConsensusEngine) Start() <-chan error {
|
||||
zap.Uint64("current_frame", e.report.MasterHeadFrame),
|
||||
)
|
||||
|
||||
if increment%30 == 0 {
|
||||
if err := e.publishMessage(e.filter, e.report); err != nil {
|
||||
e.logger.Debug("error publishing message", zap.Error(err))
|
||||
}
|
||||
}
|
||||
} else {
|
||||
skipStore = false
|
||||
}
|
||||
|
@ -438,6 +438,7 @@ func main() {
|
||||
}
|
||||
|
||||
repair(*configDirectory, node)
|
||||
runtime.GOMAXPROCS(1)
|
||||
|
||||
if nodeConfig.ListenGRPCMultiaddr != "" {
|
||||
srv, err := rpc.NewRPCServer(
|
||||
|
@ -85,6 +85,16 @@ func getPeerID(p2pConfig *config.P2PConfig) peer.ID {
|
||||
return id
|
||||
}
|
||||
|
||||
type realclock struct{}
|
||||
|
||||
func (rc realclock) Now() time.Time {
|
||||
return time.Now()
|
||||
}
|
||||
|
||||
func (rc realclock) After(d time.Duration) <-chan time.Time {
|
||||
return time.After(d)
|
||||
}
|
||||
|
||||
func NewBlossomSub(
|
||||
p2pConfig *config.P2PConfig,
|
||||
peerstore store.Peerstore,
|
||||
@ -126,7 +136,14 @@ func NewBlossomSub(
|
||||
opts = append(opts, libp2p.Identity(privKey))
|
||||
}
|
||||
|
||||
ps, err := pstoreds.NewPeerstore(ctx, peerstore, pstoreds.DefaultOpts())
|
||||
ps, err := pstoreds.NewPeerstore(ctx, peerstore, pstoreds.Options{
|
||||
CacheSize: 120000,
|
||||
MaxProtocols: 1024,
|
||||
GCPurgeInterval: 2 * time.Hour,
|
||||
GCLookaheadInterval: 0,
|
||||
GCInitialDelay: 60 * time.Second,
|
||||
Clock: realclock{},
|
||||
})
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
@ -208,7 +225,7 @@ func NewBlossomSub(
|
||||
}))
|
||||
|
||||
params := mergeDefaults(p2pConfig)
|
||||
rt := blossomsub.NewBlossomSubRouter(h, params)
|
||||
rt := blossomsub.NewBlossomSubRouter(h, params, ps)
|
||||
pubsub, err := blossomsub.NewBlossomSubWithRouter(ctx, h, rt, blossomOpts...)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
|
Loading…
Reference in New Issue
Block a user