Ywallet integration wip

hhanh00 · Sep 16, 2024 · 47b25d2 · 47b25d2
1 parent a0a7387
commit 47b25d2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/dart-warp b/dart-warp
diff --git a/warp-macros/src/lib.rs b/warp-macros/src/lib.rs
@@ -131,6 +131,9 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                 let ident = &param.ident;
                 let name = ident.to_string();
                 match name.as_str() {
+                    "coin" => {
+                        continue;
+                    }
                     "network" => {
                         has_network = true;
                         continue;
@@ -216,35 +219,35 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
 
     let network = if has_network {
         quote! {
-            let network = &coin.network.clone();
+            let network = &coin_def.network.clone();
         }
     } else {
         quote! {}
     };
     let url = if has_url {
         quote! {
-            let url = coin.url.clone();
+            let url = coin_def.config.lwd_url.clone().unwrap();
         }
     } else {
         quote! {}
     };
     let connection = if has_connection {
         if mut_connection {
             quote! {
-                let mut connection = coin.connection()?;
+                let mut connection = coin_def.connection()?;
                 let connection: &mut rusqlite::Connection = &mut connection;
             }
         } else {
             quote! {
-                let connection = &coin.connection()?;
+                let connection = &coin_def.connection()?;
             }
         }
     } else {
         quote! {}
     };
     let client = if has_client {
         quote! {
-            let mut client = coin.connect_lwd().await?;
+            let mut client = coin_def.connect_lwd().await?;
             let client = &mut client;
         }
     } else {
@@ -272,7 +275,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
             #[tokio::main]
             pub async extern "C" fn #wrapper(coin: u8, #(#wrapped_fnargs),*) -> CResult<#c_result_type> {
                 let res = async {
-                    let coin = { 
+                    let coin_def = { 
                         let c = COINS[coin as usize].lock();
                         c.clone()
                     };
@@ -294,7 +297,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
             #[no_mangle]
             pub extern "C" fn #wrapper(coin: u8, #(#wrapped_fnargs),*) -> CResult<#c_result_type> {
                 let res = || {
-                    let coin = { 
+                    let coin_def = { 
                         let c = COINS[coin as usize].lock();
                         c.clone()
                     };

diff --git a/zcash-warp b/zcash-warp
+16 −14		bin/warp.dart
+0 −0		lib/dart_warp.dart
+797 −220		lib/data_fb_generated.dart
+83 −44		lib/warp.dart
+115 −0		lib/warp_generated.dart
+18 −0		binding.h
+39 −10		flatbuffers/data.fbs
+55 −61		src/cli.rs
+19 −25		src/coin.rs
+36 −12		src/db.rs
+88 −13		src/db/account.rs
+240 −54		src/db/account_manager.rs
+3 −2		src/db/contacts.rs
+86 −21		src/db/messages.rs
+36 −18		src/db/notes.rs
+1,064 −246		src/generated/data_generated.rs
+3 −3		src/keys.rs
+18 −1		src/lwd.rs
+3 −3		src/main.rs
+2 −10		src/pay.rs
+10 −3		src/pay/builder.rs
+15 −8		src/pay/fee.rs
+2 −1		src/pay/sweep.rs
+22 −57		src/txdetails.rs
+1 −0		src/types.rs
+33 −24		src/utils.rs
+28 −4		src/utils/db.rs
+37 −0		src/utils/keys.rs
+65 −6		src/utils/messages.rs
+8 −8		src/utils/pay.rs
+1 −1		src/utils/uri.rs
+11 −1		src/warp.rs
+11 −8		src/warp/sync.rs
+2 −1		src/warp/sync/orchard.rs
+2 −1		src/warp/sync/sapling.rs
+25 −19		src/warp/sync/transparent.rs