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

Fix 12 hive tests (#8011)

Browse Source
This commit is contained in:
Somnath Banerjee 2023-08-13 19:46:25 +05:30 committed by GitHub
parent 9609ca9120
commit b7070a9c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
turbo/engineapi/engine_server.go
View File

@ -32,6 +32,7 @@ import (
"github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus"
"github.com/ledgerwatch/erigon/consensus/merge" "github.com/ledgerwatch/erigon/consensus/merge"
"github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/types"
"github.com/ledgerwatch/erigon/rlp"
"github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/rpc"
"github.com/ledgerwatch/erigon/turbo/engineapi/engine_block_downloader" "github.com/ledgerwatch/erigon/turbo/engineapi/engine_block_downloader"
"github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers"
@ -158,6 +159,9 @@ func (s *EngineServer) newPayload(ctx context.Context, req *engine_types.Executi
} }
if version >= clparams.DenebVersion { if version >= clparams.DenebVersion {
if req.BlobGasUsed == nil || req.ExcessBlobGas == nil || parentBeaconBlockRoot == nil {
return nil, &rpc.InvalidParamsError{Message: "blobGasUsed/excessBlobGas/beaconRoot missing"}
}
header.BlobGasUsed = (*uint64)(req.BlobGasUsed) header.BlobGasUsed = (*uint64)(req.BlobGasUsed)
header.ExcessBlobGas = (*uint64)(req.ExcessBlobGas) header.ExcessBlobGas = (*uint64)(req.ExcessBlobGas)
header.ParentBeaconBlockRoot = parentBeaconBlockRoot header.ParentBeaconBlockRoot = parentBeaconBlockRoot
@ -569,8 +573,21 @@ func (e *EngineServer) GetPayloadV2(ctx context.Context, payloadID hexutility.By
func (e *EngineServer) GetPayloadV3(ctx context.Context, payloadID hexutility.Bytes) (*engine_types.GetPayloadResponse, error) { func (e *EngineServer) GetPayloadV3(ctx context.Context, payloadID hexutility.Bytes) (*engine_types.GetPayloadResponse, error) {
decodedPayloadId := binary.BigEndian.Uint64(payloadID) decodedPayloadId := binary.BigEndian.Uint64(payloadID)
e.logger.Info("Received GetPayloadV3", "payloadId", decodedPayloadId) e.logger.Info("Received GetPayloadV3", "payloadId", decodedPayloadId)
payloadV3, err := e.getPayload(ctx, decodedPayloadId)
transactions := payloadV3.ExecutionPayload.Transactions
for i, transaction := range transactions {
if transaction[0] == 0x03 {
bWtx := types.BlobTxWrapper{}
rlpStream := rlp.NewStream(bytes.NewReader(transaction[1:]), 0)
bWtx.DecodeRLP(rlpStream)
return e.getPayload(ctx, decodedPayloadId) encodedTx := bytes.Buffer{}
bWtx.Tx.EncodeRLP(&encodedTx)
transactions[i] = encodedTx.Bytes()
}
}
return payloadV3, err
// return e.getPayload(ctx, decodedPayloadId)
} }
func (e *EngineServer) ForkchoiceUpdatedV1(ctx context.Context, forkChoiceState *engine_types.ForkChoiceState, payloadAttributes *engine_types.PayloadAttributes) (*engine_types.ForkChoiceUpdatedResponse, error) { func (e *EngineServer) ForkchoiceUpdatedV1(ctx context.Context, forkChoiceState *engine_types.ForkChoiceState, payloadAttributes *engine_types.PayloadAttributes) (*engine_types.ForkChoiceUpdatedResponse, error) {

7
turbo/engineapi/engine_types/jsonrpc.go
View File

@ -83,9 +83,10 @@ type ForkChoiceUpdatedResponse struct {
} }
type GetPayloadResponse struct { type GetPayloadResponse struct {
ExecutionPayload *ExecutionPayload `json:"executionPayload" gencodec:"required"` ExecutionPayload *ExecutionPayload `json:"executionPayload" gencodec:"required"`
BlockValue *hexutil.Big `json:"blockValue"` BlockValue *hexutil.Big `json:"blockValue"`
BlobsBundle *BlobsBundleV1 `json:"blobsBundle"` BlobsBundle *BlobsBundleV1 `json:"blobsBundle"`
ShouldOverrideBuilder bool `json:"shouldOverrideBuilder"`
} }
type StringifiedError struct{ err error } type StringifiedError struct{ err error }