feat(zcoin): allow ARRR/ZCOIN compilation in wasm #1805

borngraced · 2023-05-05T04:20:01Z

This PR allows ARRR to be compiled in WASM.
After this PR, I will start implementing the empty/todo fn and storages

Signed-off-by: borngraced <[email protected]>

shamardy · 2023-05-08T21:58:30Z

@borngraced can you please fix the clippy warnings related to wasm?

Signed-off-by: borngraced <[email protected]>

mm2src/coins/z_coin/z_rpc.rs

# Conflicts: # mm2src/coins/z_coin.rs

shamardy

Thank you for starting this important feature! First review iteration.

mm2src/coins/lp_coins.rs

shamardy · 2023-05-11T00:20:04Z

mm2src/coins/z_coin/z_rpc.rs

+#[cfg(not(target_arch = "wasm32"))]
 pub struct BlockDb(Connection);
+#[cfg(target_arch = "wasm32")]
+pub struct BlockDb(String);

+#[cfg(not(target_arch = "wasm32"))]


please follow BlockHeaderStorageOps example https://github.com/KomodoPlatform/atomicDEX-API/blob/d01dd41e91ccf7e353a4cdb4e2135bdeb8dfc3de/mm2src/mm2_bitcoin/spv_validation/src/storage.rs#L87
by creating a common trait that should be implemented for both struct BlockDb(Connection) and pub struct BlockDb(String);. Shouldn't pub struct BlockDb(String); use IndexedDb and not a String ? You can change these structs as you see fit.

To start with, I use obvious string just to make WASM build pass as I wouldn't want to implement the storages. structure in this pr to not look messy or too complex to review.

BlockDb can't be implemented like the way BlockHeaderStorageOps is done because BlockDb additionally needs to implement a trait with a generic function.
https://github.com/KomodoPlatform/atomicDEX-API/blob/46535e882896e10aa16f3d6364007ba2a8c0cc3d/mm2src/coins/z_coin/z_rpc.rs#L363-L372

which makes doing these impossible with the current rust

https://github.com/KomodoPlatform/atomicDEX-API/blob/46535e882896e10aa16f3d6364007ba2a8c0cc3d/mm2src/coins/utxo/utxo_block_header_storage/mod.rs#L19-L21

Meanwhile, I already completed the implementation structure in another branch, so I got it covered 💯
https://github.com/KomodoPlatform/atomicDEX-API/blob/daa1b650b0ae319c79923ee0f651f889a7a438cc/mm2src/coins/z_coin/storage/blockdb/mod.rs#L30-L38

Meanwhile, I already completed the implementation structure in another branch, so I got it covered

May be it worth adding this implementation in this PR with todos if you have it? So we can see the whole picture.

Ok cool, after Omar's comment

BlockDb can't be implemented like the way BlockHeaderStorageOps is done because BlockDb additionally needs to implement a trait with a generic function.

BlockDb can implement multiple traits, I don't see the problem. It doesn't have to be exactly like BlockHeaderStorageOps/BlockHeaderStorage but I meant to take it as an example. Another example is the LightningDB trait which I plan to implement for IndexedDB later and have a common interface. https://github.com/KomodoPlatform/atomicDEX-API/blob/a1fc8f7c92819f68c0dcdf7b1c650d86cdf945ad/mm2src/coins/lightning/ln_db.rs#L200

May be it worth adding this implementation in this PR with todos if you have it? So we can see the whole picture.

As discussed with @borngraced on DM, he will add them to this PR, as for the above suggestion about following BlockHeaderStorageOps/LightningDB/etc.. you can try that in the next PRs since it will be tricky dealing with generics.

mm2src/coins/z_coin.rs

Signed-off-by: borngraced <[email protected]>

borngraced · 2023-05-17T09:30:31Z

@shamardy @laruh PR is ready for review again.

I implemented mock and structure for blockdb and only structure for walletdb in wasm

Signed-off-by: borngraced <[email protected]>

shamardy

Next review iteration!

mm2src/coins/z_coin/storage/walletdb/mod.rs

mm2src/coins/lp_coins.rs

mm2src/coins/z_coin/z_rpc.rs

mm2src/coins/z_coin/storage/blockdb/mod.rs

shamardy · 2023-05-23T21:25:53Z

mm2src/coins/z_coin.rs

-    async fn get_spendable_notes(&self) -> Result<Vec<SpendableNote>, MmError<ZcashClientError>> {
-        let db = self.z_fields.light_wallet_db.clone();
+    #[cfg(target_arch = "wasm32")]
+    async fn my_balance_sat(&self) -> Result<u64, MmError<ZCoinBalanceError>> { todo!() }


my_balance_sat wasm implementation shouldn't return a different error from the native implementation. I understand that ZcashClientError is SqliteClientError, please consider implementing a common error type for both wasm and native implementation in the next PR, you can then implement From this new error type for SqliteClientError, etc..
I guess having a common interface as discussed here #1805 (comment) helps in this.

yes I understand 💯 that was always the plan

mm2src/coins/z_coin.rs

mm2src/coins/z_coin/z_coin_errors.rs

mm2src/coins/z_coin.rs

Signed-off-by: borngraced <[email protected]>

shamardy

Next review iteration!

mm2src/coins/z_coin/z_coin_errors.rs

Signed-off-by: borngraced <[email protected]>

shamardy

LGTM at this stage! Only some minor non-blocker comments!
@borngraced please don't forget to add some unit tests for IndexedDb implementations in the next PRs.

@laruh please do a final review of this when you can.

mm2src/coins/z_coin/storage/blockdb/mod.rs

shamardy · 2023-05-31T16:45:25Z

mm2src/coins/z_coin/storage/walletdb/mod.rs

+pub enum WalletDbError {
+    ZcoinClientInitError(ZcoinClientInitError),
+    ZCoinBuildError(String),
+    IndexedDBError(String),


IndexedDBError should probably be for wasm target only too

shamardy · 2023-05-31T16:51:29Z

@borngraced please fix the PR title to make it inline with conventional commits :)

laruh

LGTM! Thanks for your work!
I have some non blocker notes and suggestions for next PR.

In next implementations may be there is a need in trait Ops for BlockDbImpl, to impl common fns like get_latest_block, insert_block, rewind_to_height etc for two targets.
And perhaps it is worth separating the database implementations for different targets into different modules (I mean not to keep both of them in mod.rs). Lets see.

mm2src/coins/z_coin/storage/walletdb/wallet_idb.rs

borngraced · 2023-06-01T07:41:46Z

LGTM! Thanks for your work! I have some non blocker notes and suggestions for next PR.

In next implementations may be there is a need in trait Ops for BlockDbImpl, to impl common fns like get_latest_block, insert_block, rewind_to_height etc for two targets. And perhaps it is worth separating the database implementations for different targets into different modules (I mean not to keep both of them in mod.rs). Lets see.

yeah, you're right... my comment to Omar here is related to this too #1805 (comment)

Signed-off-by: borngraced <[email protected]>

shamardy · 2023-06-08T23:08:38Z

@borngraced can you please resolve the conflicts introduced due to merging this PR #1853

# Conflicts: # mm2src/coins/Cargo.toml # mm2src/coins/z_coin.rs # mm2src/coins/z_coin/z_rpc.rs

Signed-off-by: borngraced <[email protected]>

…EX-API into arrr-wasm

mm2src/coins/Cargo.toml

Signed-off-by: borngraced <[email protected]>

allow ARRR compilation in wasm

653d1cc

Signed-off-by: borngraced <[email protected]>

borngraced added the in progress Changes will be made from the author label May 5, 2023

borngraced requested a review from shamardy May 5, 2023 04:20

borngraced self-assigned this May 5, 2023

borngraced added 2 commits May 5, 2023 00:26

fix typo

7ffbf28

Signed-off-by: borngraced <[email protected]>

minor changes

7b745e1

Signed-off-by: borngraced <[email protected]>

shamardy requested a review from laruh May 5, 2023 12:32

shamardy added the 1.0.5-beta label May 5, 2023

borngraced added under review and removed in progress Changes will be made from the author labels May 8, 2023

borngraced added 3 commits May 8, 2023 22:55

minor changes and allow unused

81f9790

Signed-off-by: borngraced <[email protected]>

export SyncStatus as pub

b0cc19c

Signed-off-by: borngraced <[email protected]>

add error ZCoinBalanceError for balance error

2cd3da2

Signed-off-by: borngraced <[email protected]>

laruh reviewed May 9, 2023

View reviewed changes

mm2src/coins/z_coin/z_rpc.rs Show resolved Hide resolved

Merge remote-tracking branch 'origin/dev' into arrr-wasm

d8f8fcc

# Conflicts: # mm2src/coins/z_coin.rs

shamardy requested changes May 11, 2023

View reviewed changes

borngraced added 7 commits May 11, 2023 00:43

fix merge conflicts

f59c42e

Signed-off-by: borngraced <[email protected]>

fix checks

5db9c45

Signed-off-by: borngraced <[email protected]>

save dev state

b3e5fa6

Signed-off-by: borngraced <[email protected]>

save dev state

c753125

Signed-off-by: borngraced <[email protected]>

make walletdb compatible for native and wasm

607bfd2

Signed-off-by: borngraced <[email protected]>

Merge branch 'dev' into arrr-wasm

680fd8f

apply patch

f560e80

Signed-off-by: borngraced <[email protected]>

borngraced added 4 commits May 17, 2023 13:25

minor changes

418f074

Signed-off-by: borngraced <[email protected]>

use zcoin_builder.ctx without ref

8ebb378

Signed-off-by: borngraced <[email protected]>

add all walletdb table for wasm

2e6b465

Signed-off-by: borngraced <[email protected]>

add table to naming

4878318

Signed-off-by: borngraced <[email protected]>

shamardy requested changes May 23, 2023

View reviewed changes

fix review notes

00567f9

Signed-off-by: borngraced <[email protected]>

borngraced added under review and removed in progress Changes will be made from the author labels May 25, 2023

shamardy requested changes May 25, 2023

View reviewed changes

mm2src/coins/z_coin/z_coin_errors.rs Outdated Show resolved Hide resolved

mm2src/coins/z_coin/z_coin_errors.rs Outdated Show resolved Hide resolved

mm2src/coins/z_coin/z_coin_errors.rs Outdated Show resolved Hide resolved

borngraced added 3 commits May 26, 2023 22:09

refactor duplicate errors

bc2b2a3

Signed-off-by: borngraced <[email protected]>

fix build error

2d41590

Signed-off-by: borngraced <[email protected]>

cleanup and minor changes

5a5123d

Signed-off-by: borngraced <[email protected]>

shamardy added 1.0.6-beta and removed 1.0.5-beta labels May 30, 2023

borngraced added 2 commits May 30, 2023 15:46

fix bugs in wallet indexeddb indexes

2f9b94a

Signed-off-by: borngraced <[email protected]>

fix lint

2906e80

Signed-off-by: borngraced <[email protected]>

shamardy previously approved these changes May 31, 2023

View reviewed changes

borngraced changed the title ~~allow ARRR compilation in wasm~~ feat(zcoin): allow ARRR/ZCOIN compilation in wasm May 31, 2023

laruh previously approved these changes Jun 1, 2023

View reviewed changes

mm2src/coins/z_coin/storage/walletdb/wallet_idb.rs Outdated Show resolved Hide resolved

mm2src/coins/z_coin/storage/walletdb/wallet_idb.rs Outdated Show resolved Hide resolved

mm2src/coins/z_coin/storage/walletdb/wallet_idb.rs Outdated Show resolved Hide resolved

minor changes

48596c8

Signed-off-by: borngraced <[email protected]>

borngraced dismissed stale reviews from laruh and shamardy via 48596c8 June 1, 2023 07:57

borngraced added 4 commits June 9, 2023 00:42

Merge remote-tracking branch 'origin/dev' into arrr-wasm

33289e0

# Conflicts: # mm2src/coins/Cargo.toml # mm2src/coins/z_coin.rs # mm2src/coins/z_coin/z_rpc.rs

fix merge conflicts carg

e41f3e2

Signed-off-by: borngraced <[email protected]>

fix merge conflicts

a14232a

Signed-off-by: borngraced <[email protected]>

Merge branch 'arrr-wasm' of https://github.com/KomodoPlatform/atomicD…

d474608

…EX-API into arrr-wasm

shamardy reviewed Jun 9, 2023

View reviewed changes

mm2src/coins/Cargo.toml Show resolved Hide resolved

remove line break

dd9a4a3

Signed-off-by: borngraced <[email protected]>

shamardy approved these changes Jun 9, 2023

View reviewed changes

shamardy merged commit e876ee7 into dev Jun 9, 2023

shamardy deleted the arrr-wasm branch June 9, 2023 01:50

shamardy mentioned this pull request Jun 21, 2023

chore(release): v1.0.6-beta #1871

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(zcoin): allow ARRR/ZCOIN compilation in wasm #1805

feat(zcoin): allow ARRR/ZCOIN compilation in wasm #1805

borngraced commented May 5, 2023

shamardy commented May 8, 2023

shamardy left a comment •

edited

Loading

shamardy May 11, 2023

borngraced May 11, 2023 •

edited

Loading

laruh May 11, 2023

borngraced May 11, 2023

shamardy May 11, 2023

borngraced commented May 17, 2023

shamardy left a comment

shamardy May 23, 2023

borngraced May 24, 2023 •

edited

Loading

shamardy left a comment

shamardy left a comment

shamardy May 31, 2023

shamardy commented May 31, 2023

laruh left a comment

borngraced commented Jun 1, 2023

shamardy commented Jun 8, 2023

feat(zcoin): allow ARRR/ZCOIN compilation in wasm #1805

feat(zcoin): allow ARRR/ZCOIN compilation in wasm #1805

Conversation

borngraced commented May 5, 2023

shamardy commented May 8, 2023

shamardy left a comment • edited Loading

Choose a reason for hiding this comment

shamardy May 11, 2023

Choose a reason for hiding this comment

borngraced May 11, 2023 • edited Loading

Choose a reason for hiding this comment

laruh May 11, 2023

Choose a reason for hiding this comment

borngraced May 11, 2023

Choose a reason for hiding this comment

shamardy May 11, 2023

Choose a reason for hiding this comment

borngraced commented May 17, 2023

shamardy left a comment

Choose a reason for hiding this comment

shamardy May 23, 2023

Choose a reason for hiding this comment

borngraced May 24, 2023 • edited Loading

Choose a reason for hiding this comment

shamardy left a comment

Choose a reason for hiding this comment

shamardy left a comment

Choose a reason for hiding this comment

shamardy May 31, 2023

Choose a reason for hiding this comment

shamardy commented May 31, 2023

laruh left a comment

Choose a reason for hiding this comment

borngraced commented Jun 1, 2023

shamardy commented Jun 8, 2023

shamardy left a comment •

edited

Loading

borngraced May 11, 2023 •

edited

Loading

borngraced May 24, 2023 •

edited

Loading