invoice+rpc: add exit hop InvoiceAcceptor sub-systems and RPC calls

chainreg/chainregistry.go

@@ -68,6 +68,10 @@ type Config struct {
 	// leaves for certain custom channel types.
 	AuxLeafStore fn.Option[lnwallet.AuxLeafStore]
 
+	// AuxSigner is an optional signer that can be used to sign auxiliary
+	// leaves for certain custom channel types.
+	AuxSigner fn.Option[lnwallet.AuxSigner]
+
 	// BlockCache is the main cache for storing block information.
 	BlockCache *blockcache.BlockCache
 

cmd/lncli/arg_parse.go → cmd/commands/arg_parse.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"regexp"

cmd/lncli/arg_parse_test.go → cmd/commands/arg_parse_test.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"testing"

cmd/lncli/autopilotrpc_active.go → cmd/commands/autopilotrpc_active.go

@@ -1,7 +1,7 @@
 //go:build autopilotrpc
 // +build autopilotrpc
 
-package main
+package commands
 
 import (
 	"github.com/lightningnetwork/lnd/lnrpc/autopilotrpc"

cmd/lncli/autopilotrpc_default.go → cmd/commands/autopilotrpc_default.go

@@ -1,7 +1,7 @@
 //go:build !autopilotrpc
 // +build !autopilotrpc
 
-package main
+package commands
 
 import "github.com/urfave/cli"
 

cmd/lncli/chainrpc_active.go → cmd/commands/chainrpc_active.go

@@ -1,7 +1,7 @@
 //go:build chainrpc
 // +build chainrpc
 
-package main
+package commands
 
 import (
 	"bytes"

cmd/lncli/chainrpc_default.go → cmd/commands/chainrpc_default.go

@@ -1,7 +1,7 @@
 //go:build !chainrpc
 // +build !chainrpc
 
-package main
+package commands
 
 import "github.com/urfave/cli"
 

cmd/lncli/cmd_custom.go → cmd/commands/cmd_custom.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"encoding/hex"

cmd/lncli/cmd_debug.go → cmd/commands/cmd_debug.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bytes"

cmd/lncli/cmd_import_mission_control.go → cmd/commands/cmd_import_mission_control.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"context"

cmd/lncli/cmd_invoice.go → cmd/commands/cmd_invoice.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"encoding/hex"

cmd/lncli/cmd_macaroon.go → cmd/commands/cmd_macaroon.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bytes"

cmd/lncli/cmd_mission_control.go → cmd/commands/cmd_mission_control.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/lncli/cmd_open_channel.go → cmd/commands/cmd_open_channel.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bytes"
@@ -65,7 +65,8 @@ Signed base64 encoded PSBT or hex encoded raw wire TX (or path to file): `
 )
 
 // TODO(roasbeef): change default number of confirmations.
-var openChannelCommand = cli.Command{
+
+var OpenChannelCommand = cli.Command{
 	Name:     "openchannel",
 	Category: "Channels",
 	Usage:    "Open a channel to a node or an existing peer.",
@@ -284,10 +285,14 @@ var openChannelCommand = cli.Command{
 				allowed length is 500 characters`,
 		},
 	},
-	Action: actionDecorator(openChannel),
+	Action: actionDecorator(func(c *cli.Context) error {
+		return OpenChannel(c, nil)
+	}),
 }
 
-func openChannel(ctx *cli.Context) error {
+func OpenChannel(ctx *cli.Context,
+	reqDecorator RequestDecorator[*lnrpc.OpenChannelRequest]) error {
+
 	// TODO(roasbeef): add deadline to context
 	ctxc := getContext()
 	client, cleanUp := getClient(ctx)
@@ -451,6 +456,13 @@ func openChannel(ctx *cli.Context) error {
 		return fmt.Errorf("unsupported channel type %v", channelType)
 	}
 
+	if reqDecorator != nil {
+		err = reqDecorator(ctx, req)
+		if err != nil {
+			return err
+		}
+	}
+
 	// PSBT funding is a more involved, interactive process that is too
 	// large to also fit into this already long function.
 	if ctx.Bool("psbt") {

cmd/lncli/cmd_payments.go → cmd/commands/cmd_payments.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bytes"

cmd/lncli/cmd_profile.go → cmd/commands/cmd_profile.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/lncli/cmd_state.go → cmd/commands/cmd_state.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"context"

cmd/lncli/cmd_update_chan_status.go → cmd/commands/cmd_update_chan_status.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"errors"

cmd/lncli/cmd_version.go → cmd/commands/cmd_version.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/lncli/cmd_walletunlocker.go → cmd/commands/cmd_walletunlocker.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bufio"

cmd/lncli/commands.go → cmd/commands/commands.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bufio"
@@ -12,6 +12,7 @@ import (
 	"io/ioutil"
 	"math"
 	"os"
+	"regexp"
 	"strconv"
 	"strings"
 	"sync"
@@ -42,8 +43,44 @@ const (
 	defaultUtxoMinConf = 1
 )
 
-var errBadChanPoint = errors.New("expecting chan_point to be in format of: " +
-	"txid:index")
+var (
+	errBadChanPoint = errors.New(
+		"expecting chan_point to be in format of: txid:index",
+	)
+
+	customDataPattern = regexp.MustCompile(
+		`"custom_channel_data":\s*"([0-9a-z]+)"`,
+	)
+)
+
+func replaceCustomData(jsonBytes []byte) ([]byte, error) {
+	if customDataPattern.Match(jsonBytes) {
+		jsonBytes = customDataPattern.ReplaceAllFunc(
+			jsonBytes, func(match []byte) []byte {
+				encoded := customDataPattern.FindStringSubmatch(
+					string(match),
+				)[1]
+				decoded, err := hex.DecodeString(encoded)
+				if err != nil {
+					return match
+				}
+
+				return []byte("\"custom_channel_data\":" +
+					string(decoded))
+			},
+		)
+
+		var buf bytes.Buffer
+		err := json.Indent(&buf, jsonBytes, "", "    ")
+		if err != nil {
+			return nil, err
+		}
+
+		jsonBytes = buf.Bytes()
+	}
+
+	return jsonBytes, nil
+}
 
 func getContext() context.Context {
 	shutdownInterceptor, err := signal.Intercept()
@@ -67,7 +104,7 @@ func printJSON(resp interface{}) {
 	}
 
 	var out bytes.Buffer
-	json.Indent(&out, b, "", "\t")
+	json.Indent(&out, b, "", "    ")
 	out.WriteString("\n")
 	out.WriteTo(os.Stdout)
 }
@@ -79,7 +116,13 @@ func printRespJSON(resp proto.Message) {
 		return
 	}
 
-	fmt.Printf("%s\n", jsonBytes)
+	jsonBytesReplaced, err := replaceCustomData(jsonBytes)
+	if err != nil {
+		fmt.Println("unable to replace custom data: ", err)
+		jsonBytesReplaced = jsonBytes
+	}
+
+	fmt.Printf("%s\n", jsonBytesReplaced)
 }
 
 // actionDecorator is used to add additional information and error handling
@@ -1553,7 +1596,11 @@ func pendingChannels(ctx *cli.Context) error {
 	return nil
 }
 
-var listChannelsCommand = cli.Command{
+type RequestDecorator[T proto.Message] func(*cli.Context, T) error
+
+type ResponseDecorator[T proto.Message] func(*cli.Context, T) error
+
+var ListChannelsCommand = cli.Command{
 	Name:     "listchannels",
 	Category: "Channels",
 	Usage:    "List all open channels.",
@@ -1586,35 +1633,14 @@ var listChannelsCommand = cli.Command{
 				"order to improve performance",
 		},
 	},
-	Action: actionDecorator(listChannels),
+	Action: actionDecorator(func(c *cli.Context) error {
+		return ListChannels(c, nil)
+	}),
 }
 
-var listAliasesCommand = cli.Command{
-	Name:     "listaliases",
-	Category: "Channels",
-	Usage:    "List all aliases.",
-	Flags:    []cli.Flag{},
-	Action:   actionDecorator(listaliases),
-}
+func ListChannels(ctx *cli.Context,
+	respDecorator ResponseDecorator[*lnrpc.ListChannelsResponse]) error {
 
-func listaliases(ctx *cli.Context) error {
-	ctxc := getContext()
-	client, cleanUp := getClient(ctx)
-	defer cleanUp()
-
-	req := &lnrpc.ListAliasesRequest{}
-
-	resp, err := client.ListAliases(ctxc, req)
-	if err != nil {
-		return err
-	}
-
-	printRespJSON(resp)
-
-	return nil
-}
-
-func listChannels(ctx *cli.Context) error {
 	ctxc := getContext()
 	client, cleanUp := getClient(ctx)
 	defer cleanUp()
@@ -1651,6 +1677,38 @@ func listChannels(ctx *cli.Context) error {
 		return err
 	}
 
+	if respDecorator != nil {
+		err = respDecorator(ctx, resp)
+		if err != nil {
+			return err
+		}
+	}
+
+	printRespJSON(resp)
+
+	return nil
+}
+
+var listAliasesCommand = cli.Command{
+	Name:     "listaliases",
+	Category: "Channels",
+	Usage:    "List all aliases.",
+	Flags:    []cli.Flag{},
+	Action:   actionDecorator(listAliases),
+}
+
+func listAliases(ctx *cli.Context) error {
+	ctxc := getContext()
+	client, cleanUp := getClient(ctx)
+	defer cleanUp()
+
+	req := &lnrpc.ListAliasesRequest{}
+
+	resp, err := client.ListAliases(ctxc, req)
+	if err != nil {
+		return err
+	}
+
 	printRespJSON(resp)
 
 	return nil