mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2024-12-22 11:41:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

eth/68: always announce tx sizes with envelopes (#8502)

Browse Source 
N.B. [eth/68](https://eips.ethereum.org/EIPS/eip-5793) is implemented by
`EncodeAnnouncements` in `erigon-lib/rlp/encodel.go`
This commit is contained in:
Andrew Ashikhmin 2023-10-17 16:52:29 +02:00 committed by GitHub
parent 8ddfbfd88c
commit def6067f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erigon-lib/types/txn.go
View File

@ -100,7 +100,7 @@ type TxSlot struct {
Traced bool // Whether transaction needs to be traced throughout transaction pool code and generate debug printing
Creation bool // Set to true if "To" field of the transaction is not set
Type byte // Transaction type
Size uint32 // Size of the payload
Size uint32 // Size of the payload, always including the envelope for typed transactions
// EIP-4844: Shard Blob Transactions
BlobFeeCap uint256.Int // max_fee_per_blob_gas
@ -287,6 +287,12 @@ func (ctx *TxParseContext) ParseTransaction(payload []byte, pos int, slot *TxSlo
}
slot.Size = uint32(p - pos)
if !legacy && !hasEnvelope {
// Normalize the size so that it accounts for the envelope bytes
// See https://github.com/ledgerwatch/erigon/issues/8456
slot.Size = uint32(rlp.ListPrefixLen(int(slot.Size))) + slot.Size
}
return p, err
}

4
erigon-lib/types/txn_test.go
View File

@ -29,6 +29,7 @@ import (
"github.com/ledgerwatch/erigon-lib/common/fixedgas"
"github.com/ledgerwatch/erigon-lib/common/hexutility"
"github.com/ledgerwatch/erigon-lib/rlp"
)
func TestParseTransactionRLP(t *testing.T) {
@ -261,7 +262,8 @@ func TestBlobTxParsing(t *testing.T) {
p, err = ctx.ParseTransaction(wrapperRlp, 0, &fatTx, nil, hasEnvelope, wrappedWithBlobs, nil)
require.NoError(t, err)
assert.Equal(t, len(wrapperRlp), p)
assert.Equal(t, len(wrapperRlp), int(fatTx.Size))
wrapperLenWithEnvelope := rlp.ListPrefixLen(len(wrapperRlp)) + len(wrapperRlp)
assert.Equal(t, wrapperLenWithEnvelope, int(fatTx.Size))
assert.Equal(t, wrapperRlp, fatTx.Rlp)
assert.Equal(t, BlobTxType, fatTx.Type)