Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions crates/starknet_api/src/block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use strum_macros::EnumIter;
use time::OffsetDateTime;

use crate::core::{
ascii_as_felt,
ContractAddress,
EventCommitment,
GlobalRoot,
Expand Down Expand Up @@ -166,6 +167,14 @@ impl TryFrom<&str> for StarknetVersion {
}
}

impl TryFrom<&StarknetVersion> for Felt {
type Error = StarknetApiError;

fn try_from(starknet_version: &StarknetVersion) -> Result<Self, Self::Error> {
ascii_as_felt(&starknet_version.to_string())
}
}

impl Serialize for StarknetVersion {
fn serialize<S>(
&self,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ pub fn calculate_block_hash(
.iter(),
)
.chain(
&ascii_as_felt(&partial_block_hash_components.starknet_version.to_string())
&Felt::try_from(&partial_block_hash_components.starknet_version)
.expect("Expect ASCII version"),
)
.chain(&Felt::ZERO)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ use starknet_api::block_hash::block_hash_calculator::{
STARKNET_BLOCK_HASH1,
};
use starknet_api::core::{
ascii_as_felt,
EventCommitment,
GlobalRoot,
ReceiptCommitment,
Expand Down Expand Up @@ -109,7 +108,7 @@ fn cairo_calculate_block_hash(
EndpointArg::from(gas_prices_hash),
EndpointArg::from(state_root),
EndpointArg::from(parent_hash),
EndpointArg::from(ascii_as_felt(&components.starknet_version.to_string()).unwrap()),
EndpointArg::from(Felt::try_from(&components.starknet_version).unwrap()),
];

// We expect one felt as return value (block_hash).
Expand Down
Loading