[PLA-1640][PLA-1858] Fixes missing relayNode on config.json (#11)

enjin · Jun 14, 2024 · 8c7c6af · 8c7c6af
1 parent 6735b99
commit 8c7c6af
Show file tree

Hide file tree

Showing 7 changed files with 201 additions and 145 deletions.
diff --git a/config.json b/config.json
@@ -1 +1 @@
-{"node":"wss://rpc.matrix.canary.enjin.io:443","api":"https://platform.canary.enjin.io/graphql","master_key":"store"}
+{"node":"wss://rpc.matrix.blockchain.enjin.io:443","relay_node":"wss://rpc.relay.blockchain.enjin.io:443","api":"https://platform.enjin.io/graphql","master_key":"store"}
diff --git a/lib/presentation/loading_screen/controller/loading_controller.dart b/lib/presentation/loading_screen/controller/loading_controller.dart
@@ -20,7 +20,6 @@ class LoadingController extends GetxController {
 
   Future<void> _checkDependencies() async {
     final Directory appDir = await getApplicationSupportDirectory();
-    print(appDir.path);
 
     final DownloadAssetsController downloadAssetsController =
         DownloadAssetsController();

diff --git a/lib/presentation/main_screen/controller/main_controller.dart b/lib/presentation/main_screen/controller/main_controller.dart
@@ -35,6 +35,7 @@ class MainController extends GetxController
   final platformEndpoint = ''.obs;
   final authToken = ''.obs;
   final rpcNode = ''.obs;
+  final relayNode = ''.obs;
 
   final enjinMatrixKey = ''.obs;
   final canaryMatrixKey = ''.obs;
@@ -86,9 +87,11 @@ class MainController extends GetxController
     Get.offNamed(Routes.lock.nameToRoute());
   }
 
-  Future<void> setDaemonConfigFile(String api, String node) async {
+  Future<void> setDaemonConfigFile(
+      String api, String node, String relayNode) async {
     final config = {
       "node": node,
+      "relay_node": relayNode,
       "api": api,
       "master_key": "store",
     };
@@ -129,7 +132,7 @@ class MainController extends GetxController
     if (!DaemonService.instance.hasAddress) {
       final search = [...otp.split('\n'), ...otp.split(' ')];
       for (String word in search) {
-        final prefix = currentNetwork == 'enjin-matrix' ? 'ef' : 'cx';
+        final prefix = currentNetwork.value == 'enjin-matrix' ? 'ef' : 'cx';
         if (word.startsWith(prefix)) {
           String addr = word.split('\n')[0];
 
@@ -213,7 +216,7 @@ class MainController extends GetxController
     String walletApp = '$workingDir/wallet';
     String configFile = '$workingDir/config.json';
 
-    final hasSeed = await loadSeed();
+    await loadSeed();
 
     await DaemonService.instance.runWallet(
       walletApp: walletApp,
@@ -228,12 +231,12 @@ class MainController extends GetxController
   }
 
   Future<void> deleteStoreDir() async {
-    final directory = await getApplicationSupportDirectory();
-    String path = p.join(directory.path, 'store');
-    Directory dir = Directory(path);
-    if (dir.existsSync()) {
-      dir.delete(recursive: true);
-    }
+    // final directory = await getApplicationSupportDirectory();
+    // String path = p.join(directory.path, 'store');
+    // Directory dir = Directory(path);
+    // if (dir.existsSync()) {
+    //   dir.delete(recursive: true);
+    // }
   }
 
   Future<void> stopWallet() async {
@@ -245,7 +248,8 @@ class MainController extends GetxController
     checkIsRunning();
   }
 
-  Future<void> setPlatformConfig(String node, String api, String token) async {
+  Future<void> setPlatformConfig(
+      String node, String relayNode, String api, String token) async {
     await store
         .record('enjin.custom.api.key')
         .put(StoreService.instance.db!, token);
@@ -255,8 +259,11 @@ class MainController extends GetxController
     await store
         .record('enjin.custom.node.url')
         .put(StoreService.instance.db!, node);
+    await store
+        .record('enjin.custom.relay.url')
+        .put(StoreService.instance.db!, relayNode);
 
-    await setDaemonConfigFile(api, node);
+    await setDaemonConfigFile(api, node, relayNode);
   }
 
   Future<void> setDefaultAuthKeys(String authEnjin, String authCanary) async {

diff --git a/lib/presentation/main_screen/main_screen.dart b/lib/presentation/main_screen/main_screen.dart
@@ -326,6 +326,7 @@ class MainScreen extends GetWidget<MainController> with WindowListener {
                         onPressed: () async {
                           await controller.setPlatformConfig(
                             controller.rpcNode.value,
+                            controller.relayNode.value,
                             controller.platformEndpoint.value,
                             controller.authToken.value,
                           );
@@ -665,7 +666,7 @@ class MainScreen extends GetWidget<MainController> with WindowListener {
               Container(
                 width: 345,
                 height: 112,
-                padding: const EdgeInsets.all(16),
+                padding: const EdgeInsets.all(8),
                 decoration: ShapeDecoration(
                   color: Colors.white,
                   shape: RoundedRectangleBorder(
@@ -1038,8 +1039,9 @@ class MainScreen extends GetWidget<MainController> with WindowListener {
           color: Colors.transparent,
           child: Container(
             width: 310,
-            height: 426,
-            padding: const EdgeInsets.all(29),
+            height: 425,
+            padding:
+                const EdgeInsets.only(left: 20, right: 20, top: 20, bottom: 19),
             decoration: ShapeDecoration(
               color: const Color(0xFF494949),
               shape: RoundedRectangleBorder(
@@ -2119,8 +2121,12 @@ class MainScreen extends GetWidget<MainController> with WindowListener {
                       String node = value == 'enjin-matrix'
                           ? 'wss://rpc.matrix.blockchain.enjin.io:443'
                           : 'wss://rpc.matrix.canary.enjin.io:443';
+                      String relayNode = value == 'enjin-matrix'
+                          ? 'wss://rpc.relay.blockchain.enjin.io:443'
+                          : 'wss://rpc.relay.canary.enjin.io:443';
 
-                      await controller.setDaemonConfigFile(api, node);
+                      await controller.setDaemonConfigFile(
+                          api, node, relayNode);
                       await controller.setCurrentNetwork(value!);
                       await controller.stopWallet();
                     },

diff --git a/lib/presentation/onboard_screen/onboard_screen.dart b/lib/presentation/onboard_screen/onboard_screen.dart
@@ -421,12 +421,6 @@ class SigningPage extends StatelessWidget {
                     ),
                     onPressed: () {
                       pageController.jumpToPage(0);
-                      // pageController.previousPage(
-                      //   duration: const Duration(
-                      //     milliseconds: 300,
-                      //   ),
-                      //   curve: Curves.easeInOut,
-                      // );
                     },
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(10),
@@ -448,12 +442,6 @@ class SigningPage extends StatelessWidget {
                     buttonStyle: CustomButtonStyles.none,
                     onPressed: () {
                       pageController.jumpToPage(2);
-                      // pageController.nextPage(
-                      //   duration: const Duration(
-                      //     milliseconds: 300,
-                      //   ),
-                      //   curve: Curves.easeInOut,
-                      // );
                     },
                     decoration: CustomButtonStyles
                         .gradientDeepPurpleToDeepPurpleDecoration,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"node":"wss://rpc.matrix.canary.enjin.io:443","api":"https://platform.canary.enjin.io/graphql","master_key":"store"}
		{"node":"wss://rpc.matrix.blockchain.enjin.io:443","relay_node":"wss://rpc.relay.blockchain.enjin.io:443","api":"https://platform.enjin.io/graphql","master_key":"store"}