[service/tx] reap voucher uses now the dart way

Author: clangenb

app/lib/page/reap_voucher/reap_voucher_page.dart

@@ -46,6 +46,7 @@ class ReapVoucherPage extends StatefulWidget {
 }
 
 class _ReapVoucherPageState extends State<ReapVoucherPage> {
+  late KeyringAccount _voucherKeyringAccount;
   String? _voucherAddress;
   double? _voucherBalance;
 
@@ -56,8 +57,8 @@ class _ReapVoucherPageState extends State<ReapVoucherPage> {
     Log.d('Fetching voucher data...', 'ReapVoucherPage');
     final store = context.read<AppStore>();
 
-    final voucherPair = await KeyringAccount.fromUri('Voucher', voucherUri);
-    _voucherAddress = voucherPair.address(prefix: store.settings.endpoint.ss58 ?? 42).encode();
+    _voucherKeyringAccount = await KeyringAccount.fromUri('Voucher', voucherUri);
+    _voucherAddress = _voucherKeyringAccount.address(prefix: store.settings.endpoint.ss58 ?? 42).encode();
 
     setState(() {});
 
@@ -96,12 +97,12 @@ class _ReapVoucherPageState extends State<ReapVoucherPage> {
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
-    final store = context.watch<AppStore>();
+    final store = context.read<AppStore>();
     final h2Grey = context.titleLarge.copyWith(color: AppColors.encointerGrey);
     final h4Grey = context.bodyLarge.copyWith(color: AppColors.encointerGrey);
 
     final voucher = widget.voucher;
-    final recipient = store.account.currentAddress;
+    final recipient = Address.decode(store.account.currentAddress);
 
     return Scaffold(
       appBar: AppBar(title: Text(l10n.voucher)),
@@ -156,7 +157,7 @@ class _ReapVoucherPageState extends State<ReapVoucherPage> {
             SubmitButton(
               key: const Key(EWTestKeys.submitVoucher),
               onPressed: _isReady
-                  ? (context) => _submitReapVoucher(context, voucher.voucherUri, voucher.cid, recipient)
+                  ? (context) => _submitReapVoucher(context, _voucherKeyringAccount, voucher.cid, recipient)
                   : null,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
@@ -175,24 +176,28 @@ class _ReapVoucherPageState extends State<ReapVoucherPage> {
 
   Future<void> _submitReapVoucher(
     BuildContext context,
-    String voucherUri,
+    KeyringAccount voucherKeyringAccount,
     CommunityIdentifier cid,
-    String recipientAddress,
+    Address recipientAddress,
   ) async {
     // Fixme, use proper threshold here: #589
     if (_voucherBalance! < 0.04) return showRedeemFailedDialog(context, context.l10n.voucherBalanceTooLow);
 
-    final res = await submitReapVoucher(widget.api, voucherUri, recipientAddress, cid);
-
-    if (res['hash'] == null) {
-      Log.d('Error redeeming voucher: ${res['error']}', 'ReapVoucherPage');
-      await showRedeemFailedDialog(context, res['error'] as String?);
-    } else {
-      await VoucherDialogs.showRedeemSuccessDialog(
-        context: context,
-        onOK: () => Navigator.of(context).popUntil((route) => route.isFirst),
-      );
-    }
+    await submitEncointerTransferAll(
+      context, context.read<AppStore>(), widget.api, voucherKeyringAccount, recipientAddress, cid,
+      // the voucher obviously has tokens in cid.
+      txPaymentAsset: cid,
+      onError: (report) async {
+        Log.d('Error redeeming voucher: ${report.toJson()}', 'ReapVoucherPage');
+        await showRedeemFailedDialog(context, report.toJson().toString());
+      },
+      onFinish: (context, report) async {
+        await VoucherDialogs.showRedeemSuccessDialog(
+          context: context,
+          onOK: () => Navigator.of(context).popUntil((route) => route.isFirst),
+        );
+      },
+    );
   }
 
   Future<ChangeResult?> _changeNetworkAndCommunityIfNeeded(

app/lib/service/substrate_api/account_api.dart

@@ -54,12 +54,12 @@ class AccountApi {
 
   Future<ExtrinsicReport> sendTxAndShowNotification(
     OpaqueExtrinsic xt,
-    TxNotification notification, {
+    TxNotification? notification, {
     String? cid,
   }) async {
     final report = await EWAuthorApi(provider).submitAndWatchExtrinsicWithReport(xt);
 
-    if (report.isExtrinsicSuccess) {
+    if (report.isExtrinsicSuccess && notification != null) {
       final hash = report.blockHash;
       unawaited(NotificationPlugin.showNotification(
         int.parse(hash.substring(0, 6)),

app/lib/service/tx/lib/src/submit_to_inner.dart

@@ -29,7 +29,7 @@ Future<void> submitTxInner(
   AppStore store,
   Api api,
   OpaqueExtrinsic extrinsic,
-  TxNotification notification,
+  TxNotification? notification,
   bool showStatusSnackBar, {
   void Function(DispatchError error)? onError,
   dynamic Function(BuildContext, ExtrinsicReport)? onFinish,

app/lib/service/tx/lib/src/submit_tx_wrappers.dart

@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:flutter/cupertino.dart';
 import 'package:provider/provider.dart';
 
@@ -37,7 +35,7 @@ Future<void> submitTx(
   AppStore store,
   Api api,
   OpaqueExtrinsic xt,
-  TxNotification notification, {
+  TxNotification? notification, {
   dynamic Function(BuildContext txPageContext, ExtrinsicReport report)? onFinish,
   void Function(DispatchError report)? onError,
 }) async {
@@ -356,13 +354,37 @@ Future<dynamic> submitNextPhaseWithAlice(BuildContext context, AppStore store, A
   }
 }
 
-Future<Map<String, dynamic>> submitReapVoucher(
+Future<void> submitEncointerTransferAll(
+  BuildContext context,
+  AppStore store,
   Api api,
-  String voucherUri,
-  String recipientAddress,
-  CommunityIdentifier cid,
-) async {
-  return api.js.evalJavascript('encointer.reapVoucher("$voucherUri","$recipientAddress", ${jsonEncode(cid)})');
+  KeyringAccount signer,
+  Address recipientAddress,
+  CommunityIdentifier cid, {
+  required CommunityIdentifier? txPaymentAsset,
+  TxNotification? notification,
+  dynamic Function(BuildContext txPageContext, ExtrinsicReport report)? onFinish,
+  void Function(DispatchError report)? onError,
+}) async {
+  final call = api.encointer.encointerKusama.tx.encointerBalances.transferAll(
+    dest: recipientAddress.pubkey,
+    cid: cid.toPolkadart(),
+  );
+  final xt = await TxBuilder(api.provider).createSignedExtrinsic(
+    signer.pair,
+    call,
+    paymentAsset: txPaymentAsset?.toPolkadart(),
+  );
+
+  return submitTx(
+    context,
+    context.read<AppStore>(),
+    api,
+    OpaqueExtrinsic(xt),
+    notification,
+    onFinish: onFinish,
+    onError: onError,
+  );
 }
 
 void _showEducationalDialog(ParticipantType registrationType, BuildContext context) {