feat(rpc): Custom RPC types

beacond/cmd/defaults.go

@@ -42,7 +42,8 @@ func DefaultComponents() []any {
 			*BeaconBlockHeader, *BlobSidecars, *Logger,
 		],
 		components.ProvideBeaconDepositContract[
-			*Deposit, *ExecutionPayload, *ExecutionPayloadHeader,
+			*Deposit, *ExecutionPayload, *ExecutionPayloadHeader, Log,
+			*Withdrawal, Withdrawals, WithdrawalCredentials,
 		],
 		components.ProvideBlockStore[
 			*BeaconBlock, *BeaconBlockBody, *BeaconBlockHeader, *Logger,
@@ -64,7 +65,7 @@ func DefaultComponents() []any {
 			*AvailabilityStore, *BeaconBlock, *BeaconBlockBody,
 			*BeaconBlockHeader, *BeaconState, *BeaconStateMarshallable,
 			*BlobSidecars, *BlockStore, *Deposit, *DepositStore,
-			*ExecutionPayload, *ExecutionPayloadHeader, *Genesis,
+			*ExecutionPayload, *ExecutionPayloadHeader, *Log, *Genesis,
 			*KVStore, *Logger, *StorageBackend,
 		],
 		components.ProvideNode,
@@ -82,27 +83,28 @@ func DefaultComponents() []any {
 		components.ProvideDBManager[*AvailabilityStore, *DepositStore, *Logger],
 		components.ProvideDepositPruner[
 			*BeaconBlock, *BeaconBlockBody, *BeaconBlockHeader,
-			*Deposit, *DepositStore, *Logger,
+			*Deposit, *DepositStore, Log, *Logger,
 		],
 		components.ProvideDepositService[
 			*BeaconBlock, *BeaconBlockBody, *BeaconBlockHeader, *Deposit,
 			*DepositContract, *DepositStore, *ExecutionPayload,
-			*ExecutionPayloadHeader, *Logger,
+			*ExecutionPayloadHeader, Log, *Logger,
+			*Withdrawal, Withdrawals, WithdrawalCredentials,
 		],
 		components.ProvideDepositStore[*Deposit],
 		components.ProvideDispatcher[
 			*BeaconBlock, *BlobSidecars, *Genesis, *Logger,
 		],
 		components.ProvideEngineClient[
-			*ExecutionPayload, *ExecutionPayloadHeader, *Logger,
+			*ExecutionPayload, *ExecutionPayloadHeader, *Log, *Logger,
 		],
 		components.ProvideExecutionEngine[
-			*ExecutionPayload, *ExecutionPayloadHeader, *Logger,
+			*ExecutionPayload, *ExecutionPayloadHeader, *Log, *Logger,
 		],
 		components.ProvideJWTSecret,
 		components.ProvideLocalBuilder[
 			*BeaconBlockHeader, *BeaconState, *BeaconStateMarshallable,
-			*ExecutionPayload, *ExecutionPayloadHeader, *KVStore, *Logger,
+			*ExecutionPayload, *ExecutionPayloadHeader, *Log, *KVStore, *Logger,
 		],
 		components.ProvideReportingService[*Logger],
 		components.ProvideCometBFTService[*Logger],
@@ -111,7 +113,7 @@ func DefaultComponents() []any {
 			*BeaconBlockHeader, *BlockStore, *BeaconState,
 			*BeaconStateMarshallable, *BlobSidecar, *BlobSidecars,
 			*Deposit, *DepositStore, *ExecutionPayload, *ExecutionPayloadHeader,
-			*Genesis, *KVStore, *Logger,
+			Log, *Genesis, *KVStore, *Logger,
 			NodeAPIContext,
 		],
 		components.ProvideSidecarFactory[
@@ -120,7 +122,7 @@ func DefaultComponents() []any {
 		components.ProvideStateProcessor[
 			*BeaconBlock, *BeaconBlockBody, *BeaconBlockHeader,
 			*BeaconState, *BeaconStateMarshallable, *Deposit, *ExecutionPayload,
-			*ExecutionPayloadHeader, *KVStore,
+			*ExecutionPayloadHeader, Log, *KVStore,
 		],
 		components.ProvideKVStore[*BeaconBlockHeader, *ExecutionPayloadHeader],
 		components.ProvideStorageBackend[

beacond/cmd/types.go

@@ -129,18 +129,21 @@ type (
 		*BeaconBlockBody,
 		*Deposit,
 		*ExecutionPayload,
+		Log,
 		WithdrawalCredentials,
 	]
 
 	// EngineClient is a type alias for the engine client.
 	EngineClient = engineclient.EngineClient[
 		*ExecutionPayload,
+		Log,
 		*PayloadAttributes,
 	]
 
 	// EngineClient is a type alias for the engine client.
 	ExecutionEngine = execution.Engine[
 		*ExecutionPayload,
+		*Log,
 		*PayloadAttributes,
 		PayloadID,
 		engineprimitives.Withdrawals,
@@ -246,7 +249,7 @@ type (
 
 	// BeaconBlock type aliases.
 	BeaconBlock       = types.BeaconBlock
-	BeaconBlockBody   = types.BeaconBlockBody
+	BeaconBlockBody   = types.BeaconBlockBody[Log]
 	BeaconBlockHeader = types.BeaconBlockHeader
 
 	// BeaconState is a type alias for the BeaconState.
@@ -290,11 +293,12 @@ type (
 	Context = transition.Context
 
 	// Deposit is a type alias for the deposit.
-	Deposit = types.Deposit
+	Deposit = types.Deposit[Log]
 
 	// DepositContract is a type alias for the deposit contract.
 	DepositContract = deposit.WrappedBeaconDepositContract[
 		*Deposit,
+		Log,
 		WithdrawalCredentials,
 	]
 
@@ -320,6 +324,9 @@ type (
 		*ExecutionPayloadHeader,
 	]
 
+	// Log is a type alias for the log.
+	Log = engineprimitives.Log
+
 	// Logger is a type alias for the logger.
 	Logger = phuslu.Logger
 

mod/cli/pkg/commands/genesis/collect.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/berachain/beacon-kit/mod/cli/pkg/context"
 	"github.com/berachain/beacon-kit/mod/consensus-types/pkg/types"
+	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
 	"github.com/berachain/beacon-kit/mod/errors"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/json"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
@@ -59,7 +60,7 @@ func CollectGenesisDepositsCmd() *cobra.Command {
 				return err
 			}
 
-			var deposits []*types.Deposit
+			var deposits []*types.Deposit[engineprimitives.Log]
 			if deposits, err = CollectValidatorJSONFiles(
 				filepath.Join(config.RootDir, "config", "premined-deposits"),
 				appGenesis,
@@ -71,7 +72,7 @@ func CollectGenesisDepositsCmd() *cobra.Command {
 			}
 
 			genesisInfo := &types.Genesis[
-				*types.Deposit,
+				*types.Deposit[engineprimitives.Log],
 				*types.ExecutionPayloadHeader,
 			]{}
 
@@ -110,7 +111,7 @@ func CollectGenesisDepositsCmd() *cobra.Command {
 func CollectValidatorJSONFiles(
 	genTxsDir string,
 	genesis *genutiltypes.AppGenesis,
-) ([]*types.Deposit, error) {
+) ([]*types.Deposit[engineprimitives.Log], error) {
 	// prepare a map of all balances in genesis state to then validate
 	// against the validators addresses
 	var appState map[string]json.RawMessage
@@ -125,7 +126,7 @@ func CollectValidatorJSONFiles(
 	}
 
 	// prepare the list of validators
-	deposits := make([]*types.Deposit, 0)
+	deposits := make([]*types.Deposit[engineprimitives.Log], 0)
 	for _, fo := range fos {
 		if fo.IsDir() {
 			continue
@@ -143,7 +144,7 @@ func CollectValidatorJSONFiles(
 			return nil, err
 		}
 
-		val := &types.Deposit{}
+		val := &types.Deposit[engineprimitives.Log]{}
 		if err = json.Unmarshal(bz, val); err != nil {
 			return nil, err
 		}

mod/cli/pkg/commands/genesis/deposit.go

@@ -28,6 +28,7 @@ import (
 	"github.com/berachain/beacon-kit/mod/cli/pkg/context"
 	"github.com/berachain/beacon-kit/mod/cli/pkg/utils/parser"
 	"github.com/berachain/beacon-kit/mod/consensus-types/pkg/types"
+	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
 	"github.com/berachain/beacon-kit/mod/errors"
 	"github.com/berachain/beacon-kit/mod/node-core/pkg/components"
 	"github.com/berachain/beacon-kit/mod/node-core/pkg/components/signer"
@@ -116,7 +117,7 @@ func AddGenesisDepositCmd(cs common.ChainSpec) *cobra.Command {
 				return err
 			}
 
-			deposit := types.Deposit{
+			deposit := types.Deposit[engineprimitives.Log]{
 				Pubkey:      depositMsg.Pubkey,
 				Amount:      depositMsg.Amount,
 				Signature:   signature,
@@ -165,7 +166,7 @@ func makeOutputFilepath(rootDir, pubkey string) (string, error) {
 
 func writeDepositToFile(
 	outputDocument string,
-	depositMessage *types.Deposit,
+	depositMessage *types.Deposit[engineprimitives.Log],
 ) error {
 	//#nosec:G302,G304 // Ignore errors on this line.
 	outputFile, err := afero.NewOsFs().OpenFile(

mod/cli/pkg/commands/genesis/payload.go

@@ -83,7 +83,8 @@ func AddExecutionPayloadCmd(chainSpec common.ChainSpec) *cobra.Command {
 			}
 
 			genesisInfo := &types.Genesis[
-				*types.Deposit, *types.ExecutionPayloadHeader,
+				*types.Deposit[engineprimitives.Log],
+				*types.ExecutionPayloadHeader,
 			]{}
 
 			if err = json.Unmarshal(

mod/consensus-types/pkg/types/block.go

@@ -21,6 +21,7 @@
 package types
 
 import (
+	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/common"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/math"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/version"
@@ -41,7 +42,7 @@ type BeaconBlock struct {
 	StateRoot common.Root `json:"state_root"`
 	// Body is the body of the BeaconBlock, containing the block's
 	// operations.
-	Body *BeaconBlockBody `json:"body"`
+	Body *BeaconBlockBody[engineprimitives.Log] `json:"body"`
 }
 
 // Empty creates an empty beacon block.
@@ -67,7 +68,7 @@ func (b *BeaconBlock) NewWithVersion(
 			ProposerIndex: proposerIndex,
 			ParentRoot:    parentBlockRoot,
 			StateRoot:     common.Root{},
-			Body:          &BeaconBlockBody{},
+			Body:          &BeaconBlockBody[engineprimitives.Log]{},
 		}
 	default:
 		return &BeaconBlock{}, ErrForkVersionNotSupported
@@ -219,7 +220,7 @@ func (b *BeaconBlock) SetStateRoot(root common.Root) {
 }
 
 // GetBody retrieves the body of the BeaconBlock.
-func (b *BeaconBlock) GetBody() *BeaconBlockBody {
+func (b *BeaconBlock) GetBody() *BeaconBlockBody[engineprimitives.Log] {
 	return b.Body
 }
 

mod/consensus-types/pkg/types/block_test.go

@@ -40,7 +40,7 @@ func generateValidBeaconBlock() *types.BeaconBlock {
 		ProposerIndex: 5,
 		ParentRoot:    common.Root{1, 2, 3, 4, 5},
 		StateRoot:     common.Root{5, 4, 3, 2, 1},
-		Body: &types.BeaconBlockBody{
+		Body: &types.BeaconBlockBody[engineprimitives.Log]{
 			ExecutionPayload: &types.ExecutionPayload{
 				Number:    10,
 				ExtraData: []byte("dummy extra data for testing"),
@@ -56,7 +56,7 @@ func generateValidBeaconBlock() *types.BeaconBlock {
 				BaseFeePerGas: math.NewU256(0),
 			},
 			Eth1Data: &types.Eth1Data{},
-			Deposits: []*types.Deposit{
+			Deposits: []*types.Deposit[engineprimitives.Log]{
 				{
 					Index: 1,
 				},