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

[laruh]

fixes #2208

also in this commit 2bdee4f fixes withdarw_erc1155 decimal issue. ERC1155 "balanceOf" method started returning exact Nft amount owned by wallet without any scaling, so we dont need to use self.decimals shift when we convert U256 type to BigDecimal

[smk762]

Thanks, NFT history and 1155 withdraws confirmed working.

Note: Withdraws of a spammy NFT were throwing gas errrors, but a good NFT was fine. I assume the spammy one was trying to scalp gas.

[shamardy]

Thanks for the fix! First review iteration!

[shamardy]

What about already created tables? Shouldn't we do a migration for these tables?

[laruh]

hmm yeah, need to do it

I think it’s worth considering the use of sql client (eg SQLx) or ORM (eg Diesel) in the future, if we decide to fully refactor KDF. These sql tools natively support migrations.

[shamardy]

I think it’s worth considering the use of sql client (eg SQLx) or ORM (eg Diesel) in the future, if we decide to fully refactor KDF. These sql tools natively support migrations.

Do we have an issue open for this? If not, please open one.

[shamardy]

@borngraced can you please review the wasm / indexeddb changes?

[laruh]

@borngraced can you please review the wasm / indexeddb changes?

ps right now it doesnt work as expected.

We use web-sys to access Web APIs available in the browser. Despite the fact that web-sys functions are sync, the actuall process in browser can be async (that what happens with IndexedDB). I suppose thats why I got A mutation operation was attempted on a database that did not allow mutations. error.
In another branch Im working on async versions of on_upgrade_needed and with_table function to see will it work.

UPD: I also suggest to check for wasm db clients which support migrations.

[borngraced]

@borngraced can you please review the wasm / indexeddb changes?

ps right now it doesnt work as expected.

We use web-sys to access Web APIs available in the browser. Despite the fact that web-sys functions are sync, the actuall process in browser can be async (that what happens with IndexedDB). I suppose thats why I got A mutation operation was attempted on a database that did not allow mutations. error. In another branch Im working on async versions of on_upgrade_needed and with_table function to see will it work.

UPD: I also suggest to check for wasm db clients which support migrations.

Have checked the cursor implementation example on how async and channels are used?

[laruh]

@borngraced can you please review the wasm / indexeddb changes?

ps right now it doesnt work as expected.

We use web-sys to access Web APIs available in the browser. Despite the fact that web-sys functions are sync, the actuall process in browser can be async (that what happens with IndexedDB). I suppose thats why I got A mutation operation was attempted on a database that did not allow mutations. error. In another branch Im working on async versions of on_upgrade_needed and with_table function to see will it work.
UPD: I also suggest to check for wasm db clients which support migrations.

Have checked the cursor implementation example on how async and channels are used?

yes, in the end cursor usage requires to call "await" somewhere to wait for the end of the process.
When we init table only build function is async

    async fn init(db_id: DbIdentifier) -> InitDbResult<Self> {
        let inner = IndexedDbBuilder::new(db_id)
            .with_version(...)
            .with_table::<...>()
            .build()
            .await?;

        Ok(Self { inner })
    }

The other idea is that, the current migration fails, bcz it started earlier than upgrade permission was granted in build function

komodo-defi-framework/mm2src/mm2_db/src/indexed_db/drivers/builder.rs

Lines 87 to 91 in e8be556

	let onupgradeneeded_closure = construct_event_closure(DbOpenEvent::UpgradeNeeded, tx.clone());
	db_request.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
	db_request.set_onsuccess(Some(onsuccess_closure.as_ref().unchecked_ref()));
	db_request.set_onupgradeneeded(Some(onupgradeneeded_closure.as_ref().unchecked_ref()));

UPD: may be it worth trying to reuse our cursor driver implementation withour making with_table async

[borngraced]

@borngraced can you please review the wasm / indexeddb changes?

ps right now it doesnt work as expected.

We use web-sys to access Web APIs available in the browser. Despite the fact that web-sys functions are sync, the actuall process in browser can be async (that what happens with IndexedDB). I suppose thats why I got A mutation operation was attempted on a database that did not allow mutations. error. In another branch Im working on async versions of on_upgrade_needed and with_table function to see will it work.
UPD: I also suggest to check for wasm db clients which support migrations.

Have checked the cursor implementation example on how async and channels are used?

yes, in the end cursor usage requires to call "await" somewhere to wait for the end of the process. When we init table only build function is async

    async fn init(db_id: DbIdentifier) -> InitDbResult<Self> {
        let inner = IndexedDbBuilder::new(db_id)
            .with_version(...)
            .with_table::<...>()
            .build()
            .await?;

        Ok(Self { inner })
    }

The other idea is that, the current migration fails, bcz it started earlier than upgrade permission was granted in build function

komodo-defi-framework/mm2src/mm2_db/src/indexed_db/drivers/builder.rs

Lines 87 to 90 in e8be556

	let onupgradeneeded_closure = construct_event_closure(DbOpenEvent::UpgradeNeeded, tx.clone());
	db_request.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
	db_request.set_onsuccess(Some(onsuccess_closure.as_ref().unchecked_ref()));

UPD: may be it worth trying to reuse our cursor driver implementation withour making with_table async

I will dedicate some time to this later today/tomorrow morning and get back to you for sure!

[borngraced]

@borngraced can you please review the wasm / indexeddb changes?

ps right now it doesnt work as expected.

We use web-sys to access Web APIs available in the browser. Despite the fact that web-sys functions are sync, the actuall process in browser can be async (that what happens with IndexedDB). I suppose thats why I got A mutation operation was attempted on a database that did not allow mutations. error. In another branch Im working on async versions of on_upgrade_needed and with_table function to see will it work.
UPD: I also suggest to check for wasm db clients which support migrations.

Have checked the cursor implementation example on how async and channels are used?

yes, in the end cursor usage requires to call "await" somewhere to wait for the end of the process. When we init table only build function is async

    async fn init(db_id: DbIdentifier) -> InitDbResult<Self> {
        let inner = IndexedDbBuilder::new(db_id)
            .with_version(...)
            .with_table::<...>()
            .build()
            .await?;

        Ok(Self { inner })
    }

The other idea is that, the current migration fails, bcz it started earlier than upgrade permission was granted in build function

komodo-defi-framework/mm2src/mm2_db/src/indexed_db/drivers/builder.rs

Lines 87 to 90 in e8be556

	let onupgradeneeded_closure = construct_event_closure(DbOpenEvent::UpgradeNeeded, tx.clone());
	db_request.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
	db_request.set_onsuccess(Some(onsuccess_closure.as_ref().unchecked_ref()));

UPD: may be it worth trying to reuse our cursor driver implementation withour making with_table async

I will dedicate some time to this later today/tomorrow morning and get back to you for sure!

@laruh have you seen this yet?

komodo-defi-framework/mm2src/mm2_main/src/lp_swap/saved_swap.rs

Lines 274 to 340 in 35e9239

	pub(super) async fn get_current_migration(
	migration_table: &DbTable<'_, SwapsMigrationTable>,
	) -> MmResult<u32, SavedSwapError> {
	let migrations = migration_table
	.cursor_builder()
	.bound("migration", 0, u32::MAX)
	.reverse()
	.open_cursor("migration")
	.await?
	// TODO refactor when "closure invoked recursively or after being dropped" is fixed
	.collect()
	.await?;
	Ok(migrations.first().map(|(_, m)| m.migration).unwrap_or_default())
	}
	pub async fn migrate_swaps_data(ctx: &MmArc) -> MmResult<(), SavedSwapError> {
	let swaps_ctx = SwapsContext::from_ctx(ctx).map_to_mm(SavedSwapError::InternalError)?;
	let db = swaps_ctx.swap_db().await?;
	let transaction = db.transaction().await?;
	let migration_table = transaction.table::<SwapsMigrationTable>().await?;
	let mut migration = get_current_migration(&migration_table).await?;
	info!("Current swaps data migration {}", migration);
	loop {
	match migration {
	0 => {
	let filters_table = transaction.table::<MySwapsFiltersTable>().await?;
	let swaps_table = transaction.table::<SavedSwapTable>().await?;
	let swaps = swaps_table.get_all_items().await?;
	let swaps = swaps
	.into_iter()
	.map(|(_item_id, SavedSwapTable { saved_swap, .. })| saved_swap)
	.map(json::from_value)
	.map(|res: Result<SavedSwap, _>| {
	res.map_to_mm(|e| SavedSwapError::ErrorDeserializing(e.to_string()))
	})
	.collect::<Result<Vec<SavedSwap>, _>>()?;
	for swap in swaps {
	let (filter_id, mut filter_record) =
	match filters_table.get_item_by_unique_index("uuid", swap.uuid()).await? {
	Some(f) => f,
	None => {
	warn!("No MySwapsFiltersTable for {}", swap.uuid());
	continue;
	},
	};
	filter_record.swap_type = LEGACY_SWAP_TYPE;
	filter_record.is_finished = swap.is_finished().into();
	filters_table.replace_item(filter_id, &filter_record).await?;
	}
	},
	1 => break,
	unsupported => {
	return MmError::err(SavedSwapError::InternalError(format!(
	"Unsupported migration {}",
	unsupported
	)))
	},
	}
	migration += 1;
	migration_table.add_item(&SwapsMigrationTable { migration }).await?;
	}
	info!("Swaps data migration is completed, new version {}", migration);
	Ok(())
	}