From 8f7b0c1e61afa5b6bc3383939e6345e45be54dd3 Mon Sep 17 00:00:00 2001
From: George Tsagkarelis <george.tsagkarelis@gmail.com>
Date: Wed, 8 Nov 2023 19:01:24 +0200
Subject: [PATCH] itest: retrieve anchor txid from outpoint

---
 itest/assertions.go  | 13 +++++++++++--
 itest/assets_test.go | 11 ++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/itest/assertions.go b/itest/assertions.go
index 8292de458..abb412253 100644
--- a/itest/assertions.go
+++ b/itest/assertions.go
@@ -69,9 +69,18 @@ func AssetAnchorCheck(txid, blockHash chainhash.Hash) AssetCheck {
 			return fmt.Errorf("asset is missing chain anchor field")
 		}
 
-		if a.ChainAnchor.AnchorTxid != txid.String() {
+		out, err :=
+			wire.NewOutPointFromString(a.ChainAnchor.AnchorOutpoint)
+
+		if err != nil {
+			return fmt.Errorf("unable to parse outpoint: %v", err)
+		}
+
+		anchorTxid := out.Hash.String()
+
+		if anchorTxid != txid.String() {
 			return fmt.Errorf("unexpected asset anchor TXID, got "+
-				"%v wanted %x", a.ChainAnchor.AnchorTxid,
+				"%v wanted %x", anchorTxid,
 				txid[:])
 		}
 
diff --git a/itest/assets_test.go b/itest/assets_test.go
index 9ac54946d..13a7bc6e8 100644
--- a/itest/assets_test.go
+++ b/itest/assets_test.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
+	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightninglabs/taproot-assets/taprpc"
@@ -173,11 +174,15 @@ func transferAssetProofs(t *harnessTest, src, dst *tapdHarness,
 	importedAssets := GroupAssetsByName(listResp.Assets)
 	for _, existingAsset := range assets {
 		gen := existingAsset.AssetGenesis
-		anchorTxHash, err := chainhash.NewHashFromStr(
-			existingAsset.ChainAnchor.AnchorTxid,
+		out, err := wire.NewOutPointFromString(
+			existingAsset.ChainAnchor.AnchorOutpoint,
 		)
 		require.NoError(t.t, err)
 
+		anchorTxHash := out.Hash
+
+		require.NoError(t.t, err)
+
 		anchorBlockHash, err := chainhash.NewHashFromStr(
 			existingAsset.ChainAnchor.AnchorBlockHash,
 		)
@@ -187,7 +192,7 @@ func transferAssetProofs(t *harnessTest, src, dst *tapdHarness,
 			t.t, importedAssets, gen.Name, gen.MetaHash,
 			AssetAmountCheck(existingAsset.Amount),
 			AssetTypeCheck(existingAsset.AssetGenesis.AssetType),
-			AssetAnchorCheck(*anchorTxHash, *anchorBlockHash),
+			AssetAnchorCheck(anchorTxHash, *anchorBlockHash),
 			AssetScriptKeyIsLocalCheck(shouldShowUpAsLocal),
 		)
 	}