save

Author: Orelsanpls

src/lib/UXDController.ts

@@ -54,17 +54,19 @@ export class UXDController {
     amount,
     minAmountOut,
     signer,
+    decimals,
     collateral,
     receiver,
   }: {
     amount: number;
     minAmountOut: number;
     signer: Signer;
+    decimals: number;
     collateral?: Address;
     receiver?: Address;
   }): Promise<ContractTransaction> {
-    const nativeAmount = utils.parseEther(amount.toString());
-    const minNativeAmountOut = utils.parseEther(minAmountOut.toString());
+    const nativeAmount = utils.parseUnits(amount.toString(), decimals);
+    const minNativeAmountOut = utils.parseUnits(minAmountOut.toString(), decimals);
 
     if (collateral) {
       return this.mintWithERC20({
@@ -138,17 +140,19 @@ export class UXDController {
     amount,
     minAmountOut,
     signer,
+    decimals,
     collateral,
     receiver,
   }: {
     amount: number;
     minAmountOut: number;
     signer: Signer;
+    decimals: number;
     collateral?: Address;
     receiver?: Address;
   }): Promise<ContractTransaction> {
-    const nativeAmount = utils.parseEther(amount.toString());
-    const minNativeAmountOut = utils.parseEther(minAmountOut.toString());
+    const nativeAmount = utils.parseUnits(amount.toString(), decimals);
+    const minNativeAmountOut = utils.parseUnits(minAmountOut.toString(), decimals);
 
     if (collateral) {
       return this.redeemForERC20({
@@ -223,12 +227,14 @@ export class UXDController {
     spender,
     amount,
     signer,
+    decimals,
   }: {
     spender: Address;
     amount: number;
     signer: Signer;
+    decimals: number;
   }): Promise<ContractTransaction> {
-    const uxdAmount = utils.parseEther(amount.toString());
+    const uxdAmount = utils.parseUnits(amount.toString(), decimals);
 
     return this.uxdTokenContract.connect(signer).approve(spender, uxdAmount);
   }
@@ -239,13 +245,15 @@ export class UXDController {
     spender,
     amount,
     signer,
+    decimals,
   }: {
     token: Address;
     spender: Address;
     amount: number;
     signer: Signer;
+    decimals: number;
   }): Promise<ContractTransaction> {
-    const nativeAmount = utils.parseEther(amount.toString());
+    const nativeAmount = utils.parseUnits(amount.toString(), decimals);
 
     return ERC20__factory.connect(token, signer)
       .connect(signer)
@@ -273,15 +281,17 @@ export class UXDController {
   public async getTokenBalance({
     token,
     account,
+    decimals,
   }: {
     token: Address;
     account: Address;
+    decimals: number;
   }): Promise<number> {
     const balance = await ERC20__factory.connect(
       token,
       this.provider
     ).balanceOf(account);
 
-    return parseInt(ethers.utils.formatEther(balance));
+    return parseInt(ethers.utils.formatUnits(balance, decimals));
   }
 }