l2 keystone mining fixes

* generate 1000 blocks to start network test, to make it less likely that we will choose a premature utxo
* when checking for keystones, check for any keystone to have been mined, this way if one fails the entire test doesn't fail (ex. if we try to use a premature uxto)
* 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 {
@@ -215,7 +215,7 @@ func TestFullNetwork(t *testing.T) {
 	go func() {
 		// create a new block every second, then view pop payouts and finalities
 
-		firstL2Keystone := hemi.L2KeystoneAbbreviate(l2Keystone).Serialize()
+		keystones := []hemi.L2Keystone{l2Keystone}
 
 		for {
 			l2KeystoneRequest := bssapi.L2KeystoneRequest{
@@ -251,20 +251,17 @@ func TestFullNetwork(t *testing.T) {
 
 			time.Sleep(1 * time.Second)
 
-			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,
-			})
-			if err != nil {
-				t.Logf("error: %s", err)
-				return
+			// check each keystone created to see if one made it into the bitcoin
+			// chain
+			for _, keystone := range keystones {
+				ks := hemi.L2KeystoneAbbreviate(keystone).Serialize()
+				err = bssapi.Write(ctx, bws.conn, "someotherid", bssapi.PopPayoutsRequest{
+					L2BlockForPayout: ks[:],
+				})
+				if err != nil {
+					t.Logf("error: %s", err)
+					return
+				}
 			}
 		}
 	}()

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 {