passkey-kit 0.4.2 → 0.4.4

package/package.json

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

package/src/base.ts

@@ -1,12 +1,9 @@
-import { Networks, SorobanRpc, xdr } from "@stellar/stellar-sdk"
-import { Client as FactoryClient } from 'passkey-factory-sdk'
+import { SorobanRpc, xdr } from "@stellar/stellar-sdk"
 import base64url from "base64url"
 
 export class PasskeyBase {
-    public rpc: SorobanRpc.Server
-    public factory: FactoryClient
-    public rpcUrl: string
-    public networkPassphrase: Networks
+    public rpc: SorobanRpc.Server | undefined
+    public rpcUrl: string | undefined
     public launchtubeUrl: string | undefined
     public launchtubeJwt: string | undefined
     public mercuryUrl: string | undefined
@@ -15,9 +12,7 @@ export class PasskeyBase {
     public mercuryPassword: string | undefined
 
     constructor(options: {
-        rpcUrl: string,
-        networkPassphrase: string,
-        factoryContractId: string,
+        rpcUrl?: string,
         launchtubeUrl?: string,
         launchtubeJwt?: string,
         mercuryUrl?: string,
@@ -27,8 +22,6 @@ export class PasskeyBase {
     }) {
         const {
             rpcUrl,
-            networkPassphrase,
-            factoryContractId,
             launchtubeUrl,
             launchtubeJwt,
             mercuryUrl,
@@ -55,17 +48,16 @@ export class PasskeyBase {
         if (mercuryPassword)
             this.mercuryPassword = mercuryPassword
 
-        this.rpcUrl = rpcUrl
-        this.rpc = new SorobanRpc.Server(rpcUrl)
-        this.networkPassphrase = networkPassphrase as Networks
-        this.factory = new FactoryClient({
-            contractId: factoryContractId,
-            networkPassphrase,
-            rpcUrl
-        })
+        if (!mercuryJwt && mercuryUrl && mercuryEmail && mercuryPassword)
+            this.setMercuryJwt()
+
+        if (rpcUrl) {
+            this.rpcUrl = rpcUrl
+            this.rpc = new SorobanRpc.Server(rpcUrl)
+        }
     }
 
-    public async getMercuryJwt() {
+    public async setMercuryJwt() {
         if (!this.mercuryEmail || !this.mercuryPassword)
             throw new Error('Mercury service not configured')
 
@@ -92,11 +84,12 @@ export class PasskeyBase {
                 throw await res.json()
             })
 
+        this.mercuryJwt = jwtToken
         return jwtToken
     }
 
-    public async getSigners(contractId: string = this.factory.options.contractId) {
-        if (!this.mercuryUrl || !this.mercuryJwt)
+    public async getSigners(contractId: string) {
+        if (!this.rpc || !this.mercuryUrl || !this.mercuryJwt)
             throw new Error('Mercury service not configured')
 
         const signers = await fetch(`${this.mercuryUrl}/zephyr/execute`, {

package/src/kit.ts

@@ -1,5 +1,5 @@
 import { Client as PasskeyClient } from 'passkey-kit-sdk'
-
+import { Client as FactoryClient } from 'passkey-factory-sdk'
 import { Address, StrKey, hash, xdr, Transaction, SorobanRpc, Operation, TransactionBuilder } from '@stellar/stellar-sdk'
 import base64url from 'base64url'
 import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
@@ -10,6 +10,8 @@ import { PasskeyBase } from './base'
 
 export class PasskeyKit extends PasskeyBase {
     public keyId: string | undefined
+    public networkPassphrase: string
+    public factory: FactoryClient
     public wallet: PasskeyClient | undefined
 
     constructor(options: {
@@ -23,7 +25,22 @@ export class PasskeyKit extends PasskeyBase {
         mercuryEmail?: string,
         mercuryPassword?: string
     }) {
+        const { rpcUrl, networkPassphrase, factoryContractId } = options
+
         super(options)
+
+        if (!this.rpcUrl)
+            this.rpcUrl = rpcUrl
+
+        if (!this.rpc)
+            this.rpc = new SorobanRpc.Server(rpcUrl)
+
+        this.networkPassphrase = networkPassphrase
+        this.factory = new FactoryClient({
+            contractId: factoryContractId,
+            networkPassphrase,
+            rpcUrl
+        })
     }
 
     public async createWallet(app: string, user: string) {
@@ -129,7 +146,7 @@ export class PasskeyKit extends PasskeyBase {
         // attempt passkey id derivation
         try {
             // TODO what is the error if the entry exists but is archived?
-            await this.rpc.getContractData(contractId, xdr.ScVal.scvLedgerKeyContractInstance())
+            await this.rpc!.getContractData(contractId, xdr.ScVal.scvLedgerKeyContractInstance())
         }
         // if that fails look up from the `getContractId` function
         catch {
@@ -161,7 +178,7 @@ export class PasskeyKit extends PasskeyBase {
         // Default mirrors DEFAULT_TIMEOUT (currently 5 minutes) https://github.com/stellar/js-stellar-sdk/blob/master/src/contract/utils.ts#L7
         let { keyId, ledgersToLive = 60 } = options || {}
 
-        const lastLedger = await this.rpc.getLatestLedger().then(({ sequence }) => sequence)
+        const lastLedger = await this.rpc!.getLatestLedger().then(({ sequence }) => sequence)
         const credentials = entry.credentials().address();
         const preimage = xdr.HashIdPreimage.envelopeTypeSorobanAuthorization(
             new xdr.HashIdPreimageSorobanAuthorization({
@@ -284,7 +301,7 @@ export class PasskeyKit extends PasskeyBase {
                 await this.signAuthEntries(entries, options)
         }
 
-        const sim = await this.rpc.simulateTransaction(txn)
+        const sim = await this.rpc!.simulateTransaction(txn)
 
         if (
             SorobanRpc.Api.isSimulationError(sim)

package/types/base.d.ts

@@ -1,10 +1,7 @@
-import { Networks, SorobanRpc } from "@stellar/stellar-sdk";
-import { Client as FactoryClient } from 'passkey-factory-sdk';
+import { SorobanRpc } from "@stellar/stellar-sdk";
 export declare class PasskeyBase {
-    rpc: SorobanRpc.Server;
-    factory: FactoryClient;
-    rpcUrl: string;
-    networkPassphrase: Networks;
+    rpc: SorobanRpc.Server | undefined;
+    rpcUrl: string | undefined;
     launchtubeUrl: string | undefined;
     launchtubeJwt: string | undefined;
     mercuryUrl: string | undefined;
@@ -12,9 +9,7 @@ export declare class PasskeyBase {
     mercuryEmail: string | undefined;
     mercuryPassword: string | undefined;
     constructor(options: {
-        rpcUrl: string;
-        networkPassphrase: string;
-        factoryContractId: string;
+        rpcUrl?: string;
         launchtubeUrl?: string;
         launchtubeJwt?: string;
         mercuryUrl?: string;
@@ -22,8 +17,8 @@ export declare class PasskeyBase {
         mercuryEmail?: string;
         mercuryPassword?: string;
     });
-    getMercuryJwt(): Promise<any>;
-    getSigners(contractId?: string): Promise<{
+    setMercuryJwt(): Promise<any>;
+    getSigners(contractId: string): Promise<{
         id: string;
         pk: string;
         admin: boolean;

package/types/kit.d.ts

@@ -1,9 +1,12 @@
 import { Client as PasskeyClient } from 'passkey-kit-sdk';
+import { Client as FactoryClient } from 'passkey-factory-sdk';
 import { xdr, Transaction } from '@stellar/stellar-sdk';
 import { Buffer } from 'buffer';
 import { PasskeyBase } from './base';
 export declare class PasskeyKit extends PasskeyBase {
     keyId: string | undefined;
+    networkPassphrase: string;
+    factory: FactoryClient;
     wallet: PasskeyClient | undefined;
     constructor(options: {
         rpcUrl: string;