diff --git a/node/execution/intrinsics/token/application/token_handle_prover_join.go b/node/execution/intrinsics/token/application/token_handle_prover_join.go index b2a5a96..eaa6757 100644 --- a/node/execution/intrinsics/token/application/token_handle_prover_join.go +++ b/node/execution/intrinsics/token/application/token_handle_prover_join.go @@ -58,7 +58,7 @@ func (a *TokenApplication) handleDataAnnounceProverJoin( t.PublicKeySignatureEd448.Signature == nil || t.PublicKeySignatureEd448.PublicKey.KeyValue == nil || t.Filter == nil || len(t.Filter) != 32 || - t.FrameNumber < currentFrameNumber-1 || t.FrameNumber > currentFrameNumber { + t.FrameNumber > currentFrameNumber { a.Logger.Debug( "bad payload", zap.Uint64("given_frame_number", t.FrameNumber), diff --git a/node/execution/intrinsics/token/application/token_handle_prover_leave.go b/node/execution/intrinsics/token/application/token_handle_prover_leave.go index 046496f..ccc1d12 100644 --- a/node/execution/intrinsics/token/application/token_handle_prover_leave.go +++ b/node/execution/intrinsics/token/application/token_handle_prover_leave.go @@ -25,7 +25,7 @@ func (a *TokenApplication) handleDataAnnounceProverLeave( t.PublicKeySignatureEd448.Signature == nil || t.PublicKeySignatureEd448.PublicKey.KeyValue == nil || t.Filter == nil || len(t.Filter) != 32 || - t.FrameNumber < currentFrameNumber-1 || t.FrameNumber > currentFrameNumber { + t.FrameNumber > currentFrameNumber { return nil, errors.Wrap(ErrInvalidStateTransition, "handle leave") } diff --git a/node/execution/intrinsics/token/application/token_handle_prover_pause.go b/node/execution/intrinsics/token/application/token_handle_prover_pause.go index aa6f55b..bfea7fd 100644 --- a/node/execution/intrinsics/token/application/token_handle_prover_pause.go +++ b/node/execution/intrinsics/token/application/token_handle_prover_pause.go @@ -25,7 +25,7 @@ func (a *TokenApplication) handleDataAnnounceProverPause( t.PublicKeySignatureEd448.Signature == nil || t.PublicKeySignatureEd448.PublicKey.KeyValue == nil || t.Filter == nil || len(t.Filter) != 32 || - t.FrameNumber < currentFrameNumber-1 || t.FrameNumber > currentFrameNumber { + t.FrameNumber > currentFrameNumber { return nil, errors.Wrap(ErrInvalidStateTransition, "handle pause") } if _, touched := lockMap[string( diff --git a/node/execution/intrinsics/token/application/token_handle_prover_resume.go b/node/execution/intrinsics/token/application/token_handle_prover_resume.go index a3f53f0..21ea55d 100644 --- a/node/execution/intrinsics/token/application/token_handle_prover_resume.go +++ b/node/execution/intrinsics/token/application/token_handle_prover_resume.go @@ -25,7 +25,7 @@ func (a *TokenApplication) handleDataAnnounceProverResume( t.PublicKeySignatureEd448.Signature == nil || t.PublicKeySignatureEd448.PublicKey.KeyValue == nil || t.Filter == nil || len(t.Filter) != 32 || - t.FrameNumber < currentFrameNumber-1 || t.FrameNumber > currentFrameNumber { + t.FrameNumber > currentFrameNumber { return nil, errors.Wrap(ErrInvalidStateTransition, "handle resume") } diff --git a/node/p2p/blossomsub.go b/node/p2p/blossomsub.go index 1e4c637..4d03cc6 100644 --- a/node/p2p/blossomsub.go +++ b/node/p2p/blossomsub.go @@ -317,13 +317,16 @@ func NewBlossomSub( util.Advertise(ctx, routingDiscovery, getNetworkNamespace(p2pConfig.Network)) verifyReachability(p2pConfig) - + minBootstraps := minBootstrapPeers + if p2pConfig.Network != 0 { + minBootstraps = 1 + } bootstrap := internal.NewPeerConnector( ctx, logger.Named("bootstrap"), h, idService, - minBootstrapPeers, + minBootstraps, bootstrapParallelism, internal.NewStaticPeerSource(bootstrappers, true), ) @@ -334,7 +337,7 @@ func NewBlossomSub( ctx, internal.NewNotEnoughPeersCondition( h, - minBootstrapPeers, + minBootstraps, internal.PeerAddrInfosToPeerIDMap(bootstrappers), ), bootstrap,