diff --git a/beacon-chain/core/blocks/payload_test.go b/beacon-chain/core/blocks/payload_test.go index cc2aad8043..a0dfbb5e8b 100644 --- a/beacon-chain/core/blocks/payload_test.go +++ b/beacon-chain/core/blocks/payload_test.go @@ -101,15 +101,6 @@ func Test_IsMergeComplete(t *testing.T) { }(), want: true, }, - { - name: "has tx root", - payload: func() *enginev1.ExecutionPayloadHeader { - h := emptyPayloadHeader() - h.TransactionsRoot = bytesutil.PadTo([]byte{'a'}, fieldparams.RootLength) - return h - }(), - want: true, - }, { name: "has extra data", payload: func() *enginev1.ExecutionPayloadHeader { diff --git a/consensus-types/interfaces/beacon_block.go b/consensus-types/interfaces/beacon_block.go index da34475385..de3692b459 100644 --- a/consensus-types/interfaces/beacon_block.go +++ b/consensus-types/interfaces/beacon_block.go @@ -87,5 +87,4 @@ type ExecutionData interface { BaseFeePerGas() []byte BlockHash() []byte Transactions() ([][]byte, error) - TransactionsRoot() ([]byte, error) } diff --git a/consensus-types/wrapper/beacon_block_bellatrix_test.go b/consensus-types/wrapper/beacon_block_bellatrix_test.go index 0342d47d45..4f38430ce4 100644 --- a/consensus-types/wrapper/beacon_block_bellatrix_test.go +++ b/consensus-types/wrapper/beacon_block_bellatrix_test.go @@ -398,8 +398,6 @@ func TestBellatrixBeaconBlock_ExecutionPayloadHeader(t *testing.T) { } wsb, err := wrapper.WrappedSignedBeaconBlock(sb) require.NoError(t, err) - exec, err := wsb.Block().Body().Execution() + _, err = wsb.Block().Body().Execution() require.NoError(t, err) - _, err = exec.TransactionsRoot() - require.ErrorContains(t, "unsupported field for block type", err) } diff --git a/consensus-types/wrapper/execution.go b/consensus-types/wrapper/execution.go index e7a1c6341a..783873e12e 100644 --- a/consensus-types/wrapper/execution.go +++ b/consensus-types/wrapper/execution.go @@ -139,11 +139,6 @@ func (e executionPayload) Transactions() ([][]byte, error) { return e.p.Transactions, nil } -// TransactionsRoot -- -func (executionPayload) TransactionsRoot() ([]byte, error) { - return nil, ErrUnsupportedField -} - // executionPayloadHeader is a convenience wrapper around a blinded beacon block body's execution header data structure // This wrapper allows us to conform to a common interface so that beacon // blocks for future forks can also be applied across Prysm without issues. @@ -270,11 +265,6 @@ func (executionPayloadHeader) Transactions() ([][]byte, error) { return nil, ErrUnsupportedField } -// TransactionsRoot -- -func (e executionPayloadHeader) TransactionsRoot() ([]byte, error) { - return e.p.TransactionsRoot, nil -} - // PayloadToHeader converts `payload` into execution payload header format. func PayloadToHeader(payload interfaces.ExecutionData) (*enginev1.ExecutionPayloadHeader, error) { txs, err := payload.Transactions() @@ -342,16 +332,6 @@ func IsEmptyExecutionData(data interfaces.ExecutionData) (bool, error) { } } - txsRoot, err := data.TransactionsRoot() - switch { - case errors.Is(err, ErrUnsupportedField): - case err != nil: - return false, err - default: - if !bytes.Equal(txsRoot, make([]byte, fieldparams.RootLength)) { - return false, nil - } - } if len(data.ExtraData()) != 0 { return false, nil }