passkey-kit 0.7.5 → 0.7.6

package/cheatsheet

@@ -5,7 +5,6 @@ npm publish --workspaces
 pnpm publish --no-git-checks
 
 # Stellar commands
-stellar contract bindings rust --wasm target/wasm32-unknown-unknown/release/webauthn_wallet.wasm
 stellar contract deploy --wasm target/wasm32-unknown-unknown/release/sample_policy.wasm --network testnet --source default
 
 # Mercury commands
@@ -13,7 +12,7 @@ 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 "CAGXSSDBSFBI5633C4O4KF53XPU64BMX36JMJTJNITOAWGP442XHZSHM"
+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]}"}}}'

package/clone-js-sdk.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -rf ext/@stellar
+mkdir -p ext/@stellar/stellar-sdk
+cp -R ext/js-stellar-sdk/lib ext/@stellar/stellar-sdk/
+cp -R ext/js-stellar-sdk/dist ext/@stellar/stellar-sdk/
+cp -R ext/js-stellar-sdk/types ext/@stellar/stellar-sdk/ 
+cp ext/js-stellar-sdk/package.json ext/@stellar/stellar-sdk/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "A helper library for creating and using passkey accounts on the Stellar blockchain.",
   "author": "Tyler van der Hoeven",
   "license": "MIT",
@@ -10,12 +10,12 @@
   "dependencies": {
     "@darkedges/capacitor-native-webauthn": "^0.0.4",
     "@simplewebauthn/browser": "^10.0.0",
-    "@stellar/stellar-sdk": "file:./ext/js-stellar-sdk",
+    "@stellar/stellar-sdk": "file:./ext/@stellar/stellar-sdk",
     "base64url": "^3.0.1",
     "buffer": "^6.0.3",
-    "passkey-factory-sdk": "0.3.1",
-    "sac-sdk": "0.1.0",
-    "passkey-kit-sdk": "0.3.1"
+    "passkey-factory-sdk": "0.3.2",
+    "passkey-kit-sdk": "0.3.2",
+    "sac-sdk": "0.1.0"
   },
   "devDependencies": {
     "@simplewebauthn/types": "^10.0.0",
@@ -53,6 +53,7 @@
     "build:sac": "pnpm --filter ./packages/sac-sdk run build",
     "build:pfs": "pnpm --filter ./packages/passkey-factory-sdk run build",
     "build:pks": "pnpm --filter ./packages/passkey-kit-sdk run build",
-    "build": "pnpm run build:sac && pnpm run build:pfs && pnpm run build:pks && tsc"
+    "build": "pnpm run build:sac && pnpm run build:pfs && pnpm run build:pks && tsc",
+    "ext:cp": "./clone-js-sdk.sh"
   }
 }

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

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.1",
+  "version": "0.3.2",
   "name": "passkey-factory-sdk",
   "type": "module",
   "main": "src/index.ts",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "file:../../ext/js-stellar-sdk"
+    "@stellar/stellar-sdk": "file:../../ext/@stellar/stellar-sdk"
   },
   "devDependencies": {
     "typescript": "5.6.2"

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

@@ -26,17 +26,9 @@ if (typeof window !== 'undefined') {
   window.Buffer = window.Buffer || Buffer;
 }
 
-
-export const networks = {
-  testnet: {
-    networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CBFNOEJVO4WVIHAYIBGES5AFTOWBBN274B3VD32QSD7AYJ6J4EH3K6HC",
-  }
-} as const
-
-export type SignerLimits = readonly [Map<string, Option<Array<SignerKey>>>];
 export type SignerKey = { tag: "Policy", values: readonly [string] } | { tag: "Ed25519", values: readonly [Buffer] } | { tag: "Secp256r1", values: readonly [Buffer] };
 
+export type SignerLimits = readonly [Map<string, Option<Array<SignerKey>>>];
 export type SignerStorage = { tag: "Persistent", values: void } | { tag: "Temporary", values: void };
 
 export type Signer = { tag: "Policy", values: readonly [string, SignerLimits, SignerStorage] } | { tag: "Ed25519", values: readonly [Buffer, SignerLimits, SignerStorage] } | { tag: "Secp256r1", values: readonly [Buffer, Buffer, SignerLimits, SignerStorage] };
@@ -92,8 +84,8 @@ export interface Client {
 export class Client extends ContractClient {
   constructor(public readonly options: ContractClientOptions) {
     super(
-      new ContractSpec(["AAAAAQAAAAAAAAAAAAAADFNpZ25lckxpbWl0cwAAAAEAAAAAAAAAATAAAAAAAAPsAAAAEwAAA+gAAAPqAAAH0AAAAAlTaWduZXJLZXkAAAA=",
-        "AAAAAgAAAAAAAAAAAAAACVNpZ25lcktleQAAAAAAAAMAAAABAAAAAAAAAAZQb2xpY3kAAAAAAAEAAAATAAAAAQAAAAAAAAAHRWQyNTUxOQAAAAABAAAD7gAAACAAAAABAAAAAAAAAAlTZWNwMjU2cjEAAAAAAAABAAAADg==",
+      new ContractSpec(["AAAAAgAAAAAAAAAAAAAACVNpZ25lcktleQAAAAAAAAMAAAABAAAAAAAAAAZQb2xpY3kAAAAAAAEAAAATAAAAAQAAAAAAAAAHRWQyNTUxOQAAAAABAAAD7gAAACAAAAABAAAAAAAAAAlTZWNwMjU2cjEAAAAAAAABAAAADg==",
+        "AAAAAQAAAAAAAAAAAAAADFNpZ25lckxpbWl0cwAAAAEAAAAAAAAAATAAAAAAAAPsAAAAEwAAA+gAAAPqAAAH0AAAAAlTaWduZXJLZXkAAAA=",
         "AAAAAgAAAAAAAAAAAAAADVNpZ25lclN0b3JhZ2UAAAAAAAACAAAAAAAAAAAAAAAKUGVyc2lzdGVudAAAAAAAAAAAAAAAAAAJVGVtcG9yYXJ5AAAA",
         "AAAAAgAAAAAAAAAAAAAABlNpZ25lcgAAAAAAAwAAAAEAAAAAAAAABlBvbGljeQAAAAAAAwAAABMAAAfQAAAADFNpZ25lckxpbWl0cwAAB9AAAAANU2lnbmVyU3RvcmFnZQAAAAAAAAEAAAAAAAAAB0VkMjU1MTkAAAAAAwAAA+4AAAAgAAAH0AAAAAxTaWduZXJMaW1pdHMAAAfQAAAADVNpZ25lclN0b3JhZ2UAAAAAAAABAAAAAAAAAAlTZWNwMjU2cjEAAAAAAAAEAAAADgAAA+4AAABBAAAH0AAAAAxTaWduZXJMaW1pdHMAAAfQAAAADVNpZ25lclN0b3JhZ2UAAAA=",
         "AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAAAgAAAAAAAAAOTm90SW5pdGlhbGl6ZWQAAAAAAAEAAAAAAAAAEkFscmVhZHlJbml0aWFsaXplZAAAAAAAAg==",

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

@@ -1,13 +1,6 @@
 import { Buffer } from "buffer";
 import { AssembledTransaction, Client as ContractClient, ClientOptions as ContractClientOptions, Result } from '@stellar/stellar-sdk/contract';
 import type { Option } from '@stellar/stellar-sdk/contract';
-export declare const networks: {
-    readonly testnet: {
-        readonly networkPassphrase: "Test SDF Network ; September 2015";
-        readonly contractId: "CBFNOEJVO4WVIHAYIBGES5AFTOWBBN274B3VD32QSD7AYJ6J4EH3K6HC";
-    };
-};
-export type SignerLimits = readonly [Map<string, Option<Array<SignerKey>>>];
 export type SignerKey = {
     tag: "Policy";
     values: readonly [string];
@@ -18,6 +11,7 @@ export type SignerKey = {
     tag: "Secp256r1";
     values: readonly [Buffer];
 };
+export type SignerLimits = readonly [Map<string, Option<Array<SignerKey>>>];
 export type SignerStorage = {
     tag: "Persistent";
     values: void;

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

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.1",
+  "version": "0.3.2",
   "name": "passkey-kit-sdk",
   "type": "module",
   "main": "src/index.ts",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "file:../../ext/js-stellar-sdk"
+    "@stellar/stellar-sdk": "file:../../ext/@stellar/stellar-sdk"
   },
   "devDependencies": {
     "typescript": "5.6.2"

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

@@ -26,14 +26,6 @@ if (typeof window !== 'undefined') {
   window.Buffer = window.Buffer || Buffer;
 }
 
-
-export const networks = {
-  testnet: {
-    networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CBFNOEJVO4WVIHAYIBGES5AFTOWBBN274B3VD32QSD7AYJ6J4EH3K6HC",
-  }
-} as const
-
 export const Errors = {
   1: { message: "NotFound" },
 
@@ -67,6 +59,7 @@ export interface Secp256r1Signature {
 
 export type Signature = { tag: "Ed25519", values: readonly [Buffer] } | { tag: "Secp256r1", values: readonly [Secp256r1Signature] };
 
+export type Signatures = readonly [Map<SignerKey, Option<Signature>>];
 
 export interface Client {
   /**
@@ -141,10 +134,11 @@ export class Client extends ContractClient {
         "AAAAAgAAAAAAAAAAAAAABlNpZ25lcgAAAAAAAwAAAAEAAAAAAAAABlBvbGljeQAAAAAAAwAAABMAAAfQAAAADFNpZ25lckxpbWl0cwAAB9AAAAANU2lnbmVyU3RvcmFnZQAAAAAAAAEAAAAAAAAAB0VkMjU1MTkAAAAAAwAAA+4AAAAgAAAH0AAAAAxTaWduZXJMaW1pdHMAAAfQAAAADVNpZ25lclN0b3JhZ2UAAAAAAAABAAAAAAAAAAlTZWNwMjU2cjEAAAAAAAAEAAAADgAAA+4AAABBAAAH0AAAAAxTaWduZXJMaW1pdHMAAAfQAAAADVNpZ25lclN0b3JhZ2UAAAA=",
         "AAAAAQAAAAAAAAAAAAAAElNlY3AyNTZyMVNpZ25hdHVyZQAAAAAAAwAAAAAAAAASYXV0aGVudGljYXRvcl9kYXRhAAAAAAAOAAAAAAAAABBjbGllbnRfZGF0YV9qc29uAAAADgAAAAAAAAAJc2lnbmF0dXJlAAAAAAAD7gAAAEA=",
         "AAAAAgAAAAAAAAAAAAAACVNpZ25hdHVyZQAAAAAAAAIAAAABAAAAAAAAAAdFZDI1NTE5AAAAAAEAAAPuAAAAQAAAAAEAAAAAAAAACVNlY3AyNTZyMQAAAAAAAAEAAAfQAAAAElNlY3AyNTZyMVNpZ25hdHVyZQAA",
+        "AAAAAQAAAAAAAAAAAAAAClNpZ25hdHVyZXMAAAAAAAEAAAAAAAAAATAAAAAAAAPsAAAH0AAAAAlTaWduZXJLZXkAAAAAAAPoAAAH0AAAAAlTaWduYXR1cmUAAAA=",
         "AAAAAAAAAAAAAAADYWRkAAAAAAEAAAAAAAAABnNpZ25lcgAAAAAH0AAAAAZTaWduZXIAAAAAAAEAAAPpAAAD7QAAAAAAAAAD",
         "AAAAAAAAAAAAAAAGcmVtb3ZlAAAAAAABAAAAAAAAAApzaWduZXJfa2V5AAAAAAfQAAAACVNpZ25lcktleQAAAAAAAAEAAAPpAAAD7QAAAAAAAAAD",
         "AAAAAAAAAAAAAAAGdXBkYXRlAAAAAAABAAAAAAAAAARoYXNoAAAD7gAAACAAAAABAAAD6QAAA+0AAAAAAAAAAw==",
-        "AAAAAAAAAAAAAAAMX19jaGVja19hdXRoAAAAAwAAAAAAAAARc2lnbmF0dXJlX3BheWxvYWQAAAAAAAPuAAAAIAAAAAAAAAAKc2lnbmF0dXJlcwAAAAAD7AAAB9AAAAAJU2lnbmVyS2V5AAAAAAAD6AAAB9AAAAAJU2lnbmF0dXJlAAAAAAAAAAAAAA1hdXRoX2NvbnRleHRzAAAAAAAD6gAAB9AAAAAHQ29udGV4dAAAAAABAAAD6QAAA+0AAAAAAAAAAw=="]),
+        "AAAAAAAAAAAAAAAMX19jaGVja19hdXRoAAAAAwAAAAAAAAARc2lnbmF0dXJlX3BheWxvYWQAAAAAAAPuAAAAIAAAAAAAAAAKc2lnbmF0dXJlcwAAAAAH0AAAAApTaWduYXR1cmVzAAAAAAAAAAAADWF1dGhfY29udGV4dHMAAAAAAAPqAAAH0AAAAAdDb250ZXh0AAAAAAEAAAPpAAAD7QAAAAAAAAAD"]),
       options
     )
   }

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

@@ -1,12 +1,6 @@
 import { Buffer } from "buffer";
 import { AssembledTransaction, Client as ContractClient, ClientOptions as ContractClientOptions, Result } from '@stellar/stellar-sdk/contract';
 import type { Option } from '@stellar/stellar-sdk/contract';
-export declare const networks: {
-    readonly testnet: {
-        readonly networkPassphrase: "Test SDF Network ; September 2015";
-        readonly contractId: "CBFNOEJVO4WVIHAYIBGES5AFTOWBBN274B3VD32QSD7AYJ6J4EH3K6HC";
-    };
-};
 export declare const Errors: {
     1: {
         message: string;
@@ -80,6 +74,7 @@ export type Signature = {
     tag: "Secp256r1";
     values: readonly [Secp256r1Signature];
 };
+export type Signatures = readonly [Map<SignerKey, Option<Signature>>];
 export interface Client {
     /**
      * Construct and simulate a add transaction. Returns an `AssembledTransaction` object which will have a `result` field containing the result of the simulation. If this transaction changes contract state, you will need to call `signAndSend()` on the returned object.

package/packages/sac-sdk/package.json

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

package/packages/sac-sdk/src/index.ts

@@ -26,14 +26,6 @@ if (typeof window !== 'undefined') {
   window.Buffer = window.Buffer || Buffer;
 }
 
-
-export const networks = {
-  testnet: {
-    networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC",
-  }
-} as const
-
 export const Errors = {
 
 }

package/packages/sac-sdk/types/index.d.ts

@@ -1,11 +1,5 @@
 import { AssembledTransaction, Client as ContractClient, ClientOptions as ContractClientOptions } from '@stellar/stellar-sdk/contract';
 import type { u32, i128 } from '@stellar/stellar-sdk/contract';
-export declare const networks: {
-    readonly testnet: {
-        readonly networkPassphrase: "Test SDF Network ; September 2015";
-        readonly contractId: "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC";
-    };
-};
 export declare const Errors: {};
 export interface Client {
     /**

package/src/kit.ts

@@ -1,6 +1,6 @@
-import { Client as PasskeyClient, type Signature, type SignerKey } from 'passkey-kit-sdk'
+import { Client as PasskeyClient, type Signature, type Signatures, type SignerKey } from 'passkey-kit-sdk'
 import { Client as FactoryClient } from 'passkey-factory-sdk'
-import { Address, StrKey, hash, xdr, SorobanRpc, Keypair, Transaction, Operation } from '@stellar/stellar-sdk'
+import { Address, StrKey, hash, xdr, SorobanRpc, Keypair, Transaction, Operation, nativeToScVal } from '@stellar/stellar-sdk'
 import base64url from 'base64url'
 import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import type { AuthenticatorAttestationResponseJSON, AuthenticatorSelectionCriteria } from "@simplewebauthn/types"
@@ -191,7 +191,7 @@ export class PasskeyKit extends PasskeyBase {
     ) {
         let { rpId, keyId, keypair, policy, expiration } = options || {}
 
-        if ([keyId, keypair, policy].filter((arg) => arg).length !== 1)
+        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();
@@ -218,9 +218,23 @@ export class PasskeyKit extends PasskeyBase {
 
         const payload = hash(preimage.toXDR())
 
+        // let signatures: Signatures
         let key: SignerKey
         let val: Signature | undefined
 
+        // const scSpecTypeDefSignatures = xdr.ScSpecTypeDef.scSpecTypeUdt(
+        //     new xdr.ScSpecTypeUdt({ name: "Signatures" }),
+        // );
+
+        // switch (credentials.signature().switch()) {
+        //     case xdr.ScValType.scvVoid():
+        //         signatures = [new Map()]
+        //         break;
+        //     default: {
+        //         signatures = this.wallet!.spec.scValToNative(credentials.signature(), scSpecTypeDefSignatures)
+        //     }
+        // }
+
         // Sign with a policy
         if (policy) {
             key = {
@@ -307,15 +321,17 @@ export class PasskeyKit extends PasskeyBase {
 
         switch (credentials.signature().switch().name) {
             case 'scvVoid':
-                credentials.signature(xdr.ScVal.scvMap([scEntry]))
+                credentials.signature(xdr.ScVal.scvVec([
+                    xdr.ScVal.scvMap([scEntry])
+                ]))
                 break;
-            case 'scvMap':
+            case 'scvVec':
                 // Add the new signature to the existing map
-                credentials.signature().map()?.push(scEntry)
+                credentials.signature().vec()?.[0].map()?.push(scEntry)
 
                 // Order the map by key
                 // 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) => {
+                credentials.signature().vec()?.[0].map()?.sort((a, b) => {
                     return (
                         a.key().vec()![0].sym() +
                         a.key().vec()![1].toXDR().join('')
@@ -329,33 +345,28 @@ export class PasskeyKit extends PasskeyBase {
                 throw new Error('Unsupported signature')
         }
 
+        // Insert the new signature into the signatures Map
+        // signatures[0].set(key, val)
+
+        // Insert the new signatures Map into the credentials
+        // credentials.signature(
+        //     this.wallet!.spec.nativeToScVal(signatures, scSpecTypeDefSignatures)
+        // )
+
+        // Order the signatures map
+        // credentials.signature().vec()?.[0].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('')
+        //     )
+        // })
+
         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: AssembledTransaction<unknown>,
         options?: {
@@ -375,26 +386,7 @@ export class PasskeyKit extends PasskeyBase {
         })
     }
 
-    // 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
-    //     }
-    // }
+    // Add little utility helpers for adding and removing signers
 
     /* LATER 
         - Add a getKeyInfo action to get info about a specific passkey