passkey-kit 0.5.3 → 0.5.5

package/.vscode/settings.json

@@ -2,7 +2,7 @@
     "rust-analyzer.linkedProjects": [
         "./zephyr/Cargo.toml",
         "./contracts/Cargo.toml",
-        "./contracts/contract-webauthn-factory/Cargo.toml",
-        "./contracts/contract-webauthn-secp256r1/Cargo.toml",
+        "./contracts/webauthn-factory/Cargo.toml",
+        "./contracts/webauthn-wallet/Cargo.toml",
     ]
 }

package/cheatsheet

@@ -9,7 +9,7 @@ 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 "CCXIUFR243N7QWKXY44LZO3DVUXHAVBEEJWFGNGNVVB44VJXIYWVGNTR" # don't forget to subscribe to the contract first
+mercury-cli --jwt $MERCURY_JWT --local false --mainnet false catchup --contracts "CDOWBLFYFIWXVUW46QILLAIYIWWCZ63CIRQBG3DK5PDBUVVJ4QVJX2IX" # 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]}"}}}'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "A helper library for creating and using passkey accounts on the Stellar blockchain.",
   "author": "Tyler van der Hoeven",
   "license": "MIT",
@@ -8,6 +8,7 @@
   "main": "src/index.ts",
   "types": "types/index.d.ts",
   "dependencies": {
+    "@darkedges/capacitor-native-webauthn": "^0.0.4",
     "@simplewebauthn/browser": "^10.0.0",
     "@stellar/stellar-sdk": "12.1.0",
     "base64url": "^3.0.1",

package/src/kit.ts

@@ -15,13 +15,21 @@ export class PasskeyKit extends PasskeyBase {
     public networkPassphrase: string
     public factory: FactoryClient
     public wallet: PasskeyClient | undefined
+    public WebAuthn: {
+        startRegistration: typeof startRegistration,
+        startAuthentication: typeof startAuthentication
+    }
 
     constructor(options: {
         rpcUrl: string,
         networkPassphrase: string,
         factoryContractId: string,
+        WebAuthn?: {
+            startRegistration: typeof startRegistration,
+            startAuthentication: typeof startAuthentication
+        }
     }) {
-        const { rpcUrl, networkPassphrase, factoryContractId } = options
+        const { rpcUrl, networkPassphrase, factoryContractId, WebAuthn } = options
 
         super(rpcUrl)
 
@@ -31,6 +39,7 @@ export class PasskeyKit extends PasskeyBase {
             networkPassphrase,
             rpcUrl
         })
+        this.WebAuthn = WebAuthn || { startRegistration, startAuthentication }
     }
 
     public async createWallet(app: string, user: string) {
@@ -57,13 +66,13 @@ export class PasskeyKit extends PasskeyBase {
         }
     }
 
-    public async createKey(app: string, user: string) {
+    public async createKey(app: string, user: string, rpId?: string) {
         const now = new Date()
         const displayName = `${user} — ${now.toLocaleString()}`
-        const { id, response } = await startRegistration({
+        const { id, response } = await this.WebAuthn.startRegistration({
             challenge: base64url("stellaristhebetterblockchain"),
             rp: {
-                // id: undefined,
+                id: rpId,
                 name: app,
             },
             user: {
@@ -72,9 +81,9 @@ export class PasskeyKit extends PasskeyBase {
                 displayName
             },
             // authenticatorSelection: {
-                // requireResidentKey: false,
-                // residentKey: "preferred",
-                // userVerification: "discouraged",
+            //     requireResidentKey: false,
+            //     residentKey: "preferred",
+            //     userVerification: "discouraged",
             // },
             pubKeyCredParams: [{ alg: -7, type: "public-key" }],
             // attestation: "none",
@@ -92,15 +101,16 @@ export class PasskeyKit extends PasskeyBase {
 
     public async connectWallet(opts?: {
         keyId?: string | Uint8Array,
+        rpId?: string,
         getContractId?: (keyId: string) => Promise<string | undefined>
     }) {
-        let { keyId, getContractId } = opts || {}
+        let { keyId, rpId, getContractId } = opts || {}
         let keyIdBuffer: Buffer
 
         if (!keyId) {
-            const response = await startAuthentication({
+            const response = await this.WebAuthn.startAuthentication({
                 challenge: base64url("stellaristhebetterblockchain"),
-                // rpId: undefined,
+                rpId,
                 // userVerification: "discouraged",
                 // timeout: 120_000
             });
@@ -160,10 +170,11 @@ export class PasskeyKit extends PasskeyBase {
         entry: xdr.SorobanAuthorizationEntry,
         options?: {
             keyId?: 'any' | string | Uint8Array
+            rpId?: string,
             ledgersToLive?: number
         }
     ) {
-        let { keyId, ledgersToLive = DEFAULT_TIMEOUT } = options || {}
+        let { keyId, rpId, ledgersToLive = DEFAULT_TIMEOUT } = options || {}
 
         const lastLedger = await this.rpc.getLatestLedger().then(({ sequence }) => sequence)
         const credentials = entry.credentials().address();
@@ -177,18 +188,18 @@ export class PasskeyKit extends PasskeyBase {
         )
         const payload = hash(preimage.toXDR())
 
-        const authenticationResponse = await startAuthentication(
+        const authenticationResponse = await this.WebAuthn.startAuthentication(
             keyId === 'any'
                 || (!keyId && !this.keyId)
                 ? {
                     challenge: base64url(payload),
-                    // rpId: undefined,
+                    rpId,
                     // userVerification: "discouraged",
                     // timeout: 120_000
                 }
                 : {
                     challenge: base64url(payload),
-                    // rpId: undefined,
+                    rpId,
                     allowCredentials: [
                         {
                             id: keyId instanceof Uint8Array
@@ -331,7 +342,7 @@ export class PasskeyKit extends PasskeyBase {
 
                 let publicKeykPrefixSlice = Buffer.from([0xa5, 0x01, 0x02, 0x03, 0x26, 0x20, 0x01, 0x21, 0x58, 0x20])
                 let startIndex = attestationObject.indexOf(publicKeykPrefixSlice)
-                    startIndex = startIndex + publicKeykPrefixSlice.length
+                startIndex = startIndex + publicKeykPrefixSlice.length
 
                 x = attestationObject.slice(startIndex, 32 + startIndex)
                 y = attestationObject.slice(35 + startIndex, 67 + startIndex)

package/src/server.ts

@@ -167,6 +167,7 @@ export class PasskeyServer extends PasskeyBase {
             @Later
     */
 
+    // TODO maybe fee should default to something more dynamic since we have endpoints for getting fee information now
     public async send(xdr: string, fee: number = 10_000) {
         if (!this.launchtubeUrl || !this.launchtubeJwt)
             throw new Error('Launchtube service not configured')

package/types/kit.d.ts

@@ -1,6 +1,7 @@
 import { Client as PasskeyClient } from 'passkey-kit-sdk';
 import { Client as FactoryClient } from 'passkey-factory-sdk';
 import { xdr, Transaction, SorobanRpc } from '@stellar/stellar-sdk';
+import { startRegistration, startAuthentication } from "@simplewebauthn/browser";
 import { Buffer } from 'buffer';
 import { PasskeyBase } from './base';
 export declare class PasskeyKit extends PasskeyBase {
@@ -10,22 +11,31 @@ export declare class PasskeyKit extends PasskeyBase {
     networkPassphrase: string;
     factory: FactoryClient;
     wallet: PasskeyClient | undefined;
+    WebAuthn: {
+        startRegistration: typeof startRegistration;
+        startAuthentication: typeof startAuthentication;
+    };
     constructor(options: {
         rpcUrl: string;
         networkPassphrase: string;
         factoryContractId: string;
+        WebAuthn?: {
+            startRegistration: typeof startRegistration;
+            startAuthentication: typeof startAuthentication;
+        };
     });
     createWallet(app: string, user: string): Promise<{
         keyId: Buffer;
         contractId: string;
         xdr: string | undefined;
     }>;
-    createKey(app: string, user: string): Promise<{
+    createKey(app: string, user: string, rpId?: string): Promise<{
         keyId: Buffer;
         publicKey: Buffer;
     }>;
     connectWallet(opts?: {
         keyId?: string | Uint8Array;
+        rpId?: string;
         getContractId?: (keyId: string) => Promise<string | undefined>;
     }): Promise<{
         keyId: Buffer;
@@ -33,6 +43,7 @@ export declare class PasskeyKit extends PasskeyBase {
     }>;
     signAuthEntry(entry: xdr.SorobanAuthorizationEntry, options?: {
         keyId?: 'any' | string | Uint8Array;
+        rpId?: string;
         ledgersToLive?: number;
     }): Promise<xdr.SorobanAuthorizationEntry>;
     signAuthEntries(entries: xdr.SorobanAuthorizationEntry[], options?: {