Merge branch 'master' into f-droid

app/lib/service/substrate_api/encointer/encointer_api.dart

@@ -98,6 +98,7 @@ class EncointerApi {
     getReputations();
     getMeetupTimeOverride();
     store.encointer.communityAccount?.getNumberOfNewbieTicketsForBootstrapper();
+    store.encointer.account?.getNumberOfNewbieTicketsForReputable();
   }
 
   /// Queries the Scheduler pallet: encointerScheduler.currentPhase().
@@ -476,7 +477,7 @@ class EncointerApi {
 
         if (cid != null && pubKey != null && pubKey.isNotEmpty) {
           final address = store.account.currentAddress;
-          final data = await getAggregatedAccountData(cid, pubKey);
+          final data = await pollAggregatedAccountDataUntilNextPhase(phase, cid, pubKey);
           store.encointer.setAggregatedAccountData(cid, address, data);
         }
 
@@ -486,6 +487,31 @@ class EncointerApi {
     });
   }
 
+  /// Polls the aggregated account data until its ceremony phase field equals [nextPhase].
+  ///
+  /// This is needed because because the latestHash slightly lags behind, as it involves a
+  /// network request based on the `bestHead` subscription.
+  Future<AggregatedAccountData> pollAggregatedAccountDataUntilNextPhase(
+    CeremonyPhase nextPhase,
+    CommunityIdentifier cid,
+    String pubKey,
+  ) async {
+    while (true) {
+      final data = await getAggregatedAccountData(cid, pubKey, at: store.chain.latestHash);
+      final phase = data.global.ceremonyPhase;
+
+      if (nextPhase == phase) {
+        Log.d('[EncointerApi] received account data valid for the new ceremony phase', 'EncointerApi');
+        return data;
+      } else {
+        await Future.delayed(
+          const Duration(seconds: 3),
+          () => Log.d('[EncointerApi] polling account data until next phase is reached...', 'EncointerApi'),
+        );
+      }
+    }
+  }
+
   /// Subscribes to new community identifies.
   Future<void> subscribeCommunityIdentifiers() async {
     // contrary to the JS subscriptions, we don't get the current

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

@@ -90,8 +90,8 @@ Future<void> submitEndorseNewcomer(
     api,
     txParams,
     onFinish: (BuildContext txPageContext, ExtrinsicReport report) {
-      store.encointer.account!.getNumberOfNewbieTicketsForReputable();
-      store.encointer.communityAccount!.getNumberOfNewbieTicketsForBootstrapper();
+      store.encointer.account!.getNumberOfNewbieTicketsForReputable(at: report.blockHashBytes);
+      store.encointer.communityAccount!.getNumberOfNewbieTicketsForBootstrapper(at: report.blockHashBytes);
     },
   );
 }

app/lib/store/encointer/sub_stores/community_store/community_account_store/community_account_store.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:typed_data';
 
 import 'package:encointer_wallet/service/substrate_api/api.dart';
 import 'package:json_annotation/json_annotation.dart';
@@ -171,10 +172,10 @@ abstract class _CommunityAccountStore with Store {
   }
 
   @action
-  Future<void> getNumberOfNewbieTicketsForBootstrapper() async {
-    // Todo: #923 This returns 5 for non-bootstrappers as it naively calculates the amount of tickes based on
+  Future<void> getNumberOfNewbieTicketsForBootstrapper({Uint8List? at}) async {
+    // Todo: #923 This returns 5 for non-bootstrappers as it naively calculates the amount of tickets based on
     // the amount of burned tickets. This is essentially wrong and leads to workarounds that we need to do on dart side.
-    numberOfNewbieTicketsForBootstrapper = await webApi.encointer.getNumberOfNewbieTicketsForBootstrapper();
+    numberOfNewbieTicketsForBootstrapper = await webApi.encointer.getNumberOfNewbieTicketsForBootstrapper(at: at);
   }
 
   void initStore(Function? cacheFn) {

app/lib/store/encointer/sub_stores/encointer_account_store/encointer_account_store.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:typed_data';
 
 import 'package:json_annotation/json_annotation.dart';
 import 'package:mobx/mobx.dart';
@@ -143,8 +144,8 @@ abstract class _EncointerAccountStore with Store {
   }
 
   @action
-  Future<void> getNumberOfNewbieTicketsForReputable() async {
-    numberOfNewbieTicketsForReputable = await webApi.encointer.getNumberOfNewbieTicketsForReputable();
+  Future<void> getNumberOfNewbieTicketsForReputable({Uint8List? at}) async {
+    numberOfNewbieTicketsForReputable = await webApi.encointer.getNumberOfNewbieTicketsForReputable(at: at);
   }
 
   void initStore(Function? cacheFn) {

app/pubspec.yaml

@@ -14,7 +14,7 @@ description: EncointerWallet made with Flutter.
 
 # bump version already while working on new release, bumping build number at the same time
 # bump build number even more, if needed to clarify what's deployed
-version: 1.11.5+876
+version: 1.11.6+877
 
 publish_to: none