tapdb+tapfreighter: log proof delivery as confirmed

Add a `ConfirmProofDelivery` method to the export log. This function is
called after a proof has been successfully delivered to a remote peer.

Author: ffranr

tapdb/assets_store.go

@@ -126,6 +126,12 @@ type (
 	// output.
 	NewTransferOutput = sqlc.InsertAssetTransferOutputParams
 
+	// OutputProofDeliveryStatus wraps the params needed to set the delivery
+	// status of a given output proof.
+	//
+	// nolint: lll
+	OutputProofDeliveryStatus = sqlc.SetTransferOutputProofDeliveryStatusParams
+
 	// NewPassiveAsset wraps the params needed to insert a new passive
 	// asset.
 	NewPassiveAsset = sqlc.InsertPassiveAssetParams
@@ -278,6 +284,11 @@ type ActiveAssetsStore interface {
 	InsertAssetTransferOutput(ctx context.Context,
 		arg NewTransferOutput) error
 
+	// SetTransferOutputProofDeliveryStatus sets the delivery status of a
+	// given transfer output proof.
+	SetTransferOutputProofDeliveryStatus(ctx context.Context,
+		arg OutputProofDeliveryStatus) error
+
 	// FetchTransferInputs fetches the inputs to a given asset transfer.
 	FetchTransferInputs(ctx context.Context,
 		transferID int64) ([]TransferInputRow, error)
@@ -2750,6 +2761,43 @@ func (a *AssetStore) QueryProofTransferLog(ctx context.Context,
 	return timestamps, err
 }
 
+// ConfirmProofDelivery marks a transfer output proof as successfully
+// delivered to counterparty.
+func (a *AssetStore) ConfirmProofDelivery(ctx context.Context,
+	anchorOutpoint wire.OutPoint, outputPosition uint64) error {
+
+	// Serialize the anchor outpoint to bytes.
+	anchorOutpointBytes, err := encodeOutpoint(anchorOutpoint)
+	if err != nil {
+		return fmt.Errorf("unable to encode anchor outpoint: %w", err)
+	}
+
+	// Ensure that the position value can be stored in a 32-bit integer.
+	// Type cast if possible, otherwise return an error.
+	if outputPosition > math.MaxInt32 {
+		return fmt.Errorf("position value is too large for db: %d",
+			outputPosition)
+	}
+	outPosition := int32(outputPosition)
+
+	var writeTxOpts AssetStoreTxOptions
+
+	err = a.db.ExecTx(ctx, &writeTxOpts, func(q ActiveAssetsStore) error {
+		params := OutputProofDeliveryStatus{
+			DeliveryComplete:         sqlBool(true),
+			SerializedAnchorOutpoint: anchorOutpointBytes,
+			Position:                 outPosition,
+		}
+		return q.SetTransferOutputProofDeliveryStatus(ctx, params)
+	})
+	if err != nil {
+		return fmt.Errorf("failed to confirm transfer output proof "+
+			"delivery status in db: %w", err)
+	}
+
+	return nil
+}
+
 // ConfirmParcelDelivery marks a spend event on disk as confirmed. This updates
 // the on-chain reference information on disk to point to this new spend.
 func (a *AssetStore) ConfirmParcelDelivery(ctx context.Context,

tapfreighter/chain_porter.go

@@ -640,6 +640,8 @@ func (p *ChainPorter) transferReceiverProof(pkg *sendPackage) error {
 	ctx, cancel := p.WithCtxQuitNoTimeout()
 	defer cancel()
 
+	anchorTXID := pkg.OutboundPkg.AnchorTx.TxHash()
+
 	deliver := func(ctx context.Context, out TransferOutput) error {
 		key := out.ScriptKey.PubKey
 
@@ -720,6 +722,16 @@ func (p *ChainPorter) transferReceiverProof(pkg *sendPackage) error {
 				"courier service: %w", err)
 		}
 
+		// The proof has been successfully delivered to the receiver.
+		// Now, we will update our transfer log to reflect this.
+		err = p.cfg.ExportLog.ConfirmProofDelivery(
+			ctx, out.Anchor.OutPoint, out.Position,
+		)
+		if err != nil {
+			return fmt.Errorf("unable to log proof delivery "+
+				"confirmation: %w", err)
+		}
+
 		return nil
 	}
 
@@ -764,7 +776,7 @@ func (p *ChainPorter) transferReceiverProof(pkg *sendPackage) error {
 	// At this point we have the confirmation signal, so we can mark the
 	// parcel delivery as completed in the database.
 	err = p.cfg.ExportLog.ConfirmParcelDelivery(ctx, &AssetConfirmEvent{
-		AnchorTXID:             pkg.OutboundPkg.AnchorTx.TxHash(),
+		AnchorTXID:             anchorTXID,
 		BlockHash:              *pkg.TransferTxConfEvent.BlockHash,
 		BlockHeight:            int32(pkg.TransferTxConfEvent.BlockHeight),
 		TxIndex:                int32(pkg.TransferTxConfEvent.TxIndex),

tapfreighter/interface.go

@@ -415,6 +415,10 @@ type ExportLog interface {
 	// transactions for re-broadcast.
 	PendingParcels(context.Context) ([]*OutboundParcel, error)
 
+	// ConfirmProofDelivery marks a transfer output proof as successfully
+	// transferred.
+	ConfirmProofDelivery(context.Context, wire.OutPoint, uint64) error
+
 	// ConfirmParcelDelivery marks a spend event on disk as confirmed. This
 	// updates the on-chain reference information on disk to point to this
 	// new spend.