Merge pull request #926 from starius/fix-protos

starius · web-flow · commit d55b4ab1aa45 · 2025-04-24T11:34:57.000-03:00
looprpc: fix several minor bugs
diff --git a/Makefile b/Makefile
@@ -76,7 +76,7 @@ rpc:
 
 rpc-check: rpc
 	@$(call print, "Verifying protos.")
-	if test -n "$$(git describe --dirty | grep dirty)"; then echo "Protos not properly formatted or not compiled with correct version!"; git status; git diff; exit 1; fi
+	if test -n "$$(git status --porcelain)"; then echo "Protos not properly formatted or not compiled with correct version!"; git status; git diff; exit 1; fi
 
 rpc-js-compile:
 	@$(call print, "Compiling JSON/WASM stubs.")
@@ -135,8 +135,11 @@ mod-tidy:
 
 mod-check:
 	@$(call print, "Checking modules.")
-	$(GOMOD) tidy
-	if test -n "$$(git status | grep -e "go.mod\|go.sum")"; then echo "Running go mod tidy changes go.mod/go.sum"; git status; git diff; exit 1; fi
+	GOPROXY=direct $(GOMOD) tidy
+	cd swapserverrpc/ && GOPROXY=direct $(GOMOD) tidy
+	cd looprpc/ && GOPROXY=direct $(GOMOD) tidy
+	cd tools/ && GOPROXY=direct $(GOMOD) tidy
+	if test -n "$$(git status --porcelain)"; then echo "Running go mod tidy changes go.mod/go.sum"; git status; git diff; exit 1; fi
 
 sqlc:
 	@$(call print, "Generating sql models and queries in Go")
diff --git a/go.mod b/go.mod
@@ -21,9 +21,8 @@ require (
 	github.com/lightninglabs/aperture v0.3.8-beta
 	github.com/lightninglabs/lndclient v0.19.0-2
 	github.com/lightninglabs/loop/looprpc v1.0.0
-	github.com/lightninglabs/loop/swapserverrpc v1.0.11
-	// TODO(guggero): Update this to a commit in master.
-	github.com/lightninglabs/taproot-assets v0.5.2-0.20250306114727-f0691d155619
+	github.com/lightninglabs/loop/swapserverrpc v1.0.13
+	github.com/lightninglabs/taproot-assets v0.5.2-0.20250311211321-3793cf066af7
 	github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20250304192711-9feb761b4ec4
 	github.com/lightningnetwork/lnd/cert v1.2.2
 	github.com/lightningnetwork/lnd/clock v1.1.1
diff --git a/go.sum b/go.sum
@@ -1139,8 +1139,8 @@ github.com/lightninglabs/neutrino/cache v1.1.2 h1:C9DY/DAPaPxbFC+xNNEI/z1SJY9GS3
 github.com/lightninglabs/neutrino/cache v1.1.2/go.mod h1:XJNcgdOw1LQnanGjw8Vj44CvguYA25IMKjWFZczwZuo=
 github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
 github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
-github.com/lightninglabs/taproot-assets v0.5.2-0.20250306114727-f0691d155619 h1:GrWJ7yA8YQuh6wf98qA8TF9jkOvH0D9tdM9tSxpFnnc=
-github.com/lightninglabs/taproot-assets v0.5.2-0.20250306114727-f0691d155619/go.mod h1:+EoY8qorrcrutZeX9S5lqI76CbPewbM2B6P2O2gEZL4=
+github.com/lightninglabs/taproot-assets v0.5.2-0.20250311211321-3793cf066af7 h1:CGOClQ1aEXe2W1ZTaEZr8LUBtD6HaBYc6ZydvTY8A4M=
+github.com/lightninglabs/taproot-assets v0.5.2-0.20250311211321-3793cf066af7/go.mod h1:+EoY8qorrcrutZeX9S5lqI76CbPewbM2B6P2O2gEZL4=
 github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
 github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
 github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20250304192711-9feb761b4ec4 h1:3UfT25sO71q3V7RSb/wE0ruiwk3ex30h7ZvPZ0O2Z80=
diff --git a/loopd/swapclient_server.go b/loopd/swapclient_server.go
@@ -1580,7 +1580,7 @@ func (s *swapClientServer) WithdrawDeposits(ctx context.Context,
 		}
 	}
 
-	txhash, pkScript, err := s.withdrawalManager.DeliverWithdrawalRequest(
+	txhash, address, err := s.withdrawalManager.DeliverWithdrawalRequest(
 		ctx, outpoints, req.DestAddr, req.SatPerVbyte, req.Amount,
 	)
 	if err != nil {
@@ -1589,7 +1589,7 @@ func (s *swapClientServer) WithdrawDeposits(ctx context.Context,
 
 	return &looprpc.WithdrawDepositsResponse{
 		WithdrawalTxHash: txhash,
-		PkScript:         pkScript,
+		Address:          address,
 	}, err
 }
 
diff --git a/looprpc/client.pb.go b/looprpc/client.pb.go
diff --git a/looprpc/client.proto b/looprpc/client.proto
@@ -1678,9 +1678,9 @@ message WithdrawDepositsResponse {
     string withdrawal_tx_hash = 1;
 
     /*
-    The pkscript of the withdrawal transaction.
+    The destination address of the withdrawal transaction.
     */
-    string pk_script = 2;
+    string address = 2;
 }
 
 message OutPoint {
diff --git a/looprpc/client.swagger.json b/looprpc/client.swagger.json
@@ -1440,7 +1440,7 @@
         "next_start_time": {
           "type": "string",
           "format": "int64",
-          "description": "Timestamp of the last swap returned."
+          "description": "Timestamp to use for paging start_timestamp_ns."
         }
       }
     },
@@ -2132,9 +2132,9 @@
           "type": "string",
           "description": "The transaction hash of the withdrawal transaction."
         },
-        "pk_script": {
+        "address": {
           "type": "string",
-          "description": "The pkscript of the withdrawal transaction."
+          "description": "The destination address of the withdrawal transaction."
         }
       }
     },
diff --git a/looprpc/go.mod b/looprpc/go.mod
@@ -6,7 +6,7 @@ toolchain go1.23.7
 
 require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
-	github.com/lightninglabs/loop/swapserverrpc v1.0.11
+	github.com/lightninglabs/loop/swapserverrpc v1.0.13
 	google.golang.org/grpc v1.64.1
 	google.golang.org/protobuf v1.34.2
 )
diff --git a/looprpc/go.sum b/looprpc/go.sum
@@ -793,8 +793,8 @@ github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NB
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lightninglabs/loop/swapserverrpc v1.0.11 h1:R/8c/bo4rpqm5/cfi944rj24oQUlZu+xXjzMhEDSkrc=
-github.com/lightninglabs/loop/swapserverrpc v1.0.11/go.mod h1:Ml3gMwe/iTRLvu1QGGZzXcr0DYSa9sJGwKPktLaWtwE=
+github.com/lightninglabs/loop/swapserverrpc v1.0.13 h1:Qf4L8QBJKzhKRcC8dpvfrrBEXJMF3+XbpomAHEJsRDY=
+github.com/lightninglabs/loop/swapserverrpc v1.0.13/go.mod h1:Ml3gMwe/iTRLvu1QGGZzXcr0DYSa9sJGwKPktLaWtwE=
 github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
diff --git a/staticaddr/loopin/actions.go b/staticaddr/loopin/actions.go
@@ -19,7 +19,7 @@ import (
 	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/staticaddr/version"
 	"github.com/lightninglabs/loop/swap"
-	looprpc "github.com/lightninglabs/loop/swapserverrpc"
+	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/invoices"
@@ -117,7 +117,7 @@ func (f *FSM) InitHtlcAction(ctx context.Context,
 		version.CurrentRPCProtocolVersion(),
 	)
 
-	loopInReq := &looprpc.ServerStaticAddressLoopInRequest{
+	loopInReq := &swapserverrpc.ServerStaticAddressLoopInRequest{
 		SwapHash:              f.loopIn.SwapHash[:],
 		DepositOutpoints:      f.loopIn.DepositOutpoints,
 		HtlcClientPubKey:      f.loopIn.ClientPubkey.SerializeCompressed(),
@@ -144,7 +144,7 @@ func (f *FSM) InitHtlcAction(ctx context.Context,
 	// attempt.
 	pushEmptySigs := func() {
 		_, err = f.cfg.Server.PushStaticAddressHtlcSigs(
-			ctx, &looprpc.PushStaticAddressHtlcSigsRequest{
+			ctx, &swapserverrpc.PushStaticAddressHtlcSigsRequest{
 				SwapHash: f.loopIn.SwapHash[:],
 			},
 		)
@@ -382,17 +382,17 @@ func (f *FSM) SignHtlcTxAction(ctx context.Context,
 	}
 
 	// Push htlc tx sigs to server.
-	pushHtlcReq := &looprpc.PushStaticAddressHtlcSigsRequest{
+	pushHtlcReq := &swapserverrpc.PushStaticAddressHtlcSigsRequest{
 		SwapHash: f.loopIn.SwapHash[:],
-		StandardHtlcInfo: &looprpc.ClientHtlcSigningInfo{
+		StandardHtlcInfo: &swapserverrpc.ClientHtlcSigningInfo{
 			Nonces: clientHtlcNonces,
 			Sigs:   htlcSigs,
 		},
-		HighFeeHtlcInfo: &looprpc.ClientHtlcSigningInfo{
+		HighFeeHtlcInfo: &swapserverrpc.ClientHtlcSigningInfo{
 			Nonces: highFeeNonces,
 			Sigs:   htlcSigsHighFee,
 		},
-		ExtremeFeeHtlcInfo: &looprpc.ClientHtlcSigningInfo{
+		ExtremeFeeHtlcInfo: &swapserverrpc.ClientHtlcSigningInfo{
 			Nonces: extremelyHighNonces,
 			Sigs:   htlcSigsExtremelyHighFee,
 		},
diff --git a/staticaddr/loopin/manager.go b/staticaddr/loopin/manager.go
@@ -19,7 +19,6 @@ import (
 	"github.com/lightninglabs/loop/labels"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/swapserverrpc"
-	looprpc "github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/routing/route"
 )
@@ -34,7 +33,7 @@ const (
 type Config struct {
 	// Server is the client that is used to communicate with the static
 	// address server.
-	Server looprpc.StaticAddressServerClient
+	Server swapserverrpc.StaticAddressServerClient
 
 	// AddressManager gives the withdrawal manager access to static address
 	// parameters.
@@ -232,7 +231,7 @@ func (m *Manager) notifyNotFinished(ctx context.Context, swapHash lntypes.Hash,
 	txId chainhash.Hash) error {
 
 	_, err := m.cfg.Server.PushStaticAddressSweeplessSigs(
-		ctx, &looprpc.PushStaticAddressSweeplessSigsRequest{
+		ctx, &swapserverrpc.PushStaticAddressSweeplessSigsRequest{
 			SwapHash:     swapHash[:],
 			Txid:         txId[:],
 			ErrorMessage: SwapNotFinishedMsg,
@@ -332,7 +331,7 @@ func (m *Manager) handleLoopInSweepReq(ctx context.Context,
 
 	// We'll now sign for every deposit that is part of the loop-in.
 	responseMap := make(
-		map[string]*looprpc.ClientSweeplessSigningInfo,
+		map[string]*swapserverrpc.ClientSweeplessSigningInfo,
 		len(req.DepositToNonces),
 	)
 
@@ -394,16 +393,17 @@ func (m *Manager) handleLoopInSweepReq(ctx context.Context,
 			return err
 		}
 
-		responseMap[depositOutpoint] = &looprpc.ClientSweeplessSigningInfo{ //nolint:lll
+		signingInfo := &swapserverrpc.ClientSweeplessSigningInfo{
 			Nonce: musig2Session.PublicNonce[:],
 			Sig:   sig,
 		}
+		responseMap[depositOutpoint] = signingInfo
 	}
 
 	txHash := sweepTx.TxHash()
 
 	_, err = m.cfg.Server.PushStaticAddressSweeplessSigs(
-		ctx, &looprpc.PushStaticAddressSweeplessSigsRequest{
+		ctx, &swapserverrpc.PushStaticAddressSweeplessSigsRequest{
 			SwapHash:    loopIn.SwapHash[:],
 			Txid:        txHash[:],
 			SigningInfo: responseMap,
diff --git a/staticaddr/withdraw/manager.go b/staticaddr/withdraw/manager.go
@@ -83,9 +83,9 @@ type newWithdrawalRequest struct {
 // newWithdrawalResponse is used to return withdrawal info and error to the
 // server.
 type newWithdrawalResponse struct {
-	txHash             string
-	withdrawalPkScript string
-	err                error
+	txHash            string
+	withdrawalAddress string
+	err               error
 }
 
 // Manager manages the withdrawal state machines.
@@ -147,10 +147,6 @@ func (m *Manager) Run(ctx context.Context) error {
 	// initialization.
 	close(m.initChan)
 
-	var (
-		txHash   string
-		pkScript string
-	)
 	for {
 		select {
 		case <-newBlockChan:
@@ -161,7 +157,7 @@ func (m *Manager) Run(ctx context.Context) error {
 			}
 
 		case req := <-m.newWithdrawalRequestChan:
-			txHash, pkScript, err = m.WithdrawDeposits(
+			txHash, withdrawalAddress, err := m.WithdrawDeposits(
 				ctx, req.outpoints, req.destAddr,
 				req.satPerVbyte, req.amount,
 			)
@@ -173,9 +169,9 @@ func (m *Manager) Run(ctx context.Context) error {
 			// We forward the initialized loop-in and error to
 			// DeliverLoopInRequest.
 			resp := &newWithdrawalResponse{
-				txHash:             txHash,
-				withdrawalPkScript: pkScript,
-				err:                err,
+				txHash:            txHash,
+				withdrawalAddress: withdrawalAddress,
+				err:               err,
 			}
 			select {
 			case req.respChan <- resp:
@@ -956,7 +952,7 @@ func (m *Manager) DeliverWithdrawalRequest(ctx context.Context,
 	// Wait for the response from the manager run loop.
 	select {
 	case resp := <-request.respChan:
-		return resp.txHash, resp.withdrawalPkScript, resp.err
+		return resp.txHash, resp.withdrawalAddress, resp.err
 
 	case <-m.exitChan:
 		return "", "", fmt.Errorf("withdrawal manager has been " +

Original file line number	Diff line number	Diff line change
`@@ -1580,7 +1580,7 @@ func (s *swapClientServer) WithdrawDeposits(ctx context.Context,`
`1580`	`1580`	`}`
`1581`	`1581`	`}`
`1582`	`1582`
`1583`		`- txhash, pkScript, err := s.withdrawalManager.DeliverWithdrawalRequest(`
	`1583`	`+ txhash, address, err := s.withdrawalManager.DeliverWithdrawalRequest(`
`1584`	`1584`	`ctx, outpoints, req.DestAddr, req.SatPerVbyte, req.Amount,`
`1585`	`1585`	`)`
`1586`	`1586`	`if err != nil {`
`@@ -1589,7 +1589,7 @@ func (s *swapClientServer) WithdrawDeposits(ctx context.Context,`
`1589`	`1589`
`1590`	`1590`	`return &looprpc.WithdrawDepositsResponse{`
`1591`	`1591`	`WithdrawalTxHash: txhash,`
`1592`		`- PkScript: pkScript,`
	`1592`	`+ Address: address,`
`1593`	`1593`	`}, err`
`1594`	`1594`	`}`
`1595`	`1595`
Original file line number	Diff line number	Diff line change
`@@ -1440,7 +1440,7 @@`
`1440`	`1440`	`"next_start_time": {`
`1441`	`1441`	`"type": "string",`
`1442`	`1442`	`"format": "int64",`
`1443`		`- "description": "Timestamp of the last swap returned."`
	`1443`	`+ "description": "Timestamp to use for paging start_timestamp_ns."`
`1444`	`1444`	`}`
`1445`	`1445`	`}`
`1446`	`1446`	`},`
`@@ -2132,9 +2132,9 @@`
`2132`	`2132`	`"type": "string",`
`2133`	`2133`	`"description": "The transaction hash of the withdrawal transaction."`
`2134`	`2134`	`},`
`2135`		`- "pk_script": {`
	`2135`	`+ "address": {`
`2136`	`2136`	`"type": "string",`
`2137`		`- "description": "The pkscript of the withdrawal transaction."`
	`2137`	`+ "description": "The destination address of the withdrawal transaction."`
`2138`	`2138`	`}`
`2139`	`2139`	`}`
`2140`	`2140`	`},`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ toolchain go1.23.7`
`6`	`6`
`7`	`7`	`require (`
`8`	`8`	`github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3`
`9`		`- github.com/lightninglabs/loop/swapserverrpc v1.0.11`
	`9`	`+ github.com/lightninglabs/loop/swapserverrpc v1.0.13`
`10`	`10`	`google.golang.org/grpc v1.64.1`
`11`	`11`	`google.golang.org/protobuf v1.34.2`
`12`	`12`	`)`