Skip to content

refactor(eth2near): Fix tests and upgrade deps #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

refactor(eth2near): Fix tests and upgrade deps #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7c129fd
refactor(eth2near): Fix tests and upgrade deps
r-near May 12, 2025
208f0d5
chore: update near-workspaces dependency and fix import path
r-near May 12, 2025
2b56f0f
Fix broken test
r-near May 12, 2025
f9b0d9d
chore: upgrade near-workspaces to 0.18 and fix tree hash root type co…
r-near May 12, 2025
77fc0f6
Fix broken test
r-near May 13, 2025
ff3cd11
Fix compile issues
r-near May 13, 2025
a0cec44
Support sepolia
r-near May 13, 2025
4d35875
Update beacon endpoint
r-near May 13, 2025
d31830d
Fix tests for RPC client
r-near May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion contracts/near/eth2-utility/src/consensus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@ pub struct ProofSize {
pub execution_proof_size: usize,
}

#[derive(Debug)]
pub struct GeneralizedIndex {
pub finality_tree_depth: u32,
pub finality_tree_index: u32,
pub current_sync_committee_tree_depth: u32,
pub current_sync_committee_tree_index: u32,
pub sync_committee_tree_depth: u32,
pub sync_committee_tree_index: u32,
}

#[derive(PartialEq, BorshSerialize, BorshDeserialize, BorshSchema)]
#[derive(PartialEq, BorshSerialize, BorshDeserialize, BorshSchema, Debug)]
pub enum Network {
Mainnet,
Goerli,
Expand Down Expand Up @@ -157,9 +160,14 @@ impl NetworkConfig {
}

pub const fn get_generalized_index_constants(&self, slot: Slot) -> GeneralizedIndex {
// Altair
pub const FINALIZED_ROOT_INDEX: u32 = 105;
pub const CURRENT_SYNC_COMMITTEE_INDEX: u32 = 55;
pub const NEXT_SYNC_COMMITTEE_INDEX: u32 = 55;

// Electra
pub const FINALIZED_ROOT_INDEX_ELECTRA: u32 = 169;
pub const CURRENT_SYNC_COMMITTEE_INDEX_ELECTRA: u32 = 86;
pub const NEXT_SYNC_COMMITTEE_INDEX_ELECTRA: u32 = 87;

let epoch = compute_epoch_at_slot(slot);
Expand All @@ -168,13 +176,19 @@ impl NetworkConfig {
GeneralizedIndex {
finality_tree_depth: floorlog2(FINALIZED_ROOT_INDEX_ELECTRA),
finality_tree_index: get_subtree_index(FINALIZED_ROOT_INDEX_ELECTRA),
current_sync_committee_tree_depth: floorlog2(CURRENT_SYNC_COMMITTEE_INDEX_ELECTRA),
current_sync_committee_tree_index: get_subtree_index(
CURRENT_SYNC_COMMITTEE_INDEX_ELECTRA,
),
sync_committee_tree_depth: floorlog2(NEXT_SYNC_COMMITTEE_INDEX_ELECTRA),
sync_committee_tree_index: get_subtree_index(NEXT_SYNC_COMMITTEE_INDEX_ELECTRA),
}
} else {
GeneralizedIndex {
finality_tree_depth: floorlog2(FINALIZED_ROOT_INDEX),
finality_tree_index: get_subtree_index(FINALIZED_ROOT_INDEX),
current_sync_committee_tree_depth: floorlog2(CURRENT_SYNC_COMMITTEE_INDEX),
current_sync_committee_tree_index: get_subtree_index(CURRENT_SYNC_COMMITTEE_INDEX),
sync_committee_tree_depth: floorlog2(NEXT_SYNC_COMMITTEE_INDEX),
sync_committee_tree_index: get_subtree_index(NEXT_SYNC_COMMITTEE_INDEX),
}
Expand Down
Loading
Loading