mirror of
https://source.quilibrium.com/quilibrium/ceremonyclient.git
synced 2024-12-25 08:05:17 +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.
|
// 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{
|
return &BlossomSubRouter{
|
||||||
peers: make(map[peer.ID]protocol.ID),
|
peers: make(map[peer.ID]protocol.ID),
|
||||||
mesh: make(map[string]map[peer.ID]struct{}),
|
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),
|
lastpub: make(map[string]int64),
|
||||||
gossip: make(map[peer.ID][]*pb.ControlIHave),
|
gossip: make(map[peer.ID][]*pb.ControlIHave),
|
||||||
control: make(map[peer.ID]*pb.ControlMessage),
|
control: make(map[peer.ID]*pb.ControlMessage),
|
||||||
cab: pstoremem.NewAddrBook(),
|
cab: addrBook,
|
||||||
backoff: make(map[string]map[peer.ID]time.Time),
|
backoff: make(map[string]map[peer.ID]time.Time),
|
||||||
peerhave: make(map[peer.ID]int),
|
peerhave: make(map[peer.ID]int),
|
||||||
iasked: make(map[peer.ID]int),
|
iasked: make(map[peer.ID]int),
|
||||||
|
@ -36,5 +36,5 @@ func FormatVersion(version []byte) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func GetPatchNumber() byte {
|
func GetPatchNumber() byte {
|
||||||
return 0x00
|
return 0x01
|
||||||
}
|
}
|
||||||
|
@ -146,7 +146,7 @@ func NewMasterClockConsensusEngine(
|
|||||||
report: report,
|
report: report,
|
||||||
frameValidationCh: make(chan *protobufs.ClockFrame),
|
frameValidationCh: make(chan *protobufs.ClockFrame),
|
||||||
bandwidthTestCh: make(chan []byte),
|
bandwidthTestCh: make(chan []byte),
|
||||||
verifyTestCh: make(chan verifyChallenge),
|
verifyTestCh: make(chan verifyChallenge, 120000),
|
||||||
engineConfig: engineConfig,
|
engineConfig: engineConfig,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -403,8 +403,10 @@ func (e *MasterClockConsensusEngine) Start() <-chan error {
|
|||||||
zap.Uint64("current_frame", e.report.MasterHeadFrame),
|
zap.Uint64("current_frame", e.report.MasterHeadFrame),
|
||||||
)
|
)
|
||||||
|
|
||||||
if err := e.publishMessage(e.filter, e.report); err != nil {
|
if increment%30 == 0 {
|
||||||
e.logger.Debug("error publishing message", zap.Error(err))
|
if err := e.publishMessage(e.filter, e.report); err != nil {
|
||||||
|
e.logger.Debug("error publishing message", zap.Error(err))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
skipStore = false
|
skipStore = false
|
||||||
|
@ -438,6 +438,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repair(*configDirectory, node)
|
repair(*configDirectory, node)
|
||||||
|
runtime.GOMAXPROCS(1)
|
||||||
|
|
||||||
if nodeConfig.ListenGRPCMultiaddr != "" {
|
if nodeConfig.ListenGRPCMultiaddr != "" {
|
||||||
srv, err := rpc.NewRPCServer(
|
srv, err := rpc.NewRPCServer(
|
||||||
|
@ -85,6 +85,16 @@ func getPeerID(p2pConfig *config.P2PConfig) peer.ID {
|
|||||||
return 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(
|
func NewBlossomSub(
|
||||||
p2pConfig *config.P2PConfig,
|
p2pConfig *config.P2PConfig,
|
||||||
peerstore store.Peerstore,
|
peerstore store.Peerstore,
|
||||||
@ -126,7 +136,14 @@ func NewBlossomSub(
|
|||||||
opts = append(opts, libp2p.Identity(privKey))
|
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 {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@ -208,7 +225,7 @@ func NewBlossomSub(
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
params := mergeDefaults(p2pConfig)
|
params := mergeDefaults(p2pConfig)
|
||||||
rt := blossomsub.NewBlossomSubRouter(h, params)
|
rt := blossomsub.NewBlossomSubRouter(h, params, ps)
|
||||||
pubsub, err := blossomsub.NewBlossomSubWithRouter(ctx, h, rt, blossomOpts...)
|
pubsub, err := blossomsub.NewBlossomSubWithRouter(ctx, h, rt, blossomOpts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
|
Loading…
Reference in New Issue
Block a user