Merge pull request #9 from horizonx-tech/feature/fix-sign-method

Refactor sign Method to Avoid Panic on Gas Estimation and Enhance Error Handling

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ic-web3-rs"
-version = "0.1.9"
+version = "0.1.10"
 description = "Ethereum JSON-RPC client for IC canisters."
 homepage = "https://github.com/horizonx-tech/ic-web3"
 repository = "https://github.com/horizonx-tech/ic-web3"

src/contract/error.rs

@@ -35,6 +35,17 @@ impl std::error::Error for Error {
     }
 }
 
+impl From<Error> for crate::error::Error {
+    fn from(e: Error) -> Self {
+        match e {
+            Error::InvalidOutputType(s) => crate::error::Error::InvalidResponse(s),
+            Error::Abi(eth_error) => crate::error::Error::Decoder(format!("{}", eth_error)),
+            Error::Api(api_error) => api_error,
+            Error::InterfaceUnsupported => crate::error::Error::Internal,
+        }
+    }
+}
+
 pub mod deploy {
     use crate::{error::Error as ApiError, types::H256};
     use derive_more::{Display, From};

src/contract/mod.rs

@@ -407,18 +407,23 @@ mod contract_signing {
                 max_priority_fee_per_gas: options.max_priority_fee_per_gas,
                 ..Default::default()
             };
-            if let Some(gas) = options.gas {
-                tx.gas = gas;
+            tx.gas = if let Some(gas) = options.gas {
+                gas
             } else {
-                tx.gas = self
+                match self
                     ._estimate_gas(
                         Address::from_str(&from.to_string().as_str()).unwrap(),
                         &tx,
                         options.call_options.unwrap_or_default(),
                     )
                     .await
-                    .unwrap();
-            }
+                {
+                    Ok(gas) => gas,
+                    Err(e) => {
+                        return Err(e.into());
+                    }
+                }
+            };
             if let Some(value) = options.value {
                 tx.value = value;
             }