txpool-respect-parse-transaction-result (erigontech#1103)

cffls · Sep 4, 2024 · 3386925 · 3386925
1 parent f911a0d
commit 3386925
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/zk/txpool/txpool_grpc_server.go b/zk/txpool/txpool_grpc_server.go
@@ -187,10 +187,11 @@ func (s *GrpcServer) Add(ctx context.Context, in *txpool_proto.AddRequest) (*txp
 
 	j := 0
 	for i := 0; i < len(in.RlpTxs); i++ { // some incoming txs may be rejected, so - need secnod index
-		slots.Resize(uint(j + 1))
-		slots.Txs[j] = &types.TxSlot{}
-		slots.IsLocal[j] = true
-		if _, err := parseCtx.ParseTransaction(in.RlpTxs[i], 0, slots.Txs[j], slots.Senders.At(j), false /* hasEnvelope */, func(hash []byte) error {
+		txSlot := &types.TxSlot{}
+		sender := common.Address{}
+		senderSlice := sender[:]
+
+		if _, err := parseCtx.ParseTransaction(in.RlpTxs[i], 0, txSlot, senderSlice, false /* hasEnvelope */, func(hash []byte) error {
 			if known, _ := s.txPool.IdHashKnown(tx, hash); known {
 				return types.ErrAlreadyKnown
 			}
@@ -208,6 +209,11 @@ func (s *GrpcServer) Add(ctx context.Context, in *txpool_proto.AddRequest) (*txp
 			}
 			continue
 		}
+
+		slots.Resize(uint(j + 1))
+		slots.Txs[j] = txSlot
+		copy(slots.Senders.At(j), senderSlice)
+		slots.IsLocal[j] = true
 		j++
 	}