passkey-kit 0.7.14 → 0.7.16

package/cheatsheet

@@ -15,8 +15,4 @@ export JWT=???
 mercury-cli --jwt $JWT --local false --mainnet false deploy
 mercury-cli --jwt $JWT --local false --mainnet false catchup --project-name "smart-wallets-data-multi-signer-multi-sig" --contracts CC3TMW7O43G3WJBZ2RVWMBBKL3B5KIO275D2LHQ43KJQF4TUOHFEYVOR
 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\": \"CA4G3X75IGGNXNLXFIVFNYIGC6YAVLA7KSIFFDBSR7RQ7KEZMZWLXQBH\"}"}}}'
-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\": \"CA4G3X75IGGNXNLXFIVFNYIGC6YAVLA7KSIFFDBSR7RQ7KEZMZWLXQBH\"}"}}}'
-
-cp -R ext/js-stellar-sdk/lib/. ext/@stellar/stellar-sdk/
+curl -X POST https://api.mercurydata.app/v2/key -H "Authorization: Bearer $JWT"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.7.14",
+  "version": "0.7.16",
   "description": "A helper library for creating and using passkey accounts on the Stellar blockchain.",
   "author": "Tyler van der Hoeven",
   "license": "MIT",

package/src/index.ts

@@ -1,5 +1,6 @@
-import { PasskeyServer } from "./server"
-import { PasskeyKit, PasskeyClient, FactoryClient, SignerStore, SignerKey, type SignerLimits } from "./kit"
-import { SACClient } from "./sac"
-
-export { PasskeyKit, PasskeyClient, FactoryClient, PasskeyServer, SACClient, SignerStore, SignerKey, type SignerLimits }
+export { SignerStore, SignerKey, type SignerLimits } from './types'
+export { PasskeyKit } from "./kit"
+export { PasskeyServer } from "./server"
+export { SACClient } from "./sac"
+export { Client as PasskeyClient } from 'passkey-kit-sdk'
+export { Client as FactoryClient } from 'passkey-factory-sdk'

package/src/kit.ts

@@ -1,38 +1,13 @@
-import { Client as PasskeyClient, type Signature, type SignerKey as SDKSignerKey, type SignerLimits as SDKSignerLimits } from 'passkey-kit-sdk'
 import { Client as FactoryClient } from 'passkey-factory-sdk'
+import { Client as PasskeyClient, type Signature, type SignerKey as SDKSignerKey, type SignerLimits as SDKSignerLimits } from 'passkey-kit-sdk'
 import { StrKey, hash, xdr, SorobanRpc, Keypair, Address } from '@stellar/stellar-sdk'
-import base64url from 'base64url'
-import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
+import { AssembledTransaction, DEFAULT_TIMEOUT, type Tx } from '@stellar/stellar-sdk/contract'
 import type { AuthenticatorAttestationResponseJSON, AuthenticatorSelectionCriteria } from "@simplewebauthn/types"
+import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import { Buffer } from 'buffer'
+import base64url from 'base64url'
+import type { SignerKey, SignerLimits, SignerStore } from './types'
 import { PasskeyBase } from './base'
-import { AssembledTransaction, DEFAULT_TIMEOUT } from '@stellar/stellar-sdk/contract'
-
-export { Client as PasskeyClient } from 'passkey-kit-sdk'
-export { Client as FactoryClient } from 'passkey-factory-sdk'
-
-export class SignerKey {
-    private constructor(public key: "Policy" | "Ed25519" | "Secp256r1", public value: string) { }
-
-    static Policy(policy: string): SignerKey {
-        return new SignerKey("Policy", policy);
-    }
-
-    static Ed25519(publicKey: string): SignerKey {
-        return new SignerKey("Ed25519", publicKey);
-    }
-
-    static Secp256r1(id: string): SignerKey {
-        return new SignerKey("Secp256r1", id);
-    }
-}
-
-export type SignerLimits = Map<string, SignerKey[] | undefined>
-
-export enum SignerStore {
-    Persistent = 'Persistent',
-    Temporary = 'Temporary',
-}
 
 export class PasskeyKit extends PasskeyBase {
     declare public rpc: SorobanRpc.Server
@@ -139,8 +114,8 @@ export class PasskeyKit extends PasskeyBase {
     }
 
     public async connectWallet(opts?: {
-        keyId?: string | Uint8Array,
         rpId?: string,
+        keyId?: string | Uint8Array,
         getContractId?: (keyId: string) => Promise<string | undefined>
     }) {
         let { keyId, rpId, getContractId } = opts || {}
@@ -187,7 +162,7 @@ export class PasskeyKit extends PasskeyBase {
         }
         // if that fails look up from the `getContractId` function
         catch {
-            contractId = getContractId ? await getContractId(keyId) : undefined
+            contractId = getContractId && await getContractId(keyId)
         }
 
         if (!contractId)
@@ -195,8 +170,8 @@ export class PasskeyKit extends PasskeyBase {
 
         this.wallet = new PasskeyClient({
             contractId,
+            rpcUrl: this.rpcUrl,
             networkPassphrase: this.networkPassphrase,
-            rpcUrl: this.rpcUrl
         })
 
         return {
@@ -393,8 +368,8 @@ export class PasskeyKit extends PasskeyBase {
         return entry
     }
 
-    public sign<T>(
-        txn: AssembledTransaction<T>,
+    public async sign<T>(
+        txn: AssembledTransaction<T> | Tx | string,
         options?: {
             rpId?: string,
             keyId?: 'any' | string | Uint8Array
@@ -403,15 +378,21 @@ export class PasskeyKit extends PasskeyBase {
             expiration?: number
         }
     ) {
-        // TODO ensure we're outputting a built transaction that's actually useful in the case you don't intend to use launchtube
-        // Pretty sure we'll always be woefully under budget
-        return txn.signAuthEntries({
+        if (typeof txn === 'string') {
+            txn = AssembledTransaction.fromXDR(this.wallet!.options, txn, this.wallet!.spec)
+        } else if (!(txn instanceof AssembledTransaction)) {
+            txn = AssembledTransaction.fromXDR(this.wallet!.options, txn.toXDR(), this.wallet!.spec)
+        }
+
+        await txn.signAuthEntries({
             address: this.wallet!.options.contractId,
             authorizeEntry: (entry) => {
                 const clone = xdr.SorobanAuthorizationEntry.fromXDR(entry.toXDR())
                 return this.signAuthEntry(clone, options)
             },
         })
+
+        return txn
     }
 
     public addSecp256r1(keyId: Uint8Array, publicKey: Uint8Array, limits: SignerLimits, store: SignerStore) {

package/src/server.ts

@@ -8,6 +8,7 @@ export class PasskeyServer extends PasskeyBase {
     public launchtubeJwt: string | undefined
     public mercuryUrl: string | undefined
     public mercuryJwt: string | undefined
+    public mercuryKey: string | undefined
 
     constructor(options: {
         rpcUrl?: string,
@@ -15,6 +16,7 @@ export class PasskeyServer extends PasskeyBase {
         launchtubeJwt?: string,
         mercuryUrl?: string,
         mercuryJwt?: string,
+        mercuryKey?: string,
     }) {
         const {
             rpcUrl,
@@ -22,6 +24,7 @@ export class PasskeyServer extends PasskeyBase {
             launchtubeJwt,
             mercuryUrl,
             mercuryJwt,
+            mercuryKey,
         } = options
 
         super(rpcUrl)
@@ -37,17 +40,20 @@ export class PasskeyServer extends PasskeyBase {
 
         if (mercuryJwt)
             this.mercuryJwt = mercuryJwt
+
+        if (mercuryKey)
+            this.mercuryKey = mercuryKey
     }
 
     public async getSigners(contractId: string) {
-        if (!this.rpc || !this.mercuryUrl || !this.mercuryJwt)
+        if (!this.rpc || !this.mercuryUrl || (!this.mercuryJwt && !this.mercuryKey))
             throw new Error('Mercury service not configured')
 
         const signers = await fetch(`${this.mercuryUrl}/zephyr/execute`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
-                Authorization: `Bearer ${this.mercuryJwt}`
+                Authorization: this.mercuryJwt ? `Bearer ${this.mercuryJwt}` : this.mercuryKey!
             },
             body: JSON.stringify({
                 project_name: 'smart-wallets-data-multi-signer-multi-sig',
@@ -87,37 +93,52 @@ export class PasskeyServer extends PasskeyBase {
         }[]
     }
 
-    public async getContractId(keyId: string) {
-        if (!this.mercuryUrl || !this.mercuryJwt)
-            return
+    public async getContractId(options: {
+        keyId?: string,
+        publicKey?: string,
+        policy?: string,
+    }, index = 0) {
+        if (!this.mercuryUrl || (!this.mercuryJwt && !this.mercuryKey))
+            throw new Error('Mercury service not configured')
+
+        let { keyId, publicKey, policy } = options || {}
+
+        if ([keyId, publicKey, policy].filter((arg) => !!arg).length > 1)
+            throw new Error('Exactly one of `options.keyId`, `options.publicKey`, or `options.policy` must be provided.');
+
+        let args: { key: string, kind: 'Secp256r1' | 'Ed25519' | 'Policy' }
+
+        if (keyId)
+            args = { key: keyId, kind: 'Secp256r1' }
+        else if (publicKey)
+            args = { key: publicKey, kind: 'Ed25519' }
+        else if (policy)
+            args = { key: policy, kind: 'Policy' }
 
         const res = await fetch(`${this.mercuryUrl}/zephyr/execute`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
-                Authorization: `Bearer ${this.mercuryJwt}`
+                Authorization: this.mercuryJwt ? `Bearer ${this.mercuryJwt}` : this.mercuryKey!
             },
             body: JSON.stringify({
                 project_name: 'smart-wallets-data-multi-signer-multi-sig',
                 mode: {
                     Function: {
-                        fname: "get_address_by_signer",
-                        arguments: JSON.stringify({
-                            key: keyId,
-                            kind: 'Secp256r1'
-                        })
+                        fname: "get_addresses_by_signer",
+                        arguments: JSON.stringify(args!)
                     }
                 }
             })
         })
             .then(async (res) => {
                 if (res.ok)
-                    return res.json()
+                    return await res.json() as string[]
 
                 throw await res.json()
             })
 
-        return res || undefined as string | undefined
+        return res[index]
     }
 
     /* LATER

package/src/types.ts

@@ -0,0 +1,22 @@
+export class SignerKey {
+    private constructor(public key: "Policy" | "Ed25519" | "Secp256r1", public value: string) { }
+
+    static Policy(policy: string): SignerKey {
+        return new SignerKey("Policy", policy);
+    }
+
+    static Ed25519(publicKey: string): SignerKey {
+        return new SignerKey("Ed25519", publicKey);
+    }
+
+    static Secp256r1(id: string): SignerKey {
+        return new SignerKey("Secp256r1", id);
+    }
+}
+
+export type SignerLimits = Map<string, SignerKey[] | undefined>
+
+export enum SignerStore {
+    Persistent = 'Persistent',
+    Temporary = 'Temporary',
+}

package/types/index.d.ts

@@ -1,4 +1,6 @@
-import { PasskeyServer } from "./server";
-import { PasskeyKit, PasskeyClient, FactoryClient, SignerStore, SignerKey, type SignerLimits } from "./kit";
-import { SACClient } from "./sac";
-export { PasskeyKit, PasskeyClient, FactoryClient, PasskeyServer, SACClient, SignerStore, SignerKey, type SignerLimits };
+export { SignerStore, SignerKey, type SignerLimits } from './types';
+export { PasskeyKit } from "./kit";
+export { PasskeyServer } from "./server";
+export { SACClient } from "./sac";
+export { Client as PasskeyClient } from 'passkey-kit-sdk';
+export { Client as FactoryClient } from 'passkey-factory-sdk';

package/types/kit.d.ts

@@ -1,26 +1,12 @@
-import { Client as PasskeyClient } from 'passkey-kit-sdk';
 import { Client as FactoryClient } from 'passkey-factory-sdk';
+import { Client as PasskeyClient } from 'passkey-kit-sdk';
 import { xdr, SorobanRpc, Keypair } from '@stellar/stellar-sdk';
-import { startRegistration, startAuthentication } from "@simplewebauthn/browser";
+import { AssembledTransaction, type Tx } from '@stellar/stellar-sdk/contract';
 import type { AuthenticatorSelectionCriteria } from "@simplewebauthn/types";
+import { startRegistration, startAuthentication } from "@simplewebauthn/browser";
 import { Buffer } from 'buffer';
+import type { SignerKey, SignerLimits, SignerStore } from './types';
 import { PasskeyBase } from './base';
-import { AssembledTransaction } from '@stellar/stellar-sdk/contract';
-export { Client as PasskeyClient } from 'passkey-kit-sdk';
-export { Client as FactoryClient } from 'passkey-factory-sdk';
-export declare class SignerKey {
-    key: "Policy" | "Ed25519" | "Secp256r1";
-    value: string;
-    private constructor();
-    static Policy(policy: string): SignerKey;
-    static Ed25519(publicKey: string): SignerKey;
-    static Secp256r1(id: string): SignerKey;
-}
-export type SignerLimits = Map<string, SignerKey[] | undefined>;
-export declare enum SignerStore {
-    Persistent = "Persistent",
-    Temporary = "Temporary"
-}
 export declare class PasskeyKit extends PasskeyBase {
     rpc: SorobanRpc.Server;
     rpcUrl: string;
@@ -44,7 +30,7 @@ export declare class PasskeyKit extends PasskeyBase {
     createWallet(app: string, user: string): Promise<{
         keyId: Buffer;
         contractId: string;
-        built: import("@stellar/stellar-sdk/contract").Tx;
+        built: Tx;
     }>;
     createKey(app: string, user: string, settings?: {
         rpId?: string;
@@ -54,8 +40,8 @@ export declare class PasskeyKit extends PasskeyBase {
         publicKey: Buffer;
     }>;
     connectWallet(opts?: {
-        keyId?: string | Uint8Array;
         rpId?: string;
+        keyId?: string | Uint8Array;
         getContractId?: (keyId: string) => Promise<string | undefined>;
     }): Promise<{
         keyId: Buffer;
@@ -68,13 +54,13 @@ export declare class PasskeyKit extends PasskeyBase {
         policy?: string;
         expiration?: number;
     }): Promise<xdr.SorobanAuthorizationEntry>;
-    sign<T>(txn: AssembledTransaction<T>, options?: {
+    sign<T>(txn: AssembledTransaction<T> | Tx | string, options?: {
         rpId?: string;
         keyId?: 'any' | string | Uint8Array;
         keypair?: Keypair;
         policy?: string;
         expiration?: number;
-    }): Promise<void>;
+    }): Promise<AssembledTransaction<T>>;
     addSecp256r1(keyId: Uint8Array, publicKey: Uint8Array, limits: SignerLimits, store: SignerStore): Promise<AssembledTransaction<import("@stellar/stellar-sdk/contract").Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>>;
     addEd25519(publicKey: string, limits: SignerLimits, store: SignerStore): Promise<AssembledTransaction<import("@stellar/stellar-sdk/contract").Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>>;
     addPolicy(policy: string, limits: SignerLimits, store: SignerStore): Promise<AssembledTransaction<import("@stellar/stellar-sdk/contract").Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>>;

package/types/server.d.ts

@@ -5,12 +5,14 @@ export declare class PasskeyServer extends PasskeyBase {
     launchtubeJwt: string | undefined;
     mercuryUrl: string | undefined;
     mercuryJwt: string | undefined;
+    mercuryKey: string | undefined;
     constructor(options: {
         rpcUrl?: string;
         launchtubeUrl?: string;
         launchtubeJwt?: string;
         mercuryUrl?: string;
         mercuryJwt?: string;
+        mercuryKey?: string;
     });
     getSigners(contractId: string): Promise<{
         kind: string;
@@ -19,6 +21,10 @@ export declare class PasskeyServer extends PasskeyBase {
         limits: string;
         expired?: boolean;
     }[]>;
-    getContractId(keyId: string): Promise<any>;
+    getContractId(options: {
+        keyId?: string;
+        publicKey?: string;
+        policy?: string;
+    }, index?: number): Promise<string>;
     send(txn: Tx, fee?: number): Promise<any>;
 }

package/types/types.d.ts

@@ -0,0 +1,13 @@
+export declare class SignerKey {
+    key: "Policy" | "Ed25519" | "Secp256r1";
+    value: string;
+    private constructor();
+    static Policy(policy: string): SignerKey;
+    static Ed25519(publicKey: string): SignerKey;
+    static Secp256r1(id: string): SignerKey;
+}
+export type SignerLimits = Map<string, SignerKey[] | undefined>;
+export declare enum SignerStore {
+    Persistent = "Persistent",
+    Temporary = "Temporary"
+}