Merge branch 'develop' into erc-20-bridge

norugpull · norugpull · commit 980a51d1d683 · 2025-10-10T12:39:30.000+03:30
diff --git a/.changeset/curvy-maps-rush.md b/.changeset/curvy-maps-rush.md
diff --git a/.changeset/forty-flies-vanish.md b/.changeset/forty-flies-vanish.md
diff --git a/.changeset/red-dragons-turn.md b/.changeset/red-dragons-turn.md
diff --git a/.changeset/tasty-bats-tan.md b/.changeset/tasty-bats-tan.md
diff --git a/apps/frontend/CHANGELOG.md b/apps/frontend/CHANGELOG.md
@@ -1,5 +1,24 @@
 # frontend
 
+## 1.1.38
+
+### Patch Changes
+
+- 1974ce47: chore: USDT and WBTC on BOB migration
+- ba60a4a8: feat(SOV-5169): new bob pools routes
+- ab168f4e: SOV-5152: Update packages
+- 0d399ab3: SOV-5155: update display value
+- 682e42cf: SOV-5129: Fix Fast BTC address validation
+- Updated dependencies [0b4f5048]
+- Updated dependencies [1974ce47]
+- Updated dependencies [ba60a4a8]
+- Updated dependencies [ab168f4e]
+- Updated dependencies [e8cf255f]
+  - @sovryn/utils@0.0.3
+  - @sovryn/contracts@1.2.6
+  - @sovryn/sdk@2.0.8
+  - @sovryn/ui@1.0.33
+
 ## 1.1.37
 
 ### Patch Changes
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -1,11 +1,10 @@
 {
   "name": "frontend",
-  "version": "1.1.37",
+  "version": "1.1.38",
   "homepage": ".",
   "private": true,
   "dependencies": {
     "@apollo/client": "3.7.1",
-    "@apollo/react-hooks": "4.0.0",
     "@gobob/bob-sdk": "^3.1.7-alpha0",
     "@gobob/sats-wagmi": "^0.3.21-alpha1",
     "@loadable/component": "5.15.2",
@@ -27,35 +26,34 @@
     "@sovryn/sdk": "*",
     "@sovryn/tailwindcss-config": "*",
     "@sovryn/ui": "*",
-    "@sovryn/utils": "0.0.2",
+    "@sovryn/utils": "0.0.3",
     "@tanstack/react-query": "^5.59.0",
     "@uniswap/permit2-sdk": "1.2.0",
     "bitcoin-address-validation": "2.2.1",
     "chart.js": "4.1.1",
-    "classnames": "2.3.2",
-    "date-fns": "2.30.0",
-    "dayjs": "1.11.7",
+    "classnames": "2.5.1",
+    "date-fns": "4.1.0",
+    "dayjs": "1.11.18",
     "env-cmd": "10.1.0",
     "ethers": "5.7.1",
     "ethers-eip712": "0.2.0",
     "graphql": "16.6.0",
     "i18next": "22.0.4",
     "i18next-browser-languagedetector": "7.0.0",
     "immer": "^10.0.3",
-    "nanoid": "4.0.0",
+    "nanoid": "5.1.6",
     "qrcode.react": "3.1.0",
     "react": "18.2.0",
-    "react-chartjs-2": "5.1.0",
-    "react-countup": "6.4.0",
-    "react-day-picker": "8.8.0",
+    "react-chartjs-2": "5.3.0",
+    "react-countup": "6.5.3",
+    "react-day-picker": "9.11.0",
     "react-dom": "18.2.0",
-    "react-helmet-async": "1.3.0",
+    "react-helmet-async": "2.0.5",
     "react-i18next": "12.0.0",
     "react-markdown": "8.0.7",
     "react-multi-carousel": "2.8.4",
     "react-router-dom": "6.4.2",
     "react-scripts": "5.0.1",
-    "react-slider": "2.0.6",
     "react-timer-hook": "3.0.7",
     "reactjs-localstorage": "1.0.1",
     "remark-gfm": "3.0.1",
diff --git a/apps/frontend/src/app/3_organisms/Header/components/BridgeMenuItem/BridgeMenuItem.tsx b/apps/frontend/src/app/3_organisms/Header/components/BridgeMenuItem/BridgeMenuItem.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import { t } from 'i18next';
 
 import { ChainIds } from '@sovryn/ethers-provider';
-import { Menu, MenuItem, Tooltip } from '@sovryn/ui';
+import { Badge, Menu, MenuItem, Tooltip } from '@sovryn/ui';
 
 import { POWPEG, RSK_FAUCET } from '../../../../../constants/general';
 import { BOB } from '../../../../../constants/infrastructure/bob';
@@ -141,7 +141,12 @@ export const BridgeMenuItem: FC<BridgeMenuItemProps> = ({ dataAttribute }) => {
             />
             <MenuItem
               key={t('header.nav.bridges.subMenu.btcBridge')}
-              text={t('header.nav.bridges.subMenu.btcBridge')}
+              text={
+                <span className="flex items-center gap-1.5">
+                  {t('header.nav.bridges.subMenu.btcBridge')}
+                  <Badge content={t('common.deprecated')} className="px-1.5" />
+                </span>
+              }
               label={
                 !isMobile &&
                 t('header.nav.bridges.subMenu.btcBridgeDescription')
diff --git a/apps/frontend/src/app/5_pages/MarketMakingPage/components/AmbientMarketMaking/components/BOBMigrationBanner/BOBMigrationBanner.tsx b/apps/frontend/src/app/5_pages/MarketMakingPage/components/AmbientMarketMaking/components/BOBMigrationBanner/BOBMigrationBanner.tsx
@@ -24,7 +24,7 @@ export const BOBMigrationBanner: FC = () => {
       <Button
         text={t(translations.common.learnMore)}
         style={ButtonStyle.ghost}
-        href="/"
+        href="https://app.gobob.xyz/en/migrate"
         hrefExternal
       />
     </div>
diff --git a/apps/frontend/src/app/5_pages/MarketMakingPage/components/BobDepositModal/hooks/useGetPoolInfo.ts b/apps/frontend/src/app/5_pages/MarketMakingPage/components/BobDepositModal/hooks/useGetPoolInfo.ts
@@ -4,8 +4,10 @@ import { useCallback } from 'react';
 
 import { Pool } from '@sovryn/sdk';
 
+import { BOB } from '../../../../../../constants/infrastructure/bob';
 import { useCurrentChain } from '../../../../../../hooks/useChainStore';
-import { loadIndexer } from '../../../../../../lib/indexer';
+import { Environments } from '../../../../../../types/global';
+import { isMainnet } from '../../../../../../utils/helpers';
 import { useGetPool } from '../../../hooks/useGetPool';
 
 export const useGetPoolInfo = (pool: Pool) => {
@@ -17,7 +19,10 @@ export const useGetPoolInfo = (pool: Pool) => {
       return '0';
     }
 
-    const poolStatsFreshEndpoint = loadIndexer(chainId).url + '/pool_stats?';
+    const poolStatsFreshEndpoint =
+      (isMainnet()
+        ? BOB.indexer[Environments.Mainnet]
+        : BOB.indexer[Environments.Testnet]) + '/pool_stats?';
 
     return fetch(
       poolStatsFreshEndpoint +
diff --git a/apps/frontend/src/locales/en/translations.json b/apps/frontend/src/locales/en/translations.json
@@ -71,7 +71,8 @@
             "withdrawal": "Withdrawal"
         },
         "learnMore": "Learn more",
-        "invalidAmountError": "Exceeds maximum amount"
+        "invalidAmountError": "Exceeds maximum amount",
+        "deprecated": "deprecated"
     },
     "connectWalletButton": {
         "connect": "Get started",
diff --git a/packages/contracts/CHANGELOG.md b/packages/contracts/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @sovryn/contracts
 
+## 1.2.6
+
+### Patch Changes
+
+- 1974ce47: chore: USDT and WBTC on BOB migration
+- e8cf255f: fix: add WBTC contract
+
 ## 1.2.5
 
 ### Patch Changes
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sovryn/contracts",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "license": "MIT",
diff --git a/packages/contracts/src/contracts/loan-tokens/rsk.ts b/packages/contracts/src/contracts/loan-tokens/rsk.ts
@@ -26,6 +26,11 @@ export const rsk: Record<string, AsyncContractConfigData> = {
     getAbi: async () =>
       (await import('../../abis/loanTokenLogicWRBTC.json')).default,
   },
+  WBTC: {
+    address: '0xa9DcDC63eaBb8a2b6f39D7fF9429d88340044a7A',
+    getAbi: async () =>
+      (await import('../../abis/loanTokenLogicWRBTC.json')).default,
+  },
   RUSDT: {
     address: '0x849C47f9C259E9D62F289BF1b2729039698D8387',
     getAbi: async () =>
diff --git a/packages/contracts/src/contracts/loan-tokens/rskTestnet.ts b/packages/contracts/src/contracts/loan-tokens/rskTestnet.ts
@@ -26,6 +26,11 @@ export const rskTestnet: Record<string, AsyncContractConfigData> = {
     getAbi: async () =>
       (await import('../../abis/loanTokenLogicWRBTC.json')).default,
   },
+  WBTC: {
+    address: '0xe67Fe227e0504e8e96A34C3594795756dC26e14B',
+    getAbi: async () =>
+      (await import('../../abis/loanTokenLogicWRBTC.json')).default,
+  },
   RUSDT: {
     address: '0xd1f225BEAE98ccc51c468d1E92d0331c4f93e566',
     getAbi: async () =>
diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @sovryn/sdk
 
+## 2.0.8
+
+### Patch Changes
+
+- 1974ce47: chore: USDT and WBTC on BOB migration
+- ba60a4a8: feat(SOV-5169): new bob pools routes
+- Updated dependencies [0b4f5048]
+- Updated dependencies [1974ce47]
+- Updated dependencies [e8cf255f]
+  - @sovryn/utils@0.0.3
+  - @sovryn/contracts@1.2.6
+
 ## 2.0.7
 
 ### Patch Changes
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sovryn/sdk",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "@sovryn/contracts": "*",
     "@sovryn/ethers-provider": "*",
     "@sovryn/sdex": "*",
-    "@sovryn/utils": "^0.0.2",
+    "@sovryn/utils": "^0.0.3",
     "@uniswap/permit2-sdk": "^1.2.1",
     "rxjs": "7.5.6"
   },
diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @sovryn/ui
 
+## 1.0.33
+
+### Patch Changes
+
+- 1974ce47: chore: USDT and WBTC on BOB migration
+- ab168f4e: SOV-5152: Update packages
+
 ## 1.0.32
 
 ### Patch Changes
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sovryn/ui",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/typings.d.ts",
@@ -50,7 +50,8 @@
     "rollup-plugin-postcss": "4.0.2",
     "rollup-plugin-terser": "7.0.2",
     "storybook-css-modules": "1.0.8",
-    "typescript": "4.5.2"
+    "typescript": "4.5.2",
+    "react-slider": "2.0.6"
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "6.2.0",
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sovryn/utils
 
+## 0.0.3
+
+### Patch Changes
+
+- 0b4f5048: fix: decimal util crashing when null value is given
+
 ## 0.0.2
 
 ### Patch Changes
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sovryn/utils",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "license": "MIT",
diff --git a/packages/utils/src/math/Decimal.ts b/packages/utils/src/math/Decimal.ts
@@ -93,15 +93,29 @@ export class Decimal {
       case 'object':
         if (decimalish instanceof Decimal) {
           return decimalish;
+        } else if (decimalish === null || decimalish === undefined) {
+          return Decimal.ZERO;
         } else {
-          throw new Error('invalid Decimalish value');
+          throw new Error(
+            'invalid Decimalish value: ' +
+              typeof decimalish +
+              '(' +
+              decimalish +
+              ')',
+          );
         }
       case 'string':
         return Decimal._fromString(decimalish);
       case 'number':
         return Decimal._fromString(decimalish.toString());
       default:
-        throw new Error('invalid Decimalish value');
+        throw new Error(
+          'invalid Decimalish value: ' +
+            typeof decimalish +
+            '(' +
+            decimalish +
+            ')',
+        );
     }
   }
 
diff --git a/yarn.lock b/yarn.lock
