diff --git a/chains/evm/listener/handlers/step.go b/chains/evm/listener/handlers/step.go index 515a63e..46df0cd 100644 --- a/chains/evm/listener/handlers/step.go +++ b/chains/evm/listener/handlers/step.go @@ -142,7 +142,7 @@ func (h *StepEventHandler) destinationDomains(slot uint64) ([]uint8, uint64, err return domains.ToSlice(), 0, err } - endBlock := block.Data.Capella.Message.Body.ExecutionPayload.BlockNumber + endBlock := block.Data.Deneb.Message.Body.ExecutionPayload.BlockNumber if h.latestBlock == 0 { return h.allDomains, endBlock, nil } diff --git a/chains/evm/listener/handlers/step_test.go b/chains/evm/listener/handlers/step_test.go index be9710d..0373d0c 100644 --- a/chains/evm/listener/handlers/step_test.go +++ b/chains/evm/listener/handlers/step_test.go @@ -13,7 +13,7 @@ import ( "github.com/attestantio/go-eth2-client/api" apiv1 "github.com/attestantio/go-eth2-client/api/v1" "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/capella" + "github.com/attestantio/go-eth2-client/spec/deneb" "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" @@ -121,10 +121,10 @@ func (s *StepHandlerTestSuite) Test_HandleEvents_FirstStep_StepExecuted() { Block: "10", }).Return(&api.Response[*spec.VersionedSignedBeaconBlock]{ Data: &spec.VersionedSignedBeaconBlock{ - Capella: &capella.SignedBeaconBlock{ - Message: &capella.BeaconBlock{ - Body: &capella.BeaconBlockBody{ - ExecutionPayload: &capella.ExecutionPayload{ + Deneb: &deneb.SignedBeaconBlock{ + Message: &deneb.BeaconBlock{ + Body: &deneb.BeaconBlockBody{ + ExecutionPayload: &deneb.ExecutionPayload{ BlockNumber: 100, }, }, @@ -166,10 +166,10 @@ func (s *StepHandlerTestSuite) Test_HandleEvents_SecondStep_MissingDeposits() { Block: "10", }).Return(&api.Response[*spec.VersionedSignedBeaconBlock]{ Data: &spec.VersionedSignedBeaconBlock{ - Capella: &capella.SignedBeaconBlock{ - Message: &capella.BeaconBlock{ - Body: &capella.BeaconBlockBody{ - ExecutionPayload: &capella.ExecutionPayload{ + Deneb: &deneb.SignedBeaconBlock{ + Message: &deneb.BeaconBlock{ + Body: &deneb.BeaconBlockBody{ + ExecutionPayload: &deneb.ExecutionPayload{ BlockNumber: 100, }, }, @@ -203,10 +203,10 @@ func (s *StepHandlerTestSuite) Test_HandleEvents_SecondStep_MissingDeposits() { Block: "10", }).Return(&api.Response[*spec.VersionedSignedBeaconBlock]{ Data: &spec.VersionedSignedBeaconBlock{ - Capella: &capella.SignedBeaconBlock{ - Message: &capella.BeaconBlock{ - Body: &capella.BeaconBlockBody{ - ExecutionPayload: &capella.ExecutionPayload{ + Deneb: &deneb.SignedBeaconBlock{ + Message: &deneb.BeaconBlock{ + Body: &deneb.BeaconBlockBody{ + ExecutionPayload: &deneb.ExecutionPayload{ BlockNumber: 110, }, }, @@ -242,10 +242,10 @@ func (s *StepHandlerTestSuite) Test_HandleEvents_SecondStep_ValidDeposits() { Block: "10", }).Return(&api.Response[*spec.VersionedSignedBeaconBlock]{ Data: &spec.VersionedSignedBeaconBlock{ - Capella: &capella.SignedBeaconBlock{ - Message: &capella.BeaconBlock{ - Body: &capella.BeaconBlockBody{ - ExecutionPayload: &capella.ExecutionPayload{ + Deneb: &deneb.SignedBeaconBlock{ + Message: &deneb.BeaconBlock{ + Body: &deneb.BeaconBlockBody{ + ExecutionPayload: &deneb.ExecutionPayload{ BlockNumber: 100, }, }, @@ -279,10 +279,10 @@ func (s *StepHandlerTestSuite) Test_HandleEvents_SecondStep_ValidDeposits() { Block: "10", }).Return(&api.Response[*spec.VersionedSignedBeaconBlock]{ Data: &spec.VersionedSignedBeaconBlock{ - Capella: &capella.SignedBeaconBlock{ - Message: &capella.BeaconBlock{ - Body: &capella.BeaconBlockBody{ - ExecutionPayload: &capella.ExecutionPayload{ + Deneb: &deneb.SignedBeaconBlock{ + Message: &deneb.BeaconBlock{ + Body: &deneb.BeaconBlockBody{ + ExecutionPayload: &deneb.ExecutionPayload{ BlockNumber: 110, }, },