Client will only use current node as rpc node if it's persist finished

nknorg · Mar 29, 2023 · fa95a95 · fa95a95
1 parent e058fbe
commit fa95a95
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 13 deletions.
diff --git a/dist/nkn.js b/dist/nkn.js
@@ -687,11 +687,17 @@ class Client {
 
     this.ws = ws;
     this.node = nodeInfo;
+    this.wallet.options.rpcServerAddr = '';
 
     if (nodeInfo.rpcAddr) {
-      this.wallet.options.rpcServerAddr = (tls ? 'https' : 'http') + '://' + nodeInfo.rpcAddr;
-    } else {
-      this.wallet.options.rpcServerAddr = '';
+      let addr = (tls ? 'https' : 'http') + '://' + nodeInfo.rpcAddr;
+      common.rpc.getNodeState.call(this, {
+        rpcServerAddr: addr
+      }).then(nodeState => {
+        if (nodeState.syncState === 'PERSIST_FINISHED') {
+          this.wallet.options.rpcServerAddr = addr;
+        }
+      });
     }
 
     let challengeDone;

diff --git a/dist/nkn.min.js b/dist/nkn.min.js
diff --git a/docs/index.html b/docs/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset='utf-8'>
-  <title>nkn-sdk 1.2.7 | Documentation</title>
+  <title>nkn-sdk 1.2.8 | Documentation</title>
   <meta name='description' content='NKN client and wallet SDK'>
   <meta name='viewport' content='width=device-width,initial-scale=1'>
   <link href='assets/bass.css' rel='stylesheet'>
@@ -15,7 +15,7 @@
       <div id='split-left' class='overflow-auto fs0 height-viewport-100'>
         <div class='py1 px2'>
           <h3 class='mb0 no-anchor'>nkn-sdk</h3>
-          <div class='mb1'><code>1.2.7</code></div>
+          <div class='mb1'><code>1.2.8</code></div>
           <input
             placeholder='Filter'
             id='filter-input'

diff --git a/lib/client/client.js b/lib/client/client.js
@@ -686,11 +686,17 @@ class Client {
 
     this.ws = ws;
     this.node = nodeInfo;
+    this.wallet.options.rpcServerAddr = '';
 
     if (nodeInfo.rpcAddr) {
-      this.wallet.options.rpcServerAddr = (tls ? 'https' : 'http') + '://' + nodeInfo.rpcAddr;
-    } else {
-      this.wallet.options.rpcServerAddr = '';
+      let addr = (tls ? 'https' : 'http') + '://' + nodeInfo.rpcAddr;
+      common.rpc.getNodeState.call(this, {
+        rpcServerAddr: addr
+      }).then(nodeState => {
+        if (nodeState.syncState === 'PERSIST_FINISHED') {
+          this.wallet.options.rpcServerAddr = addr;
+        }
+      });
     }
 
     let challengeDone;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nkn-sdk",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "NKN client and wallet SDK",
   "main": "lib/index.js",
   "exports": {

diff --git a/src/client/client.js b/src/client/client.js
@@ -603,10 +603,14 @@ export default class Client {
 
     this.ws = ws;
     this.node = nodeInfo;
+    this.wallet.options.rpcServerAddr = '';
     if (nodeInfo.rpcAddr) {
-      this.wallet.options.rpcServerAddr = (tls ? 'https' : 'http') + '://' + nodeInfo.rpcAddr;
-    } else {
-      this.wallet.options.rpcServerAddr = '';
+      let addr = (tls ? 'https' : 'http') + '://' + nodeInfo.rpcAddr;
+      common.rpc.getNodeState.call(this, {rpcServerAddr:addr}).then(nodeState => {
+        if (nodeState.syncState === 'PERSIST_FINISHED') {
+          this.wallet.options.rpcServerAddr = addr;
+        }
+      })
     }
 
     let challengeDone: Function;