Merge branch 'master' into contract-error-data-msg

xJonathanLEI · Oct 30, 2023 · 8db3dfa · 8db3dfa
2 parents b44b884 + 1d2eb07
commit 8db3dfa
Show file tree

Hide file tree

Showing 26 changed files with 485 additions and 599 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starknet"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Jonathan LEI <[email protected]>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
@@ -35,13 +35,13 @@ all-features = true
 
 [dependencies]
 starknet-ff = { version = "0.3.4", path = "./starknet-ff", default-features = false }
-starknet-crypto = { version = "0.6.0", path = "./starknet-crypto" }
-starknet-core = { version = "0.6.1", path = "./starknet-core", default-features = false }
-starknet-providers = { version = "0.6.0", path = "./starknet-providers" }
-starknet-contract = { version = "0.5.0", path = "./starknet-contract" }
-starknet-signers = { version = "0.4.0", path = "./starknet-signers" }
-starknet-accounts = { version = "0.5.0", path = "./starknet-accounts" }
-starknet-macros = { version = "0.1.3", path = "./starknet-macros" }
+starknet-crypto = { version = "0.6.1", path = "./starknet-crypto" }
+starknet-core = { version = "0.7.0", path = "./starknet-core", default-features = false }
+starknet-providers = { version = "0.7.0", path = "./starknet-providers" }
+starknet-contract = { version = "0.6.0", path = "./starknet-contract" }
+starknet-signers = { version = "0.5.0", path = "./starknet-signers" }
+starknet-accounts = { version = "0.6.0", path = "./starknet-accounts" }
+starknet-macros = { version = "0.1.4", path = "./starknet-macros" }
 
 [dev-dependencies]
 serde_json = "1.0.74"

diff --git a/README.md b/README.md
@@ -98,6 +98,8 @@ Examples can be found in the [examples folder](./examples):
 
 9. [Parsing a JSON-RPC request on the server side](./examples/parse_jsonrpc_request.rs)
 
+10. [Inspecting a erased provider-specific error type](./examples/downcast_provider_error.rs)
+
 ## License
 
 Licensed under either of

diff --git a/examples/downcast_provider_error.rs b/examples/downcast_provider_error.rs
@@ -0,0 +1,26 @@
+use starknet_providers::{
+    jsonrpc::{HttpTransport, HttpTransportError, JsonRpcClient, JsonRpcClientError},
+    Provider, ProviderError,
+};
+use url::Url;
+
+#[tokio::main]
+async fn main() {
+    let rpc_client =
+        JsonRpcClient::new(HttpTransport::new(Url::parse("https://fake.url/").unwrap()));
+
+    let error = match rpc_client.block_number().await.unwrap_err() {
+        ProviderError::Other(inner) => inner,
+        _ => panic!("unexpected error variant"),
+    };
+
+    // The implementation-specific error type is erased to make the `ProviderError` type easier to
+    // work with. Here, we showcase how to recover the inner type.
+    let impl_specific_error: &JsonRpcClientError<HttpTransportError> =
+        match error.as_any().downcast_ref() {
+            Some(inner) => inner,
+            None => panic!("unexpected downcast failure"),
+        };
+
+    dbg!(impl_specific_error);
+}
diff --git a/examples/starknet-wasm/Cargo.toml b/examples/starknet-wasm/Cargo.toml
@@ -20,6 +20,6 @@ default = ["console_error_panic_hook"]
 
 [dependencies]
 starknet-ff = { version = "0.3.4", path = "../../starknet-ff" }
-starknet-crypto = { version = "0.6.0", path = "../../starknet-crypto" }
+starknet-crypto = { version = "0.6.1", path = "../../starknet-crypto" }
 console_error_panic_hook = { version = "0.1.7", optional = true }
 wasm-bindgen = "0.2.84"
diff --git a/starknet-accounts/Cargo.toml b/starknet-accounts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starknet-accounts"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Jonathan LEI <[email protected]>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
@@ -14,9 +14,9 @@ keywords = ["ethereum", "starknet", "web3"]
 exclude = ["test-data/**"]
 
 [dependencies]
-starknet-core = { version = "0.6.1", path = "../starknet-core" }
-starknet-providers = { version = "0.6.0", path = "../starknet-providers" }
-starknet-signers = { version = "0.4.0", path = "../starknet-signers" }
+starknet-core = { version = "0.7.0", path = "../starknet-core" }
+starknet-providers = { version = "0.7.0", path = "../starknet-providers" }
+starknet-signers = { version = "0.5.0", path = "../starknet-signers" }
 async-trait = "0.1.68"
 auto_impl = "1.0.1"
 thiserror = "1.0.40"

diff --git a/starknet-accounts/src/account/declaration.rs b/starknet-accounts/src/account/declaration.rs
@@ -99,9 +99,7 @@ impl<'a, A> Declaration<'a, A>
 where
     A: ConnectedAccount + Sync,
 {
-    pub async fn estimate_fee(
-        &self,
-    ) -> Result<FeeEstimate, AccountError<A::SignError, <A::Provider as Provider>::Error>> {
+    pub async fn estimate_fee(&self) -> Result<FeeEstimate, AccountError<A::SignError>> {
         // Resolves nonce
         let nonce = match self.nonce {
             Some(value) => value,
@@ -119,8 +117,7 @@ where
         &self,
         skip_validate: bool,
         skip_fee_charge: bool,
-    ) -> Result<SimulatedTransaction, AccountError<A::SignError, <A::Provider as Provider>::Error>>
-    {
+    ) -> Result<SimulatedTransaction, AccountError<A::SignError>> {
         // Resolves nonce
         let nonce = match self.nonce {
             Some(value) => value,
@@ -135,21 +132,11 @@ where
             .await
     }
 
-    pub async fn send(
-        &self,
-    ) -> Result<
-        DeclareTransactionResult,
-        AccountError<A::SignError, <A::Provider as Provider>::Error>,
-    > {
+    pub async fn send(&self) -> Result<DeclareTransactionResult, AccountError<A::SignError>> {
         self.prepare().await?.send().await
     }
 
-    async fn prepare(
-        &self,
-    ) -> Result<
-        PreparedDeclaration<'a, A>,
-        AccountError<A::SignError, <A::Provider as Provider>::Error>,
-    > {
+    async fn prepare(&self) -> Result<PreparedDeclaration<'a, A>, AccountError<A::SignError>> {
         // Resolves nonce
         let nonce = match self.nonce {
             Some(value) => value,
@@ -183,7 +170,7 @@ where
     async fn estimate_fee_with_nonce(
         &self,
         nonce: FieldElement,
-    ) -> Result<FeeEstimate, AccountError<A::SignError, <A::Provider as Provider>::Error>> {
+    ) -> Result<FeeEstimate, AccountError<A::SignError>> {
         let prepared = PreparedDeclaration {
             account: self.account,
             inner: RawDeclaration {
@@ -210,8 +197,7 @@ where
         nonce: FieldElement,
         skip_validate: bool,
         skip_fee_charge: bool,
-    ) -> Result<SimulatedTransaction, AccountError<A::SignError, <A::Provider as Provider>::Error>>
-    {
+    ) -> Result<SimulatedTransaction, AccountError<A::SignError>> {
         let prepared = PreparedDeclaration {
             account: self.account,
             inner: RawDeclaration {
@@ -298,9 +284,7 @@ impl<'a, A> LegacyDeclaration<'a, A>
 where
     A: ConnectedAccount + Sync,
 {
-    pub async fn estimate_fee(
-        &self,
-    ) -> Result<FeeEstimate, AccountError<A::SignError, <A::Provider as Provider>::Error>> {
+    pub async fn estimate_fee(&self) -> Result<FeeEstimate, AccountError<A::SignError>> {
         // Resolves nonce
         let nonce = match self.nonce {
             Some(value) => value,
@@ -318,8 +302,7 @@ where
         &self,
         skip_validate: bool,
         skip_fee_charge: bool,
-    ) -> Result<SimulatedTransaction, AccountError<A::SignError, <A::Provider as Provider>::Error>>
-    {
+    ) -> Result<SimulatedTransaction, AccountError<A::SignError>> {
         // Resolves nonce
         let nonce = match self.nonce {
             Some(value) => value,
@@ -334,21 +317,13 @@ where
             .await
     }
 
-    pub async fn send(
-        &self,
-    ) -> Result<
-        DeclareTransactionResult,
-        AccountError<A::SignError, <A::Provider as Provider>::Error>,
-    > {
+    pub async fn send(&self) -> Result<DeclareTransactionResult, AccountError<A::SignError>> {
         self.prepare().await?.send().await
     }
 
     async fn prepare(
         &self,
-    ) -> Result<
-        PreparedLegacyDeclaration<'a, A>,
-        AccountError<A::SignError, <A::Provider as Provider>::Error>,
-    > {
+    ) -> Result<PreparedLegacyDeclaration<'a, A>, AccountError<A::SignError>> {
         // Resolves nonce
         let nonce = match self.nonce {
             Some(value) => value,
@@ -381,7 +356,7 @@ where
     async fn estimate_fee_with_nonce(
         &self,
         nonce: FieldElement,
-    ) -> Result<FeeEstimate, AccountError<A::SignError, <A::Provider as Provider>::Error>> {
+    ) -> Result<FeeEstimate, AccountError<A::SignError>> {
         let prepared = PreparedLegacyDeclaration {
             account: self.account,
             inner: RawLegacyDeclaration {
@@ -407,8 +382,7 @@ where
         nonce: FieldElement,
         skip_validate: bool,
         skip_fee_charge: bool,
-    ) -> Result<SimulatedTransaction, AccountError<A::SignError, <A::Provider as Provider>::Error>>
-    {
+    ) -> Result<SimulatedTransaction, AccountError<A::SignError>> {
         let prepared = PreparedLegacyDeclaration {
             account: self.account,
             inner: RawLegacyDeclaration {
@@ -505,12 +479,7 @@ impl<'a, A> PreparedDeclaration<'a, A>
 where
     A: ConnectedAccount,
 {
-    pub async fn send(
-        &self,
-    ) -> Result<
-        DeclareTransactionResult,
-        AccountError<A::SignError, <A::Provider as Provider>::Error>,
-    > {
+    pub async fn send(&self) -> Result<DeclareTransactionResult, AccountError<A::SignError>> {
         let tx_request = self.get_declare_request(false).await?;
         self.account
             .provider()
@@ -522,10 +491,7 @@ where
     pub async fn get_declare_request(
         &self,
         query_only: bool,
-    ) -> Result<
-        BroadcastedDeclareTransactionV2,
-        AccountError<A::SignError, <A::Provider as Provider>::Error>,
-    > {
+    ) -> Result<BroadcastedDeclareTransactionV2, AccountError<A::SignError>> {
         let signature = self
             .account
             .sign_declaration(&self.inner, query_only)
@@ -563,12 +529,7 @@ impl<'a, A> PreparedLegacyDeclaration<'a, A>
 where
     A: ConnectedAccount,
 {
-    pub async fn send(
-        &self,
-    ) -> Result<
-        DeclareTransactionResult,
-        AccountError<A::SignError, <A::Provider as Provider>::Error>,
-    > {
+    pub async fn send(&self) -> Result<DeclareTransactionResult, AccountError<A::SignError>> {
         let tx_request = self.get_declare_request(false).await?;
         self.account
             .provider()
@@ -580,10 +541,7 @@ where
     pub async fn get_declare_request(
         &self,
         query_only: bool,
-    ) -> Result<
-        BroadcastedDeclareTransactionV1,
-        AccountError<A::SignError, <A::Provider as Provider>::Error>,
-    > {
+    ) -> Result<BroadcastedDeclareTransactionV1, AccountError<A::SignError>> {
         let signature = self
             .account
             .sign_legacy_declaration(&self.inner, query_only)