multi: hook up new CoinSelectType field

Author: guggero

rpcserver.go

@@ -2019,6 +2019,12 @@ func (r *rpcServer) FundVirtualPsbt(ctx context.Context,
 	req *wrpc.FundVirtualPsbtRequest) (*wrpc.FundVirtualPsbtResponse,
 	error) {
 
+	coinSelectType, err := unmarshalCoinSelectType(req.CoinSelectType)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing coin select type: %w",
+			err)
+	}
+
 	var fundedVPkt *tapfreighter.FundedVPacket
 	switch {
 	case req.GetPsbt() != nil:
@@ -2040,9 +2046,8 @@ func (r *rpcServer) FundVirtualPsbt(ctx context.Context,
 				"recipients: %w", err)
 		}
 
-		fundedVPkt, err = r.cfg.AssetWallet.FundPacket(
-			ctx, desc, vPkt,
-		)
+		desc.CoinSelectType = coinSelectType
+		fundedVPkt, err = r.cfg.AssetWallet.FundPacket(ctx, desc, vPkt)
 		if err != nil {
 			return nil, fmt.Errorf("error funding packet: %w", err)
 		}
@@ -2073,7 +2078,9 @@ 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, coinSelectType, addr,
+		)
 		if err != nil {
 			return nil, fmt.Errorf("error funding address send: "+
 				"%w", err)
@@ -2117,6 +2124,26 @@ func (r *rpcServer) FundVirtualPsbt(ctx context.Context,
 	return response, nil
 }
 
+// unmarshalCoinSelectType converts an RPC select type into a native one.
+func unmarshalCoinSelectType(
+	coinSelectType wrpc.CoinSelectType) (tapsend.CoinSelectType, error) {
+
+	switch coinSelectType {
+	case wrpc.CoinSelectType_COIN_SELECT_DEFAULT:
+		return tapsend.DefaultCoinSelectType, nil
+
+	case wrpc.CoinSelectType_COIN_SELECT_BIP86_ONLY:
+		return tapsend.Bip86Only, nil
+
+	case wrpc.CoinSelectType_COIN_SELECT_SCRIPT_TREES_ALLOWED:
+		return tapsend.ScriptTreesAllowed, nil
+
+	default:
+		return 0, fmt.Errorf("unknown coin select type: %d",
+			coinSelectType)
+	}
+}
+
 // SignVirtualPsbt signs the inputs of a virtual transaction and prepares the
 // commitments of the inputs and outputs.
 func (r *rpcServer) SignVirtualPsbt(ctx context.Context,

tapchannel/aux_funding_controller.go

@@ -697,6 +697,7 @@ func (f *FundingController) fundVirtualPacket(ctx context.Context,
 
 	// Fund the packet. This will derive an anchor internal key for us, but
 	// we'll overwrite that later on.
+	fundDesc.CoinSelectType = tapsend.Bip86Only
 	return f.cfg.AssetWallet.FundPacket(ctx, fundDesc, pktTemplate)
 }
 

tapfreighter/chain_porter.go

@@ -994,7 +994,7 @@ func (p *ChainPorter) stateStep(currentPkg sendPackage) (*sendPackage, error) {
 				"address parcel")
 		}
 		fundSendRes, err := p.cfg.AssetWallet.FundAddressSend(
-			ctx, addrParcel.destAddrs...,
+			ctx, tapsend.Bip86Only, addrParcel.destAddrs...,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("unable to fund address send: "+

tapfreighter/interface.go

@@ -131,8 +131,7 @@ type CoinSelector interface {
 	SelectCoins(ctx context.Context, constraints CommitmentConstraints,
 		strategy MultiCommitmentSelectStrategy,
 		maxVersion commitment.TapCommitmentVersion,
-	) ([]*AnchoredCommitment,
-		error)
+	) ([]*AnchoredCommitment, error)
 
 	// ReleaseCoins releases/unlocks coins that were previously leased and
 	// makes them available for coin selection again.

tapfreighter/wallet.go

@@ -68,6 +68,7 @@ type Wallet interface {
 	// asset re-anchors and the Taproot Asset level commitment of the
 	// selected assets.
 	FundAddressSend(ctx context.Context,
+		coinSelectType tapsend.CoinSelectType,
 		receiverAddrs ...*address.Tap) (*FundedVPacket, error)
 
 	// FundPacket funds a virtual transaction, selecting assets to spend
@@ -234,6 +235,7 @@ type FundedVPacket struct {
 //
 // NOTE: This is part of the Wallet interface.
 func (f *AssetWallet) FundAddressSend(ctx context.Context,
+	coinSelectType tapsend.CoinSelectType,
 	receiverAddrs ...*address.Tap) (*FundedVPacket, error) {
 
 	// We start by creating a new virtual transaction that will be used to
@@ -251,6 +253,7 @@ func (f *AssetWallet) FundAddressSend(ctx context.Context,
 		return nil, fmt.Errorf("unable to describe recipients: %w", err)
 	}
 
+	fundDesc.CoinSelectType = coinSelectType
 	fundedVPkt, err := f.FundPacket(ctx, fundDesc, vPkt)
 	if err != nil {
 		return nil, err
@@ -367,7 +370,7 @@ func (f *AssetWallet) FundPacket(ctx context.Context,
 	constraints := CommitmentConstraints{
 		AssetSpecifier: fundDesc.AssetSpecifier,
 		MinAmt:         fundDesc.Amount,
-		CoinSelectType: tapsend.Bip86Only,
+		CoinSelectType: fundDesc.CoinSelectType,
 	}
 
 	anchorVersion, err := tappsbt.CommitmentVersion(vPkt.Version)

tapsend/send.go

@@ -192,6 +192,9 @@ type FundingDescriptor struct {
 
 	// Amount is the amount of the asset to transfer.
 	Amount uint64
+
+	// CoinSelectType specifies the type of coins that should be selected.
+	CoinSelectType CoinSelectType
 }
 
 // TapCommitmentKey is the key that maps to the root commitment for the asset