diff --git a/Cargo.lock b/Cargo.lock
index 74703b4..a3f017c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2127,8 +2127,8 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "starknet"
-version = "0.7.0"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+version = "0.8.0"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "starknet-accounts",
  "starknet-contract",
@@ -2142,8 +2142,8 @@ dependencies = [
 
 [[package]]
 name = "starknet-accounts"
-version = "0.6.1"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+version = "0.7.0"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "async-trait",
  "auto_impl",
@@ -2155,8 +2155,8 @@ dependencies = [
 
 [[package]]
 name = "starknet-contract"
-version = "0.6.0"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+version = "0.7.0"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "serde",
  "serde_json",
@@ -2169,8 +2169,8 @@ dependencies = [
 
 [[package]]
 name = "starknet-core"
-version = "0.7.2"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+version = "0.8.0"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "base64 0.21.6",
  "flate2",
@@ -2187,7 +2187,7 @@ dependencies = [
 [[package]]
 name = "starknet-crypto"
 version = "0.6.1"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "crypto-bigint",
  "hex",
@@ -2206,7 +2206,7 @@ dependencies = [
 [[package]]
 name = "starknet-crypto-codegen"
 version = "0.3.2"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "starknet-curve",
  "starknet-ff",
@@ -2216,7 +2216,7 @@ dependencies = [
 [[package]]
 name = "starknet-curve"
 version = "0.4.0"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "starknet-ff",
 ]
@@ -2224,7 +2224,7 @@ dependencies = [
 [[package]]
 name = "starknet-ff"
 version = "0.3.5"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "ark-ff",
  "bigdecimal",
@@ -2236,8 +2236,8 @@ dependencies = [
 
 [[package]]
 name = "starknet-macros"
-version = "0.1.4"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+version = "0.1.5"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "starknet-core",
  "syn 2.0.48",
@@ -2245,8 +2245,8 @@ dependencies = [
 
 [[package]]
 name = "starknet-providers"
-version = "0.7.0"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+version = "0.8.0"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "async-trait",
  "auto_impl",
@@ -2264,8 +2264,8 @@ dependencies = [
 
 [[package]]
 name = "starknet-signers"
-version = "0.5.0"
-source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=64ebc36#64ebc364c0c346e81b715c5b4a3b32ef37b055c8"
+version = "0.6.0"
+source = "git+https://github.com/xJonathanLEI/starknet-rs.git?rev=96c6803#96c6803118773d9fd1d74fcf1465763f11a080a1"
 dependencies = [
  "async-trait",
  "auto_impl",
diff --git a/unit_tests/Cargo.toml b/unit_tests/Cargo.toml
index d8348cd..fd05b76 100644
--- a/unit_tests/Cargo.toml
+++ b/unit_tests/Cargo.toml
@@ -12,10 +12,10 @@ serde = "1.0.194"
 serde_json = "1.0.110"
 tokio = { version = "1", features = ["full"] }
 url = "2.5.0"
-starknet = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "64ebc36", default-features = false }
-starknet-core = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "64ebc36", default-features = false }
-starknet-providers = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "64ebc36", default-features = false }
-starknet-accounts = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "64ebc36", default-features = false }
+starknet = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "96c6803", default-features = false }
+starknet-core = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "96c6803", default-features = false }
+starknet-providers = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "96c6803", default-features = false }
+starknet-accounts = { git = "https://github.com/xJonathanLEI/starknet-rs.git", rev = "96c6803", default-features = false }
 env_logger = "0.10.1"
 
 [dev-dependencies]
diff --git a/unit_tests/tests/test_call.rs b/unit_tests/tests/test_call.rs
index 832ce3e..c0856c9 100644
--- a/unit_tests/tests/test_call.rs
+++ b/unit_tests/tests/test_call.rs
@@ -10,8 +10,7 @@ use starknet_core::{
     utils::get_selector_from_name,
 };
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 
 ///
@@ -39,11 +38,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
-        }))
-    );
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound)))
 }
 
 ///
@@ -71,10 +66,7 @@ async fn fail_non_existing_contract(clients: HashMap<String, JsonRpcClient<HttpT
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::ContractNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
     );
 }
 
@@ -105,10 +97,7 @@ async fn fail_invalid_contract_entry_point_selector(
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::ContractError)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
     );
 }
 
@@ -137,10 +126,7 @@ async fn fail_missing_contract_call_data(clients: HashMap<String, JsonRpcClient<
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::ContractError)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
     );
 }
 
@@ -198,10 +184,7 @@ async fn fail_too_many_call_data(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::ContractError)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_estimate_fee.rs b/unit_tests/tests/test_estimate_fee.rs
index 2d7846a..4a1bdf4 100644
--- a/unit_tests/tests/test_estimate_fee.rs
+++ b/unit_tests/tests/test_estimate_fee.rs
@@ -6,7 +6,7 @@ use common::*;
 use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
 use starknet_providers::{
     jsonrpc::{HttpTransport, JsonRpcClient},
-    MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
+    Provider, ProviderError,
 };
 use std::assert_matches::assert_matches;
 use std::collections::HashMap;
@@ -22,7 +22,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         deoxys.estimate_fee(&vec![ok_invoke_transaction], BlockId::Hash(FieldElement::ZERO)).await,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound
+        Err(ProviderError::StarknetError(StarknetError::ContractNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_estimate_message_fee.rs b/unit_tests/tests/test_estimate_message_fee.rs
index b2c61ac..7e36269 100644
--- a/unit_tests/tests/test_estimate_message_fee.rs
+++ b/unit_tests/tests/test_estimate_message_fee.rs
@@ -6,7 +6,7 @@ use common::*;
 use starknet_core::types::{BlockId, EthAddress, FieldElement, MsgFromL1, StarknetError};
 use starknet_providers::{
     jsonrpc::{HttpTransport, JsonRpcClient},
-    MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
+    Provider, ProviderError,
 };
 use std::assert_matches::assert_matches;
 use std::collections::HashMap;
@@ -60,7 +60,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
         .await;
     assert_matches!(
         deoxys_message_fee,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound
+        Err(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
@@ -85,8 +85,7 @@ async fn fail_contract_not_found(clients: HashMap<String, JsonRpcClient<HttpTran
         .await;
     assert_matches!(
         deoxys_message_fee,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::ContractNotFound
-    );
+        Err(ProviderError::StarknetError(StarknetError::ContractNotFound)))
 }
 
 #[rstest]
@@ -111,8 +110,7 @@ async fn fail_contract_error(clients: HashMap<String, JsonRpcClient<HttpTranspor
         .await;
     assert_matches!(
         deoxys_message_fee,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::ContractError
-    );
+        Err(ProviderError::StarknetError(StarknetError::ContractError(_))))
 }
 
 #[rstest]
diff --git a/unit_tests/tests/test_get_block_transaction_count.rs b/unit_tests/tests/test_get_block_transaction_count.rs
index 4c4d480..3db6bfa 100644
--- a/unit_tests/tests/test_get_block_transaction_count.rs
+++ b/unit_tests/tests/test_get_block_transaction_count.rs
@@ -9,7 +9,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
 use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
 use starknet_providers::{
     jsonrpc::{HttpTransport, JsonRpcClient},
-    MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
+    Provider, ProviderError,
 };
 use unit_tests::constants::DEOXYS;
 
@@ -25,10 +25,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_get_block_with_tx_hashes.rs b/unit_tests/tests/test_get_block_with_tx_hashes.rs
index 2aba763..740cdf0 100644
--- a/unit_tests/tests/test_get_block_with_tx_hashes.rs
+++ b/unit_tests/tests/test_get_block_with_tx_hashes.rs
@@ -9,7 +9,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
 use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
 use starknet_providers::{
     jsonrpc::{HttpTransport, JsonRpcClient},
-    MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
+    Provider, ProviderError,
 };
 use unit_tests::constants::DEOXYS;
 
@@ -31,10 +31,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_get_block_with_txs.rs b/unit_tests/tests/test_get_block_with_txs.rs
index e12918e..b02c108 100644
--- a/unit_tests/tests/test_get_block_with_txs.rs
+++ b/unit_tests/tests/test_get_block_with_txs.rs
@@ -9,7 +9,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
 use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
 use starknet_providers::{
     jsonrpc::{HttpTransport, JsonRpcClient},
-    MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage,
+    Provider, ProviderError,
 };
 use unit_tests::constants::DEOXYS;
 
@@ -25,10 +25,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_get_class.rs b/unit_tests/tests/test_get_class.rs
index 44bf1b5..bfe3604 100644
--- a/unit_tests/tests/test_get_class.rs
+++ b/unit_tests/tests/test_get_class.rs
@@ -5,8 +5,7 @@ use common::*;
 
 use starknet_core::types::{BlockId, FieldElement, StarknetError};
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 use std::assert_matches::assert_matches;
 use std::collections::HashMap;
@@ -27,7 +26,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
             test_contract_class_hash,
         )
         .await,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound
+        Err(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
@@ -47,7 +46,7 @@ async fn fail_non_existing_class_hash(clients: HashMap<String, JsonRpcClient<Htt
             unknown_contract_class_hash,
         )
         .await,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::ClassHashNotFound
+        Err(ProviderError::StarknetError(StarknetError::ClassHashNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_get_class_at.rs b/unit_tests/tests/test_get_class_at.rs
index 4515fad..09562e2 100644
--- a/unit_tests/tests/test_get_class_at.rs
+++ b/unit_tests/tests/test_get_class_at.rs
@@ -9,8 +9,7 @@ use starknet_core::types::{
     contract::legacy::LegacyProgram, BlockId, BlockTag, ContractClass, FieldElement, StarknetError,
 };
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 
 ///
@@ -34,10 +33,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
@@ -59,10 +55,7 @@ async fn fail_non_existing_contract(clients: HashMap<String, JsonRpcClient<HttpT
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::ContractNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_get_class_hash_at.rs b/unit_tests/tests/test_get_class_hash_at.rs
index a597985..8311ed3 100644
--- a/unit_tests/tests/test_get_class_hash_at.rs
+++ b/unit_tests/tests/test_get_class_hash_at.rs
@@ -7,8 +7,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
 
 use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 
 ///
@@ -32,10 +31,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
     )
 }
 
@@ -60,10 +56,7 @@ async fn fail_non_existing_contract(clients: HashMap<String, JsonRpcClient<HttpT
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::ContractNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
     )
 }
 
diff --git a/unit_tests/tests/test_get_events.rs b/unit_tests/tests/test_get_events.rs
index d72bd6c..69f42bd 100644
--- a/unit_tests/tests/test_get_events.rs
+++ b/unit_tests/tests/test_get_events.rs
@@ -6,10 +6,9 @@ use std::{assert_matches::assert_matches, sync::Arc};
 use anyhow::anyhow;
 use common::*;
 use starknet::macros::{felt_hex, selector};
-use starknet_core::types::{BlockId, EventFilter, EventsPage, FieldElement};
+use starknet_core::types::{BlockId, EventFilter, EventsPage, FieldElement, StarknetError};
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 use tokio::task::JoinSet;
 
@@ -48,10 +47,7 @@ async fn fail_invalid_block_number(deoxys: JsonRpcClient<HttpTransport>) {
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Unknown(-32602)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::UnexpectedError(_))) //previous error : Unknown(-32602)
     )
 }
 
@@ -101,10 +97,7 @@ async fn fail_invalid_block_range(deoxys: JsonRpcClient<HttpTransport>) {
     // for some reason a block range of 0 results in an internal error
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Unknown(-32603)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::UnexpectedError(_))) //previous error : Unknown(-32603)
     )
 }
 
diff --git a/unit_tests/tests/test_get_nonce.rs b/unit_tests/tests/test_get_nonce.rs
index bd42fa2..11319d2 100644
--- a/unit_tests/tests/test_get_nonce.rs
+++ b/unit_tests/tests/test_get_nonce.rs
@@ -6,8 +6,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
 use common::*;
 use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 
 ///
@@ -47,10 +46,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
@@ -75,10 +71,7 @@ async fn fail_non_existing_contract(clients: HashMap<String, JsonRpcClient<HttpT
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::ContractNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_get_state_update.rs b/unit_tests/tests/test_get_state_update.rs
index 37abb05..9fe2af1 100644
--- a/unit_tests/tests/test_get_state_update.rs
+++ b/unit_tests/tests/test_get_state_update.rs
@@ -5,8 +5,7 @@ use common::*;
 
 use starknet_core::types::{BlockId, BlockTag, StarknetError};
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 use std::assert_matches::assert_matches;
 use std::collections::HashMap;
@@ -33,7 +32,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
         deoxys
         .get_state_update(BlockId::Number(0))
         .await,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound
+        Err(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_get_storage_at.rs b/unit_tests/tests/test_get_storage_at.rs
index d3f48d7..49ecb49 100644
--- a/unit_tests/tests/test_get_storage_at.rs
+++ b/unit_tests/tests/test_get_storage_at.rs
@@ -8,8 +8,7 @@ use std::collections::HashMap;
 
 use starknet_core::types::{BlockId, BlockTag, FieldElement, StarknetError};
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 
 ///
@@ -34,10 +33,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
     )
 }
 
@@ -63,10 +59,7 @@ async fn fail_non_existing_contract(clients: HashMap<String, JsonRpcClient<HttpT
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::ContractNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::ContractNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_get_transaction_by_block_id_and_index.rs b/unit_tests/tests/test_get_transaction_by_block_id_and_index.rs
index c207583..bffd9ba 100644
--- a/unit_tests/tests/test_get_transaction_by_block_id_and_index.rs
+++ b/unit_tests/tests/test_get_transaction_by_block_id_and_index.rs
@@ -6,8 +6,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
 use common::*;
 use starknet_core::types::{BlockId, FieldElement, StarknetError};
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 
 ///
@@ -28,10 +27,7 @@ async fn fail_non_existent_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
@@ -53,10 +49,7 @@ async fn fail_non_existent_block_index(clients: HashMap<String, JsonRpcClient<Ht
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::InvalidTransactionIndex)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::InvalidTransactionIndex))
     );
 }
 
diff --git a/unit_tests/tests/test_get_transaction_by_hash.rs b/unit_tests/tests/test_get_transaction_by_hash.rs
index 699d196..5ee3204 100644
--- a/unit_tests/tests/test_get_transaction_by_hash.rs
+++ b/unit_tests/tests/test_get_transaction_by_hash.rs
@@ -6,8 +6,7 @@ use std::{assert_matches::assert_matches, collections::HashMap};
 use common::*;
 use starknet_core::types::{FieldElement, StarknetError, Transaction};
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 
 ///
@@ -28,10 +27,7 @@ async fn fail_non_existing_transaction(clients: HashMap<String, JsonRpcClient<Ht
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::TransactionHashNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::TransactionHashNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_get_transaction_status.rs b/unit_tests/tests/test_get_transaction_status.rs
index 8f74bb4..c134999 100644
--- a/unit_tests/tests/test_get_transaction_status.rs
+++ b/unit_tests/tests/test_get_transaction_status.rs
@@ -8,8 +8,7 @@ use starknet_core::types::{
     BlockId, BlockTag, FieldElement, StarknetError, TransactionExecutionStatus, TransactionStatus,
 };
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 
 ///
@@ -30,10 +29,7 @@ async fn fail_invalid_transaction(clients: HashMap<String, JsonRpcClient<HttpTra
 
     assert_matches!(
         response_deoxys,
-        Some(ProviderError::StarknetError(StarknetErrorWithMessage {
-            message: _,
-            code: MaybeUnknownErrorCode::Known(StarknetError::TransactionHashNotFound)
-        }))
+        Some(ProviderError::StarknetError(StarknetError::TransactionHashNotFound))
     );
 }
 
diff --git a/unit_tests/tests/test_simulate_transaction.rs b/unit_tests/tests/test_simulate_transaction.rs
index 2dd30fc..b77c5e0 100644
--- a/unit_tests/tests/test_simulate_transaction.rs
+++ b/unit_tests/tests/test_simulate_transaction.rs
@@ -10,8 +10,7 @@ use starknet_core::types::{
 };
 use starknet_core::utils::get_selector_from_name;
 use starknet_providers::{
-    jsonrpc::HttpTransport, JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError,
-    StarknetErrorWithMessage,
+    jsonrpc::HttpTransport, JsonRpcClient, Provider, ProviderError,
 };
 use std::assert_matches::assert_matches;
 use std::collections::HashMap;
@@ -46,7 +45,7 @@ async fn fail_non_existing_block(clients: HashMap<String, JsonRpcClient<HttpTran
 
     assert_matches!(
         deoxys.simulate_transactions(BlockId::Hash(FieldElement::ZERO),&[ok_invoke_transaction], []).await,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound
+        Err(ProviderError::StarknetError(StarknetError::BlockNotFound))
     );
 }
 
@@ -59,7 +58,7 @@ async fn fail_max_fee_too_big(clients: HashMap<String, JsonRpcClient<HttpTranspo
 
     assert_matches!(
         deoxys.simulate_transactions(BlockId::Tag(BlockTag::Latest), &[max_fee_transaction], []).await,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Unknown(500), message })) if message == "Internal server error"
+        Err(ProviderError::StarknetError(StarknetError::UnexpectedError(_))) //TODO : compare this code error to pathfinder to be sure
     );
 }
 
@@ -78,7 +77,7 @@ async fn fail_if_one_txn_cannot_be_executed(
             bad_invoke_transaction,
             ok_invoke_transaction,
         ],[] ).await,
-        Err(ProviderError::StarknetError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::ContractError
+        Err(ProviderError::StarknetError(StarknetError::ContractError(_)))
     );
 }