Merge pull request #1480 from jamaljsr/leaves-chain-anchor

Add chain_anchor with block_timestamp to AssetLeaves RPC

Author: guggero

asset/asset.go

@@ -1863,6 +1863,10 @@ type ChainAsset struct {
 	// tx.
 	AnchorBlockHeight uint32
 
+	// AnchorBlockTimestamp is the Unix timestamp of the block that mined
+	// the anchor tx.
+	AnchorBlockTimestamp int64
+
 	// AnchorOutpoint is the outpoint that commits to the asset.
 	AnchorOutpoint wire.OutPoint
 

proof/proof.go

@@ -530,6 +530,7 @@ func (p *Proof) ToChainAsset() (asset.ChainAsset, error) {
 		AnchorBlockHash:        p.BlockHeader.BlockHash(),
 		AnchorOutpoint:         p.OutPoint(),
 		AnchorBlockHeight:      p.BlockHeight,
+		AnchorBlockTimestamp:   p.BlockHeader.Timestamp.Unix(),
 		AnchorInternalKey:      p.InclusionProof.InternalKey,
 		AnchorMerkleRoot:       merkleRoot[:],
 		AnchorTapscriptSibling: tsSibling,

rpcserver.go

@@ -1212,6 +1212,13 @@ func (r *rpcServer) MarshalChainAsset(ctx context.Context, a asset.ChainAsset,
 		return nil, err
 	}
 
+	// Ensure the block timestamp is set if a block height is set.
+	if a.AnchorBlockTimestamp == 0 && a.AnchorBlockHeight > 0 {
+		a.AnchorBlockTimestamp = r.cfg.ChainBridge.GetBlockTimestamp(
+			ctx, a.AnchorBlockHeight,
+		)
+	}
+
 	return taprpc.MarshalChainAsset(
 		ctx, a, decDisplay, withWitness, keyRing,
 	)
@@ -5293,8 +5300,19 @@ func marshalAssetLeaf(ctx context.Context, keys taprpc.KeyLookup,
 	assetLeaf *universe.Leaf,
 	decDisplay fn.Option[uint32]) (*unirpc.AssetLeaf, error) {
 
-	rpcAsset, err := taprpc.MarshalAsset(
-		ctx, assetLeaf.Asset, false, true, keys, decDisplay,
+	// Decode the single proof to extract on-chain anchor info.
+	p, err := proof.Decode(assetLeaf.RawProof)
+	if err != nil {
+		return nil, err
+	}
+	chainAsset, err := p.ToChainAsset()
+	if err != nil {
+		return nil, err
+	}
+
+	// Marshal as a chain asset to include chain_anchor details.
+	rpcAsset, err := taprpc.MarshalChainAsset(
+		ctx, chainAsset, decDisplay, true, keys,
 	)
 	if err != nil {
 		return nil, err

taprpc/marshal.go

@@ -510,6 +510,7 @@ func MarshalChainAsset(ctx context.Context, a asset.ChainAsset,
 		MerkleRoot:       a.AnchorMerkleRoot,
 		TapscriptSibling: a.AnchorTapscriptSibling,
 		BlockHeight:      a.AnchorBlockHeight,
+		BlockTimestamp:   a.AnchorBlockTimestamp,
 	}
 
 	if a.AnchorLeaseOwner != [32]byte{} {

taprpc/taprootassets.pb.go

@@ -265,6 +265,9 @@ message AnchorInfo {
 
     // The height of the block which contains the anchor transaction.
     uint32 block_height = 8;
+
+    // The UTC Unix timestamp of the block containing the anchor transaction.
+    int64 block_timestamp = 9;
 }
 
 message GenesisInfo {

taprpc/taprootassets.proto

@@ -1256,6 +1256,11 @@
           "type": "integer",
           "format": "int64",
           "description": "The height of the block which contains the anchor transaction."
+        },
+        "block_timestamp": {
+          "type": "string",
+          "format": "int64",
+          "description": "The UTC Unix timestamp of the block containing the anchor transaction."
         }
       }
     },

taprpc/taprootassets.swagger.json

@@ -1700,6 +1700,11 @@
           "type": "integer",
           "format": "int64",
           "description": "The height of the block which contains the anchor transaction."
+        },
+        "block_timestamp": {
+          "type": "string",
+          "format": "int64",
+          "description": "The UTC Unix timestamp of the block containing the anchor transaction."
         }
       }
     },