Merge pull request #133 from CityOfZion/CU-86a5z9zkg

CU-86a5z9zkg - BS Lib - Enhance failure handling for native token has…
CityOfZion · Dec 19, 2024 · 5874676 · 5874676
2 parents 1b216f8 + 6e73001
commit 5874676
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 11 deletions.
diff --git a/common/changes/@cityofzion/bs-ethereum/CU-86a5z9zkg_2024-12-19-22-07.json b/common/changes/@cityofzion/bs-ethereum/CU-86a5z9zkg_2024-12-19-22-07.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cityofzion/bs-ethereum",
+      "comment": "Enhance failure handling for native token hash fetching",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cityofzion/bs-ethereum"
+}
diff --git a/packages/bs-ethereum/src/constants/BSEthereumConstants.ts b/packages/bs-ethereum/src/constants/BSEthereumConstants.ts
@@ -43,6 +43,10 @@ export class BSEthereumConstants {
     '12227332': 'GAS',
   }
 
+  static NATIVE_WRAPPED_HASH_BY_NETWORK_ID: Partial<Record<BSEthereumNetworkId, string>> = {
+    '1': '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+  }
+
   static RPC_LIST_BY_NETWORK_ID: Record<BSEthereumNetworkId, string[]> = {
     '1': [
       'https://eth.llamarpc.com',

diff --git a/packages/bs-ethereum/src/helpers/BSEthereumHelper.ts b/packages/bs-ethereum/src/helpers/BSEthereumHelper.ts
@@ -1,4 +1,4 @@
-import { Network } from '@cityofzion/blockchain-service'
+import { Network, normalizeHash } from '@cityofzion/blockchain-service'
 import { BSEthereumConstants, BSEthereumNetworkId } from '../constants/BSEthereumConstants'
 
 export class BSEthereumHelper {
@@ -21,7 +21,7 @@ export class BSEthereumHelper {
   }
 
   static normalizeHash(hash: string): string {
-    return hash.startsWith('0x') ? hash.slice(2) : hash
+    return normalizeHash(hash)
   }
 
   static wait(duration: number): Promise<void> {

diff --git a/packages/bs-ethereum/src/services/exchange-data/MoralisEDSEthereum.ts b/packages/bs-ethereum/src/services/exchange-data/MoralisEDSEthereum.ts
@@ -9,7 +9,7 @@ import {
   TokenPricesHistoryResponse,
   TokenPricesResponse,
 } from '@cityofzion/blockchain-service'
-import { BSEthereumNetworkId } from '../../constants/BSEthereumConstants'
+import { BSEthereumConstants, BSEthereumNetworkId } from '../../constants/BSEthereumConstants'
 import { BSEthereumHelper } from '../../helpers/BSEthereumHelper'
 import { MoralisBDSEthereum } from '../blockchain-data/MoralisBDSEthereum'
 
@@ -47,10 +47,20 @@ export class MoralisEDSEthereum extends CryptoCompareEDS implements ExchangeData
 
   async #getWrappedNativeToken(): Promise<Token> {
     const nativeToken = BSEthereumHelper.getNativeAsset(this.#network)
+    const wrappedSymbol = `W${nativeToken.symbol}`
+    const localWrappedHash = BSEthereumConstants.NATIVE_WRAPPED_HASH_BY_NETWORK_ID[this.#network.id]
+    if (localWrappedHash) {
+      return {
+        ...nativeToken,
+        symbol: wrappedSymbol,
+        hash: localWrappedHash,
+      }
+    }
+
     const client = MoralisBDSEthereum.getClient(this.#network)
     const { data } = await client.get<MoralisERC20MetadataResponse[]>('/erc20/metadata/symbols', {
       params: {
-        symbols: [`W${nativeToken.symbol}`],
+        symbols: [wrappedSymbol],
       },
     })
 
@@ -74,18 +84,26 @@ export class MoralisEDSEthereum extends CryptoCompareEDS implements ExchangeData
 
     let wrappedNativeToken: Token | undefined
     if (params.tokens.some(token => token.symbol === nativeToken.symbol)) {
-      wrappedNativeToken = await this.#getWrappedNativeToken()
+      try {
+        wrappedNativeToken = await this.#getWrappedNativeToken()
+      } catch {
+        /* empty */
+      }
     }
 
-    const tokensBody = params.tokens.map(token => {
+    const tokensBody: { token_address: string }[] = []
+
+    params.tokens.map(token => {
       if (token.symbol !== nativeToken.symbol) {
-        return {
+        tokensBody.push({
           token_address: token.hash,
-        }
+        })
       }
 
-      return {
-        token_address: wrappedNativeToken!.hash,
+      if (wrappedNativeToken) {
+        tokensBody.push({
+          token_address: wrappedNativeToken.hash,
+        })
       }
     })
 
@@ -106,8 +124,9 @@ export class MoralisEDSEthereum extends CryptoCompareEDS implements ExchangeData
           let token: Token
 
           if (
+            wrappedNativeToken &&
             BSEthereumHelper.normalizeHash(item.tokenAddress) ===
-            BSEthereumHelper.normalizeHash(wrappedNativeToken?.hash ?? '')
+              BSEthereumHelper.normalizeHash(wrappedNativeToken.hash)
           ) {
             token = nativeToken
           } else {