This commit is contained in:
Cassandra Heart 2024-03-09 20:26:17 -06:00 committed by GitHub
parent d1079e17f0
commit 24a17ceddb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 20 additions and 12 deletions

View File

@ -161,7 +161,7 @@ func (t *Bitmask) Subscribe(opts ...SubOpt) (*Subscription, error) {
if sub.ch == nil { if sub.ch == nil {
// apply the default size // apply the default size
sub.ch = make(chan *Message, 1000) sub.ch = make(chan *Message, 128)
} }
out := make(chan *Subscription, 1) out := make(chan *Subscription, 1)

View File

@ -260,18 +260,18 @@ func NewPubSub(ctx context.Context, h host.Host, rt PubSubRouter, opts ...Option
peerFilter: DefaultPeerFilter, peerFilter: DefaultPeerFilter,
disc: &discover{}, disc: &discover{},
maxMessageSize: DefaultMaxMessageSize, maxMessageSize: DefaultMaxMessageSize,
peerOutboundQueueSize: 1000, peerOutboundQueueSize: 128,
signID: h.ID(), signID: h.ID(),
signKey: nil, signKey: nil,
signPolicy: StrictSign, signPolicy: StrictSign,
incoming: make(chan *RPC, 1000), incoming: make(chan *RPC, 128),
newPeers: make(chan struct{}, 1), newPeers: make(chan struct{}, 1),
newPeersPend: make(map[peer.ID]struct{}), newPeersPend: make(map[peer.ID]struct{}),
newPeerStream: make(chan network.Stream), newPeerStream: make(chan network.Stream),
newPeerError: make(chan peer.ID), newPeerError: make(chan peer.ID),
peerDead: make(chan struct{}, 1), peerDead: make(chan struct{}, 1),
peerDeadPend: make(map[peer.ID]struct{}), peerDeadPend: make(map[peer.ID]struct{}),
deadPeerBackoff: newBackoff(ctx, 1000, BackoffCleanupInterval, MaxBackoffAttempts), deadPeerBackoff: newBackoff(ctx, 128, BackoffCleanupInterval, MaxBackoffAttempts),
cancelCh: make(chan *Subscription), cancelCh: make(chan *Subscription),
getPeers: make(chan *listPeerReq), getPeers: make(chan *listPeerReq),
addSub: make(chan *addSubReq), addSub: make(chan *addSubReq),
@ -280,7 +280,7 @@ func NewPubSub(ctx context.Context, h host.Host, rt PubSubRouter, opts ...Option
addBitmask: make(chan *addBitmaskReq), addBitmask: make(chan *addBitmaskReq),
rmBitmask: make(chan *rmBitmaskReq), rmBitmask: make(chan *rmBitmaskReq),
getBitmasks: make(chan *bitmaskReq), getBitmasks: make(chan *bitmaskReq),
sendMsg: make(chan *Message, 1000), sendMsg: make(chan *Message, 128),
addVal: make(chan *addValReq), addVal: make(chan *addValReq),
rmVal: make(chan *rmValReq), rmVal: make(chan *rmValReq),
eval: make(chan func()), eval: make(chan func()),

View File

@ -887,11 +887,11 @@ func logoVersion(width int) string {
out += " ''---.. ...---'' ##\n" out += " ''---.. ...---'' ##\n"
out += " ''----------''\n" out += " ''----------''\n"
out += " \n" out += " \n"
out += " Quilibrium Node - v1.4.3 Sunset\n" out += " Quilibrium Node - v1.4.4 Sunset\n"
out += " \n" out += " \n"
out += " DB Console\n" out += " DB Console\n"
} else { } else {
out = "Quilibrium Node - v1.4.3 Sunset - DB Console\n" out = "Quilibrium Node - v1.4.4 Sunset - DB Console\n"
} }
return out return out
} }

View File

@ -51,13 +51,13 @@ type DataConsensusEngine interface {
} }
func GetMinimumVersionCutoff() time.Time { func GetMinimumVersionCutoff() time.Time {
return time.Date(2024, time.March, 7, 5, 0, 0, 0, time.UTC) return time.Date(2024, time.March, 10, 2, 0, 0, 0, time.UTC)
} }
func GetMinimumVersion() []byte { func GetMinimumVersion() []byte {
return []byte{0x01, 0x04, 0x03} return []byte{0x01, 0x04, 0x04}
} }
func GetVersion() []byte { func GetVersion() []byte {
return []byte{0x01, 0x04, 0x03} return []byte{0x01, 0x04, 0x04}
} }

View File

@ -12,6 +12,9 @@ import (
func (a *CeremonyApplication) applyTranscript( func (a *CeremonyApplication) applyTranscript(
transcript *protobufs.CeremonyTranscript, transcript *protobufs.CeremonyTranscript,
) error { ) error {
if a.UpdatedTranscript == nil {
return errors.Wrap(errors.New("invalid transcript"), "apply transcript")
}
if len(a.UpdatedTranscript.G1Powers) != len(transcript.G1Powers) { if len(a.UpdatedTranscript.G1Powers) != len(transcript.G1Powers) {
return errors.Wrap(errors.New("invalid g1s"), "apply transcript") return errors.Wrap(errors.New("invalid g1s"), "apply transcript")
} }

View File

@ -523,5 +523,5 @@ func printLogo() {
func printVersion() { func printVersion() {
fmt.Println(" ") fmt.Println(" ")
fmt.Println(" Quilibrium Node - v1.4.3 Sunset") fmt.Println(" Quilibrium Node - v1.4.4 Sunset")
} }

View File

@ -55,6 +55,11 @@ var BITMASK_ALL = []byte{
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
} }
// While we iterate through these next phases, we're going to aggressively
// enforce keeping updated. This will be achieved through announce strings
// that will vary with each update
var ANNOUNCE = "quilibrium-1.4.4-sunset-horizon"
func NewBlossomSub( func NewBlossomSub(
p2pConfig *config.P2PConfig, p2pConfig *config.P2PConfig,
logger *zap.Logger, logger *zap.Logger,
@ -97,7 +102,7 @@ func NewBlossomSub(
kademliaDHT := initDHT(ctx, p2pConfig, logger, h) kademliaDHT := initDHT(ctx, p2pConfig, logger, h)
routingDiscovery := routing.NewRoutingDiscovery(kademliaDHT) routingDiscovery := routing.NewRoutingDiscovery(kademliaDHT)
util.Advertise(ctx, routingDiscovery, string(BITMASK_ALL)) util.Advertise(ctx, routingDiscovery, ANNOUNCE)
go discoverPeers(p2pConfig, ctx, logger, h, routingDiscovery) go discoverPeers(p2pConfig, ctx, logger, h, routingDiscovery)