Merge pull request #601 from sputn1ck/expose_l402_id

lightninglabs · Jun 22, 2023 · 32d48d3 · 32d48d3
2 parents eaad220 + ca032b1
commit 32d48d3
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 10 deletions.
diff --git a/cmd/loop/lsat.go b/cmd/loop/lsat.go
@@ -1,13 +1,11 @@
 package main
 
 import (
-	"bytes"
 	"context"
 	"encoding/hex"
 	"fmt"
 	"time"
 
-	"github.com/lightninglabs/aperture/lsat"
 	"github.com/lightninglabs/loop/looprpc"
 	"github.com/urfave/cli"
 	"gopkg.in/macaroon.v2"
@@ -55,13 +53,9 @@ func listAuth(ctx *cli.Context) error {
 			return fmt.Errorf("unable to unmarshal macaroon: %v",
 				err)
 		}
-		id, err := lsat.DecodeIdentifier(bytes.NewReader(mac.Id()))
-		if err != nil {
-			return fmt.Errorf("unable to decode macaroon ID: %v",
-				err)
-		}
+
 		tokens[i] = &printableToken{
-			ID:              hex.EncodeToString(id.TokenID[:]),
+			ID:              t.Id,
 			ValidUntil:      "",
 			BaseMacaroon:    hex.EncodeToString(t.BaseMacaroon),
 			PaymentHash:     hex.EncodeToString(t.PaymentHash),

diff --git a/loopd/swapclient_server.go b/loopd/swapclient_server.go
@@ -1,6 +1,7 @@
 package loopd
 
 import (
+	"bytes"
 	"context"
 	"encoding/hex"
 	"errors"
@@ -12,6 +13,7 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/lightninglabs/aperture/lsat"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/labels"
@@ -723,6 +725,13 @@ func (s *swapClientServer) GetLsatTokens(ctx context.Context,
 		if err != nil {
 			return nil, err
 		}
+
+		id, err := lsat.DecodeIdentifier(
+			bytes.NewReader(token.BaseMacaroon().Id()),
+		)
+		if err != nil {
+			return nil, err
+		}
 		rpcTokens[idx] = &clientrpc.LsatToken{
 			BaseMacaroon:       macBytes,
 			PaymentHash:        token.PaymentHash[:],
@@ -732,6 +741,9 @@ func (s *swapClientServer) GetLsatTokens(ctx context.Context,
 			TimeCreated:        token.TimeCreated.Unix(),
 			Expired:            !token.IsValid(),
 			StorageName:        key,
+			Id: hex.EncodeToString(
+				id.TokenID[:],
+			),
 		}
 		idx++
 	}

diff --git a/looprpc/client.pb.go b/looprpc/client.pb.go
diff --git a/looprpc/client.proto b/looprpc/client.proto
@@ -743,6 +743,11 @@ message LsatToken {
     file name of the token where it's stored on the file system.
     */
     string storage_name = 8;
+
+    /*
+    The l402 ID of the token.
+    */
+    string id = 9;
 }
 
 message LoopStats {

diff --git a/looprpc/client.swagger.json b/looprpc/client.swagger.json
@@ -1017,6 +1017,10 @@
         "storage_name": {
           "type": "string",
           "description": "Identifying attribute of this token in the store. Currently represents the\nfile name of the token where it's stored on the file system."
+        },
+        "id": {
+          "type": "string",
+          "description": "The l402 Id of the token."
         }
       }
     },