wdk: update import paths

Author: patrislav

packages/wallet/wdk/src/index.ts

@@ -1,2 +1,2 @@
-export * as Identity from './identity/index.js'
+export * as Identity from './identity/signer.js'
 export * as Sequence from './sequence/index.js'

packages/wallet/wdk/src/sequence/handlers/authcode-pkce.ts

@@ -2,8 +2,7 @@ import { Hex, Address, Bytes } from 'ox'
 import { Handler } from './handler.js'
 import * as Db from '../../dbs/index.js'
 import { Signatures } from '../signatures.js'
-import * as Identity from '../../identity/index.js'
-import { SignerUnavailable, SignerReady, SignerActionable, BaseSignatureRequest } from '../types/signature-request.js'
+import * as Identity from '@0xsequence/identity-instrument'
 import { IdentitySigner } from '../../identity/signer.js'
 import { AuthCodeHandler } from './authcode.js'
 

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

@@ -2,7 +2,7 @@ import { Hex, Address, Bytes } from 'ox'
 import { Handler } from './handler.js'
 import * as Db from '../../dbs/index.js'
 import { Signatures } from '../signatures.js'
-import * as Identity from '../../identity/index.js'
+import * as Identity from '@0xsequence/identity-instrument'
 import { SignerUnavailable, SignerReady, SignerActionable, BaseSignatureRequest } from '../types/signature-request.js'
 import { IdentitySigner } from '../../identity/signer.js'
 import { IdentityHandler } from './identity.js'

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

@@ -1,8 +1,9 @@
-import { Hex } from 'ox'
+import { Hex, Bytes } from 'ox'
 import * as Db from '../../dbs/index.js'
-import * as Identity from '../../identity/index.js'
+import * as Identity from '@0xsequence/identity-instrument'
 import { Signatures } from '../signatures.js'
 import { BaseSignatureRequest } from '../types/signature-request.js'
+import { IdentitySigner, toIdentityAuthKey } from '../../identity/signer.js'
 
 export const identityTypeToHex = (identityType?: Identity.IdentityType): Hex.Hex => {
   // Bytes4
@@ -38,15 +39,7 @@ export class IdentityHandler {
       throw new Error('no-auth-key')
     }
 
-    const res = await this.nitro.commitVerifier({
-      params: {
-        ...challenge.getCommitParams(),
-        authKey: {
-          publicKey: authKey.address,
-          keyType: Identity.KeyType.P256R1,
-        },
-      },
-    })
+    const res = await this.nitro.commitVerifier(toIdentityAuthKey(authKey), challenge)
     return res
   }
 
@@ -56,39 +49,31 @@ export class IdentityHandler {
       throw new Error('no-auth-key')
     }
 
-    const res = await this.nitro.completeAuth({
-      params: {
-        ...challenge.getCompleteParams(),
-        authKey: {
-          publicKey: authKey.address,
-          keyType: Identity.KeyType.P256R1,
-        },
-      },
-    })
+    const res = await this.nitro.completeAuth(toIdentityAuthKey(authKey), challenge)
 
     authKey.identitySigner = res.signer
     authKey.expiresAt = new Date(Date.now() + 1000 * 60 * 3) // 3 minutes
     await this.authKeys.delBySigner('')
     await this.authKeys.set(authKey)
 
-    const signer = new Identity.IdentitySigner(this.nitro, authKey)
+    const signer = new IdentitySigner(this.nitro, authKey)
     return signer
   }
 
-  protected async sign(signer: Identity.IdentitySigner, request: BaseSignatureRequest) {
+  protected async sign(signer: IdentitySigner, request: BaseSignatureRequest) {
     const signature = await signer.sign(request.envelope.wallet, request.envelope.chainId, request.envelope.payload)
     await this.signatures.addSignature(request.id, {
       address: signer.address,
       signature,
     })
   }
 
-  protected async getAuthKeySigner(address: string): Promise<Identity.IdentitySigner | undefined> {
+  protected async getAuthKeySigner(address: string): Promise<IdentitySigner | undefined> {
     const authKey = await this.getAuthKey(address)
     if (!authKey) {
       return undefined
     }
-    return new Identity.IdentitySigner(this.nitro, authKey)
+    return new IdentitySigner(this.nitro, authKey)
   }
 
   private async getAuthKey(signer: string): Promise<Db.AuthKey | undefined> {

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

@@ -1,11 +1,11 @@
 import { Hex, Address } from 'ox'
-import { Handler } from './handler.js'
 import { Signers } from '@0xsequence/wallet-core'
+import * as Identity from '@0xsequence/identity-instrument'
+import { Handler } from './handler.js'
 import * as Db from '../../dbs/index.js'
 import { Signatures } from '../signatures.js'
 import { SignerUnavailable, SignerReady, SignerActionable, BaseSignatureRequest } from '../types/signature-request.js'
 import { Kinds } from '../types/signer.js'
-import * as Identity from '../../identity/index.js'
 import { IdentityHandler } from './identity.js'
 
 type RespondFn = (otp: string) => Promise<void>

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

@@ -11,10 +11,10 @@ import {
   SessionConfig,
   Signature as SequenceSignature,
 } from '@0xsequence/wallet-primitives'
+import { IdentityInstrument } from '@0xsequence/identity-instrument'
 import { createAttestationVerifyingFetch } from '@0xsequence/tee-verifier'
 import { Address } from 'ox'
 import * as Db from '../dbs/index.js'
-import * as Identity from '../identity/index.js'
 import { Devices } from './devices.js'
 import {
   AuthCodePkceHandler,
@@ -278,7 +278,7 @@ export class Manager {
 
     this.mnemonicHandler = new MnemonicHandler(modules.signatures)
     shared.handlers.set(Kinds.LoginMnemonic, this.mnemonicHandler)
-    
+
     this.recoveryHandler = new RecoveryHandler(modules.signatures, modules.recovery)
     shared.handlers.set(Kinds.Recovery, this.recoveryHandler)
 
@@ -289,10 +289,10 @@ export class Manager {
           logTiming: true,
         })
       : ops.identity.fetch
-    const nitro = new Identity.IdentityInstrument(ops.identity.url, verifyingFetch)
-    
+    const identityInstrument = new IdentityInstrument(ops.identity.url, verifyingFetch)
+
     if (ops.identity.email?.enabled) {
-      this.otpHandler = new OtpHandler(nitro, modules.signatures, shared.databases.authKeys)
+      this.otpHandler = new OtpHandler(identityInstrument, modules.signatures, shared.databases.authKeys)
       shared.handlers.set(Kinds.LoginEmailOtp, this.otpHandler)
     }
     if (ops.identity.google?.enabled) {
@@ -302,7 +302,7 @@ export class Manager {
           'google-pkce',
           'https://accounts.google.com',
           ops.identity.google.clientId,
-          nitro,
+          identityInstrument,
           modules.signatures,
           shared.databases.authCommitments,
           shared.databases.authKeys,
@@ -316,7 +316,7 @@ export class Manager {
           'apple',
           'https://appleid.apple.com',
           ops.identity.apple.clientId,
-          nitro,
+          identityInstrument,
           modules.signatures,
           shared.databases.authCommitments,
           shared.databases.authKeys,

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

@@ -9,7 +9,7 @@ import {
   SessionConfig,
 } from '@0xsequence/wallet-primitives'
 import { Address, Bytes, Hash, Hex } from 'ox'
-import { IdentityType } from '../identity/index.js'
+import { IdentityType } from '@0xsequence/identity-instrument'
 import { AuthCodePkceHandler } from './handlers/authcode-pkce.js'
 import { IdentityHandler, identityTypeToHex } from './handlers/identity.js'
 import { ManagerOptionsDefaults, Shared } from './manager.js'