Merge pull request #46 from axelarnetwork/feat/config

feat: don't use testnet config for devnet
axelarnetwork · May 15, 2024 · 1183aee · 1183aee
2 parents cb9700a + 74bde9a
commit 1183aee
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/methods/tvl/getTVL.js b/methods/tvl/getTVL.js
@@ -223,9 +223,11 @@ module.exports = async params => {
       return [k, { ...v, supply: getChainData(k)?.chain_type !== 'cosmos' ? supply : k === 'axelarnet' && assetType !== 'its' ? isNativeOnEVM ? total - _.sum(toArray(Object.entries(tvl).filter(([k, v]) => getChainData(k)?.chain_type === 'cosmos').map(([k, v]) => k === 'secret-snip' ? v.total : v.supply))) : isNativeOnCosmos ? total ? total - _.sum(toArray(Object.entries(tvl).filter(([k, v]) => getChainData(k)?.chain_type === 'evm').map(([k, v]) => v.supply))) : 0 : supply : supply }];
     }));
 
-    const total_on_evm = _.sum(toArray(Object.entries(tvl).filter(([k, v]) => getChainData(k)?.chain_type === 'evm' && !v.token_manager_type?.startsWith('lockUnlock')).map(([k, v]) => v.supply)));
-    const total_on_cosmos = _.sum(toArray(Object.entries(tvl).filter(([k, v]) => getChainData(k)?.chain_type === 'cosmos' && k !== native_chain).map(([k, v]) => v[hasAllCosmosChains ? isNativeOnCosmos || k === 'secret-snip' ? 'supply' : 'total' : 'escrow_balance'])));
+    let total_on_evm = _.sum(toArray(Object.entries(tvl).filter(([k, v]) => getChainData(k)?.chain_type === 'evm' && (assetType !== 'its' || isCanonicalITS) && !v.token_manager_type?.startsWith('lockUnlock')).map(([k, v]) => v.supply)));
+    const total_on_cosmos = _.sum(toArray(Object.entries(tvl).filter(([k, v]) => getChainData(k)?.chain_type === 'cosmos' && k !== native_chain && (assetType !== 'its' || isCanonicalITS)).map(([k, v]) => v[hasAllCosmosChains ? isNativeOnCosmos || k === 'secret-snip' ? 'supply' : 'total' : 'escrow_balance'])));
     const total = isNativeOnCosmos || isNativeOnAxelarnet ? total_on_evm + total_on_cosmos : assetType === 'its' ? isCanonicalITS ? _.sum(toArray(Object.values(tvl).map(d => d.token_manager_balance))) : toNumber(await getTokenCirculatingSupply(coingecko_id)) : _.sum(toArray(Object.entries(tvl).map(([k, v]) => isNativeOnEVM ? v.gateway_balance : v.total)));
+    if (assetType === 'its' && !isCanonicalITS && isNativeOnEVM) total_on_evm += total;
+
     const evm_escrow_address = isNativeOnCosmos ? getAddress(isNativeOnAxelarnet ? asset : `ibc/${toHash(`transfer/${_.last(tvl[native_chain]?.ibc_channels)?.channel_id}/${asset}`)}`, axelarnet.prefix_address, 32) : undefined;
     const evm_escrow_balance = evm_escrow_address ? toNumber(await getCosmosBalance('axelarnet', evm_escrow_address, { ...assetData, ...addresses?.axelarnet })) : 0;
     const evm_escrow_address_urls = evm_escrow_address && toArray([axelarnet.explorer?.url && axelarnet.explorer.address_path && `${axelarnet.explorer.url}${axelarnet.explorer.address_path.replace('{address}', evm_escrow_address)}`, `${axelarnetLCDUrl}/cosmos/bank/v1beta1/balances/${evm_escrow_address}`]);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "axelarscan-api",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "Axelarscan API",
   "main": "index.js",
   "scripts": {

diff --git a/terraform/devnet-amplifier/variables.tf.example b/terraform/devnet-amplifier/variables.tf.example
@@ -45,7 +45,7 @@ variable "log_level" {
 
 variable "app_version" {
   description = "App version, same as docker image version"
-  default     = "0.0.18"
+  default     = "0.0.19"
   validation {
     error_message = "Must be valid semantic version. $Major.$Minor.$Patch"
     condition     = can(regex("^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$", var.app_version))

diff --git a/terraform/mainnet/variables.tf.example b/terraform/mainnet/variables.tf.example
@@ -45,7 +45,7 @@ variable "log_level" {
 
 variable "app_version" {
   description = "App version, same as docker image version"
-  default     = "0.0.18"
+  default     = "0.0.19"
   validation {
     error_message = "Must be valid semantic version. $Major.$Minor.$Patch"
     condition     = can(regex("^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$", var.app_version))

diff --git a/terraform/stagenet/variables.tf.example b/terraform/stagenet/variables.tf.example
@@ -45,7 +45,7 @@ variable "log_level" {
 
 variable "app_version" {
   description = "App version, same as docker image version"
-  default     = "0.0.18"
+  default     = "0.0.19"
   validation {
     error_message = "Must be valid semantic version. $Major.$Minor.$Patch"
     condition     = can(regex("^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$", var.app_version))

diff --git a/terraform/testnet/variables.tf.example b/terraform/testnet/variables.tf.example
@@ -45,7 +45,7 @@ variable "log_level" {
 
 variable "app_version" {
   description = "App version, same as docker image version"
-  default     = "0.0.18"
+  default     = "0.0.19"
   validation {
     error_message = "Must be valid semantic version. $Major.$Minor.$Patch"
     condition     = can(regex("^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$", var.app_version))

diff --git a/utils/config.js b/utils/config.js
@@ -68,7 +68,7 @@ const getAxelarConfig = async (env = ENVIRONMENT, forceCache = false) => {
 
 const getAssets = async (env = ENVIRONMENT) => {
   const assetsData = _.cloneDeep(assets[env]);
-  env = env !== 'mainnet' ? 'testnet' : env;
+  env = env === 'stagenet' ? 'testnet' : env;
   const response = await getAxelarConfig(env);
 
   Object.values({ ...response?.assets }).filter(d => d.type === 'gateway').forEach(d => {
@@ -101,7 +101,7 @@ const getAssetData = async (asset, assetsData, env = ENVIRONMENT) => {
 
 const getITSAssets = async (env = ENVIRONMENT) => {
   const assetsData = _.cloneDeep(toArray(its_assets[env]));
-  env = env !== 'mainnet' ? 'testnet' : env;
+  env = env === 'stagenet' ? 'testnet' : env;
   const response = await getAxelarConfig(env);
 
   Object.values({ ...response?.assets }).filter(d => ['customInterchain', 'interchain', 'canonical'].includes(d.type)).forEach(d => {