Fixing lint and type errors for relayer package

Author: corbanbrook

packages/services/relayer/src/preconditions/codec.ts

@@ -36,6 +36,11 @@ export function decodePrecondition(p: TransactionPrecondition): Precondition | u
     return undefined
   }
 
+  if (typeof p.minAmount !== 'bigint') {
+    console.warn(`Failed to decode precondition: minAmount must be a bigint`)
+    return undefined
+  }
+
   let precondition: Precondition | undefined
 
   try {
@@ -118,73 +123,92 @@ export function decodePrecondition(p: TransactionPrecondition): Precondition | u
 }
 
 export function encodePrecondition(p: Precondition): string {
-  const data: any = {}
-
   switch (p.type()) {
     case 'native-balance': {
       const native = p as NativeBalancePrecondition
-      data.address = native.address.toString()
-      if (native.min !== undefined) data.min = native.min.toString()
-      if (native.max !== undefined) data.max = native.max.toString()
-      break
+      const data = {
+        address: native.address.toString(),
+        ...(native.min !== undefined && { min: native.min.toString() }),
+        ...(native.max !== undefined && { max: native.max.toString() }),
+      }
+
+      return JSON.stringify(data)
     }
 
     case 'erc20-balance': {
       const erc20 = p as Erc20BalancePrecondition
-      data.address = erc20.address.toString()
-      data.token = erc20.token.toString()
-      if (erc20.min !== undefined) data.min = erc20.min.toString()
-      if (erc20.max !== undefined) data.max = erc20.max.toString()
-      break
+      const data = {
+        address: erc20.address.toString(),
+        token: erc20.token.toString(),
+        ...(erc20.min !== undefined && { min: erc20.min.toString() }),
+        ...(erc20.max !== undefined && { max: erc20.max.toString() }),
+      }
+
+      return JSON.stringify(data)
     }
 
     case 'erc20-approval': {
       const erc20 = p as Erc20ApprovalPrecondition
-      data.address = erc20.address.toString()
-      data.token = erc20.token.toString()
-      data.operator = erc20.operator.toString()
-      data.min = erc20.min.toString()
-      break
+      const data = {
+        address: erc20.address.toString(),
+        token: erc20.token.toString(),
+        operator: erc20.operator.toString(),
+        min: erc20.min.toString(),
+      }
+
+      return JSON.stringify(data)
     }
 
     case 'erc721-ownership': {
       const erc721 = p as Erc721OwnershipPrecondition
-      data.address = erc721.address.toString()
-      data.token = erc721.token.toString()
-      data.tokenId = erc721.tokenId.toString()
-      if (erc721.owned !== undefined) data.owned = erc721.owned
-      break
+      const data = {
+        address: erc721.address.toString(),
+        token: erc721.token.toString(),
+        tokenId: erc721.tokenId.toString(),
+        ...(erc721.owned !== undefined && { owned: erc721.owned }),
+      }
+
+      return JSON.stringify(data)
     }
 
     case 'erc721-approval': {
       const erc721 = p as Erc721ApprovalPrecondition
-      data.address = erc721.address.toString()
-      data.token = erc721.token.toString()
-      data.tokenId = erc721.tokenId.toString()
-      data.operator = erc721.operator.toString()
-      break
+      const data = {
+        address: erc721.address.toString(),
+        token: erc721.token.toString(),
+        tokenId: erc721.tokenId.toString(),
+        operator: erc721.operator.toString(),
+      }
+
+      return JSON.stringify(data)
     }
 
     case 'erc1155-balance': {
       const erc1155 = p as Erc1155BalancePrecondition
-      data.address = erc1155.address.toString()
-      data.token = erc1155.token.toString()
-      data.tokenId = erc1155.tokenId.toString()
-      if (erc1155.min !== undefined) data.min = erc1155.min.toString()
-      if (erc1155.max !== undefined) data.max = erc1155.max.toString()
-      break
+      const data = {
+        address: erc1155.address.toString(),
+        token: erc1155.token.toString(),
+        tokenId: erc1155.tokenId.toString(),
+        ...(erc1155.min !== undefined && { min: erc1155.min.toString() }),
+        ...(erc1155.max !== undefined && { max: erc1155.max.toString() }),
+      }
+
+      return JSON.stringify(data)
     }
 
     case 'erc1155-approval': {
       const erc1155 = p as Erc1155ApprovalPrecondition
-      data.address = erc1155.address.toString()
-      data.token = erc1155.token.toString()
-      data.tokenId = erc1155.tokenId.toString()
-      data.operator = erc1155.operator.toString()
-      data.min = erc1155.min.toString()
-      break
+      const data = {
+        address: erc1155.address.toString(),
+        token: erc1155.token.toString(),
+        tokenId: erc1155.tokenId.toString(),
+        operator: erc1155.operator.toString(),
+        min: erc1155.min.toString(),
+      }
+
+      return JSON.stringify(data)
     }
   }
 
-  return JSON.stringify(data)
+  return JSON.stringify({})
 }

packages/services/relayer/src/relayer/relayer.ts

@@ -27,8 +27,10 @@ export interface Relayer {
   checkPrecondition(precondition: Precondition.Precondition): Promise<boolean>
 }
 
-export function isRelayer(relayer: any): relayer is Relayer {
+export function isRelayer(relayer: unknown): relayer is Relayer {
   return (
+    typeof relayer === 'object' &&
+    relayer !== null &&
     'isAvailable' in relayer &&
     'feeOptions' in relayer &&
     'relay' in relayer &&

packages/services/relayer/src/relayer/rpc-relayer/index.ts

@@ -10,7 +10,16 @@ import {
 import { Address, Hex, AbiFunction } from 'ox'
 import { Constants, Payload, Network } from '@0xsequence/wallet-primitives'
 import { FeeOption, FeeQuote, OperationStatus, Relayer } from '../index.js'
-import { decodePrecondition } from '../../preconditions/index.js'
+import {
+  decodePrecondition,
+  Erc1155ApprovalPrecondition,
+  Erc1155BalancePrecondition,
+  Erc20ApprovalPrecondition,
+  Erc20BalancePrecondition,
+  Erc721ApprovalPrecondition,
+  Erc721OwnershipPrecondition,
+  NativeBalancePrecondition,
+} from '../../preconditions/index.js'
 import {
   erc20BalanceOf,
   erc20Allowance,
@@ -69,7 +78,9 @@ export const getChain = (chainId: number): Chain => {
   }
 
   // Fall back to viem's built-in chains
-  const viemChain = Object.values(chains).find((c: any) => typeof c === 'object' && 'id' in c && c.id === chainId)
+  const viemChain = Object.values(chains).find(
+    (c: unknown) => typeof c === 'object' && c !== null && 'id' in c && c.id === chainId,
+  )
   if (viemChain) {
     return viemChain as Chain
   }
@@ -78,7 +89,7 @@ export const getChain = (chainId: number): Chain => {
 }
 
 export class RpcRelayer implements Relayer {
-  public readonly kind: 'relayer' = 'relayer'
+  public readonly kind = 'relayer'
   public readonly type = 'rpc'
   public readonly id: string
   public readonly chainId: number
@@ -239,7 +250,7 @@ export class RpcRelayer implements Relayer {
     return { opHash: `0x${result.txnHash}` }
   }
 
-  async status(opHash: Hex.Hex, chainId: number): Promise<OperationStatus> {
+  async status(opHash: Hex.Hex, _chainId: number): Promise<OperationStatus> {
     try {
       const cleanedOpHash = opHash.startsWith('0x') ? opHash.substring(2) : opHash
       const result = await this.client.getMetaTxnReceipt({ metaTxID: cleanedOpHash })
@@ -291,9 +302,9 @@ export class RpcRelayer implements Relayer {
 
     switch (decoded.type()) {
       case 'native-balance': {
-        const native = decoded as any
+        const native = decoded as NativeBalancePrecondition
         try {
-          const balance = await this.provider.getBalance({ address: native.address.toString() as `0x${string}` })
+          const balance = await this.provider.getBalance({ address: native.address })
           const minWei = native.min !== undefined ? BigInt(native.min) : undefined
           const maxWei = native.max !== undefined ? BigInt(native.max) : undefined
 
@@ -316,9 +327,9 @@ export class RpcRelayer implements Relayer {
       }
 
       case 'erc20-balance': {
-        const erc20 = decoded as any
+        const erc20 = decoded as Erc20BalancePrecondition
         try {
-          const data = AbiFunction.encodeData(erc20BalanceOf, [erc20.address.toString()])
+          const data = AbiFunction.encodeData(erc20BalanceOf, [erc20.address])
           const result = await this.provider.call({
             to: erc20.token.toString() as `0x${string}`,
             data: data as `0x${string}`,
@@ -345,9 +356,9 @@ export class RpcRelayer implements Relayer {
       }
 
       case 'erc20-approval': {
-        const erc20 = decoded as any
+        const erc20 = decoded as Erc20ApprovalPrecondition
         try {
-          const data = AbiFunction.encodeData(erc20Allowance, [erc20.address.toString(), erc20.operator.toString()])
+          const data = AbiFunction.encodeData(erc20Allowance, [erc20.address, erc20.operator])
           const result = await this.provider.call({
             to: erc20.token.toString() as `0x${string}`,
             data: data as `0x${string}`,
@@ -362,12 +373,12 @@ export class RpcRelayer implements Relayer {
       }
 
       case 'erc721-ownership': {
-        const erc721 = decoded as any
+        const erc721 = decoded as Erc721OwnershipPrecondition
         try {
           const data = AbiFunction.encodeData(erc721OwnerOf, [erc721.tokenId])
           const result = await this.provider.call({
-            to: erc721.token.toString() as `0x${string}`,
-            data: data as `0x${string}`,
+            to: erc721.token,
+            data: data,
           })
           const resultHex = result.toString() as `0x${string}`
           const owner = resultHex.slice(-40)
@@ -381,7 +392,7 @@ export class RpcRelayer implements Relayer {
       }
 
       case 'erc721-approval': {
-        const erc721 = decoded as any
+        const erc721 = decoded as Erc721ApprovalPrecondition
         try {
           const data = AbiFunction.encodeData(erc721GetApproved, [erc721.tokenId])
           const result = await this.provider.call({
@@ -398,9 +409,9 @@ export class RpcRelayer implements Relayer {
       }
 
       case 'erc1155-balance': {
-        const erc1155 = decoded as any
+        const erc1155 = decoded as Erc1155BalancePrecondition
         try {
-          const data = AbiFunction.encodeData(erc1155BalanceOf, [erc1155.address.toString(), erc1155.tokenId])
+          const data = AbiFunction.encodeData(erc1155BalanceOf, [erc1155.address, erc1155.tokenId])
           const result = await this.provider.call({
             to: erc1155.token.toString() as `0x${string}`,
             data: data as `0x${string}`,
@@ -427,15 +438,12 @@ export class RpcRelayer implements Relayer {
       }
 
       case 'erc1155-approval': {
-        const erc1155 = decoded as any
+        const erc1155 = decoded as Erc1155ApprovalPrecondition
         try {
-          const data = AbiFunction.encodeData(erc1155IsApprovedForAll, [
-            erc1155.address.toString(),
-            erc1155.operator.toString(),
-          ])
+          const data = AbiFunction.encodeData(erc1155IsApprovedForAll, [erc1155.address, erc1155.operator])
           const result = await this.provider.call({
-            to: erc1155.token.toString() as `0x${string}`,
-            data: data as `0x${string}`,
+            to: erc1155.token,
+            data: data,
           })
           return BigInt(result.toString()) === 1n
         } catch (error) {

packages/services/relayer/src/relayer/standard/eip6963.ts

@@ -6,7 +6,7 @@ import { Payload } from '@0xsequence/wallet-primitives'
 import { FeeToken, TransactionPrecondition } from '../rpc-relayer/relayer.gen.js'
 
 export class EIP6963Relayer implements Relayer {
-  public readonly kind: 'relayer' = 'relayer'
+  public readonly kind = 'relayer'
   public readonly type = 'eip6963'
   public readonly id: string
   public readonly info: EIP6963ProviderInfo
@@ -59,7 +59,7 @@ export function getEIP6963Store() {
   return store
 }
 
-let relayers: Map<string, EIP6963Relayer> = new Map()
+const relayers: Map<string, EIP6963Relayer> = new Map()
 
 export function getRelayers(): EIP6963Relayer[] {
   const store = getEIP6963Store()