diff --git a/relayer/relays/beacon/header/syncer/json/beacon_json.go b/relayer/relays/beacon/header/syncer/json/beacon_json.go index cda9afae1a..f736981bd8 100644 --- a/relayer/relays/beacon/header/syncer/json/beacon_json.go +++ b/relayer/relays/beacon/header/syncer/json/beacon_json.go @@ -32,16 +32,16 @@ type SyncAggregate struct { } type Update struct { - AttestedHeader BeaconHeader `json:"attested_header"` - SyncAggregate SyncAggregate `json:"sync_aggregate"` - SignatureSlot uint64 `json:"signature_slot"` - NextSyncCommitteeUpdate *NextSyncCommitteeUpdate `json:"next_sync_committee_update"` - FinalizedHeader BeaconHeader `json:"finalized_header"` - FinalityBranch []string `json:"finality_branch"` - BlockRootsRoot string `json:"block_roots_root"` - BlockRootsBranch []string `json:"block_roots_branch"` - ExecutionHeader *VersionedExecutionPayloadHeader `json:"execution_header"` - ExecutionBranch *[]string `json:"execution_branch"` + AttestedHeader BeaconHeader `json:"attested_header"` + SyncAggregate SyncAggregate `json:"sync_aggregate"` + SignatureSlot uint64 `json:"signature_slot"` + NextSyncCommitteeUpdate *NextSyncCommitteeUpdate `json:"next_sync_committee_update"` + FinalizedHeader BeaconHeader `json:"finalized_header"` + FinalityBranch []string `json:"finality_branch"` + BlockRootsRoot string `json:"block_roots_root"` + BlockRootsBranch []string `json:"block_roots_branch"` + ExecutionHeader VersionedExecutionPayloadHeader `json:"execution_header"` + ExecutionBranch []string `json:"execution_branch"` } type NextSyncCommitteeUpdate struct { diff --git a/relayer/relays/beacon/header/syncer/scale/beacon_scale.go b/relayer/relays/beacon/header/syncer/scale/beacon_scale.go index 209960de4a..0beda0255f 100644 --- a/relayer/relays/beacon/header/syncer/scale/beacon_scale.go +++ b/relayer/relays/beacon/header/syncer/scale/beacon_scale.go @@ -42,7 +42,7 @@ type UpdatePayload struct { BlockRootsRoot types.H256 BlockRootsBranch []types.H256 ExecutionHeader VersionedExecutionPayloadHeader - ExecutionHeaderBranch []types.H256 + ExecutionBranch []types.H256 } type OptionNextSyncCommitteeUpdatePayload struct { diff --git a/relayer/relays/beacon/header/syncer/scale/json_conversion.go b/relayer/relays/beacon/header/syncer/scale/json_conversion.go index 69b0baa4a1..46c939ed10 100644 --- a/relayer/relays/beacon/header/syncer/scale/json_conversion.go +++ b/relayer/relays/beacon/header/syncer/scale/json_conversion.go @@ -34,6 +34,8 @@ func (p UpdatePayload) ToJSON() json.Update { FinalityBranch: util.ScaleBranchToString(p.FinalityBranch), BlockRootsRoot: p.BlockRootsRoot.Hex(), BlockRootsBranch: util.ScaleBranchToString(p.BlockRootsBranch), + ExecutionHeader: p.ExecutionHeader.ToJSON(), + ExecutionBranch: util.ScaleBranchToString(p.ExecutionBranch), } } diff --git a/relayer/relays/beacon/header/syncer/syncer.go b/relayer/relays/beacon/header/syncer/syncer.go index 23e6b11126..d1db8b6d59 100644 --- a/relayer/relays/beacon/header/syncer/syncer.go +++ b/relayer/relays/beacon/header/syncer/syncer.go @@ -188,12 +188,12 @@ func (s *Syncer) GetSyncCommitteePeriodUpdateFromEndpoint(from uint64) (scale.Up NextSyncCommitteeBranch: util.ProofBranchToScale(committeeUpdate.NextSyncCommitteeBranch), }, }, - FinalizedHeader: finalizedHeader, - FinalityBranch: util.ProofBranchToScale(committeeUpdate.FinalityBranch), - BlockRootsRoot: blockRootsProof.Leaf, - BlockRootsBranch: blockRootsProof.Proof, - ExecutionHeader: versionedExecutionPayloadHeader, - ExecutionHeaderBranch: util.ProofBranchToScale(committeeUpdate.FinalizedHeader.ExecutionBranch), + FinalizedHeader: finalizedHeader, + FinalityBranch: util.ProofBranchToScale(committeeUpdate.FinalityBranch), + BlockRootsRoot: blockRootsProof.Leaf, + BlockRootsBranch: blockRootsProof.Proof, + ExecutionHeader: versionedExecutionPayloadHeader, + ExecutionBranch: util.ProofBranchToScale(committeeUpdate.FinalizedHeader.ExecutionBranch), }, FinalizedHeaderBlockRoot: finalizedHeaderBlockRoot, BlockRootsTree: blockRootsProof.Tree, @@ -347,12 +347,12 @@ func (s *Syncer) GetFinalizedUpdate() (scale.Update, error) { NextSyncCommitteeUpdate: scale.OptionNextSyncCommitteeUpdatePayload{ HasValue: false, }, - FinalizedHeader: finalizedHeader, - FinalityBranch: util.ProofBranchToScale(finalizedUpdate.Data.FinalityBranch), - BlockRootsRoot: blockRootsProof.Leaf, - BlockRootsBranch: blockRootsProof.Proof, - ExecutionHeader: versionedExecutionPayloadHeader, - ExecutionHeaderBranch: util.ProofBranchToScale(finalizedUpdate.Data.FinalizedHeader.ExecutionBranch), + FinalizedHeader: finalizedHeader, + FinalityBranch: util.ProofBranchToScale(finalizedUpdate.Data.FinalityBranch), + BlockRootsRoot: blockRootsProof.Leaf, + BlockRootsBranch: blockRootsProof.Proof, + ExecutionHeader: versionedExecutionPayloadHeader, + ExecutionBranch: util.ProofBranchToScale(finalizedUpdate.Data.FinalizedHeader.ExecutionBranch), } return scale.Update{ @@ -776,7 +776,7 @@ func (s *Syncer) GetFinalizedUpdateAtAttestedSlot(attestedSlot uint64, boundary BlockRootsRoot: blockRootsProof.Leaf, BlockRootsBranch: blockRootsProof.Proof, ExecutionHeader: versionedExecutionPayloadHeader, - ExecutionHeaderBranch: util.BytesBranchToScale(executionHeaderProof.Hashes), + ExecutionBranch: util.BytesBranchToScale(executionHeaderProof.Hashes), } return scale.Update{