proof+tappsbt: update testdata

Author: gijswijs

proof/mock.go

@@ -578,6 +578,7 @@ func NewTestFromProof(t testing.TB, p *Proof) *TestProof {
 	t.Helper()
 
 	tp := &TestProof{
+		Version:         p.Version,
 		PrevOut:         p.PrevOut.String(),
 		BlockHeader:     NewTestFromBlockHeader(t, &p.BlockHeader),
 		BlockHeight:     p.BlockHeight,
@@ -651,6 +652,7 @@ func NewTestFromProof(t testing.TB, p *Proof) *TestProof {
 }
 
 type TestProof struct {
+	Version          TransitionVersion         `json:"version"`
 	PrevOut          string                    `json:"prev_out"`
 	BlockHeader      *TestBlockHeader          `json:"block_header"`
 	BlockHeight      uint32                    `json:"block_height"`
@@ -673,6 +675,7 @@ func (tp *TestProof) ToProof(t testing.TB) *Proof {
 	t.Helper()
 
 	p := &Proof{
+		Version:         tp.Version,
 		PrevOut:         test.ParseOutPoint(t, tp.PrevOut),
 		BlockHeader:     *tp.BlockHeader.ToBlockHeader(t),
 		BlockHeight:     tp.BlockHeight,
@@ -872,28 +875,58 @@ func NewTestFromCommitmentProof(t testing.TB,
 		TapscriptSibling: commitment.HexTapscriptSibling(
 			t, p.TapSiblingPreimage,
 		),
+		STXOProofs:      NewTestFromSTXOProofs(t, p),
 		UnknownOddTypes: p.UnknownOddTypes,
 	}
 }
 
+func NewTestFromSTXOProofs(t testing.TB,
+	p *CommitmentProof) *map[string]commitment.TestProof {
+
+	t.Helper()
+
+	stxoProofs := make(map[string]commitment.TestProof)
+	for key, proof := range p.STXOProofs {
+		keyHex := hex.EncodeToString(key[:])
+		stxoProofs[keyHex] = *commitment.NewTestFromProof(t, &proof)
+	}
+	return &stxoProofs
+}
+
+// nolint: lll
 type TestCommitmentProof struct {
-	Proof            *commitment.TestProof `json:"proof"`
-	TapscriptSibling string                `json:"tapscript_sibling"`
-	UnknownOddTypes  tlv.TypeMap           `json:"unknown_odd_types"`
+	Proof            *commitment.TestProof            `json:"proof"`
+	TapscriptSibling string                           `json:"tapscript_sibling"`
+	STXOProofs       *map[string]commitment.TestProof `json:"stxo_proofs"`
+	UnknownOddTypes  tlv.TypeMap                      `json:"unknown_odd_types"`
 }
 
 func (tcp *TestCommitmentProof) ToCommitmentProof(
 	t testing.TB) *CommitmentProof {
 
 	t.Helper()
 
-	return &CommitmentProof{
+	stxoProofs := make(map[asset.SerializedKey]commitment.Proof)
+	for key, proof := range *tcp.STXOProofs {
+		keyBytes, err := hex.DecodeString(key)
+		require.NoError(t, err)
+		key := asset.SerializedKey(keyBytes)
+		stxoProofs[key] = *proof.ToProof(t)
+	}
+
+	cp := &CommitmentProof{
 		Proof: *tcp.Proof.ToProof(t),
 		TapSiblingPreimage: commitment.ParseTapscriptSibling(
 			t, tcp.TapscriptSibling,
 		),
 		UnknownOddTypes: tcp.UnknownOddTypes,
 	}
+
+	if len(stxoProofs) > 0 {
+		cp.STXOProofs = stxoProofs
+	}
+
+	return cp
 }
 
 func NewTestFromTapscriptProof(t testing.TB,

proof/testdata/ownership-proof.hex

@@ -1 +1 @@
-5441505000040000000002244146fded5052d4d6666f2e3aad153de175f0300335eeef1d1796ddf8771b8e9b00000001045000004020f8b7cdd6f9d28ace33ce0a4065f92d7de9f4b73be10818d27f116530d316326ea8cbe7ba88ec8404872776918c153ee13d777c05c8b3da03cf4be76d8a56b12748725367ffff7f200000000006fd018c020000000001024146fded5052d4d6666f2e3aad153de175f0300335eeef1d1796ddf8771b8e9b0100000000000000007a6aed31fe675df9f3cbb30ec93c6aa64c0357ee95e041b68209dd0405126ea100000000000000000003e803000000000000225120b39d40166eab936be97ba489bd3e0b804fbd3c405b6b4dd853a7ecd645c7b8c9e803000000000000225120c439941c12ce99347f4a629a938835f2cdd7cc2646da97f18c52b4f17a18b0f4a9d0f505000000002251208ea64fa1adc917b9a9f7b6f4d671faa71a3ce538e4d22f2bc7696b2228448a2801400a89ab38452e2851d9b8a8faa24078d5517588fa2c857a2b4be65c0ac56631771139a245721a0b70e75e0c33a6eec16ee1d540c00489c8321569edc4e0d3e57f02473044022053b3677ee4a83b5b64d25f6c9f6d03a6678f2daeecad0966b7f1bfcb43f86b6a022041be57f3ca6ce364e28ae4991633ba9a4198f2a8ecd4489e4e1998cd447d8ff3012102dd95677d998373268ea2e0fd1a9bdd62e74eaee0db36ae080957c8f4732448c400000000082201568673ad5cad10893ce5f16f5943297a3a5d3d0e669ea3a337a32654c7533125000afd02b400010002590028ff502c98283a6008d6883a1e634a5a55c10b7927b6e60a3c90de95053e47000000000f66697273742d6974657374627578788d3b306cb9fc3bc5478adccf848583d8952d793747c31dddfd486d7d5d84efea00000000000401000603fd02580bfd022301fd021f0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b44a000171eba4c1f1a64d5342c68cfcfce96a3332c936824f676cc047db8c79bf24f8ba0000000000000258ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffd016600010002590028ff502c98283a6008d6883a1e634a5a55c10b7927b6e60a3c90de95053e47000000000f66697273742d6974657374627578788d3b306cb9fc3bc5478adccf848583d8952d793747c31dddfd486d7d5d84efea00000000000401000603fd02580bad01ab01654146fded5052d4d6666f2e3aad153de175f0300335eeef1d1796ddf8771b8e9b00000001898e84dbe0f54e8c551fa7f45e8299c57239a4cdd9d5641da75eaf83a577fdd002e2356b87d6435363aaa7a763eeeb3818000527783c0c4ed72999a4853ef2a23b0342014062f411bf03948cb3ca8a887a6449b1b99f93458e1c2f837ec20c7759461ad433bdeb43fc3abf29cde2cb2680e3f1c7a5ac60dc5833042ed31067f80c57b285370d2894c638977dfebc6426564611a74aedddb57c7664e9278213cfcce97de38733f000000000000004b00e02000010210273567b487064507c8bb16c912e8ec608bf09f2d461a89bfe63c37a7b3fdd21fa0e020000102102550807e261f1add28272dd1dc99979f7bb0e87982c296d52d7b58fba2c1a68e40c9f0004000000010221026f8944cb3cc0e077dedfbe312cbe6071861bec5cdc055ff6fe7fe26f5a5b8357037401490001000220898e84dbe0f54e8c551fa7f45e8299c57239a4cdd9d5641da75eaf83a577fdd004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010202220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0df802c70004000000000221028d87ba784f1639cb7d85f0d1f79e3a0f36a32b745aa84ef5e175aee24ab4631f039c01710001000220898e84dbe0f54e8c551fa7f45e8299c57239a4cdd9d5641da75eaf83a577fdd0044a00014c598c9376185fd1dfb86659a5c3675bab19595cf1abf5a1cc7b7dc887d607cf0000000000000258fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7022700010202220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2e0004000000020221027e12e36f36b1b39f15cf888cc4ec443dea1f07082fb35ea2f2d170c782687e7305030401010f9f0004000000000221028d87ba784f1639cb7d85f0d1f79e3a0f36a32b745aa84ef5e175aee24ab4631f037401490001000220898e84dbe0f54e8c551fa7f45e8299c57239a4cdd9d5641da75eaf83a577fdd004220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010202220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff154201405a9d3325ceddab77bbb43583930ab428d76c89b11b3af6fe4e97daee4c4eb34422c1d8e9e67bfde1d3b1a8bfeb8ec7e458ffe0e4f8b9f2faf1ad946e43b6a9ec1604000001be
+544150500004000000010224322fb1e1fc3e8ac3d230664a5959a3eb5a343294841c3ad4c088aa9f9f82ea3000000001045000004020435da7bf31228018b03be8072d6262ffc632828e6636ad64b8681d6cd7a529341d8a57f58873f6e1c48db6b8a1570a7b93e39d2b387fcb27420e4c0918b3d6e0232df967ffff7f200000000006fd018d02000000000102322fb1e1fc3e8ac3d230664a5959a3eb5a343294841c3ad4c088aa9f9f82ea30010000000000000000197be6fe5d5f9488aa038960ee04ceb509791267f6e46edc73d5d7be13c08cd000000000000000000003e803000000000000225120fd5f09800f7b1befe3f0649cb65c35004d3d82dc21d06af7a569333532ba0eade803000000000000225120512d38f275f8a91ca8899c162af76b86b882271431255f10d005e23941fe69f6a0cff5050000000022512080cf471bd28b9abf673df24fc74fd4a86e4346376cac19b70628f61b5dcd964101408b89a550784e4f6660569c2d9c21eb54668bcdecca1ecd23f39bc22ea9b06a98587a381a9e4606ed691c637b4b8343fe660fef8ba6dbe27a0a5b1ed66ef437ce024830450221009551b21259abdadf24db15104040184a7a7c7913c75fa7612e2cf77695436da6022066fe3e354acb87e33ec215369c500e2de31c9d8e15581359174bc023041f2035012103fb325a9156865ffe610b0c244c4c74ae63484e8b342f6750483a5f2e40a030910000000008220148760dde51a3c940aa1b292d79d609dc8a3c4066fd54171099d0486927342e89000afd02b4000100025904c16d2503ae3adf056f8fbbec9dd0cb8732b086afc6402749f9cc2cbb728dcf000000000f66697273742d6974657374627578782903629f38feee5e92059430922a9f474fa5afb3cca01fa29eb9e376e7680cb200000000000401000603fd02580bfd022301fd021f0165000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005fd01b44a0001afbfd79e63ab70b2e1f37cd985fb044edfb32772265292289cb7dc6c2d8fa1c90000000000000258ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffd0166000100025904c16d2503ae3adf056f8fbbec9dd0cb8732b086afc6402749f9cc2cbb728dcf000000000f66697273742d6974657374627578782903629f38feee5e92059430922a9f474fa5afb3cca01fa29eb9e376e7680cb200000000000401000603fd02580bad01ab0165322fb1e1fc3e8ac3d230664a5959a3eb5a343294841c3ad4c088aa9f9f82ea3000000001316e6e2cda487ccb842a33b6e053ea73ac7d530c3bab7cb21e1baab55e272fb6025e1140bf5d148145041d19c01a37833f8a5cdaa6a38d2f0351317d82235c1d830342014035fbd0d76bda89280998d8231133646715496054d95e43f3e2968f056b1d48bf4bc8d8bf248a2fab56b47925aedc488ae15f9a0595aaaca96c1f4a02be6365fb0d287441c7d7a7a630b6b55db3c5b359029a7dbdd85fbc9e2f20d10115a8e4dd528d00000000000004b00e020000102102e91d8a3534529700d361612b2030635a5963292fafe5feb46fa55b8fc4decb430e020000102102478db6bee52588200b0fc44e5bcbafa942e2b9d47585935caf4c8921b6ef0c710c9f0004000000010221035e8e461f9ad1b524191e4b41e22aabd0e097abd9ec55536cbd7f7a6953ae3601037401490001000220316e6e2cda487ccb842a33b6e053ea73ac7d530c3bab7cb21e1baab55e272fb604220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff022700010202220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0dfd012002ef0004000000000221034395429ea34c178b1a9815b0174e1419c1ac3a40b1ff244842e81bc5c97471ca03c401710001000220316e6e2cda487ccb842a33b6e053ea73ac7d530c3bab7cb21e1baab55e272fb6044a0001e9a19edac39ef630189662e357c25732241beee0f5fb8782feb81ad570f43fda0000000000000258ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdf024f000102024a00017408363b807cbcbe19bdede39dfc364acb67492846939cff45c08144723c73970000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f2e000400000002022102c4323a4e334295388956ebc1c309a3263a1483a74eaa1e8d4b0184be5c82b36505030401010fc70004000000000221034395429ea34c178b1a9815b0174e1419c1ac3a40b1ff244842e81bc5c97471ca039c01490001000220316e6e2cda487ccb842a33b6e053ea73ac7d530c3bab7cb21e1baab55e272fb604220000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff024f000102024a00017408363b807cbcbe19bdede39dfc364acb67492846939cff45c08144723c73970000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f15420140a75ea1cfe9c8bd39ebb7b42271f70ba97f42a26b8f07049eb97d4470b4064181d55f46ec5e13cca5a513f42610b38bef1b184a48def81e3307cb0a479f9d54311604000001bc