Merge branch 'develop' into staging

hop-protocol · Oct 23, 2024 · 000f277 · 000f277
2 parents 082d117 + 8a33694
commit 000f277
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/packages/explorer-backend/src/Db.ts b/packages/explorer-backend/src/Db.ts
@@ -262,6 +262,10 @@ class Db {
     await this.db.query(
       'CREATE INDEX IF NOT EXISTS idx_transfers_reorged_null ON transfers ((1)) WHERE reorged IS NULL;'
     )
+
+    await this.db.query(
+      'CREATE INDEX IF NOT EXISTS idx_transfers_bond_transaction_hash ON transfers (bond_transaction_hash);'
+    )
   }
 
   async getPrices () {
@@ -590,7 +594,7 @@ class Db {
     }
 
     if (transferId) {
-      whereClauses.push(`(transfer_id = $${i} OR transaction_hash = $${i})`)
+      whereClauses.push(`(transfer_id = $${i} OR transaction_hash = $${i} OR bond_transaction_hash = $${i})`)
       queryParams.push(transferId)
       i++
     }

diff --git a/packages/frontend/src/pages/Pools/PoolsOverview/PoolRow.tsx b/packages/frontend/src/pages/Pools/PoolsOverview/PoolRow.tsx
@@ -143,7 +143,7 @@ export function PoolRow (props: Props) {
                 <Typography variant="body2" color="secondary" title="Tokens in pool">
                   {isPoolDeprecated ? <DeprecatedBadge badgeContent="Deprecated" color="warning" title="This pool is deprecated and only withdrawals are allowed.">{poolSubtitle}</DeprecatedBadge> : (
 
-                    poolSubtitle?.includes('Pol ') ? <RebrandedBadge badgeContent="prev. MATIC" color="info" title="The token symbol has been rebranded">{poolSubtitle}</RebrandedBadge> : poolSubtitle
+                    poolSubtitle?.includes('POL ') ? <RebrandedBadge badgeContent="prev. MATIC" color="info" title="The token symbol has been rebranded">{poolSubtitle}</RebrandedBadge> : poolSubtitle
 
                   )}
                 </Typography>

diff --git a/packages/frontend/src/pages/Pools/PoolsOverview/usePools.tsx b/packages/frontend/src/pages/Pools/PoolsOverview/usePools.tsx
@@ -72,7 +72,7 @@ export function usePools () {
           const tokenImage = getTokenImage(tokenModel.symbol)
           let tokenSymbolDisplay = token
           if (tokenSymbolDisplay === TokenSymbol.MATIC && chainModel.slug === ChainSlug.Polygon) {
-            tokenSymbolDisplay = 'Pol'
+            tokenSymbolDisplay = 'POL'
           }
           const poolName = `${tokenSymbolDisplay} ${chainModel.name} Pool`
           const poolSubtitle = `${tokenSymbolDisplay} - h${token}`

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hop-protocol/sdk",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "The v1 Hop Protocol TypeScript SDK",
   "author": "Authereum Labs, Inc.",
   "license": "MIT",

diff --git a/packages/sdk/src/HopBridge.ts b/packages/sdk/src/HopBridge.ts
@@ -922,7 +922,7 @@ export class HopBridge extends Base {
       estimatedReceived = BigNumber.from(0)
     }
 
-    const availableLiquidity = await this.#getAvailableLiquidityCctp(sourceChain)
+    const availableLiquidity = await this.#getAvailableLiquidityCctp(sourceChain, destinationChain)
     const isLiquidityAvailable = availableLiquidity.gte(amountIn)
     const lpFeeBps = BigNumber.from(0)
     const requiredLiquidity = amountIn
@@ -1655,13 +1655,19 @@ export class HopBridge extends Base {
   }
 
   async #getAvailableLiquidityCctp (
-    sourceChain: TChain
+    sourceChain: TChain,
+    destinationChain: TChain
   ): Promise<BigNumber> {
     const isEnabled = await this.getIsCctpEnabled()
     if (!isEnabled) {
       return BigNumber.from(0)
     }
 
+    destinationChain = this.toChainModel(destinationChain)
+    if (ChainSlug.Polygon === destinationChain.slug) {
+      return BigNumber.from(0)
+    }
+
     sourceChain = this.toChainModel(sourceChain)
 
     const sourceChainProvider = this.getChainProvider(sourceChain)
@@ -1692,7 +1698,7 @@ export class HopBridge extends Base {
     }
 
     if (this.getShouldUseCctpBridge({isHTokenSend})) {
-      return this.#getAvailableLiquidityCctp(sourceChain)
+      return this.#getAvailableLiquidityCctp(sourceChain, destinationChain)
     }
 
     sourceChain = this.toChainModel(sourceChain)

diff --git a/packages/sdk/src/priceFeed/PriceFeed.ts b/packages/sdk/src/priceFeed/PriceFeed.ts
@@ -31,7 +31,8 @@ export class PriceFeed {
     WETH: 'ETH',
     WMATIC: 'MATIC',
     WXDAI: 'DAI',
-    XDAI: 'DAI'
+    XDAI: 'DAI',
+    WPOL: 'MATIC'
   }
 
   constructor (apiKeysMap: PriceFeedApiKeys = {}) {

diff --git a/packages/stats-worker/src/YieldStats.ts b/packages/stats-worker/src/YieldStats.ts
@@ -132,6 +132,7 @@ class YieldStats {
       for (const chain in (this.bridges as any)[token]) {
         const shouldSkip = this.shouldSkipYields(this.bridges, chain, token)
         if (shouldSkip) {
+          console.log(`skipping ${chain}.${token}`)
           continue
         }