894 midgard query decimals (#896)

xchainjs · Nov 4, 2023 · 0d5d691 · 0d5d691
1 parent aba77c2
commit 0d5d691
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 15 deletions.
diff --git a/packages/xchain-midgard-query/CHANGELOG.md b/packages/xchain-midgard-query/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.1.4 (2023-11-04)
+
+## Update
+
+- getDecimalForAsset can handle synth assets
+
 # v0.1.3 (2023-10-06)
 
 ## Update

diff --git a/packages/xchain-midgard-query/__e2e__/thorchain-midgard-query-e2e.ts b/packages/xchain-midgard-query/__e2e__/thorchain-midgard-query-e2e.ts
@@ -1,5 +1,6 @@
 import { Network } from '@xchainjs/xchain-client'
 import { THORNameDetails } from '@xchainjs/xchain-midgard'
+import { assetFromStringEx } from '@xchainjs/xchain-util'
 
 import { MidgardCache } from '../src/midgard-cache'
 import { MidgardQuery } from '../src/midgard-query'
@@ -75,4 +76,14 @@ describe('Midgard-query liquidity action end to end Tests', () => {
     )
     console.log('thornames', thornames)
   })
+  it(`Shoud return decimals by asset`, async () => {
+    const atomDecimals = await midgardQuery.getDecimalForAsset(AssetATOM)
+    const avaxDecimals = await midgardQuery.getDecimalForAsset(AssetAVAX)
+    const btcDecimals = await midgardQuery.getDecimalForAsset(AssetBTC)
+    const synthBtcDecimals = await midgardQuery.getDecimalForAsset(assetFromStringEx('BTC/BTC'))
+    console.log(`AssetATOM decimals: ${atomDecimals}`)
+    console.log(`AssetAVAX decimals: ${avaxDecimals}`)
+    console.log(`AssetBTC decimals: ${btcDecimals}`)
+    console.log(`Synth AssetBTC decimals: ${synthBtcDecimals}`)
+  })
 })
diff --git a/packages/xchain-midgard-query/package.json b/packages/xchain-midgard-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-midgard-query",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "license": "MIT",
   "description": "Module that is responsible for get data from Midgard API",
   "keywords": [
@@ -50,4 +50,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}
diff --git a/packages/xchain-midgard-query/src/midgard-query.ts b/packages/xchain-midgard-query/src/midgard-query.ts
@@ -92,12 +92,11 @@ export class MidgardQuery {
    * @returns {number} Number of decimals from Midgard https://gitlab.com/thorchain/midgard#refresh-native-decimals
    */
   public async getDecimalForAsset(asset: Asset): Promise<number> {
-    if (!isAssetRuneNative(asset)) {
-      const pool = await this.getPool(assetToString(asset))
-      const decimals = Number(pool.nativeDecimal)
-      if (decimals > 0) return decimals
-      else return DEFAULT_THORCHAIN_DECIMALS
-    }
-    return DEFAULT_THORCHAIN_DECIMALS
+    if (isAssetRuneNative(asset) || asset.synth) return DEFAULT_THORCHAIN_DECIMALS
+
+    const pool = await this.getPool(assetToString(asset))
+    const decimals = Number(pool.nativeDecimal)
+
+    return decimals > 0 ? decimals : DEFAULT_THORCHAIN_DECIMALS
   }
 }
diff --git a/packages/xchain-thorchain-amm/CHANGELOG.md b/packages/xchain-thorchain-amm/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.7.11 (2023-11-04)
+
+## Update
+
+- thorchain-query package from 0.6.7 to 0.6.8
+
 # v0.7.10 (2023-11-02)
 
 ## Update

diff --git a/packages/xchain-thorchain-amm/package.json b/packages/xchain-thorchain-amm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain-amm",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "description": "module that exposes estimating & swappping cryptocurrency assets on thorchain",
   "keywords": [
     "THORChain",
@@ -50,7 +50,7 @@
     "@xchainjs/xchain-doge": "^0.7.3",
     "@xchainjs/xchain-ethereum": "^0.30.5",
     "@xchainjs/xchain-thornode": "^0.3.8",
-    "@xchainjs/xchain-thorchain-query": "^0.6.7",
+    "@xchainjs/xchain-thorchain-query": "^0.6.8",
     "@xchainjs/xchain-evm": "^0.3.5",
     "@xchainjs/xchain-litecoin": "^0.13.2",
     "@xchainjs/xchain-mayachain": "^0.2.8",
@@ -86,7 +86,7 @@
     "@xchainjs/xchain-doge": "^0.7.3",
     "@xchainjs/xchain-ethereum": "^0.30.5",
     "@xchainjs/xchain-thornode": "^0.3.8",
-    "@xchainjs/xchain-thorchain-query": "^0.6.7",
+    "@xchainjs/xchain-thorchain-query": "^0.6.8",
     "@xchainjs/xchain-evm": "^0.3.5",
     "@xchainjs/xchain-litecoin": "^0.13.2",
     "@xchainjs/xchain-mayachain": "^0.2.8",

diff --git a/packages/xchain-thorchain-query/CHANGELOG.md b/packages/xchain-thorchain-query/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.6.8 (2023-11-04)
+
+## Update
+
+- midgard-query package from 0.1.3 to 0.1.4
+
 # v0.6.7 (2023-11-03)
 
 ## Update

diff --git a/packages/xchain-thorchain-query/package.json b/packages/xchain-thorchain-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain-query",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "license": "MIT",
   "description": "Thorchain query module that is resposible for estimating swap calculations and add/remove liquidity for thorchain ",
   "keywords": [
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@xchainjs/xchain-client": "^0.15.1",
     "@xchainjs/xchain-thornode": "^0.3.8",
-    "@xchainjs/xchain-midgard-query": "^0.1.3",
+    "@xchainjs/xchain-midgard-query": "^0.1.4",
     "@xchainjs/xchain-util": "^0.13.1",
     "axios": "^1.3.6",
     "axios-retry": "^3.2.5",
@@ -44,7 +44,7 @@
   "peerDependencies": {
     "@xchainjs/xchain-client": "^0.15.1",
     "@xchainjs/xchain-thornode": "^0.3.8",
-    "@xchainjs/xchain-midgard-query": "^0.1.3",
+    "@xchainjs/xchain-midgard-query": "^0.1.4",
     "@xchainjs/xchain-util": "^0.13.1",
     "axios": "^1.3.6",
     "axios-retry": "^3.2.5",