Merge pull request #206 from thepower/feat/get_node_settins_current

add chain setting current api method
thepower · Dec 24, 2024 · 6062b70 · 6062b70
2 parents a3a7bf6 + c2f97b8
commit 6062b70
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/.changeset/dry-islands-push.md b/.changeset/dry-islands-push.md
@@ -0,0 +1,5 @@
+---
+'@thepowereco/tssdk': patch
+---
+
+add chain setting current api method
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,9 @@
+{
+  "mode": "pre",
+  "tag": "canary",
+  "initialVersions": {
+    "@thepowereco/cli": "1.12.15",
+    "@thepowereco/tssdk": "2.2.12"
+  },
+  "changesets": []
+}
diff --git a/packages/tssdk/src/helpers/network.enum.ts b/packages/tssdk/src/helpers/network.enum.ts
@@ -8,6 +8,7 @@ export enum ChainAction {
   GET_WALLET = 'GET_WALLET',
   GET_WALLET_SEQUENCE = 'GET_SEQUENCE',
   GET_NODE_SETTINGS = 'GET_NODE_SETTINGS',
+  GET_NODE_SETTINGS_CURRENT = 'GET_NODE_SETTINGS_CURRENT',
   CREATE_TRANSACTION = 'CREATE_TRANSACTION',
   EXECUTE_CALL = 'EXECUTE_CALL',
   GET_MY_CHAIN = 'GET_MY_CHAIN',

diff --git a/packages/tssdk/src/helpers/network.helper.ts b/packages/tssdk/src/helpers/network.helper.ts
@@ -96,6 +96,9 @@ export const transformResponse = (response: any, kind: ChainAction, requestParam
 
     case ChainAction.GET_NODE_SETTINGS:
       return response.settings
+
+    case ChainAction.GET_NODE_SETTINGS_CURRENT:
+      return response.settings
     default:
       return response
   }

diff --git a/packages/tssdk/src/libs/network/network.ts b/packages/tssdk/src/libs/network/network.ts
@@ -166,7 +166,7 @@ export class NetworkApi {
   }
 
   public async getFeeSettings() {
-    const settings = await this.askBlockchainTo(ChainAction.GET_NODE_SETTINGS, {})
+    const settings = await this.askBlockchainTo(ChainAction.GET_NODE_SETTINGS_CURRENT, {})
     return this.calculateFeeSettings(settings)
   }
 
@@ -329,7 +329,7 @@ export class NetworkApi {
   }
 
   private calculateFeeSettings(settings: any) {
-    let result = settings.current
+    let result = settings
     let feeCur = ''
 
     if (result.fee) {
@@ -467,7 +467,7 @@ export class NetworkApi {
   }
 
   public async getNodeSettings() {
-    return this.askBlockchainTo(ChainAction.GET_NODE_SETTINGS, {})
+    return this.askBlockchainTo(ChainAction.GET_NODE_SETTINGS_CURRENT, {})
   }
 
   public async createTransaction(data: { tx: string }) {
@@ -594,6 +594,10 @@ export class NetworkApi {
         actionUrl = '/settings'
         break
 
+      case ChainAction.GET_NODE_SETTINGS_CURRENT:
+        actionUrl = '/settings/current'
+        break
+
       case ChainAction.GET_SC_CODE:
         requestParams.responseType = 'arraybuffer'
         requestParams.url = `${parameters.address}/code`
@@ -629,15 +633,15 @@ export class NetworkApi {
   }
 
   private async loadFeeGasSettingsAndDecimals() {
-    const settings = await this.askBlockchainTo(ChainAction.GET_NODE_SETTINGS, {})
+    const settings = await this.askBlockchainTo(ChainAction.GET_NODE_SETTINGS_CURRENT, {})
     this._feeSettings = this.calculateFeeSettings(settings)
     this._gasSettings = this.calculateGasSettings(settings)
 
-    this._decimals = settings?.current?.decimals || { SK: 9 }
+    this._decimals = settings?.decimals || { SK: 9 }
   }
 
   private calculateGasSettings(settings: any) {
-    let result = settings.current
+    let result = settings
     let gasCur
 
     if (result.gas) {

diff --git a/packages/tssdk/src/libs/wallet.ts b/packages/tssdk/src/libs/wallet.ts
@@ -32,7 +32,7 @@ export class WalletApi {
 
     const settings = await networkApi.getNodeSettings()
 
-    const derivationPath = `${DERIVATION_PATH_BASE}/${COIN}'/0'/${settings.current.allocblock.block}'/${settings.current.allocblock.group}'`
+    const derivationPath = `${DERIVATION_PATH_BASE}/${COIN}'/0'/${settings.allocblock.block}'/${settings.allocblock.group}'`
 
     const keyPair = await CryptoApi.generateKeyPairFromSeedPhrase(seed, derivationPath)