Merge pull request #34 from rabbitholegg/gmx_stargate_hotfix

Fix(gmx&stargate): chain id return and fetch->axios

.changeset/neat-teachers-complain.md

@@ -0,0 +1,6 @@
+---
+"@rabbitholegg/questdk-plugin-stargate": patch
+"@rabbitholegg/questdk-plugin-gmx": patch
+---
+
+Switch from fetch to axios and return correct chain IDs in stargate

packages/gmx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabbitholegg/questdk-plugin-gmx",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.3",
   "type": "module",
   "exports": {
     "require": "./dist/cjs/index.js",
@@ -34,18 +34,18 @@
   "types": "./dist/types/index.d.ts",
   "typings": "./dist/types/index.d.ts",
   "devDependencies": {
-    "@types/node": "^20.4.5",
-    "@vitest/coverage-v8": "^0.33.0",
-    "rimraf": "^5.0.1",
-    "rome": "^12.1.3",
-    "ts-node": "^10.9.1",
+    "@types/node": "20.4.5",
+    "@vitest/coverage-v8": "0.33.0",
+    "rimraf": "5.0.1",
+    "rome": "12.1.3",
+    "ts-node": "10.9.1",
     "tsconfig": "workspace:*",
-    "typescript": "^5.1.6",
-    "vitest": "^0.33.0"
+    "typescript": "5.1.6",
+    "vitest": "0.33.0"
   },
   "dependencies": {
     "@rabbitholegg/questdk": "1.0.1-alpha.10",
-    "node-fetch": "^3.3.2",
-    "viem": "^1.2.15"
+    "axios": "1.5.0",
+    "viem": "1.2.15"
   }
 }

packages/gmx/src/GMX.test.ts

@@ -1,11 +1,12 @@
 import { GreaterThanOrEqual, apply } from '@rabbitholegg/questdk/filter'
 import { describe, expect, test } from 'vitest'
 import { GMX_SWAPV1_ABI } from './abi.js'
-import { swap } from './GMX.js'
+import { getSupportedTokenAddresses, swap } from './GMX.js'
 import { ARB_ONE_CHAIN_ID } from './chain-ids.js'
 import { SWAP_ETH, SWAP_ETH_V2 } from './test-transactions.js'
 import { parseEther } from 'viem'
 import {
+  DEFAULT_TOKEN_LIST_URL,
   GMX_ROUTERV1_ADDRESS,
   GMX_ROUTERV2_ADDRESS,
 } from './contract-addresses.js'
@@ -69,5 +70,9 @@ describe('Given the gmx plugin', () => {
       })
       expect(apply(transaction, filter)).to.be.true
     })
+    test('should return the correct list of tokens', async () => {
+      const tokens = await getSupportedTokenAddresses(ARB_ONE_CHAIN_ID)
+      expect(tokens).to.deep.equal(DEFAULT_TOKEN_LIST_URL)
+    })
   })
 })

packages/gmx/src/GMX.ts

@@ -5,7 +5,7 @@ import {
   DEFAULT_TOKEN_LIST_URL,
   GMX_ROUTERV1_ADDRESS,
 } from './contract-addresses.js'
-import fetch from 'node-fetch'
+import axios from 'axios'
 import { type Address } from 'viem'
 
 enum OrderType {
@@ -84,12 +84,12 @@ export const swap = async (swap: SwapActionParams) => {
 export const getSupportedTokenAddresses = async (_chainId: number) => {
   try {
     // Send a GET request to the specified URL using the fetch API
-    const response = await fetch('https://api.gmx.io/tokens')
+    const response = await axios.get('https://api.gmx.io/tokens')
 
     // Check if the request was successful (status code 200)
-    if (response.ok) {
+    if (response.statusText === 'OK') {
       // Parse the JSON response into a JavaScript object
-      const data = (await response.json()) as Array<{ data: any; id: string }>
+      const data = response.data as Array<{ data: any; id: string }>
       return data.map((token) => token.id) as Address[]
     } else {
       console.error(`Request failed with status code: ${response.status}`)

packages/stargate/src/Stargate.ts

@@ -3,7 +3,7 @@ import { type Address } from 'viem'
 import { STARGATE_BRIDGE_ABI } from './abi.js'
 import {
   ARBITRUM_CHAIN_ID,
-  CHAIN_ID_ARRAY,
+  NATIVE_CHAIN_ID_ARRAY,
   ETH_CHAIN_ID,
   LAYER_ONE_TO_LAYER_ZERO_CHAIN_ID,
   POLYGON_CHAIN_ID,
@@ -77,5 +77,5 @@ export const getSupportedTokenAddresses = async (
 }
 
 export const getSupportedChainIds = async () => {
-  return CHAIN_ID_ARRAY as number[]
+  return NATIVE_CHAIN_ID_ARRAY as number[]
 }

packages/stargate/src/chain-ids.ts

@@ -50,7 +50,7 @@ export const LAYER_ONE_TO_LAYER_ZERO_CHAIN_ID: Record<number, number> = {
   [BASE_CHAIN_ID]: BASE_LAYER_ZERO_CHAIN_ID,
 } as const
 
-export const CHAIN_ID_ARRAY = [
+export const LAYER_ZERO_CHAIN_ID_ARRAY = [
   ETH_LAYER_ZERO_CHAIN_ID,
   BNB_LAYER_ZERO_CHAIN_ID,
   AVALANCHE_LAYER_ZERO_CHAIN_ID,
@@ -63,3 +63,17 @@ export const CHAIN_ID_ARRAY = [
   LINEA_LAYER_ZERO_CHAIN_ID,
   BASE_LAYER_ZERO_CHAIN_ID,
 ]
+
+export const NATIVE_CHAIN_ID_ARRAY = [
+  ETH_CHAIN_ID,
+  BNB_CHAIN_ID,
+  AVALANCHE_CHAIN_ID,
+  POLYGON_CHAIN_ID,
+  ARBITRUM_CHAIN_ID,
+  OPTIMISM_CHAIN_ID,
+  FANTOM_CHAIN_ID,
+  METIS_CHAIN_ID,
+  KAVA_CHAIN_ID,
+  LINEA_CHAIN_ID,
+  BASE_CHAIN_ID,
+]