message board sync on web

Author: ec2

justfile

@@ -4,13 +4,22 @@ default:
 build:
     wasm-pack build -t web  --release --out-dir ./packages/webz-core -Z --no-default-features --features="wasm" build-std="panic_abort,std"
 
+## Wasm Tests
 test-web:
     WASM_BINDGEN_TEST_TIMEOUT=99999 wasm-pack test --release --firefox --no-default-features --features="wasm" -Z build-std="panic_abort,std"
+    
+test-message-board-web:
+    WASM_BINDGEN_TEST_TIMEOUT=99999 wasm-pack test --release --firefox --no-default-features --features="wasm" -Z build-std="panic_abort,std" --test message-board-sync
+    
+test-simple-web:
+    WASM_BINDGEN_TEST_TIMEOUT=99999 wasm-pack test --release --firefox --no-default-features --features="wasm" -Z build-std="panic_abort,std" --test simple-sync-and-send
 
-example-native:
+
+## Native Examples
+example-simple:
     cargo run -r --example simple-sync
 
-example-sqlite:
+example-simple-sqlite:
     cargo run -r --example simple-sync --features="sqlite-db"
 
 example-message-board:

src/bindgen/wallet.rs

@@ -37,6 +37,20 @@ pub struct WebWallet {
     inner: MemoryWallet<tonic_web_wasm_client::Client>,
 }
 
+impl WebWallet {
+    fn network_from_str (
+        network: &str
+    ) -> Result<consensus::Network, Error> {
+        match network {
+            "main" => Ok(consensus::Network::MainNetwork),
+            "test" => Ok(consensus::Network::TestNetwork),
+            _ => {
+                 Err(Error::InvalidNetwork(network.to_string()))
+            }
+        }
+    }
+}
+
 #[wasm_bindgen]
 impl WebWallet {
     /// Create a new instance of a Zcash wallet for a given network
@@ -46,13 +60,7 @@ impl WebWallet {
         lightwalletd_url: &str,
         min_confirmations: u32,
     ) -> Result<WebWallet, Error> {
-        let network = match network {
-            "main" => consensus::Network::MainNetwork,
-            "test" => consensus::Network::TestNetwork,
-            _ => {
-                return Err(Error::InvalidNetwork(network.to_string()));
-            }
-        };
+        let network = Self::network_from_str(network)?;
         let min_confirmations = NonZeroU32::try_from(min_confirmations)
             .map_err(|_| Error::InvalidMinConformations(min_confirmations))?;
         let client = Client::new(lightwalletd_url.to_string());
@@ -67,6 +75,7 @@ impl WebWallet {
         })
     }
 
+
     /// Add a new account to the wallet
     ///
     /// # Arguments
@@ -90,14 +99,10 @@ impl WebWallet {
         key: &str,
         birthday_height: Option<u32>,
     ) -> Result<String, Error> {
-        let s = zcash_keys::encoding::decode_extended_full_viewing_key(
-            MAIN_NETWORK.hrp_sapling_extended_full_viewing_key(),
-            &key.trim(),
-        )
-        .unwrap();
-        let ufvk = UnifiedFullViewingKey::from_sapling_extended_full_viewing_key(s).unwrap();
-
-        self.inner.import_ufvk(ufvk, birthday_height).await
+
+        let ufvk = UnifiedFullViewingKey::decode(&self.inner.network, key).map_err(Error::KeyParseError)?;
+
+        self.inner.import_ufvk(&ufvk, birthday_height).await
     }
 
     pub fn suggest_scan_ranges(&self) -> Result<Vec<BlockRange>, Error> {

src/error.rs

@@ -44,6 +44,8 @@ pub enum Error {
     InvalidAmount(#[from] zcash_primitives::transaction::components::amount::BalanceError),
     #[error("Failed to send transaction")]
     SendFailed { code: i32, reason: String },
+    #[error("Failed to parse key: {0}")]
+    KeyParseError(String),
 
     #[cfg(feature = "sqlite-db")]
     #[error("Sqlite error: {0}")]

src/wallet.rs

@@ -158,7 +158,7 @@ where
 
     pub async fn import_ufvk(
         &mut self,
-        ufvk: UnifiedFullViewingKey,
+        ufvk: &UnifiedFullViewingKey,
         birthday_height: Option<u32>,
     ) -> Result<String, Error> {
         let birthday = match birthday_height {
@@ -189,7 +189,7 @@ where
 
         let _account = self
             .db
-            .import_account_ufvk(&ufvk, &birthday, AccountPurpose::ViewOnly)?;
+            .import_account_ufvk(ufvk, &birthday, AccountPurpose::ViewOnly)?;
 
         Ok("0".to_string())
     }

tests/message-board-sync.rs

@@ -0,0 +1,47 @@
+use wasm_bindgen_test::*;
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+use std::sync::Once;
+use zcash_keys::keys::UnifiedFullViewingKey;
+use zcash_primitives::consensus::Network;
+use zcash_primitives::constants;
+use webz_core::bindgen::wallet::WebWallet;
+
+// Required to initialize the logger and panic hooks only once
+static INIT: Once = Once::new();
+pub fn initialize() {
+    INIT.call_once(|| {
+        webz_core::init::start();
+    });
+}
+const SAPLING_EFVK: &'static str = "zxviews1q0duytgcqqqqpqre26wkl45gvwwwd706xw608hucmvfalr759ejwf7qshjf5r9aa7323zulvz6plhttp5mltqcgs9t039cx2d09mgq05ts63n8u35hyv6h9nc9ctqqtue2u7cer2mqegunuulq2luhq3ywjcz35yyljewa4mgkgjzyfwh6fr6jd0dzd44ghk0nxdv2hnv4j5nxfwv24rwdmgllhe0p8568sgqt9ckt02v2kxf5ahtql6s0ltjpkckw8gtymxtxuu9gcr0swvz";
+
+#[wasm_bindgen_test]
+async fn test_message_board() {
+    initialize();
+
+    let mut w = WebWallet::new("main", "https://zcash-mainnet.chainsafe.dev", 1).unwrap();
+
+    let s = zcash_keys::encoding::decode_extended_full_viewing_key(
+        constants::mainnet::HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY,
+        &SAPLING_EFVK.trim(),
+    )
+        .unwrap();
+
+    let ufvk = UnifiedFullViewingKey::from_sapling_extended_full_viewing_key(s).unwrap();
+    let ufvk_str = ufvk.encode(&Network::MainNetwork);
+    let id = w.import_ufvk(&ufvk_str, Some(2477329)).await.unwrap();
+    tracing::info!("Created account with id: {}", id);
+
+    tracing::info!("Syncing wallet");
+    w.sync(&js_sys::Function::new_with_args(
+        "scanned_to, tip",
+        "console.log('Scanned: ', scanned_to, '/', tip)",
+    ))
+        .await
+        .unwrap();
+    tracing::info!("Syncing complete :)");
+
+    let summary = w.get_wallet_summary().unwrap();
+    tracing::info!("Wallet summary: {:?}", summary);
+}

tests/tests.rs renamed to tests/simple-sync-and-send.rs

@@ -44,3 +44,4 @@ async fn test_get_and_scan_range() {
     let summary = w.get_wallet_summary().unwrap();
     tracing::info!("Wallet summary: {:?}", summary);
 }
+