Revert "Correctly process confirmations"

This reverts commit 1b9bc4450c.

VERSION

@@ -1 +1 @@
-0.91.1
+0.91.2

eth-node/types/envelopes.go

@@ -28,7 +28,7 @@ const (
 	// And event, ideally, should contain information about peer that sent envelope to us.
 	EventEnvelopeReceived EventType = "envelope.received"
 	// EventBatchAcknowledged is sent when batch of envelopes was acknowledged by a peer.
-	EventBatchAcknowledged EventType = "batch.acknowledged"
+	EventBatchAcknowledged EventType = "batch.acknowleged"
 	// EventEnvelopeAvailable fires when envelop is available for filters
 	EventEnvelopeAvailable EventType = "envelope.available"
 	// EventMailServerRequestSent fires when such request is sent.

protocol/transport/envelopes_monitor.go

@@ -25,7 +25,7 @@ const (
 type EnvelopesMonitorConfig struct {
 	EnvelopeEventsHandler          EnvelopeEventsHandler
 	MaxAttempts                    int
-	AwaitOnlyMailServerConfirmations bool
+	MailserverConfirmationsEnabled bool
 	IsMailserver                   func(types.EnodeID) bool
 	Logger                         *zap.Logger
 }
@@ -55,7 +55,7 @@ func NewEnvelopesMonitor(w types.Waku, config EnvelopesMonitorConfig) *Envelopes
 		w:                      w,
 		api:                    api,
 		handler:                config.EnvelopeEventsHandler,
-		awaitOnlyMailServerConfirmations: config.AwaitOnlyMailServerConfirmations,
+		mailServerConfirmation: config.MailserverConfirmationsEnabled,
 		maxAttempts:            config.MaxAttempts,
 		isMailserver:           config.IsMailserver,
 		logger:                 logger.With(zap.Namespace("EnvelopesMonitor")),
@@ -76,6 +76,7 @@ type EnvelopesMonitor struct {
 	w                      types.Waku
 	api                    types.PublicWakuAPI
 	handler                EnvelopeEventsHandler
+	mailServerConfirmation bool
 	maxAttempts            int
 
 	mu        sync.Mutex
@@ -86,8 +87,6 @@ type EnvelopesMonitor struct {
 	attempts    map[types.Hash]int
 	identifiers map[types.Hash][][]byte
 
-	awaitOnlyMailServerConfirmations bool
-
 	wg           sync.WaitGroup
 	quit         chan struct{}
 	isMailserver func(peer types.EnodeID) bool
@@ -165,7 +164,7 @@ func (m *EnvelopesMonitor) handleEvent(event types.EnvelopeEvent) {
 
 func (m *EnvelopesMonitor) handleEventEnvelopeSent(event types.EnvelopeEvent) {
 	// Mailserver confirmations for WakuV2 are disabled
-	if (m.w == nil || m.w.Version() < 2) && m.awaitOnlyMailServerConfirmations {
+	if (m.w == nil || m.w.Version() < 2) && m.mailServerConfirmation {
 		if !m.isMailserver(event.Peer) {
 			return
 		}
@@ -182,21 +181,26 @@ func (m *EnvelopesMonitor) handleEventEnvelopeSent(event types.EnvelopeEvent) {
 		return
 	}
 	m.logger.Debug("envelope is sent", zap.String("hash", event.Hash.String()), zap.String("peer", event.Peer.String()))
-	confirmationExpected := event.Batch != (types.Hash{})
-	if confirmationExpected {
+	if event.Batch != (types.Hash{}) {
 		if _, ok := m.batches[event.Batch]; !ok {
 			m.batches[event.Batch] = map[types.Hash]struct{}{}
 		}
 		m.batches[event.Batch][event.Hash] = struct{}{}
 		m.logger.Debug("waiting for a confirmation", zap.String("batch", event.Batch.String()))
+	} else {
+		m.envelopes[event.Hash] = EnvelopeSent
+		if m.handler != nil {
+			m.handler.EnvelopeSent(m.identifiers[event.Hash])
+		}
 	}
 }
 
 func (m *EnvelopesMonitor) handleAcknowledgedBatch(event types.EnvelopeEvent) {
-
-	if m.awaitOnlyMailServerConfirmations && !m.isMailserver(event.Peer) {
+	if m.mailServerConfirmation {
+		if !m.isMailserver(event.Peer) {
 			return
 		}
+	}
 
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -287,9 +291,11 @@ func (m *EnvelopesMonitor) handleEnvelopeFailure(hash types.Hash, err error) {
 }
 
 func (m *EnvelopesMonitor) handleEventEnvelopeReceived(event types.EnvelopeEvent) {
-	if m.awaitOnlyMailServerConfirmations && !m.isMailserver(event.Peer) {
+	if m.mailServerConfirmation {
+		if !m.isMailserver(event.Peer) {
 			return
 		}
+	}
 	m.mu.Lock()
 	defer m.mu.Unlock()
 	state, ok := m.envelopes[event.Hash]

protocol/transport/envelopes_monitor_test.go

@@ -34,14 +34,14 @@ func (s *EnvelopesMonitorSuite) SetupTest() {
 		EnvelopesMonitorConfig{
 			EnvelopeEventsHandler:          nil,
 			MaxAttempts:                    0,
-			AwaitOnlyMailServerConfirmations: false,
+			MailserverConfirmationsEnabled: false,
 			IsMailserver:                   func(types.EnodeID) bool { return false },
 			Logger:                         zap.NewNop(),
 		},
 	)
 }
 
-func (s *EnvelopesMonitorSuite) TestEnvelopePosted() {
+func (s *EnvelopesMonitorSuite) TestConfirmed() {
 	s.monitor.Add(testIDs, testHash, types.NewMessage{})
 	s.Contains(s.monitor.envelopes, testHash)
 	s.Equal(EnvelopePosted, s.monitor.envelopes[testHash])
@@ -50,7 +50,7 @@ func (s *EnvelopesMonitorSuite) TestEnvelopePosted() {
 		Hash:  testHash,
 	})
 	s.Contains(s.monitor.envelopes, testHash)
-	s.Equal(EnvelopePosted, s.monitor.envelopes[testHash])
+	s.Equal(EnvelopeSent, s.monitor.envelopes[testHash])
 }
 
 func (s *EnvelopesMonitorSuite) TestConfirmedWithAcknowledge() {
@@ -96,7 +96,7 @@ func (s *EnvelopesMonitorSuite) TestRemoved() {
 
 func (s *EnvelopesMonitorSuite) TestIgnoreNotFromMailserver() {
 	// enables filter in the tracker to drop confirmations from non-mailserver peers
-	s.monitor.awaitOnlyMailServerConfirmations = true
+	s.monitor.mailServerConfirmation = true
 	s.monitor.Add(testIDs, testHash, types.NewMessage{})
 	s.monitor.handleEvent(types.EnvelopeEvent{
 		Event: types.EventEnvelopeSent,

services/ext/service.go

@@ -126,7 +126,7 @@ func (s *Service) InitProtocol(nodeName string, identity *ecdsa.PrivateKey, db *
 
 	envelopesMonitorConfig := &transport.EnvelopesMonitorConfig{
 		MaxAttempts:                    s.config.MaxMessageDeliveryAttempts,
-		AwaitOnlyMailServerConfirmations: s.config.MailServerConfirmations,
+		MailserverConfirmationsEnabled: s.config.MailServerConfirmations,
 		IsMailserver: func(peer types.EnodeID) bool {
 			return s.peerStore.Exist(peer)
 		},