MWEB Light Client

chain/chainservice.go

@@ -5,6 +5,7 @@ import (
 	"github.com/ltcsuite/ltcd/chaincfg/chainhash"
 	"github.com/ltcsuite/ltcd/ltcutil"
 	"github.com/ltcsuite/ltcd/ltcutil/gcs"
+	"github.com/ltcsuite/ltcd/ltcutil/mweb"
 	"github.com/ltcsuite/ltcd/wire"
 	"github.com/ltcsuite/neutrino"
 	"github.com/ltcsuite/neutrino/banman"
@@ -22,6 +23,7 @@ type NeutrinoChainService interface {
 	GetBlockHeader(*chainhash.Hash) (*wire.BlockHeader, error)
 	IsCurrent() bool
 	SendTransaction(*wire.MsgTx) error
+	MarkAsConfirmed(chainhash.Hash)
 	GetCFilter(chainhash.Hash, wire.FilterType,
 		...neutrino.QueryOption) (*gcs.Filter, error)
 	GetUtxo(...neutrino.RescanOption) (*neutrino.SpendReport, error)
@@ -31,6 +33,11 @@ type NeutrinoChainService interface {
 	AddBytesSent(uint64)
 	AddBytesReceived(uint64)
 	NetTotals() (uint64, uint64)
+	RegisterMempoolCallback(func(*ltcutil.Tx))
+	NotifyMempoolReceived([]ltcutil.Address)
+	RegisterMwebUtxosCallback(func(*mweb.Leafset, []*wire.MwebNetUtxo))
+	NotifyAddedMwebUtxos(*mweb.Leafset) error
+	MwebUtxoExists(*chainhash.Hash) bool
 	UpdatePeerHeights(*chainhash.Hash, int32, *neutrino.ServerPeer)
 	ChainParams() chaincfg.Params
 	Stop() error

chain/interface.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/ltcsuite/ltcd/chaincfg/chainhash"
 	"github.com/ltcsuite/ltcd/ltcutil"
+	"github.com/ltcsuite/ltcd/ltcutil/mweb"
 	"github.com/ltcsuite/ltcd/rpcclient"
 	"github.com/ltcsuite/ltcd/wire"
 	"github.com/ltcsuite/ltcwallet/waddrmgr"
@@ -108,6 +109,12 @@ type (
 		Block    *wtxmgr.BlockMeta // nil if unmined
 	}
 
+	// MwebUtxos is a notification of new MWEB utxos.
+	MwebUtxos struct {
+		Leafset *mweb.Leafset
+		Utxos   []*wire.MwebNetUtxo
+	}
+
 	// RescanProgress is a notification describing the current status
 	// of an in-progress rescan.
 	RescanProgress struct {

chain/mocks_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/ltcsuite/ltcd/chaincfg/chainhash"
 	"github.com/ltcsuite/ltcd/ltcutil"
 	"github.com/ltcsuite/ltcd/ltcutil/gcs"
+	"github.com/ltcsuite/ltcd/ltcutil/mweb"
 	"github.com/ltcsuite/ltcd/rpcclient"
 	"github.com/ltcsuite/ltcd/wire"
 	"github.com/ltcsuite/neutrino"
@@ -104,6 +105,10 @@ func (m *mockChainService) SendTransaction(*wire.MsgTx) error {
 	return errNotImplemented
 }
 
+func (m *mockChainService) MarkAsConfirmed(chainhash.Hash) {
+	panic(errNotImplemented)
+}
+
 func (m *mockChainService) GetCFilter(chainhash.Hash,
 	wire.FilterType, ...neutrino.QueryOption) (*gcs.Filter, error) {
 
@@ -140,6 +145,24 @@ func (m *mockChainService) NetTotals() (uint64, uint64) {
 	panic(errNotImplemented)
 }
 
+func (m *mockChainService) RegisterMempoolCallback(func(*ltcutil.Tx)) {
+}
+
+func (m *mockChainService) NotifyMempoolReceived([]ltcutil.Address) {
+}
+
+func (m *mockChainService) RegisterMwebUtxosCallback(
+	func(*mweb.Leafset, []*wire.MwebNetUtxo)) {
+}
+
+func (m *mockChainService) NotifyAddedMwebUtxos(*mweb.Leafset) error {
+	return errNotImplemented
+}
+
+func (m *mockChainService) MwebUtxoExists(*chainhash.Hash) bool {
+	panic(errNotImplemented)
+}
+
 func (m *mockChainService) UpdatePeerHeights(*chainhash.Hash,
 	int32, *neutrino.ServerPeer,
 ) {

chain/neutrino.go

@@ -9,8 +9,8 @@ import (
 	"github.com/ltcsuite/ltcd/chaincfg"
 	"github.com/ltcsuite/ltcd/chaincfg/chainhash"
 	"github.com/ltcsuite/ltcd/ltcutil"
-	"github.com/ltcsuite/ltcd/ltcutil/gcs"
 	"github.com/ltcsuite/ltcd/ltcutil/gcs/builder"
+	"github.com/ltcsuite/ltcd/ltcutil/mweb"
 	"github.com/ltcsuite/ltcd/rpcclient"
 	"github.com/ltcsuite/ltcd/txscript"
 	"github.com/ltcsuite/ltcd/wire"
@@ -241,12 +241,8 @@ func (s *NeutrinoClient) FilterBlocks(
 	// the filter returns a positive match, the full block is then requested
 	// and scanned for addresses using the block filterer.
 	for i, blk := range req.Blocks {
-		// TODO(wilmer): Investigate why polling it still necessary
-		// here. While testing, I ran into a few instances where the
-		// filter was not retrieved, leading to a panic. This should not
-		// happen in most cases thanks to the query logic revamp within
-		// Neutrino, but it seems there's still an uncovered edge case.
-		filter, err := s.pollCFilter(&blk.Hash)
+		filter, err := s.CS.GetCFilter(blk.Hash,
+			wire.GCSFilterRegular, neutrino.OptimisticBatch())
 		if err != nil {
 			return nil, err
 		}
@@ -343,36 +339,6 @@ func buildFilterBlocksWatchList(req *FilterBlocksRequest) ([][]byte, error) {
 	return watchList, nil
 }
 
-// pollCFilter attempts to fetch a CFilter from the neutrino client. This is
-// used to get around the fact that the filter headers may lag behind the
-// highest known block header.
-func (s *NeutrinoClient) pollCFilter(hash *chainhash.Hash) (*gcs.Filter, error) {
-	var (
-		filter *gcs.Filter
-		err    error
-		count  int
-	)
-
-	const maxFilterRetries = 50
-	for count < maxFilterRetries {
-		if count > 0 {
-			time.Sleep(100 * time.Millisecond)
-		}
-
-		filter, err = s.CS.GetCFilter(
-			*hash, wire.GCSFilterRegular, neutrino.OptimisticBatch(),
-		)
-		if err != nil {
-			count++
-			continue
-		}
-
-		return filter, nil
-	}
-
-	return nil, err
-}
-
 // Rescan replicates the RPC client's Rescan command.
 func (s *NeutrinoClient) Rescan(startHash *chainhash.Hash, addrs []ltcutil.Address,
 	outPoints map[wire.OutPoint]ltcutil.Address) error {
@@ -382,6 +348,9 @@ func (s *NeutrinoClient) Rescan(startHash *chainhash.Hash, addrs []ltcutil.Addre
 	defer s.rescanMtx.Unlock()
 
 	s.clientMtx.Lock()
+
+	s.CS.NotifyMempoolReceived(addrs)
+
 	if !s.started {
 		s.clientMtx.Unlock()
 		return fmt.Errorf("can't do a rescan when the chain client " +
@@ -477,6 +446,10 @@ func (s *NeutrinoClient) Rescan(startHash *chainhash.Hash, addrs []ltcutil.Addre
 // NotifyBlocks replicates the RPC client's NotifyBlocks command.
 func (s *NeutrinoClient) NotifyBlocks() error {
 	s.clientMtx.Lock()
+
+	s.CS.RegisterMempoolCallback(s.onRecvTx)
+	s.CS.RegisterMwebUtxosCallback(s.onMwebUtxos)
+
 	// If we're scanning, we're already notifying on blocks. Otherwise,
 	// start a rescan without watching any addresses.
 	if !s.scanning {
@@ -495,6 +468,8 @@ func (s *NeutrinoClient) NotifyReceived(addrs []ltcutil.Address) error {
 
 	s.clientMtx.Lock()
 
+	s.CS.NotifyMempoolReceived(addrs)
+
 	// If we have a rescan running, we just need to add the appropriate
 	// addresses to the watch list.
 	if s.scanning {
@@ -797,3 +772,25 @@ out:
 	close(s.dequeueNotification)
 	s.wg.Done()
 }
+
+func (s *NeutrinoClient) onRecvTx(tx *ltcutil.Tx) {
+	rec, err := wtxmgr.NewTxRecordFromMsgTx(tx.MsgTx(), time.Now())
+	if err != nil {
+		log.Errorf("Cannot create transaction record for relevant "+
+			"tx: %v", err)
+		return
+	}
+	select {
+	case s.enqueueNotification <- RelevantTx{rec, nil}:
+	case <-s.quit:
+	}
+}
+
+func (s *NeutrinoClient) onMwebUtxos(
+	leafset *mweb.Leafset, utxos []*wire.MwebNetUtxo) {
+
+	select {
+	case s.enqueueNotification <- MwebUtxos{leafset, utxos}:
+	case <-s.quit:
+	}
+}

cmd/sweepaccount/main.go

@@ -18,6 +18,7 @@ import (
 	"github.com/ltcsuite/ltcd/wire"
 	"github.com/ltcsuite/ltcwallet/internal/cfgutil"
 	"github.com/ltcsuite/ltcwallet/netparams"
+	"github.com/ltcsuite/ltcwallet/waddrmgr"
 	"github.com/ltcsuite/ltcwallet/wallet/txauthor"
 	"github.com/ltcsuite/ltcwallet/wallet/txrules"
 	"github.com/ltcsuite/ltcwallet/wallet/txsizes"
@@ -181,8 +182,9 @@ func makeInputSource(outputs []btcjson.ListUnspentResult) txauthor.InputSource {
 		sourceErr = noInputValue{}
 	}
 
-	return func(ltcutil.Amount) (ltcutil.Amount, []*wire.TxIn, []ltcutil.Amount, [][]byte, error) {
-		return totalInputValue, inputs, inputValues, nil, sourceErr
+	return func(ltcutil.Amount) (ltcutil.Amount, []*wire.TxIn,
+		[]ltcutil.Amount, [][]byte, []*wire.MwebOutput, error) {
+		return totalInputValue, inputs, inputValues, nil, nil, sourceErr
 	}
 }
 
@@ -193,7 +195,7 @@ func makeDestinationScriptSource(rpcClient *rpcclient.Client, accountName string
 
 	// GetNewAddress always returns a P2PKH address since it assumes
 	// BIP-0044.
-	newChangeScript := func() ([]byte, error) {
+	newChangeScript := func(*waddrmgr.KeyScope) ([]byte, error) {
 		destinationAddress, err := rpcClient.GetNewAddress(accountName)
 		if err != nil {
 			return nil, err

go.mod

@@ -5,69 +5,30 @@ require (
 	github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
 	github.com/davecgh/go-spew v1.1.1
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1
-	github.com/jessevdk/go-flags v1.4.0
+	github.com/jessevdk/go-flags v1.5.0
 	github.com/jrick/logrotate v1.0.0
 	github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf
-	github.com/ltcsuite/lnd/ticker v1.1.0
-	github.com/ltcsuite/lnd/tlv v1.1.1
-	github.com/ltcsuite/ltcd v0.23.5
-	github.com/ltcsuite/ltcd/btcec/v2 v2.3.2
-	github.com/ltcsuite/ltcd/chaincfg/chainhash v1.0.2
-	github.com/ltcsuite/ltcd/ltcutil v1.1.3
-	github.com/ltcsuite/ltcd/ltcutil/psbt v1.1.8
-	github.com/ltcsuite/ltcwallet/wallet/txauthor v1.3.2
-	github.com/ltcsuite/ltcwallet/wallet/txrules v1.2.0
-	github.com/ltcsuite/ltcwallet/wallet/txsizes v1.2.3
-	github.com/ltcsuite/ltcwallet/walletdb v1.4.0
-	github.com/ltcsuite/ltcwallet/wtxmgr v1.5.0
-	github.com/ltcsuite/neutrino v0.16.0
-	github.com/ltcsuite/neutrino/cache v1.1.1
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.3
 	golang.org/x/crypto v0.7.0
 	golang.org/x/net v0.10.0
 	golang.org/x/term v0.8.0
-	google.golang.org/grpc v1.53.0
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/grpc v1.56.3
+	google.golang.org/protobuf v1.30.0
+	lukechampine.com/blake3 v1.2.1
 )
 
 require (
-	github.com/aead/siphash v1.0.1 // indirect
-	github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
-	github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
-	github.com/decred/dcrd/lru v1.1.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/kkdai/bstream v1.0.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
-	github.com/ltcsuite/lnd/clock v1.1.0 // indirect
-	github.com/ltcsuite/lnd/queue v1.1.0 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	go.etcd.io/bbolt v1.3.7 // indirect
-	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	lukechampine.com/blake3 v1.2.1 // indirect
 )
 
 go 1.18
-
-replace github.com/ltcsuite/ltcwallet/walletdb => ./walletdb
-
-replace github.com/ltcsuite/neutrino => ../neutrino
-
-replace github.com/ltcsuite/neutrino/cache => ../neutrino/cache
-
-replace github.com/ltcsuite/lnd/tlv => ../lnd/tlv
-
-replace github.com/ltcsuite/ltcd/ltcutil/psbt => ../ltcd/ltcutil/psbt
-
-replace github.com/ltcsuite/ltcwallet/wallet/txauthor => ./wallet/txauthor
-
-replace github.com/ltcsuite/ltcwallet/wallet/txsizes => ./wallet/txsizes
-
-// loshy temp:
-
-replace github.com/ltcsuite/ltcd => ../ltcd
-
-replace github.com/ltcsuite/ltcd/chaincfg/chainhash => ../ltcd/chaincfg/chainhash