multi: refactor to split off tapsend package from tapscript

We have the following weird package dependency chain:
proof -> vm -> tapscript -> tappsbt

This makes things weird and cumbersome. The only parts in tapscript that
actually use the tappsbt stuff is send related.
So to break that dependency chain between the vm and tappsbt, we split
off all the send functionality into a new tapsend package.

Author: guggero

itest/psbt_test.go

@@ -20,7 +20,7 @@ import (
 	wrpc "github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/tapdevrpc"
-	"github.com/lightninglabs/taproot-assets/tapscript"
+	"github.com/lightninglabs/taproot-assets/tapsend"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lntest/wait"
@@ -1391,7 +1391,7 @@ func testPsbtSighashNone(t *harnessTest) {
 	witnessBackup := signedPacket.Outputs[0].Asset.PrevWitnesses
 
 	// Bob now creates the output assets.
-	err = tapscript.PrepareOutputAssets(context.Background(), signedPacket)
+	err = tapsend.PrepareOutputAssets(context.Background(), signedPacket)
 	require.NoError(t.t, err)
 
 	// We attach the backed-up Previous Witnesses to the newly created
@@ -1564,7 +1564,7 @@ func testPsbtSighashNoneInvalid(t *harnessTest) {
 	witnessBackup := signedPacket.Outputs[0].Asset.PrevWitnesses
 
 	// Bob now creates the output assets.
-	err = tapscript.PrepareOutputAssets(context.Background(), signedPacket)
+	err = tapsend.PrepareOutputAssets(context.Background(), signedPacket)
 	require.NoError(t.t, err)
 
 	// We attach the backed-up Previous Witnesses to the newly created

log.go

@@ -9,7 +9,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/tapdb"
 	"github.com/lightninglabs/taproot-assets/tapfreighter"
 	"github.com/lightninglabs/taproot-assets/tapgarden"
-	"github.com/lightninglabs/taproot-assets/tapscript"
+	"github.com/lightninglabs/taproot-assets/tapsend"
 	"github.com/lightninglabs/taproot-assets/universe"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/signal"
@@ -99,9 +99,7 @@ func SetupLoggers(root *build.RotatingLogWriter, interceptor signal.Interceptor)
 	AddSubLogger(root, proof.Subsystem, interceptor, proof.UseLogger)
 	AddSubLogger(root, tapdb.Subsystem, interceptor, tapdb.UseLogger)
 	AddSubLogger(root, address.Subsystem, interceptor, address.UseLogger)
-	AddSubLogger(
-		root, tapscript.Subsystem, interceptor, tapscript.UseLogger,
-	)
+	AddSubLogger(root, tapsend.Subsystem, interceptor, tapsend.UseLogger)
 	AddSubLogger(root, universe.Subsystem, interceptor, universe.UseLogger)
 	AddSubLogger(
 		root, commitment.Subsystem, interceptor, commitment.UseLogger,

rpcserver.go

@@ -38,6 +38,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/taprpc/tapdevrpc"
 	unirpc "github.com/lightninglabs/taproot-assets/taprpc/universerpc"
 	"github.com/lightninglabs/taproot-assets/tapscript"
+	"github.com/lightninglabs/taproot-assets/tapsend"
 	"github.com/lightninglabs/taproot-assets/universe"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/keychain"
@@ -1675,7 +1676,7 @@ func (r *rpcServer) FundVirtualPsbt(ctx context.Context,
 		// Extract the recipient information from the packet. This
 		// basically assembles the asset ID we want to send to and the
 		// sum of all output amounts.
-		desc, err := tapscript.DescribeRecipients(
+		desc, err := tapsend.DescribeRecipients(
 			ctx, vPkt, r.cfg.TapAddrBook,
 		)
 		if err != nil {
@@ -2349,7 +2350,7 @@ func (r *rpcServer) BurnAsset(ctx context.Context,
 		in.AmountToBurn)
 
 	fundResp, err := r.cfg.AssetWallet.FundBurn(
-		ctx, &tapscript.FundingDescriptor{
+		ctx, &tapsend.FundingDescriptor{
 			ID:       assetID,
 			GroupKey: groupKey,
 			Amount:   in.AmountToBurn,

tapfreighter/chain_porter.go

@@ -19,6 +19,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/tapgarden"
 	"github.com/lightninglabs/taproot-assets/tappsbt"
 	"github.com/lightninglabs/taproot-assets/tapscript"
+	"github.com/lightninglabs/taproot-assets/tapsend"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
 )
@@ -830,7 +831,7 @@ func (p *ChainPorter) importLocalAddresses(ctx context.Context,
 func createDummyOutput() *wire.TxOut {
 	// The dummy PkScript is the same size as an encoded P2TR output.
 	newOutput := wire.TxOut{
-		Value:    int64(tapscript.DummyAmtSats),
+		Value:    int64(tapsend.DummyAmtSats),
 		PkScript: make([]byte, 34),
 	}
 	return &newOutput
@@ -923,7 +924,7 @@ func (p *ChainPorter) stateStep(currentPkg sendPackage) (*sendPackage, error) {
 
 		default:
 			feeRate, err = p.cfg.ChainBridge.EstimateFee(
-				ctx, tapscript.SendConfTarget,
+				ctx, tapsend.SendConfTarget,
 			)
 			if err != nil {
 				return nil, fmt.Errorf("unable to estimate "+

tapfreighter/wallet.go

@@ -29,6 +29,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/tapgarden"
 	"github.com/lightninglabs/taproot-assets/tappsbt"
 	"github.com/lightninglabs/taproot-assets/tapscript"
+	"github.com/lightninglabs/taproot-assets/tapsend"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
 )
@@ -106,13 +107,13 @@ type Wallet interface {
 	// FundPacket funds a virtual transaction, selecting assets to spend
 	// in order to pay the given recipient. The selected input is then added
 	// to the given virtual transaction.
-	FundPacket(ctx context.Context, fundDesc *tapscript.FundingDescriptor,
+	FundPacket(ctx context.Context, fundDesc *tapsend.FundingDescriptor,
 		vPkt *tappsbt.VPacket) (*FundedVPacket, error)
 
 	// FundBurn funds a virtual transaction for burning the given amount of
 	// units of the given asset.
 	FundBurn(ctx context.Context,
-		fundDesc *tapscript.FundingDescriptor) (*FundedVPacket, error)
+		fundDesc *tapsend.FundingDescriptor) (*FundedVPacket, error)
 
 	// SignVirtualPacket signs the virtual transaction of the given packet
 	// and returns the input indexes that were signed.
@@ -441,7 +442,7 @@ func (f *AssetWallet) FundAddressSend(ctx context.Context,
 			"transaction from addresses: %w", err)
 	}
 
-	fundDesc, err := tapscript.DescribeAddrs(receiverAddrs)
+	fundDesc, err := tapsend.DescribeAddrs(receiverAddrs)
 	if err != nil {
 		return nil, nil, fmt.Errorf("unable to describe recipients: "+
 			"%w", err)
@@ -522,7 +523,7 @@ func (f *AssetWallet) passiveAssetVPacket(passiveAsset *asset.Asset,
 // pay the given recipient. The selected input is then added to the given
 // virtual transaction.
 func (f *AssetWallet) FundPacket(ctx context.Context,
-	fundDesc *tapscript.FundingDescriptor,
+	fundDesc *tapsend.FundingDescriptor,
 	vPkt *tappsbt.VPacket) (*FundedVPacket, error) {
 
 	// The input and address networks must match.
@@ -551,7 +552,7 @@ func (f *AssetWallet) FundPacket(ctx context.Context,
 // FundBurn funds a virtual transaction for burning the given amount of units of
 // the given asset.
 func (f *AssetWallet) FundBurn(ctx context.Context,
-	fundDesc *tapscript.FundingDescriptor) (*FundedVPacket, error) {
+	fundDesc *tapsend.FundingDescriptor) (*FundedVPacket, error) {
 
 	// We need to find a commitment that has enough assets to satisfy this
 	// send request. We'll map the address to a set of constraints, so we
@@ -702,7 +703,7 @@ func (f *AssetWallet) FundBurn(ctx context.Context,
 
 // fundPacketWithInputs funds a virtual transaction with the given inputs.
 func (f *AssetWallet) fundPacketWithInputs(ctx context.Context,
-	fundDesc *tapscript.FundingDescriptor, vPkt *tappsbt.VPacket,
+	fundDesc *tapsend.FundingDescriptor, vPkt *tappsbt.VPacket,
 	selectedCommitments []*AnchoredCommitment) (*FundedVPacket, error) {
 
 	log.Infof("Selected %v asset inputs for send of %d to %x",
@@ -746,7 +747,7 @@ func (f *AssetWallet) fundPacketWithInputs(ctx context.Context,
 		},
 	)
 
-	fullValue, err := tapscript.ValidateInputs(
+	fullValue, err := tapsend.ValidateInputs(
 		inputCommitments, inputsScriptKeys, assetType, fundDesc,
 	)
 	if err != nil {
@@ -914,7 +915,7 @@ func (f *AssetWallet) fundPacketWithInputs(ctx context.Context,
 		)
 	}
 
-	if err := tapscript.PrepareOutputAssets(ctx, vPkt); err != nil {
+	if err := tapsend.PrepareOutputAssets(ctx, vPkt); err != nil {
 		return nil, fmt.Errorf("unable to create split commit: %w", err)
 	}
 
@@ -968,7 +969,7 @@ func (f *AssetWallet) setVPacketInputs(ctx context.Context,
 		// to be in the commitment we spend (we did the same when
 		// creating the output, so differences should be apparent when
 		// debugging).
-		tapscript.LogCommitment(
+		tapsend.LogCommitment(
 			"Input", idx, assetInput.Commitment, internalKey.PubKey,
 			anchorPkScript, anchorMerkleRoot[:],
 		)
@@ -1106,7 +1107,7 @@ func (f *AssetWallet) SignVirtualPacket(vPkt *tappsbt.VPacket,
 	// Now we'll use the signer to sign all the inputs for the new Taproot
 	// Asset leaves. The witness data for each input will be assigned for
 	// us.
-	err := tapscript.SignVirtualTransaction(
+	err := tapsend.SignVirtualTransaction(
 		vPkt, f.cfg.Signer, f.cfg.WitnessValidator,
 	)
 	if err != nil {
@@ -1382,7 +1383,7 @@ func (f *AssetWallet) AnchorVirtualTransactions(ctx context.Context,
 	}
 	vPacket := params.VPkts[0]
 
-	outputCommitments, err := tapscript.CreateOutputCommitments(
+	outputCommitments, err := tapsend.CreateOutputCommitments(
 		params.InputCommitments, vPacket, params.PassiveAssetsVPkts,
 	)
 	if err != nil {
@@ -1392,7 +1393,7 @@ func (f *AssetWallet) AnchorVirtualTransactions(ctx context.Context,
 
 	// Construct our template PSBT to commits to the set of dummy locators
 	// we use to make fee estimation work.
-	sendPacket, err := tapscript.CreateAnchorTx(vPacket.Outputs)
+	sendPacket, err := tapsend.CreateAnchorTx(vPacket.Outputs)
 	if err != nil {
 		return nil, fmt.Errorf("error creating anchor TX: %w", err)
 	}
@@ -1428,7 +1429,7 @@ func (f *AssetWallet) AnchorVirtualTransactions(ctx context.Context,
 
 	// First, we'll update the PSBT packets to insert the _real_ outputs we
 	// need to commit to the asset transfer.
-	mergedCommitments, err := tapscript.UpdateTaprootOutputKeys(
+	mergedCommitments, err := tapsend.UpdateTaprootOutputKeys(
 		signAnchorPkt, vPacket, outputCommitments,
 	)
 	if err != nil {
@@ -1508,7 +1509,7 @@ func (f *AssetWallet) SignOwnershipProof(
 	vPkt := tappsbt.OwnershipProofPacket(
 		ownedAsset.Copy(), f.cfg.ChainParams,
 	)
-	err := tapscript.SignVirtualTransaction(
+	err := tapsend.SignVirtualTransaction(
 		vPkt, f.cfg.Signer, f.cfg.WitnessValidator,
 	)
 	if err != nil {

tapgarden/caretaker.go

@@ -21,7 +21,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/commitment"
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/proof"
-	"github.com/lightninglabs/taproot-assets/tapscript"
+	"github.com/lightninglabs/taproot-assets/tapsend"
 	"github.com/lightninglabs/taproot-assets/universe"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
@@ -394,7 +394,7 @@ func (b *BatchCaretaker) fundGenesisPsbt(ctx context.Context) (*FundedPsbt, erro
 		b.batchKey[:])
 
 	txTemplate := wire.NewMsgTx(2)
-	txTemplate.AddTxOut(tapscript.CreateDummyOutput())
+	txTemplate.AddTxOut(tapsend.CreateDummyOutput())
 	genesisPkt, err := psbt.NewFromUnsignedTx(txTemplate)
 	if err != nil {
 		return nil, fmt.Errorf("unable to make psbt packet: %w", err)

tapgarden/mock.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
+	"github.com/lightninglabs/taproot-assets/tapsend"
 	"math/rand"
 	"testing"
 	"time"
@@ -22,7 +23,6 @@ import (
 	"github.com/lightninglabs/taproot-assets/asset"
 	"github.com/lightninglabs/taproot-assets/internal/test"
 	"github.com/lightninglabs/taproot-assets/proof"
-	"github.com/lightninglabs/taproot-assets/tapscript"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnwallet"
@@ -108,7 +108,7 @@ func (m *MockWalletAnchor) FundPsbt(_ context.Context, packet *psbt.Packet,
 	anchorInput := psbt.PInput{
 		WitnessUtxo: &wire.TxOut{
 			Value:    100000,
-			PkScript: bytes.Clone(tapscript.GenesisDummyScript),
+			PkScript: bytes.Clone(tapsend.GenesisDummyScript),
 		},
 		SighashType: txscript.SigHashDefault,
 	}
@@ -118,7 +118,7 @@ func (m *MockWalletAnchor) FundPsbt(_ context.Context, packet *psbt.Packet,
 	// exclusion proofs.
 	changeOutput := wire.TxOut{
 		Value:    50000,
-		PkScript: bytes.Clone(tapscript.GenesisDummyScript),
+		PkScript: bytes.Clone(tapsend.GenesisDummyScript),
 	}
 	changeOutput.PkScript[0] = txscript.OP_0
 	packet.UnsignedTx.AddTxOut(&changeOutput)

tapgarden/planter_test.go

@@ -6,6 +6,7 @@ import (
 	"database/sql"
 	"encoding/hex"
 	"fmt"
+	"github.com/lightninglabs/taproot-assets/tapsend"
 	"math/rand"
 	"sync"
 	"testing"
@@ -457,7 +458,7 @@ func (t *mintingTestHarness) assertGenesisTxFunded() *tapgarden.FundedPsbt {
 		if txOut.Value == int64(tapgarden.GenesisAmtSats) {
 			isP2TR := txscript.IsPayToTaproot(txOut.PkScript)
 			isDummyScript := bytes.Equal(
-				txOut.PkScript, tapscript.GenesisDummyScript[:],
+				txOut.PkScript, tapsend.GenesisDummyScript[:],
 			)
 
 			if isP2TR || isDummyScript {