chore!: remove waku service

closes: #6663

Author: osmaczko

api/geth_backend.go

@@ -59,21 +59,17 @@ import (
 	"github.com/status-im/status-go/rpc"
 	"github.com/status-im/status-go/server/pairing/statecontrol"
 	"github.com/status-im/status-go/services/ens"
-	"github.com/status-im/status-go/services/ext"
 	"github.com/status-im/status-go/services/personal"
 	"github.com/status-im/status-go/services/typeddata"
 	"github.com/status-im/status-go/services/wallet"
 	"github.com/status-im/status-go/services/wallet/wallettypes"
 	"github.com/status-im/status-go/signal"
 	"github.com/status-im/status-go/sqlite"
 	"github.com/status-im/status-go/transactions"
-	wakutypes "github.com/status-im/status-go/waku/types"
 	"github.com/status-im/status-go/walletdatabase"
 )
 
 var (
-	// ErrWakuIdentityInjectionFailure injecting whisper identities has failed.
-	ErrWakuIdentityInjectionFailure = errors.New("failed to inject identity into waku")
 	// ErrUnsupportedRPCMethod is for methods not supported by the RPC interface
 	ErrUnsupportedRPCMethod = errors.New("method is unsupported by RPC interface")
 	// ErrRPCClientUnavailable is returned if an RPC client can't be retrieved.
@@ -109,7 +105,6 @@ type GethStatusBackend struct {
 	transactor               *transactions.Transactor
 	connectionState          connection.State
 	appState                 AppState
-	selectedAccountKeyID     string
 	allowAllRPC              bool // used only for tests, disables api method restrictions
 	LocalPairingStateManager *statecontrol.ProcessStateManager
 	centralizedMetrics       *centralizedmetrics.MetricService
@@ -185,11 +180,6 @@ func (b *GethStatusBackend) MessageSigner() communities.MessageSigner {
 	return b.signer
 }
 
-// SelectedAccountKeyID returns a Whisper key ID of the selected chat key pair.
-func (b *GethStatusBackend) SelectedAccountKeyID() string {
-	return b.selectedAccountKeyID
-}
-
 // IsNodeRunning confirm that node is running
 func (b *GethStatusBackend) IsNodeRunning() bool {
 	return b.statusNode.IsRunning()
@@ -203,6 +193,10 @@ func (b *GethStatusBackend) StartNode(config *params.NodeConfig) error {
 		signal.SendNodeCrashed(err)
 		return err
 	}
+
+	// Set initial connection state
+	b.statusNode.ConnectionChanged(b.connectionState)
+
 	return nil
 }
 
@@ -830,9 +824,9 @@ func (b *GethStatusBackend) loginAccount(request *requests.Login) error {
 			return errors.Wrap(err, "failed to get selected chat account")
 		}
 
-		err = b.injectAccountsIntoServices()
+		err = b.initProtocol()
 		if err != nil {
-			return errors.Wrap(err, "failed to inject accounts into services")
+			return errors.Wrap(err, "failed to init protocol")
 		}
 	}
 
@@ -943,7 +937,7 @@ func (b *GethStatusBackend) startNodeWithAccount(acc multiaccounts.Account, pass
 			return err
 		}
 
-		err = b.injectAccountsIntoServices()
+		err = b.initProtocol()
 		if err != nil {
 			return err
 		}
@@ -2251,7 +2245,7 @@ func (b *GethStatusBackend) startNode(config *params.NodeConfig) (err error) {
 	// Handle a case when a node is stopped and resumed.
 	// If there is no account selected, an error is returned.
 	if _, err := b.accountsManager.SelectedChatAccount(); err == nil {
-		if err := b.injectAccountsIntoServices(); err != nil {
+		if err := b.initProtocol(); err != nil {
 			return err
 		}
 	} else if err != accsmanagement.ErrNoAccountSelected {
@@ -2608,7 +2602,6 @@ func (b *GethStatusBackend) switchToPreLoginLog() error {
 
 // cleanupServices stops parts of services that aren't managed by a node and removes injected data from services.
 func (b *GethStatusBackend) cleanupServices() error {
-	b.selectedAccountKeyID = ""
 	if b.statusNode == nil {
 		return nil
 	}
@@ -2662,7 +2655,7 @@ func (b *GethStatusBackend) SelectAccount(loginParams LoginParams) error {
 		b.account = loginParams.MultiAccount
 	}
 
-	if err := b.injectAccountsIntoServices(); err != nil {
+	if err := b.initProtocol(); err != nil {
 		return err
 	}
 
@@ -2690,7 +2683,12 @@ func (b *GethStatusBackend) LocalPairingStarted() error {
 	return accountDB.MnemonicWasShown()
 }
 
-func (b *GethStatusBackend) injectAccountsIntoWakuService(w wakutypes.WakuKeyManager, st *ext.Service) error {
+func (b *GethStatusBackend) initProtocol() error {
+	st := b.statusNode.WakuV2ExtService()
+	if st == nil {
+		return nil
+	}
+
 	chatAccount, err := b.accountsManager.SelectedChatAccount()
 	if err != nil {
 		return err
@@ -2703,23 +2701,13 @@ func (b *GethStatusBackend) injectAccountsIntoWakuService(w wakutypes.WakuKeyMan
 		return err
 	}
 
-	if err := w.DeleteKeyPairs(); err != nil { // err is not possible; method return value is incorrect
-		return err
-	}
-	b.selectedAccountKeyID, err = w.AddKeyPair(identity)
-	if err != nil {
-		return ErrWakuIdentityInjectionFailure
-	}
-
 	if st != nil {
 		if err := st.InitProtocol(b.statusNode.GethNode().Config().Name, identity, b.appDB, b.walletDB,
 			b.statusNode.HTTPServer(), b.multiaccountsDB, acc, b.accountsManager, b.statusNode.RPCClient(),
-			b.statusNode.WalletService(), b.statusNode.CommunityTokensService(), b.statusNode.WakuV2Service(),
-			logutils.ZapLogger(), b.statusNode.AccountsPublisher()); err != nil {
+			b.statusNode.WalletService(), b.statusNode.CommunityTokensService(),
+			logutils.ZapLogger(), b.statusNode.AccountsPublisher(), b.statusNode.TimeSource()); err != nil {
 			return err
 		}
-		// Set initial connection state
-		st.ConnectionChanged(b.connectionState)
 
 		messenger := st.Messenger()
 		// Init public status api
@@ -2754,19 +2742,6 @@ func (b *GethStatusBackend) KeyUID() string {
 	return ""
 }
 
-func (b *GethStatusBackend) injectAccountsIntoServices() error {
-	if b.statusNode.WakuV2Service() != nil {
-		return b.injectAccountsIntoWakuService(b.statusNode.WakuV2Service(), func() *ext.Service {
-			if b.statusNode.WakuV2ExtService() == nil {
-				return nil
-			}
-			return b.statusNode.WakuV2ExtService().Service
-		}())
-	}
-
-	return nil
-}
-
 // ExtractGroupMembershipSignatures extract signatures from tuples of content/signature
 func (b *GethStatusBackend) ExtractGroupMembershipSignatures(signaturePairs [][2]string) ([]string, error) {
 	return crypto.ExtractSignatures(signaturePairs)

node/get_status_node.go

@@ -44,7 +44,6 @@ import (
 	"github.com/status-im/status-go/services/wallet"
 	"github.com/status-im/status-go/timesource"
 	"github.com/status-im/status-go/transactions"
-	"github.com/status-im/status-go/wakuv2"
 )
 
 // errors
@@ -94,7 +93,6 @@ type StatusNode struct {
 	localNotificationsSrvc *localnotifications.Service
 	personalSrvc           *personal.Service
 	timeSourceSrvc         *timesource.NTPTimeSource
-	wakuV2Srvc             *wakuv2.Waku
 	wakuV2ExtSrvc          *wakuv2ext.Service
 	ensSrvc                *ens.Service
 	communityTokensSrvc    *communitytokens.Service
@@ -314,7 +312,6 @@ func (n *StatusNode) stop() error {
 	n.localNotificationsSrvc = nil
 	n.personalSrvc = nil
 	n.timeSourceSrvc = nil
-	n.wakuV2Srvc = nil
 	n.wakuV2ExtSrvc = nil
 	n.ensSrvc = nil
 	n.communityTokensSrvc = nil

node/geth_node.go

@@ -15,8 +15,6 @@ import (
 // Errors related to node and services creation.
 var (
 	ErrNodeMakeFailureFormat                      = "error creating p2p node: %s"
-	ErrWakuServiceRegistrationFailure             = errors.New("failed to register the Waku service")
-	ErrWakuV2ServiceRegistrationFailure           = errors.New("failed to register the WakuV2 service")
 	ErrLightEthRegistrationFailure                = errors.New("failed to register the LES service")
 	ErrLightEthRegistrationFailureUpstreamEnabled = errors.New("failed to register the LES service, upstream is also configured")
 	ErrPersonalServiceRegistrationFailure         = errors.New("failed to register the personal api service")

node/status_node_rpc_client_test.go

@@ -189,7 +189,7 @@ func TestNodeRPCPrivateClientCallPrivateService(t *testing.T) {
 		require.NoError(t, err)
 	}()
 
-	result, err := statusNode.CallPrivateRPC(`{"jsonrpc": "2.0", "id": 1, "method": "waku_info"}`)
+	result, err := statusNode.CallPrivateRPC(`{"jsonrpc": "2.0", "id": 1, "method": "wakuext_echo", "params": ["hello"]}`)
 	require.NoError(t, err)
 
 	// the call is successful

node/status_node_services.go

@@ -2,31 +2,23 @@ package node
 
 import (
 	"context"
-	"crypto/ecdsa"
 	"database/sql"
 	"encoding/json"
 	"errors"
-	"fmt"
-	"os"
 	"reflect"
 	"time"
 
 	"go.uber.org/zap"
 
 	"github.com/status-im/status-go/pkg/pubsub"
 	"github.com/status-im/status-go/server"
-	"github.com/status-im/status-go/signal"
 	"github.com/status-im/status-go/transactions"
-	"github.com/status-im/status-go/wakuv2"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/event"
 	gethrpc "github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/status-im/status-go/appmetrics"
 	"github.com/status-im/status-go/common"
-	"github.com/status-im/status-go/eth-node/crypto"
-	"github.com/status-im/status-go/logutils"
 	"github.com/status-im/status-go/multiaccounts/accounts"
 	"github.com/status-im/status-go/params"
 	accountssvc "github.com/status-im/status-go/services/accounts"
@@ -51,7 +43,6 @@ import (
 	"github.com/status-im/status-go/services/wallet"
 	"github.com/status-im/status-go/services/wallet/thirdparty"
 	"github.com/status-im/status-go/timesource"
-	wakuv2common "github.com/status-im/status-go/wakuv2/common"
 )
 
 var (
@@ -111,11 +102,6 @@ func (b *StatusNode) initServices(config *params.NodeConfig, mediaServer *server
 				config.WakuV2Config.TelemetryServerURL = telemetryServerURL
 			}
 		}
-		waku2Service, err := b.wakuV2Service(config)
-		if err != nil {
-			return err
-		}
-		services = append(services, waku2Service)
 
 		wakuext, err := b.wakuV2ExtService(config)
 		if err != nil {
@@ -166,7 +152,7 @@ func (b *StatusNode) wakuV2ExtService(config *params.NodeConfig) (*wakuv2ext.Ser
 		return nil, errors.New("geth node not initialized")
 	}
 	if b.wakuV2ExtSrvc == nil {
-		b.wakuV2ExtSrvc = wakuv2ext.New(*config, b.wakuV2Srvc, b.rpcClient)
+		b.wakuV2ExtSrvc = wakuv2ext.New(*config, b.rpcClient)
 	}
 
 	return b.wakuV2ExtSrvc, nil
@@ -198,81 +184,6 @@ func (b *StatusNode) EnsService() *ens.Service {
 func (b *StatusNode) WakuV2ExtService() *wakuv2ext.Service {
 	return b.wakuV2ExtSrvc
 }
-func (b *StatusNode) WakuV2Service() *wakuv2.Waku {
-	return b.wakuV2Srvc
-}
-
-func (b *StatusNode) wakuV2Service(nodeConfig *params.NodeConfig) (*wakuv2.Waku, error) {
-	if b.wakuV2Srvc == nil {
-		cfg := &wakuv2.Config{
-			MaxMessageSize:                         wakuv2common.DefaultMaxMessageSize,
-			Host:                                   nodeConfig.WakuV2Config.Host,
-			Port:                                   nodeConfig.WakuV2Config.Port,
-			LightClient:                            nodeConfig.WakuV2Config.LightClient,
-			WakuNodes:                              nodeConfig.ClusterConfig.WakuNodes,
-			EnableStore:                            nodeConfig.WakuV2Config.EnableStore,
-			StoreCapacity:                          nodeConfig.WakuV2Config.StoreCapacity,
-			StoreSeconds:                           nodeConfig.WakuV2Config.StoreSeconds,
-			DiscoveryLimit:                         nodeConfig.WakuV2Config.DiscoveryLimit,
-			DiscV5BootstrapNodes:                   nodeConfig.ClusterConfig.DiscV5BootstrapNodes,
-			Nameserver:                             nodeConfig.WakuV2Config.Nameserver,
-			UDPPort:                                nodeConfig.WakuV2Config.UDPPort,
-			AutoUpdate:                             nodeConfig.WakuV2Config.AutoUpdate,
-			DefaultShardPubsubTopic:                wakuv2.DefaultShardPubsubTopic(),
-			TelemetryServerURL:                     nodeConfig.WakuV2Config.TelemetryServerURL,
-			ClusterID:                              nodeConfig.ClusterConfig.ClusterID,
-			EnableMissingMessageVerification:       nodeConfig.WakuV2Config.EnableMissingMessageVerification,
-			EnableStoreConfirmationForMessagesSent: nodeConfig.WakuV2Config.EnableStoreConfirmationForMessagesSent,
-			UseThrottledPublish:                    true,
-		}
-
-		// Configure peer exchange and discv5 settings based on node type
-		if cfg.LightClient {
-			cfg.EnablePeerExchangeServer = false
-			cfg.EnablePeerExchangeClient = true
-			cfg.EnableDiscV5 = false
-		} else {
-			cfg.EnablePeerExchangeServer = true
-			cfg.EnablePeerExchangeClient = false
-			cfg.EnableDiscV5 = true
-		}
-
-		if nodeConfig.WakuV2Config.MaxMessageSize > 0 {
-			cfg.MaxMessageSize = nodeConfig.WakuV2Config.MaxMessageSize
-		}
-
-		var nodeKey *ecdsa.PrivateKey
-		var err error
-		if nodeConfig.NodeKey != "" {
-			nodeKey, err = crypto.HexToECDSA(nodeConfig.NodeKey)
-			if err != nil {
-				return nil, fmt.Errorf("could not convert nodekey into a valid private key: %v", err)
-			}
-		} else {
-			nodeKeyStr := os.Getenv("WAKUV2_NODE_KEY")
-			if nodeKeyStr != "" {
-				nodeKeyBytes, err := hexutil.Decode(nodeKeyStr)
-				if err != nil {
-					return nil, fmt.Errorf("failed to decode the go-waku private key: %v", err)
-				}
-
-				nodeKey, err = crypto.ToECDSA(nodeKeyBytes)
-				if err != nil {
-					return nil, fmt.Errorf("could not convert nodekey into a valid private key: %v", err)
-				}
-			}
-		}
-
-		w, err := wakuv2.New(nodeKey, cfg, logutils.ZapLogger(), b.appDB, b.timeSource(), signal.SendHistoricMessagesRequestFailed, signal.SendPeerStats)
-
-		if err != nil {
-			return nil, err
-		}
-		b.wakuV2Srvc = w
-	}
-
-	return b.wakuV2Srvc, nil
-}
 
 func (b *StatusNode) connectorService() *connector.Service {
 	if b.connectorSrvc == nil {
@@ -494,7 +405,7 @@ func (b *StatusNode) personalService() *personal.Service {
 	return b.personalSrvc
 }
 
-func (b *StatusNode) timeSource() *timesource.NTPTimeSource {
+func (b *StatusNode) TimeSource() *timesource.NTPTimeSource {
 
 	if b.timeSourceSrvc == nil {
 		b.timeSourceSrvc = timesource.Default()
@@ -510,7 +421,7 @@ func (b *StatusNode) timeSource() *timesource.NTPTimeSource {
 }
 
 func (b *StatusNode) timeSourceNow() func() time.Time {
-	return b.timeSource().Now
+	return b.TimeSource().Now
 }
 
 func (b *StatusNode) Cleanup() error {

protocol/messenger.go

@@ -1752,6 +1752,7 @@ func (m *Messenger) Shutdown() (err error) {
 			}
 		}
 	}
+	m.started = false
 	return
 }
 

protocol/messenger_mailserver.go

@@ -39,8 +39,9 @@ const (
 var ErrNoFiltersForChat = errors.New("no filter registered for given chat")
 
 func (m *Messenger) shouldSync() (bool, error) {
-	// TODO (pablo) support community store node as well
-	if m.messaging.GetActiveStorenode().ID == "" || !m.Online() {
+	if !m.started ||
+		m.messaging.GetActiveStorenode().ID == "" ||
+		!m.Online() {
 		return false, nil
 	}