Using Address.isEqual

Author: corbanbrook

packages/wallet/core/src/wallet.ts

@@ -338,12 +338,11 @@ export class Wallet {
     // is not "dangerous", aka it does not have any delegate calls
     // or calls to the wallet contract itself
     if (!options?.unsafe) {
-      const lowerCaseSelf = this.address.toLowerCase()
       for (const call of calls) {
         if (call.delegateCall) {
           throw new Error('delegate calls are not allowed in safe mode')
         }
-        if (call.to.toLowerCase() === lowerCaseSelf) {
+        if (Address.isEqual(call.to, this.address)) {
           throw new Error('calls to the wallet contract itself are not allowed in safe mode')
         }
       }
@@ -452,12 +451,11 @@ export class Wallet {
     // is not "dangerous", aka it does not have any delegate calls
     // or calls to the wallet contract itself
     if (!options?.unsafe) {
-      const lowerCaseSelf = this.address.toLowerCase()
       for (const call of calls) {
         if (call.delegateCall) {
           throw new Error('delegate calls are not allowed in safe mode')
         }
-        if (call.to.toLowerCase() === lowerCaseSelf) {
+        if (Address.isEqual(call.to, this.address)) {
           throw new Error('calls to the wallet contract itself are not allowed in safe mode')
         }
       }

packages/wallet/wdk/src/identity/signer.ts

@@ -30,7 +30,7 @@ export class IdentitySigner implements Signers.Signer {
     readonly authKey: AuthKey,
   ) {}
 
-  get address(): `0x${string}` {
+  get address(): Address.Address {
     if (!Address.validate(this.authKey.identitySigner)) {
       throw new Error('No signer address found')
     }

packages/wallet/wdk/src/sequence/handlers/mnemonic.ts

@@ -66,7 +66,7 @@ export class MnemonicHandler implements Handler {
               return reject('invalid-mnemonic')
             }
 
-            if (signer.address.toLowerCase() !== address.toLowerCase()) {
+            if (!Address.isEqual(signer.address, address)) {
               return reject('wrong-mnemonic')
             }
 

packages/wallet/wdk/src/sequence/recovery.ts

@@ -27,7 +27,7 @@ export class Recovery {
     transformer: (leaves: Extensions.Recovery.RecoveryLeaf[]) => Extensions.Recovery.RecoveryLeaf[],
   ) {
     const ext = this.shared.sequence.extensions.recovery
-    const idx = modules.findIndex((m) => m.address === ext)
+    const idx = modules.findIndex((m) => Address.isEqual(m.address, ext))
     if (idx === -1) {
       return
     }

packages/wallet/wdk/src/sequence/wallets.ts

@@ -765,7 +765,7 @@ export class Wallets {
     const nextDevicesTopology = buildCappedTree([
       ...Config.getSigners(devicesTopology)
         .signers.filter(
-          (x) => x !== '0x0000000000000000000000000000000000000000' && x.toLowerCase() !== device.address.toLowerCase(),
+          (x) => x !== '0x0000000000000000000000000000000000000000' && !Address.isEqual(x, device.address),
         )
         .map((x) => ({ address: x })),
       ...Config.getSigners(devicesTopology).sapientSigners,

packages/wallet/wdk/test/sessions.test.ts

@@ -220,9 +220,7 @@ describe('Sessions (via Manager)', () => {
 
       // Sign and complete the request
       const sigRequest = await wdk.manager.getSignatureRequest(requestId)
-      const identitySigner = sigRequest.signers.find(
-        (s) => s.address.toLowerCase() === wdk.identitySignerAddress.toLowerCase(),
-      )
+      const identitySigner = sigRequest.signers.find((s) => Address.isEqual(s.address, wdk.identitySignerAddress))
       if (!identitySigner || (identitySigner.status !== 'actionable' && identitySigner.status !== 'ready')) {
         throw new Error(`Identity signer not found or not ready/actionable: ${identitySigner?.status}`)
       }
@@ -305,9 +303,7 @@ describe('Sessions (via Manager)', () => {
 
       // Sign and complete the request
       const sigRequest = await wdk.manager.getSignatureRequest(requestId)
-      const identitySigner = sigRequest.signers.find(
-        (s) => s.address.toLowerCase() === wdk.identitySignerAddress.toLowerCase(),
-      )
+      const identitySigner = sigRequest.signers.find((s) => Address.isEqual(s.address, wdk.identitySignerAddress))
       if (!identitySigner || (identitySigner.status !== 'actionable' && identitySigner.status !== 'ready')) {
         throw new Error(`Identity signer not found or not ready/actionable: ${identitySigner?.status}`)
       }