Better typing of preconditions

Author: corbanbrook

packages/wallet/core/src/preconditions/codec.ts

@@ -120,58 +120,68 @@ export function decodePrecondition(p: IntentPrecondition): Precondition | undefi
   }
 }
 
+type PreconditionData = {
+  address: Address.Checksummed
+  token: Address.Checksummed
+  operator: Address.Checksummed
+  min: string
+  max: string
+  tokenId: string
+  owned: boolean
+}
+
 export function encodePrecondition(p: Precondition): string {
-  const data: any = {}
+  const data: Partial<PreconditionData> = {}
 
   switch (p.type()) {
     case 'native-balance': {
       const native = p as NativeBalancePrecondition
-      data.address = native.address.toString()
+      data.address = native.address
       if (native.min !== undefined) data.min = native.min.toString()
       if (native.max !== undefined) data.max = native.max.toString()
       break
     }
 
     case 'erc20-balance': {
       const erc20 = p as Erc20BalancePrecondition
-      data.address = erc20.address.toString()
-      data.token = erc20.token.toString()
+      data.address = erc20.address
+      data.token = erc20.token
       if (erc20.min !== undefined) data.min = erc20.min.toString()
       if (erc20.max !== undefined) data.max = erc20.max.toString()
       break
     }
 
     case 'erc20-approval': {
       const erc20 = p as Erc20ApprovalPrecondition
-      data.address = erc20.address.toString()
-      data.token = erc20.token.toString()
-      data.operator = erc20.operator.toString()
+      data.address = erc20.address
+      data.token = erc20.token
+      data.operator = erc20.operator
       data.min = erc20.min.toString()
       break
     }
 
     case 'erc721-ownership': {
       const erc721 = p as Erc721OwnershipPrecondition
-      data.address = erc721.address.toString()
-      data.token = erc721.token.toString()
+      data.address = erc721.address
+      data.token = erc721.token
       data.tokenId = erc721.tokenId.toString()
       if (erc721.owned !== undefined) data.owned = erc721.owned
       break
     }
 
     case 'erc721-approval': {
       const erc721 = p as Erc721ApprovalPrecondition
-      data.address = erc721.address.toString()
-      data.token = erc721.token.toString()
+      data.address = erc721.address
+      data.token = erc721.token
       data.tokenId = erc721.tokenId.toString()
-      data.operator = erc721.operator.toString()
+      data.operator = erc721.operator
       break
     }
 
     case 'erc1155-balance': {
       const erc1155 = p as Erc1155BalancePrecondition
-      data.address = erc1155.address.toString()
-      data.token = erc1155.token.toString()
+      data.address = erc1155.address
+      data.token = erc1155.token
       data.tokenId = erc1155.tokenId.toString()
       if (erc1155.min !== undefined) data.min = erc1155.min.toString()
       if (erc1155.max !== undefined) data.max = erc1155.max.toString()
@@ -180,10 +190,10 @@ export function encodePrecondition(p: Precondition): string {
 
     case 'erc1155-approval': {
       const erc1155 = p as Erc1155ApprovalPrecondition
-      data.address = erc1155.address.toString()
-      data.token = erc1155.token.toString()
+      data.address = erc1155.address
+      data.token = erc1155.token
       data.tokenId = erc1155.tokenId.toString()
-      data.operator = erc1155.operator.toString()
+      data.operator = erc1155.operator
       data.min = erc1155.min.toString()
       break
     }

packages/wallet/core/src/relayer/standard/local.ts

@@ -3,7 +3,16 @@ import { EIP1193Provider } from 'mipd'
 import { AbiFunction, Bytes, Hex, TransactionReceipt } from 'ox'
 import { FeeOption, FeeQuote, OperationStatus, Relayer } from '../relayer.js'
 import { IntentPrecondition } from './rpc/relayer.gen.js'
-import { decodePrecondition } from '../../preconditions/index.js'
+import {
+  decodePrecondition,
+  Erc1155ApprovalPrecondition,
+  Erc1155BalancePrecondition,
+  Erc20ApprovalPrecondition,
+  Erc20BalancePrecondition,
+  Erc721ApprovalPrecondition,
+  Erc721OwnershipPrecondition,
+  NativeBalancePrecondition,
+} from '../../preconditions/index.js'
 import {
   erc20BalanceOf,
   erc20Allowance,
@@ -171,8 +180,8 @@ export class LocalRelayer implements Relayer {
 
     switch (decoded.type()) {
       case 'native-balance': {
-        const native = decoded as any
-        const balance = await this.provider.getBalance(native.address.toString())
+        const native = decoded as NativeBalancePrecondition
+        const balance = await this.provider.getBalance(native.address)
         if (native.min !== undefined && balance < native.min) {
           return false
         }
@@ -183,10 +192,10 @@ export class LocalRelayer implements Relayer {
       }
 
       case 'erc20-balance': {
-        const erc20 = decoded as any
-        const data = AbiFunction.encodeData(erc20BalanceOf, [erc20.address.toString()])
+        const erc20 = decoded as Erc20BalancePrecondition
+        const data = AbiFunction.encodeData(erc20BalanceOf, [erc20.address])
         const result = await this.provider.call({
-          to: erc20.token.toString(),
+          to: erc20.token,
           data,
         })
         const balance = BigInt(result)
@@ -200,21 +209,21 @@ export class LocalRelayer implements Relayer {
       }
 
       case 'erc20-approval': {
-        const erc20 = decoded as any
-        const data = AbiFunction.encodeData(erc20Allowance, [erc20.address.toString(), erc20.operator.toString()])
+        const erc20 = decoded as Erc20ApprovalPrecondition
+        const data = AbiFunction.encodeData(erc20Allowance, [erc20.address, erc20.operator])
         const result = await this.provider.call({
-          to: erc20.token.toString(),
+          to: erc20.token,
           data,
         })
         const allowance = BigInt(result)
         return allowance >= erc20.min
       }
 
       case 'erc721-ownership': {
-        const erc721 = decoded as any
+        const erc721 = decoded as Erc721OwnershipPrecondition
         const data = AbiFunction.encodeData(erc721OwnerOf, [erc721.tokenId])
         const result = await this.provider.call({
-          to: erc721.token.toString(),
+          to: erc721.token,
           data,
         })
         const owner = Address.checksum(`0x${result.slice(26)}`)
@@ -223,21 +232,21 @@ export class LocalRelayer implements Relayer {
       }
 
       case 'erc721-approval': {
-        const erc721 = decoded as any
+        const erc721 = decoded as Erc721ApprovalPrecondition
         const data = AbiFunction.encodeData(erc721GetApproved, [erc721.tokenId])
         const result = await this.provider.call({
-          to: erc721.token.toString(),
+          to: erc721.token,
           data,
         })
         const approved = Address.checksum(`0x${result.slice(26)}`)
         return Address.isEqual(approved, erc721.operator)
       }
 
       case 'erc1155-balance': {
-        const erc1155 = decoded as any
-        const data = AbiFunction.encodeData(erc1155BalanceOf, [erc1155.address.toString(), erc1155.tokenId])
+        const erc1155 = decoded as Erc1155BalancePrecondition
+        const data = AbiFunction.encodeData(erc1155BalanceOf, [erc1155.address, erc1155.tokenId])
         const result = await this.provider.call({
-          to: erc1155.token.toString(),
+          to: erc1155.token,
           data,
         })
         const balance = BigInt(result)
@@ -251,13 +260,10 @@ export class LocalRelayer implements Relayer {
       }
 
       case 'erc1155-approval': {
-        const erc1155 = decoded as any
-        const data = AbiFunction.encodeData(erc1155IsApprovedForAll, [
-          erc1155.address.toString(),
-          erc1155.operator.toString(),
-        ])
+        const erc1155 = decoded as Erc1155ApprovalPrecondition
+        const data = AbiFunction.encodeData(erc1155IsApprovedForAll, [erc1155.address, erc1155.operator])
         const result = await this.provider.call({
-          to: erc1155.token.toString(),
+          to: erc1155.token,
           data,
         })
         return BigInt(result) === 1n