apply suggestions

Signed-off-by: bennett <[email protected]>

src/clients/BundleDataClient/utils/FillUtils.ts

@@ -100,14 +100,14 @@ export async function verifyFillRepayment(
     repaymentChainId = fill.destinationChainId;
   }
 
-  if (!fill.relayer.isValidEvmAddress()) {
+  if (!fill.relayer.isValidOn(repaymentChainId)) {
     // TODO: Handle case where fill was sent on non-EVM chain, in which case the following call would fail
     // or return something unexpected. We'd want to return undefined here.
     const fillTransaction = await destinationChainProvider.getTransaction(fill.transactionHash);
     const destinationRelayer = fillTransaction?.from;
     const replacementRelayer = toAddress(destinationRelayer, repaymentChainId, false);
     // Repayment chain is still an EVM chain, but the msg.sender is a bytes32 address, so the fill is invalid.
-    if (!isDefined(destinationRelayer) || !replacementRelayer.isValidEvmAddress()) {
+    if (!isDefined(destinationRelayer) || !replacementRelayer.isValidOn(repaymentChainId)) {
       return undefined;
     }
     if (!matchedDeposit.fromLiteChain) {

src/clients/HubPoolClient.ts

@@ -531,7 +531,7 @@ export class HubPoolClient extends BaseAbstractClient {
     );
   }
 
-  getTokenInfo(chainId: number | string, tokenAddress: string): L1Token | undefined {
+  getTokenInfo(chainId: number | string, tokenAddress: Address): L1Token | undefined {
     const deposit = { originChainId: parseInt(chainId.toString()), inputToken: tokenAddress };
     return this.getTokenInfoForDeposit(deposit);
   }
@@ -819,8 +819,8 @@ export class HubPoolClient extends BaseAbstractClient {
     let runningBalance = toBN(0);
     if (executedRootBundle) {
       const indexOfL1Token = executedRootBundle.l1Tokens
-        .map((_l1Token) => _l1Token.toAddress().toLowerCase())
-        .indexOf(l1Token.toAddress().toLowerCase());
+        .map((_l1Token) => _l1Token.toAddress())
+        .indexOf(l1Token.toAddress());
       runningBalance = executedRootBundle.runningBalances[indexOfL1Token];
     }
 

src/utils/AddressUtils.ts

@@ -125,6 +125,14 @@ export class Address {
     return isSvmAddress(this.toBase58());
   }
 
+  // Checks if the address is valid on the given chain ID.
+  isValidOn(chainId: number): boolean {
+    if (chainIsEvm(chainId)) {
+      return this.isValidEvmAddress();
+    }
+    return this.isValidSvmAddress();
+  }
+
   // Checks if the object is an address by looking at whether it has an Address constructor.
   static isAddress(obj: Record<string, unknown>): boolean {
     return obj instanceof Address;