[5/5]: lnwallet: extensions to aux leaf store to integrate custom channels

.golangci.yml

@@ -254,8 +254,8 @@ issues:
  - forbidigo
  - godot
 
- # Allow fmt.Printf() in lncli.
- - path: cmd/lncli/*
+ # Allow fmt.Printf() in commands.
+ - path: cmd/commands/*
  linters:
  - forbidigo
 

channeldb/channel.go

@@ -2750,6 +2750,8 @@ func (h *HTLC) Copy() HTLC {
  copy(clone.Signature[:], h.Signature)
  copy(clone.RHash[:], h.RHash[:])
  copy(clone.ExtraData, h.ExtraData)
+ clone.BlindingPoint = h.BlindingPoint
+ clone.CustomRecords = h.CustomRecords.Copy()
 
  return clone
 }

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

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
  "regexp"
@@ -42,7 +42,7 @@ func parseTime(s string, base time.Time) (uint64, error) {
 
 var lightningPrefix = "lightning:"
 
-// stripPrefix removes accidentally copied 'lightning:' prefix.
-func stripPrefix(s string) string {
+// StripPrefix removes accidentally copied 'lightning:' prefix.
+func StripPrefix(s string) string {
  return strings.TrimSpace(strings.TrimPrefix(s, lightningPrefix))
 }

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

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
  "testing"
@@ -111,7 +111,7 @@ func TestStripPrefix(t *testing.T) {
  t.Parallel()
 
  for _, test := range stripPrefixTests {
- actual := stripPrefix(test.in)
+ actual := StripPrefix(test.in)
  require.Equal(t, test.expected, actual)
  }
 }

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"
@@ -9,7 +9,7 @@ import (
  "github.com/urfave/cli"
 )
 
-var addInvoiceCommand = cli.Command{
+var AddInvoiceCommand = cli.Command{
  Name: "addinvoice",
  Category: "Invoices",
  Usage: "Add a new invoice.",
@@ -307,7 +307,7 @@ func decodePayReq(ctx *cli.Context) error {
  }
 
  resp, err := client.DecodePayReq(ctxc, &lnrpc.PayReqString{
- PayReq: stripPrefix(payreq),
+ PayReq: StripPrefix(payreq),
  })
  if err != nil {
  return err

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"
@@ -265,6 +265,7 @@ func setCfg(ctx *cli.Context) error {
  Config: mcCfg.Config,
  },
  )
+
  return err
 }
 
@@ -366,5 +367,6 @@ func resetMissionControl(ctx *cli.Context) error {
 
  req := &routerrpc.ResetMissionControlRequest{}
  _, err := client.ResetMissionControl(ctxc, req)
+
  return err
 }

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

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

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

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
  "bytes"
@@ -141,8 +141,8 @@ var (
  }
 )
 
-// paymentFlags returns common flags for sendpayment and payinvoice.
-func paymentFlags() []cli.Flag {
+// PaymentFlags returns common flags for sendpayment and payinvoice.
+func PaymentFlags() []cli.Flag {
  return []cli.Flag{
  cli.StringFlag{
  Name: "pay_req",
@@ -190,7 +190,7 @@ func paymentFlags() []cli.Flag {
  }
 }
 
-var sendPaymentCommand = cli.Command{
+var SendPaymentCommand = cli.Command{
  Name: "sendpayment",
  Category: "Payments",
  Usage: "Send a payment over lightning.",
@@ -214,7 +214,7 @@ var sendPaymentCommand = cli.Command{
  `,
  ArgsUsage: "dest amt payment_hash final_cltv_delta pay_addr | " +
  "--pay_req=R [--pay_addr=H]",
- Flags: append(paymentFlags(),
+ Flags: append(PaymentFlags(),
  cli.StringFlag{
  Name: "dest, d",
  Usage: "the compressed identity pubkey of the " +
@@ -241,7 +241,7 @@ var sendPaymentCommand = cli.Command{
  Usage: "will generate a pre-image and encode it in the sphinx packet, a dest must be set [experimental]",
  },
  ),
- Action: sendPayment,
+ Action: SendPayment,
 }
 
 // retrieveFeeLimit retrieves the fee limit based on the different fee limit
@@ -312,7 +312,7 @@ func parsePayAddr(ctx *cli.Context, args cli.Args) ([]byte, error) {
  return payAddr, nil
 }
 
-func sendPayment(ctx *cli.Context) error {
+func SendPayment(ctx *cli.Context) error {
  // Show command help if no arguments provided
  if ctx.NArg() == 0 && ctx.NumFlags() == 0 {
  _ = cli.ShowCommandHelp(ctx, "sendpayment")
@@ -325,7 +325,7 @@ func sendPayment(ctx *cli.Context) error {
  // details of the payment are encoded within the request.
  if ctx.IsSet("pay_req") {
  req := &routerrpc.SendPaymentRequest{
- PaymentRequest: stripPrefix(ctx.String("pay_req")),
+ PaymentRequest: StripPrefix(ctx.String("pay_req")),
  Amt: ctx.Int64("amt"),
  DestCustomRecords: make(map[uint64][]byte),
  }
@@ -343,7 +343,7 @@ func sendPayment(ctx *cli.Context) error {
 
  req.PaymentAddr = payAddr
 
- return sendPaymentRequest(ctx, req)
+ return SendPaymentRequest(ctx, req)
  }
 
  var (
@@ -451,10 +451,10 @@ func sendPayment(ctx *cli.Context) error {
 
  req.PaymentAddr = payAddr
 
- return sendPaymentRequest(ctx, req)
+ return SendPaymentRequest(ctx, req)
 }
 
-func sendPaymentRequest(ctx *cli.Context,
+func SendPaymentRequest(ctx *cli.Context,
  req *routerrpc.SendPaymentRequest) error {
 
  ctxc := getContext()
@@ -592,7 +592,7 @@ func sendPaymentRequest(ctx *cli.Context,
  return err
  }
 
- finalState, err := printLivePayment(
+ finalState, err := PrintLivePayment(
  ctxc, stream, client, printJSON,
  )
  if err != nil {
@@ -652,15 +652,15 @@ func trackPayment(ctx *cli.Context) error {
  }
 
  client := lnrpc.NewLightningClient(conn)
- _, err = printLivePayment(ctxc, stream, client, ctx.Bool(jsonFlag.Name))
+ _, err = PrintLivePayment(ctxc, stream, client, ctx.Bool(jsonFlag.Name))
  return err
 }
 
-// printLivePayment receives payment updates from the given stream and either
+// PrintLivePayment receives payment updates from the given stream and either
 // outputs them as json or as a more user-friendly formatted table. The table
 // option uses terminal control codes to rewrite the output. This call
 // terminates when the payment reaches a final state.
-func printLivePayment(ctxc context.Context,
+func PrintLivePayment(ctxc context.Context,
  stream routerrpc.Router_TrackPaymentV2Client,
  client lnrpc.LightningClient, json bool) (*lnrpc.Payment, error) {
 
@@ -859,7 +859,7 @@ var payInvoiceCommand = cli.Command{
  This command is a shortcut for 'sendpayment --pay_req='.
  `,
  ArgsUsage: "pay_req",
- Flags: append(paymentFlags(),
+ Flags: append(PaymentFlags(),
  cli.Int64Flag{
  Name: "amt",
  Usage: "(optional) number of satoshis to fulfill the " +
@@ -883,12 +883,12 @@ func payInvoice(ctx *cli.Context) error {
  }
 
  req := &routerrpc.SendPaymentRequest{
- PaymentRequest: stripPrefix(payReq),
+ PaymentRequest: StripPrefix(payReq),
  Amt: ctx.Int64("amt"),
  DestCustomRecords: make(map[uint64][]byte),
  }
 
- return sendPaymentRequest(ctx, req)
+ return SendPaymentRequest(ctx, req)
 }
 
 var sendToRouteCommand = cli.Command{
@@ -1870,7 +1870,7 @@ func estimateRouteFee(ctx *cli.Context) error {
  req.AmtSat = amtSat
 
  case ctx.IsSet("pay_req"):
- req.PaymentRequest = stripPrefix(ctx.String("pay_req"))
+ req.PaymentRequest = StripPrefix(ctx.String("pay_req"))
  if ctx.IsSet("timeout") {
  req.Timeout = uint32(ctx.Duration("timeout").Seconds())
  }

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"