Merge pull request #176 from aergoio/feature/updateWallet

Update wallet client when custom network updating fix a bug

Author: findmytrueself

.github/workflows/build.yml

@@ -18,15 +18,15 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: node_modules
         key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}

.prettierignore

@@ -0,0 +1 @@
+*

lerna.json

@@ -3,6 +3,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "2.1.1",
+  "version": "2.1.2",
   "useWorkspaces": true
 }

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herajs/client",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Javascript client framework for aergo",
   "main": "dist/herajs.common.js",
   "module": "dist/herajs.esm.js",
@@ -32,7 +32,7 @@
   "homepage": "https://github.com/aergoio/herajs#readme",
   "dependencies": {
     "@grpc/grpc-js": "^1.11.1",
-    "@herajs/common": "^2.1.1",
+    "@herajs/common": "^2.1.2",
     "@improbable-eng/grpc-web": "^0.9.1",
     "@types/google-protobuf": "^3.2.7",
     "google-protobuf": "^3.21.2",

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herajs/common",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Herajs common library",
   "main": "dist/herajs-common.cjs.js",
   "module": "dist/herajs-common.esm.js",

packages/crypto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herajs/crypto",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Cryptography tools for aergo",
   "main": "dist/herajs-crypto.cjs.js",
   "module": "dist/herajs-crypto.esm.js",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/aergoio/herajs-crypto#readme",
   "dependencies": {
-    "@herajs/common": "^2.1.1",
+    "@herajs/common": "^2.1.2",
     "@herajs/hdkey": "^11.2.0",
     "@types/elliptic": "^6.4.0",
     "aes-js": "^3.1.1",

packages/ledger-hw-app-aergo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herajs/ledger-hw-app-aergo",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Ledger Hardware app for Aergo",
   "main": "dist/herajs-ledger-hw-app-aergo.cjs.js",
   "module": "dist/herajs-ledger-hw-app-aergo.esm.js",
@@ -27,9 +27,9 @@
   },
   "homepage": "https://github.com/aergoio/herajs#readme",
   "dependencies": {
-    "@herajs/client": "^2.1.1",
-    "@herajs/common": "^2.1.1",
-    "@herajs/crypto": "^2.1.1"
+    "@herajs/client": "^2.1.2",
+    "@herajs/common": "^2.1.2",
+    "@herajs/crypto": "^2.1.2"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport": "^6.24.1",

packages/vue-plugin/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@herajs/vue-plugin",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Add Aergo controller to your Vue.js project",
   "main": "plugin.js",
   "scripts": {},
   "author": "aergo team and contributors",
   "license": "MIT",
   "dependencies": {
-    "@herajs/client": "^2.1.1",
-    "@herajs/wallet": "^2.1.1"
+    "@herajs/client": "^2.1.2",
+    "@herajs/wallet": "^2.1.2"
   },
   "gitHead": "97d1b15d147bb1bbff6d70dbe4bb06a60a881bc1"
 }

packages/wallet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herajs/wallet",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "SDK for making Aergo wallet applications",
   "scripts": {
     "type-check": "tsc --noEmit",
@@ -24,10 +24,10 @@
   "license": "MIT",
   "dependencies": {
     "@elderapo/typed-event-emitter": "^1.4.1",
-    "@herajs/client": "^2.1.1",
-    "@herajs/common": "^2.1.1",
-    "@herajs/crypto": "^2.1.1",
-    "@herajs/ledger-hw-app-aergo": "^2.1.1",
+    "@herajs/client": "^2.1.2",
+    "@herajs/common": "^2.1.2",
+    "@herajs/crypto": "^2.1.2",
+    "@herajs/ledger-hw-app-aergo": "^2.1.2",
     "@types/google-protobuf": "^3.2.7",
     "@types/hashmap": "^2.0.29",
     "@types/leveldown": "^4.0.0",

packages/wallet/src/wallet.ts

@@ -75,7 +75,23 @@ export class Wallet extends MiddlewareConsumer {
             throw new Error('supply nodeUrl in chain config or instantiate provider manually');
         }
 
+        // Check if the existing chain exists.
+        if (this.chainConfigs.has(chainConfig.chainId)) {
+            const existingConfig = this.chainConfigs.get(chainConfig.chainId);
+        
+            if (existingConfig) {
+                if (existingConfig.nodeUrl !== chainConfig.nodeUrl) {
+                    this.chainConfigs.set(chainConfig.chainId, { 
+                        ...existingConfig, 
+                        nodeUrl: chainConfig.nodeUrl 
+                    });
+                }
+                return;
+            }
+        }
+
         this.chainConfigs.set(chainConfig.chainId, chainConfig);
+
         if (
             this.chainConfigs.size === 1 &&
             this.defaultChainId === DEFAULT_CHAIN &&
@@ -116,9 +132,11 @@ export class Wallet extends MiddlewareConsumer {
         if (!this.chainConfigs.has(chainId)) {
             throw new Error(`trying to use not configured chainId ${chainId}`);
         }
+    
         const chainConfig = this.chainConfigs.get(chainId) as ChainConfig;
         let client: AergoClient;
-
+    
+        // If the client does not exist, create a new one.
         if (!this.clients.has(chainId)) {
             let provider = chainConfig.provider;
             if (typeof provider === 'function') {
@@ -127,14 +145,33 @@ export class Wallet extends MiddlewareConsumer {
             client = new AergoClient({}, provider);
             this.clients.set(chainId, client);
         } else {
+            // If the client already exists, compare nodeUrl and update if necessary.
             client = this.clients.get(chainId) as AergoClient;
+            let existingNodeUrl;
+            if (client && (client as any).config && (client as any).config.url) {
+                existingNodeUrl = (client as any).config.url;
+            } else {
+                existingNodeUrl = undefined;
+            }
+    
+            if (existingNodeUrl !== chainConfig.nodeUrl) {
+                // Create a new `AergoClient` and replace the existing one.
+                let provider = chainConfig.provider;
+                if (typeof provider === 'function') {
+                    provider = new provider({ url: chainConfig.nodeUrl });
+                }
+                client = new AergoClient({}, provider);
+                this.clients.set(chainId, client);
+            }
         }
+    
         if (this.defaultLimit) {
             client.setDefaultLimit(this.defaultLimit);
         }
+    
         return client;
     }
-
+    
     /**
      * Prepare a transaction from given account specified by simple TxBody.
      * Completes missing information (chainIdHash, nonce) and signs tx using key of account.