l2 keystone mining fixes

* generate 1000 blocks to start network test, to make it less likely that we will choose a premature utxo
* give time for l2 keystone to be mined
* do not continue if we have found a pop tx in a wire msg tx without error

fixes #2

e2e/network_test.go

@@ -88,7 +88,7 @@ func TestFullNetwork(t *testing.T) {
 			"-rpcuser=user",
 			"-rpcpassword=password",
 			"generatetoaddress",
-			"300", // need to generate a lot for greater chance to not spend coinbase
+			"1000", // need to generate a lot for greater chance to not spend coinbase
 			btcAddress.EncodeAddress(),
 		})
 	if err != nil {
@@ -212,22 +212,22 @@ func TestFullNetwork(t *testing.T) {
 		}
 	}()
 
-	go func() {
-		// create a new block every second, then view pop payouts and finalities
-
-		firstL2Keystone := hemi.L2KeystoneAbbreviate(l2Keystone).Serialize()
+	l2KeystoneRequest := bssapi.L2KeystoneRequest{
+		L2Keystone: l2Keystone,
+	}
 
+	go func() {
 		for {
-			l2KeystoneRequest := bssapi.L2KeystoneRequest{
-				L2Keystone: l2Keystone,
-			}
-
 			err = bssapi.Write(ctx, bws.conn, "someid", l2KeystoneRequest)
 			if err != nil {
 				t.Logf("error: %s", err)
 				return
 			}
 
+			// give time for the L2 Keystone to propogate to bitcoin tx mempool
+			time.Sleep(10 * time.Second)
+
+			// generate a new btc block, this should include the l2 keystone
 			err = runBitcoinCommand(ctx,
 				t,
 				bitcoindContainer,
@@ -246,21 +246,13 @@ func TestFullNetwork(t *testing.T) {
 				return
 			}
 
-			l2Keystone.L1BlockNumber++
-			l2Keystone.L2BlockNumber++
-
-			time.Sleep(1 * time.Second)
+			// give time for bfg to see the new block
+			time.Sleep(10 * time.Second)
 
+			// ensure the l2 keystone is in the chain
+			ks := hemi.L2KeystoneAbbreviate(l2Keystone).Serialize()
 			err = bssapi.Write(ctx, bws.conn, "someotherid", bssapi.PopPayoutsRequest{
-				L2BlockForPayout: firstL2Keystone[:],
-			})
-			if err != nil {
-				t.Logf("error: %s", err)
-				return
-			}
-
-			err = bssapi.Write(ctx, bws.conn, "someotheridz", bssapi.BTCFinalityByRecentKeystonesRequest{
-				NumRecentKeystones: 100,
+				L2BlockForPayout: ks[:],
 			})
 			if err != nil {
 				t.Logf("error: %s", err)

service/bfg/bfg.go

@@ -271,6 +271,8 @@ func (s *Server) handleBitcoinBroadcast(ctx context.Context, bws *bfgWs, payload
 		tl2, err = pop.ParseTransactionL2FromOpReturn(v.PkScript)
 		if err != nil {
 			log.Errorf(err.Error()) // handle real error below
+		} else {
+			break
 		}
 	}
 	if tl2 == nil {