Skip to content

feat: use correct content key selectors for history network #1890

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

Merged
merged 1 commit into from
Aug 1, 2025
Merged

feat: use correct content key selectors for history network #1890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions crates/ethportal-api/src/types/content_key/content_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ mod tests {
#[case::block_number_12345678_block_body(
12_345_678,
HISTORY_BLOCK_BODY_KEY_PREFIX,
b256!("0x614e3d0000000000000000000000000000000000000000000000000000000009"),
b256!("0x614e3d0000000000000000000000000000000000000000000000000000000000"),
)]
#[case::block_number_12345678_receipts(
12_345_678,
HISTORY_BLOCK_RECEIPTS_KEY_PREFIX,
b256!("0x614e3d000000000000000000000000000000000000000000000000000000000A"),
b256!("0x614e3d0000000000000000000000000000000000000000000000000000000001"),
)]
fn simple(
#[case] block_number: u64,
Expand Down
16 changes: 8 additions & 8 deletions crates/ethportal-api/src/types/content_key/history.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ use crate::{
};

// Prefixes for the different types of history content keys
pub const HISTORY_BLOCK_BODY_KEY_PREFIX: u8 = 0x09;
pub const HISTORY_BLOCK_RECEIPTS_KEY_PREFIX: u8 = 0x0A;
pub const HISTORY_BLOCK_BODY_KEY_PREFIX: u8 = 0x00;
pub const HISTORY_BLOCK_RECEIPTS_KEY_PREFIX: u8 = 0x01;

/// A content key used in Portal History network
#[derive(Clone, Debug, Eq, PartialEq)]
Expand Down Expand Up @@ -155,15 +155,15 @@ mod tests {

#[rstest]
#[case::block_number_0(0, B256::with_last_byte(HISTORY_BLOCK_BODY_KEY_PREFIX))]
#[case::block_number_12_345_678(12_345_678, b256!("0x614e3d0000000000000000000000000000000000000000000000000000000009"))]
#[case::block_number_12_345_678(12_345_678, b256!("0x614e3d0000000000000000000000000000000000000000000000000000000000"))]
fn block_body(#[case] block_number: u64, #[case] expected_content_id: B256) {
let content_key = HistoryContentKey::new_block_body(block_number);
assert_eq!(content_key.content_id(), expected_content_id);
}

#[rstest]
#[case::block_number_0(0, B256::with_last_byte(HISTORY_BLOCK_RECEIPTS_KEY_PREFIX))]
#[case::block_number_12_345_678(12_345_678, b256!("0x614e3d000000000000000000000000000000000000000000000000000000000a"))]
#[case::block_number_12_345_678(12_345_678, b256!("0x614e3d0000000000000000000000000000000000000000000000000000000001"))]
fn block_receipts(#[case] block_number: u64, #[case] expected_content_id: B256) {
let content_key = HistoryContentKey::new_block_receipts(block_number);
assert_eq!(content_key.content_id(), expected_content_id);
Expand All @@ -173,8 +173,8 @@ mod tests {
use super::*;

#[rstest]
#[case::block_number_0(0, bytes!("0x090000000000000000"))]
#[case::block_number_12_345_678(12_345_678, bytes!("0x094e61bc0000000000"))]
#[case::block_number_0(0, bytes!("0x000000000000000000"))]
#[case::block_number_12_345_678(12_345_678, bytes!("0x004e61bc0000000000"))]
fn block_body(#[case] block_number: u64, #[case] content_key_bytes: RawContentKey) {
let content_key = HistoryContentKey::new_block_body(block_number);

Expand All @@ -186,8 +186,8 @@ mod tests {
}

#[rstest]
#[case::block_number_0(0, bytes!("0x0a0000000000000000"))]
#[case::block_number_12_345_678(12_345_678, bytes!("0x0a4e61bc0000000000"))]
#[case::block_number_0(0, bytes!("0x010000000000000000"))]
#[case::block_number_12_345_678(12_345_678, bytes!("0x014e61bc0000000000"))]
fn block_receipts(#[case] block_number: u64, #[case] content_key_bytes: RawContentKey) {
let content_key = HistoryContentKey::new_block_receipts(block_number);

Expand Down
Loading