Merge remote-tracking branch 'origin/fix/swap-input-update' into tmp/…

…20241226
RabbyHub · Dec 26, 2024 · 38933d2 · 38933d2
2 parents 0ad3c3d + 207ea6a
commit 38933d2
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "@rabby-wallet/rabby-action": "0.1.8",
     "@rabby-wallet/rabby-api": "0.9.7",
     "@rabby-wallet/rabby-security-engine": "2.0.7",
-    "@rabby-wallet/rabby-swap": "0.0.43",
+    "@rabby-wallet/rabby-swap": "0.0.45",
     "@rabby-wallet/widgets": "1.0.9",
     "@rematch/core": "2.2.0",
     "@rematch/select": "3.1.2",

diff --git a/src/ui/component/ChainSelector/InForm.tsx b/src/ui/component/ChainSelector/InForm.tsx
@@ -138,7 +138,6 @@ export const ChainRender = ({
       )}
       {...other}
     >
-      {/* <img className="logo" src={CHAINS[chain].logo} alt={CHAINS[chain].name} /> */}
       {chain && (
         <ChainIcon
           chain={chain}

diff --git a/src/ui/views/Approval/components/BroadcastMode/index.tsx b/src/ui/views/Approval/components/BroadcastMode/index.tsx
@@ -12,6 +12,7 @@ import { useTranslation } from 'react-i18next';
 import styled, { createGlobalStyle } from 'styled-components';
 import { Card } from '../Card';
 import { Divide } from '../Divide';
+import { findChainByEnum } from '@/utils/chain';
 
 const GlobalStyle = createGlobalStyle`
   .broadcast-mode-popup {
@@ -189,7 +190,10 @@ export const BroadcastMode = ({
   const [account] = useAccount();
   const wallet = useWallet();
   const { data: supportedPushType } = useRequest(
-    () => wallet.openapi.gasSupportedPushType(CHAINS[chain]?.serverId),
+    () =>
+      wallet.openapi.gasSupportedPushType(
+        findChainByEnum(chain)!.serverId || CHAINS[chain]?.serverId
+      ),
     {
       refreshDeps: [chain],
     }

diff --git a/src/ui/views/Swap/Component/Main.tsx b/src/ui/views/Swap/Component/Main.tsx
@@ -26,7 +26,7 @@ import {
   SWAP_SUPPORT_CHAINS,
 } from '@/constant';
 import ChainSelectorInForm from '@/ui/component/ChainSelector/InForm';
-import { findChainByServerID } from '@/utils/chain';
+import { findChainByEnum, findChainByServerID } from '@/utils/chain';
 import type { SelectChainItemProps } from '@/ui/component/ChainSelector/components/SelectChainItem';
 import i18n from '@/i18n';
 import { useTranslation } from 'react-i18next';
@@ -471,7 +471,7 @@ export const Main = () => {
             }
             setPayToken(token);
           }}
-          chainId={CHAINS[chain].serverId}
+          chainId={findChainByEnum(chain)!.serverId}
           type={'from'}
           excludeTokens={receiveToken?.id ? [receiveToken?.id] : undefined}
         />
@@ -516,7 +516,7 @@ export const Main = () => {
               setLowCreditVisible(true);
             }
           }}
-          chainId={CHAINS[chain].serverId}
+          chainId={findChainByEnum(chain)!.serverId || CHAINS[chain].serverId}
           type={'to'}
           excludeTokens={payToken?.id ? [payToken?.id] : undefined}
           currentQuote={activeProvider}

diff --git a/src/ui/views/Swap/hooks/quote.tsx b/src/ui/views/Swap/hooks/quote.tsx
@@ -20,6 +20,7 @@ import { useRabbySelector } from '@/ui/store';
 import stats from '@/stats';
 import { ChainGas } from '@/background/service/preference';
 import { verifySdk } from './verify';
+import { findChainByEnum } from '@/utils/chain';
 
 export interface validSlippageParams {
   chain: CHAINS_ENUM;
@@ -31,6 +32,7 @@ export interface validSlippageParams {
 export const useQuoteMethods = () => {
   const walletController = useWallet();
   const walletOpenapi = walletController.openapi;
+
   const validSlippage = React.useCallback(
     async ({
       chain,
@@ -40,7 +42,7 @@ export const useQuoteMethods = () => {
     }: validSlippageParams) => {
       const p = {
         slippage: new BigNumber(slippage).div(100).toString(),
-        chain_id: CHAINS[chain].serverId,
+        chain_id: findChainByEnum(chain)!.serverId,
         from_token_id: payTokenId,
         to_token_id: receiveTokenId,
       };
@@ -98,8 +100,8 @@ export const useQuoteMethods = () => {
     async ({ addr, chain, tokenId }: getTokenParams) => {
       return walletOpenapi.getToken(
         addr,
-        CHAINS[chain].serverId,
-        tokenId // CHAINS[chain].nativeTokenAddress
+        findChainByEnum(chain)!.serverId,
+        tokenId
       );
     },
     [walletOpenapi]
@@ -116,15 +118,16 @@ export const useQuoteMethods = () => {
       getDexQuoteParams,
       'payToken' | 'receiveToken' | 'payAmount' | 'chain' | 'dexId'
     >) => {
+      const chainInfo = findChainByEnum(chain)!;
       if (
-        payToken?.id === CHAINS[chain].nativeTokenAddress ||
+        payToken?.id === chainInfo.nativeTokenAddress ||
         isSwapWrapToken(payToken.id, receiveToken.id, chain)
       ) {
         return [true, false];
       }
 
       const allowance = await walletController.getERC20Allowance(
-        CHAINS[chain].serverId,
+        chainInfo.serverId,
         payToken.id,
         getSpender(dexId, chain)
       );
@@ -156,19 +159,20 @@ export const useQuoteMethods = () => {
       dexId,
       quote,
     }: getPreExecResultParams) => {
+      const chainInfo = findChainByEnum(chain)!;
       const nonce = await walletController.getRecommendNonce({
         from: userAddress,
-        chainId: CHAINS[chain].id,
+        chainId: chainInfo.id,
       });
       const lastTimeGas: ChainGas | null = await walletController.getLastTimeGasSelection(
-        CHAINS[chain].id
+        chainInfo.id
       );
       const gasMarket = await walletController.gasMarketV2({
-        chain: CHAINS[chain],
+        chain: chainInfo,
         tx: {
           ...quote.tx,
           nonce,
-          chainId: CHAINS[chain].id,
+          chainId: chainInfo.id,
           gas: '0x0',
         },
       });
@@ -205,7 +209,7 @@ export const useQuoteMethods = () => {
           {
             from: userAddress,
             to: payToken.id,
-            chainId: CHAINS[chain].id,
+            chainId: chainInfo.id,
             spender: getSpender(dexId, chain),
             amount,
           }
@@ -270,7 +274,7 @@ export const useQuoteMethods = () => {
         tx: {
           ...quote.tx,
           nonce: nextNonce,
-          chainId: CHAINS[chain].id,
+          chainId: chainInfo.id,
           value: `0x${new BigNumber(quote.tx.value).toString(16)}`,
           gasPrice: `0x${new BigNumber(gasPrice).toString(16)}`,
           gas: '0x0',
@@ -329,7 +333,7 @@ export const useQuoteMethods = () => {
         let gasPrice: number;
         if (isOpenOcean) {
           const gasMarket = await walletController.gasMarketV2({
-            chainId: CHAINS[chain].serverId,
+            chainId: findChainByEnum(chain)!.serverId,
           });
           gasPrice = gasMarket?.[1]?.price;
         }
@@ -362,6 +366,8 @@ export const useQuoteMethods = () => {
               chain,
               gasPrice,
               fee: true,
+              chainServerId: findChainByEnum(chain)!.serverId,
+              nativeTokenAddress: findChainByEnum(chain)!.nativeTokenAddress,
             },
             walletOpenapi
           );
@@ -476,7 +482,9 @@ export const useQuoteMethods = () => {
 
       return Promise.all([
         ...(supportedDEXList.filter((e) => DEX[e]) as DEX_ENUM[]).map((dexId) =>
-          getDexQuote({ ...params, dexId })
+          getDexQuote({ ...params, dexId }).finally(() => {
+            console.log('dexid end', dexId);
+          })
         ),
       ]);
     },
@@ -572,7 +580,7 @@ export function isSwapWrapToken(
 ) {
   const wrapTokens = [
     WrapTokenAddressMap[chain as keyof typeof WrapTokenAddressMap],
-    CHAINS[chain].nativeTokenAddress,
+    findChainByEnum(chain)!.nativeTokenAddress,
   ];
   return (
     !!wrapTokens.find((token) => isSameAddress(payTokenId, token)) &&

diff --git a/src/ui/views/Swap/hooks/token.tsx b/src/ui/views/Swap/hooks/token.tsx
@@ -19,7 +19,7 @@ import { useRbiSource } from '@/ui/utils/ga-event';
 import stats from '@/stats';
 import { useAsyncInitializeChainList } from '@/ui/hooks/useChain';
 import { SWAP_SUPPORT_CHAINS } from '@/constant';
-import { findChain } from '@/utils/chain';
+import { findChain, findChainByEnum } from '@/utils/chain';
 import { GasLevelType } from '../Component/ReserveGasPopup';
 import { useSwapSlippage } from './slippage';
 import { useLowCreditState } from '../Component/LowCreditModal';
@@ -41,7 +41,7 @@ const useTokenInfo = ({
     if (userAddress && token?.id && chain) {
       const data = await wallet.openapi.getToken(
         userAddress,
-        CHAINS[chain].serverId,
+        findChainByEnum(chain)!.serverId,
         token.id
       );
       return data;
@@ -214,17 +214,18 @@ export const useTokenPair = (userAddress: string) => {
         setIsDraggingSlider(true);
         setSwapUseSlider(true);
         setSlider(v);
+
+        if (syncAmount) {
+          setIsDraggingSlider(false);
+        }
+
         if (v === 100) {
           handleSlider100();
           return;
         }
         setPayAmount(
           new BigNumber(v).div(100).times(tokenAmountBn(payToken)).toString(10)
         );
-
-        if (syncAmount) {
-          setIsDraggingSlider(false);
-        }
       }
     },
     [payToken]
@@ -247,7 +248,10 @@ export const useTokenPair = (userAddress: string) => {
 
   const payTokenIsNativeToken = useMemo(() => {
     if (payToken) {
-      return isSameAddress(payToken.id, CHAINS[chain].nativeTokenAddress);
+      return isSameAddress(
+        payToken.id,
+        findChainByEnum(chain)!.nativeTokenAddress
+      );
     }
     return false;
   }, [chain, payToken]);
@@ -281,7 +285,7 @@ export const useTokenPair = (userAddress: string) => {
   const { value: gasList } = useAsync(() => {
     gasPriceRef.current = undefined;
     setGasLevel('normal');
-    return wallet.gasMarketV2({ chainId: CHAINS[chain].serverId });
+    return wallet.gasMarketV2({ chainId: findChainByEnum(chain)!.serverId });
   }, [chain]);
 
   const normalGasPrice = useMemo(
@@ -356,7 +360,7 @@ export const useTokenPair = (userAddress: string) => {
     if (payToken?.id && receiveToken?.id) {
       const wrapTokens = [
         WrapTokenAddressMap[chain],
-        CHAINS[chain].nativeTokenAddress,
+        findChainByEnum(chain)!.nativeTokenAddress,
       ];
       const res =
         !!wrapTokens.find((token) => isSameAddress(payToken?.id, token)) &&
@@ -445,6 +449,7 @@ export const useTokenPair = (userAddress: string) => {
       setQuotesList((e) =>
         e.map((q) => ({ ...q, loading: true, isBest: false }))
       );
+      setActiveProvider(undefined);
       return getAllQuotes({
         userAddress,
         payToken,
@@ -708,7 +713,7 @@ export const useTokenPair = (userAddress: string) => {
 };
 
 function getChainDefaultToken(chain: CHAINS_ENUM) {
-  const chainInfo = CHAINS[chain];
+  const chainInfo = findChainByEnum(chain)!;
   return {
     id: chainInfo.nativeTokenAddress,
     decimals: chainInfo.nativeTokenDecimals,

diff --git a/src/ui/views/Swap/hooks/verify.tsx b/src/ui/views/Swap/hooks/verify.tsx
@@ -9,7 +9,7 @@ import {
 import { useMemo } from 'react';
 import { getRouter, getSpender, isSwapWrapToken } from './quote';
 import BigNumber from 'bignumber.js';
-import { findChain } from '@/utils/chain';
+import { findChain, findChainByEnum } from '@/utils/chain';
 
 type ValidateTokenParam = {
   id: string;
@@ -35,7 +35,7 @@ export const verifyRouterAndSpender = (
   const spenderWhitelist = getSpender(dexId, chain);
   const isNativeToken = isSameAddress(
     payTokenId,
-    CHAINS[chain].nativeTokenAddress
+    findChainByEnum(chain)!.nativeTokenAddress
   );
   const isWrapTokens = isSwapWrapToken(payTokenId, receiveTokenId, chain);
 
@@ -48,7 +48,7 @@ export const verifyRouterAndSpender = (
 };
 
 const isNativeToken = (chain: CHAINS_ENUM, tokenId: string) =>
-  isSameAddress(tokenId, CHAINS[chain].nativeTokenAddress);
+  isSameAddress(tokenId, findChainByEnum(chain)!.nativeTokenAddress);
 
 export const verifyCalldata = <T extends Parameters<typeof decodeCalldata>[1]>(
   data: QuoteResult | null,
@@ -123,7 +123,7 @@ export const verifySdk = <T extends ValidateTokenParam>(
     data,
     actualDexId,
     new BigNumber(slippage).div(100).toFixed(),
-    data?.tx ? { ...data?.tx, chainId: CHAINS[chain].id } : undefined
+    data?.tx ? { ...data?.tx, chainId: findChainByEnum(chain)!.id } : undefined
   );
 
   return {

diff --git a/yarn.lock b/yarn.lock
@@ -4900,10 +4900,10 @@
     sha256-uint8array "^0.10.3"
     url-parse "^1.5.1"
 
-"@rabby-wallet/[email protected].43":
-  version "0.0.43"
-  resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-swap/-/rabby-swap-0.0.43.tgz#79b24115a438a4910da247be6e7b652f02f26e64"
-  integrity sha512-Zyhb54fV0JRqJwXP3wt7L+BAd6fSCdOM/oTqhduA3M419ZVZI/DiN7hMo6S/EvLizKPIJiiIMokT8J9Iml5eAQ==
+"@rabby-wallet/[email protected].45":
+  version "0.0.45"
+  resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-swap/-/rabby-swap-0.0.45.tgz#523f07ebf869ceac171a5c36494a0d053394ef2e"
+  integrity sha512-ps5N9ZyTgqMo+5VWrbzuchHI4L+VQngjpPbRSVNd+6M8Mdqx02haMJy+lGmanKpTWConRMcdZ2AY4qo6I8tBqA==
   dependencies:
     "@ethersproject/abi" "^5.7.0"
     axios "^0.27.2"