passkey-kit 0.7.4 → 0.7.5

package/cheatsheet

@@ -13,8 +13,10 @@ stellar contract deploy --wasm target/wasm32-unknown-unknown/release/sample_poli
 
 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 "CBMMJ55OQSFSYASVENVHW55QNA4Q52GE42P23E4V7O37GKMETKOFFENA"
+mercury-cli --jwt $JWT --local false --mainnet false catchup --project-name "smart-wallets-data-multi-signer-multi-sig" --contracts "CAGXSSDBSFBI5633C4O4KF53XPU64BMX36JMJTJNITOAWGP442XHZSHM"
 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\"}"}}}'
+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/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "A helper library for creating and using passkey accounts on the Stellar blockchain.",
   "author": "Tyler van der Hoeven",
   "license": "MIT",
@@ -10,19 +10,22 @@
   "dependencies": {
     "@darkedges/capacitor-native-webauthn": "^0.0.4",
     "@simplewebauthn/browser": "^10.0.0",
-    "@stellar/stellar-sdk": "12.3.0",
+    "@stellar/stellar-sdk": "file:./ext/js-stellar-sdk",
     "base64url": "^3.0.1",
     "buffer": "^6.0.3",
     "passkey-factory-sdk": "0.3.1",
-    "passkey-kit-sdk": "0.3.1",
-    "sac-sdk": "0.1.0"
+    "sac-sdk": "0.1.0",
+    "passkey-kit-sdk": "0.3.1"
   },
   "devDependencies": {
     "@simplewebauthn/types": "^10.0.0",
+    "@types/node": "^22.7.3",
     "typescript": "^5.6.2"
   },
   "workspaces": [
-    "packages/*"
+    "packages/passkey-factory-sdk",
+    "packages/passkey-kit-sdk",
+    "packages/sac-sdk"
   ],
   "engine": {
     "node": ">=20"

package/packages/passkey-factory-sdk/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.3.0"
+    "@stellar/stellar-sdk": "file:../../ext/js-stellar-sdk"
   },
   "devDependencies": {
     "typescript": "5.6.2"

package/packages/passkey-factory-sdk/src/index.ts

@@ -30,7 +30,7 @@ if (typeof window !== 'undefined') {
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CA3WONARSZHZQCCM5WF5HLD27MIP7RWCQJMID4TLZIWPHQYGJT2CIYWX",
+    contractId: "CBFNOEJVO4WVIHAYIBGES5AFTOWBBN274B3VD32QSD7AYJ6J4EH3K6HC",
   }
 } as const
 

package/packages/passkey-factory-sdk/types/index.d.ts

@@ -4,7 +4,7 @@ import type { Option } from '@stellar/stellar-sdk/contract';
 export declare const networks: {
     readonly testnet: {
         readonly networkPassphrase: "Test SDF Network ; September 2015";
-        readonly contractId: "CA3WONARSZHZQCCM5WF5HLD27MIP7RWCQJMID4TLZIWPHQYGJT2CIYWX";
+        readonly contractId: "CBFNOEJVO4WVIHAYIBGES5AFTOWBBN274B3VD32QSD7AYJ6J4EH3K6HC";
     };
 };
 export type SignerLimits = readonly [Map<string, Option<Array<SignerKey>>>];

package/packages/passkey-kit-sdk/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.3.0"
+    "@stellar/stellar-sdk": "file:../../ext/js-stellar-sdk"
   },
   "devDependencies": {
     "typescript": "5.6.2"

package/packages/passkey-kit-sdk/src/index.ts

@@ -30,7 +30,7 @@ if (typeof window !== 'undefined') {
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CA3WONARSZHZQCCM5WF5HLD27MIP7RWCQJMID4TLZIWPHQYGJT2CIYWX",
+    contractId: "CBFNOEJVO4WVIHAYIBGES5AFTOWBBN274B3VD32QSD7AYJ6J4EH3K6HC",
   }
 } as const
 

package/packages/passkey-kit-sdk/types/index.d.ts

@@ -4,7 +4,7 @@ import type { Option } from '@stellar/stellar-sdk/contract';
 export declare const networks: {
     readonly testnet: {
         readonly networkPassphrase: "Test SDF Network ; September 2015";
-        readonly contractId: "CA3WONARSZHZQCCM5WF5HLD27MIP7RWCQJMID4TLZIWPHQYGJT2CIYWX";
+        readonly contractId: "CBFNOEJVO4WVIHAYIBGES5AFTOWBBN274B3VD32QSD7AYJ6J4EH3K6HC";
     };
 };
 export declare const Errors: {

package/packages/sac-sdk/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.3.0"
+    "@stellar/stellar-sdk": "file:../../ext/js-stellar-sdk"
   },
   "devDependencies": {
     "typescript": "5.6.2"

package/pnpm-workspace.yaml

@@ -1,3 +1,4 @@
 packages:
   - 'packages/**'
+  - '!ext/**'
   - '!demo/**'

package/src/kit.ts

@@ -1,12 +1,12 @@
 import { Client as PasskeyClient, type Signature, type SignerKey } from 'passkey-kit-sdk'
 import { Client as FactoryClient } from 'passkey-factory-sdk'
-import { Address, StrKey, hash, xdr, SorobanRpc, Keypair, Transaction } from '@stellar/stellar-sdk'
+import { Address, StrKey, hash, xdr, SorobanRpc, Keypair, Transaction, Operation } from '@stellar/stellar-sdk'
 import base64url from 'base64url'
 import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import type { AuthenticatorAttestationResponseJSON, AuthenticatorSelectionCriteria } from "@simplewebauthn/types"
 import { Buffer } from 'buffer'
 import { PasskeyBase } from './base'
-import { DEFAULT_TIMEOUT, type Tx } from '@stellar/stellar-sdk/contract'
+import { AssembledTransaction, DEFAULT_TIMEOUT, type Tx } from '@stellar/stellar-sdk/contract'
 
 export class PasskeyKit extends PasskeyBase {
     declare public rpc: SorobanRpc.Server
@@ -185,27 +185,28 @@ export class PasskeyKit extends PasskeyBase {
             rpId?: string,
             keyId?: 'any' | string | Uint8Array
             keypair?: Keypair,
-            validUntilLedgerSeq?: number
+            policy?: string,
+            expiration?: number
         }
     ) {
-        let { rpId, keyId, keypair, validUntilLedgerSeq } = options || {}
+        let { rpId, keyId, keypair, policy, expiration } = options || {}
 
-        if (keyId && keypair)
-            throw new Error('Provide either `options.keyId` or `options.keypair` but not both')
+        if ([keyId, keypair, policy].filter((arg) => arg).length !== 1)
+            throw new Error('Exactly one of `options.keyId`, `options.keypair`, or `options.policy` must be provided.');
 
         const credentials = entry.credentials().address();
 
-        if (!validUntilLedgerSeq) {
-            validUntilLedgerSeq = credentials.signatureExpirationLedger()
+        if (!expiration) {
+            expiration = credentials.signatureExpirationLedger()
 
-            if (!validUntilLedgerSeq) {
+            if (!expiration) {
                 const lastLedger = await this.rpc.getLatestLedger().then(({ sequence }) => sequence)
-                validUntilLedgerSeq = lastLedger + DEFAULT_TIMEOUT / 5;
+                expiration = lastLedger + DEFAULT_TIMEOUT / 5;
             }
         }
 
-        credentials.signatureExpirationLedger(validUntilLedgerSeq)
-        
+        credentials.signatureExpirationLedger(expiration)
+
         const preimage = xdr.HashIdPreimage.envelopeTypeSorobanAuthorization(
             new xdr.HashIdPreimageSorobanAuthorization({
                 networkId: hash(Buffer.from(this.networkPassphrase)),
@@ -214,14 +215,22 @@ export class PasskeyKit extends PasskeyBase {
                 invocation: entry.rootInvocation()
             })
         )
-        
+
         const payload = hash(preimage.toXDR())
 
         let key: SignerKey
-        let val: Signature
+        let val: Signature | undefined
+
+        // Sign with a policy
+        if (policy) {
+            key = {
+                tag: "Policy",
+                values: [policy]
+            }
+        }
 
         // Sign with the keypair as an ed25519 signer
-        if (keypair) {
+        else if (keypair) {
             const signature = keypair.sign(payload);
 
             key = {
@@ -289,8 +298,8 @@ export class PasskeyKit extends PasskeyBase {
         const scValType = xdr.ScSpecTypeDef.scSpecTypeUdt(
             new xdr.ScSpecTypeUdt({ name: "Signature" }),
         );
-        const scVal = this.wallet!.spec.nativeToScVal(val, scValType);
         const scKey = this.wallet!.spec.nativeToScVal(key, scKeyType);
+        const scVal = val ? this.wallet!.spec.nativeToScVal(val, scValType) : xdr.ScVal.scvVoid();
         const scEntry = new xdr.ScMapEntry({
             key: scKey,
             val: scVal,
@@ -303,178 +312,89 @@ export class PasskeyKit extends PasskeyBase {
             case 'scvMap':
                 // Add the new signature to the existing map
                 credentials.signature().map()?.push(scEntry)
+
                 // Order the map by key
-                credentials.signature().map()?.sort((a, b) => 
-                    a.key().toXDR().compare(b.key().toXDR())
-                )
+                // Not using Buffer.compare because Symbols are 9 bytes and unused bytes _append_ 0s vs prepending them, which is too bad
+                credentials.signature().map()?.sort((a, b) => {
+                    return (
+                        a.key().vec()![0].sym() +
+                        a.key().vec()![1].toXDR().join('')
+                    ).localeCompare(
+                        b.key().vec()![0].sym() +
+                        b.key().vec()![1].toXDR().join('')
+                    )
+                })
                 break;
             default:
                 throw new Error('Unsupported signature')
         }
-    }
 
-    public async signAuthEntries(
-        entries: xdr.SorobanAuthorizationEntry[],
-        options?: {
-            rpId?: string,
-            keyId?: 'any' | string | Uint8Array
-            keypair?: Keypair,
-            validUntilLedgerSeq?: number
-        }
-    ) {
-        // TODO should there be more control over which auth entries are signed? Especially given we support multiple signers now?
-        // As-is .sign() will always sign every smart wallet auth entry. This may be okay but likely we should have more control over which auth entry the signer is signing
-        for (const auth of entries) {
-            if (
-                auth.credentials().switch().name === 'sorobanCredentialsAddress'
-                && 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)
-                    await this.signAuthEntry(auth, options)
-            }
-        }
+        return entry
     }
 
+    // public async signAuthEntries(
+    //     entries: xdr.SorobanAuthorizationEntry[],
+    //     options?: {
+    //         rpId?: string,
+    //         keyId?: 'any' | string | Uint8Array
+    //         keypair?: Keypair,
+    //         policy?: string,
+    //         expiration?: number
+    //     }
+    // ) {
+    //     // TODO should there be more control over which auth entries are signed? Especially given we support multiple signers now?
+    //     // As-is .sign() will always sign every smart wallet auth entry. This may be okay but likely we should have more control over which auth entry the signer is signing
+    //     for (const auth of entries) {
+    //         if (
+    //             auth.credentials().switch().name === 'sorobanCredentialsAddress'
+    //             && 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)
+    //                 await this.signAuthEntry(auth, options)
+    //         }
+    //     }
+    // }
+
     public async sign(
-        txn: Transaction,
+        txn: AssembledTransaction<unknown>,
         options?: {
             rpId?: string,
             keyId?: 'any' | string | Uint8Array
             keypair?: Keypair,
-            validUntilLedgerSeq?: number
+            policy?: string,
+            expiration?: number
         }
     ) {
-        const entries = this.getAuthEntries(txn)
-
-        if (entries)
-            await this.signAuthEntries(entries, options)
-    }
-
-    public async attachPolicy(
-        txn: Transaction,
-        index: number,
-        policy: string
-    ) {
-        if (!this.wallet)
-            throw new Error('Wallet not connected')
-
-        const entries = this.getAuthEntries(txn)
-        const auth = entries?.[index]
-        const context = auth?.rootInvocation().function()
-
-        if (!entries || !auth || !context)
-            throw new Error('No context found')
-
-        let context_arg: xdr.ScVal
-
-        switch (context.switch().name) {
-            case 'sorobanAuthorizedFunctionTypeContractFn':
-                switch (context.contractFn().contractAddress().switch().name) {
-                    case 'scAddressTypeContract':
-                        context_arg = xdr.ScVal.scvVec([
-                            xdr.ScVal.scvSymbol("Contract"),
-                            xdr.ScVal.scvMap([
-                                new xdr.ScMapEntry({
-                                    key: xdr.ScVal.scvSymbol("args"),
-                                    val: xdr.ScVal.scvVec(context.contractFn().args()),
-                                }),
-                                new xdr.ScMapEntry({
-                                    key: xdr.ScVal.scvSymbol("contract"),
-                                    val: Address.contract(context.contractFn().contractAddress().contractId()).toScVal(),
-                                }),
-                                new xdr.ScMapEntry({
-                                    key: xdr.ScVal.scvSymbol("fn_name"),
-                                    val: xdr.ScVal.scvSymbol(context.contractFn().functionName()),
-                                }),
-                            ]),
-                        ])
-                        break;
-                    default:
-                        throw new Error('Unsupported contractAddress')
-                }
-                break;
-            case 'sorobanAuthorizedFunctionTypeCreateContractHostFn':
-                switch (context.createContractHostFn().contractIdPreimage().switch().name) {
-                    case 'contractIdPreimageFromAddress':
-                        context_arg = xdr.ScVal.scvVec([
-                            xdr.ScVal.scvSymbol("CreateContractHostFn"),
-                            xdr.ScVal.scvMap([
-                                new xdr.ScMapEntry({
-                                    key: xdr.ScVal.scvSymbol("executable"),
-                                    val: xdr.ScVal.scvVec([
-                                        xdr.ScVal.scvSymbol("Wasm"),
-                                        xdr.ScVal.scvBytes(context.createContractHostFn().executable().wasmHash())
-                                    ]),
-                                }),
-                                new xdr.ScMapEntry({
-                                    key: xdr.ScVal.scvSymbol("salt"),
-                                    val: xdr.ScVal.scvBytes(context.createContractHostFn().contractIdPreimage().fromAddress().salt()),
-                                }),
-                            ]),
-                        ])
-                        break;
-                    default:
-                        throw new Error('Unsupported contractIdPreimage')
-                }
-                break;
-            default:
-                throw new Error('Unsupported context')
-        }
-
-        const __check_auth_args = new xdr.InvokeContractArgs({
-            contractAddress: Address.fromString(this.wallet.options.contractId).toScAddress(),
-            functionName: "__check_auth",
-            args: [context_arg],
-        });
-
-        const __check_auth_invocation = new xdr.SorobanAuthorizedInvocation({
-            function:
-                xdr.SorobanAuthorizedFunction.sorobanAuthorizedFunctionTypeContractFn(
-                    __check_auth_args,
-                ),
-            subInvocations: [],
-        });
-
-        const __check_auth = new xdr.SorobanAuthorizationEntry({
-            credentials: xdr.SorobanCredentials.sorobanCredentialsAddress(
-                new xdr.SorobanAddressCredentials({
-                    address: Address.fromString(policy).toScAddress(),
-                    nonce: auth.credentials().address().nonce(),
-                    signatureExpirationLedger: auth.credentials().address().signatureExpirationLedger(),
-                    signature: xdr.ScVal.scvVec([]),
-                }),
-            ),
-            rootInvocation: __check_auth_invocation,
-        });
-
-        entries.push(__check_auth)
-    }
-
-    public prepareTransaction(txn: Tx) {
-        return new Transaction(txn.toXDR(), this.networkPassphrase);
+        await txn.signAuthEntries({
+            address: this.wallet!.options.contractId,
+            authorizeEntry: (entry) => {
+                const clone = xdr.SorobanAuthorizationEntry.fromXDR(entry.toXDR())
+                return this.signAuthEntry(clone, options)    
+            },
+        })
     }
 
-    private getAuthEntries(txn: Transaction) {
-        if (txn.operations.length !== 1)
-            throw new Error('Must include only one Soroban operation')
-
-        for (const op of txn.operations) {
-            if (
-                op.type !== 'invokeHostFunction'
-                && op.type !== 'extendFootprintTtl'
-                && op.type !== 'restoreFootprint'
-            ) throw new Error('Must include only one operation of type `invokeHostFunction` or `extendFootprintTtl` or `restoreFootprint`')
-        }
-
-        // Only need to sign auth for `invokeHostFunction` operations
-        if (txn.operations[0].type === 'invokeHostFunction') {
-            const entries = txn.operations[0].auth
-
-            if (entries && entries.length)
-                return entries
-        }
-    }
+    // private getAuthEntries(txn: Transaction) {
+    //     if (txn.operations.length !== 1)
+    //         throw new Error('Must include only one Soroban operation')
+
+    //     for (const op of txn.operations) {
+    //         if (
+    //             op.type !== 'invokeHostFunction'
+    //             && op.type !== 'extendFootprintTtl'
+    //             && op.type !== 'restoreFootprint'
+    //         ) throw new Error('Must include only one operation of type `invokeHostFunction` or `extendFootprintTtl` or `restoreFootprint`')
+    //     }
+
+    //     // Only need to sign auth for `invokeHostFunction` operations
+    //     if (txn.operations[0].type === 'invokeHostFunction') {
+    //         const entries = txn.operations[0].auth
+
+    //         if (entries && entries.length)
+    //             return entries
+    //     }
+    // }
 
     /* LATER 
         - Add a getKeyInfo action to get info about a specific passkey

package/src/server.ts

@@ -1,6 +1,7 @@
-import { SorobanRpc, Transaction, xdr } from "@stellar/stellar-sdk"
+import { SorobanRpc, xdr } from "@stellar/stellar-sdk"
 import { PasskeyBase } from "./base"
 import base64url from "base64url"
+import type { Tx } from "@stellar/stellar-sdk/contract"
 
 export class PasskeyServer extends PasskeyBase {
     public launchtubeUrl: string | undefined
@@ -123,7 +124,7 @@ export class PasskeyServer extends PasskeyBase {
         - Add a method for getting a paginated or filtered list of all a wallet's events
     */
 
-    public async send(txn: Transaction, fee?: number) {
+    public async send(txn: Tx, fee?: number) {
         if (!this.launchtubeUrl || !this.launchtubeJwt)
             throw new Error('Launchtube service not configured')
 

package/types/kit.d.ts

@@ -1,11 +1,11 @@
 import { Client as PasskeyClient } from 'passkey-kit-sdk';
 import { Client as FactoryClient } from 'passkey-factory-sdk';
-import { xdr, SorobanRpc, Keypair, Transaction } from '@stellar/stellar-sdk';
+import { xdr, SorobanRpc, Keypair } from '@stellar/stellar-sdk';
 import { startRegistration, startAuthentication } from "@simplewebauthn/browser";
 import type { AuthenticatorSelectionCriteria } from "@simplewebauthn/types";
 import { Buffer } from 'buffer';
 import { PasskeyBase } from './base';
-import { type Tx } from '@stellar/stellar-sdk/contract';
+import { AssembledTransaction, type Tx } from '@stellar/stellar-sdk/contract';
 export declare class PasskeyKit extends PasskeyBase {
     rpc: SorobanRpc.Server;
     rpcUrl: string;
@@ -50,23 +50,16 @@ export declare class PasskeyKit extends PasskeyBase {
         rpId?: string;
         keyId?: 'any' | string | Uint8Array;
         keypair?: Keypair;
-        validUntilLedgerSeq?: number;
-    }): Promise<void>;
-    signAuthEntries(entries: xdr.SorobanAuthorizationEntry[], options?: {
-        rpId?: string;
-        keyId?: 'any' | string | Uint8Array;
-        keypair?: Keypair;
-        validUntilLedgerSeq?: number;
-    }): Promise<void>;
-    sign(txn: Transaction, options?: {
+        policy?: string;
+        expiration?: number;
+    }): Promise<xdr.SorobanAuthorizationEntry>;
+    sign(txn: AssembledTransaction<unknown>, options?: {
         rpId?: string;
         keyId?: 'any' | string | Uint8Array;
         keypair?: Keypair;
-        validUntilLedgerSeq?: number;
+        policy?: string;
+        expiration?: number;
     }): Promise<void>;
-    attachPolicy(txn: Transaction, index: number, policy: string): Promise<void>;
-    prepareTransaction(txn: Tx): Transaction<import("@stellar/stellar-sdk").Memo<import("@stellar/stellar-sdk").MemoType>, import("@stellar/stellar-sdk").Operation[]>;
-    private getAuthEntries;
     private getPublicKey;
     private compactSignature;
 }

package/types/server.d.ts

@@ -1,5 +1,5 @@
-import { Transaction } from "@stellar/stellar-sdk";
 import { PasskeyBase } from "./base";
+import type { Tx } from "@stellar/stellar-sdk/contract";
 export declare class PasskeyServer extends PasskeyBase {
     launchtubeUrl: string | undefined;
     launchtubeJwt: string | undefined;
@@ -20,5 +20,5 @@ export declare class PasskeyServer extends PasskeyBase {
         expired?: boolean;
     }[]>;
     getContractId(keyId: string): Promise<any>;
-    send(txn: Transaction, fee?: number): Promise<any>;
+    send(txn: Tx, fee?: number): Promise<any>;
 }