rpcutils: move gRPC marshal functionality from taprpc

Our overall goal is to make taprpc as lean as possible so that it is
not dependent on the rest of the `taproot-assets` module. Taprpc will
then be made into a module that can be imported for lean WASM builds.
With that in mind, we move gRPC marshalling functionality from the
taprpc package to a new package called rpcutils.

Author: ffranr

cmd/commands/addrs.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/lightninglabs/taproot-assets/asset"
+	"github.com/lightninglabs/taproot-assets/rpcutils"
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	"github.com/urfave/cli"
 )
@@ -82,7 +83,7 @@ func newAddr(ctx *cli.Context) error {
 	client, cleanUp := getClient(ctx)
 	defer cleanUp()
 
-	assetVersion, err := taprpc.MarshalAssetVersion(
+	assetVersion, err := rpcutils.MarshalAssetVersion(
 		asset.Version(ctx.Uint64(assetVersionName)),
 	)
 	if err != nil {

itest/assertions.go

@@ -21,6 +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/rpcutils"
 	"github.com/lightninglabs/taproot-assets/tapfreighter"
 	"github.com/lightninglabs/taproot-assets/tappsbt"
 	"github.com/lightninglabs/taproot-assets/taprpc"
@@ -2188,7 +2189,7 @@ func AssertBalances(t *testing.T, client taprpc.TaprootAssetsClient,
 	case config.scriptKeyType != nil:
 		rpcTypeQuery = &taprpc.ScriptKeyTypeQuery{
 			Type: &taprpc.ScriptKeyTypeQuery_ExplicitType{
-				ExplicitType: taprpc.MarshalScriptKeyType(
+				ExplicitType: rpcutils.MarshalScriptKeyType(
 					*config.scriptKeyType,
 				),
 			},

itest/mint_fund_seal_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/internal/test"
 	"github.com/lightninglabs/taproot-assets/proof"
+	"github.com/lightninglabs/taproot-assets/rpcutils"
 	"github.com/lightninglabs/taproot-assets/tappsbt"
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	wrpc "github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
@@ -109,23 +110,23 @@ func testMintFundSealAssets(t *harnessTest) {
 	// Asset 0 will have no asset group, and an external script key with a
 	// tapscript root.
 	assetReqWithScriptKey := CopyRequest(simpleAssets[0])
-	assetReqWithScriptKey.Asset.ScriptKey = taprpc.MarshalScriptKey(
+	assetReqWithScriptKey.Asset.ScriptKey = rpcutils.MarshalScriptKey(
 		tweakedScript,
 	)
 
 	// Asset 1 will have a specific internal group key with a tapscript
 	// root. This asset will be a group anchor.
 	assetReqGroupedInternalTweaked := CopyRequest(simpleAssets[1])
 	assetReqGroupedInternalTweaked.Asset.NewGroupedAsset = true
-	assetReqGroupedInternalTweaked.Asset.GroupInternalKey = taprpc.
-		MarshalKeyDescriptor(managedGroupInternal)
+	assetReqGroupedInternalTweaked.Asset.GroupInternalKey =
+		rpcutils.MarshalKeyDescriptor(managedGroupInternal)
 	assetReqGroupedInternalTweaked.Asset.
 		GroupTapscriptRoot = groupInternalTweak
 
 	// Asset 2 will have an external group key with a tapscript root.
 	assetReqGroupedExternal := CopyRequest(issuableAssets[0])
-	assetReqGroupedExternal.Asset.GroupInternalKey = taprpc.
-		MarshalKeyDescriptor(groupExternalDesc)
+	assetReqGroupedExternal.Asset.GroupInternalKey =
+		rpcutils.MarshalKeyDescriptor(groupExternalDesc)
 	assetReqGroupedExternal.Asset.GroupTapscriptRoot = groupExternalTweak[:]
 
 	// Asset 3 will be a member of the asset group created by Asset 1.
@@ -701,7 +702,7 @@ func unmarshalPendingAssetGroup(t *testing.T,
 	asset.GroupVirtualTx) {
 
 	require.NotNil(t, a.GroupVirtualTx)
-	virtualTx, err := taprpc.UnmarshalGroupVirtualTx(a.GroupVirtualTx)
+	virtualTx, err := rpcutils.UnmarshalGroupVirtualTx(a.GroupVirtualTx)
 	require.NoError(t, err)
 
 	// Ensure that the group virtual tx is the same as the grouped virtual
@@ -721,7 +722,7 @@ func unmarshalPendingAssetGroup(t *testing.T,
 
 	// Unmarshal group key request.
 	require.NotNil(t, a.GroupKeyRequest)
-	keyReq, err := taprpc.UnmarshalGroupKeyRequest(a.GroupKeyRequest)
+	keyReq, err := rpcutils.UnmarshalGroupKeyRequest(a.GroupKeyRequest)
 	require.NoError(t, err)
 
 	return *keyReq, *virtualTx

itest/multisig.go

@@ -21,6 +21,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/cmd/commands"
 	"github.com/lightninglabs/taproot-assets/commitment"
 	"github.com/lightninglabs/taproot-assets/fn"
+	"github.com/lightninglabs/taproot-assets/rpcutils"
 	"github.com/lightninglabs/taproot-assets/tappsbt"
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	wrpc "github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
@@ -171,7 +172,7 @@ func MultiSigTest(t *testing.T, ctx context.Context, aliceTapd,
 	muSig2Addr, err := bobTapd.NewAddr(ctxt, &taprpc.NewAddrRequest{
 		AssetId:   firstBatchGenesis.AssetId,
 		Amt:       assetsToSend,
-		ScriptKey: taprpc.MarshalScriptKey(tapScriptKey),
+		ScriptKey: rpcutils.MarshalScriptKey(tapScriptKey),
 		InternalKey: &taprpc.KeyDescriptor{
 			RawKeyBytes: pubKeyBytes(btcInternalKey),
 		},
@@ -372,7 +373,7 @@ func DeriveKeys(t *testing.T, tapd commands.RpcClientsBundle) (asset.ScriptKey,
 		},
 	)
 	require.NoError(t, err)
-	scriptKey, err := taprpc.UnmarshalScriptKey(scriptKeyDesc.ScriptKey)
+	scriptKey, err := rpcutils.UnmarshalScriptKey(scriptKeyDesc.ScriptKey)
 	require.NoError(t, err)
 
 	internalKeyDesc, err := tapd.NextInternalKey(
@@ -381,7 +382,7 @@ func DeriveKeys(t *testing.T, tapd commands.RpcClientsBundle) (asset.ScriptKey,
 		},
 	)
 	require.NoError(t, err)
-	internalKeyLnd, err := taprpc.UnmarshalKeyDescriptor(
+	internalKeyLnd, err := rpcutils.UnmarshalKeyDescriptor(
 		internalKeyDesc.InternalKey,
 	)
 	require.NoError(t, err)

itest/psbt_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/internal/test"
 	"github.com/lightninglabs/taproot-assets/proof"
+	"github.com/lightninglabs/taproot-assets/rpcutils"
 	"github.com/lightninglabs/taproot-assets/tapfreighter"
 	"github.com/lightninglabs/taproot-assets/tappsbt"
 	"github.com/lightninglabs/taproot-assets/taprpc"
@@ -2708,7 +2709,7 @@ func testPsbtLockTimeSend(t *harnessTest) {
 	// We need to let the wallet of Bob know that we're going to use a
 	// script key with a custom root.
 	_, err = bob.DeclareScriptKey(ctxt, &wrpc.DeclareScriptKeyRequest{
-		ScriptKey: taprpc.MarshalScriptKey(bobAssetScriptKey),
+		ScriptKey: rpcutils.MarshalScriptKey(bobAssetScriptKey),
 	})
 	require.NoError(t.t, err)
 
@@ -2923,7 +2924,7 @@ func testPsbtRelativeLockTimeSend(t *harnessTest) {
 	// We need to let the wallet of Bob know that we're going to use a
 	// script key with a custom root.
 	_, err = bob.DeclareScriptKey(ctxt, &wrpc.DeclareScriptKeyRequest{
-		ScriptKey: taprpc.MarshalScriptKey(bobAssetScriptKey),
+		ScriptKey: rpcutils.MarshalScriptKey(bobAssetScriptKey),
 	})
 	require.NoError(t.t, err)
 
@@ -3139,7 +3140,7 @@ func testPsbtRelativeLockTimeSendProofFail(t *harnessTest) {
 	// We need to let the wallet of Bob know that we're going to use a
 	// script key with a custom root.
 	_, err = bob.DeclareScriptKey(ctxt, &wrpc.DeclareScriptKeyRequest{
-		ScriptKey: taprpc.MarshalScriptKey(bobAssetScriptKey),
+		ScriptKey: rpcutils.MarshalScriptKey(bobAssetScriptKey),
 	})
 	require.NoError(t.t, err)
 
@@ -3333,12 +3334,12 @@ func sendToTapscriptAddr(ctx context.Context, t *harnessTest, alice,
 		AssetVersion: mintedAsset.Version,
 		ScriptKey: &taprpc.ScriptKey{
 			PubKey: schnorr.SerializePubKey(bobAssetScriptKey),
-			KeyDesc: taprpc.MarshalKeyDescriptor(
+			KeyDesc: rpcutils.MarshalKeyDescriptor(
 				bobScriptKey.RawKey,
 			),
 			TapTweak: rootHash,
 		},
-		InternalKey: taprpc.MarshalKeyDescriptor(bobInternalKey),
+		InternalKey: rpcutils.MarshalKeyDescriptor(bobInternalKey),
 	})
 
 	require.NoError(t.t, err)

itest/send_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/internal/test"
 	"github.com/lightninglabs/taproot-assets/proof"
+	"github.com/lightninglabs/taproot-assets/rpcutils"
 	"github.com/lightninglabs/taproot-assets/tapfreighter"
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	wrpc "github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
@@ -1150,7 +1151,7 @@ func testSpendChangeOutputWhenProofTransferFail(t *harnessTest) {
 		// for this output.
 		firstOutput := firstTransfer.Outputs[0]
 		require.Equal(
-			t.t, taprpc.ProofDeliveryStatusNotApplicable,
+			t.t, rpcutils.ProofDeliveryStatusNotApplicable,
 			firstOutput.ProofDeliveryStatus,
 		)
 
@@ -1159,7 +1160,7 @@ func testSpendChangeOutputWhenProofTransferFail(t *harnessTest) {
 		// completed successfully.
 		secondOutput := firstTransfer.Outputs[1]
 		require.Equal(
-			t.t, taprpc.ProofDeliveryStatusPending,
+			t.t, rpcutils.ProofDeliveryStatusPending,
 			secondOutput.ProofDeliveryStatus,
 		)
 
@@ -1228,7 +1229,7 @@ func testSpendChangeOutputWhenProofTransferFail(t *harnessTest) {
 		// for this output.
 		firstOutput := firstTransfer.Outputs[0]
 		require.Equal(
-			t.t, taprpc.ProofDeliveryStatusNotApplicable,
+			t.t, rpcutils.ProofDeliveryStatusNotApplicable,
 			firstOutput.ProofDeliveryStatus,
 		)
 
@@ -1237,7 +1238,7 @@ func testSpendChangeOutputWhenProofTransferFail(t *harnessTest) {
 		// completed successfully.
 		secondOutput := firstTransfer.Outputs[1]
 		require.Equal(
-			t.t, taprpc.ProofDeliveryStatusPending,
+			t.t, rpcutils.ProofDeliveryStatusPending,
 			secondOutput.ProofDeliveryStatus,
 		)
 
@@ -1254,7 +1255,7 @@ func testSpendChangeOutputWhenProofTransferFail(t *harnessTest) {
 		// for this output.
 		firstOutput = secondTransfer.Outputs[0]
 		require.Equal(
-			t.t, taprpc.ProofDeliveryStatusNotApplicable,
+			t.t, rpcutils.ProofDeliveryStatusNotApplicable,
 			firstOutput.ProofDeliveryStatus,
 		)
 
@@ -1263,7 +1264,7 @@ func testSpendChangeOutputWhenProofTransferFail(t *harnessTest) {
 		// completed successfully.
 		secondOutput = secondTransfer.Outputs[1]
 		require.Equal(
-			t.t, taprpc.ProofDeliveryStatusPending,
+			t.t, rpcutils.ProofDeliveryStatusPending,
 			secondOutput.ProofDeliveryStatus,
 		)
 

itest/utils.go

@@ -22,6 +22,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/rpcutils"
 	"github.com/lightninglabs/taproot-assets/tapgarden"
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
@@ -666,7 +667,7 @@ func ManualMintSimpleAsset(t *harnessTest, lndNode *node.HarnessNode,
 		OutputIndex:  anchorIdx,
 		Type:         asset.Type(req.AssetType),
 	}
-	assetVersion, err := taprpc.UnmarshalAssetVersion(req.AssetVersion)
+	assetVersion, err := rpcutils.UnmarshalAssetVersion(req.AssetVersion)
 	require.NoError(t.t, err)
 
 	newAsset, err := asset.New(

proof/courier.go

@@ -14,7 +14,7 @@ import (
 	"github.com/lightninglabs/lightning-node-connect/hashmailrpc"
 	"github.com/lightninglabs/taproot-assets/asset"
 	"github.com/lightninglabs/taproot-assets/fn"
-	"github.com/lightninglabs/taproot-assets/taprpc"
+	"github.com/lightninglabs/taproot-assets/rpcutils"
 	unirpc "github.com/lightninglabs/taproot-assets/taprpc/universerpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -1309,7 +1309,7 @@ func (c *UniverseRpcCourier) DeliverProof(ctx context.Context,
 		// Construct asset leaf.
 		// Note: We pass in a none-value for the decimal display option,
 		// as this doesn't matter for the courrier.
-		rpcAsset, err := taprpc.MarshalAsset(
+		rpcAsset, err := rpcutils.MarshalAsset(
 			ctx, &proofAsset, true, true, nil, fn.None[uint32](),
 		)
 		if err != nil {