Fix rounding issue with max amounts (#79)

- Fix rounding issue with max amounts - Upgrade sdk to 3.1.0-beta4
hyperlane-xyz · Nov 13, 2023 · 039ba44 · 039ba44 · vercel · Nov 13, 2023
1 parent ea2479e
commit 039ba44
Show file tree

Hide file tree

Showing 7 changed files with 269 additions and 73 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hyperlane-xyz/warp-ui-template",
   "description": "A web app template for building Hyperlane Warp Route UIs",
-  "version": "3.1.0-beta3",
+  "version": "3.1.0-beta4",
   "author": "J M Rossy",
   "dependencies": {
     "@chakra-ui/next-js": "^2.1.5",
@@ -16,8 +16,8 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@headlessui/react": "^1.7.14",
-    "@hyperlane-xyz/sdk": "^3.1.0-beta3",
-    "@hyperlane-xyz/utils": "^3.1.0-beta3",
+    "@hyperlane-xyz/sdk": "^3.1.0-beta4",
+    "@hyperlane-xyz/utils": "^3.1.0-beta4",
     "@hyperlane-xyz/widgets": "^1.5.0",
     "@metamask/jazzicon": "https://github.com/jmrossy/jazzicon#7a8df28974b4e81129bfbe3cab76308b889032a6",
     "@rainbow-me/rainbowkit": "0.12.16",

diff --git a/src/components/toast/IgpDetailsToast.tsx b/src/components/toast/IgpDetailsToast.tsx
@@ -2,13 +2,13 @@ import { toast } from 'react-toastify';
 
 import { links } from '../../consts/links';
 
-export function toastIgpDetails(igpFee: number, tokenName = 'native token') {
+export function toastIgpDetails(igpFee: string, tokenName = 'native token') {
   toast.error(<IgpDetailsToast tokenName={tokenName} igpFee={igpFee} />, {
     autoClose: 5000,
   });
 }
 
-export function IgpDetailsToast({ tokenName, igpFee }) {
+export function IgpDetailsToast({ tokenName, igpFee }: { tokenName: string; igpFee: string }) {
   return (
     <div>
       Cross-chain transfers require a small fee of {igpFee} {tokenName} to fund delivery transaction

diff --git a/src/consts/values.ts b/src/consts/values.ts
@@ -1,6 +1,3 @@
-export const MIN_ROUNDED_VALUE = 0.00001;
-export const DISPLAY_DECIMALS = 4;
-export const STANDARD_TOKEN_DECIMALS = 18;
 export const SOL_ZERO_ADDRESS = '00000000000000000000000000000000000000000000';
 export const COSMOS_ZERO_ADDRESS = 'cosmos100000000000000000000000000000000000000';
 // Strangely, this is not included in any of the Solana packages

diff --git a/src/features/transfer/TransferTokenForm.tsx b/src/features/transfer/TransferTokenForm.tsx
@@ -295,7 +295,7 @@ function TokenBalance({
   balance?: string | null;
   decimals?: number;
 }) {
-  const value = !decimals ? fromWei(balance, decimals) : fromWeiRounded(balance, decimals, false);
+  const value = !decimals ? fromWei(balance, decimals) : fromWeiRounded(balance, decimals);
   return <div className="text-xs text-gray-500 text-right">{`${label}: ${value}`}</div>;
 }
 
@@ -420,7 +420,7 @@ function ReviewDetails({ visible, tokenRoutes }: { visible: boolean; tokenRoutes
     tokenRoutes,
   ) as WarpRoute;
   const isNft = tokenCaip19Id && isNonFungibleToken(tokenCaip19Id);
-  const sendValueWei = isNft ? amount.toString() : toWei(amount, route?.originDecimals).toFixed(0);
+  const sendValueWei = isNft ? amount.toString() : toWei(amount, route?.originDecimals);
   const originProtocol = getProtocolType(originCaip2Id);
   const originUnitName =
     originProtocol !== ProtocolType.Cosmos
@@ -534,7 +534,9 @@ function validateFormValues(
   const parsedAmount = tryParseAmount(amount);
   if (!parsedAmount || parsedAmount.lte(0))
     return { amount: isNft ? 'Invalid Token Id' : 'Invalid amount' };
-  const sendValue = isNft ? parsedAmount : toWei(parsedAmount, route?.originDecimals);
+  const sendValue = isNft
+    ? parsedAmount
+    : new BigNumber(toWei(parsedAmount, route?.originDecimals));
 
   if (!isNft) {
     // Validate balances for ERC20-like tokens

diff --git a/src/features/transfer/useTokenTransfer.ts b/src/features/transfer/useTokenTransfer.ts
@@ -124,7 +124,7 @@ async function executeTransfer({
     if (!tokenRoute) throw new Error('No token route found between chains');
 
     const isNft = isNonFungibleToken(tokenCaip19Id);
-    const weiAmountOrId = isNft ? amount : toWei(amount, tokenRoute.originDecimals).toFixed(0);
+    const weiAmountOrId = isNft ? amount : toWei(amount, tokenRoute.originDecimals);
     const activeAccountAddress = getAccountAddressForChain(
       originCaip2Id,
       activeAccounts.accounts[originProtocol],

diff --git a/src/features/transfer/utils.ts b/src/features/transfer/utils.ts
@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js';
 import { providers } from 'ethers';
 import { toast } from 'react-toastify';
 
@@ -33,7 +34,7 @@ export async function ensureSufficientCollateral(route: Route, weiAmount: string
     route.originDecimals,
     destinationBalance,
   );
-  if (destinationBalanceInOriginDecimals.lt(weiAmount)) {
+  if (new BigNumber(destinationBalanceInOriginDecimals).lt(weiAmount)) {
     toast.error('Collateral contract balance insufficient for transfer');
     throw new Error('Insufficient collateral balance');
   }