Merge pull request #126 from etherspot/fix/cast-chain-id-as-number

cast chain ids as number
etherspot · Mar 20, 2024 · d91c37b · d91c37b
2 parents 9f57aad + 13b5028
commit d91c37b
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.9.2] - 2024-03-20
+
+### Breaking Changes
+- Cast `chainId` to number throughout the library to make it failproof for string chain IDs
+
 ## [0.9.1] - 2024-03-16
 
 ### Breaking Changes

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@etherspot/transaction-kit",
   "description": "React Etherspot Transaction Kit",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "main": "dist/cjs/index.js",
   "scripts": {
     "rollup:build": "NODE_OPTIONS=--max-old-space-size=8192 rollup -c",

diff --git a/src/components/EtherspotTransactionKit.tsx b/src/components/EtherspotTransactionKit.tsx
@@ -25,7 +25,7 @@ const EtherspotTransactionKit = ({
 }: EtherspotTransactionKitProps) => (
   <EtherspotContextProvider
     provider={provider}
-    chainId={chainId}
+    chainId={+chainId} // cast to make it less failproof when passed as string, i.e. from env file
     accountTemplate={accountTemplate}
     projectKey={projectKey}
   >

diff --git a/src/hooks/useEtherspotAssets.ts b/src/hooks/useEtherspotAssets.ts
@@ -31,7 +31,7 @@ const useEtherspotAssets = (chainId?: number): IEtherspotAssetsHook => {
       const dataService = getDataService();
       assets = await dataService.getTokenListTokens({
         name: 'EtherspotPopularTokens',
-        chainId: assetsChainId,
+        chainId: +assetsChainId,
       });
     } catch (e) {
       console.warn(

diff --git a/src/hooks/useEtherspotBalances.ts b/src/hooks/useEtherspotBalances.ts
@@ -37,7 +37,7 @@ const useEtherspotBalances = (chainId?: number): IEtherspotBalancesHook => {
       const dataService = getDataService();
       const { items } = await dataService.getAccountBalances({
         account: balancesForAccount,
-        chainId: balancesChainId,
+        chainId: +balancesChainId,
       });
 
       return items;

diff --git a/src/hooks/useEtherspotHistory.ts b/src/hooks/useEtherspotHistory.ts
@@ -39,7 +39,7 @@ const useEtherspotHistory = (chainId: number): IEtherspotHistoryHook => {
       // @ts-ignore
       ({ items: transactions } = await dataService.getTransactions({
         account: transactionsForAccount,
-        chainId: historyChainId,
+        chainId: +historyChainId,
       }));
     } catch (e) {
 
@@ -56,7 +56,7 @@ const useEtherspotHistory = (chainId: number): IEtherspotHistoryHook => {
   const getAccountTransaction = async (hash: string): Promise<Transaction | undefined> => {
     try {
       const dataService = getDataService();
-      return dataService.getTransaction({ hash, chainId: historyChainId });
+      return dataService.getTransaction({ hash, chainId: +historyChainId });
     } catch (e) {
       console.warn(
         `Sorry, an error occurred whilst trying to fetch the transaction`

diff --git a/src/hooks/useEtherspotNfts.ts b/src/hooks/useEtherspotNfts.ts
@@ -37,7 +37,7 @@ const useEtherspotNfts = (chainId?: number): IEtherspotNftsHook => {
       const dataService = getDataService();
       const { items } = await dataService.getNftList({
         account: nftsForAccount,
-        chainId: nftsChainId,
+        chainId: +nftsChainId,
       });
 
       return items;

diff --git a/src/hooks/useEtherspotPrices.ts b/src/hooks/useEtherspotPrices.ts
@@ -28,15 +28,15 @@ const useEtherspotPrices = (chainId?: number): IEtherspotPricesHook => {
   }, [chainId, etherspotChainId]);
 
   const getPrice = async (assetAddress: string, assetChainId: number = defaultChainId) => {
-    const [price] = await getPrices([assetAddress], assetChainId);
+    const [price] = await getPrices([assetAddress], +assetChainId);
     return price;
   }
 
   const getPrices = async (assetAddresses: string[], assetsChainId: number = defaultChainId) => {
     try {
       const dataService = getDataService();
       const result = await dataService.fetchExchangeRates({
-        chainId: assetsChainId,
+        chainId: +assetsChainId,
         tokens: assetAddresses,
       });
 

diff --git a/src/hooks/useEtherspotSwaps.ts b/src/hooks/useEtherspotSwaps.ts
@@ -86,7 +86,7 @@ const useEtherspotSwaps = (chainId?: number): IEtherspotSwapsHook => {
     if (toChainId && toChainId !== chainId) {
       try {
         const { items: offers } = await dataService.getAdvanceRoutesLiFi({
-          fromChainId: swapsChainId,
+          fromChainId: +swapsChainId,
           toChainId,
           fromAmount,
           fromTokenAddress,
@@ -111,7 +111,7 @@ const useEtherspotSwaps = (chainId?: number): IEtherspotSwapsHook => {
         fromTokenAddress,
         toTokenAddress,
         fromAddress: fromAccount,
-        fromChainId: swapsChainId,
+        fromChainId: +swapsChainId,
       });
       return { type: 'same-chain', offers };
     } catch (e) {

diff --git a/src/providers/EtherspotContextProvider.tsx b/src/providers/EtherspotContextProvider.tsx
@@ -67,7 +67,7 @@ const EtherspotContextProvider = ({
 
     // @ts-ignore
     const sdkForChain = new PrimeSdk(mappedProvider ?? provider, {
-      chainId: sdkChainId,
+      chainId: +sdkChainId,
       etherspotBundlerApiKey: projectKey ?? ('__ETHERSPOT_PROJECT_KEY__' || undefined),
       factoryWallet: accountTemplate as Factory,
     });