From d89b92ce1db93f2063f0fd25abc3f34f9428cfbc Mon Sep 17 00:00:00 2001 From: lightclient Date: Tue, 9 Sep 2025 09:48:58 -0600 Subject: [PATCH] core/txpool/blobpool: reject blob tx with with legacy sidecar --- core/txpool/blobpool/blobpool.go | 6 +----- core/txpool/blobpool/blobpool_test.go | 7 +++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go index 7eb035660b..5b539cc9ee 100644 --- a/core/txpool/blobpool/blobpool.go +++ b/core/txpool/blobpool/blobpool.go @@ -1431,14 +1431,10 @@ func (p *BlobPool) convertSidecar(txs []*types.Transaction) ([]*types.Transactio // related to the add is finished. Only use this during tests for determinism. func (p *BlobPool) Add(txs []*types.Transaction, sync bool) []error { var ( - errs []error + errs = make([]error, len(txs)) adds = make([]*types.Transaction, 0, len(txs)) ) - txs, errs = p.convertSidecar(txs) for i, tx := range txs { - if errs[i] != nil { - continue - } errs[i] = p.add(tx) if errs[i] == nil { adds = append(adds, tx.WithoutBlobTxSidecar()) diff --git a/core/txpool/blobpool/blobpool_test.go b/core/txpool/blobpool/blobpool_test.go index 51ab27eb01..29e421c5ab 100644 --- a/core/txpool/blobpool/blobpool_test.go +++ b/core/txpool/blobpool/blobpool_test.go @@ -1689,8 +1689,7 @@ func TestAdd(t *testing.T) { } } -// Tests that adding the transactions with legacy sidecar and expect them to -// be converted to new format correctly. +// Tests adding transactions with legacy sidecars are correctly rejected. func TestAddLegacyBlobTx(t *testing.T) { var ( key1, _ = crypto.GenerateKey() @@ -1724,8 +1723,8 @@ func TestAddLegacyBlobTx(t *testing.T) { ) errs := pool.Add([]*types.Transaction{tx1, tx2, tx3}, true) for _, err := range errs { - if err != nil { - t.Fatalf("failed to add tx: %v", err) + if err == nil { + t.Fatalf("expected tx add to fail") } } verifyPoolInternals(t, pool)