Merge pull request #47 from peaqnetwork/feature/1202812787027835_improve-chain-response-time

Fix/1202812787027835 improve chain response time

Author: irediaes

.github/workflows/draft.yaml

@@ -85,10 +85,10 @@ jobs:
     needs: draft-release
     steps:
       # Set up Flutter.
-      - name: Clone Flutter repository with flutter-version 2.5.3
+      - name: Clone Flutter repository with flutter-version 3.0.5
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '2.5.3'
+          flutter-version: '3.0.5'
 
       - name: Install Linux dependencies
         if: matrix.target == 'Linux'

android/app/src/main/jniLibs/arm64-v8a/libpeaq_codec_api.so

@@ -34,15 +34,17 @@ class CEVChargeProvider with ChangeNotifier {
   LoadingStatus _chargingStatus = LoadingStatus.idle;
   String _statusMessage = '';
   String _providerDid = "";
-  double _counter = 0;
-  double _progress = 1;
+  int _repeatedSessionCount = 0;
+  double _progress = 0;
   CEVStation _station = CEVStation();
   List<Detail> _transactions = [];
   msg.TransactionValue _refundInfo = msg.TransactionValue();
   msg.TransactionValue _spentInfo = msg.TransactionValue();
   List<Detail> _details = [];
   BigInt _atto = BigInt.parse("1000000000000000000");
 
+  num token = (10 * pow(10, 19));
+
   String get providerDid => _providerDid;
   CEVStation? get station => _station;
   List<Detail> get details => _details;
@@ -51,8 +53,8 @@ class CEVChargeProvider with ChangeNotifier {
   List<Detail> get transactions => _transactions;
   msg.TransactionValue get refundInfo => _refundInfo;
   msg.TransactionValue get spentInfo => _spentInfo;
+  int get repeatedSessionCount => _repeatedSessionCount;
   double get progress => _progress;
-  double get counter => _counter;
   String get statusMessage => _statusMessage;
 
   set chargingStatus(LoadingStatus cstatus) {
@@ -89,18 +91,18 @@ class CEVChargeProvider with ChangeNotifier {
 
   // generate provider account details
   generateDetails({bool notify = false}) {
-    List<Detail> _newDetails = [];
+    List<Detail> newDetails = [];
 
     if (_station != null) {
-      _newDetails.addAll([
+      newDetails.addAll([
         Detail("Identity", _station.did ?? ""),
         Detail("Plug Type", _station.plugType ?? ""),
         Detail("Status", _station.status ?? "", color: CEVTheme.successColor),
         Detail("Power", _station.power ?? ""),
       ]);
     }
 
-    _details = _newDetails;
+    _details = newDetails;
     if (notify) {
       notifyListeners();
     }
@@ -113,18 +115,18 @@ class CEVChargeProvider with ChangeNotifier {
     var tokenSymbol = appProvider.accountProvider.account.tokenSymbol;
     _atto = BigInt.from(pow(10, num.parse(tokenDecimals.toString())));
 
-    print(
-        "generateTransactions :: _refundInfo:: ${_refundInfo.toProto3Json()}");
-    print("generateTransactions :: _spentInfo:: ${_spentInfo.toProto3Json()}");
+    // print(
+    //     "generateTransactions :: _refundInfo:: ${_refundInfo.toProto3Json()}");
+    // print("generateTransactions :: _spentInfo:: ${_spentInfo.toProto3Json()}");
 
     if (_refundInfo.tokenNum.isNotEmpty && _spentInfo.tokenNum.isNotEmpty) {
       var refundRawToken = _refundInfo.tokenNum;
       var spentRawToken = _spentInfo.tokenNum;
       var refundToken = (BigInt.parse(refundRawToken) / _atto);
-      print("refundToken:: $refundToken");
+      // print("refundToken:: $refundToken");
       var refundTokenString = refundToken.toStringAsFixed(4);
       var spentToken = (BigInt.parse(spentRawToken) / _atto);
-      print("spentToken:: $spentToken");
+      // print("spentToken:: $spentToken");
       var spentTokenString = spentToken.toStringAsFixed(4);
       var total = (refundToken + spentToken).toStringAsFixed(4);
       _newtx.addAll([
@@ -142,6 +144,7 @@ class CEVChargeProvider with ChangeNotifier {
 
   /// fetch provider Did  document from chain state storage
   fetchProviderDidDocument(String did) async {
+    _repeatedSessionCount = 0;
     reset();
     if (_providerDid == _station.did) {
       generateDetails(notify: true);
@@ -154,6 +157,8 @@ class CEVChargeProvider with ChangeNotifier {
       setStatus(LoadingStatus.error, message: Env.invalidProviderDid);
     }
 
+    setStatus(LoadingStatus.error, message: Env.fetchingData);
+
     var address = did.split(":")[2];
 
     var doc = await appProvider.peerProvider.fetchDidDocument(address);
@@ -163,9 +168,6 @@ class CEVChargeProvider with ChangeNotifier {
       notifyListeners();
     }
 
-    _status = LoadingStatus.loading;
-    notifyListeners();
-
     _station.did = _providerDid;
     _station.address = address;
 
@@ -189,9 +191,11 @@ class CEVChargeProvider with ChangeNotifier {
   generateAndFundMultisigWallet() async {
     setStatus(LoadingStatus.idle);
     String consumer = appProvider.accountProvider.account.address!;
-    String provider = _station.address!;
+    // String provider = _station.address!;
+
+    String provider = _providerDid.split(":")[2];
 
-    setStatus(LoadingStatus.loading, message: Env.creatingMultisigWallet);
+    // setStatus(LoadingStatus.loading, message: Env.creatingMultisigWallet);
 
     bool walletCreated =
         await appProvider.peerProvider.creatMultisigAddress(provider, consumer);
@@ -203,10 +207,9 @@ class CEVChargeProvider with ChangeNotifier {
       return;
     }
 
-    var token = (10 * pow(10, 19));
     var seed = appProvider.accountProvider.account.seed!;
 
-    setStatus(LoadingStatus.loading, message: Env.fundingMultisigWallet);
+    // setStatus(LoadingStatus.loading, message: Env.fundingMultisigWallet);
 
     var resp = await appProvider.peerProvider
         .transferFund(multisigAddress, "$token", seed);
@@ -217,12 +220,10 @@ class CEVChargeProvider with ChangeNotifier {
       return;
     }
 
-    await Future.delayed(const Duration(seconds: 3));
-
-    _startCharge(token.toString());
+    // await Future.delayed(const Duration(seconds: 3));
   }
 
-  _startCharge(String token) async {
+  startCharge(String token) async {
     setStatus(LoadingStatus.idle);
 
     setStatus(LoadingStatus.loading, message: Env.requestingService);
@@ -269,24 +270,8 @@ class CEVChargeProvider with ChangeNotifier {
     var spentTimePoint = _spentInfo.timePoint;
     var otherSignatories = [_station.address!];
 
-    var _seed = appProvider.accountProvider.account.seed ?? "";
-
-    setStatus(LoadingStatus.loading, message: Env.approvingRefundTransaction);
+    var seed = appProvider.accountProvider.account.seed ?? "";
 
-    bool approveRefund = await appProvider.peerProvider
-        .approveMultisigTransaction(
-            threshold: 2,
-            otherSignatories: otherSignatories,
-            timepointHeight: refundTimePoint.height.toInt(),
-            timepointIndex: refundTimePoint.index.toInt(),
-            callHash: _refundInfo.callHash,
-            seed: _seed);
-
-    if (!approveRefund) {
-      setStatus(LoadingStatus.error,
-          message: Env.approvingRefundTransactionFailed);
-      return;
-    }
     setStatus(LoadingStatus.loading, message: Env.approvingSpentTransaction);
 
     bool approveSpent = await appProvider.peerProvider
@@ -296,15 +281,44 @@ class CEVChargeProvider with ChangeNotifier {
             timepointHeight: spentTimePoint.height.toInt(),
             timepointIndex: spentTimePoint.index.toInt(),
             callHash: _spentInfo.callHash,
-            seed: _seed);
+            seed: seed);
 
     if (!approveSpent) {
       setStatus(LoadingStatus.error,
           message: Env.approvingSpentTransactionFailed);
       return;
     }
 
+    // increased the number of times this session has been repeated
+    _repeatedSessionCount += 1;
+    notifyListeners();
+
+    setStatus(LoadingStatus.loading, message: Env.approvingRefundTransaction);
+    // bool approveRefund = await appProvider.peerProvider
+    //     .approveMultisigTransaction(
+    //         threshold: 2,
+    //         otherSignatories: otherSignatories,
+    //         timepointHeight: refundTimePoint.height.toInt(),
+    //         timepointIndex: refundTimePoint.index.toInt(),
+    //         callHash: _refundInfo.callHash,
+    //         seed: seed);
+
+    // if (!approveRefund) {
+    //   setStatus(LoadingStatus.error,
+    //       message: Env.approvingRefundTransactionFailed);
+    //   return;
+    // }
+
+    appProvider.peerProvider.approveMultisigTransaction(
+        threshold: 2,
+        otherSignatories: otherSignatories,
+        timepointHeight: refundTimePoint.height.toInt(),
+        timepointIndex: refundTimePoint.index.toInt(),
+        callHash: _refundInfo.callHash,
+        seed: seed);
+
     _chargingStatus = LoadingStatus.success;
+
     setStatus(LoadingStatus.idle, message: Env.transactionCompleted);
 
     appProvider.peerProvider.disconnectP2P();

android/app/src/main/jniLibs/armeabi-v7a/libpeaq_codec_api.so

@@ -267,7 +267,8 @@ class CEVPeerProvider with ChangeNotifier {
     }
 
     if (_isPeerAuthenticated) {
-      await appProvider.chargeProvider.generateAndFundMultisigWallet();
+      await appProvider.chargeProvider
+          .startCharge(appProvider.chargeProvider.token.toString());
       // await appProvider.accountProvider
       //     .simulateServiceRequestedAndDeliveredEvents();
     } else {