fix(nft): add token_id field to the tx history primary key, fix balance

mm2src/coins/eth.rs

@@ -157,6 +157,8 @@ mod eip1559_gas_fee;
 pub(crate) use eip1559_gas_fee::FeePerGasEstimated;
 use eip1559_gas_fee::{BlocknativeGasApiCaller, FeePerGasSimpleEstimator, GasApiConfig, GasApiProvider,
                       InfuraGasApiCaller};
+use mm2_number::num_bigint::ToBigInt;
+
 pub(crate) mod eth_swap_v2;
 
 /// https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol
@@ -917,7 +919,11 @@ pub async fn withdraw_erc1155(ctx: MmArc, withdraw_type: WithdrawErc1155) -> Wit
     let amount_dec = if withdraw_type.max {
         wallet_amount.clone()
     } else {
-        withdraw_type.amount.unwrap_or_else(|| 1.into())
+        let amount = withdraw_type.amount.unwrap_or_else(|| BigUint::from(1u32));
+        let bigint = amount
+            .to_bigint()
+            .ok_or_else(|| WithdrawError::InternalError("Failed to convert BigUint to BigInt".to_string()))?;
+        BigDecimal::from(bigint)
     };
 
     if amount_dec > wallet_amount {

mm2src/coins/nft.rs

@@ -25,6 +25,8 @@ use crate::nft::nft_errors::{ClearNftDbError, MetaFromUrlError, ProtectFromSpamE
 use crate::nft::nft_structs::{build_nft_with_empty_meta, BuildNftFields, ClearNftDbReq, NftCommon, NftCtx, NftInfo,
                               NftTransferCommon, PhishingDomainReq, PhishingDomainRes, RefreshMetadataReq,
                               SpamContractReq, SpamContractRes, TransferMeta, TransferStatus, UriMeta};
+#[cfg(not(target_arch = "wasm32"))]
+use crate::nft::storage::NftMigrationOps;
 use crate::nft::storage::{NftListStorageOps, NftTransferHistoryStorageOps};
 use common::log::error;
 use common::parse_rfc3339_to_timestamp;
@@ -155,6 +157,9 @@ pub async fn get_nft_transfers(ctx: MmArc, req: NftTransfersReq) -> MmResult<Nft
     for chain in req.chains.iter() {
         if !NftTransferHistoryStorageOps::is_initialized(&storage, chain).await? {
             NftTransferHistoryStorageOps::init(&storage, chain).await?;
+        } else {
+            #[cfg(not(target_arch = "wasm32"))]
+            NftMigrationOps::migrate_tx_history_if_needed(&storage, chain).await?;
         }
     }
     let mut transfer_history_list = storage
@@ -224,6 +229,8 @@ pub async fn update_nft(ctx: MmArc, req: UpdateNftReq) -> MmResult<(), UpdateNft
         let transfer_history_initialized = NftTransferHistoryStorageOps::is_initialized(&storage, chain).await?;
 
         let from_block = if transfer_history_initialized {
+            #[cfg(not(target_arch = "wasm32"))]
+            NftMigrationOps::migrate_tx_history_if_needed(&storage, chain).await?;
             let last_transfer_block = NftTransferHistoryStorageOps::get_last_block_number(&storage, chain).await?;
             last_transfer_block.map(|b| b + 1)
         } else {

mm2src/coins/nft/nft_structs.rs

@@ -21,6 +21,9 @@ use crate::nft::nft_errors::{LockDBError, ParseChainTypeError, ParseContractType
 use crate::nft::storage::{NftListStorageOps, NftTransferHistoryStorageOps};
 use crate::{TransactionType, TxFeeDetails, WithdrawFee};
 
+#[cfg(not(target_arch = "wasm32"))]
+use crate::nft::storage::NftMigrationOps;
+
 cfg_native! {
     use db_common::async_sql_conn::AsyncConnection;
     use futures::lock::Mutex as AsyncMutex;
@@ -438,7 +441,8 @@ pub struct WithdrawErc1155 {
     #[serde(deserialize_with = "deserialize_token_id")]
     pub(crate) token_id: BigUint,
     /// Optional amount of the token to withdraw. Defaults to 1 if not specified.
-    pub(crate) amount: Option<BigDecimal>,
+    #[serde(deserialize_with = "deserialize_opt_biguint")]
+    pub(crate) amount: Option<BigUint>,
     /// If set to `true`, withdraws the maximum amount available. Overrides the `amount` field.
     #[serde(default)]
     pub(crate) max: bool,
@@ -753,7 +757,7 @@ impl NftCtx {
     #[cfg(not(target_arch = "wasm32"))]
     pub(crate) async fn lock_db(
         &self,
-    ) -> MmResult<impl NftListStorageOps + NftTransferHistoryStorageOps + '_, LockDBError> {
+    ) -> MmResult<impl NftListStorageOps + NftTransferHistoryStorageOps + NftMigrationOps + '_, LockDBError> {
         Ok(self.nft_cache_db.lock().await)
     }
 
@@ -806,6 +810,19 @@ where
     BigUint::from_str(&s).map_err(serde::de::Error::custom)
 }
 
+/// Custom deserialization function for optional BigUint.
+fn deserialize_opt_biguint<'de, D>(deserializer: D) -> Result<Option<BigUint>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let opt: Option<String> = Option::deserialize(deserializer)?;
+    if let Some(s) = opt {
+        BigUint::from_str(&s).map(Some).map_err(serde::de::Error::custom)
+    } else {
+        Ok(None)
+    }
+}
+
 /// Request parameters for clearing NFT data from the database.
 #[derive(Debug, Deserialize)]
 pub struct ClearNftDbReq {

mm2src/coins/nft/storage/mod.rs

@@ -244,3 +244,10 @@ pub(crate) struct TransferDetailsJson {
     pub(crate) to_address: Address,
     pub(crate) fee_details: Option<EthTxFeeDetails>,
 }
+
+#[async_trait]
+pub trait NftMigrationOps {
+    type Error: NftStorageError;
+
+    async fn migrate_tx_history_if_needed(&self, chain: &Chain) -> MmResult<(), Self::Error>;
+}