refactor: replace starknet-rs BlockId with types-rs BlockId (#384)

Author: jbcaron

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Next release
 
+- refactor: replace starknet-rs BlockId with types-rs BlockId and remove redundant mp_block::BlockId
 - feat(fgw): added `add_transaction` for gateway client
 - fix(fgw): include `l1_to_l2_consumed_message` in L1 handler receipt
 - build: up starknet-rs, starknet-types, blockifier(v0.8.0), cairo

Cargo.lock

@@ -42,7 +42,7 @@ use anyhow::Context;
 use mc_db::{MadaraBackend, MadaraStorageError};
 use metrics::BlockMetrics;
 use mp_class::{class_hash::ComputeClassHashError, compile::ClassCompilationError};
-use starknet_core::types::Felt;
+use starknet_types_core::felt::Felt;
 use std::{borrow::Cow, sync::Arc};
 
 mod metrics;

crates/client/block_import/src/lib.rs

@@ -11,7 +11,7 @@ use mp_transactions::Transaction;
 use rayon::iter::{IntoParallelIterator, IntoParallelRefIterator};
 use rayon::prelude::*;
 use starknet_api::core::ChainId;
-use starknet_core::types::Felt;
+use starknet_types_core::felt::Felt;
 use starknet_types_core::hash::{Pedersen, Poseidon, StarkHash};
 use std::mem;
 use std::sync::Arc;

crates/client/block_import/src/pre_validate.rs

@@ -2,7 +2,7 @@ use mp_block::header::{GasPrices, L1DataAvailabilityMode};
 use mp_block::Header;
 use mp_chain_config::StarknetVersion;
 use mp_state_update::StateDiff;
-use starknet_core::types::Felt;
+use starknet_types_core::felt::Felt;
 
 use crate::{
     BlockValidationContext, PreValidatedBlock, PreValidatedPendingBlock, UnverifiedCommitments, UnverifiedFullBlock,

crates/client/block_import/src/tests/block_import_utils.rs

@@ -15,7 +15,7 @@ use mp_state_update::StateDiff;
 use mp_transactions::Transaction;
 use serde::{Deserialize, Serialize};
 use starknet_api::core::ChainId;
-use starknet_core::types::Felt;
+use starknet_types_core::felt::Felt;
 
 #[derive(Clone, Debug, Eq, PartialEq, Default, Serialize, Deserialize)]
 pub struct UnverifiedHeader {

crates/client/block_import/src/types.rs

@@ -4,13 +4,14 @@ use crate::{
 };
 use itertools::Itertools;
 use mc_db::{MadaraBackend, MadaraStorageError};
+use mp_block::BlockTag;
 use mp_block::{
-    header::PendingHeader, BlockId, BlockTag, Header, MadaraBlockInfo, MadaraBlockInner, MadaraMaybePendingBlock,
+    header::PendingHeader, BlockId, Header, MadaraBlockInfo, MadaraBlockInner, MadaraMaybePendingBlock,
     MadaraMaybePendingBlockInfo, MadaraPendingBlockInfo,
 };
 use mp_convert::{FeltHexDisplay, ToFelt};
 use starknet_api::core::ChainId;
-use starknet_core::types::Felt;
+use starknet_types_core::felt::Felt;
 use starknet_types_core::hash::{Poseidon, StarkHash};
 use std::{borrow::Cow, sync::Arc};
 

crates/client/block_import/src/verify_apply.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 use rayon::{iter::ParallelIterator, slice::ParallelSlice};
 use rocksdb::{BoundColumnFamily, IteratorMode, ReadOptions, WriteOptions};
 use serde::Serialize;
-use starknet_core::types::Felt;
+use starknet_types_core::felt::Felt;
 
 use crate::{
     db_block_id::{DbBlockId, DbBlockIdResolvable},

crates/client/db/src/contract_db.rs

@@ -26,12 +26,6 @@ impl DbBlockIdResolvable for BlockId {
     }
 }
 
-impl DbBlockIdResolvable for starknet_core::types::BlockId {
-    fn resolve_db_block_id(&self, backend: &MadaraBackend) -> Result<Option<DbBlockId>, MadaraStorageError> {
-        backend.id_to_storage_type(&(*self).into())
-    }
-}
-
 impl DbBlockIdResolvable for DbBlockId {
     fn resolve_db_block_id(&self, _backend: &MadaraBackend) -> Result<Option<DbBlockId>, MadaraStorageError> {
         Ok(Some(*self))

crates/client/db/src/db_block_id.rs

@@ -2,7 +2,7 @@ use crate::DatabaseExt;
 use crate::{Column, MadaraBackend, MadaraStorageError};
 use rocksdb::WriteOptions;
 use serde::{Deserialize, Serialize};
-use starknet_core::types::Felt;
+use starknet_types_core::felt::Felt;
 
 pub const DEVNET_KEYS: &[u8] = b"DEVNET_KEYS";