passkey-kit 0.6.1 → 0.7.1

package/.vscode/settings.json

@@ -2,6 +2,8 @@
     "rust-analyzer.linkedProjects": [
         "./zephyr/Cargo.toml",
         "./contracts/Cargo.toml",
+        "./contracts/example-contract/Cargo.toml",
+        "./contracts/sample-policy/Cargo.toml",
         "./contracts/webauthn-factory/Cargo.toml",
         "./contracts/webauthn-wallet/Cargo.toml",
     ]

package/README.md

@@ -1,5 +1,8 @@
 # Passkey Kit
 
+> [!WARNING]  
+> Code in this repo is demo material only. It has not been audited. Do not use to hold, protect, or secure anything.
+
 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/)

package/cheatsheet

@@ -4,13 +4,17 @@ npm publish --workspaces
 # Install passkey-kit
 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
 # https://test.mercurydata.app/
 
 export JWT=???
 mercury-cli --jwt $JWT --local false --mainnet false deploy
-mercury-cli --jwt $JWT --local false --mainnet false catchup --contracts "CDOWBLFYFIWXVUW46QILLAIYIWWCZ63CIRQBG3DK5PDBUVVJ4QVJX2IX" # don't forget to subscribe to the contract first
+mercury-cli --jwt $JWT --local false --mainnet false catchup --project-name "smart-wallets-data-multi-signer-multi-sig" --contracts "CDONKSPO6DUH46JRRIAK4O5ZINA5C2RXHP57BMFHKVBGOQXAT3IW6QCO"
 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\": \"CCXIUFR243N7QWKXY44LZO3DVUXHAVBEEJWFGNGNVVB44VJXIYWVGNTR\"}"}}}'
+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\": \"CCXIUFR243N7QWKXY44LZO3DVUXHAVBEEJWFGNGNVVB44VJXIYWVGNTR\"}"}}}'
+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\"}"}}}'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "A helper library for creating and using passkey accounts on the Stellar blockchain.",
   "author": "Tyler van der Hoeven",
   "license": "MIT",
@@ -10,16 +10,16 @@
   "dependencies": {
     "@darkedges/capacitor-native-webauthn": "^0.0.4",
     "@simplewebauthn/browser": "^10.0.0",
-    "@stellar/stellar-sdk": "12.1.0",
+    "@stellar/stellar-sdk": "12.3.0",
     "base64url": "^3.0.1",
     "buffer": "^6.0.3",
-    "passkey-kit-sdk": "0.2.1",
-    "passkey-factory-sdk": "0.2.1",
+    "passkey-factory-sdk": "0.3.1",
+    "passkey-kit-sdk": "0.3.1",
     "sac-sdk": "0.1.0"
   },
   "devDependencies": {
     "@simplewebauthn/types": "^10.0.0",
-    "typescript": "^5.5.3"
+    "typescript": "^5.6.2"
   },
   "workspaces": [
     "packages/*"

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

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.1",
+  "version": "0.3.1",
   "name": "passkey-factory-sdk",
   "type": "module",
   "main": "src/index.ts",
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.1.0"
+    "@stellar/stellar-sdk": "12.3.0"
   },
   "devDependencies": {
-    "typescript": "5.5.3"
+    "typescript": "5.6.2"
   }
 }

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

@@ -1,4 +1,5 @@
 import { Buffer } from "buffer";
+import { Address } from '@stellar/stellar-sdk';
 import {
   AssembledTransaction,
   Client as ContractClient,
@@ -6,21 +7,43 @@ import {
   Result,
   Spec as ContractSpec,
 } from '@stellar/stellar-sdk/contract';
+import type {
+  u32,
+  i32,
+  u64,
+  i64,
+  u128,
+  i128,
+  u256,
+  i256,
+  Option,
+  Typepoint,
+  Duration,
+} from '@stellar/stellar-sdk/contract';
 
 if (typeof window !== 'undefined') {
   //@ts-ignore Buffer exists
   window.Buffer = window.Buffer || Buffer;
 }
 
+
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CCPLERXCJZB7LX2VOSOCBNRN754FRLHI6Y2AVOQBA5L7C2ZJX5RFVVET",
+    contractId: "CA3WONARSZHZQCCM5WF5HLD27MIP7RWCQJMID4TLZIWPHQYGJT2CIYWX",
   }
 } 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 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] };
+
 export const Errors = {
   1: { message: "NotInitialized" },
+
   2: { message: "AlreadyInitialized" }
 }
 
@@ -48,7 +71,7 @@ export interface Client {
   /**
    * Construct and simulate a deploy 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.
    */
-  deploy: ({ salt, id, pk }: { salt: Buffer, id: Buffer, pk: Buffer }, options?: {
+  deploy: ({ salt, signer }: { salt: Buffer, signer: Signer }, options?: {
     /**
      * The fee to pay for the transaction. Default: BASE_FEE
      */
@@ -64,13 +87,18 @@ export interface Client {
      */
     simulate?: boolean;
   }) => Promise<AssembledTransaction<Result<string>>>
+
 }
 export class Client extends ContractClient {
   constructor(public readonly options: ContractClientOptions) {
     super(
-      new ContractSpec(["AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAAAgAAAAAAAAAOTm90SW5pdGlhbGl6ZWQAAAAAAAEAAAAAAAAAEkFscmVhZHlJbml0aWFsaXplZAAAAAAAAg==",
+      new ContractSpec(["AAAAAQAAAAAAAAAAAAAADFNpZ25lckxpbWl0cwAAAAEAAAAAAAAAATAAAAAAAAPsAAAAEwAAA+gAAAPqAAAH0AAAAAlTaWduZXJLZXkAAAA=",
+        "AAAAAgAAAAAAAAAAAAAACVNpZ25lcktleQAAAAAAAAMAAAABAAAAAAAAAAZQb2xpY3kAAAAAAAEAAAATAAAAAQAAAAAAAAAHRWQyNTUxOQAAAAABAAAD7gAAACAAAAABAAAAAAAAAAlTZWNwMjU2cjEAAAAAAAABAAAADg==",
+        "AAAAAgAAAAAAAAAAAAAADVNpZ25lclN0b3JhZ2UAAAAAAAACAAAAAAAAAAAAAAAKUGVyc2lzdGVudAAAAAAAAAAAAAAAAAAJVGVtcG9yYXJ5AAAA",
+        "AAAAAgAAAAAAAAAAAAAABlNpZ25lcgAAAAAAAwAAAAEAAAAAAAAABlBvbGljeQAAAAAAAwAAABMAAAfQAAAADFNpZ25lckxpbWl0cwAAB9AAAAANU2lnbmVyU3RvcmFnZQAAAAAAAAEAAAAAAAAAB0VkMjU1MTkAAAAAAwAAA+4AAAAgAAAH0AAAAAxTaWduZXJMaW1pdHMAAAfQAAAADVNpZ25lclN0b3JhZ2UAAAAAAAABAAAAAAAAAAlTZWNwMjU2cjEAAAAAAAAEAAAADgAAA+4AAABBAAAH0AAAAAxTaWduZXJMaW1pdHMAAAfQAAAADVNpZ25lclN0b3JhZ2UAAAA=",
+        "AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAAAgAAAAAAAAAOTm90SW5pdGlhbGl6ZWQAAAAAAAEAAAAAAAAAEkFscmVhZHlJbml0aWFsaXplZAAAAAAAAg==",
         "AAAAAAAAAAAAAAAEaW5pdAAAAAEAAAAAAAAACXdhc21faGFzaAAAAAAAA+4AAAAgAAAAAQAAA+kAAAPtAAAAAAAAAAM=",
-        "AAAAAAAAAAAAAAAGZGVwbG95AAAAAAADAAAAAAAAAARzYWx0AAAD7gAAACAAAAAAAAAAAmlkAAAAAAAOAAAAAAAAAAJwawAAAAAD7gAAAEEAAAABAAAD6QAAABMAAAAD"]),
+        "AAAAAAAAAAAAAAAGZGVwbG95AAAAAAACAAAAAAAAAARzYWx0AAAD7gAAACAAAAAAAAAABnNpZ25lcgAAAAAH0AAAAAZTaWduZXIAAAAAAAEAAAPpAAAAEwAAAAM="]),
       options
     )
   }

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

@@ -1,11 +1,40 @@
 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: "CCPLERXCJZB7LX2VOSOCBNRN754FRLHI6Y2AVOQBA5L7C2ZJX5RFVVET";
+        readonly contractId: "CA3WONARSZHZQCCM5WF5HLD27MIP7RWCQJMID4TLZIWPHQYGJT2CIYWX";
     };
 };
+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 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];
+};
 export declare const Errors: {
     1: {
         message: string;
@@ -37,10 +66,9 @@ export interface Client {
     /**
      * Construct and simulate a deploy 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.
      */
-    deploy: ({ salt, id, pk }: {
+    deploy: ({ salt, signer }: {
         salt: Buffer;
-        id: Buffer;
-        pk: Buffer;
+        signer: Signer;
     }, options?: {
         /**
          * The fee to pay for the transaction. Default: BASE_FEE

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

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.1",
+  "version": "0.3.1",
   "name": "passkey-kit-sdk",
   "type": "module",
   "main": "src/index.ts",
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.1.0"
+    "@stellar/stellar-sdk": "12.3.0"
   },
   "devDependencies": {
-    "typescript": "5.5.3"
+    "typescript": "5.6.2"
   }
 }

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

@@ -1,4 +1,5 @@
 import { Buffer } from "buffer";
+import { Address } from '@stellar/stellar-sdk';
 import {
   AssembledTransaction,
   Client as ContractClient,
@@ -6,41 +7,72 @@ import {
   Result,
   Spec as ContractSpec,
 } from '@stellar/stellar-sdk/contract';
+import type {
+  u32,
+  i32,
+  u64,
+  i64,
+  u128,
+  i128,
+  u256,
+  i256,
+  Option,
+  Typepoint,
+  Duration,
+} from '@stellar/stellar-sdk/contract';
 
 if (typeof window !== 'undefined') {
   //@ts-ignore Buffer exists
   window.Buffer = window.Buffer || Buffer;
 }
 
+
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CCPLERXCJZB7LX2VOSOCBNRN754FRLHI6Y2AVOQBA5L7C2ZJX5RFVVET",
+    contractId: "CA3WONARSZHZQCCM5WF5HLD27MIP7RWCQJMID4TLZIWPHQYGJT2CIYWX",
   }
 } as const
 
 export const Errors = {
   1: { message: "NotFound" },
-  2: { message: "NotPermitted" },
-  3: { message: "ClientDataJsonChallengeIncorrect" },
-  4: { message: "Secp256r1PublicKeyParse" },
-  5: { message: "Secp256r1SignatureParse" },
-  6: { message: "Secp256r1VerifyFailed" },
+
+  2: { message: "MissingContext" },
+
+  3: { message: "MissingSignerLimits" },
+
+  4: { message: "FailedPolicySignerLimits" },
+
+  5: { message: "SignatureKeyValueMismatch" },
+
+  6: { message: "ClientDataJsonChallengeIncorrect" },
+
   7: { message: "JsonParseError" }
 }
+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 interface Signature {
+export type SignerVal = { tag: "Policy", values: readonly [SignerLimits] } | { tag: "Ed25519", values: readonly [SignerLimits] } | { tag: "Secp256r1", values: readonly [Buffer, SignerLimits] };
+
+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] };
+
+
+export interface Secp256r1Signature {
   authenticator_data: Buffer;
   client_data_json: Buffer;
-  id: Buffer;
   signature: Buffer;
 }
 
+export type Signature = { tag: "Ed25519", values: readonly [Buffer] } | { tag: "Secp256r1", values: readonly [Secp256r1Signature] };
+
+
 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.
    */
-  add: ({ id, pk, admin }: { id: Buffer, pk: Buffer, admin: boolean }, options?: {
+  add: ({ signer }: { signer: Signer }, options?: {
     /**
      * The fee to pay for the transaction. Default: BASE_FEE
      */
@@ -60,7 +92,7 @@ export interface Client {
   /**
    * Construct and simulate a remove 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.
    */
-  remove: ({ id }: { id: Buffer }, options?: {
+  remove: ({ signer_key }: { signer_key: SignerKey }, options?: {
     /**
      * The fee to pay for the transaction. Default: BASE_FEE
      */
@@ -96,16 +128,23 @@ export interface Client {
      */
     simulate?: boolean;
   }) => Promise<AssembledTransaction<Result<void>>>
+
 }
 export class Client extends ContractClient {
   constructor(public readonly options: ContractClientOptions) {
     super(
-      new ContractSpec(["AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAABwAAAAAAAAAITm90Rm91bmQAAAABAAAAAAAAAAxOb3RQZXJtaXR0ZWQAAAACAAAAAAAAACBDbGllbnREYXRhSnNvbkNoYWxsZW5nZUluY29ycmVjdAAAAAMAAAAAAAAAF1NlY3AyNTZyMVB1YmxpY0tleVBhcnNlAAAAAAQAAAAAAAAAF1NlY3AyNTZyMVNpZ25hdHVyZVBhcnNlAAAAAAUAAAAAAAAAFVNlY3AyNTZyMVZlcmlmeUZhaWxlZAAAAAAAAAYAAAAAAAAADkpzb25QYXJzZUVycm9yAAAAAAAH",
-        "AAAAAAAAAAAAAAADYWRkAAAAAAMAAAAAAAAAAmlkAAAAAAAOAAAAAAAAAAJwawAAAAAD7gAAAEEAAAAAAAAABWFkbWluAAAAAAAAAQAAAAEAAAPpAAAD7QAAAAAAAAAD",
-        "AAAAAAAAAAAAAAAGcmVtb3ZlAAAAAAABAAAAAAAAAAJpZAAAAAAADgAAAAEAAAPpAAAD7QAAAAAAAAAD",
+      new ContractSpec(["AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAABwAAAAAAAAAITm90Rm91bmQAAAABAAAAAAAAAA5NaXNzaW5nQ29udGV4dAAAAAAAAgAAAAAAAAATTWlzc2luZ1NpZ25lckxpbWl0cwAAAAADAAAAAAAAABhGYWlsZWRQb2xpY3lTaWduZXJMaW1pdHMAAAAEAAAAAAAAABlTaWduYXR1cmVLZXlWYWx1ZU1pc21hdGNoAAAAAAAABQAAAAAAAAAgQ2xpZW50RGF0YUpzb25DaGFsbGVuZ2VJbmNvcnJlY3QAAAAGAAAAAAAAAA5Kc29uUGFyc2VFcnJvcgAAAAAABw==",
+        "AAAAAQAAAAAAAAAAAAAADFNpZ25lckxpbWl0cwAAAAEAAAAAAAAAATAAAAAAAAPsAAAAEwAAA+gAAAPqAAAH0AAAAAlTaWduZXJLZXkAAAA=",
+        "AAAAAgAAAAAAAAAAAAAACVNpZ25lcktleQAAAAAAAAMAAAABAAAAAAAAAAZQb2xpY3kAAAAAAAEAAAATAAAAAQAAAAAAAAAHRWQyNTUxOQAAAAABAAAD7gAAACAAAAABAAAAAAAAAAlTZWNwMjU2cjEAAAAAAAABAAAADg==",
+        "AAAAAgAAAAAAAAAAAAAACVNpZ25lclZhbAAAAAAAAAMAAAABAAAAAAAAAAZQb2xpY3kAAAAAAAEAAAfQAAAADFNpZ25lckxpbWl0cwAAAAEAAAAAAAAAB0VkMjU1MTkAAAAAAQAAB9AAAAAMU2lnbmVyTGltaXRzAAAAAQAAAAAAAAAJU2VjcDI1NnIxAAAAAAAAAgAAA+4AAABBAAAH0AAAAAxTaWduZXJMaW1pdHM=",
+        "AAAAAgAAAAAAAAAAAAAADVNpZ25lclN0b3JhZ2UAAAAAAAACAAAAAAAAAAAAAAAKUGVyc2lzdGVudAAAAAAAAAAAAAAAAAAJVGVtcG9yYXJ5AAAA",
+        "AAAAAgAAAAAAAAAAAAAABlNpZ25lcgAAAAAAAwAAAAEAAAAAAAAABlBvbGljeQAAAAAAAwAAABMAAAfQAAAADFNpZ25lckxpbWl0cwAAB9AAAAANU2lnbmVyU3RvcmFnZQAAAAAAAAEAAAAAAAAAB0VkMjU1MTkAAAAAAwAAA+4AAAAgAAAH0AAAAAxTaWduZXJMaW1pdHMAAAfQAAAADVNpZ25lclN0b3JhZ2UAAAAAAAABAAAAAAAAAAlTZWNwMjU2cjEAAAAAAAAEAAAADgAAA+4AAABBAAAH0AAAAAxTaWduZXJMaW1pdHMAAAfQAAAADVNpZ25lclN0b3JhZ2UAAAA=",
+        "AAAAAQAAAAAAAAAAAAAAElNlY3AyNTZyMVNpZ25hdHVyZQAAAAAAAwAAAAAAAAASYXV0aGVudGljYXRvcl9kYXRhAAAAAAAOAAAAAAAAABBjbGllbnRfZGF0YV9qc29uAAAADgAAAAAAAAAJc2lnbmF0dXJlAAAAAAAD7gAAAEA=",
+        "AAAAAgAAAAAAAAAAAAAACVNpZ25hdHVyZQAAAAAAAAIAAAABAAAAAAAAAAdFZDI1NTE5AAAAAAEAAAPuAAAAQAAAAAEAAAAAAAAACVNlY3AyNTZyMQAAAAAAAAEAAAfQAAAAElNlY3AyNTZyMVNpZ25hdHVyZQAA",
+        "AAAAAAAAAAAAAAADYWRkAAAAAAEAAAAAAAAABnNpZ25lcgAAAAAH0AAAAAZTaWduZXIAAAAAAAEAAAPpAAAD7QAAAAAAAAAD",
+        "AAAAAAAAAAAAAAAGcmVtb3ZlAAAAAAABAAAAAAAAAApzaWduZXJfa2V5AAAAAAfQAAAACVNpZ25lcktleQAAAAAAAAEAAAPpAAAD7QAAAAAAAAAD",
         "AAAAAAAAAAAAAAAGdXBkYXRlAAAAAAABAAAAAAAAAARoYXNoAAAD7gAAACAAAAABAAAD6QAAA+0AAAAAAAAAAw==",
-        "AAAAAQAAAAAAAAAAAAAACVNpZ25hdHVyZQAAAAAAAAQAAAAAAAAAEmF1dGhlbnRpY2F0b3JfZGF0YQAAAAAADgAAAAAAAAAQY2xpZW50X2RhdGFfanNvbgAAAA4AAAAAAAAAAmlkAAAAAAAOAAAAAAAAAAlzaWduYXR1cmUAAAAAAAPuAAAAQA==",
-        "AAAAAAAAAAAAAAAMX19jaGVja19hdXRoAAAAAwAAAAAAAAARc2lnbmF0dXJlX3BheWxvYWQAAAAAAAPuAAAAIAAAAAAAAAAJc2lnbmF0dXJlAAAAAAAH0AAAAAlTaWduYXR1cmUAAAAAAAAAAAAADWF1dGhfY29udGV4dHMAAAAAAAPqAAAH0AAAAAdDb250ZXh0AAAAAAEAAAPpAAAD7QAAAAAAAAAD"]),
+        "AAAAAAAAAAAAAAAMX19jaGVja19hdXRoAAAAAwAAAAAAAAARc2lnbmF0dXJlX3BheWxvYWQAAAAAAAPuAAAAIAAAAAAAAAAKc2lnbmF0dXJlcwAAAAAD7AAAB9AAAAAJU2lnbmVyS2V5AAAAAAAD6AAAB9AAAAAJU2lnbmF0dXJlAAAAAAAAAAAAAA1hdXRoX2NvbnRleHRzAAAAAAAD6gAAB9AAAAAHQ29udGV4dAAAAAABAAAD6QAAA+0AAAAAAAAAAw=="]),
       options
     )
   }

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

@@ -1,9 +1,10 @@
 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: "CCPLERXCJZB7LX2VOSOCBNRN754FRLHI6Y2AVOQBA5L7C2ZJX5RFVVET";
+        readonly contractId: "CA3WONARSZHZQCCM5WF5HLD27MIP7RWCQJMID4TLZIWPHQYGJT2CIYWX";
     };
 };
 export declare const Errors: {
@@ -29,20 +30,62 @@ export declare const Errors: {
         message: string;
     };
 };
-export interface Signature {
+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 SignerVal = {
+    tag: "Policy";
+    values: readonly [SignerLimits];
+} | {
+    tag: "Ed25519";
+    values: readonly [SignerLimits];
+} | {
+    tag: "Secp256r1";
+    values: readonly [Buffer, SignerLimits];
+};
+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];
+};
+export interface Secp256r1Signature {
     authenticator_data: Buffer;
     client_data_json: Buffer;
-    id: Buffer;
     signature: Buffer;
 }
+export type Signature = {
+    tag: "Ed25519";
+    values: readonly [Buffer];
+} | {
+    tag: "Secp256r1";
+    values: readonly [Secp256r1Signature];
+};
 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.
      */
-    add: ({ id, pk, admin }: {
-        id: Buffer;
-        pk: Buffer;
-        admin: boolean;
+    add: ({ signer }: {
+        signer: Signer;
     }, options?: {
         /**
          * The fee to pay for the transaction. Default: BASE_FEE
@@ -60,8 +103,8 @@ export interface Client {
     /**
      * Construct and simulate a remove 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.
      */
-    remove: ({ id }: {
-        id: Buffer;
+    remove: ({ signer_key }: {
+        signer_key: SignerKey;
     }, options?: {
         /**
          * The fee to pay for the transaction. Default: BASE_FEE

package/packages/sac-sdk/package.json

@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "buffer": "6.0.3",
-    "@stellar/stellar-sdk": "12.1.0"
+    "@stellar/stellar-sdk": "12.3.0"
   },
   "devDependencies": {
-    "typescript": "5.5.3"
+    "typescript": "5.6.2"
   }
 }

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

@@ -1,13 +1,24 @@
 import { Buffer } from "buffer";
+import { Address } from '@stellar/stellar-sdk';
 import {
   AssembledTransaction,
   Client as ContractClient,
   ClientOptions as ContractClientOptions,
+  Result,
   Spec as ContractSpec,
 } from '@stellar/stellar-sdk/contract';
 import type {
   u32,
+  i32,
+  u64,
+  i64,
+  u128,
   i128,
+  u256,
+  i256,
+  Option,
+  Typepoint,
+  Duration,
 } from '@stellar/stellar-sdk/contract';
 
 if (typeof window !== 'undefined') {
@@ -15,6 +26,7 @@ if (typeof window !== 'undefined') {
   window.Buffer = window.Buffer || Buffer;
 }
 
+
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
@@ -529,6 +541,7 @@ export interface Client {
      */
     simulate?: boolean;
   }) => Promise<AssembledTransaction<null>>
+
 }
 export class Client extends ContractClient {
   constructor(public readonly options: ContractClientOptions) {

package/src/base.ts

@@ -1,5 +1,10 @@
 import { SorobanRpc } from "@stellar/stellar-sdk"
 
+// TODO consider adding support for a signAuthEntry method that conforms to the ed25519 signature scheme of this passkey interface
+// once we do that we can clean the code a little with the `xdr.HashIdPreimage.envelopeTypeSorobanAuthorization` stuff
+// ... note I've re-read the above and I've currently got no clue what this is asking for. Maybe check git-blame for when it was added to try and find some context
+// actually this is just talking about adding support for signing transactions with an ed25519 key as well as a passkey. Simple enough
+
 export class PasskeyBase {
     public rpcUrl: string | undefined
     public rpc: SorobanRpc.Server | undefined

package/src/index.ts

@@ -1,5 +1,5 @@
 import { PasskeyServer } from "./server"
-import { PasskeyKit } from "./kit"
+import { PasskeyKit, DEFAULT_LTL } from "./kit"
 import { SACClient } from "./sac"
 
-export { PasskeyServer, PasskeyKit, SACClient }
+export { PasskeyServer, PasskeyKit, SACClient, DEFAULT_LTL }

package/src/kit.ts

@@ -1,4 +1,4 @@
-import { Client as PasskeyClient } from 'passkey-kit-sdk'
+import { Client as PasskeyClient, type Secp256r1Signature, type Signature } 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'
@@ -6,7 +6,8 @@ import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import type { AuthenticatorAttestationResponseJSON, AuthenticatorSelectionCriteria } from "@simplewebauthn/types"
 import { Buffer } from 'buffer'
 import { PasskeyBase } from './base'
-import { DEFAULT_TIMEOUT } from '@stellar/stellar-sdk/contract'
+
+export const DEFAULT_LTL = 12
 
 export class PasskeyKit extends PasskeyBase {
     declare public rpc: SorobanRpc.Server
@@ -47,10 +48,23 @@ export class PasskeyKit extends PasskeyBase {
 
         const { result, built } = await this.factory.deploy({
             salt: hash(keyId),
-            id: keyId,
-            pk: publicKey
+            signer: {
+                tag: 'Secp256r1',
+                values: [
+                    keyId, 
+                    publicKey, 
+                    [new Map()],
+                    {tag: 'Persistent', values: undefined},
+                ]
+            },
         })
 
+        if (result.isErr())
+            throw new Error(result.unwrapErr().message)
+        
+        if (!built)
+            throw new Error('Failed to create wallet')
+
         const contractId = result.unwrap()
 
         this.wallet = new PasskeyClient({
@@ -62,7 +76,7 @@ export class PasskeyKit extends PasskeyBase {
         return {
             keyId,
             contractId,
-            xdr: built?.toXDR()
+            xdr: built.toXDR()
         }
     }
 
@@ -157,7 +171,7 @@ export class PasskeyKit extends PasskeyBase {
         }
 
         if (!contractId)
-            throw new Error('No `contractId` was found')
+            throw new Error('Failed to connect wallet')
 
         this.wallet = new PasskeyClient({
             contractId,
@@ -179,7 +193,7 @@ export class PasskeyKit extends PasskeyBase {
             ledgersToLive?: number
         }
     ) {
-        let { keyId, rpId, ledgersToLive = DEFAULT_TIMEOUT } = options || {}
+        let { keyId, rpId, ledgersToLive = DEFAULT_LTL } = options || {}
 
         const lastLedger = await this.rpc.getLatestLedger().then(({ sequence }) => sequence)
         const credentials = entry.credentials().address();
@@ -187,6 +201,8 @@ export class PasskeyKit extends PasskeyBase {
             new xdr.HashIdPreimageSorobanAuthorization({
                 networkId: hash(Buffer.from(this.networkPassphrase)),
                 nonce: credentials.nonce(),
+                // TODO maybe if folks set `ledgersToLive` that should be the TTL vs the extension from `lastLedger`. Will make it easier to coordinate multisig
+                // Call it `validUntilLedgerSeq` like the JS SDK
                 signatureExpirationLedger: lastLedger + ledgersToLive,
                 invocation: entry.rootInvocation()
             })
@@ -222,25 +238,48 @@ export class PasskeyKit extends PasskeyBase {
             base64url.toBuffer(authenticationResponse.response.signature)
         );
 
-        credentials.signatureExpirationLedger(lastLedger + ledgersToLive)
-        credentials.signature(xdr.ScVal.scvMap([
-            new xdr.ScMapEntry({
-                key: xdr.ScVal.scvSymbol('authenticator_data'),
-                val: xdr.ScVal.scvBytes(base64url.toBuffer(authenticationResponse.response.authenticatorData)),
-            }),
+        // TODO No idea how to make this work
+        // https://discord.com/channels/@me/1025113063583666246/1281789018979438672
+        // const t: Signature = {
+        //     tag: 'Secp256r1',
+        //     values: [{
+        //         authenticator_data: base64url.toBuffer(authenticationResponse.response.authenticatorData),
+        //         client_data_json: base64url.toBuffer(authenticationResponse.response.clientDataJSON),
+        //         id: [base64url.toBuffer(authenticationResponse.id)],
+        //         signature
+        //     }]
+        // }
+
+        // const test = this.wallet!.spec.nativeToScVal(t, )
+
+        const sig = xdr.ScVal.scvMap([
             new xdr.ScMapEntry({
-                key: xdr.ScVal.scvSymbol('client_data_json'),
-                val: xdr.ScVal.scvBytes(base64url.toBuffer(authenticationResponse.response.clientDataJSON)),
-            }),
-            new xdr.ScMapEntry({
-                key: xdr.ScVal.scvSymbol('id'),
-                val: xdr.ScVal.scvBytes(base64url.toBuffer(authenticationResponse.id)),
-            }),
-            new xdr.ScMapEntry({
-                key: xdr.ScVal.scvSymbol('signature'),
-                val: xdr.ScVal.scvBytes(signature),
-            }),
-        ]))
+                key: xdr.ScVal.scvVec([
+                    xdr.ScVal.scvSymbol('Secp256r1'),
+                    xdr.ScVal.scvBytes(base64url.toBuffer(authenticationResponse.id))
+                ]),
+                val: xdr.ScVal.scvVec([
+                    xdr.ScVal.scvSymbol('Secp256r1'),
+                    xdr.ScVal.scvMap([
+                        new xdr.ScMapEntry({
+                            key: xdr.ScVal.scvSymbol('authenticator_data'),
+                            val: xdr.ScVal.scvBytes(base64url.toBuffer(authenticationResponse.response.authenticatorData)),
+                        }),
+                        new xdr.ScMapEntry({
+                            key: xdr.ScVal.scvSymbol('client_data_json'),
+                            val: xdr.ScVal.scvBytes(base64url.toBuffer(authenticationResponse.response.clientDataJSON)),
+                        }),
+                        new xdr.ScMapEntry({
+                            key: xdr.ScVal.scvSymbol('signature'),
+                            val: xdr.ScVal.scvBytes(signature),
+                        }),
+                    ])  
+                ])
+            })
+        ])
+
+        credentials.signatureExpirationLedger(lastLedger + ledgersToLive)
+        credentials.signature(sig)
 
         return entry
     }
@@ -362,7 +401,7 @@ export class PasskeyKit extends PasskeyBase {
 
         /* TODO 
             - We're doing some pretty "smart" public key decoding stuff so we should verify the signature against this final public key before assuming it's safe to use and save on-chain
-                Given that `startRegistration` doesn't produce a signature, verifying we've got the correct public key isn't really possible
+                Hmm...Given that `startRegistration` doesn't produce a signature, verifying we've got the correct public key isn't really possible
                 @Later
         */
 

package/src/server.ts

@@ -1,6 +1,6 @@
 import { SorobanRpc, xdr } from "@stellar/stellar-sdk"
-import base64url from "base64url"
 import { PasskeyBase } from "./base"
+import base64url from "base64url"
 
 export class PasskeyServer extends PasskeyBase {
     public launchtubeUrl: string | undefined
@@ -49,7 +49,7 @@ export class PasskeyServer extends PasskeyBase {
                 Authorization: `Bearer ${this.mercuryJwt}`
             },
             body: JSON.stringify({
-                project_name: 'smart-wallets-data',
+                project_name: 'smart-wallets-data-multi-signer-multi-sig',
                 mode: {
                     Function: {
                         fname: "get_signers_by_address",
@@ -70,17 +70,20 @@ export class PasskeyServer extends PasskeyBase {
         for (const signer of signers) {
             if (!signer.admin) {
                 try {
-                    await this.rpc.getContractData(contractId, xdr.ScVal.scvBytes(signer.id), SorobanRpc.Durability.Temporary)
+                    await this.rpc.getContractData(contractId, xdr.ScVal.scvBytes(base64url.toBuffer(signer.key)), SorobanRpc.Durability.Temporary)
                 } catch {
                     signer.expired = true
                 }
             }
-
-            signer.id = base64url(signer.id)
-            signer.pk = base64url(signer.pk)
         }
 
-        return signers as { id: string, pk: string, admin: boolean, expired?: boolean }[]
+        return signers as { 
+            kind: string,
+            key: string, 
+            val: string, 
+            limits: string,
+            expired?: boolean 
+        }[]
     }
 
     public async getContractId(keyId: string) {
@@ -94,12 +97,13 @@ export class PasskeyServer extends PasskeyBase {
                 Authorization: `Bearer ${this.mercuryJwt}`
             },
             body: JSON.stringify({
-                project_name: 'smart-wallets-data',
+                project_name: 'smart-wallets-data-multi-signer-multi-sig',
                 mode: {
                     Function: {
                         fname: "get_address_by_signer",
                         arguments: JSON.stringify({
-                            id: [...base64url.toBuffer(keyId)]
+                            key: keyId,
+                            kind: 'Secp256r1'
                         })
                     }
                 }
@@ -112,7 +116,7 @@ export class PasskeyServer extends PasskeyBase {
                 throw await res.json()
             })
 
-        return res[0]?.address as string | undefined
+        return res || undefined as string | undefined
     }
 
     /* TODO 

package/types/index.d.ts

@@ -1,4 +1,4 @@
 import { PasskeyServer } from "./server";
-import { PasskeyKit } from "./kit";
+import { PasskeyKit, DEFAULT_LTL } from "./kit";
 import { SACClient } from "./sac";
-export { PasskeyServer, PasskeyKit, SACClient };
+export { PasskeyServer, PasskeyKit, SACClient, DEFAULT_LTL };

package/types/kit.d.ts

@@ -5,6 +5,7 @@ import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import type { AuthenticatorSelectionCriteria } from "@simplewebauthn/types";
 import { Buffer } from 'buffer';
 import { PasskeyBase } from './base';
+export declare const DEFAULT_LTL = 12;
 export declare class PasskeyKit extends PasskeyBase {
     rpc: SorobanRpc.Server;
     rpcUrl: string;
@@ -28,7 +29,7 @@ export declare class PasskeyKit extends PasskeyBase {
     createWallet(app: string, user: string): Promise<{
         keyId: Buffer;
         contractId: string;
-        xdr: string | undefined;
+        xdr: string;
     }>;
     createKey(app: string, user: string, settings?: {
         rpId?: string;

package/types/server.d.ts

@@ -12,11 +12,12 @@ export declare class PasskeyServer extends PasskeyBase {
         mercuryJwt?: string;
     });
     getSigners(contractId: string): Promise<{
-        id: string;
-        pk: string;
-        admin: boolean;
+        kind: string;
+        key: string;
+        val: string;
+        limits: string;
         expired?: boolean;
     }[]>;
-    getContractId(keyId: string): Promise<string | undefined>;
+    getContractId(keyId: string): Promise<any>;
     send(xdr: string, fee?: number): Promise<any>;
 }