JS - 0.9.75, HF 30 - Optimize private groups, small fix

golos-blockchain · Sep 6, 2024 · 422b730 · 422b730
1 parent 787afce
commit 422b730
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/golos-lib-js/package.json b/golos-lib-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "golos-lib-js",
-  "version": "0.9.74",
+  "version": "0.9.75",
   "description": "Golos-js the JavaScript library with API for GOLOS blockchain",
   "main": "lib/index.js",
   "scripts": {

diff --git a/golos-lib-js/src/auth/index.js b/golos-lib-js/src/auth/index.js
@@ -137,10 +137,6 @@ Auth.withNodeLogin = async function ({ account, keys,
         api = golosApi
     }
 
-    if (!dgp) {
-        dgp = await api.getDynamicGlobalPropertiesAsync()
-    }
-
     let resp
 
     const { MultiSession } = multiSession
@@ -154,7 +150,16 @@ Auth.withNodeLogin = async function ({ account, keys,
         }
     }
 
-    const { head_block_number, witness } = dgp
+    let gprops
+    if (!dgp) {
+        gprops = await api.getDynamicGlobalPropertiesAsync()
+    } else if (typeof(dgp) === 'function') {
+        gprops = await dgp()
+    } else {
+        gprops = dgp
+    }
+
+    const { head_block_number, witness } = gprops
 
     console.time('withNodeLogin - signData')
     const signed = this.signData(head_block_number.toString(), keys)

diff --git a/golos-lib-js/src/auth/messages.js b/golos-lib-js/src/auth/messages.js
@@ -642,7 +642,7 @@ export async function encodeMsg({ group,
 
     const encrypted_message = msg.toString('hex')
     return {
-        nonce: Aes.uniqueNonce().toString(),
+        nonce: nonce || Aes.uniqueNonce().toString(),
         encrypted_message,
         checksum: 0,
         from_memo_key: emptyPublicKey,