working end to end

Author: d4mr

Cargo.lock

@@ -4,10 +4,9 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-aide = { version = "0.14.2", features = ["axum"] }
 alloy = { version = "1.0.8", features = ["serde", "json-rpc"] }
 schemars = "0.8.22"
-serde = "1.0.219"
+serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 thiserror = "2.0.12"
 vault-types = { version = "0.1.0", git = "ssh://git@github.com/thirdweb-dev/vault.git", branch = "main" }

core/Cargo.toml

@@ -1,4 +1,4 @@
-use alloy::primitives::Address;
+use alloy::primitives::{Address, Bytes};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -7,3 +7,14 @@ use serde::{Deserialize, Serialize};
 /// # Address
 /// Used to represent an EVM address. This is a string of length 42 with a `0x` prefix. Non-checksummed addresses are also supported, but will be converted to checksummed.
 pub struct AddressDef(pub String);
+
+#[derive(JsonSchema, Serialize, Deserialize, Clone)]
+#[serde(remote = "Bytes", transparent)]
+/// # Bytes
+/// Used to represent "bytes". This is a 0x prefixed hex string.
+pub struct BytesDef(pub String);
+
+#[derive(JsonSchema, Serialize, Deserialize, Clone)]
+/// # U256
+/// Used to represent a 256-bit unsigned integer. Engine can parse these from any valid encoding of the Ethereum "quantity" format.
+pub struct U256Def(pub String);

core/src/defs.rs

@@ -1,17 +1,19 @@
+use crate::defs::AddressDef;
 use alloy::{
     primitives::Address,
     transports::{
         RpcError as AlloyRpcError, TransportErrorKind, http::reqwest::header::InvalidHeaderValue,
     },
 };
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use thirdweb_core::error::ThirdwebError;
 use thiserror::Error;
 use twmq::error::TwmqError;
 
 use crate::chain::Chain;
 
-#[derive(Debug, Error, Clone, Serialize, Deserialize)]
+#[derive(Debug, Error, Clone, Serialize, Deserialize, JsonSchema)]
 pub enum RpcErrorKind {
     /// Server returned an error response.
     #[error("server returned an error response: {0}")]
@@ -56,7 +58,7 @@ pub enum RpcErrorKind {
     OtherTransportError(String),
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone, JsonSchema)]
 pub struct RpcErrorResponse {
     /// The error code.
     pub code: i64,
@@ -80,7 +82,7 @@ impl RpcErrorResponse {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct RpcErrorInfo {
     /// The chain ID where the error occurred
     pub chain_id: u64,
@@ -97,7 +99,7 @@ pub struct RpcErrorInfo {
 }
 
 /// A serializable contract interaction error type
-#[derive(Debug, Error, Serialize, Deserialize, Clone)]
+#[derive(Debug, Error, Serialize, Deserialize, Clone, JsonSchema)]
 pub enum ContractInteractionErrorKind {
     /// Unknown function referenced.
     #[error("unknown function: function {0} does not exist")]
@@ -135,9 +137,29 @@ pub enum ContractInteractionErrorKind {
     /// An error occured while waiting for a pending transaction.
     #[error("pending transaction error: {0}")]
     PendingTransactionError(String),
+
+    /// Error during contract function preparation (ABI resolution, parameter encoding)
+    #[error("contract preparation failed: {0}")]
+    PreparationFailed(String),
+
+    /// Error during multicall execution
+    #[error("multicall execution failed: {0}")]
+    MulticallExecutionFailed(String),
+
+    /// Error during result decoding
+    #[error("result decoding failed: {0}")]
+    ResultDecodingFailed(String),
+
+    /// Parameter validation error
+    #[error("parameter validation failed: {0}")]
+    ParameterValidationFailed(String),
+
+    /// Function resolution error
+    #[error("function resolution failed: {0}")]
+    FunctionResolutionFailed(String),
 }
 
-#[derive(Error, Debug, Serialize, Clone, Deserialize)]
+#[derive(Error, Debug, Serialize, Clone, Deserialize, JsonSchema)]
 pub enum EngineError {
     #[error("RPC error on chain {chain_id} at {rpc_url}: {message}")]
     RpcError {
@@ -175,6 +197,7 @@ pub enum EngineError {
     #[error("Contract interaction error: {message}")]
     ContractInteractionError {
         /// Contract address
+        #[schemars(with = "Option<AddressDef>")]
         contract_address: Option<Address>,
         /// Chain ID
         chain_id: u64,
@@ -202,6 +225,43 @@ impl From<InvalidHeaderValue> for EngineError {
     }
 }
 
+impl EngineError {
+    pub fn contract_preparation_error(
+        contract_address: Option<Address>,
+        chain_id: u64,
+        message: String,
+    ) -> Self {
+        EngineError::ContractInteractionError {
+            contract_address,
+            chain_id,
+            message: message.clone(),
+            kind: ContractInteractionErrorKind::PreparationFailed(message),
+        }
+    }
+
+    pub fn contract_multicall_error(chain_id: u64, message: String) -> Self {
+        EngineError::ContractInteractionError {
+            contract_address: None,
+            chain_id,
+            message: message.clone(),
+            kind: ContractInteractionErrorKind::MulticallExecutionFailed(message),
+        }
+    }
+
+    pub fn contract_decoding_error(
+        contract_address: Option<Address>,
+        chain_id: u64,
+        message: String,
+    ) -> Self {
+        EngineError::ContractInteractionError {
+            contract_address,
+            chain_id,
+            message: message.clone(),
+            kind: ContractInteractionErrorKind::ResultDecodingFailed(message),
+        }
+    }
+}
+
 pub trait AlloyRpcErrorToEngineError {
     fn to_engine_error(&self, chain: &impl Chain) -> EngineError;
     fn to_engine_bundler_error(&self, chain: &impl Chain) -> EngineError;

core/src/error.rs

@@ -95,16 +95,21 @@ pub fn default_account_salt() -> String {
 struct EntrypointAndFactoryDetailsDeserHelper {
     /// # Entrypoint Contract Address
     /// The address of the ERC-4337 entrypoint contract.
+    ///
     /// If omitted, defaults to the standard address for the specified/inferred version.
+    ///
     /// Known addresses:
+    ///
     /// - V0.6: 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789
+    ///
     /// - V0.7: 0x0000000071727De22E5E9d8BAf0edAc6f37da032
     #[serde(rename = "entrypointAddress")]
-    #[schemars(with = "AddressDef")]
+    #[schemars(with = "Option<AddressDef>")]
     entrypoint_address: Option<Address>,
 
     /// # Entrypoint Version
     /// The version of the ERC-4337 standard to use.
+    ///
     /// If omitted, the version will be inferred from the entrypoint address,
     /// then from factory address, or defaults to V0.7.
     #[serde(rename = "entrypointVersion")]
@@ -113,11 +118,14 @@ struct EntrypointAndFactoryDetailsDeserHelper {
     /// # Account Factory Address
     /// The address of the smart account factory contract.
     /// If omitted, defaults to the thirweb default account factory for the specified/inferred version.
+    ///
     /// Known addresses:
+    ///
     /// - V0.6: 0x85e23b94e7F5E9cC1fF78BCe78cfb15B81f0DF00
+    ///
     /// - V0.7: 0x4bE0ddfebcA9A5A4a617dee4DeCe99E7c862dceb
     #[serde(rename = "factoryAddress")]
-    #[schemars(with = "AddressDef")]
+    #[schemars(with = "Option<AddressDef>")]
     factory_address: Option<Address>,
 }