mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-03 09:37:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better solution to bodies corrupted output in ByRange/ByHashes (#8427)

Browse Source 
Marshal outside
This commit is contained in:
Giulio rebuffo 2023-10-10 17:06:19 +02:00 committed by GitHub
parent 0d190ff9e9
commit e36e5631a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
turbo/execution/eth1/getters.go
View File

@ -14,6 +14,7 @@ import (
types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types"
"github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/rawdb"
"github.com/ledgerwatch/erigon/core/types"
"github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils" "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils"
) )
@ -139,8 +140,12 @@ func (e *EthereumExecutionModule) GetBodiesByHashes(ctx context.Context, req *ex
if body == nil { if body == nil {
break break
} }
txs, err := types.MarshalTransactionsBinary(body.Transactions)
if err != nil {
return nil, err
}
bodies = append(bodies, &execution.BlockBody{ bodies = append(bodies, &execution.BlockBody{
Transactions: body.RawBody().Transactions, Transactions: txs,
Withdrawals: eth1_utils.ConvertWithdrawalsToRpc(body.Withdrawals), Withdrawals: eth1_utils.ConvertWithdrawalsToRpc(body.Withdrawals),
}) })
} }
@ -171,8 +176,13 @@ func (e *EthereumExecutionModule) GetBodiesByRange(ctx context.Context, req *exe
if err != nil { if err != nil {
return nil, err return nil, err
} }
txs, err := types.MarshalTransactionsBinary(body.Transactions)
if err != nil {
return nil, err
}
bodies = append(bodies, &execution.BlockBody{ bodies = append(bodies, &execution.BlockBody{
Transactions: body.RawBody().Transactions, Transactions: txs,
Withdrawals: eth1_utils.ConvertWithdrawalsToRpc(body.Withdrawals), Withdrawals: eth1_utils.ConvertWithdrawalsToRpc(body.Withdrawals),
}) })
} }