Merge branch 'main' into e35_sharded_bloom_ef

ledgerwatch · Sep 18, 2023 · 4a67e92 · 4a67e92
2 parents ec1068a + 2fca6e8
commit 4a67e92
Show file tree

Hide file tree

Showing 21 changed files with 207 additions and 126 deletions.
diff --git a/gointerfaces/downloader/downloader.pb.go b/gointerfaces/downloader/downloader.pb.go
diff --git a/gointerfaces/downloader/downloader_grpc.pb.go b/gointerfaces/downloader/downloader_grpc.pb.go
diff --git a/gointerfaces/execution/execution.pb.go b/gointerfaces/execution/execution.pb.go
diff --git a/gointerfaces/execution/execution_grpc.pb.go b/gointerfaces/execution/execution_grpc.pb.go
diff --git a/gointerfaces/remote/ethbackend.pb.go b/gointerfaces/remote/ethbackend.pb.go
diff --git a/gointerfaces/remote/ethbackend_grpc.pb.go b/gointerfaces/remote/ethbackend_grpc.pb.go
diff --git a/gointerfaces/remote/kv.pb.go b/gointerfaces/remote/kv.pb.go
diff --git a/gointerfaces/remote/kv_grpc.pb.go b/gointerfaces/remote/kv_grpc.pb.go
diff --git a/gointerfaces/remote/mocks.go b/gointerfaces/remote/mocks.go
diff --git a/gointerfaces/sentinel/sentinel.pb.go b/gointerfaces/sentinel/sentinel.pb.go
diff --git a/gointerfaces/sentinel/sentinel_grpc.pb.go b/gointerfaces/sentinel/sentinel_grpc.pb.go
diff --git a/gointerfaces/sentry/sentry.pb.go b/gointerfaces/sentry/sentry.pb.go
diff --git a/gointerfaces/sentry/sentry_grpc.pb.go b/gointerfaces/sentry/sentry_grpc.pb.go
diff --git a/gointerfaces/txpool/mining.pb.go b/gointerfaces/txpool/mining.pb.go
diff --git a/gointerfaces/txpool/mining_grpc.pb.go b/gointerfaces/txpool/mining_grpc.pb.go
diff --git a/gointerfaces/txpool/txpool.pb.go b/gointerfaces/txpool/txpool.pb.go
diff --git a/gointerfaces/txpool/txpool_grpc.pb.go b/gointerfaces/txpool/txpool_grpc.pb.go
diff --git a/gointerfaces/types/types.pb.go b/gointerfaces/types/types.pb.go
diff --git a/txpool/fetch.go b/txpool/fetch.go
@@ -222,20 +222,15 @@ func (f *Fetch) handleInboundMessage(ctx context.Context, req *sentry.InboundMes
 		if err != nil {
 			return fmt.Errorf("parsing NewPooledTransactionHashes: %w", err)
 		}
-		var hashbuf [32]byte
-		var unknownHashes types2.Hashes
-		for i := 0; i < hashCount; i++ {
-			_, pos, err = types2.ParseHash(req.Data, pos, hashbuf[:0])
-			if err != nil {
-				return fmt.Errorf("parsing NewPooledTransactionHashes: %w", err)
-			}
-			known, err := f.pool.IdHashKnown(tx, hashbuf[:])
-			if err != nil {
+		hashes := make([]byte, 32*hashCount)
+		for i := 0; i < len(hashes); i += 32 {
+			if _, pos, err = types2.ParseHash(req.Data, pos, hashes[i:]); err != nil {
 				return err
 			}
-			if !known {
-				unknownHashes = append(unknownHashes, hashbuf[:]...)
-			}
+		}
+		unknownHashes, err := f.pool.FilterKnownIdHashes(tx, hashes)
+		if err != nil {
+			return err
 		}
 		if len(unknownHashes) > 0 {
 			var encodedRequest []byte
@@ -256,15 +251,9 @@ func (f *Fetch) handleInboundMessage(ctx context.Context, req *sentry.InboundMes
 		if err != nil {
 			return fmt.Errorf("parsing NewPooledTransactionHashes88: %w", err)
 		}
-		var unknownHashes types2.Hashes
-		for i := 0; i < len(hashes); i += 32 {
-			known, err := f.pool.IdHashKnown(tx, hashes[i:i+32])
-			if err != nil {
-				return err
-			}
-			if !known {
-				unknownHashes = append(unknownHashes, hashes[i:i+32]...)
-			}
+		unknownHashes, err := f.pool.FilterKnownIdHashes(tx, hashes)
+		if err != nil {
+			return err
 		}
 
 		if len(unknownHashes) > 0 {
@@ -482,7 +471,10 @@ func (f *Fetch) handleStateChanges(ctx context.Context, client StateChangesClien
 					if err = f.threadSafeParseStateChangeTxn(func(parseContext *types2.TxParseContext) error {
 						_, err = parseContext.ParseTransaction(change.Txs[i], 0, unwindTxs.Txs[i], unwindTxs.Senders.At(i), false /* hasEnvelope */, false /* wrappedWithBlobs */, nil)
 						if unwindTxs.Txs[i].Type == types2.BlobTxType {
-							knownBlobTxn := f.pool.GetKnownBlobTxn(tx, unwindTxs.Txs[i].IDHash[:])
+							knownBlobTxn, err := f.pool.GetKnownBlobTxn(tx, unwindTxs.Txs[i].IDHash[:])
+							if err != nil {
+								return err
+							}
 							if knownBlobTxn != nil {
 								unwindTxs.Txs[i] = knownBlobTxn.Tx
 							}