tapfreighter: fix wrong proof outpoint being used

This fixes a couple of instances where the porter used the wrong
outpoint for proof locators when creating new proofs for a send package.
This was previously not noticed because the outpoint in the locator was
ignored by both the file based and database archive. With the outpoint
now being mandatory, this lead to failures in the integration tests.

Author: guggero

tapfreighter/chain_porter.go

@@ -458,7 +458,7 @@ func (p *ChainPorter) storeProofs(sendPkg *sendPackage) error {
 		outputProofLocator := proof.Locator{
 			AssetID:   &firstInput.ID,
 			ScriptKey: *out.ScriptKey.PubKey,
-			OutPoint:  &firstInput.OutPoint,
+			OutPoint:  fn.Ptr(proofSuffix.OutPoint()),
 		}
 		outputProof := &proof.AnnotatedProof{
 			Locator: outputProofLocator,
@@ -536,19 +536,20 @@ func (p *ChainPorter) fetchInputProof(ctx context.Context,
 // updateAssetProofFile retrieves and updates the proof file for the given asset
 // ID and script key with the new proof.
 func (p *ChainPorter) updateAssetProofFile(ctx context.Context, assetID asset.ID,
-	scriptKeyPub *btcec.PublicKey, outPoint *wire.OutPoint,
+	scriptKeyPub *btcec.PublicKey, oldOutPoint *wire.OutPoint,
 	confEvent *chainntnfs.TxConfirmation,
 	newProof *proof.Proof) (*proof.AnnotatedProof, *proof.Proof, error) {
 
 	// Retrieve current proof file.
 	locator := proof.Locator{
 		AssetID:   &assetID,
 		ScriptKey: *scriptKeyPub,
-		OutPoint:  outPoint,
+		OutPoint:  oldOutPoint,
 	}
 	currentProofFileBlob, err := p.cfg.AssetProofs.FetchProof(ctx, locator)
 	if err != nil {
-		return nil, nil, fmt.Errorf("error fetching proof: %w", err)
+		return nil, nil, fmt.Errorf("error fetching current proof: %w",
+			err)
 	}
 	currentProofFile := proof.NewEmptyFile(proof.V0)
 	err = currentProofFile.Decode(bytes.NewReader(currentProofFileBlob))
@@ -585,7 +586,7 @@ func (p *ChainPorter) updateAssetProofFile(ctx context.Context, assetID asset.ID
 		Locator: proof.Locator{
 			AssetID:   &assetID,
 			ScriptKey: *newProof.Asset.ScriptKey.PubKey,
-			OutPoint:  outPoint,
+			OutPoint:  fn.Ptr(newProof.OutPoint()),
 		},
 		Blob: newProofFileBuffer.Bytes(),
 	}
@@ -734,7 +735,7 @@ func (p *ChainPorter) transferReceiverProof(pkg *sendPackage) error {
 		proofLocator := proof.Locator{
 			AssetID:   &passiveAsset.GenesisID,
 			ScriptKey: *passiveAsset.ScriptKey.PubKey,
-			OutPoint:  &passiveAsset.PrevAnchorPoint,
+			OutPoint:  fn.Ptr(passiveAsset.NewProof.OutPoint()),
 		}
 		proofFileBlob, err := p.cfg.AssetProofs.FetchProof(
 			ctx, proofLocator,