Merge pull request #1465 from lightninglabs/extract-refactors-from-proof-v1

Extract non-controversion commits from Proof-system-v1 PR

Author: ffranr

asset/asset.go

@@ -1395,6 +1395,13 @@ func (a *Asset) HasSplitCommitmentWitness() bool {
 	return IsSplitCommitWitness(a.PrevWitnesses[0])
 }
 
+// IsTransferRoot returns true if this asset represents a root transfer. A root
+// transfer is an asset that is neither a genesis asset nor contains split
+// commitment witness data.
+func (a *Asset) IsTransferRoot() bool {
+	return !a.IsGenesisAsset() && !a.HasSplitCommitmentWitness()
+}
+
 // IsUnSpendable returns true if an asset uses the un-spendable script key and
 // has zero value.
 func (a *Asset) IsUnSpendable() bool {
@@ -1919,9 +1926,7 @@ type AltLeaf[T any] interface {
 }
 
 // NewAltLeaf instantiates a new valid AltLeaf.
-func NewAltLeaf(key ScriptKey, keyVersion ScriptVersion,
-	prevWitness []Witness) (*Asset, error) {
-
+func NewAltLeaf(key ScriptKey, keyVersion ScriptVersion) (*Asset, error) {
 	if key.PubKey == nil {
 		return nil, fmt.Errorf("script key must be non-nil")
 	}
@@ -1932,7 +1937,7 @@ func NewAltLeaf(key ScriptKey, keyVersion ScriptVersion,
 		Amount:              0,
 		LockTime:            0,
 		RelativeLockTime:    0,
-		PrevWitnesses:       prevWitness,
+		PrevWitnesses:       nil,
 		SplitCommitmentRoot: nil,
 		GroupKey:            nil,
 		ScriptKey:           key,

asset/asset_test.go

@@ -364,9 +364,6 @@ func TestAssetEncoding(t *testing.T) {
 	})
 
 	assertAssetEncoding("minimal asset", &Asset{
-		Genesis: Genesis{
-			MetaHash: [MetaHashLen]byte{},
-		},
 		ScriptKey: NewScriptKey(pubKey),
 	})
 

asset/encoding.go

@@ -864,7 +864,7 @@ func AltLeavesDecoder(r io.Reader, val any, buf *[8]byte, l uint64) error {
 			return err
 		}
 
-		leaves := make([]AltLeaf[Asset], 0, numItems)
+		leaves := make([]AltLeaf[Asset], numItems)
 		leafKeys := make(map[SerializedKey]struct{})
 		for i := uint64(0); i < numItems; i++ {
 			var streamBytes []byte
@@ -890,7 +890,7 @@ func AltLeavesDecoder(r io.Reader, val any, buf *[8]byte, l uint64) error {
 			}
 
 			leafKeys[leafKey] = struct{}{}
-			leaves = append(leaves, AltLeaf[Asset](&leaf))
+			leaves[i] = AltLeaf[Asset](&leaf)
 		}
 
 		*typ = leaves

asset/mock.go

@@ -678,12 +678,9 @@ func RandAssetWithValues(t testing.TB, genesis Genesis, groupKey *GroupKey,
 
 // RandAltLeaf generates a random Asset that is a valid AltLeaf.
 func RandAltLeaf(t testing.TB) *Asset {
-	randWitness := []Witness{
-		{TxWitness: test.RandTxWitnesses(t)},
-	}
 	randKey := RandScriptKey(t)
 	randVersion := ScriptVersion(test.RandInt[uint16]())
-	randLeaf, err := NewAltLeaf(randKey, randVersion, randWitness)
+	randLeaf, err := NewAltLeaf(randKey, randVersion)
 	require.NoError(t, err)
 	require.NoError(t, randLeaf.ValidateAltLeaf())
 

proof/taproot.go

@@ -411,7 +411,7 @@ func (p TaprootProof) DeriveByAssetExclusion(assetCommitmentKey,
 
 	return deriveCommitmentKeys(
 		tapCommitment, p.InternalKey,
-		p.CommitmentProof.TapSiblingPreimage, true, true,
+		p.CommitmentProof.TapSiblingPreimage, false, true,
 	)
 }
 

proof/testdata/proof_tlv_encoding_generated.json

@@ -336,13 +336,13 @@ func addOtherOutputExclusionProofs(outputs []*tappsbt.VOutput,
 	for idx := range outputs {
 		vOut := outputs[idx]
 
-		haveIProof := params.HaveInclusionProof(vOut.AnchorOutputIndex)
-		haveEProof := params.HaveExclusionProof(vOut.AnchorOutputIndex)
+		outIndex := vOut.AnchorOutputIndex
+		haveIProof := params.HaveInclusionProof(outIndex)
+		haveEProof := params.HaveExclusionProof(outIndex)
 		if haveIProof || haveEProof {
 			continue
 		}
 
-		outIndex := vOut.AnchorOutputIndex
 		tapTree := outputCommitments[outIndex]
 
 		_, splitExclusionProof, err := tapTree.Proof(

tappsbt/testdata/psbt_encoding_generated.json

@@ -2075,9 +2075,9 @@ func ValidateAnchorInputs(anchorPacket *psbt.Packet, packets []*tappsbt.VPacket,
 		}
 
 		// This is the most important check. This ensures that the
-		// assets in the outputs of the virtual transactions match
-		// exactly the assets that are committed to in the anchor
-		// output script.
+		// assets in the inputs of the virtual transactions match
+		// exactly the assets committed to in the anchor output script
+		// that is being spent.
 		anchorScript := inputScripts[anchorOutpoint]
 		if !bytes.Equal(anchorScript, script) {
 			// The commitment may not be V2; let's check against

tapsend/proof.go

@@ -388,7 +388,7 @@ func createPacket(t *testing.T, addr address.Tap, prevInput asset.PrevID,
 		for range numAltLeaves {
 			scriptKey := asset.NewScriptKey(test.RandPubKey(t))
 			baseLeaf, err := asset.NewAltLeaf(
-				scriptKey, asset.ScriptV0, nil,
+				scriptKey, asset.ScriptV0,
 			)
 			require.NoError(t, err)
 
@@ -1195,7 +1195,7 @@ var createOutputCommitmentsTestCases = []testCase{{
 
 		altLeafScriptKey := asset.NewScriptKey(test.RandPubKey(t))
 		newAltLeaf, err := asset.NewAltLeaf(
-			altLeafScriptKey, asset.ScriptV0, nil,
+			altLeafScriptKey, asset.ScriptV0,
 		)
 		require.NoError(t, err)