forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 13:16:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/txpool/blobpool: reject blob tx with with legacy sidecar

Browse source
This commit is contained in:
lightclient 2025-09-09 09:48:58 -06:00
parent 409cfa557c
commit d89b92ce1d
No known key found for this signature in database
GPG key ID: 657913021EF45A6A
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/txpool/blobpool/blobpool.go
View file

@ -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. // related to the add is finished. Only use this during tests for determinism.
func (p *BlobPool) Add(txs []*types.Transaction, sync bool) []error { func (p *BlobPool) Add(txs []*types.Transaction, sync bool) []error {
var ( var (
errs []error errs = make([]error, len(txs))
adds = make([]*types.Transaction, 0, len(txs)) adds = make([]*types.Transaction, 0, len(txs))
) )
txs, errs = p.convertSidecar(txs)
for i, tx := range txs { for i, tx := range txs {
if errs[i] != nil {
continue
}
errs[i] = p.add(tx) errs[i] = p.add(tx)
if errs[i] == nil { if errs[i] == nil {
adds = append(adds, tx.WithoutBlobTxSidecar()) adds = append(adds, tx.WithoutBlobTxSidecar())

7
core/txpool/blobpool/blobpool_test.go
View file

@ -1689,8 +1689,7 @@ func TestAdd(t *testing.T) {
} }
} }
// Tests that adding the transactions with legacy sidecar and expect them to // Tests adding transactions with legacy sidecars are correctly rejected.
// be converted to new format correctly.
func TestAddLegacyBlobTx(t *testing.T) { func TestAddLegacyBlobTx(t *testing.T) {
var ( var (
key1, _ = crypto.GenerateKey() key1, _ = crypto.GenerateKey()
@ -1724,8 +1723,8 @@ func TestAddLegacyBlobTx(t *testing.T) {
) )
errs := pool.Add([]*types.Transaction{tx1, tx2, tx3}, true) errs := pool.Add([]*types.Transaction{tx1, tx2, tx3}, true)
for _, err := range errs { for _, err := range errs {
if err != nil { if err == nil {
t.Fatalf("failed to add tx: %v", err) t.Fatalf("expected tx add to fail")
} }
} }
verifyPoolInternals(t, pool) verifyPoolInternals(t, pool)