tapd+tapdb: return anchor block height in ListTransfers if available

Previously, confirmed anchors included only the block hash, requiring
clients to perform extra steps to look up the block height. This change
adds the block height directly to the RPC response when available.

Author: bhandras

rpcserver.go

@@ -3591,13 +3591,14 @@ func marshalOutboundParcel(
 	})
 
 	return &taprpc.AssetTransfer{
-		TransferTimestamp:  parcel.TransferTime.Unix(),
-		AnchorTxHash:       anchorTxHash[:],
-		AnchorTxHeightHint: parcel.AnchorTxHeightHint,
-		AnchorTxChainFees:  parcel.ChainFees,
-		AnchorTxBlockHash:  anchorTxBlockHash,
-		Inputs:             rpcInputs,
-		Outputs:            rpcOutputs,
+		TransferTimestamp:   parcel.TransferTime.Unix(),
+		AnchorTxHash:        anchorTxHash[:],
+		AnchorTxHeightHint:  parcel.AnchorTxHeightHint,
+		AnchorTxChainFees:   parcel.ChainFees,
+		AnchorTxBlockHash:   anchorTxBlockHash,
+		AnchorTxBlockHeight: parcel.AnchorTxBlockHeight,
+		Inputs:              rpcInputs,
+		Outputs:             rpcOutputs,
 	}, nil
 }
 

tapdb/assets_store.go

@@ -3491,6 +3491,14 @@ func (a *AssetStore) QueryParcels(ctx context.Context,
 				Inputs:             inputs,
 				Outputs:            outputs,
 			}
+
+			// Set the block height if the anchor is marked as
+			// confirmed in the database.
+			if dbAnchorTx.BlockHeight.Valid {
+				parcel.AnchorTxBlockHeight = uint32(
+					dbAnchorTx.BlockHeight.Int32,
+				)
+			}
 			outboundParcels = append(outboundParcels, parcel)
 		}
 

tapdb/assets_store_test.go

@@ -1556,6 +1556,15 @@ func TestAssetExportLog(t *testing.T) {
 	)
 	require.NoError(t, err)
 
+	// Make sure that if we query for the asset transfer again, we now have
+	// the block hash and height set.
+	parcels, err = assetsStore.QueryParcels(ctx, &anchorTxHash, false)
+	require.NoError(t, err)
+	require.Len(t, parcels, 1)
+	spendDelta.AnchorTxBlockHash = fn.Some(fakeBlockHash)
+	spendDelta.AnchorTxBlockHeight = uint32(blockHeight)
+	require.Equal(t, spendDelta, parcels[0])
+
 	// We'll now fetch all the assets to verify that they were updated
 	// properly on disk.
 	chainAssets, err := assetsStore.FetchAllAssets(ctx, false, true, nil)

tapfreighter/chain_porter.go

@@ -405,6 +405,7 @@ func (p *ChainPorter) waitForTransferTxConf(pkg *sendPackage) error {
 		pkg.OutboundPkg.AnchorTxBlockHash = fn.MaybeSome(
 			confEvent.BlockHash,
 		)
+		pkg.OutboundPkg.AnchorTxBlockHeight = confEvent.BlockHeight
 
 		pkg.SendState = SendStateStorePostAnchorTxConf
 

tapfreighter/interface.go

@@ -348,6 +348,11 @@ type OutboundParcel struct {
 	// confirmed.
 	AnchorTxBlockHash fn.Option[chainhash.Hash]
 
+	// AnchorTxBlockHeight is the block height of the block that contains
+	// the anchor transaction. This is set once the anchor transaction is
+	// confirmed.
+	AnchorTxBlockHeight uint32
+
 	// TransferTime holds the timestamp of the outbound spend.
 	TransferTime time.Time
 

taprpc/assetwalletrpc/assetwallet.swagger.json

@@ -921,6 +921,11 @@
         "anchor_tx_block_hash": {
           "$ref": "#/definitions/taprpcChainHash",
           "description": "The block hash of the blockchain block that contains the anchor\ntransaction. If this value is unset, the anchor transaction is\nunconfirmed."
+        },
+        "anchor_tx_block_height": {
+          "type": "integer",
+          "format": "int64",
+          "description": "The block height of the blockchain block that contains the anchor\ntransaction. If the anchor transaction is still unconfirmed, this value\nwill be 0."
         }
       }
     },

taprpc/taprootassets.pb.go

@@ -726,6 +726,11 @@ message AssetTransfer {
     // transaction. If this value is unset, the anchor transaction is
     // unconfirmed.
     ChainHash anchor_tx_block_hash = 7;
+
+    // The block height of the blockchain block that contains the anchor
+    // transaction. If the anchor transaction is still unconfirmed, this value
+    // will be 0.
+    uint32 anchor_tx_block_height = 8;
 }
 
 message TransferInput {

taprpc/taprootassets.proto

@@ -1495,6 +1495,11 @@
         "anchor_tx_block_hash": {
           "$ref": "#/definitions/taprpcChainHash",
           "description": "The block hash of the blockchain block that contains the anchor\ntransaction. If this value is unset, the anchor transaction is\nunconfirmed."
+        },
+        "anchor_tx_block_height": {
+          "type": "integer",
+          "format": "int64",
+          "description": "The block height of the blockchain block that contains the anchor\ntransaction. If the anchor transaction is still unconfirmed, this value\nwill be 0."
         }
       }
     },