passkey-kit 0.0.24 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "type": "module",
   "main": "src/index.ts",
   "types": "types/index.d.ts",

package/packages/passkey-factory-sdk/src/index.ts

@@ -1,10 +1,12 @@
 import { Buffer } from "buffer";
 import {
-  AssembledTransaction,
   Client as ContractClient,
+  Spec as ContractSpec,
+} from '@stellar/stellar-sdk/contract';
+import type {
+  AssembledTransaction,
   ClientOptions as ContractClientOptions,
   Result,
-  Spec as ContractSpec,
 } from '@stellar/stellar-sdk/contract';
 
 if (typeof window !== 'undefined') {

package/packages/passkey-factory-sdk/types/index.d.ts

@@ -1,5 +1,6 @@
 import { Buffer } from "buffer";
-import { AssembledTransaction, Client as ContractClient, ClientOptions as ContractClientOptions, Result } from '@stellar/stellar-sdk/contract';
+import { Client as ContractClient } from '@stellar/stellar-sdk/contract';
+import type { AssembledTransaction, ClientOptions as ContractClientOptions, Result } from '@stellar/stellar-sdk/contract';
 export declare const networks: {
     readonly testnet: {
         readonly networkPassphrase: "Test SDF Network ; September 2015";

package/packages/passkey-kit-sdk/src/index.ts

@@ -1,10 +1,12 @@
 import { Buffer } from "buffer";
 import {
-  AssembledTransaction,
   Client as ContractClient,
+  Spec as ContractSpec,
+} from '@stellar/stellar-sdk/contract';
+import type {
+  AssembledTransaction,
   ClientOptions as ContractClientOptions,
   Result,
-  Spec as ContractSpec,
 } from '@stellar/stellar-sdk/contract';
 
 if (typeof window !== 'undefined') {
@@ -12,7 +14,6 @@ if (typeof window !== 'undefined') {
   window.Buffer = window.Buffer || Buffer;
 }
 
-
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",

package/packages/passkey-kit-sdk/types/index.d.ts

@@ -1,5 +1,6 @@
 import { Buffer } from "buffer";
-import { AssembledTransaction, Client as ContractClient, ClientOptions as ContractClientOptions, Result } from '@stellar/stellar-sdk/contract';
+import { Client as ContractClient } from '@stellar/stellar-sdk/contract';
+import type { AssembledTransaction, ClientOptions as ContractClientOptions, Result } from '@stellar/stellar-sdk/contract';
 export declare const networks: {
     readonly testnet: {
         readonly networkPassphrase: "Test SDF Network ; September 2015";

package/src/index.ts

@@ -15,8 +15,8 @@ import { Buffer } from 'buffer'
 */
 
 export class PasskeyAccount {
-    public id: string | undefined
-    public sudo: string | undefined
+    public keyId: string | undefined
+    public sudoKeyId: string | undefined
     public wallet: PasskeyClient | undefined
     public factory: FactoryClient
     public sequencePublicKey: string
@@ -86,6 +86,7 @@ export class PasskeyAccount {
         })
 
         return {
+            keyId,
             contractId,
             xdr: built!.toXDR() as string
         }
@@ -112,11 +113,12 @@ export class PasskeyAccount {
             attestation: "none",
         });
 
-        if (!this.id) {
-            this.id = startRegistrationResponse.id
+        if (!this.keyId) {
+            this.keyId = startRegistrationResponse.id
 
-            if (!this.sudo)
-                this.sudo = startRegistrationResponse.id
+            // If there was no keyId we're likely about to deploy a new wallet so we should set the sudoKeyId 
+            if (!this.sudoKeyId)
+                this.sudoKeyId = startRegistrationResponse.id
         }
 
         return this.getKey(startRegistrationResponse)
@@ -129,8 +131,8 @@ export class PasskeyAccount {
             userVerification: "discouraged",
         });
 
-        if (!this.id)
-            this.id = startAuthenticationResponse.id
+        if (!this.keyId)
+            this.keyId = startAuthenticationResponse.id
 
         const { keyId } = await this.getKey(startAuthenticationResponse)
 
@@ -167,18 +169,21 @@ export class PasskeyAccount {
         // get and set the sudo signer
         await this.getData()
 
-        return contractId
+        return {
+            keyId,
+            contractId
+        }
     }
 
     public async sign(
         txn: Transaction | string,
         options?: {
-            id?: 'any' | 'sudo' | string | Uint8Array
-            ttl?: number
+            keyId?: 'any' | 'sudo' | string | Uint8Array
+            ledgersToLive?: number
         }
     ) {
         // Default mirrors DEFAULT_TIMEOUT (currently 5 minutes) https://github.com/stellar/js-stellar-sdk/blob/master/src/contract/utils.ts#L7
-        let { id, ttl = 60 } = options || {}
+        let { keyId, ledgersToLive = 60 } = options || {}
 
         // hack to ensure we don't stack fees when simulating and assembling multiple times
         txn = TransactionBuilder.cloneFrom(new Transaction(
@@ -197,14 +202,14 @@ export class PasskeyAccount {
                 new xdr.HashIdPreimageSorobanAuthorization({
                     networkId: hash(Buffer.from(this.networkPassphrase, 'utf-8')),
                     nonce: auth.credentials().address().nonce(),
-                    signatureExpirationLedger: lastLedger + ttl,
+                    signatureExpirationLedger: lastLedger + ledgersToLive,
                     invocation: auth.rootInvocation()
                 })
             ).toXDR()
         )
 
         const authenticationResponse = await startAuthentication(
-            id === 'any' || (id === 'sudo' && !this.sudo)
+            keyId === 'any' || (keyId === 'sudo' && !this.sudoKeyId)
                 ? {
                     challenge: base64url(authHash),
                     // rpId: undefined,
@@ -215,11 +220,11 @@ export class PasskeyAccount {
                     // rpId: undefined,
                     allowCredentials: [
                         {
-                            id: id === 'sudo'
-                                ? this.sudo!
-                                : id instanceof Uint8Array
-                                    ? base64url(id)
-                                    : id || this.id!,
+                            id: keyId === 'sudo'
+                                ? this.sudoKeyId!
+                                : keyId instanceof Uint8Array
+                                    ? base64url(keyId)
+                                    : keyId || this.keyId!,
                             type: "public-key",
                         },
                     ],
@@ -228,17 +233,17 @@ export class PasskeyAccount {
         );
 
         // set sudo if this is a sudo request
-        if (id === 'sudo')
-            this.sudo = authenticationResponse.id
+        if (keyId === 'sudo')
+            this.sudoKeyId = authenticationResponse.id
 
         // reset this.id to be the most recently used passkey
-        this.id = authenticationResponse.id
+        this.keyId = authenticationResponse.id
 
         const signatureRaw = base64url.toBuffer(authenticationResponse.response.signature);
         const signature = this.convertEcdsaSignatureAsnToCompact(signatureRaw);
         const creds = auth.credentials().address();
 
-        creds.signatureExpirationLedger(lastLedger + ttl)
+        creds.signatureExpirationLedger(lastLedger + ledgersToLive)
         creds.signature(xdr.ScVal.scvMap([
             new xdr.ScMapEntry({
                 key: xdr.ScVal.scvSymbol('authenticator_data'),
@@ -308,7 +313,7 @@ export class PasskeyAccount {
                 );
             });
 
-        this.sudo = base64url(data.get('sudo_sig'))
+        this.sudoKeyId = base64url(data.get('sudo_sig'))
 
         return data
     }

package/types/index.d.ts

@@ -3,8 +3,8 @@ import { Client as FactoryClient } from 'passkey-factory-sdk';
 import { Networks, Transaction, Horizon, SorobanRpc } from '@stellar/stellar-sdk';
 import { Buffer } from 'buffer';
 export declare class PasskeyAccount {
-    id: string | undefined;
-    sudo: string | undefined;
+    keyId: string | undefined;
+    sudoKeyId: string | undefined;
     wallet: PasskeyClient | undefined;
     factory: FactoryClient;
     sequencePublicKey: string;
@@ -26,6 +26,7 @@ export declare class PasskeyAccount {
         factoryContractId?: string;
     });
     createWallet(name: string, user: string): Promise<{
+        keyId: Buffer;
         contractId: string;
         xdr: string;
     }>;
@@ -33,10 +34,13 @@ export declare class PasskeyAccount {
         keyId: Buffer;
         publicKey: Buffer | undefined;
     }>;
-    connectWallet(): Promise<string>;
+    connectWallet(): Promise<{
+        keyId: Buffer;
+        contractId: string;
+    }>;
     sign(txn: Transaction | string, options?: {
-        id?: 'any' | 'sudo' | string | Uint8Array;
-        ttl?: number;
+        keyId?: 'any' | 'sudo' | string | Uint8Array;
+        ledgersToLive?: number;
     }): Promise<string>;
     send(txn: Transaction, fee?: number): Promise<Horizon.HorizonApi.SubmitTransactionResponse>;
     getData(): Promise<Map<string, any>>;