Allow custom fee

hhanh00 · Aug 5, 2023 · 95aec7b · 95aec7b
1 parent d338584
commit 95aec7b
Show file tree

Hide file tree

Showing 22 changed files with 336 additions and 59 deletions.
diff --git a/idl/data.fbs b/idl/data.fbs
@@ -226,3 +226,10 @@ table TxReport {
   fee:uint64;
   privacy_level:uint8;
 }
+
+table Fee {
+  fee:uint64;
+  min_fee:uint64;
+  max_fee:uint64;
+  scheme:uint8;
+}
diff --git a/lib/accounts.dart b/lib/accounts.dart
@@ -49,7 +49,6 @@ class AccountList {
               (a) => Account(coin.coin, a.id, a.name!, a.keyType, a.balance, 0))
           .toList();
       final id = WarpApi.getActiveAccountId(coin.coin);
-      print("active $id");
       if (id != 0) {
         accounts.firstWhere((a) => a.id == id).active = true;
       }

diff --git a/lib/contact.dart b/lib/contact.dart
@@ -89,7 +89,7 @@ class ContactsState extends State<ContactsTab> {
 
   _onCommit() async {
     try {
-      final txPlan = WarpApi.commitUnsavedContacts(settings.anchorOffset);
+      final txPlan = WarpApi.commitUnsavedContacts(settings.anchorOffset, settings.feeRule);
       Navigator.of(context).pushNamed('/txplan', arguments: txPlan);
     } on String catch (msg) {
       showSnackBar(msg, error: true);

diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -236,6 +236,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "error": m7,
         "excludedNotes": MessageLookupByLibrary.simpleMessage("Excluded Notes"),
         "expert": MessageLookupByLibrary.simpleMessage("Expert"),
+        "fee": MessageLookupByLibrary.simpleMessage("Fee"),
         "fileSaved": MessageLookupByLibrary.simpleMessage("File saved"),
         "fromPool": MessageLookupByLibrary.simpleMessage("From Pool"),
         "fromto": MessageLookupByLibrary.simpleMessage("From/To"),

diff --git a/lib/generated/intl/messages_es.dart b/lib/generated/intl/messages_es.dart
@@ -241,6 +241,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "excludedNotes":
             MessageLookupByLibrary.simpleMessage("Notas excluidas"),
         "expert": MessageLookupByLibrary.simpleMessage("Modo Experto"),
+        "fee": MessageLookupByLibrary.simpleMessage("Fee"),
         "fileSaved": MessageLookupByLibrary.simpleMessage("Archivo guardado"),
         "fromPool": MessageLookupByLibrary.simpleMessage("Del Suministro"),
         "fromto": MessageLookupByLibrary.simpleMessage("Rem/Dest."),

diff --git a/lib/generated/intl/messages_fr.dart b/lib/generated/intl/messages_fr.dart
@@ -240,6 +240,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "error": m7,
         "excludedNotes": MessageLookupByLibrary.simpleMessage("Billets exclus"),
         "expert": MessageLookupByLibrary.simpleMessage("Expert"),
+        "fee": MessageLookupByLibrary.simpleMessage("Fee"),
         "fileSaved": MessageLookupByLibrary.simpleMessage("File saved"),
         "fromPool": MessageLookupByLibrary.simpleMessage("A partir du Fond"),
         "fromto": MessageLookupByLibrary.simpleMessage("Env/Dest."),

diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/home.dart b/lib/home.dart
@@ -364,43 +364,61 @@ class HomeInnerState extends State<HomeInnerPage>
       if (!WarpApi.isValidTransparentKey(k)) return s.invalidKey;
       return null;
     };
+    final formKey = GlobalKey<FormBuilderState>();
     final confirmed = await showDialog<bool>(
             context: context,
             barrierDismissible: false,
             builder: (context) => AlertDialog(
                 title: Text(s.sweep),
                 content: SingleChildScrollView(
+                  child: FormBuilder(
+                    key: formKey,
                     child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    TextFormField(
-                      decoration: InputDecoration(labelText: s.transparentKey),
-                      controller: keyController,
-                      validator: checkKey,
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        FormBuilderTextField(
+                          name: 'key',
+                          decoration:
+                              InputDecoration(labelText: s.transparentKey),
+                          controller: keyController,
+                          validator: checkKey,
+                        ),
+                        FormBuilderRadioGroup<int>(
+                            orientation: OptionsOrientation.horizontal,
+                            decoration: InputDecoration(labelText: s.toPool),
+                            name: 'pool',
+                            initialValue: 0,
+                            onChanged: (v) {
+                              pool = v ?? 0;
+                            },
+                            options: [
+                              FormBuilderFieldOption(
+                                  child: Text('T'), value: 0),
+                              FormBuilderFieldOption(
+                                  child: Text('S'), value: 1),
+                              if (active.coinDef.supportsUA)
+                                FormBuilderFieldOption(
+                                    child: Text('O'), value: 2),
+                            ]),
+                      ],
                     ),
-                    FormBuilderRadioGroup<int>(
-                        orientation: OptionsOrientation.horizontal,
-                        decoration: InputDecoration(labelText: s.toPool),
-                        name: 'pool',
-                        initialValue: 0,
-                        onChanged: (v) {
-                          pool = v ?? 0;
-                        },
-                        options: [
-                          FormBuilderFieldOption(child: Text('T'), value: 0),
-                          FormBuilderFieldOption(child: Text('S'), value: 1),
-                          if (active.coinDef.supportsUA)
-                            FormBuilderFieldOption(child: Text('O'), value: 2),
-                        ]),
-                  ],
-                )),
-                actions: confirmButtons(
-                    context, () => Navigator.of(context).pop(true)))) ??
+                  ),
+                ),
+                actions: confirmButtons(context, () async {
+                  final form = formKey.currentState!;
+                  if (form.validate()) {
+                    try {
+                      final txid = await WarpApi.sweepTransparent(syncStatus.latestHeight,
+                          keyController.text, pool, settings.anchorOffset, settings.feeRule);
+                      showSnackBar(s.txId(txid));
+                      Navigator.of(context).pop(true);
+                    } on String catch (msg) {
+                      form.fields['key']!.invalidate(msg);
+                    }
+                  }
+                }))) ??
         false;
     if (confirmed) {
-      final txid = await WarpApi.sweepTransparent(syncStatus.latestHeight,
-          keyController.text, pool, settings.anchorOffset);
-      showSnackBar(s.txId(txid));
     }
   }
 

diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -310,5 +310,6 @@
   "scanningAddresses": "Scanning addresses",
   "blockExplorer": "Block Explorer",
   "tapQrCodeForSaplingAddress": "Tap QR Code for Sapling Address",
-  "playSound": "Play Sound"
+  "playSound": "Play Sound",
+  "fee": "Fee"
 }
diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb
@@ -308,5 +308,6 @@
   "scanningAddresses": "Scanning addresses",
   "blockExplorer": "Block Explorer",
   "tapQrCodeForSaplingAddress": "Tap QR Code for Sapling Address",
-  "playSound": "Sonido"
+  "playSound": "Sonido",
+  "fee": "Fee"
 }
diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb
@@ -309,5 +309,6 @@
   "scanningAddresses": "Scanning addresses",
   "blockExplorer": "Block Explorer",
   "tapQrCodeForSaplingAddress": "Tap QR Code for Sapling Address",
-  "playSound": "Effets Sonores"
+  "playSound": "Effets Sonores",
+  "fee": "Fee"
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -834,7 +834,7 @@ Future<bool> authenticate(BuildContext context, String reason) async {
 Future<void> shieldTAddr(BuildContext context) async {
   try {
     final txPlan = WarpApi.shieldTAddr(
-        active.coin, active.id, active.tbalance, settings.anchorOffset);
+        active.coin, active.id, active.tbalance, settings.anchorOffset, settings.feeRule);
     Navigator.of(context).pushNamed('/txplan', arguments: txPlan);
   } on String catch (msg) {
     showSnackBar(msg, error: true);

diff --git a/lib/pools.dart b/lib/pools.dart
@@ -149,7 +149,8 @@ class PoolsState extends State<PoolsPage> {
             includeFee,
             _memoController.text,
             stringToAmount(_maxAmountController.text),
-            settings.anchorOffset);
+            settings.anchorOffset,
+            settings.feeRule);
         Navigator.of(context)
             .pushReplacementNamed('/txplan', arguments: txPlan);
       } on String catch (message) {

diff --git a/lib/send.dart b/lib/send.dart
@@ -538,7 +538,7 @@ Future<void> send(BuildContext context, List<Recipient> recipients) async {
   if (recipients.length == 1) active.setDraftRecipient(recipients[0]);
   try {
     final txPlan = await WarpApi.prepareTx(
-        active.coin, active.id, recipients, settings.anchorOffset);
+        active.coin, active.id, recipients, settings.anchorOffset, settings.feeRule);
     Navigator.pushReplacementNamed(context, '/txplan', arguments: txPlan);
   } on String catch (message) {
     showSnackBar(message);

diff --git a/lib/settings.dart b/lib/settings.dart
@@ -35,6 +35,7 @@ class SettingsState extends State<SettingsPage>
     with SingleTickerProviderStateMixin {
   var _anchorController =
       TextEditingController(text: "${settings.anchorOffset}");
+  var _feeController = TextEditingController(text: amountToString(settings.fee, MAX_PRECISION));
   var _memoController = TextEditingController();
   var _currency = settings.currency;
   var _needAuth = false;
@@ -152,6 +153,15 @@ class SettingsState extends State<SettingsPage>
                                     },
                                     onSaved: _onProtectOpen)),
                           ]),
+                          if (!simpleMode)
+                            FormBuilderTextField(
+                                decoration: InputDecoration(
+                                    labelText: s.fee),
+                                name: 'fee',
+                                keyboardType: TextInputType.number,
+                                controller: _feeController,
+                                inputFormatters: [makeInputFormatter(false)],
+                                onSaved: _onFee),
                           if (!simpleMode)
                             FormBuilderCheckbox(
                                 name: 'use_millis',
@@ -441,6 +451,10 @@ class SettingsState extends State<SettingsPage>
     settings.updateGetTx(v);
   }
 
+  _onFee(v) {
+    settings.setFee(stringToAmount(v));
+  }
+
   _onUseMillis(v) {
     settings.setUseMillis(v);
   }

diff --git a/lib/store.dart b/lib/store.dart
@@ -199,6 +199,9 @@ abstract class _Settings with Store {
   @observable
   bool sound = true;
 
+  @observable
+  int fee = 1000;
+
   String dbPasswd = "";
 
   @action
@@ -229,6 +232,7 @@ abstract class _Settings with Store {
     txView = ViewStyle.values[(prefs.getInt('tx_view') ?? 0)];
     qrOffline = prefs.getBool('qr_offline') ?? true;
     sound = prefs.getBool('sound') ?? true;
+    fee = prefs.getInt('fee') ?? 10000;
 
     primaryColorValue = prefs.getInt('primary') ?? Colors.blue.value;
     primaryVariantColorValue =
@@ -594,7 +598,20 @@ abstract class _Settings with Store {
     prefs.setInt('min_privacy', v);
   }
 
+  @action
+  Future<void> setFee(int v) async {
+    final prefs = await SharedPreferences.getInstance();
+    fee = v;
+    prefs.setInt('fee', v);
+  }
+
   bool get isDeveloper => developerMode == 0;
+
+  FeeT get feeRule {
+    return FeeT(
+      fee: fee,
+    );
+  }
 }
 
 Future<double?> getFxRate(String coin, String fiat) async {

diff --git a/native/zcash-sync b/native/zcash-sync
+21 −5		binding.h
+12 −3		src/api/contact.rs
+30 −5		src/api/dart_ffi.rs
+10 −38		src/api/payment_v2.rs
+201 −0		src/db/data_generated.rs
+14 −8		src/ledger/builder.rs
+4 −19		src/ledger/builder/orchard_bundle.rs
+4 −3		src/ledger/builder/sapling_bundle.rs
+14 −5		src/note_selection/fee.rs
+2 −1		src/note_selection/optimize.rs
+3 −0		src/taddr.rs