From a8512d65ded272f86b5d787cd7e9c634c18cdc75 Mon Sep 17 00:00:00 2001 From: Ferran Borreguero Date: Fri, 5 Apr 2024 15:41:31 +0100 Subject: [PATCH 1/2] Add sidecars to execution data --- suave/backends/eth_backend_server.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/suave/backends/eth_backend_server.go b/suave/backends/eth_backend_server.go index 571f4a4eddce..9e55342ab244 100644 --- a/suave/backends/eth_backend_server.go +++ b/suave/backends/eth_backend_server.go @@ -57,7 +57,7 @@ func (e *EthBackendServer) BuildEthBlock(ctx context.Context, buildArgs *types.B } // TODO: we're not adding blobs, but this is not where you would do it anyways - return engine.BlockToExecutableData(block, profit, nil), nil + return engine.BlockToExecutableData(block, profit, getSidecars(block)), nil } func (e *EthBackendServer) BuildEthBlockFromBundles(ctx context.Context, buildArgs *types.BuildBlockArgs, bundles []types.SBundle) (*engine.ExecutionPayloadEnvelope, error) { @@ -81,9 +81,20 @@ func (e *EthBackendServer) BuildEthBlockFromBundles(ctx context.Context, buildAr } // TODO: we're not adding blobs, but this is not where you would do it anyways - return engine.BlockToExecutableData(block, profit, nil), nil + return engine.BlockToExecutableData(block, profit, getSidecars(block)), nil } func (e *EthBackendServer) Call(ctx context.Context, contractAddr common.Address, input []byte) ([]byte, error) { return e.b.Call(ctx, contractAddr, input) } + +func getSidecars(block *types.Block) []*types.BlobTxSidecar { + sidecars := []*types.BlobTxSidecar{} + for _, tx := range block.Transactions() { + sidecar := tx.BlobTxSidecar() + if sidecar != nil { + sidecars = append(sidecars, sidecar) + } + } + return sidecars +} From 8314c11879778629e31ec0e45c77c1284802a7d9 Mon Sep 17 00:00:00 2001 From: Ferran Borreguero Date: Fri, 5 Apr 2024 16:01:36 +0100 Subject: [PATCH 2/2] Remove comments --- suave/backends/eth_backend_server.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/suave/backends/eth_backend_server.go b/suave/backends/eth_backend_server.go index 9e55342ab244..330063db6549 100644 --- a/suave/backends/eth_backend_server.go +++ b/suave/backends/eth_backend_server.go @@ -56,7 +56,6 @@ func (e *EthBackendServer) BuildEthBlock(ctx context.Context, buildArgs *types.B return nil, err } - // TODO: we're not adding blobs, but this is not where you would do it anyways return engine.BlockToExecutableData(block, profit, getSidecars(block)), nil } @@ -80,7 +79,6 @@ func (e *EthBackendServer) BuildEthBlockFromBundles(ctx context.Context, buildAr return nil, err } - // TODO: we're not adding blobs, but this is not where you would do it anyways return engine.BlockToExecutableData(block, profit, getSidecars(block)), nil }