Improve in transit handling

Author: gemcoder21

Cargo.lock

@@ -86,6 +86,19 @@ pub async fn get_device_transaction_by_id_v2(
     id: TransactionIdParam,
     client: &State<Mutex<TransactionsClient>>,
 ) -> Result<ApiResponse<Transaction>, ApiError> {
+    get_device_transaction(id, client).await
+}
+
+#[get("/devices/transaction/<id>")]
+pub async fn get_device_transaction_v2(
+    _device: AuthenticatedDevice,
+    id: TransactionIdParam,
+    client: &State<Mutex<TransactionsClient>>,
+) -> Result<ApiResponse<Transaction>, ApiError> {
+    get_device_transaction(id, client).await
+}
+
+async fn get_device_transaction(id: TransactionIdParam, client: &State<Mutex<TransactionsClient>>) -> Result<ApiResponse<Transaction>, ApiError> {
     Ok(client.lock().await.get_transaction_by_id(&id.0)?.into())
 }
 

apps/api/src/devices/mod.rs

@@ -121,6 +121,7 @@ fn mount_routes(rocket: Rocket<Build>, admin_enabled: bool) -> Rocket<Build> {
                 devices::get_device_assets_v2,
                 devices::get_device_wallet_configuration_v2,
                 devices::get_device_name_resolve_v2,
+                devices::get_device_transaction_v2,
                 devices::get_device_transaction_by_id_v2,
                 devices::get_device_transactions_v2,
                 devices::get_device_address_names_v2,

apps/api/src/main.rs

@@ -10,7 +10,7 @@ rpc = ["dep:chain_traits", "dep:gem_client"]
 signer = ["dep:signer", "dep:gem_hash", "dep:hex"]
 reqwest = ["gem_client/reqwest"]
 unit_tests = ["signer"]
-chain_integration_tests = ["rpc", "reqwest", "settings/testkit"]
+chain_integration_tests = ["rpc", "reqwest", "primitives/testkit", "settings/testkit"]
 
 [dependencies]
 serde = { workspace = true, features = ["derive"] }

crates/gem_bitcoin/Cargo.toml

@@ -60,7 +60,7 @@ mod chain_integration_tests {
     async fn test_bitcoin_get_transactions_status() {
         let bitcoin_client = create_bitcoin_test_client();
 
-        let request = TransactionStateRequest::new_id(TEST_TRANSACTION_ID.to_string());
+        let request = TransactionStateRequest::mock_with_id(TEST_TRANSACTION_ID);
         let update = bitcoin_client.get_transaction_status(request).await.unwrap();
 
         println!("State: {:?}", update.state);

crates/gem_bitcoin/src/provider/transactions.rs

@@ -8,7 +8,7 @@ default = []
 rpc = ["dep:async-trait", "dep:chain_traits"]
 reqwest = ["gem_jsonrpc/reqwest", "gem_client/reqwest", "dep:reqwest"]
 signer = ["dep:alloy-signer-local", "dep:alloy-network", "dep:alloy-consensus"]
-chain_integration_tests = ["rpc", "reqwest", "settings/testkit"]
+chain_integration_tests = ["rpc", "reqwest", "primitives/testkit", "settings/testkit"]
 testkit = []
 
 [dependencies]

crates/gem_evm/Cargo.toml

@@ -28,7 +28,7 @@ mod chain_integration_tests {
     #[tokio::test]
     async fn test_ethereum_get_transaction_status_confirmed() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         let client = create_ethereum_test_client();
-        let request = TransactionStateRequest::new_id("0x98dd4d9a586620f84e8066f1b015d663f9c0c94c4e0e02377840c3e6d43e2ad3".to_string());
+        let request = TransactionStateRequest::mock_with_id("0x98dd4d9a586620f84e8066f1b015d663f9c0c94c4e0e02377840c3e6d43e2ad3");
 
         let result = client.get_transaction_status(request).await?;
 
@@ -47,7 +47,7 @@ mod chain_integration_tests {
     #[tokio::test]
     async fn test_smartchain_get_transaction_status_confirmed() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         let client = create_smartchain_test_client();
-        let request = TransactionStateRequest::new_id("0xd85c4496230adf8a7c0fc1e98713127fb31a0f8f72874acea443e2f615f3c1b6".to_string());
+        let request = TransactionStateRequest::mock_with_id("0xd85c4496230adf8a7c0fc1e98713127fb31a0f8f72874acea443e2f615f3c1b6");
 
         let result = client.get_transaction_status(request).await?;
 

crates/gem_evm/src/provider/transaction_state.rs

@@ -20,7 +20,7 @@ impl<C: Client> HyperCoreClient<C> {
 
         match id {
             HyperCoreTransactionId::Order(oid) => {
-                let start_time = request.created_at - 5_000;
+                let start_time = request.created_at.timestamp_millis() - 5_000;
                 let fills = self.get_user_fills_by_time(&request.sender_address, start_time).await?;
                 Ok(transaction_state_mapper::map_transaction_state_order(fills, oid, request.id))
             }

crates/gem_hypercore/src/provider/transaction_state.rs

@@ -13,7 +13,7 @@ rpc = [
     "dep:chain_traits",
 ]
 reqwest = ["gem_client/reqwest"]
-chain_integration_tests = ["rpc", "reqwest", "settings/testkit"]
+chain_integration_tests = ["rpc", "reqwest", "primitives/testkit", "settings/testkit"]
 
 [dependencies]
 primitives = { path = "../primitives" }

crates/gem_polkadot/Cargo.toml

@@ -11,12 +11,12 @@ use crate::{provider::transaction_state_mapper::map_transaction_status, rpc::cli
 impl<C: Client> ChainTransactionState for PolkadotClient<C> {
     async fn get_transaction_status(&self, request: TransactionStateRequest) -> Result<TransactionUpdate, Box<dyn Error + Sync + Send>> {
         let block_number = request.block_number;
-        if block_number <= 0 {
+        if block_number == 0 {
             return Err("Invalid block number".into());
         }
 
         let block_head = self.get_block_head().await?;
-        let from_block = block_number as u64;
+        let from_block = block_number;
         let to_block = calculate_to_block(block_head.number, from_block);
 
         let blocks = self.get_blocks(&from_block.to_string(), &to_block.to_string()).await?;