passkey-kit 0.0.25 → 0.0.27

package/package.json

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

package/src/index.ts

@@ -121,7 +121,18 @@ export class PasskeyAccount {
                 this.sudoKeyId = startRegistrationResponse.id
         }
 
-        return this.getKey(startRegistrationResponse)
+        const { publicKeyObject } = this.getPublicKeyObject(startRegistrationResponse.response.attestationObject);
+
+        const publicKey = Buffer.from([
+            4, // (0x04 prefix) https://en.bitcoin.it/wiki/Elliptic_Curve_Digital_Signature_Algorithm
+            ...publicKeyObject.get('-2')!,
+            ...publicKeyObject.get('-3')!
+        ])
+
+        return {
+            keyId: base64url.toBuffer(startRegistrationResponse.id),
+            publicKey
+        }
     }
 
     public async connectWallet() {
@@ -134,7 +145,7 @@ export class PasskeyAccount {
         if (!this.keyId)
             this.keyId = startAuthenticationResponse.id
 
-        const { keyId } = await this.getKey(startAuthenticationResponse)
+        const keyIdBuffer = base64url.toBuffer(startAuthenticationResponse.id)
 
         // NOTE might not need this for derivation as all signers are stored in the factory and we can use that lookup as both primary and secondary
         let contractId = StrKey.encodeContract(hash(xdr.HashIdPreimage.envelopeTypeContractId(
@@ -143,7 +154,7 @@ export class PasskeyAccount {
                 contractIdPreimage: xdr.ContractIdPreimage.contractIdPreimageFromAddress(
                     new xdr.ContractIdPreimageFromAddress({
                         address: Address.fromString(this.factoryContractId).toScAddress(),
-                        salt: hash(keyId),
+                        salt: hash(keyIdBuffer),
                     })
                 )
             })
@@ -155,7 +166,7 @@ export class PasskeyAccount {
         }
         // if that fails look up from the factory mapper
         catch {
-            const { val } = await this.rpc.getContractData(this.factoryContractId, xdr.ScVal.scvBytes(keyId))
+            const { val } = await this.rpc.getContractData(this.factoryContractId, xdr.ScVal.scvBytes(keyIdBuffer))
             contractId = scValToNative(val.contractData().val())
         }
 
@@ -169,7 +180,10 @@ export class PasskeyAccount {
         // get and set the sudo signer
         await this.getData()
 
-        return contractId
+        return {
+            keyId: keyIdBuffer,
+            contractId
+        }
     }
 
     public async sign(
@@ -321,25 +335,6 @@ export class PasskeyAccount {
             @Later
     */
 
-    private async getKey(value: RegistrationResponseJSON | AuthenticationResponseJSON) {
-        let publicKey: Buffer | undefined
-
-        if (isAuthentication(value)) {
-            const { publicKeyObject } = this.getPublicKeyObject(value.response.attestationObject);
-
-            publicKey = Buffer.from([
-                4, // (0x04 prefix) https://en.bitcoin.it/wiki/Elliptic_Curve_Digital_Signature_Algorithm
-                ...publicKeyObject.get('-2')!,
-                ...publicKeyObject.get('-3')!
-            ])
-        }
-
-        return {
-            keyId: base64url.toBuffer(value.id),
-            publicKey
-        }
-    }
-
     private getPublicKeyObject(attestationObject: string) {
         const { authData } = decode(base64url.toBuffer(attestationObject));
         const authDataUint8Array = new Uint8Array(authData);

package/types/index.d.ts

@@ -32,16 +32,18 @@ export declare class PasskeyAccount {
     }>;
     createKey(name: string, user: string): Promise<{
         keyId: Buffer;
-        publicKey: Buffer | undefined;
+        publicKey: Buffer;
+    }>;
+    connectWallet(): Promise<{
+        keyId: Buffer;
+        contractId: string;
     }>;
-    connectWallet(): Promise<string>;
     sign(txn: Transaction | string, options?: {
         keyId?: 'any' | 'sudo' | string | Uint8Array;
         ledgersToLive?: number;
     }): Promise<string>;
     send(txn: Transaction, fee?: number): Promise<Horizon.HorizonApi.SubmitTransactionResponse>;
     getData(): Promise<Map<string, any>>;
-    private getKey;
     private getPublicKeyObject;
     private convertEcdsaSignatureAsnToCompact;
 }