Merge branch 'master' into feat/market-banners

Switcheo · Nov 1, 2024 · a5ee473 · a5ee473
2 parents 1ba22c4 + 04b72e7
commit a5ee473
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 49 deletions.
diff --git a/configs/mainnet.json b/configs/mainnet.json
@@ -17,31 +17,33 @@
     "usdc.1.6.e70e14"
   ],
   "transfer_options": {
-    "Osmosis": 0,
-    "Noble": 1,
-    "Cosmos Hub": 2,
-    "Evmos": 3,
-    "Axelar": 4,
-    "Juno": 5,
-    "Stride": 6,
-    "Kujira": 7,
-    "Terra": 8,
-    "Comdex": 9,
-    "Stafihub": 10,
-    "Persistence Core": 11,
-    "Stargaze": 12,
-    "Canto": 13,
-    "Sommelier": 14,
-    "IRIS Hub": 15,
-    "Ethereum": 16,
-    "Arbitrum": 17,
-    "Polygon": 18,
-    "OKC": 19,
-    "Binance Smart Chain": 20,
-    "Carbon": 21,
-    "Neo": 22,
-    "Neo3": 23,
-    "Zilliqa": 24
+    "Mantle": 0,
+    "Base": 1,
+    "Osmosis": 2,
+    "Noble": 3,
+    "Cosmos Hub": 4,
+    "Evmos": 5,
+    "Axelar": 6,
+    "Juno": 7,
+    "Stride": 8,
+    "Kujira": 9,
+    "Terra": 10,
+    "Comdex": 11,
+    "Stafihub": 12,
+    "Persistence Core": 13,
+    "Stargaze": 14,
+    "Canto": 15,
+    "Sommelier": 16,
+    "IRIS Hub": 17,
+    "Ethereum": 18,
+    "Arbitrum": 19,
+    "Polygon": 20,
+    "OKC": 21,
+    "Binance Smart Chain": 22,
+    "Carbon": 23,
+    "Neo": 24,
+    "Neo3": 25,
+    "Zilliqa": 26
   },
   "network_fees": {
     "swth": 0,
@@ -115,7 +117,9 @@
     "cmkt/212": "BYBIT:POPCATUSDT",
     "cmkt/226": "BINANCE:SOLETH",
     "cmkt/235": "BINANCE:NEIROETHUSDT.P",
-    "cmkt/237": "CRYPTO:KASUSD"
+    "cmkt/237": "CRYPTO:KASUSD",
+    "cmkt/244": "BYBIT:GRASSUSDT",
+    "cmkt/245": "BINANCE:GOATUSDT.P"
   },
   "perp_pool_pie_chart_colors": {
     "cmkt/117": "#875DFF",
@@ -196,33 +200,41 @@
     "cmkt/241": "#f06202",
     "cmkt/242": "#1c1061",
     "cmkt/243": "#f80cb4",
+    "cmkt/244": "#aaec0f",
+    "cmkt/245": "#59615e",
+    "cmkt/246": "#96fde4",
     "Unused": "#7798E4"
   },
   "markets_override": {
     "cmkt/181": {
       "base": {
         "symbol": "1000PEPE"
-      }
+      },
+      "groupQuantity": 1000
     },
     "cmkt/202": {
       "base": {
         "symbol": "1000SHIB"
-      }
+      },
+      "groupQuantity": 1000
     },
     "cmkt/207": {
       "base": {
         "symbol": "1000BONK"
-      }
+      },
+      "groupQuantity": 1000
     },
     "cmkt/209": {
       "base": {
         "symbol": "1000FLOKI"
-      }
+      },
+      "groupQuantity": 1000
     },
     "cmkt/215": {
       "base": {
         "symbol": "1MMOG"
-      }
+      },
+      "groupQuantity": 1000000
     }
   },
   "demex_points_config": {
@@ -355,24 +367,32 @@
   "perp_pools": {
     "incentives": {
       "proxy": "0x7b1C7216C117cC62D875e3086518B238392cf04d",
-      "distributors": ["0x93903Ad6599271b2c23b5e5065da835dee2105b7", "0xD3997de7D72943d62a34f1089E52027C86b4764F", "0x06F2d494531eDCA39aA51B1C3EfB51dE9F1fA17d", "0xF1bE2Db4A62e3AeDEd389224B15b370E27e1e9A1", "0x6a09bC65Ef703466187f59083239399e1948fEbB", "0x8c6A1123744a78bf48B7b58Ae0ce02F364c30F8e", "0x4Ea7639a37d229914F64e832bF5038Bc634E51Fd"]
+      "distributors": [
+        "0x93903Ad6599271b2c23b5e5065da835dee2105b7",
+        "0xD3997de7D72943d62a34f1089E52027C86b4764F",
+        "0x06F2d494531eDCA39aA51B1C3EfB51dE9F1fA17d",
+        "0xF1bE2Db4A62e3AeDEd389224B15b370E27e1e9A1",
+        "0x6a09bC65Ef703466187f59083239399e1948fEbB",
+        "0x8c6A1123744a78bf48B7b58Ae0ce02F364c30F8e",
+        "0x4Ea7639a37d229914F64e832bF5038Bc634E51Fd"
+      ]
     },
     "banners": [
       {
-        "perp_pool_id": "9",
-        "show_until": "2024-10-30T08:00+00:00",
+        "perp_pool_id": "5",
+        "show_until": "2024-11-14T08:00+00:00",
         "title": "New Markets Added",
-        "added_markets": "UNI (Uniswap) perp will be added to this pool on 17 Oct 08:00 AM UTC.",
-        "action_trigger_date": "2024-10-30T08:00+00:00",
-        "past_tense_text": "UNI (Uniswap) perp was added to this pool on 17 Oct 08:00 AM UTC."
+        "added_markets": "GRASS (Grass) perp will be added to this pool on 28 Oct 02:00 PM UTC.",
+        "action_trigger_date": "2024-10-28T08:00+00:00",
+        "past_tense_text": "GRASS (Grass) perp was added to this pool on 28 Oct 02:00 PM UTC."
       },
       {
-        "perp_pool_id": "8",
-        "show_until": "2024-09-30T08:00+00:00",
+        "perp_pool_id": "7",
+        "show_until": "2024-11-14T08:00+00:00",
         "title": "New Markets Added",
-        "added_markets": "POL (ex-matic) perp will be added to this pool on 19 Sep 08:00 AM UTC.",
-        "action_trigger_date": "2024-09-19T08:00+00:00",
-        "past_tense_text": "POL (ex-matic) perp was added to this pool on 19 Sep 08:00 AM UTC."
+        "added_markets": "GOAT (Goatseus Maximus) perp will be added to this pool on 29 Oct 08:00 AM UTC.",
+        "action_trigger_date": "2024-10-29T08:00+00:00",
+        "past_tense_text": "GOAT (Goatseus Maximus) perp was added to this pool on 29 Oct 08:00 AM UTC."
       },
       {
         "perp_pool_id": "1",

diff --git a/configs/testnet.json b/configs/testnet.json
@@ -20,7 +20,8 @@
     "cmkt/13": {
       "base": {
         "symbol": "1000PEPE"
-      }
+      },
+      "groupQuantity": 1000
     }
   },
   "cross_selling_source_tokens": ["swth"],

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "@cosmjs/tendermint-rpc": "~0.31.3",
     "@types/node": "^18.11.9",
     "@types/node-fetch": "^2.6.2",
-    "carbon-js-sdk": "^0.11.20",
+    "carbon-js-sdk": "^0.11.23",
     "long": "^4.0.0",
     "node-fetch": "^2.6.1",
     "pajv": "^1.2.0",

diff --git a/scripts/check_configs.ts b/scripts/check_configs.ts
@@ -447,7 +447,9 @@ async function main() {
       const transferOptionsArr = Object.keys(jsonData.transfer_options)
       const ibcBridgeNames = sdk.token.getIbcBlockchainNames();
       if (!ibcBridgeNames.includes("Carbon")) ibcBridgeNames.push("Carbon");
-      const validTransferOptionChains = sdk.token.getPolynetworkBlockchainNames().concat(ibcBridgeNames);
+      const validTransferOptionChains = sdk.token.getPolynetworkBlockchainNames()
+        .concat(sdk.token.getAxelarBlockchainNames())
+        .concat(ibcBridgeNames);
 
       const hasInvalidChains = checkValidEntries(transferOptionsArr, validTransferOptionChains);
       if (hasInvalidChains.status && hasInvalidChains.entry) {

diff --git a/yarn.lock b/yarn.lock
@@ -2251,10 +2251,10 @@ callsite@1.0.0:
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
   integrity sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==
 
-carbon-js-sdk@^0.11.20:
-  version "0.11.20"
-  resolved "https://registry.yarnpkg.com/carbon-js-sdk/-/carbon-js-sdk-0.11.20.tgz#ba9cdaa6fee0b8590d481931de0efa96f699aef3"
-  integrity sha512-XQph2nhqFHLe5TLLhNKSXpH77NqIlN6oqC2JQOSHD0l4dcrSTC1CyfdBrrTTgGfCA7tns75KxL92d7B2eISKlA==
+carbon-js-sdk@^0.11.23:
+  version "0.11.23"
+  resolved "https://registry.yarnpkg.com/carbon-js-sdk/-/carbon-js-sdk-0.11.23.tgz#8c35301bbc958df5b08ac1065d170dd34fe0e9c1"
+  integrity sha512-ngAB7JLb3U+KLjFy+AYiL3tXKRGZrtWGpoFfejkvJoIBko1i25KVIH16G+9HvUqdYlUVU02BgTm80jPKxfX72w==
   dependencies:
     "@cityofzion/neon-api" "^4.9.0"
     "@cityofzion/neon-core" "^4.9.0"