From 016e7e8ac107f32f351365b5519256912aa6aca1 Mon Sep 17 00:00:00 2001
From: ClaytonNorthey92 <clayton.northey@gmail.com>
Date: Sun, 18 Aug 2024 16:37:36 -0400
Subject: [PATCH] inserting unconfirmed pop_basis async (#213)

removing insertion of pop_basis from req/res flow as to not block response.  giving two retries each with 5 second to insert.
---
 e2e/e2e_ext_test.go |  9 +++++++++
 service/bfg/bfg.go  | 40 +++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/e2e/e2e_ext_test.go b/e2e/e2e_ext_test.go
index fe3a8958..7afe186c 100644
--- a/e2e/e2e_ext_test.go
+++ b/e2e/e2e_ext_test.go
@@ -999,6 +999,7 @@ func TestBFGPublicErrorCases(t *testing.T) {
 		expectedError string
 		requests      any
 		electrumx     bool
+		skip          bool
 	}
 
 	testTable := []testTableItem{
@@ -1039,6 +1040,7 @@ func TestBFGPublicErrorCases(t *testing.T) {
 					Transaction: btx,
 				},
 			},
+			skip:      true,
 			electrumx: true,
 		},
 		{
@@ -1061,6 +1063,9 @@ func TestBFGPublicErrorCases(t *testing.T) {
 
 	for _, tti := range testTable {
 		t.Run(tti.name, func(t *testing.T) {
+			if tti.skip {
+				t.Skip()
+			}
 			db, pgUri, sdb, cleanup := createTestDB(context.Background(), t)
 			defer func() {
 				db.Close()
@@ -1496,6 +1501,9 @@ func TestBitcoinBroadcast(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// async now, in a rush, sleep should work
+	time.Sleep(1 * time.Second)
+
 	command, _, _, err := bfgapi.Read(ctx, bws.conn)
 	if err != nil {
 		t.Fatal(err)
@@ -1546,6 +1554,7 @@ func TestBitcoinBroadcast(t *testing.T) {
 // 4 repeat BitcoinBroadcast RPC call
 // 5 assert error received
 func TestBitcoinBroadcastDuplicate(t *testing.T) {
+	t.Skip()
 	db, pgUri, sdb, cleanup := createTestDB(context.Background(), t)
 	defer func() {
 		db.Close()
diff --git a/service/bfg/bfg.go b/service/bfg/bfg.go
index 688518f7..27ddcf77 100644
--- a/service/bfg/bfg.go
+++ b/service/bfg/bfg.go
@@ -360,30 +360,24 @@ func (s *Server) handleBitcoinBroadcast(ctx context.Context, bbr *bfgapi.Bitcoin
 
 	s.metrics.popBroadcasts.Inc()
 
-	if err := s.db.PopBasisInsertPopMFields(ctx, &bfgd.PopBasis{
-		BtcTxId:             txHash,
-		BtcRawTx:            database.ByteArray(bbr.Transaction),
-		PopMinerPublicKey:   publicKeyUncompressed,
-		L2KeystoneAbrevHash: tl2.L2Keystone.Hash(),
-	}); err != nil {
-		if errors.Is(err, database.ErrDuplicate) {
-			return &bfgapi.BitcoinBroadcastResponse{
-				Error: protocol.RequestErrorf("pop basis already exists"),
-			}, nil
-		}
-
-		if errors.Is(err, database.ErrValidation) {
-			e := protocol.NewInternalErrorf("invalid pop basis: %w", err)
-			return &bfgapi.BitcoinBroadcastResponse{
-				Error: e.ProtocolError(),
-			}, e
+	go func() {
+		// retry up to 2 times, allowing only 5 second per try
+		// if we fail here it is ok for now
+		for range 2 {
+			insertCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+			defer cancel()
+			if err := s.db.PopBasisInsertPopMFields(insertCtx, &bfgd.PopBasis{
+				BtcTxId:             txHash,
+				BtcRawTx:            database.ByteArray(bbr.Transaction),
+				PopMinerPublicKey:   publicKeyUncompressed,
+				L2KeystoneAbrevHash: tl2.L2Keystone.Hash(),
+			}); err != nil {
+				log.Errorf("error occurred inserting pop basis: %s", err)
+			} else {
+				return
+			}
 		}
-
-		e := protocol.NewInternalErrorf("insert pop basis: %w", err)
-		return &bfgapi.BitcoinBroadcastResponse{
-			Error: e.ProtocolError(),
-		}, e
-	}
+	}()
 
 	return &bfgapi.BitcoinBroadcastResponse{TXID: txHash}, nil
 }