multi: transport proof courier address in VOutput

Since we now have a field to store the proof courier delivery address
URL in within the VOutput, we no longer need to carry along extra state
in the freighter.

Author: guggero

rpcserver.go

@@ -1720,9 +1720,7 @@ func (r *rpcServer) FundVirtualPsbt(ctx context.Context,
 			return nil, fmt.Errorf("no recipients specified")
 		}
 
-		fundedVPkt, _, err = r.cfg.AssetWallet.FundAddressSend(
-			ctx, addr,
-		)
+		fundedVPkt, err = r.cfg.AssetWallet.FundAddressSend(ctx, addr)
 		if err != nil {
 			return nil, fmt.Errorf("error funding address send: "+
 				"%w", err)

tapfreighter/chain_porter.go

@@ -864,18 +864,16 @@ func (p *ChainPorter) stateStep(currentPkg sendPackage) (*sendPackage, error) {
 			return nil, fmt.Errorf("unable to cast parcel to " +
 				"address parcel")
 		}
-		fundSendRes, outputIdxToAddr, err :=
-			p.cfg.AssetWallet.FundAddressSend(
-				ctx, addrParcel.destAddrs...,
-			)
+		fundSendRes, err := p.cfg.AssetWallet.FundAddressSend(
+			ctx, addrParcel.destAddrs...,
+		)
 		if err != nil {
 			return nil, fmt.Errorf("unable to fund address send: "+
 				"%w", err)
 		}
 
 		currentPkg.VirtualPacket = fundSendRes.VPacket
 		currentPkg.InputCommitments = fundSendRes.InputCommitments
-		currentPkg.OutputIdxToAddr = outputIdxToAddr
 
 		currentPkg.SendState = SendStateVirtualSign
 

tapfreighter/parcel.go

@@ -300,10 +300,6 @@ type sendPackage struct {
 	// virtual asset transition transaction.
 	VirtualPacket *tappsbt.VPacket
 
-	// OutputIdxToAddr is a map from a VPacket's VOutput index to its
-	// associated Tap address.
-	OutputIdxToAddr tappsbt.OutputIdxToAddr
-
 	// InputCommitments is a map from virtual package input index to its
 	// associated Taproot Asset commitment.
 	InputCommitments tappsbt.InputCommitments
@@ -408,12 +404,10 @@ func (s *sendPackage) prepareForStorage(currentHeight uint32) (*OutboundParcel,
 		// Convert any proof courier address associated with this output
 		// to bytes for db storage.
 		var proofCourierAddrBytes []byte
-		if s.OutputIdxToAddr != nil {
-			if addr, ok := s.OutputIdxToAddr[idx]; ok {
-				proofCourierAddrBytes = []byte(
-					addr.ProofCourierAddr.String(),
-				)
-			}
+		if vOut.ProofDeliveryAddress != nil {
+			proofCourierAddrBytes = []byte(
+				vOut.ProofDeliveryAddress.String(),
+			)
 		}
 
 		anchorInternalKey := keychain.KeyDescriptor{

tapfreighter/wallet.go

@@ -101,8 +101,7 @@ type Wallet interface {
 	// asset re-anchors and the Taproot Asset level commitment of the
 	// selected assets.
 	FundAddressSend(ctx context.Context,
-		receiverAddrs ...*address.Tap) (*FundedVPacket,
-		tappsbt.OutputIdxToAddr, error)
+		receiverAddrs ...*address.Tap) (*FundedVPacket, error)
 
 	// FundPacket funds a virtual transaction, selecting assets to spend
 	// in order to pay the given recipient. The selected input is then added
@@ -429,31 +428,29 @@ type FundedVPacket struct {
 //
 // NOTE: This is part of the Wallet interface.
 func (f *AssetWallet) FundAddressSend(ctx context.Context,
-	receiverAddrs ...*address.Tap) (*FundedVPacket,
-	tappsbt.OutputIdxToAddr, error) {
+	receiverAddrs ...*address.Tap) (*FundedVPacket, error) {
 
 	// We start by creating a new virtual transaction that will be used to
 	// hold the asset transfer. Because sending to an address is always a
 	// non-interactive process, we can use this function that always creates
 	// a change output.
-	vPkt, outputIdxToAddr, err := tappsbt.FromAddresses(receiverAddrs, 1)
+	vPkt, err := tappsbt.FromAddresses(receiverAddrs, 1)
 	if err != nil {
-		return nil, nil, fmt.Errorf("unable to create virtual "+
-			"transaction from addresses: %w", err)
+		return nil, fmt.Errorf("unable to create virtual transaction "+
+			"from addresses: %w", err)
 	}
 
 	fundDesc, err := tapsend.DescribeAddrs(receiverAddrs)
 	if err != nil {
-		return nil, nil, fmt.Errorf("unable to describe recipients: "+
-			"%w", err)
+		return nil, fmt.Errorf("unable to describe recipients: %w", err)
 	}
 
 	fundedVPkt, err := f.FundPacket(ctx, fundDesc, vPkt)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
-	return fundedVPkt, outputIdxToAddr, nil
+	return fundedVPkt, nil
 }
 
 // passiveAssetVPacket creates a virtual packet for the given passive asset.

tappsbt/address.go

@@ -9,21 +9,16 @@ import (
 	"github.com/lightningnetwork/lnd/keychain"
 )
 
-// OutputIdxToAddr is a map from a VPacket's VOutput index to its associated
-// Tap address.
-type OutputIdxToAddr map[int]address.Tap
-
 // FromAddresses creates an empty virtual transaction packet from the given
 // addresses. Because sending to an address is always non-interactive, a change
 // output is also added to the packet.
 func FromAddresses(receiverAddrs []*address.Tap,
-	firstOutputIndex uint32) (*VPacket, OutputIdxToAddr, error) {
+	firstOutputIndex uint32) (*VPacket, error) {
 
 	// We need at least one address to send to. Any special cases or
 	// interactive sends should go through the FundPacket method.
 	if len(receiverAddrs) < 1 {
-		return nil, nil, fmt.Errorf("at least one address must be" +
-			"specified")
+		return nil, fmt.Errorf("at least one address must be specified")
 	}
 
 	firstAddr := receiverAddrs[0]
@@ -51,9 +46,6 @@ func FromAddresses(receiverAddrs []*address.Tap,
 		ScriptKey:         asset.NUMSScriptKey,
 	})
 
-	// Map from output index to address.
-	outputIdxToAddr := make(OutputIdxToAddr, len(receiverAddrs))
-
 	// We start at output index 1 because we also have the change output
 	// above. We also just use continuous integers for the anchor output
 	// index, but start at the first one indicated by the caller.
@@ -70,13 +62,11 @@ func FromAddresses(receiverAddrs []*address.Tap,
 			),
 			AnchorOutputInternalKey:      &addr.InternalKey,
 			AnchorOutputTapscriptSibling: addr.TapscriptSibling,
+			ProofDeliveryAddress:         &addr.ProofCourierAddr,
 		})
-
-		outputIndex := len(pkt.Outputs) - 1
-		outputIdxToAddr[outputIndex] = *addr
 	}
 
-	return pkt, outputIdxToAddr, nil
+	return pkt, nil
 }
 
 // ForInteractiveSend creates a virtual transaction packet for sending an output

tappsbt/decode_test.go

@@ -102,7 +102,7 @@ func TestEncodingDecoding(t *testing.T) {
 				t, testParams, proofCourierAddr,
 			)
 
-			pkg, _, err := FromAddresses([]*address.Tap{addr.Tap}, 1)
+			pkg, err := FromAddresses([]*address.Tap{addr.Tap}, 1)
 			require.NoError(t, err)
 			pkg.Outputs = append(pkg.Outputs, &VOutput{
 				ScriptKey: asset.RandScriptKey(t),

tappsbt/testdata/psbt_encoding_generated.json

@@ -65,7 +65,7 @@
             "tr_bip32_derivation": null,
             "tr_internal_key": "",
             "tr_merkle_root": "",
-            "proof_delivery_address": "",
+            "proof_delivery_address": "hashmail://rand.hashmail.proof.courier:443",
             "proof_suffix": null
           },
           {
@@ -92,7 +92,7 @@
         "version": 0,
         "chain_params_hrp": "tapbc"
       },
-      "expected": "cHNidP8BALQCAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAIlEgfHm5sm5GOJXu9WedhViULIbErSIzre8BvD5tVAs2U/6KW98sf8SEJSJRIEWKkswS0BuOiJLaWO1RHTmPLOQrTWKVzwxmNGJJ9NMGAAAAAAAAAAAiUSB9C3k0Adq3BnbS7ep7gw/kIN1LWDnu/dgQL1ASrchGsgAAAAABcAEBAXEFdGFwYmMBcgEAAAFwZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJOqeF1Iw+Cgx/gsg8LxV4U1HJPW5d2R4lHreXkAZ/RrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXEIAAAAAAAAAAABcgABcwgAAAAAAAAAAAF1AAF4AAABcAEBAXEBAAFyCAAAAAAAAAAAAXkBAAABcAEAAXEBAAFyCAAAAAAAAAABAXMhAxJmhdoJ0WE1iBypdiKVpag5mwvWbqpYY6DXUS7uwWL+AXgVAMASbm90IGEgdmFsaWQgc2NyaXB0AXkBAAABcAEAAXEBAAFyCAAAAAAAAAAAAXkBAAA=",
+      "expected": "cHNidP8BALQCAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAIlEgfHm5sm5GOJXu9WedhViULIbErSIzre8BvD5tVAs2U/6KW98sf8SEJSJRIEWKkswS0BuOiJLaWO1RHTmPLOQrTWKVzwxmNGJJ9NMGAAAAAAAAAAAiUSB9C3k0Adq3BnbS7ep7gw/kIN1LWDnu/dgQL1ASrchGsgAAAAABcAEBAXEFdGFwYmMBcgEAAAFwZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJOqeF1Iw+Cgx/gsg8LxV4U1HJPW5d2R4lHreXkAZ/RrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXEIAAAAAAAAAAABcgABcwgAAAAAAAAAAAF1AAF4AAABcAEBAXEBAAFyCAAAAAAAAAAAAXkBAAABcAEAAXEBAAFyCAAAAAAAAAABAXMhAxJmhdoJ0WE1iBypdiKVpag5mwvWbqpYY6DXUS7uwWL+AXgVAMASbm90IGEgdmFsaWQgc2NyaXB0AXkBAAF6Kmhhc2htYWlsOi8vcmFuZC5oYXNobWFpbC5wcm9vZi5jb3VyaWVyOjQ0MwABcAEAAXEBAAFyCAAAAAAAAAAAAXkBAAA=",
       "comment": "minimal packet"
     },
     {