Swaps

hhanh00 · Oct 27, 2024 · 2d96791 · 2d96791
1 parent 2531164
commit 2d96791
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 25 deletions.
diff --git a/dart-warp b/dart-warp
diff --git a/warp-macros/src/lib.rs b/warp-macros/src/lib.rs
@@ -4,8 +4,8 @@ use proc_macro2::Span;
 use proc_macro_error::{abort, proc_macro_error};
 use quote::quote;
 use syn::{
-    parse_macro_input, parse_quote, FnArg, GenericArgument, Ident, ItemFn,
-    Pat, PathArguments, ReturnType, Signature, Type,
+    parse_macro_input, parse_quote, FnArg, GenericArgument, Ident, ItemFn, Pat, PathArguments,
+    ReturnType, Signature, Type,
 };
 
 #[proc_macro_attribute]
@@ -46,23 +46,23 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
             };
             quote! {
                 let res = res.map(|_| 0u8);
-                map_result(res)
+                crate::ffi::map_result(res)
             }
         }
         "String" => {
             c_result_type = parse_quote! {
-                *mut c_char
+                *mut std::ffi::c_char
             };
             quote! {
-                map_result_string(res)
+                crate::ffi::map_result_string(res)
             }
         }
         "Vec < u8 >" => {
             c_result_type = parse_quote! {
                 *const u8
             };
             quote! {
-                map_result_bytes(res)
+                crate::ffi::map_result_bytes(res)
             }
         }
         _ => {
@@ -74,41 +74,41 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                 };
                 quote! {
                     let data = res.map(|res| {
-                        let mut builder = FlatBufferBuilder::new();
+                        let mut builder = flatbuffers::FlatBufferBuilder::new();
                         let mut os = Vec::new();
                         for v in res.iter().rev() {
                             let o = v.pack(&mut builder);
                             builder.push(o);
                             os.push(o);
                         }
-                        builder.start_vector::<WIPOffset<#ty>>(res.len());
+                        builder.start_vector::<flatbuffers::WIPOffset<#ty>>(res.len());
                         for o in os {
                             builder.push(o);
                         }
-                        let o = builder.end_vector::<WIPOffset<#ty>>(res.len());
+                        let o = builder.end_vector::<flatbuffers::WIPOffset<#ty>>(res.len());
                         builder.finish(o, None);
                         let data = builder.finished_data();
                         data.to_vec()
                     });
-                    map_result_bytes(data)
+                    crate::ffi::map_result_bytes(data)
                 }
             } else if result_type_str.ends_with("T") {
                 c_result_type = parse_quote! {
                     *const u8
                 };
                 quote! {
                     let data = res.map(|res| {
-                        let mut builder = FlatBufferBuilder::new();
+                        let mut builder = flatbuffers::FlatBufferBuilder::new();
                         let ret_bytes = res.pack(&mut builder);
                         builder.finish(ret_bytes, None);
                         let data = builder.finished_data().to_vec();
                         data
                     });
-                    map_result_bytes(data)
+                    crate::ffi::map_result_bytes(data)
                 }
             } else {
                 quote! {
-                    map_result(res)
+                    crate::ffi::map_result(res)
                 }
             }
         }
@@ -155,11 +155,11 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                 match type_name.as_str() {
                     "& str" => {
                         convs.push(quote! {
-                            let #ident = unsafe { CStr::from_ptr(#ident).to_string_lossy() };
+                            let #ident = unsafe { std::ffi::CStr::from_ptr(#ident).to_string_lossy() };
                             let #ident = &#ident;
                         });
                         let input: FnArg = parse_quote! {
-                            #ident: *mut c_char
+                            #ident: *mut std::ffi::c_char
                         };
                         wrapped_fnargs.push(input);
                         continue;
@@ -175,7 +175,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                             let #ident = &#ident[..];
                         });
                         let input: FnArg = parse_quote! {
-                            #ident: CParam
+                            #ident: crate::ffi::CParam
                         };
                         wrapped_fnargs.push(input);
                         continue;
@@ -202,7 +202,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                             let #ident = &#ident;
                         });
                         let input: FnArg = parse_quote! {
-                            #ident: CParam
+                            #ident: crate::ffi::CParam
                         };
                         wrapped_fnargs.push(input);
                         continue;
@@ -214,6 +214,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
         wrapped_fnargs.push(input.clone());
     }
 
+    let has_autoparam = has_coin | has_network | has_connection | mut_connection | has_client;
     let coin = if has_coin {
         quote! {
             let coin = &coin_def.clone();
@@ -267,12 +268,26 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
 
     let wrapper = Ident::new(&format!("c_{}", ident), ident.span());
 
-    let res = if is_async {
+    let res = if !has_autoparam {
         quote! {
             #[no_mangle]
-            pub extern "C" fn #wrapper(coin: u8, #(#wrapped_fnargs),*) -> CResult<#c_result_type> {
+            pub extern "C" fn #wrapper(#(#wrapped_fnargs),*) -> crate::ffi::CResult<#c_result_type> {
+                let res = || {
+                    #(#convs)*
+                    #ident(#(#args),*)
+                };
+                let res = res();
+                #map_result
+            }
+
+            #vis fn #ident(#inputs) #output #block
+        }
+    } else if is_async {
+        quote! {
+            #[no_mangle]
+            pub extern "C" fn #wrapper(coin: u8, #(#wrapped_fnargs),*) -> crate::ffi::CResult<#c_result_type> {
                 let coin_def = {
-                    let c = COINS[coin as usize].lock();
+                    let c = crate::coin::COINS[coin as usize].lock();
                     c.clone()
                 };
                 let runtime = coin_def.runtime.0.as_ref().unwrap();
@@ -292,10 +307,10 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
     } else {
         quote! {
             #[no_mangle]
-            pub extern "C" fn #wrapper(coin: u8, #(#wrapped_fnargs),*) -> CResult<#c_result_type> {
+            pub extern "C" fn #wrapper(coin: u8, #(#wrapped_fnargs),*) -> crate::ffi::CResult<#c_result_type> {
                 let res = || {
                     let coin_def = {
-                        let c = COINS[coin as usize].lock();
+                        let c = crate::coin::COINS[coin as usize].lock();
                         c.clone()
                     };
                     #coin

diff --git a/zcash-warp b/zcash-warp
diff --git a/zkool b/zkool
+425 −27		lib/data_fb_generated.dart
+23 −10		lib/warp.dart
+72 −46		lib/warp_generated.dart
+14 −9		binding.h
+21 −0		flatbuffers/data.fbs
+0 −5		src/account/contacts.rs
+0 −5		src/account/txs.rs
+3 −2		src/cli.rs
+23 −17		src/db.rs
+1 −4		src/db/account.rs
+0 −5		src/db/account_manager.rs
+0 −5		src/db/chain.rs
+0 −4		src/db/contacts.rs
+3 −29		src/db/mempool.rs
+0 −5		src/db/messages.rs
+27 −8		src/db/notes.rs
+110 −0		src/db/swap.rs
+33 −21		src/db/tx.rs
+688 −3		src/generated/data_generated.rs
+1 −6		src/keys.rs
+13 −7		src/lwd.rs
+5 −1		src/pay.rs
+9 −6		src/pay/builder.rs
+9 −1		src/pay/prepare.rs
+0 −4		src/pay/sweep.rs
+0 −4		src/txdetails.rs
+1 −4		src/utils.rs
+0 −4		src/utils/chain.rs
+0 −6		src/utils/data_split.rs
+12 −18		src/utils/db.rs
+0 −5		src/utils/keys.rs
+1 −9		src/utils/messages.rs
+1 −7		src/utils/pay.rs
+0 −5		src/utils/tx.rs
+0 −6		src/utils/ua.rs
+9 −10		src/utils/uri.rs
+0 −6		src/utils/zip_db.rs
+5 −9		src/warp/mempool.rs
+0 −6		src/warp/sync.rs
+54 −55		lib/accounts.dart
+30 −0		lib/accounts.g.dart
+6 −0		lib/generated/intl/messages.dart
+3 −0		lib/generated/intl/messages_en.dart
+3 −0		lib/generated/intl/messages_es.dart
+3 −0		lib/generated/intl/messages_fr.dart
+3 −0		lib/generated/intl/messages_pt.dart
+2 −1		lib/l10n/intl_en.arb
+2 −1		lib/pages/accounts/submit.dart
+87 −90		lib/pages/accounts/swap/history.dart
+368 −365		lib/pages/accounts/swap/stealthex.dart
+0 −1		lib/pages/messages.dart
+5 −12		lib/pages/more/more.dart
+1 −1		lib/pages/scan.dart
+1 −1		lib/pages/splash.dart
+1 −1		lib/pages/utils.dart
+22 −19		lib/router.dart
+3 −1		lib/store.dart