fix: u128 serialization (#258)

* fix: u128 serialization * fix: u128 serialization using near-sdk
Near-One · Feb 14, 2025 · 13ebfa3 · 13ebfa3
1 parent c6c3dd7
commit 13ebfa3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 26 deletions.
diff --git a/omni-relayer/Cargo.lock b/omni-relayer/Cargo.lock
diff --git a/omni-relayer/Cargo.toml b/omni-relayer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "omni-relayer"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 resolver = "2"
 repository = "https://github.com/Near-One/omni-bridge"
@@ -36,6 +36,7 @@ near-jsonrpc-client = "0.15.1"
 near-jsonrpc-primitives = "0.28.0"
 near-primitives = "0.28.0"
 near-crypto = "0.28.0"
+near-sdk = "5.8.0"
 
 hex = "0.4.3"
 alloy = { version = "0.9", features = ["node-bindings", "providers", "rpc-types", "sol-types", "provider-ws", "signers", "signer-local"] }

diff --git a/omni-relayer/src/utils/solana.rs b/omni-relayer/src/utils/solana.rs
@@ -136,11 +136,11 @@ async fn decode_instruction(
                             utils::redis::EVENTS,
                             signature.to_string(),
                             Transfer::Solana {
-                                amount: payload.amount,
+                                amount: payload.amount.into(),
                                 token: token.clone(),
                                 sender: sender.clone(),
                                 recipient: payload.recipient.clone(),
-                                fee: payload.fee,
+                                fee: payload.fee.into(),
                                 native_fee: payload.native_fee,
                                 message: payload.message.clone(),
                                 emitter: emitter.clone(),

diff --git a/omni-relayer/src/workers/mod.rs b/omni-relayer/src/workers/mod.rs
@@ -13,6 +13,7 @@ use ethereum_types::H256;
 use near_bridge_client::TransactionOptions;
 use near_jsonrpc_client::JsonRpcClient;
 use near_primitives::{hash::CryptoHash, types::AccountId, views::TxExecutionStatus};
+use near_sdk::json_types::U128;
 use solana_client::rpc_request::RpcResponseErrorData;
 use solana_rpc_client_api::{client_error::ErrorKind, request::RpcError};
 use solana_sdk::{instruction::InstructionError, pubkey::Pubkey, transaction::TransactionError};
@@ -52,11 +53,11 @@ pub enum Transfer {
         expected_finalization_time: i64,
     },
     Solana {
-        amount: u128,
+        amount: U128,
         token: String,
         sender: String,
         recipient: String,
-        fee: u128,
+        fee: U128,
         native_fee: u64,
         message: String,
         emitter: String,
@@ -960,7 +961,7 @@ async fn process_solana_init_transfer_event(
         match utils::fee::is_fee_sufficient(
             &config,
             Fee {
-                fee: fee.into(),
+                fee,
                 native_fee: u128::from(native_fee).into(),
             },
             &sender,
@@ -994,7 +995,7 @@ async fn process_solana_init_transfer_event(
         ChainKind::Sol,
         &recipient,
         token,
-        fee,
+        fee.0,
         u128::from(native_fee),
     )
     .await