Fix parseUnits usage

celer-network · Jul 2, 2024 · 9bb0ae7 · 9bb0ae7
1 parent bc87df0
commit 9bb0ae7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 29 deletions.
diff --git a/scripts/common.ts b/scripts/common.ts
@@ -1,9 +1,8 @@
+import { Numeric, Overrides, parseUnits } from 'ethers';
 import { ethers, getNamedAccounts } from 'hardhat';
 
 import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
 
-import type { Overrides } from 'ethers';
-
 export async function getDeployerSigner(): Promise<SignerWithAddress> {
   const deployer = (await getNamedAccounts())['deployer'];
   return await ethers.getSigner(deployer);
@@ -21,3 +20,9 @@ export async function getFeeOverrides(): Promise<Overrides> {
   }
   return { gasPrice: feeData.gasPrice || 0 };
 }
+
+export function getParseUnitsCallback(
+  unitNames: (string | Numeric)[]
+): (value: string, index: number, array: string[]) => bigint {
+  return (s, i) => parseUnits(s, unitNames[i]);
+}
diff --git a/scripts/sentinel/sentinel_set_limits.ts b/scripts/sentinel/sentinel_set_limits.ts
@@ -1,42 +1,31 @@
 import 'hardhat-deploy';
 
 import * as dotenv from 'dotenv';
-import { BigNumber } from 'ethers';
-
-import { parseUnits } from '@ethersproject/units';
 
 import { Sentinel__factory } from '../../typechain';
-import { getDeployerSigner, getFeeOverrides } from '../common';
-
-import type { ContractTransaction, Overrides } from '@ethersproject/contracts';
-import type { BigNumberish } from '@ethersproject/bignumber';
+import { TypedContractMethod } from '../../typechain/common';
+import { getDeployerSigner, getFeeOverrides, getParseUnitsCallback } from '../common';
 
+import type { AddressLike, BigNumberish, Overrides } from 'ethers';
 dotenv.config();
 
-function getParseUnitsCallback(
-  unitNames: BigNumberish[]
-): (value: string, index: number, array: string[]) => BigNumber {
-  return (s, i) => parseUnits(s, unitNames[i]);
-}
-
 async function setLimitIfSpecified(
   limitEnv: string,
   target: string,
   tokens: string[],
   decimals: string[],
   methodName: string,
-  method: (
-    _target: string,
-    _tokens: string[],
-    _amounts: BigNumberish[],
-    overrides?: Overrides & { from?: string }
-  ) => Promise<ContractTransaction>,
+  method: TypedContractMethod<
+    [_target: string, _tokens: AddressLike[], _amounts: BigNumberish[]],
+    [void],
+    'nonpayable'
+  >,
   feeOverrides: Overrides
 ): Promise<void> {
   if (limitEnv) {
     const limitStr = limitEnv.split(',');
     if (limitEnv.length > 0 && limitStr.length === decimals.length) {
-      const limits = limitStr.map(getParseUnitsCallback(decimals));
+      const limits = limitStr.map(getParseUnitsCallback(decimals.map(Number)));
       await (await method(target, tokens, limits, feeOverrides)).wait();
       console.log(
         methodName,

diff --git a/scripts/set_limits.ts b/scripts/set_limits.ts
@@ -1,20 +1,15 @@
 import 'hardhat-deploy';
 
 import * as dotenv from 'dotenv';
-import { parseUnits } from 'ethers';
 
 import { Bridge__factory, OriginalTokenVault__factory, PeggedTokenBridge__factory } from '../typechain';
 import { TypedContractMethod } from '../typechain/common';
-import { getDeployerSigner, getFeeOverrides } from './common';
+import { getDeployerSigner, getFeeOverrides, getParseUnitsCallback } from './common';
 
 import type { AddressLike, BigNumberish, Overrides } from 'ethers';
 
 dotenv.config();
 
-function getParseUnitsCallback(unitNames: string[]): (value: string, index: number, array: string[]) => bigint {
-  return (s, i) => parseUnits(s, unitNames[i]);
-}
-
 async function setLimitIfSpecified(
   limitEnv: string,
   tokens: string[],
@@ -26,7 +21,7 @@ async function setLimitIfSpecified(
   if (limitEnv) {
     const limitStr = limitEnv.split(',');
     if (limitEnv.length > 0 && limitStr.length === decimals.length) {
-      const limits = limitStr.map(getParseUnitsCallback(decimals));
+      const limits = limitStr.map(getParseUnitsCallback(decimals.map(Number)));
       await (await method(tokens, limits, feeOverrides)).wait();
       console.log(
         methodName,