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

fix encode method

Browse source
This commit is contained in:
maskpp 2025-08-17 18:21:37 +08:00
parent 076d8c78fe
commit 524b2277a2
1 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
core/types/tx_blob.go
View file

@ -280,13 +280,30 @@ func (tx *BlobTx) withSidecar(sideCar *BlobTxSidecar) *BlobTx {
} }
func (tx *BlobTx) encode(b *bytes.Buffer) error { func (tx *BlobTx) encode(b *bytes.Buffer) error {
if err := rlp.Encode(b, tx); err != nil { err := rlp.Encode(b, tx)
if err != nil {
return err return err
} }
if tx.Sidecar != nil {
return rlp.Encode(b, tx.Sidecar) type blobTxSidecar struct {
Blobs []kzg4844.Blob // Blobs needed by the blob pool
Commitments []kzg4844.Commitment // Commitments needed by the blob pool
Proofs []kzg4844.Proof // Proofs needed by the blob pool
} }
return nil
if sidecar := tx.Sidecar; sidecar != nil {
if sidecar.Version != BlobSidecarVersion0 {
err = rlp.Encode(b, sidecar.Version)
}
if err == nil {
err = rlp.Encode(b, &blobTxSidecar{
Blobs: sidecar.Blobs,
Commitments: sidecar.Commitments,
Proofs: sidecar.Proofs,
})
}
}
return err
} }
func (tx *BlobTx) decode(input []byte) error { func (tx *BlobTx) decode(input []byte) error {
@ -294,14 +311,36 @@ func (tx *BlobTx) decode(input []byte) error {
if err != nil { if err != nil {
return err return err
} }
type blobTxSidecar struct {
Blobs []kzg4844.Blob // Blobs needed by the blob pool
Commitments []kzg4844.Commitment // Commitments needed by the blob pool
Proofs []kzg4844.Proof // Proofs needed by the blob pool
}
// If the input is shorter than the RLP-encoded transaction, it means // If the input is shorter than the RLP-encoded transaction, it means
// that the transaction does not have a sidecar. // that the transaction does not have a sidecar.
if len(input) > bLen { if input = input[bLen:]; len(input) > 0 {
var sidecar *BlobTxSidecar var (
if err = rlp.DecodeBytes(input[bLen:], &sidecar); err != nil { version byte
sidecar = blobTxSidecar{}
)
kind, content, _, err := rlp.Split(input)
if kind == rlp.Byte {
if err = rlp.DecodeBytes(content, &version); err != nil {
return err
}
input = input[len(content):]
}
if err = rlp.DecodeBytes(input, &sidecar); err != nil {
return err return err
} }
tx.Sidecar = sidecar tx.Sidecar = &BlobTxSidecar{
Version: version,
Blobs: sidecar.Blobs,
Commitments: sidecar.Commitments,
Proofs: sidecar.Proofs,
}
} }
return nil return nil
} }