SD-34: Update tokens, networks and shielder sdk

rAskVAL · rAskVAL · commit 172d7c25ba0c · 2025-04-08T16:02:37.000+03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "generate-icons": "tsx scripts/generateIcons.ts"
   },
   "dependencies": {
-    "@cardinal-cryptography/shielder-sdk": "0.2.0-beta.4",
+    "@cardinal-cryptography/shielder-sdk": "0.2.0-beta.5",
     "@cardinal-cryptography/shielder-sdk-crypto": "0.2.0-beta.2",
     "@cardinal-cryptography/shielder-sdk-crypto-wasm": "0.2.0-beta.2",
     "@number-flow/react": "^0.5.7",
diff --git a/src/domains/chains/utils/definitions/chains/alephZero/alephZero.ts b/src/domains/chains/utils/definitions/chains/alephZero/alephZero.ts
@@ -2,7 +2,7 @@ import UsdcIcon from '../../commonTokensIcons/usdc.svg?react';
 import UsdtIcon from '../../commonTokensIcons/usdt.svg?react';
 import WAzeroIcon from '../../commonTokensIcons/wAzero.svg?react';
 import WBtcIcon from '../../commonTokensIcons/wBtc.svg?react';
-import WEthIcon from '../../commonTokensIcons/wBtc.svg?react';
+import WEthIcon from '../../commonTokensIcons/wEth.svg?react';
 import { ChainConfig } from '../../definitions';
 
 import ChainIcon from './alephZeroEvm.svg?react';
@@ -42,7 +42,7 @@ const config: ChainConfig = {
       '0x5be9D19Ed24c8C31f4b1FA78A555a97eD462582D': { icon: WBtcIcon },
       '0xB3f0eE446723f4258862D949B4c9688e7e7d35d3': { icon: WEthIcon },
       '0x18d25B4e18165c97e1285212e5d1f80eDD6d3Aa7': { icon: UsdcIcon },
-      '0xD648529D4803d3467bA8850577BEd4e4b8Ae583C': { icon: UsdtIcon },
+      '0x27a1Bb249A2973D01264e8e43Ee9be2424F1a52B': { icon: UsdtIcon },
     },
   },
   testnet: {
@@ -51,10 +51,8 @@ const config: ChainConfig = {
     NativeTokenIcon,
     id: 2039,
     shielderConfig: {
-      shielderContractAddress: '0x7126761c7E18915C891c215a23100739492B78a1',
-      // TODO(SD-31): Replace the placeholder relayer URL with chain-specific URLs once provided.
-      // https://cardinal-cryptography.atlassian.net/browse/SD-31
-      relayerUrl: 'https://shielder-relayer-dev.test.azero.dev',
+      shielderContractAddress: '0x0037A4AAE611b931d626887Bd53028a2a7051A7e',
+      relayerUrl: 'https://shielder-relayer-v2.dev.azero.dev/azero-testnet',
     },
     nativeCurrency: {
       decimals: 18,
@@ -80,11 +78,8 @@ const config: ChainConfig = {
       },
     },
     whitelistedTokens: {
-      '0xcC1141eEd15EB519b08cA38A2Ee75AB8025F0DA9': { icon: WAzeroIcon },
-      '0x50Cb1A86F64E065F1763E9c5B3a8FA321dad9402': { icon: WBtcIcon },
-      '0x189d0D5409F244B78C86cdcF9331B276363bDDa1': { icon: WEthIcon },
-      '0xc1947a75696731548651dD40CcB22D23fEA71AF3': { icon: UsdcIcon },
-      '0x8fceA92b10b7ee07fc625Cd3441Bbe65E9F472f2': { icon: UsdtIcon },
+      '0x1C66D6187B318f10Eb1A8BD986451DF02BE3DbAC': { icon: WEthIcon },
+      '0x27a1Bb249A2973D01264e8e43Ee9be2424F1a52B': { icon: UsdtIcon },
     },
   },
 };
diff --git a/src/domains/chains/utils/definitions/chains/arbitrum/arbitrum.svg b/src/domains/chains/utils/definitions/chains/arbitrum/arbitrum.svg
@@ -0,0 +1,3 @@
+<svg width="50" height="50" viewBox="-11 -9 80 80" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+    <path d="M53.6084 14.017L30.4044 0.898708C29.6548 0.480848 28.8273 0.265625 28 0.265625C27.1728 0.265625 26.3452 0.480848 25.6084 0.898708L2.39161 14.0296C0.917707 14.8653 0 16.4101 0 18.0816V44.3434C0 46.0148 0.917707 47.5722 2.39161 48.4079L25.6084 61.5388C26.3377 61.9526 27.1615 62.1707 28 62.1719C28.8273 62.1719 29.6548 61.9566 30.3916 61.5388L53.6084 48.4079C55.0951 47.5722 56 46.0274 56 44.3434V18.0816C56 16.4101 55.0823 14.8525 53.6084 14.017ZM52.096 44.3434C52.096 44.6471 51.928 44.9257 51.6564 45.0775L48.1221 47.0784L38.8198 22.0956C38.6517 21.6397 38.0054 21.6397 37.8375 22.0956L34.7737 30.3134C34.6831 30.5411 34.6831 30.7949 34.7737 31.0226L42.0344 50.5248L39.6184 51.8925L33.6756 35.9229C33.5072 35.4671 32.8611 35.4671 32.693 35.9229L29.6292 44.1407C29.5389 44.3684 29.5389 44.622 29.6292 44.8497L33.5309 55.3388L28.4394 58.2212C28.3056 58.2974 28.154 58.3367 28 58.3351C27.845 58.3351 27.7026 58.2972 27.5606 58.2212L22.5189 55.3682L36.8403 16.9039C36.9694 16.562 36.7111 16.2075 36.3491 16.2075H30.4673C30.0277 16.2075 29.627 16.4735 29.4848 16.8785L17.0321 50.3096L14.7903 48.4841L26.5517 16.8911C26.6681 16.562 26.4224 16.2075 26.0475 16.2075H20.1657C19.7261 16.2075 19.3251 16.4735 19.183 16.8785L7.92638 47.1105L4.35641 45.0903C4.08485 44.9382 3.91702 44.6597 3.91702 44.3559V18.0816C3.91702 17.7776 4.08485 17.499 4.35641 17.3472L27.5734 4.21625C27.7033 4.14185 27.8503 4.10261 28 4.10237C28.155 4.10237 28.2974 4.14033 28.4394 4.21625L51.6564 17.3472C51.928 17.499 52.096 17.7776 52.096 18.0816V44.3434Z" fill="currentcolor"/>
+</svg>
diff --git a/src/domains/chains/utils/definitions/chains/arbitrum/arbitrum.ts b/src/domains/chains/utils/definitions/chains/arbitrum/arbitrum.ts
@@ -0,0 +1,31 @@
+import { arbitrum, arbitrumSepolia } from 'viem/chains';
+
+import UsdtIcon from '../../commonTokensIcons/usdt.svg?react';
+import WEthIcon from '../../commonTokensIcons/wEth.svg?react';
+import { ChainConfig } from '../../definitions';
+
+import ChainIcon from './arbitrum.svg?react';
+import NativeTokenIcon from './nativeToken.svg?react';
+
+const config: ChainConfig = {
+  mainnet: {
+    ...arbitrum,
+    ChainIcon,
+    NativeTokenIcon,
+    whitelistedTokens: {},
+  },
+  testnet: {
+    ...arbitrumSepolia,
+    shielderConfig: {
+      shielderContractAddress: '0x4691195fd10716b477B57b673939A99c6c0bc83A',
+      relayerUrl: 'https://shielder-relayer-v2.dev.azero.dev/arbitrum-testnet',
+    },
+    ChainIcon,
+    NativeTokenIcon,
+    whitelistedTokens: {
+      '0xaefC07E8821fB684DB23c7e3a6A1CC91B871a954': { icon: WEthIcon },
+      '0xbf97a6bea949aabe8324f78b2f5455f7b1f52a78': { icon: UsdtIcon },
+    },
+  },
+};
+export default config;
diff --git a/src/domains/chains/utils/definitions/chains/arbitrum/index.ts b/src/domains/chains/utils/definitions/chains/arbitrum/index.ts
@@ -0,0 +1,2 @@
+export { default } from './arbitrum.ts';
+export * from './arbitrum.ts';
diff --git a/src/domains/chains/utils/definitions/chains/arbitrum/nativeToken.svg b/src/domains/chains/utils/definitions/chains/arbitrum/nativeToken.svg
@@ -0,0 +1,12 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_14074_91934)">
+<path d="M30.049 26.5586H26.4365L27.7172 29.4351C27.7855 29.5885 27.9376 29.6873 28.1055 29.6873H30.9512C31.1819 29.6873 31.3362 29.4497 31.2424 29.2389L30.049 26.5586Z" fill="#1E232B"/>
+<path d="M30.9518 17.457H25.9969L22.0934 8.68964C22.0251 8.5363 21.873 8.4375 21.7051 8.4375H18.5234C18.3555 8.4375 18.2034 8.5363 18.1351 8.68964L14.2317 17.457H9.27676C9.10071 17.457 8.95801 17.5997 8.95801 17.7758V20.3258C8.95801 20.5018 9.10071 20.6445 9.27676 20.6445H12.8125L8.98595 29.2391C8.89209 29.4499 9.04639 29.6875 9.27717 29.6875H12.1228C12.2906 29.6875 12.4428 29.5887 12.5111 29.4353L20.1143 12.3583L23.8035 20.6445H30.9518C31.1278 20.6445 31.2705 20.5018 31.2705 20.3258V17.7758C31.2705 17.5997 31.1278 17.457 30.9518 17.457Z" fill="#1E232B"/>
+<path style="fill: #00B7FF;" d="M30.9831 21.3408H17.0636C16.9438 21.3408 16.8429 21.4178 16.7948 21.5276C16.7945 21.5282 16.7942 21.5288 16.794 21.5295L15.0447 25.4585C14.9601 25.6484 15.0991 25.8623 15.3069 25.8623H30.9831C31.1417 25.8623 31.2702 25.7338 31.2702 25.5753V21.6279C31.2702 21.4693 31.1417 21.3408 30.9831 21.3408ZM21.5368 22.6285H20.2292V23.3764H21.458V23.8224H20.2292V24.5703H21.5368V25.0207H19.7131V22.1825H21.5368V22.6285ZM23.5239 25.0207H22.9816L22.0195 22.1825H22.5662L23.2573 24.3739L23.9569 22.1825H24.4992L23.5239 25.0207ZM27.9933 25.0207H27.4729V22.9494L26.6682 24.7102H26.3315L25.5006 22.8913V25.0207H24.9845V22.1825H25.7236L26.502 23.8712L27.2805 22.1825H27.9933L27.9933 25.0207Z" fill="#00B7FF"/>
+</g>
+<defs>
+<clipPath id="clip0_14074_91934">
+<rect width="22.3125" height="21.25" fill="white" transform="translate(8.95801 8.4375)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/domains/chains/utils/definitions/definitions.ts b/src/domains/chains/utils/definitions/definitions.ts
@@ -4,7 +4,7 @@ import { Address, Chain } from 'viem';
 import { NetworkEnvironment } from 'src/domains/chains/types/misc';
 
 import alephZero from './chains/alephZero';
-import base from './chains/base';
+import arbitrum from './chains/arbitrum';
 
 export type Definition = {
   id: number,
@@ -24,5 +24,6 @@ export type ChainConfig = Record<NetworkEnvironment, Definition>;
 
 export default {
   alephZero,
-  base,
+  arbitrum,
+  // base,
 } satisfies Record<string, ChainConfig>;
diff --git a/src/domains/misc/utils/useTransactionFee.tsx b/src/domains/misc/utils/useTransactionFee.tsx
diff --git a/src/domains/misc/utils/useTransactionFees.tsx b/src/domains/misc/utils/useTransactionFees.tsx
@@ -0,0 +1,30 @@
+import { erc20Token, nativeToken } from '@cardinal-cryptography/shielder-sdk';
+import { skipToken, useQuery } from '@tanstack/react-query';
+import { Address } from 'viem';
+
+import { Token } from 'src/domains/chains/types/misc';
+import getQueryKey from 'src/domains/misc/utils/getQueryKey';
+import useShielderClient from 'src/domains/shielder/utils/useShielderClient';
+
+type Props = {
+  walletAddress: Address | undefined,
+  token: Token,
+};
+
+const useTransactionFees = ({ walletAddress, token }: Props) => {
+  const { data: shielderClient } = useShielderClient();
+  const { data } = useQuery({
+    queryKey: walletAddress ? getQueryKey.estimateFeesPerGas(walletAddress) : [],
+    queryFn: !shielderClient ?
+      skipToken :
+      async () => {
+        const sdkToken = token.isNative ? nativeToken() : erc20Token(token.address);
+
+        return await shielderClient.getWithdrawFees(sdkToken, 0n);
+      },
+  });
+
+  return data;
+};
+
+export default useTransactionFees;
diff --git a/src/domains/shielder/components/SignatureModal.tsx b/src/domains/shielder/components/SignatureModal.tsx
@@ -20,8 +20,7 @@ const SignatureModal = () => {
   const [isTryingAgain, setIsTryingAgain] = useState(false);
   const { address, disconnect, isConnected } = useWallet();
   const { connector } = useAccount();
-  const { setShielderPrivateKeySeeds } = useShielderStore(address);
-
+  const { setShielderPrivateKeySeeds, shielderPrivateKey } = useShielderStore(address);
   const getShielderPrivateKey = async () => {
     if (!address) throw new Error('No address');
     const signature = await signMessage(wagmiAdapter.wagmiConfig, {
@@ -34,7 +33,8 @@ const SignatureModal = () => {
 
   const isReady = !!connector?.getChainId && isConnected;
 
-  const { data: shielderPrivateKey, refetch, isError: isSigningError, isLoading } = useQuery({
+  const { refetch, isError: isSigningError, isLoading } = useQuery({
+    enabled: !shielderPrivateKey,
     queryKey: address ? getQueryKey.shielderPrivateKey(address) : [],
     queryFn: isReady ? getShielderPrivateKey : skipToken,
     staleTime: Infinity,
@@ -54,7 +54,7 @@ const SignatureModal = () => {
   const isError = isTryingAgain || isSigningError || !isConnected;
 
   return (
-    <Modal isOpenInitially={isConnected && !shielderPrivateKey} nonDismissable>
+    <Modal isOpenInitially={isConnected && !shielderPrivateKey } nonDismissable>
       <Content>
         <CheckedContainer>
           <SignatureIcon size={60} icon="Signature" color={isError ? vars('--color-status-danger-foreground-1-rest') : undefined} />
diff --git a/src/domains/shielder/components/TokenList/AssetBox/AssetBox.tsx b/src/domains/shielder/components/TokenList/AssetBox/AssetBox.tsx
@@ -218,15 +218,21 @@ const AssetBox = ({
               </PercentageContainer>
             )}
           </Row>
-          {isPresent(effectiveAssetValue) && transactionMaxValue?.gt(0) && nativeCoinClippedMaxValue?.gt(0) && (
-            <InteractiveSlider
-              snapPoints={[0, 0.25, 0.5, 0.75, 1]}
-              snapRange={20}
-              onValueChange={handleSliderValueChange}
-              value={BigNumber(effectiveAssetValue).div(transactionMaxValue).toNumber()}
-              highlighted={isBalanceExceeded}
-            />
-          )}
+          {
+            isPresent(effectiveAssetValue) &&
+            transactionMaxValue?.gt(0) &&
+            (
+              !shouldClipNativeCoinValue || nativeCoinClippedMaxValue.gt(0)
+            ) && (
+              <InteractiveSlider
+                snapPoints={[0, 0.25, 0.5, 0.75, 1]}
+                snapRange={20}
+                onValueChange={handleSliderValueChange}
+                value={BigNumber(effectiveAssetValue).div(transactionMaxValue).toNumber()}
+                highlighted={isBalanceExceeded}
+              />
+            )
+          }
         </SplitBox.Section>
       )}
     </SplitBox.Container>
diff --git a/src/domains/shielder/components/TokenList/Modals/SendModal/SendPage.tsx b/src/domains/shielder/components/TokenList/Modals/SendModal/SendPage.tsx
@@ -12,7 +12,7 @@ import CIcon from 'src/domains/misc/components/CIcon';
 import DoubleBorderBox from 'src/domains/misc/components/DoubleBorderBox';
 import getQueryKey from 'src/domains/misc/utils/getQueryKey';
 import isPresent from 'src/domains/misc/utils/isPresent';
-import useTransactionFee from 'src/domains/misc/utils/useTransactionFee';
+import useTransactionFees from 'src/domains/misc/utils/useTransactionFees.tsx';
 import NetworkFeeRow from 'src/domains/shielder/components/NetworkFeeRow';
 import { Token } from 'src/domains/shielder/components/TokenList';
 import useWithdraw from 'src/domains/shielder/utils/useWithdraw';
@@ -44,7 +44,8 @@ const SendPage = ({ token, addressTo }: Props) => {
     return token.decimals ? BigNumber(value || 0).shiftedBy(token.decimals) : BigNumber(0);
   }, [value, token.decimals]);
 
-  const transactionFee = useTransactionFee({ walletAddress: address });
+  const fees = useTransactionFees({ walletAddress: address, token });
+  const transactionFee = fees?.fee_details.total_cost_native;
 
   const maxAmountToShield = useMemo(() => {
     if (!isPresent(token.balance)) return token.balance;
@@ -75,7 +76,7 @@ const SendPage = ({ token, addressTo }: Props) => {
       throw new Error('Address to is not available'); // should never happen
     }
 
-    void withdraw({ token, amount: BigInt(valueBn.toString()), addressTo, useManualWithdraw: true });
+    void withdraw({ token, amount: BigInt(valueBn.toString()), addressTo });
   };
 
   const buttonLabel = useMemo(() => {
diff --git a/src/domains/shielder/components/TokenList/Modals/ShieldModal.tsx b/src/domains/shielder/components/TokenList/Modals/ShieldModal.tsx
@@ -12,7 +12,7 @@ import DoubleBorderBox from 'src/domains/misc/components/DoubleBorderBox';
 import Modal from 'src/domains/misc/components/Modal';
 import getQueryKey from 'src/domains/misc/utils/getQueryKey';
 import isPresent from 'src/domains/misc/utils/isPresent';
-import useTransactionFee from 'src/domains/misc/utils/useTransactionFee';
+import useTransactionFees from 'src/domains/misc/utils/useTransactionFees.tsx';
 import NetworkFeeRow from 'src/domains/shielder/components/NetworkFeeRow';
 import useShield from 'src/domains/shielder/utils/useShield';
 import { typography } from 'src/domains/styling/utils/tokens';
@@ -45,7 +45,8 @@ const ShieldModal = ({ children, token }: Props) => {
     return token.decimals ? BigNumber(value || 0).shiftedBy(token.decimals) : BigNumber(0);
   }, [value, token.decimals]);
 
-  const transactionFee = useTransactionFee({ walletAddress: address });
+  const fees = useTransactionFees({ walletAddress: address, token });
+  const transactionFee = fees?.fee_details.total_cost_native;
 
   const maxAmountToShield = useMemo(() => {
     if (!isPresent(token.balance)) return token.balance;
diff --git a/src/domains/shielder/utils/useWithdraw.ts b/src/domains/shielder/utils/useWithdraw.ts
@@ -1,6 +1,6 @@
 import { erc20Token, nativeToken } from '@cardinal-cryptography/shielder-sdk';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useAccount, useSendTransaction } from 'wagmi';
+import { useAccount } from 'wagmi';
 
 import { Token } from 'src/domains/chains/types/misc';
 import getQueryKey from 'src/domains/misc/utils/getQueryKey';
@@ -9,7 +9,6 @@ import useShielderClient from './useShielderClient';
 
 export const useWithdraw = () => {
   const { data: shielderClient } = useShielderClient();
-  const { sendTransactionAsync } = useSendTransaction();
   const { address: walletAddress, chainId } = useAccount();
   const queryClient = useQueryClient();
 
@@ -18,37 +17,25 @@ export const useWithdraw = () => {
       token,
       amount,
       addressTo,
-      useManualWithdraw = false,
     }: {
       token: Token,
       amount: bigint,
       addressTo: `0x${string}`,
-      useManualWithdraw?: boolean,
     }) => {
       if (!shielderClient) throw new Error('Shielder client not available');
       if (!walletAddress) throw new Error('Wallet address not available');
 
       const sdkToken = token.isNative ? nativeToken() : erc20Token(token.address);
 
-      if (useManualWithdraw) {
-        await shielderClient.withdrawManual(
-          sdkToken,
-          amount,
-          addressTo,
-          async params => await sendTransactionAsync(params),
-          walletAddress
-        );
-      } else {
-        const fees = await shielderClient.getWithdrawFees();
+      const fees = await shielderClient.getWithdrawFees(sdkToken, 0n);
 
-        await shielderClient.withdraw(
-          sdkToken,
-          amount + fees.totalFee,
-          fees.totalFee,
-          addressTo,
-          0n
-        );
-      }
+      await shielderClient.withdraw(
+        sdkToken,
+        amount + fees.fee_details.total_cost_fee_token,
+        fees,
+        addressTo,
+        0n
+      );
     },
     onSuccess: (_, { token }) => {
       if (!walletAddress || !chainId) return;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export { default } from './arbitrum.ts';`
	`2`	`+export * from './arbitrum.ts';`