passkey-kit 0.3.0 → 0.4.0

package/README.md

@@ -13,13 +13,14 @@ On the client:
 ```ts
 const account = new PasskeyKit({
     rpcUrl: env.RPC_URL,
-    networkPassphrase: env.NETWORK_PASSPHRASE
+    networkPassphrase: env.NETWORK_PASSPHRASE,
+    factoryContractId: env.FACTORY_CONTRACT_ID,
 });
 ```
 
 On the server:
 ```ts
-const account = new PasskeyKit({
+const account = new PasskeyBase({
     launchtubeUrl: env.LAUNCHTUBE_URL,
     launchtubeJwt: env.LAUNCHTUBE_JWT,
 });
@@ -37,6 +38,7 @@ For any questions or to showcase your progress please join the `#passkeys` chann
 
 Passkey kit consists of three primary directories:
 - `./contracts` - Contains the Rust Soroban smart contracts of the smart wallet implementation.
+- `./zephyr` - Contains the [Zephyr](https://www.mercurydata.app/products/zephyr-vm) program for processing smart wallet events.
 - `./src` - Contains the TypeScript files for the actual TS SDK library.
 - `./demo` - Contains a basic demo of the SDK in action.
 

package/cheatsheet

@@ -9,7 +9,8 @@ pnpm publish --no-git-checks
 
 export MERCURY_JWT=???
 mercury-cli --jwt $MERCURY_JWT --local false --mainnet false deploy
-mercury-cli --jwt $MERCURY_JWT --local false --mainnet false catchup --contracts "???" # don't forget to subscribe to the contract first
-curl -X POST https://api.mercurydata.app/zephyr/execute -H "Authorization: Bearer $MERCURY_JWT" -H 'Content-Type: application/json' -d '{"mode":{"Function": {"fname": "get_signers_by_address", "arguments": "{\"address\": \"CBLWEW63G2KU7ZGVQTTFTJLGQSXAU5PU5ZXERQDDLL4LBA72D7ER6C75\"}"}}}'
+mercury-cli --jwt $MERCURY_JWT --local false --mainnet false catchup --contracts "CCXIUFR243N7QWKXY44LZO3DVUXHAVBEEJWFGNGNVVB44VJXIYWVGNTR" # don't forget to subscribe to the contract first
+curl -X GET https://api.mercurydata.app/catchups/4
+curl -X POST https://api.mercurydata.app/zephyr/execute -H "Authorization: Bearer $MERCURY_JWT" -H 'Content-Type: application/json' -d '{"mode":{"Function": {"fname": "get_signers_by_address", "arguments": "{\"address\": \"CCXIUFR243N7QWKXY44LZO3DVUXHAVBEEJWFGNGNVVB44VJXIYWVGNTR\"}"}}}'
 curl -X POST https://api.mercurydata.app/zephyr/execute -H "Authorization: Bearer $MERCURY_JWT" -H 'Content-Type: application/json' -d '{"mode":{"Function": {"fname": "get_address_by_signer", "arguments": "{\"id\": [78,127,30,69,248,174,95,168,47,59,161,168,51,120,117,135,112,133,232,92]}"}}}'
-curl -X POST https://api.mercurydata.app/zephyr/execute -H "Authorization: Bearer $MERCURY_JWT" -H 'Content-Type: application/json' -d '{"mode":{"Function": {"fname": "get_events_by_address", "arguments": "{\"address\": \"CBLWEW63G2KU7ZGVQTTFTJLGQSXAU5PU5ZXERQDDLL4LBA72D7ER6C75\"}"}}}'
+curl -X POST https://api.mercurydata.app/zephyr/execute -H "Authorization: Bearer $MERCURY_JWT" -H 'Content-Type: application/json' -d '{"mode":{"Function": {"fname": "get_events_by_address", "arguments": "{\"address\": \"CCXIUFR243N7QWKXY44LZO3DVUXHAVBEEJWFGNGNVVB44VJXIYWVGNTR\"}"}}}'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A helper library for creating and using passkey accounts on the Stellar blockchain.",
   "author": "Tyler van der Hoeven",
   "license": "MIT",
@@ -11,13 +11,13 @@
     "@simplewebauthn/browser": "^10.0.0",
     "@stellar/stellar-sdk": "12.1.0",
     "base64url": "^3.0.1",
-    "bigint-conversion": "^2.4.3",
     "buffer": "^6.0.3",
     "cbor-x": "^1.5.9",
-    "passkey-factory-sdk": "0.1.0",
-    "passkey-kit-sdk": "0.1.0"
+    "passkey-factory-sdk": "0.2.0",
+    "passkey-kit-sdk": "0.2.0"
   },
   "devDependencies": {
+    "@simplewebauthn/types": "^10.0.0",
     "typescript": "^5.5.3"
   },
   "workspaces": [

package/packages/passkey-factory-sdk/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0",
+  "version": "0.2.0",
   "name": "passkey-factory-sdk",
   "type": "module",
   "main": "src/index.ts",
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.0.1"
+    "@stellar/stellar-sdk": "12.1.0"
   },
   "devDependencies": {
-    "typescript": "5.4.5"
+    "typescript": "5.5.3"
   }
 }

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

@@ -15,13 +15,13 @@ if (typeof window !== 'undefined') {
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CA6DVSXLLOSI32JAPGP4MLOG64FGERLYCP2SGRX2A6MPWGA5KDUKL66P",
+    contractId: "CBCPNJNIR7I6ZI5AIXTMYI3MCDCSTNUZ57XL75HQWI6Y4ESWUP24HRBG",
   }
 } as const
 
 export const Errors = {
-  1: { message: "" },
-  2: { message: "" }
+  1: { message: "NotInitialized" },
+  2: { message: "AlreadyInitialized" }
 }
 
 export interface Client {

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

@@ -3,7 +3,7 @@ import { AssembledTransaction, Client as ContractClient, ClientOptions as Contra
 export declare const networks: {
     readonly testnet: {
         readonly networkPassphrase: "Test SDF Network ; September 2015";
-        readonly contractId: "CA6DVSXLLOSI32JAPGP4MLOG64FGERLYCP2SGRX2A6MPWGA5KDUKL66P";
+        readonly contractId: "CBCPNJNIR7I6ZI5AIXTMYI3MCDCSTNUZ57XL75HQWI6Y4ESWUP24HRBG";
     };
 };
 export declare const Errors: {

package/packages/passkey-kit-sdk/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0",
+  "version": "0.2.0",
   "name": "passkey-kit-sdk",
   "type": "module",
   "main": "src/index.ts",
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.0.1"
+    "@stellar/stellar-sdk": "12.1.0"
   },
   "devDependencies": {
-    "typescript": "5.4.5"
+    "typescript": "5.5.3"
   }
 }

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

@@ -15,21 +15,19 @@ if (typeof window !== 'undefined') {
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CA6DVSXLLOSI32JAPGP4MLOG64FGERLYCP2SGRX2A6MPWGA5KDUKL66P",
+    contractId: "CBCPNJNIR7I6ZI5AIXTMYI3MCDCSTNUZ57XL75HQWI6Y4ESWUP24HRBG",
   }
 } as const
 
 export const Errors = {
-  1: { message: "" },
-  2: { message: "" },
-  3: { message: "" },
-  4: { message: "" },
-  5: { message: "" },
-  6: { message: "" },
-  7: { message: "" },
-  8: { message: "" },
-  9: { message: "" },
-  10: { message: "" }
+  1: { message: "NotFound" },
+  2: { message: "NotPermitted" },
+  3: { message: "AlreadyInitialized" },
+  4: { message: "ClientDataJsonChallengeIncorrect" },
+  5: { message: "Secp256r1PublicKeyParse" },
+  6: { message: "Secp256r1SignatureParse" },
+  7: { message: "Secp256r1VerifyFailed" },
+  8: { message: "JsonParseError" }
 }
 
 export interface Signature {
@@ -61,29 +59,9 @@ export interface Client {
   }) => Promise<AssembledTransaction<Result<void>>>
 
   /**
-   * Construct and simulate a upgrade transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
-   */
-  upgrade: ({ hash }: { hash: Buffer }, options?: {
-    /**
-     * The fee to pay for the transaction. Default: BASE_FEE
-     */
-    fee?: number;
-
-    /**
-     * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-     */
-    timeoutInSeconds?: number;
-
-    /**
-     * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-     */
-    simulate?: boolean;
-  }) => Promise<AssembledTransaction<Result<void>>>
-
-  /**
-   * Construct and simulate a add_sig transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
+   * Construct and simulate a add transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
    */
-  add_sig: ({ id, pk }: { id: Buffer, pk: Buffer }, options?: {
+  add: ({ id, pk, admin }: { id: Buffer, pk: Buffer, admin: boolean }, options?: {
     /**
      * The fee to pay for the transaction. Default: BASE_FEE
      */
@@ -101,9 +79,9 @@ export interface Client {
   }) => Promise<AssembledTransaction<Result<void>>>
 
   /**
-   * Construct and simulate a rm_sig transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
+   * Construct and simulate a remove transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
    */
-  rm_sig: ({ id }: { id: Buffer }, options?: {
+  remove: ({ id }: { id: Buffer }, options?: {
     /**
      * The fee to pay for the transaction. Default: BASE_FEE
      */
@@ -121,9 +99,9 @@ export interface Client {
   }) => Promise<AssembledTransaction<Result<void>>>
 
   /**
-   * Construct and simulate a re_super transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
+   * Construct and simulate a upgrade transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
    */
-  re_super: ({ id }: { id: Buffer }, options?: {
+  upgrade: ({ hash }: { hash: Buffer }, options?: {
     /**
      * The fee to pay for the transaction. Default: BASE_FEE
      */
@@ -143,12 +121,11 @@ export interface Client {
 export class Client extends ContractClient {
   constructor(public readonly options: ContractClientOptions) {
     super(
-      new ContractSpec(["AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAACgAAAAAAAAAOTm90SW5pdGlhbGl6ZWQAAAAAAAEAAAAAAAAACE5vdEZvdW5kAAAAAgAAAAAAAAAMTm90UGVybWl0dGVkAAAAAwAAAAAAAAASQWxyZWFkeUluaXRpYWxpemVkAAAAAAAEAAAAAAAAAA5Kc29uUGFyc2VFcnJvcgAAAAAABQAAAAAAAAAOSW52YWxpZENvbnRleHQAAAAAAAYAAAAAAAAAIENsaWVudERhdGFKc29uQ2hhbGxlbmdlSW5jb3JyZWN0AAAABwAAAAAAAAAXU2VjcDI1NnIxUHVibGljS2V5UGFyc2UAAAAACAAAAAAAAAAXU2VjcDI1NnIxU2lnbmF0dXJlUGFyc2UAAAAACQAAAAAAAAAVU2VjcDI1NnIxVmVyaWZ5RmFpbGVkAAAAAAAACg==",
+      new ContractSpec(["AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAACAAAAAAAAAAITm90Rm91bmQAAAABAAAAAAAAAAxOb3RQZXJtaXR0ZWQAAAACAAAAAAAAABJBbHJlYWR5SW5pdGlhbGl6ZWQAAAAAAAMAAAAAAAAAIENsaWVudERhdGFKc29uQ2hhbGxlbmdlSW5jb3JyZWN0AAAABAAAAAAAAAAXU2VjcDI1NnIxUHVibGljS2V5UGFyc2UAAAAABQAAAAAAAAAXU2VjcDI1NnIxU2lnbmF0dXJlUGFyc2UAAAAABgAAAAAAAAAVU2VjcDI1NnIxVmVyaWZ5RmFpbGVkAAAAAAAABwAAAAAAAAAOSnNvblBhcnNlRXJyb3IAAAAAAAg=",
         "AAAAAAAAAAAAAAAEaW5pdAAAAAIAAAAAAAAAAmlkAAAAAAAOAAAAAAAAAAJwawAAAAAD7gAAAEEAAAABAAAD6QAAA+0AAAAAAAAAAw==",
+        "AAAAAAAAAAAAAAADYWRkAAAAAAMAAAAAAAAAAmlkAAAAAAAOAAAAAAAAAAJwawAAAAAD7gAAAEEAAAAAAAAABWFkbWluAAAAAAAAAQAAAAEAAAPpAAAD7QAAAAAAAAAD",
+        "AAAAAAAAAAAAAAAGcmVtb3ZlAAAAAAABAAAAAAAAAAJpZAAAAAAADgAAAAEAAAPpAAAD7QAAAAAAAAAD",
         "AAAAAAAAAAAAAAAHdXBncmFkZQAAAAABAAAAAAAAAARoYXNoAAAD7gAAACAAAAABAAAD6QAAA+0AAAAAAAAAAw==",
-        "AAAAAAAAAAAAAAAHYWRkX3NpZwAAAAACAAAAAAAAAAJpZAAAAAAADgAAAAAAAAACcGsAAAAAA+4AAABBAAAAAQAAA+kAAAPtAAAAAAAAAAM=",
-        "AAAAAAAAAAAAAAAGcm1fc2lnAAAAAAABAAAAAAAAAAJpZAAAAAAADgAAAAEAAAPpAAAD7QAAAAAAAAAD",
-        "AAAAAAAAAAAAAAAIcmVfc3VwZXIAAAABAAAAAAAAAAJpZAAAAAAADgAAAAEAAAPpAAAD7QAAAAAAAAAD",
         "AAAAAQAAAAAAAAAAAAAACVNpZ25hdHVyZQAAAAAAAAQAAAAAAAAAEmF1dGhlbnRpY2F0b3JfZGF0YQAAAAAADgAAAAAAAAAQY2xpZW50X2RhdGFfanNvbgAAAA4AAAAAAAAAAmlkAAAAAAAOAAAAAAAAAAlzaWduYXR1cmUAAAAAAAPuAAAAQA==",
         "AAAAAAAAAAAAAAAMX19jaGVja19hdXRoAAAAAwAAAAAAAAARc2lnbmF0dXJlX3BheWxvYWQAAAAAAAPuAAAAIAAAAAAAAAAJc2lnbmF0dXJlAAAAAAAH0AAAAAlTaWduYXR1cmUAAAAAAAAAAAAADWF1dGhfY29udGV4dHMAAAAAAAPqAAAH0AAAAAdDb250ZXh0AAAAAAEAAAPpAAAD7QAAAAAAAAAD"]),
       options
@@ -156,9 +133,8 @@ export class Client extends ContractClient {
   }
   public readonly fromJSON = {
     init: this.txFromJSON<Result<void>>,
-    upgrade: this.txFromJSON<Result<void>>,
-    add_sig: this.txFromJSON<Result<void>>,
-    rm_sig: this.txFromJSON<Result<void>>,
-    re_super: this.txFromJSON<Result<void>>
+    add: this.txFromJSON<Result<void>>,
+    remove: this.txFromJSON<Result<void>>,
+    upgrade: this.txFromJSON<Result<void>>
   }
 }

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

@@ -3,7 +3,7 @@ import { AssembledTransaction, Client as ContractClient, ClientOptions as Contra
 export declare const networks: {
     readonly testnet: {
         readonly networkPassphrase: "Test SDF Network ; September 2015";
-        readonly contractId: "CA6DVSXLLOSI32JAPGP4MLOG64FGERLYCP2SGRX2A6MPWGA5KDUKL66P";
+        readonly contractId: "CBCPNJNIR7I6ZI5AIXTMYI3MCDCSTNUZ57XL75HQWI6Y4ESWUP24HRBG";
     };
 };
 export declare const Errors: {
@@ -31,12 +31,6 @@ export declare const Errors: {
     8: {
         message: string;
     };
-    9: {
-        message: string;
-    };
-    10: {
-        message: string;
-    };
 };
 export interface Signature {
     authenticator_data: Buffer;
@@ -66,30 +60,12 @@ export interface Client {
         simulate?: boolean;
     }) => Promise<AssembledTransaction<Result<void>>>;
     /**
-     * Construct and simulate a upgrade transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
+     * Construct and simulate a add transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
      */
-    upgrade: ({ hash }: {
-        hash: Buffer;
-    }, options?: {
-        /**
-         * The fee to pay for the transaction. Default: BASE_FEE
-         */
-        fee?: number;
-        /**
-         * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-         */
-        timeoutInSeconds?: number;
-        /**
-         * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-         */
-        simulate?: boolean;
-    }) => Promise<AssembledTransaction<Result<void>>>;
-    /**
-     * Construct and simulate a add_sig transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
-     */
-    add_sig: ({ id, pk }: {
+    add: ({ id, pk, admin }: {
         id: Buffer;
         pk: Buffer;
+        admin: boolean;
     }, options?: {
         /**
          * The fee to pay for the transaction. Default: BASE_FEE
@@ -105,9 +81,9 @@ export interface Client {
         simulate?: boolean;
     }) => Promise<AssembledTransaction<Result<void>>>;
     /**
-     * Construct and simulate a rm_sig transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
+     * Construct and simulate a remove transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
      */
-    rm_sig: ({ id }: {
+    remove: ({ id }: {
         id: Buffer;
     }, options?: {
         /**
@@ -124,10 +100,10 @@ export interface Client {
         simulate?: boolean;
     }) => Promise<AssembledTransaction<Result<void>>>;
     /**
-     * Construct and simulate a re_super transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
+     * Construct and simulate a upgrade transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.
      */
-    re_super: ({ id }: {
-        id: Buffer;
+    upgrade: ({ hash }: {
+        hash: Buffer;
     }, options?: {
         /**
          * The fee to pay for the transaction. Default: BASE_FEE
@@ -148,9 +124,8 @@ export declare class Client extends ContractClient {
     constructor(options: ContractClientOptions);
     readonly fromJSON: {
         init: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
+        add: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
+        remove: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
         upgrade: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
-        add_sig: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
-        rm_sig: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
-        re_super: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
     };
 }

package/src/kit.ts

@@ -1,9 +1,9 @@
 import { Client as PasskeyClient } from 'passkey-kit-sdk'
 import { Client as FactoryClient } from 'passkey-factory-sdk'
-import { Address, Networks, StrKey, hash, xdr, Transaction, SorobanRpc, Operation, scValToNative, TransactionBuilder } from '@stellar/stellar-sdk'
-import { bufToBigint, bigintToBuf } from 'bigint-conversion'
+import { Address, Networks, StrKey, hash, xdr, Transaction, SorobanRpc, Operation, TransactionBuilder } from '@stellar/stellar-sdk'
 import base64url from 'base64url'
 import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
+import type { AuthenticatorAttestationResponseJSON } from "@simplewebauthn/types"
 import { decode } from 'cbor-x/decode'
 import { Buffer } from 'buffer'
 import { PasskeyBase } from './base'
@@ -49,8 +49,8 @@ export class PasskeyKit extends PasskeyBase {
         })
     }
 
-    public async createWallet(name: string, user: string) {
-        const { keyId, publicKey } = await this.createKey(name, user)
+    public async createWallet(app: string, user: string) {
+        const { keyId, publicKey } = await this.createKey(app, user)
 
         const { result, built } = await this.factory.deploy({
             id: keyId,
@@ -72,17 +72,19 @@ export class PasskeyKit extends PasskeyBase {
         }
     }
 
-    public async createKey(name: string, user: string) {
-        const startRegistrationResponse = await startRegistration({
+    public async createKey(app: string, user: string) {
+        const now = new Date()
+        const displayName = `${user} — ${now.toLocaleString()}`
+        const { id, response} = await startRegistration({
             challenge: base64url("stellaristhebetterblockchain"),
             rp: {
                 // id: undefined,
-                name,
+                name: app,
             },
-            user: {
-                id: base64url(user),
-                name: user,
-                displayName: user,
+            user: { // TODO there's a real danger here of overwriting a user's key if they use the same `user` name
+                id: base64url(`${user}:${now.getTime()}:${Math.random()}`),
+                name: displayName,
+                displayName
             },
             authenticatorSelection: {
                 requireResidentKey: false,
@@ -94,18 +96,12 @@ export class PasskeyKit extends PasskeyBase {
         });
 
         if (!this.keyId)
-            this.keyId = startRegistrationResponse.id
+            this.keyId = id;
 
-        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')!
-        ])
+        const publicKey = this.getPublicKey(response);
 
         return {
-            keyId: base64url.toBuffer(startRegistrationResponse.id),
+            keyId: base64url.toBuffer(id),
             publicKey
         }
     }
@@ -115,21 +111,23 @@ export class PasskeyKit extends PasskeyBase {
         getContractId?: GetContractIdFunction
     }) {
         let { keyId, getContractId } = opts
-        let keyIdBuffer: Uint8Array
+        let keyIdBuffer: Buffer
 
         if (!keyId) {
-            const { id } = await startAuthentication({
+            const response = await startAuthentication({
                 challenge: base64url("stellaristhebetterblockchain"),
                 // rpId: undefined,
                 userVerification: "discouraged",
             });
 
-            keyId = id
+            console.log(response);
+
+            keyId = response.id
         }
 
         if (keyId instanceof Uint8Array) {
-            keyIdBuffer = keyId
-            keyId = base64url(keyId)
+            keyIdBuffer = Buffer.from(keyId)
+            keyId = base64url(keyIdBuffer)
         } else {
             keyIdBuffer = base64url.toBuffer(keyId)
         }
@@ -222,7 +220,7 @@ export class PasskeyKit extends PasskeyBase {
                     allowCredentials: [
                         {
                             id: keyId instanceof Uint8Array
-                                ? base64url(keyId)
+                                ? base64url(Buffer.from(keyId))
                                 : keyId || this.keyId!,
                             type: "public-key",
                         },
@@ -231,8 +229,9 @@ export class PasskeyKit extends PasskeyBase {
                 }
         );
 
-        const signatureRaw = base64url.toBuffer(authenticationResponse.response.signature);
-        const signature = this.convertEcdsaSignatureAsnToCompact(signatureRaw);
+        const signature = this.compactSignature(
+            base64url.toBuffer(authenticationResponse.response.signature)
+        );
 
         credentials.signatureExpirationLedger(lastLedger + ledgersToLive)
         credentials.signature(xdr.ScVal.scvMap([
@@ -323,27 +322,6 @@ export class PasskeyKit extends PasskeyBase {
 
         return SorobanRpc.assembleTransaction(txn, sim).build().toXDR()
     }
-    public async getSuperKeyId() {
-        const data: Map<string, any> = new Map()
-
-        const { val } = await this.rpc.getContractData(
-            this.wallet!.options.contractId,
-            xdr.ScVal.scvLedgerKeyContractInstance(),
-        );
-
-        val.contractData()
-            .val()
-            .instance()
-            .storage()
-            ?.forEach((entry) => {
-                data.set(
-                    scValToNative(entry.key()),
-                    scValToNative(entry.val()),
-                );
-            });
-
-        return base64url(data.get('super'))
-    }
 
     /* TODO 
         - Add a getKeyInfo action to get info about a specific passkey
@@ -351,133 +329,66 @@ export class PasskeyKit extends PasskeyBase {
             @Later
     */
 
-    private getPublicKeyObject(attestationObject: string) {
-        const { authData } = decode(base64url.toBuffer(attestationObject));
-        const authDataUint8Array = new Uint8Array(authData);
-        const authDataView = new DataView(authDataUint8Array.buffer, 0, authDataUint8Array.length);
-
-        let offset = 0;
-
-        // RP ID Hash (32 bytes)
-        const rpIdHash = authData.slice(offset, offset + 32);
-        offset += 32;
-
-        // Flags (1 byte)
-        const flags = authDataView.getUint8(offset);
-        offset += 1;
-
-        // Sign Count (4 bytes, big endian)
-        const signCount = authDataView.getUint32(offset, false);
-        offset += 4;
-
-        // Attested Credential Data, if present
-        if (flags & 0x40) { // Checking the AT flag
-            // AAGUID (16 bytes)
-            const aaguid = authData.slice(offset, offset + 16);
-            offset += 16;
-
-            // Credential ID Length (2 bytes, big endian)
-            const credIdLength = authDataView.getUint16(offset, false);
-            offset += 2;
-
-            // Credential ID (variable length)
-            const credentialId = authData.slice(offset, offset + credIdLength);
-            offset += credIdLength;
-
-            // Credential Public Key - (77 bytes...I hope)
-            const credentialPublicKey = authData.slice(offset, offset + 77);
-            offset += 77;
-
-            // Any leftover bytes. I found some when using a YubiKey
-            const theRest = authData.slice(offset);
-
-            // Decode the credential public key to COSE
-            const publicKeyObject = new Map<string, any>(Object.entries(decode(credentialPublicKey)));
-
-            return {
-                rpIdHash,
-                flags,
-                signCount,
-                aaguid,
-                credIdLength,
-                credentialId,
-                credentialPublicKey,
-                theRest,
-                publicKeyObject
-            };
-        }
-
-        throw new Error("Attested credential data not present in the flags.");
-    }
-
-    private convertEcdsaSignatureAsnToCompact(sig: Buffer) {
-        // Define the order of the curve secp256k1
-        // https://github.com/RustCrypto/elliptic-curves/blob/master/p256/src/lib.rs#L72
-        const q = Buffer.from('ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551', 'hex')
-
-        // ASN Sequence
-        let offset = 0;
-        if (sig[offset] != 0x30) {
-            throw "signature is not a sequence";
-        }
-        offset += 1;
+    private getPublicKey(response: AuthenticatorAttestationResponseJSON) {
+        let publicKey: Buffer | undefined
 
-        // ASN Sequence Byte Length
-        offset += 1;
+        if (response.publicKey)
+            publicKey = base64url.toBuffer(response.publicKey).slice(response.publicKey.length - 65)
 
-        // ASN Integer (R)
-        if (sig[offset] != 0x02) {
-            throw "first element in sequence is not an integer";
+        if (
+            !publicKey
+            || publicKey[0] !== 0x04
+            || publicKey.length !== 65
+        ) {
+            // Extract and decode attestation object (CBOR), slice authenticator data to get COSE-encoded public key, and decode COSE to obtain key components
+            const { authData } = response.authenticatorData ? { authData: base64url.toBuffer(response.authenticatorData) } : decode(base64url.toBuffer(response.attestationObject));
+            const credentialIdLength = (authData[53] << 8) + authData[54];
+            const publicKeyBytes = authData.slice(55 + credentialIdLength);
+            const publicKeyCose = decode(publicKeyBytes);
+
+            publicKey = Buffer.from([
+                0x04, // (0x04 prefix) https://en.bitcoin.it/wiki/Elliptic_Curve_Digital_Signature_Algorithm
+                ...publicKeyCose['-2'],
+                ...publicKeyCose['-3']
+            ])
         }
-        offset += 1;
 
-        // ASN Integer (R) Byte Length
-        const rLen = sig[offset];
-        offset += 1;
+        return publicKey
+    }
+    private compactSignature(signature: Buffer) {
+        // Decode the DER signature
+        let offset = 2;
 
-        // ASN Integer (R) Byte Value
-        if (rLen >= 33) {
-            if (rLen != 33 || sig[offset] != 0x00) {
-                throw "can only handle larger than 32 byte R's that are len 33 and lead with zero";
-            }
-            offset += 1;
-        }
-        const r = sig.slice(offset, offset + 32);
-        offset += 32;
+        const rLength = signature[offset + 1];
+        const r = signature.slice(offset + 2, offset + 2 + rLength);
 
-        // ASN Integer (S)
-        if (sig[offset] != 0x02) {
-            throw "second element in sequence is not an integer";
-        }
-        offset += 1;
+        offset += 2 + rLength;
 
-        // ASN Integer (S) Byte Length
-        const sLen = sig[offset];
-        offset += 1;
+        const sLength = signature[offset + 1];
+        const s = signature.slice(offset + 2, offset + 2 + sLength);
 
-        // ASN Integer (S) Byte Value
-        if (sLen >= 33) {
-            if (sLen != 33 || sig[offset] != 0x00) {
-                throw "can only handle larger than 32 byte R's that are len 33 and lead with zero";
-            }
-            offset += 1;
-        }
+        // Convert r and s to BigInt
+        const rBigInt = BigInt('0x' + r.toString('hex'));
+        let sBigInt = BigInt('0x' + s.toString('hex'));
 
-        const s = sig.slice(offset, offset + 32);
+        // Ensure s is in the low-S form
+        // https://github.com/stellar/stellar-protocol/discussions/1435#discussioncomment-8809175
+        // https://discord.com/channels/897514728459468821/1233048618571927693
+        // Define the order of the curve secp256r1
+        // https://github.com/RustCrypto/elliptic-curves/blob/master/p256/src/lib.rs#L72
+        const n = BigInt('0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551');
+        const halfN = n / 2n;
 
-        offset += 32;
+        if (sBigInt > halfN)
+            sBigInt = n - sBigInt;
 
-        let signature64: Buffer
+        // Convert back to buffers and ensure they are 32 bytes
+        const rPadded = Buffer.from(rBigInt.toString(16).padStart(64, '0'), 'hex');
+        const sLowS = Buffer.from(sBigInt.toString(16).padStart(64, '0'), 'hex');
 
-        // Force low S range
-        // https://github.com/stellar/stellar-protocol/discussions/1435#discussioncomment-8809175
-        // https://discord.com/channels/897514728459468821/1233048618571927693
-        if (bufToBigint(s) > ((bufToBigint(q) - BigInt(1)) / BigInt(2))) {
-            signature64 = Buffer.from([...r, ...Buffer.from(bigintToBuf(bufToBigint(q) - bufToBigint(s), true) as ArrayBuffer)]);
-        } else {
-            signature64 = Buffer.from([...r, ...s]);
-        }
+        // Concatenate r and low-s
+        const concatSignature = Buffer.concat([rPadded, sLowS]);
 
-        return signature64;
+        return concatSignature;
     }
 }

package/tsconfig.json

@@ -6,7 +6,6 @@
     "target": "ESNext",
     "module": "ESNext",
     "moduleDetection": "force",
-    // "allowJs": true,
 
     // Bundler mode
     "moduleResolution": "node",
@@ -26,5 +25,5 @@
     "noPropertyAccessFromIndexSignature": false,
     "strictNullChecks": true,
   },
-  "exclude": ["./demo", "./packages", "./types", "./contracts", "./zephyr"]
+  "exclude": ["./demo", "./packages", "./types", "./contracts", "./zephyr", "./bun_tests"]
 }

package/types/kit.d.ts

@@ -19,12 +19,12 @@ export declare class PasskeyKit extends PasskeyBase {
         networkPassphrase: string;
         factoryContractId: string;
     });
-    createWallet(name: string, user: string): Promise<{
+    createWallet(app: string, user: string): Promise<{
         keyId: Buffer;
         contractId: string;
         xdr: string;
     }>;
-    createKey(name: string, user: string): Promise<{
+    createKey(app: string, user: string): Promise<{
         keyId: Buffer;
         publicKey: Buffer;
     }>;
@@ -32,7 +32,7 @@ export declare class PasskeyKit extends PasskeyBase {
         keyId?: string | Uint8Array;
         getContractId?: GetContractIdFunction;
     }): Promise<{
-        keyId: Uint8Array;
+        keyId: Buffer;
         contractId: string;
     }>;
     signAuthEntry(entry: xdr.SorobanAuthorizationEntry, options?: {
@@ -47,8 +47,7 @@ export declare class PasskeyKit extends PasskeyBase {
         keyId?: 'any' | string | Uint8Array;
         ledgersToLive?: number;
     }): Promise<string>;
-    getSuperKeyId(): Promise<string>;
-    private getPublicKeyObject;
-    private convertEcdsaSignatureAsnToCompact;
+    private getPublicKey;
+    private compactSignature;
 }
 export {};

package/types/src/base.d.ts

@@ -0,0 +1,9 @@
+export declare class PasskeyBase {
+    launchtubeUrl: string | undefined;
+    launchtubeJwt: string | undefined;
+    constructor(options: {
+        launchtubeUrl?: string;
+        launchtubeJwt?: string;
+    });
+    send(xdr: string, fee?: number): Promise<any>;
+}

package/types/src/index.d.ts

@@ -0,0 +1,3 @@
+import { PasskeyBase } from "./base";
+import { PasskeyKit } from "./kit";
+export { PasskeyBase, PasskeyKit };

package/types/src/kit.d.ts

@@ -0,0 +1,53 @@
+import { Client as PasskeyClient } from 'passkey-kit-sdk';
+import { Client as FactoryClient } from 'passkey-factory-sdk';
+import { Networks, xdr, Transaction, SorobanRpc } from '@stellar/stellar-sdk';
+import { Buffer } from 'buffer';
+import { PasskeyBase } from './base';
+type GetContractIdFunction = (keyId: string) => Promise<string>;
+export declare class PasskeyKit extends PasskeyBase {
+    keyId: string | undefined;
+    keyExpired: boolean | undefined;
+    wallet: PasskeyClient | undefined;
+    factory: FactoryClient;
+    networkPassphrase: Networks;
+    rpcUrl: string;
+    rpc: SorobanRpc.Server;
+    constructor(options: {
+        rpcUrl: string;
+        launchtubeUrl?: string;
+        launchtubeJwt?: string;
+        networkPassphrase: string;
+        factoryContractId: string;
+    });
+    createWallet(name: string, user: string): Promise<{
+        keyId: Buffer;
+        contractId: string;
+        xdr: string;
+    }>;
+    createKey(name: string, user: string): Promise<{
+        keyId: Buffer;
+        publicKey: Buffer;
+    }>;
+    connectWallet(opts: {
+        keyId?: string | Uint8Array;
+        getContractId?: GetContractIdFunction;
+    }): Promise<{
+        keyId: Buffer;
+        contractId: string;
+    }>;
+    signAuthEntry(entry: xdr.SorobanAuthorizationEntry, options?: {
+        keyId?: 'any' | string | Uint8Array;
+        ledgersToLive?: number;
+    }): Promise<xdr.SorobanAuthorizationEntry>;
+    signAuthEntries(entries: xdr.SorobanAuthorizationEntry[], options?: {
+        keyId?: 'any' | string | Uint8Array;
+        ledgersToLive?: number;
+    }): Promise<xdr.SorobanAuthorizationEntry[]>;
+    sign(txn: Transaction | string, options?: {
+        keyId?: 'any' | string | Uint8Array;
+        ledgersToLive?: number;
+    }): Promise<string>;
+    private getPublicKeyObject;
+    private convertEcdsaSignatureAsnToCompact;
+}
+export {};

package/types/tests/index.d.ts

@@ -0,0 +1 @@
+export {};