passkey-kit 0.7.14 → 0.7.15

package/package.json

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

package/src/kit.ts

@@ -6,7 +6,7 @@ import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import type { AuthenticatorAttestationResponseJSON, AuthenticatorSelectionCriteria } from "@simplewebauthn/types"
 import { Buffer } from 'buffer'
 import { PasskeyBase } from './base'
-import { AssembledTransaction, DEFAULT_TIMEOUT } from '@stellar/stellar-sdk/contract'
+import { AssembledTransaction, DEFAULT_TIMEOUT, type Tx } from '@stellar/stellar-sdk/contract'
 
 export { Client as PasskeyClient } from 'passkey-kit-sdk'
 export { Client as FactoryClient } from 'passkey-factory-sdk'
@@ -187,7 +187,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 +195,8 @@ export class PasskeyKit extends PasskeyBase {
 
         this.wallet = new PasskeyClient({
             contractId,
+            rpcUrl: this.rpcUrl,
             networkPassphrase: this.networkPassphrase,
-            rpcUrl: this.rpcUrl
         })
 
         return {
@@ -393,8 +393,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 +403,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

@@ -87,9 +87,29 @@ export class PasskeyServer extends PasskeyBase {
         }[]
     }
 
-    public async getContractId(keyId: string) {
+    public async getContractId(options: {
+        keyId?: string,
+        publicKey?: string,
+        policy?: string,
+    }, index = 0) {
         if (!this.mercuryUrl || !this.mercuryJwt)
-            return
+            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' }
+        else
+            throw new Error('Exactly one of `options.keyId`, `options.publicKey`, or `options.policy` must be provided.');
 
         const res = await fetch(`${this.mercuryUrl}/zephyr/execute`, {
             method: 'POST',
@@ -101,23 +121,20 @@ export class PasskeyServer extends PasskeyBase {
                 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/types/kit.d.ts

@@ -5,7 +5,7 @@ import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import type { AuthenticatorSelectionCriteria } from "@simplewebauthn/types";
 import { Buffer } from 'buffer';
 import { PasskeyBase } from './base';
-import { AssembledTransaction } from '@stellar/stellar-sdk/contract';
+import { AssembledTransaction, type Tx } 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 {
@@ -44,7 +44,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;
@@ -68,13 +68,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

@@ -19,6 +19,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>;
 }