Refactor1 (#3)

Refactored code
Regenerated rust code
Rust package update
Regenerate polkadart
Added unit test

Author: n13

README.md

@@ -1,15 +1,15 @@
 # Resonance Network Wallet
 
-A mobile wallet application for the Resonance Network blockchain and its native REZ cryptocurrency.
+A mobile wallet application for the Resonance Network blockchain and its native RES cryptocurrency.
 
 ## Features
 
 - **Welcome Screen**: Create a new wallet or import an existing one
 - **Create Wallet**: Generates a 24-word recovery phrase for a new wallet
 - **Import Wallet**: Restore access using a 12 or 24-word recovery phrase
 - **Main Wallet Screen**: View balance and recent transactions
-- **Send REZ**: Send cryptocurrency to other accounts
-- **Receive REZ**: Display QR code with your wallet address
+- **Send RES**: Send cryptocurrency to other accounts
+- **Receive RES**: Display QR code with your wallet address
 - **Identity Support**: Display human-readable names for accounts when available
 
 ## Getting Started

generate_rust_bridge.sh

@@ -0,0 +1 @@
+flutter_rust_bridge_codegen generate

integration_test/simple_test.dart

@@ -7,7 +7,7 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
   setUpAll(() async => await RustLib.init());
   testWidgets('Can call rust function', (WidgetTester tester) async {
-    await tester.pumpWidget(const MyApp());
-    expect(find.textContaining('Result: `Hello, Tom!`'), findsOneWidget);
+    await tester.pumpWidget(const ResonanceWalletApp());
+    expect(find.textContaining('Resonance Network'), findsOneWidget);
   });
 }

lib/account_profile.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'substrate_service.dart';
+import 'package:resonance_network_wallet/core/services/substrate_service.dart';
 
 class AccountProfilePage extends StatelessWidget {
   final String accountId;
@@ -87,8 +87,7 @@ class AccountProfilePage extends StatelessWidget {
                       onPressed: () {
                         Clipboard.setData(ClipboardData(text: accountId));
                         ScaffoldMessenger.of(context).showSnackBar(
-                          const SnackBar(
-                              content: Text('Address copied to clipboard')),
+                          const SnackBar(content: Text('Address copied to clipboard')),
                         );
                       },
                       icon: const Icon(Icons.copy),
@@ -158,8 +157,7 @@ class AccountProfilePage extends StatelessWidget {
 
                   if (confirmed == true) {
                     await SubstrateService().logout();
-                    Navigator.of(context)
-                        .pushNamedAndRemoveUntil('/', (route) => false);
+                    Navigator.of(context).pushNamedAndRemoveUntil('/', (route) => false);
                   }
                 },
               ),

lib/core/constants/app_constants.dart

@@ -0,0 +1,14 @@
+class AppConstants {
+  static const String appName = 'Resonance Network Wallet';
+  static const String rpcEndpoint = 'ws://127.0.0.1:9944';
+
+  // Development accounts
+  static const String crystalAlice = '//Crystal Alice';
+  static const String crystalBob = '//Crystal Bob';
+  static const String crystalCharlie = '//Crystal Charlie';
+
+  // Shared Preferences keys
+  static const String hasWalletKey = 'has_wallet';
+  static const String mnemonicKey = 'mnemonic';
+  static const String accountIdKey = 'account_id';
+}

lib/substrate_service.dart lib/core/services/substrate_service.dartlib/substrate_service.dart renamed to lib/core/services/substrate_service.dart

@@ -6,11 +6,11 @@ import 'dart:math';
 import 'package:bip39/bip39.dart' as bip39;
 import 'package:convert/convert.dart' as convert;
 
-import 'generated/resonance/resonance.dart';
-import 'generated/resonance/types/sp_runtime/multiaddress/multi_address.dart' as multi_address;
+import '../../generated/resonance/resonance.dart';
+import '../../generated/resonance/types/sp_runtime/multiaddress/multi_address.dart' as multi_address;
 import 'package:ss58/ss58.dart';
 import 'package:resonance_network_wallet/src/rust/api/crypto.dart' as crypto;
-import 'resonance_extrinsic_payload.dart';
+import '../../resonance_extrinsic_payload.dart';
 
 class WalletInfo {
   final KeyPair keyPair;
@@ -82,10 +82,17 @@ class SubstrateService {
   static const String _rpcEndpoint = 'ws://127.0.0.1:9944'; // Replace with actual endpoint
 
   Future<void> initialize() async {
-    _provider = Provider.fromUri(Uri.parse(_rpcEndpoint));
-    _stateApi = StateApi(_provider);
-    _authorApi = AuthorApi(_provider);
-    _systemApi = SystemApi(_provider);
+    print('Initializing SubstrateService...');
+    try {
+      _provider = Provider.fromUri(Uri.parse(_rpcEndpoint));
+      _stateApi = StateApi(_provider);
+      _authorApi = AuthorApi(_provider);
+      _systemApi = SystemApi(_provider);
+      print('SubstrateService initialized successfully');
+    } catch (e) {
+      print('Error initializing SubstrateService: $e');
+      rethrow;
+    }
   }
 
   String formatBalance(BigInt balance) {
@@ -159,22 +166,22 @@ class SubstrateService {
   }
 
   Future<BigInt> queryBalance(String address) async {
+    print('Querying balance for address: $address');
     try {
       // Create Resonance API instance
       final resonanceApi = Resonance(_provider);
       // Account from SS58 address
       final account = Address.decode(address);
 
-      // print('Account pubkey: ${account.pubkey}');
-
       // Retrieve Account Balance
       final accountInfo = await resonanceApi.query.system.account(account.pubkey);
-      // print('Balance for $address: ${accountInfo.data.free}');
+      print('Balance for $address: ${accountInfo.data.free}');
 
       // Get the free balance
       return accountInfo.data.free;
-    } catch (e) {
+    } catch (e, stackTrace) {
       print('Error querying balance: $e');
+      print('Stack trace: $stackTrace');
       throw Exception('Failed to query balance: $e');
     }
   }
@@ -192,22 +199,30 @@ class SubstrateService {
   }
 
   crypto.Keypair dilithiumKeypairFromMnemonic(String senderSeed) {
+    print('Generating dilithium keypair from seed: $senderSeed');
     crypto.Keypair senderWallet;
     if (senderSeed.startsWith('//')) {
+      print('Using development account path');
       switch (senderSeed) {
         case CRYSTAL_ALICE:
+          print('Generating Crystal Alice keypair');
           senderWallet = crypto.crystalAlice();
+          print('Crystal Alice public key: ${senderWallet.publicKey}');
+          print('Crystal Alice address: ${senderWallet.ss58Address}');
           break;
         case CRYSTAL_BOB:
+          print('Generating Crystal Bob keypair');
           senderWallet = crypto.crystalBob();
           break;
         case CRYSTAL_CHARLIE:
+          print('Generating Crystal Charlie keypair');
           senderWallet = crypto.crystalCharlie();
           break;
         default:
           throw Exception('Invalid sender seed: $senderSeed');
       }
     } else {
+      print('Using regular mnemonic');
       // Get the sender's wallet
       senderWallet = crypto.generateKeypair(mnemonicStr: senderSeed);
     }