fix

Author: attente

packages/wallet/core/src/envelope.ts

@@ -1,4 +1,4 @@
-import { Config, Payload, Signature } from '@0xsequence/wallet-primitives'
+import { Address, Config, Payload, Signature } from '@0xsequence/wallet-primitives'
 import { Hex } from 'ox'
 
 export type Envelope<T extends Payload.Payload> = {

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

@@ -1,3 +1,4 @@
+import { Address } from '@0xsequence/wallet-primitives'
 import {
   Precondition,
   NativeBalancePrecondition,
@@ -40,52 +41,52 @@ export function decodePrecondition(p: IntentPrecondition): Precondition | undefi
     switch (p.type) {
       case 'native-balance':
         precondition = new NativeBalancePrecondition(
-          Address.from(data.address),
+          Address.checksum(data.address),
           data.min ? BigInt(data.min) : undefined,
           data.max ? BigInt(data.max) : undefined,
         )
         break
 
       case 'erc20-balance':
         precondition = new Erc20BalancePrecondition(
-          Address.from(data.address),
-          Address.from(data.token),
+          Address.checksum(data.address),
+          Address.checksum(data.token),
           data.min ? BigInt(data.min) : undefined,
           data.max ? BigInt(data.max) : undefined,
         )
         break
 
       case 'erc20-approval':
         precondition = new Erc20ApprovalPrecondition(
-          Address.from(data.address),
-          Address.from(data.token),
-          Address.from(data.operator),
+          Address.checksum(data.address),
+          Address.checksum(data.token),
+          Address.checksum(data.operator),
           BigInt(data.min),
         )
         break
 
       case 'erc721-ownership':
         precondition = new Erc721OwnershipPrecondition(
-          Address.from(data.address),
-          Address.from(data.token),
+          Address.checksum(data.address),
+          Address.checksum(data.token),
           BigInt(data.tokenId),
           data.owned,
         )
         break
 
       case 'erc721-approval':
         precondition = new Erc721ApprovalPrecondition(
-          Address.from(data.address),
-          Address.from(data.token),
+          Address.checksum(data.address),
+          Address.checksum(data.token),
           BigInt(data.tokenId),
-          Address.from(data.operator),
+          Address.checksum(data.operator),
         )
         break
 
       case 'erc1155-balance':
         precondition = new Erc1155BalancePrecondition(
-          Address.from(data.address),
-          Address.from(data.token),
+          Address.checksum(data.address),
+          Address.checksum(data.token),
           BigInt(data.tokenId),
           data.min ? BigInt(data.min) : undefined,
           data.max ? BigInt(data.max) : undefined,
@@ -94,10 +95,10 @@ export function decodePrecondition(p: IntentPrecondition): Precondition | undefi
 
       case 'erc1155-approval':
         precondition = new Erc1155ApprovalPrecondition(
-          Address.from(data.address),
-          Address.from(data.token),
+          Address.checksum(data.address),
+          Address.checksum(data.token),
           BigInt(data.tokenId),
-          Address.from(data.operator),
+          Address.checksum(data.operator),
           BigInt(data.min),
         )
         break

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

@@ -1,3 +1,5 @@
+import { Address } from '@0xsequence/wallet-primitives'
+
 export interface Precondition {
   type(): string
   isValid(): Error | undefined

packages/wallet/core/src/relayer/bundler.ts

@@ -1,4 +1,4 @@
-import { Payload } from '@0xsequence/wallet-primitives'
+import { Address, Payload } from '@0xsequence/wallet-primitives'
 import { Hex } from 'ox'
 import { UserOperation } from 'ox/erc4337'
 import { OperationStatus } from './relayer.js'

packages/wallet/core/src/relayer/bundlers/pimlico.ts

@@ -1,4 +1,4 @@
-import { Payload } from '@0xsequence/wallet-primitives'
+import { Address, Payload } from '@0xsequence/wallet-primitives'
 import { Bundler } from '../bundler.js'
 import { Provider, Hex, RpcTransport } from 'ox'
 import { UserOperation } from 'ox/erc4337'

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

@@ -1,4 +1,4 @@
-import { Payload, Precondition } from '@0xsequence/wallet-primitives'
+import { Address, Payload, Precondition } from '@0xsequence/wallet-primitives'
 import { Hex } from 'ox'
 import { FeeToken, GetMetaTxnReceiptReturn } from './standard/rpc/index.js'
 

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

@@ -2,7 +2,7 @@ import { createStore, EIP6963ProviderInfo, EIP6963ProviderDetail } from 'mipd'
 import { EIP1193ProviderAdapter, LocalRelayer } from './local.js'
 import { FeeOption, FeeQuote, OperationStatus, Relayer } from '../relayer.js'
 import { Hex } from 'ox'
-import { Payload } from '@0xsequence/wallet-primitives'
+import { Address, Payload } from '@0xsequence/wallet-primitives'
 import { IntentPrecondition } from './rpc/relayer.gen.js'
 
 export class EIP6963Relayer implements Relayer {

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

@@ -1,4 +1,4 @@
-import { Constants, Payload } from '@0xsequence/wallet-primitives'
+import { Address, Constants, Payload } from '@0xsequence/wallet-primitives'
 import { EIP1193Provider } from 'mipd'
 import { AbiFunction, Bytes, Hex, TransactionReceipt } from 'ox'
 import { FeeOption, FeeQuote, OperationStatus, Relayer } from '../relayer.js'
@@ -217,8 +217,8 @@ export class LocalRelayer implements Relayer {
           to: erc721.token.toString(),
           data,
         })
-        const owner = '0x' + result.slice(26)
-        const isOwner = owner.toLowerCase() === erc721.address.toString().toLowerCase()
+        const owner = Address.checksum(`0x${result.slice(26)}`)
+        const isOwner = Address.isEqual(owner, erc721.address)
         return erc721.owned === undefined ? isOwner : erc721.owned === isOwner
       }
 
@@ -229,8 +229,8 @@ export class LocalRelayer implements Relayer {
           to: erc721.token.toString(),
           data,
         })
-        const approved = '0x' + result.slice(26)
-        return approved.toLowerCase() === erc721.operator.toString().toLowerCase()
+        const approved = Address.checksum(`0x${result.slice(26)}`)
+        return Address.isEqual(approved, erc721.operator)
       }
 
       case 'erc1155-balance': {

packages/wallet/core/src/relayer/standard/pk-relayer.ts

@@ -1,4 +1,4 @@
-import { Payload, Precondition } from '@0xsequence/wallet-primitives'
+import { Address, Payload, Precondition } from '@0xsequence/wallet-primitives'
 import { Hex, Provider, Secp256k1, TransactionEnvelopeEip1559, TransactionReceipt } from 'ox'
 import { LocalRelayer } from './local.js'
 import { FeeOption, FeeQuote, OperationStatus, Relayer } from '../relayer.js'

packages/wallet/core/src/relayer/standard/rpc/index.ts

@@ -7,7 +7,7 @@ import {
 } from './relayer.gen.js'
 import { FeeOption, FeeQuote, OperationStatus, Relayer } from '../../relayer.js'
 import { Hex, Bytes, AbiFunction } from 'ox'
-import { Constants, Payload } from '@0xsequence/wallet-primitives'
+import { Address, Constants, Payload } from '@0xsequence/wallet-primitives'
 import { ETHTxnStatus, FeeToken as RpcFeeToken } from './relayer.gen.js'
 import { decodePrecondition } from '../../../preconditions/index.js'
 import {
@@ -83,13 +83,12 @@ export class RpcRelayer implements Relayer {
 
       const quote: FeeQuote | undefined = result.quote ? { _tag: 'FeeQuote', _quote: result.quote } : undefined
       const options = result.options.map((option) => {
-        Address.assert(option.to)
         return {
           token: {
             ...option.token,
             contractAddress: this.mapRpcFeeTokenToAddress(option.token),
           },
-          to: option.to,
+          to: Address.checksum(option.to),
           value: option.value,
           gasLimit: option.gasLimit,
         }
@@ -290,8 +289,8 @@ export class RpcRelayer implements Relayer {
           if (resultHex === undefined) {
             throw new Error('no response for erc-721 ownership query')
           }
-          const owner = resultHex.slice(-40)
-          const isOwner = owner.toLowerCase() === erc721.address.toString().slice(2).toLowerCase()
+          const owner = Address.checksum(`0x${resultHex.slice(-40)}`)
+          const isOwner = Address.isEqual(owner, erc721.address)
           const expectedOwnership = erc721.owned !== undefined ? erc721.owned : true
           return isOwner === expectedOwnership
         } catch (error) {
@@ -309,8 +308,8 @@ export class RpcRelayer implements Relayer {
           if (resultHex === undefined) {
             throw new Error('no response for erc-721 approval query')
           }
-          const approved = resultHex.slice(-40)
-          return approved.toLowerCase() === erc721.operator.toString().slice(2).toLowerCase()
+          const approved = Address.checksum(resultHex.slice(-40))
+          return Address.isEqual(approved, erc721.operator)
         } catch (error) {
           console.error('Error checking ERC721 approval:', error)
           return false
@@ -368,7 +367,7 @@ export class RpcRelayer implements Relayer {
 
   private mapRpcFeeTokenToAddress(rpcToken: RpcFeeToken): Address.Checksummed {
     if (rpcToken.type === FeeTokenType.ERC20_TOKEN && rpcToken.contractAddress) {
-      return Address.from(rpcToken.contractAddress)
+      return Address.checksum(rpcToken.contractAddress)
     }
     return Constants.ZeroAddress // Default to zero address for native token or unsupported types
   }