Download / Sync from file

hhanh00 · Oct 8, 2024 · 8bd9846 · 8bd9846
1 parent 0bc4fe6
commit 8bd9846
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,6 +24,7 @@ figment = { version = "0.10.19", features = [ "env", "toml" ] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = [ "env-filter" ] }
 tokio = { version = "1.40", features = ["rt-multi-thread"] }
+tokio-stream = "0.1.15"
 tonic = { version = "0.12", features = ["tls", "tls-native-roots", "tls-webpki-roots"] }
 prost = "0.13"
 hex = { version = "0.4", features = ["serde"] }

diff --git a/dart-warp b/dart-warp
diff --git a/warp-macros/src/lib.rs b/warp-macros/src/lib.rs
@@ -117,6 +117,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let ItemFn { vis, block, .. } = &input;
     let mut wrapped_fnargs = vec![];
     let mut convs = vec![];
+    let mut has_coin = false;
     let mut has_network = false;
     let mut has_connection = false;
     let mut mut_connection = false;
@@ -132,6 +133,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                 let name = ident.to_string();
                 match name.as_str() {
                     "coin" => {
+                        has_coin = true;
                         continue;
                     }
                     "network" => {
@@ -217,6 +219,14 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
         wrapped_fnargs.push(input.clone());
     }
 
+    let coin = if has_coin {
+        quote! {
+            let coin = &coin_def.clone();
+        }
+    } else {
+        quote! {}
+    };
+
     let network = if has_network {
         quote! {
             let network = &coin_def.network.clone();
@@ -279,6 +289,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                         let c = COINS[coin as usize].lock();
                         c.clone()
                     };
+                    #coin
                     #network
                     #connection
                     #url
@@ -301,6 +312,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                         let c = COINS[coin as usize].lock();
                         c.clone()
                     };
+                    #coin
                     #network
                     #connection
                     #url
@@ -313,7 +325,6 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
             }
 
             #vis fn #ident(#inputs) #output #block
-
         }
     };
 

diff --git a/ywallet b/ywallet
diff --git a/zcash-warp b/zcash-warp
+1 −0		Cargo.toml
+3 −1		binding.h
+21 −6		src/cli.rs
+3 −3		src/db/account.rs
+13 −0		src/keys.rs
+1 −0		src/pay.rs
+18 −1		src/pay/builder.rs
+1 −0		src/pay/conv.rs
+3 −2		src/utils.rs
+1 −1		src/utils/chain.rs
+165 −46		src/warp/sync.rs
+3 −2		src/warp/sync/orchard.rs
+2 −1		src/warp/sync/sapling.rs
+1 −1		src/warp/sync/transparent.rs