Merge pull request #1473 from bhandras/transfer-anchor-pkscript

guggero · web-flow · commit 164f82de491d · 2025-04-22T14:12:44.000+02:00
taprpc: TransferOutputAnchor to include the anchor pkscript
diff --git a/rpcserver.go b/rpcserver.go
@@ -3589,6 +3589,7 @@ func marshalOutboundParcel(
 			MerkleRoot:       out.Anchor.MerkleRoot[:],
 			TapscriptSibling: out.Anchor.TapscriptSibling,
 			NumPassiveAssets: out.Anchor.NumPassiveAssets,
+			PkScript:         out.Anchor.PkScript,
 		}
 		scriptPubKey := out.ScriptKey.PubKey
 
diff --git a/tapfreighter/interface.go b/tapfreighter/interface.go
@@ -224,6 +224,9 @@ type Anchor struct {
 	// NumPassiveAssets is the number of passive assets in the commitment
 	// for this anchor output.
 	NumPassiveAssets uint32
+
+	// PkScript is the pkScript of the anchor output.
+	PkScript []byte
 }
 
 // OutputIdentifier is a key that can be used to uniquely identify a transfer
diff --git a/tapfreighter/parcel.go b/tapfreighter/parcel.go
@@ -726,6 +726,7 @@ func outputAnchor(anchorTx *tapsend.AnchorTransaction, vOut *tappsbt.VOutput,
 		MerkleRoot:        merkleRoot[:],
 		TapscriptSibling:  preimageBytes,
 		NumPassiveAssets:  numPassiveAssets,
+		PkScript:          txOut.PkScript,
 	}, nil
 }
 
diff --git a/taprpc/assetwalletrpc/assetwallet.swagger.json b/taprpc/assetwalletrpc/assetwallet.swagger.json
@@ -1147,6 +1147,11 @@
         "num_passive_assets": {
           "type": "integer",
           "format": "int64"
+        },
+        "pk_script": {
+          "type": "string",
+          "format": "byte",
+          "description": "pk_script is the pkscript of the anchor output."
         }
       }
     }
diff --git a/taprpc/taprootassets.pb.go b/taprpc/taprootassets.pb.go
diff --git a/taprpc/taprootassets.proto b/taprpc/taprootassets.proto
@@ -779,6 +779,9 @@ message TransferOutputAnchor {
     bytes tapscript_sibling = 6;
 
     uint32 num_passive_assets = 7;
+
+    // pk_script is the pkscript of the anchor output.
+    bytes pk_script = 8;
 }
 
 enum OutputType {
diff --git a/taprpc/taprootassets.swagger.json b/taprpc/taprootassets.swagger.json
@@ -2527,6 +2527,11 @@
         "num_passive_assets": {
           "type": "integer",
           "format": "int64"
+        },
+        "pk_script": {
+          "type": "string",
+          "format": "byte",
+          "description": "pk_script is the pkscript of the anchor output."
         }
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -3589,6 +3589,7 @@ func marshalOutboundParcel(`
`3589`	`3589`	`MerkleRoot: out.Anchor.MerkleRoot[:],`
`3590`	`3590`	`TapscriptSibling: out.Anchor.TapscriptSibling,`
`3591`	`3591`	`NumPassiveAssets: out.Anchor.NumPassiveAssets,`
	`3592`	`+ PkScript: out.Anchor.PkScript,`
`3592`	`3593`	`}`
`3593`	`3594`	`scriptPubKey := out.ScriptKey.PubKey`
`3594`	`3595`
Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,9 @@ type Anchor struct {`
`224`	`224`	`// NumPassiveAssets is the number of passive assets in the commitment`
`225`	`225`	`// for this anchor output.`
`226`	`226`	`NumPassiveAssets uint32`
	`227`	`+`
	`228`	`+ // PkScript is the pkScript of the anchor output.`
	`229`	`+ PkScript []byte`
`227`	`230`	`}`
`228`	`231`
`229`	`232`	`// OutputIdentifier is a key that can be used to uniquely identify a transfer`
Original file line number	Diff line number	Diff line change
`@@ -726,6 +726,7 @@ func outputAnchor(anchorTx tapsend.AnchorTransaction, vOut tappsbt.VOutput,`
`726`	`726`	`MerkleRoot: merkleRoot[:],`
`727`	`727`	`TapscriptSibling: preimageBytes,`
`728`	`728`	`NumPassiveAssets: numPassiveAssets,`
	`729`	`+ PkScript: txOut.PkScript,`
`729`	`730`	`}, nil`
`730`	`731`	`}`
`731`	`732`
Original file line number	Diff line number	Diff line change
`@@ -1147,6 +1147,11 @@`
`1147`	`1147`	`"num_passive_assets": {`
`1148`	`1148`	`"type": "integer",`
`1149`	`1149`	`"format": "int64"`
	`1150`	`+ },`
	`1151`	`+ "pk_script": {`
	`1152`	`+ "type": "string",`
	`1153`	`+ "format": "byte",`
	`1154`	`+ "description": "pk_script is the pkscript of the anchor output."`
`1150`	`1155`	`}`
`1151`	`1156`	`}`
`1152`	`1157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -779,6 +779,9 @@ message TransferOutputAnchor {`
`779`	`779`	`bytes tapscript_sibling = 6;`
`780`	`780`
`781`	`781`	`uint32 num_passive_assets = 7;`
	`782`	`+`
	`783`	`+ // pk_script is the pkscript of the anchor output.`
	`784`	`+ bytes pk_script = 8;`
`782`	`785`	`}`
`783`	`786`
`784`	`787`	`enum OutputType {`
Original file line number	Diff line number	Diff line change
`@@ -2527,6 +2527,11 @@`
`2527`	`2527`	`"num_passive_assets": {`
`2528`	`2528`	`"type": "integer",`
`2529`	`2529`	`"format": "int64"`
	`2530`	`+ },`
	`2531`	`+ "pk_script": {`
	`2532`	`+ "type": "string",`
	`2533`	`+ "format": "byte",`
	`2534`	`+ "description": "pk_script is the pkscript of the anchor output."`
`2530`	`2535`	`}`
`2531`	`2536`	`}`
`2532`	`2537`	`},`