passkey-kit 0.5.1 → 0.5.3

package/README.md

@@ -1,6 +1,6 @@
 # Passkey Kit
 
-Passkey kit is a basic TypeScript SDK for creating and managing Stellar smart wallets. It's intended to be used in tandem with [Launchtube](https://github.com/kalepail/launchtube) for submitting passkey signed transactions onchain however this is not a requirement. This is both a client and a server side library. `PasskeyKit` on the client and `PasskeyBase` on the server.
+Passkey kit is a basic TypeScript SDK for creating and managing Stellar smart wallets. It's intended to be used in tandem with [Launchtube](https://github.com/kalepail/launchtube) for submitting passkey signed transactions onchain however this is not a requirement. This is both a client and a server side library. `PasskeyKit` on the client and `PasskeyServer` on the server.
 
 Demo site: [passkey-kit-demo.pages.dev](https://passkey-kit-demo.pages.dev/)
 
@@ -20,7 +20,7 @@ const account = new PasskeyKit({
 
 On the server:
 ```ts
-const account = new PasskeyBase({
+const account = new PasskeyServer({
     rpcUrl: env.PUBLIC_rpcUrl,
     launchtubeUrl: env.PUBLIC_launchtubeUrl,
     launchtubeJwt: env.PRIVATE_launchtubeJwt,
@@ -30,9 +30,15 @@ const account = new PasskeyBase({
 });
 ```
 
-Note that while I don't recommend it you can use the server-intended `send` method on the client side by passing in the `launchtubeUrl` and `launchtubeJwt` values to the `PasskeyKit` constructor. We do this in the `./demo` site to ease demonstration, development and experimentation, however in a production environment you'll want to keep your secrets safe on the server.
+This is a fully typed library so docs aren't provided, however there's a full example showcasing all the core public methods in the `./demo` directory. I also recommend reviewing the [Super Peach](https://github.com/kalepail/superpeach) repo for an example of how you could implement both the client and server side in a more real-world scenario.
+
+Good luck, have fun, and change the world!
+
+For any questions or to showcase your progress please join the `#passkeys` channel on our [Discord](https://discord.gg/stellardev).
+
+## Deploy the event indexer
 
-In order to utilize the zephyr indexing service to track available signers and reverse lookup smart wallet contract addresses from passkey ids you'll need to deploy the Zephyr program from inside the `./zephyr` directory.
+In order to utilize the Mercury Zephyr indexing service to track available signers and reverse lookup smart wallet contract addresses from passkey ids you'll need to deploy the Zephyr program from inside the `./zephyr` directory.
 
 ```bash
 cd ./zephyr
@@ -43,13 +49,7 @@ export MERCURY_JWT="<YOUR.MERCURY.JWT>"
 mercury-cli --jwt $MERCURY_JWT --local false --mainnet false deploy
 ```
 
-This is a fully typed library so docs aren't provided, however there's a full example showcasing all the core public methods in the `./demo` directory. I also recommend reviewing the [Super Peach](https://github.com/kalepail/superpeach) repo for an example of how you could implement both the client and server side in a more real-world scenario.
-
-Good luck, have fun, and change the world!
-
-For any questions or to showcase your progress please join the `#passkeys` channel on our [Discord](https://discord.gg/stellardev).
-
-## Some Notes
+## TypeScript gotchas
 
 This is a TypeScript library and the npm package doesn't export a JavaScript version. The `@stellar/stellar-sdk` library is enormous and I really don't wan't folks bundling it up twice. Therefore you'll need to ensure you're transpiling this library into your project and that goes for either a TS project or a JS one. For many of you this will "just work" but for others you'll need to do some fiddling.
 
@@ -60,7 +60,8 @@ const nextConfig = {
     transpilePackages: [
         'passkey-kit', 
         'passkey-factory-sdk', 
-        'passkey-kit-sdk'
+        'passkey-kit-sdk',
+        'sac-sdk',
     ]
 };
 
@@ -71,10 +72,10 @@ If someone smarter than me knows how to include an optional JS build from a TS l
 ## Contributing 
 
 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.
+- `./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.
 
 To install dependencies:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "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,6 +6,7 @@ import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import type { AuthenticatorAttestationResponseJSON } from "@simplewebauthn/types"
 import { Buffer } from 'buffer'
 import { PasskeyBase } from './base'
+import { DEFAULT_TIMEOUT } from '@stellar/stellar-sdk/contract'
 
 export class PasskeyKit extends PasskeyBase {
     declare public rpc: SorobanRpc.Server
@@ -41,7 +42,7 @@ export class PasskeyKit extends PasskeyBase {
             pk: publicKey
         })
 
-        const contractId = result.unwrap() as string
+        const contractId = result.unwrap()
 
         this.wallet = new PasskeyClient({
             contractId,
@@ -52,7 +53,7 @@ export class PasskeyKit extends PasskeyBase {
         return {
             keyId,
             contractId,
-            xdr: built!.toXDR() as string
+            xdr: built?.toXDR()
         }
     }
 
@@ -70,14 +71,14 @@ export class PasskeyKit extends PasskeyBase {
                 name: displayName,
                 displayName
             },
-            authenticatorSelection: {
-                requireResidentKey: false,
-                residentKey: "preferred",
-                userVerification: "discouraged",
-            },
+            // authenticatorSelection: {
+                // requireResidentKey: false,
+                // residentKey: "preferred",
+                // userVerification: "discouraged",
+            // },
             pubKeyCredParams: [{ alg: -7, type: "public-key" }],
-            attestation: "none",
-            timeout: 120_000,
+            // attestation: "none",
+            // timeout: 120_000,
         });
 
         if (!this.keyId)
@@ -100,8 +101,8 @@ export class PasskeyKit extends PasskeyBase {
             const response = await startAuthentication({
                 challenge: base64url("stellaristhebetterblockchain"),
                 // rpId: undefined,
-                userVerification: "discouraged",
-                timeout: 120_000
+                // userVerification: "discouraged",
+                // timeout: 120_000
             });
 
             keyId = response.id
@@ -162,8 +163,7 @@ export class PasskeyKit extends PasskeyBase {
             ledgersToLive?: number
         }
     ) {
-        // 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 || {}
+        let { keyId, ledgersToLive = DEFAULT_TIMEOUT } = options || {}
 
         const lastLedger = await this.rpc.getLatestLedger().then(({ sequence }) => sequence)
         const credentials = entry.credentials().address();
@@ -183,8 +183,8 @@ export class PasskeyKit extends PasskeyBase {
                 ? {
                     challenge: base64url(payload),
                     // rpId: undefined,
-                    userVerification: "discouraged",
-                    timeout: 120_000
+                    // userVerification: "discouraged",
+                    // timeout: 120_000
                 }
                 : {
                     challenge: base64url(payload),
@@ -197,8 +197,8 @@ export class PasskeyKit extends PasskeyBase {
                             type: "public-key",
                         },
                     ],
-                    userVerification: "discouraged",
-                    timeout: 120_000
+                    // userVerification: "discouraged",
+                    // timeout: 120_000
                 }
         );
 
@@ -242,7 +242,7 @@ export class PasskeyKit extends PasskeyBase {
                 && auth.credentials().address().address().switch().name === 'scAddressTypeContract'
             ) {
                 // If auth entry matches our Smart Wallet move forward with the signature request
-                if (Address.contract(auth.credentials().address().address().contractId()).toString() === this.wallet!.options.contractId)
+                if (Address.contract(auth.credentials().address().address().contractId()).toString() === this.wallet?.options.contractId)
                     await this.signAuthEntry(auth, options)
             }
         }
@@ -309,7 +309,7 @@ export class PasskeyKit extends PasskeyBase {
 
         if (response.publicKey) {
             publicKey = base64url.toBuffer(response.publicKey)
-            publicKey = publicKey!.slice(publicKey!.length - 65)
+            publicKey = publicKey?.slice(publicKey.length - 65)
         }
 
         if (
@@ -327,13 +327,14 @@ export class PasskeyKit extends PasskeyBase {
                 x = authenticatorData.slice(65 + credentialIdLength, 97 + credentialIdLength)
                 y = authenticatorData.slice(100 + credentialIdLength, 132 + credentialIdLength)
             } else {
-                const attestationData = base64url.toBuffer(response.attestationObject)
-                
-                let startIndex = attestationData.indexOf(0xa5, 0x01, 0x02, 0x03, 0x26, 0x20, 0x01, 0x21, 0x58, 0x20)
-                    startIndex = startIndex + startIndex.length
+                const attestationObject = base64url.toBuffer(response.attestationObject)
+
+                let publicKeykPrefixSlice = Buffer.from([0xa5, 0x01, 0x02, 0x03, 0x26, 0x20, 0x01, 0x21, 0x58, 0x20])
+                let startIndex = attestationObject.indexOf(publicKeykPrefixSlice)
+                    startIndex = startIndex + publicKeykPrefixSlice.length
 
-                x = attestationData.slice(startIndex, 32 + startIndex)
-                y = attestationData.slice(35 + startIndex, 67 + startIndex)
+                x = attestationObject.slice(startIndex, 32 + startIndex)
+                y = attestationObject.slice(35 + startIndex, 67 + startIndex)
             }
 
             publicKey = Buffer.from([

package/src/sac.ts

@@ -1,10 +1,11 @@
-import { SorobanRpc } from "@stellar/stellar-sdk"
 import { Client as SacClient } from 'sac-sdk'
+import { PasskeyBase } from "./base"
+import type { SorobanRpc } from '@stellar/stellar-sdk'
 
-export class SACClient {
+export class SACClient extends PasskeyBase {
+    declare public rpc: SorobanRpc.Server
+    declare public rpcUrl: string
     public networkPassphrase: string
-    public rpcUrl: string
-    public rpc: SorobanRpc.Server
     
     constructor(options: {
         networkPassphrase: string,
@@ -12,9 +13,9 @@ export class SACClient {
     }) {
         const { networkPassphrase, rpcUrl } = options
 
+        super(rpcUrl)
+
         this.networkPassphrase = networkPassphrase
-        this.rpcUrl = rpcUrl
-        this.rpc = new SorobanRpc.Server(rpcUrl)
     }
 
     public getSACClient(SACContractId: string) {
@@ -23,72 +24,5 @@ export class SACClient {
             networkPassphrase: this.networkPassphrase,
             rpcUrl: this.rpcUrl
         })
-
-        // switch (command) {
-        //     case SacCommands.Allowance:
-        //         return sac.allowance(args)
-        //     case SacCommands.Authorized:
-        //         return sac.authorized(args)
-        //     case SacCommands.Approve:
-        //         return sac.approve(args)
-        //     case SacCommands.Balance:
-        //         return sac.balance(args)
-        //     case SacCommands.Burn:
-        //         return sac.burn(args)
-        //     case SacCommands.BurnFrom:
-        //         return sac.burn_from(args)
-        //     case SacCommands.Clawback:
-        //         return sac.clawback(args)
-        //     case SacCommands.Decimals:
-        //         return sac.decimals(args)
-        //     case SacCommands.Mint:
-        //         return sac.mint(args)
-        //     case SacCommands.Name:
-        //         return sac.name(args)
-        //     case SacCommands.SetAdmin:
-        //         return sac.set_admin(args)
-        //     case SacCommands.Admin:
-        //         return sac.admin(args)
-        //     case SacCommands.SetAuthorized:
-        //         return sac.set_authorized(args)
-        //     case SacCommands.Symbol:
-        //         return sac.symbol(args)
-        //     case SacCommands.Transfer:
-        //         return sac.transfer(args)
-        //     case SacCommands.TransferFrom:
-        //         return sac.transfer_from(args)
-        //     default:
-        //         throw new Error('Invalid command')
-        // }
-
-        // const { SAC, from, to, amount, fee = 0 } = args
-        // const txn = new TransactionBuilder(mockSource, {
-        //     fee: fee.toString(),
-        //     networkPassphrase: import.meta.env.VITE_networkPassphrase
-        // })
-        //     .addOperation(Operation.invokeContractFunction({
-        //         contract: SAC,
-        //         function: 'transfer',
-        //         args: [
-        //             nativeToScVal(from, { type: 'address' }),
-        //             nativeToScVal(to, { type: 'address' }),
-        //             nativeToScVal(amount, { type: 'i128' })
-        //         ],
-        //     }))
-        //     .setTimeout(5 * 60)
-        //     .build()
-    
-        // const sim = await rpc.simulateTransaction(txn)
-    
-        // if (
-        //     SorobanRpc.Api.isSimulationError(sim)
-        //     || SorobanRpc.Api.isSimulationRestore(sim)
-        // ) throw sim
-    
-        // return {
-        //     txn,
-        //     sim,
-        //     built: SorobanRpc.assembleTransaction(txn, sim).build()
-        // }
     }
 }

package/tsconfig.json

@@ -6,7 +6,7 @@
     "module": "ESNext",
     "moduleDetection": "force",
     // Bundler mode
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "allowImportingTsExtensions": true,
     "verbatimModuleSyntax": true,
     "declaration": true,
@@ -21,12 +21,7 @@
     "noPropertyAccessFromIndexSignature": false,
     "strictNullChecks": true,
   },
-  "exclude": [
-    "./bun_tests",
-    "./contracts", 
-    "./demo", 
-    "./packages",
-    "./types", 
-    "./zephyr", 
-  ]
+  "include": [
+    "src/*",
+  ],
 }

package/types/kit.d.ts

@@ -18,7 +18,7 @@ export declare class PasskeyKit extends PasskeyBase {
     createWallet(app: string, user: string): Promise<{
         keyId: Buffer;
         contractId: string;
-        xdr: string;
+        xdr: string | undefined;
     }>;
     createKey(app: string, user: string): Promise<{
         keyId: Buffer;

package/types/sac.d.ts

@@ -1,9 +1,10 @@
-import { SorobanRpc } from "@stellar/stellar-sdk";
 import { Client as SacClient } from 'sac-sdk';
-export declare class SACClient {
-    networkPassphrase: string;
-    rpcUrl: string;
+import { PasskeyBase } from "./base";
+import type { SorobanRpc } from '@stellar/stellar-sdk';
+export declare class SACClient extends PasskeyBase {
     rpc: SorobanRpc.Server;
+    rpcUrl: string;
+    networkPassphrase: string;
     constructor(options: {
         networkPassphrase: string;
         rpcUrl: string;