feat: use sessionId for server-side RPCs (#956)

* feat: use sessionId for server-side RPCs

* chore: fix types

* chore: bump yttrium

* fix: add orchestration_id to export

* chore: bump cerberus

* fix: handle unwrap

* chore: bump yttrium & add st & sv to CA analytics

* fix: order

* chore: pin yttrium

Author: chris13524

Cargo.lock

@@ -13,7 +13,7 @@ build = "build.rs"
 [dependencies]
 wc = { git = "https://github.com/WalletConnect/utils-rs.git", tag = "v0.9.0", features = ["alloc", "analytics", "future", "http", "metrics", "geoip", "geoblock", "rate_limit"] }
 relay_rpc = { git = "https://github.com/WalletConnect/WalletConnectRust.git", tag = "v0.32.0", features = ["cacao"] }
-yttrium = { git = "https://github.com/reown-com/yttrium.git", rev = "4f9def1" }
+yttrium = { git = "https://github.com/reown-com/yttrium.git", rev = "e2c6984" }
 
 # Async
 async-trait = "0.1.82"
@@ -68,7 +68,7 @@ pnet_datalink = "0.31"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["json", "ansi", "env-filter"] }
 
-cerberus = { git = "https://github.com/WalletConnect/cerberus.git", tag = "v0.13.1" }
+cerberus = { git = "https://github.com/WalletConnect/cerberus.git", rev = "251233e" }
 parquet = { git = "https://github.com/WalletConnect/arrow-rs.git", rev = "99a1cc3", default-features = false, features = ["flate2"] }
 parquet_derive = { git = "https://github.com/WalletConnect/arrow-rs.git", rev = "99a1cc3" }
 chrono = { version = "0.4", features = ["serde"] }
@@ -80,7 +80,7 @@ rand = "0.8.5"
 rand_core = "0.6"
 prometheus-http-query = "0.6.6"
 ethers = { version = "2.0.11", git = "https://github.com/gakonst/ethers-rs" } # using Git version because crates.io version fails clippy
-alloy = { version = "0.9.2", features = ["providers", "json-rpc"] }
+alloy = { version = "0.11.1", features = ["providers", "json-rpc"] }
 fastlz-rs = "0.0.3"
 
 bytes = "1.7.1"
@@ -89,7 +89,7 @@ base64 = "0.22"
 bs58 = "0.5"
 regex = "1.10"
 sha256 = "1.5"
-uuid = { version = "1.10", features = ["serde"] }
+uuid = { version = "1.13.1", features = ["serde"] }
 
 # System CPU and Memory metrics
 sysinfo = "0.30"
@@ -113,4 +113,8 @@ lto = "thin"
 debug = 1
 
 # [patch.'https://github.com/reown-com/yttrium.git']
-# yttrium = { path = "../yttrium/crates/yttrium" }
+# yttrium = { path = "../../reown-com/yttrium/crates/yttrium" }
+
+[patch.crates-io]
+alloy = { git = "https://github.com/alloy-rs/alloy.git", rev = "5dcdf0f" }
+alloy-provider = { git = "https://github.com/alloy-rs/alloy.git", rev = "5dcdf0f" }

Cargo.toml

@@ -10,6 +10,12 @@ pub struct ChainAbstractionFundingInfo {
     pub country: Option<Arc<str>>,
     pub continent: Option<Arc<str>>,
 
+    // Sdk info
+    pub sv: Option<String>,
+    pub st: Option<String>,
+
+    pub orchestration_id: String,
+
     pub chain_id: String,
     pub token_contract: String,
     pub token_symbol: String,
@@ -26,6 +32,11 @@ impl ChainAbstractionFundingInfo {
         country: Option<Arc<str>>,
         continent: Option<Arc<str>>,
 
+        sv: Option<String>,
+        st: Option<String>,
+
+        orchestration_id: String,
+
         chain_id: String,
         token_contract: String,
         token_symbol: String,
@@ -40,6 +51,11 @@ impl ChainAbstractionFundingInfo {
             country,
             continent,
 
+            sv,
+            st,
+
+            orchestration_id,
+
             chain_id,
             token_contract,
             token_symbol,
@@ -58,6 +74,12 @@ pub struct ChainAbstractionBridgingInfo {
     pub country: Option<Arc<str>>,
     pub continent: Option<Arc<str>>,
 
+    // Sdk info
+    pub sv: Option<String>,
+    pub st: Option<String>,
+
+    pub orchestration_id: String,
+
     pub src_chain_id: String,
     pub src_token_contract: String,
     pub src_token_symbol: String,
@@ -80,6 +102,11 @@ impl ChainAbstractionBridgingInfo {
         country: Option<Arc<str>>,
         continent: Option<Arc<str>>,
 
+        sv: Option<String>,
+        st: Option<String>,
+
+        orchestration_id: String,
+
         src_chain_id: String,
         src_token_contract: String,
         src_token_symbol: String,
@@ -100,6 +127,11 @@ impl ChainAbstractionBridgingInfo {
             country,
             continent,
 
+            st,
+            sv,
+
+            orchestration_id,
+
             src_chain_id,
             src_token_contract,
             src_token_symbol,
@@ -124,6 +156,12 @@ pub struct ChainAbstractionInitialTxInfo {
     pub country: Option<Arc<str>>,
     pub continent: Option<Arc<str>>,
 
+    // Sdk info
+    pub sv: Option<String>,
+    pub st: Option<String>,
+
+    pub orchestration_id: String,
+
     pub transfer_from: String,
     pub transfer_to: String,
     pub amount: String,
@@ -142,6 +180,11 @@ impl ChainAbstractionInitialTxInfo {
         country: Option<Arc<str>>,
         continent: Option<Arc<str>>,
 
+        sv: Option<String>,
+        st: Option<String>,
+
+        orchestration_id: String,
+
         transfer_from: String,
         transfer_to: String,
         amount: String,
@@ -158,6 +201,11 @@ impl ChainAbstractionInitialTxInfo {
             country,
             continent,
 
+            sv,
+            st,
+
+            orchestration_id,
+
             transfer_from,
             transfer_to,
             amount,

src/analytics/chain_abstraction_info.rs

@@ -313,6 +313,7 @@ async fn handler_internal(
                 parsed_address,
                 rpc_project_id,
                 MessageSource::Balance,
+                None,
             )
             .await?;
             if let Some(balance) = response

src/handlers/balance.rs

@@ -94,6 +94,7 @@ pub async fn check_erc20_balances(
     address: Address,
     chain_id: String,
     erc2_contracts: Vec<Address>,
+    session_id: Option<String>,
 ) -> Result<Vec<(Address, U256)>, RpcError> {
     let mut balances = Vec::new();
     // Check the ERC20 tokens balance for each of supported assets
@@ -105,6 +106,7 @@ pub async fn check_erc20_balances(
             EthersH160::from(<[u8; 20]>::from(address)),
             &project_id,
             MessageSource::ChainAgnosticCheck,
+            session_id.clone(),
         )
         .await?;
         balances.push((contract, U256::from_be_bytes(erc20_balance.into())));
@@ -125,6 +127,7 @@ pub struct BridgingAsset {
 /// same symbol to avoid unnecessary swapping
 pub async fn check_bridging_for_erc20_transfer(
     rpc_project_id: String,
+    session_id: Option<String>,
     value: U256,
     sender: Address,
     // Exclude the initial transaction asset from the check
@@ -161,6 +164,7 @@ pub async fn check_bridging_for_erc20_transfer(
                 .iter()
                 .map(|c| Address::from_str(c).unwrap_or_default())
                 .collect(),
+            session_id.clone(),
         )
         .await?;
         for (contract_address, current_balance) in erc20_balances {

src/handlers/chain_agnostic/mod.rs

@@ -83,12 +83,20 @@ async fn handler_internal(
         .validate_project_access_and_quota(rpc_project_id.as_ref())
         .await?;
 
+    let first_call = if let Some(first) = request_payload.transaction.calls.into_calls().first() {
+        first.clone()
+    } else {
+        return Err(RpcError::InvalidParameter(
+            "The transaction calls are empty".to_string(),
+        ));
+    };
+
     let mut initial_transaction = Transaction {
         from: request_payload.transaction.from,
-        to: request_payload.transaction.to,
-        value: request_payload.transaction.value,
+        to: first_call.to,
+        value: first_call.value,
+        input: first_call.input.clone(),
         gas_limit: U64::ZERO,
-        input: request_payload.transaction.input.clone(),
         nonce: U64::ZERO,
         chain_id: request_payload.transaction.chain_id.clone(),
     };
@@ -103,6 +111,7 @@ async fn handler_internal(
         from_address,
         rpc_project_id.as_ref(),
         MessageSource::ChainAgnosticCheck,
+        query_params.session_id.clone(),
     )
     .await?;
     initial_transaction.nonce = intial_transaction_nonce;
@@ -274,6 +283,7 @@ async fn handler_internal(
         convert_alloy_address_to_h160(from_address),
         rpc_project_id.as_ref(),
         MessageSource::ChainAgnosticCheck,
+        query_params.session_id.clone(),
     )
     .await?;
     let erc20_balance = U256::from_be_bytes(erc20_balance.into());
@@ -289,6 +299,7 @@ async fn handler_internal(
     // or return an insufficient funds error
     let Some(bridging_asset) = check_bridging_for_erc20_transfer(
         rpc_project_id.as_ref().to_string(),
+        query_params.session_id.clone(),
         erc20_topup_value,
         from_address,
         initial_transaction.chain_id.clone(),
@@ -417,6 +428,7 @@ async fn handler_internal(
         from_address,
         rpc_project_id.as_ref(),
         MessageSource::ChainAgnosticCheck,
+        query_params.session_id.clone(),
     )
     .await?;
 
@@ -565,6 +577,9 @@ async fn handler_internal(
                 region.clone(),
                 country.clone(),
                 continent.clone(),
+                query_params.sdk_version.clone(),
+                query_params.sdk_type.clone(),
+                orchestration_id.clone(),
                 bridge_chain_id.clone(),
                 bridge_contract.to_string(),
                 bridge_token_symbol.clone(),
@@ -578,6 +593,9 @@ async fn handler_internal(
                 region.clone(),
                 country.clone(),
                 continent.clone(),
+                query_params.sdk_version.clone(),
+                query_params.sdk_type.clone(),
+                orchestration_id.clone(),
                 bridge_chain_id.clone(),
                 bridge_contract.to_string(),
                 bridge_token_symbol.clone(),
@@ -595,6 +613,9 @@ async fn handler_internal(
                 region,
                 country,
                 continent,
+                query_params.sdk_version,
+                query_params.sdk_type,
+                orchestration_id.clone(),
                 from_address.to_string(),
                 to_address.to_string(),
                 asset_transfer_value.to_string(),

src/handlers/chain_agnostic/route.rs

@@ -19,7 +19,7 @@ use {
     wc::future::FutureExt,
     yttrium::chain_abstraction::api::status::{
         StatusQueryParams, StatusResponse, StatusResponseCompleted, StatusResponseError,
-        StatusResponsePending,
+        StatusResponsePendingObject,
     },
 };
 
@@ -81,6 +81,7 @@ async fn handler_internal(
         EthersH160::from(<[u8; 20]>::from(bridging_status_item.wallet)),
         query_params.project_id.as_ref(),
         MessageSource::ChainAgnosticCheck,
+        query_params.session_id.clone(),
     )
     .await?;
 
@@ -144,7 +145,7 @@ async fn handler_internal(
     }
 
     // The balance was not fullfilled return the pending status
-    return Ok(Json(StatusResponse::Pending(StatusResponsePending {
+    return Ok(Json(StatusResponse::Pending(StatusResponsePendingObject {
         created_at: bridging_status_item.created_at,
         check_in: STATUS_POLLING_INTERVAL,
     }))

src/handlers/chain_agnostic/status.rs

@@ -116,6 +116,7 @@ pub async fn handler_internal(
         &chain_id_caip2,
         rpc_project_id,
         MessageSource::ProfileAddressSigValidate,
+        None,
     )
     .await
     {

src/handlers/profile/address.rs

@@ -92,6 +92,7 @@ pub async fn handler_internal(
         &chain_id_caip2,
         rpc_project_id,
         MessageSource::ProfileAttributesSigValidate,
+        None,
     )
     .await
     {

src/handlers/profile/attributes.rs

@@ -140,6 +140,7 @@ pub async fn handler_internal(
         &chain_id_caip2,
         rpc_project_id,
         MessageSource::ProfileRegisterSigValidate,
+        None,
     )
     .await
     {

src/handlers/profile/register.rs

@@ -129,6 +129,7 @@ async fn handler_internal(
         &chain_id_caip2,
         contract_address,
         user_op.clone(),
+        None,
     )
     .await?;
     let eip191_user_op_hash = to_eip191_message(&user_op_hash);

src/handlers/sessions/cosign.rs

@@ -1,4 +1,4 @@
-use alloy::primitives::{Bytes, B256, U64};
+use alloy::primitives::{Bytes, U64};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -7,7 +7,7 @@ pub struct CallId(pub CallIdInner);
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CallIdInner {
     pub chain_id: U64,
-    pub user_op_hash: B256,
+    pub user_op_hash: Bytes,
 }
 
 impl Serialize for CallId {