From a4c0578680ff874e1720c03c655f569c8445f22a Mon Sep 17 00:00:00 2001 From: Doryu Date: Fri, 21 Nov 2025 01:16:09 +0100 Subject: [PATCH] Update api.go --- internal/ethapi/api.go | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index d7cf47468c4..3dda6ef2e5d 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1644,6 +1644,19 @@ func (api *TransactionAPI) currentBlobSidecarVersion() byte { return types.BlobSidecarVersion0 } +// convertLegacyBlobSidecar upgrades the legacy blob sidecar if required. +// TODO: remove in go-ethereum v1.17.x +func convertLegacyBlobSidecar(tx *types.Transaction, expected byte) (*types.Transaction, error) { + sc := tx.BlobTxSidecar() + if sc == nil || sc.Version != types.BlobSidecarVersion0 || expected != types.BlobSidecarVersion1 { + return tx, nil + } + if err := sc.ToV1(); err != nil { + return nil, fmt.Errorf("blob sidecar conversion failed: %v", err) + } + return tx.WithBlobTxSidecar(sc), nil +} + // SendRawTransaction will add the signed transaction to the transaction pool. // The sender is responsible for signing the transaction and using the correct nonce. func (api *TransactionAPI) SendRawTransaction(ctx context.Context, input hexutil.Bytes) (common.Hash, error) { @@ -1653,15 +1666,10 @@ func (api *TransactionAPI) SendRawTransaction(ctx context.Context, input hexutil } // Convert legacy blob transaction proofs. - // TODO: remove in go-ethereum v1.17.x - if sc := tx.BlobTxSidecar(); sc != nil { - exp := api.currentBlobSidecarVersion() - if sc.Version == types.BlobSidecarVersion0 && exp == types.BlobSidecarVersion1 { - if err := sc.ToV1(); err != nil { - return common.Hash{}, fmt.Errorf("blob sidecar conversion failed: %v", err) - } - tx = tx.WithBlobTxSidecar(sc) - } + var err error + tx, err = convertLegacyBlobSidecar(tx, api.currentBlobSidecarVersion()) + if err != nil { + return common.Hash{}, err } return SubmitTransaction(ctx, api.b, tx) @@ -1676,15 +1684,10 @@ func (api *TransactionAPI) SendRawTransactionSync(ctx context.Context, input hex } // Convert legacy blob transaction proofs. - // TODO: remove in go-ethereum v1.17.x - if sc := tx.BlobTxSidecar(); sc != nil { - exp := api.currentBlobSidecarVersion() - if sc.Version == types.BlobSidecarVersion0 && exp == types.BlobSidecarVersion1 { - if err := sc.ToV1(); err != nil { - return nil, fmt.Errorf("blob sidecar conversion failed: %v", err) - } - tx = tx.WithBlobTxSidecar(sc) - } + var err error + tx, err = convertLegacyBlobSidecar(tx, api.currentBlobSidecarVersion()) + if err != nil { + return nil, err } ch := make(chan core.ChainEvent, 128)