passkey-kit 0.2.5 → 0.3.0

package/.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: Contract Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_name:
+        description: 'Unique release name'
+        required: true
+        type: string
+
+jobs:
+
+  release-contract-webauthn-factory:
+    uses: stellar-expert/soroban-build-workflow/.github/workflows/release.yml@main
+    with:
+      release_name: ${{ github.ref_name }}
+      release_description: 'Release of the factory contract'
+      relative_path: 'contracts'
+      package: 'webauthn-factory'
+    secrets:
+      release_token: ${{ secrets.GITHUB_TOKEN }}
+
+  release-contract-webauthn-secp256r1:
+      uses: stellar-expert/soroban-build-workflow/.github/workflows/release.yml@main
+      with:
+        release_name: ${{ github.ref_name }}
+        release_description: 'Release of the secp256r1 contract'
+        relative_path: 'contracts'
+        package: 'webauthn-secp256r1'
+      secrets:
+        release_token: ${{ secrets.GITHUB_TOKEN }}

package/.vscode/settings.json

@@ -1,5 +1,7 @@
 {
     "rust-analyzer.linkedProjects": [
+        "./zephyr/Cargo.toml",
+        "./contracts/Cargo.toml",
         "./contracts/contract-webauthn-factory/Cargo.toml",
         "./contracts/contract-webauthn-secp256r1/Cargo.toml",
     ]

package/README.md

@@ -60,8 +60,8 @@ pnpm i
 pnpm run start
 ```
 
-[!IMPORTANT]
+> [!IMPORTANT]
 > If you fiddle with contracts in `./contracts` you'll need to run the make commands. Just remember to update the `WEBAUTHN_FACTORY` and `WEBAUTHN_WASM` values from the `make deploy` command before running `make init`.
 
-[!IMPORTANT]
-> Keep in mind the bindings here in `./packages` have been _heavily_ modified. Be careful when rebuilding and updating. Likely you'll only want to update the `src/index.ts` files in each respective package vs swapping out entire directories.
+> [!IMPORTANT]
+> Keep in mind the bindings here in `./packages` have been _heavily_ modified. Be careful when rebuilding and updating. Likely you'll only want to update the `src/index.ts` files in each respective package vs swapping out entire directories.

package/TODO.md

@@ -1,2 +1 @@
-- [ ] Signer list should be paginated
-- [ ] Attach some meaningful metadata to signers so you know which one belongs to which domain
+- [ ] Add timestamps to zephyr event data

package/cheatsheet

@@ -2,4 +2,14 @@
 npm publish --workspaces   
 
 # Install passkey-kit
-pnpm publish --no-git-checks
+pnpm publish --no-git-checks
+
+# Mercury commands
+# https://test.mercurydata.app/
+
+export MERCURY_JWT=???
+mercury-cli --jwt $MERCURY_JWT --local false --mainnet false deploy
+mercury-cli --jwt $MERCURY_JWT --local false --mainnet false catchup --contracts "???" # don't forget to subscribe to the contract first
+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\": \"CBLWEW63G2KU7ZGVQTTFTJLGQSXAU5PU5ZXERQDDLL4LBA72D7ER6C75\"}"}}}'
+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\": \"CBLWEW63G2KU7ZGVQTTFTJLGQSXAU5PU5ZXERQDDLL4LBA72D7ER6C75\"}"}}}'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "A helper library for creating and using passkey accounts on the Stellar blockchain.",
   "author": "Tyler van der Hoeven",
   "license": "MIT",
@@ -9,16 +9,16 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "@simplewebauthn/browser": "^10.0.0",
-    "@stellar/stellar-sdk": "12.0.1",
+    "@stellar/stellar-sdk": "12.1.0",
     "base64url": "^3.0.1",
     "bigint-conversion": "^2.4.3",
     "buffer": "^6.0.3",
     "cbor-x": "^1.5.9",
-    "passkey-factory-sdk": "0.0.8",
-    "passkey-kit-sdk": "0.0.8"
+    "passkey-factory-sdk": "0.1.0",
+    "passkey-kit-sdk": "0.1.0"
   },
   "devDependencies": {
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.3"
   },
   "workspaces": [
     "packages/*"

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

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.8",
+  "version": "0.1.0",
   "name": "passkey-factory-sdk",
   "type": "module",
   "main": "src/index.ts",

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

@@ -15,39 +15,16 @@ if (typeof window !== 'undefined') {
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CBXQAM53YVVPKAPS2NCSOCXTOK6HOXA3JLURVLD6VFQUHJPKFVBJIBHQ",
+    contractId: "CA6DVSXLLOSI32JAPGP4MLOG64FGERLYCP2SGRX2A6MPWGA5KDUKL66P",
   }
 } as const
 
 export const Errors = {
   1: { message: "" },
-  2: { message: "" },
-  3: { message: "" },
-  4: { message: "" },
-  5: { message: "" }
+  2: { message: "" }
 }
 
 export interface Client {
-  /**
-   * Construct and simulate a extend_ttl 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.
-   */
-  extend_ttl: (options?: {
-    /**
-     * The fee to pay for the transaction. Default: BASE_FEE
-     */
-    fee?: number;
-
-    /**
-     * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-     */
-    timeoutInSeconds?: number;
-
-    /**
-     * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-     */
-    simulate?: boolean;
-  }) => Promise<AssembledTransaction<null>>
-
   /**
    * Construct and simulate a init 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.
    */
@@ -87,65 +64,18 @@ export interface Client {
      */
     simulate?: boolean;
   }) => Promise<AssembledTransaction<Result<string>>>
-
-  /**
-   * Construct and simulate a add_sig 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_sig: ({ id, contract }: { id: Buffer, contract: string }, options?: {
-    /**
-     * The fee to pay for the transaction. Default: BASE_FEE
-     */
-    fee?: number;
-
-    /**
-     * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-     */
-    timeoutInSeconds?: number;
-
-    /**
-     * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-     */
-    simulate?: boolean;
-  }) => Promise<AssembledTransaction<Result<void>>>
-
-  /**
-   * Construct and simulate a rm_sig 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.
-   */
-  rm_sig: ({ id, contract }: { id: Buffer, contract: string }, options?: {
-    /**
-     * The fee to pay for the transaction. Default: BASE_FEE
-     */
-    fee?: number;
-
-    /**
-     * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-     */
-    timeoutInSeconds?: number;
-
-    /**
-     * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-     */
-    simulate?: boolean;
-  }) => Promise<AssembledTransaction<Result<void>>>
-
 }
 export class Client extends ContractClient {
   constructor(public readonly options: ContractClientOptions) {
     super(
-      new ContractSpec(["AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAABQAAAAAAAAAJTm90SW5pdGVkAAAAAAAAAQAAAAAAAAAITm90Rm91bmQAAAACAAAAAAAAAAxOb3RQZXJtaXR0ZWQAAAADAAAAAAAAAA1BbHJlYWR5SW5pdGVkAAAAAAAABAAAAAAAAAANQWxyZWFkeU1hcHBlZAAAAAAAAAU=",
-        "AAAAAAAAAAAAAAAKZXh0ZW5kX3R0bAAAAAAAAAAAAAA=",
+      new ContractSpec(["AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAAAgAAAAAAAAAOTm90SW5pdGlhbGl6ZWQAAAAAAAEAAAAAAAAAEkFscmVhZHlJbml0aWFsaXplZAAAAAAAAg==",
         "AAAAAAAAAAAAAAAEaW5pdAAAAAEAAAAAAAAACXdhc21faGFzaAAAAAAAA+4AAAAgAAAAAQAAA+kAAAPtAAAAAAAAAAM=",
-        "AAAAAAAAAAAAAAAGZGVwbG95AAAAAAACAAAAAAAAAAJpZAAAAAAADgAAAAAAAAACcGsAAAAAA+4AAABBAAAAAQAAA+kAAAATAAAAAw==",
-        "AAAAAAAAAAAAAAAHYWRkX3NpZwAAAAACAAAAAAAAAAJpZAAAAAAADgAAAAAAAAAIY29udHJhY3QAAAATAAAAAQAAA+kAAAPtAAAAAAAAAAM=",
-        "AAAAAAAAAAAAAAAGcm1fc2lnAAAAAAACAAAAAAAAAAJpZAAAAAAADgAAAAAAAAAIY29udHJhY3QAAAATAAAAAQAAA+kAAAPtAAAAAAAAAAM="]),
+        "AAAAAAAAAAAAAAAGZGVwbG95AAAAAAACAAAAAAAAAAJpZAAAAAAADgAAAAAAAAACcGsAAAAAA+4AAABBAAAAAQAAA+kAAAATAAAAAw=="]),
       options
     )
   }
   public readonly fromJSON = {
-    extend_ttl: this.txFromJSON<null>,
     init: this.txFromJSON<Result<void>>,
-    deploy: this.txFromJSON<Result<string>>,
-    add_sig: this.txFromJSON<Result<void>>,
-    rm_sig: this.txFromJSON<Result<void>>
+    deploy: this.txFromJSON<Result<string>>
   }
 }

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

@@ -3,7 +3,7 @@ import { AssembledTransaction, Client as ContractClient, ClientOptions as Contra
 export declare const networks: {
     readonly testnet: {
         readonly networkPassphrase: "Test SDF Network ; September 2015";
-        readonly contractId: "CBXQAM53YVVPKAPS2NCSOCXTOK6HOXA3JLURVLD6VFQUHJPKFVBJIBHQ";
+        readonly contractId: "CA6DVSXLLOSI32JAPGP4MLOG64FGERLYCP2SGRX2A6MPWGA5KDUKL66P";
     };
 };
 export declare const Errors: {
@@ -13,34 +13,8 @@ export declare const Errors: {
     2: {
         message: string;
     };
-    3: {
-        message: string;
-    };
-    4: {
-        message: string;
-    };
-    5: {
-        message: string;
-    };
 };
 export interface Client {
-    /**
-     * Construct and simulate a extend_ttl 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.
-     */
-    extend_ttl: (options?: {
-        /**
-         * The fee to pay for the transaction. Default: BASE_FEE
-         */
-        fee?: number;
-        /**
-         * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-         */
-        timeoutInSeconds?: number;
-        /**
-         * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-         */
-        simulate?: boolean;
-    }) => Promise<AssembledTransaction<null>>;
     /**
      * Construct and simulate a init 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.
      */
@@ -80,55 +54,12 @@ export interface Client {
          */
         simulate?: boolean;
     }) => Promise<AssembledTransaction<Result<string>>>;
-    /**
-     * Construct and simulate a add_sig 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_sig: ({ id, contract }: {
-        id: Buffer;
-        contract: string;
-    }, options?: {
-        /**
-         * The fee to pay for the transaction. Default: BASE_FEE
-         */
-        fee?: number;
-        /**
-         * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-         */
-        timeoutInSeconds?: number;
-        /**
-         * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-         */
-        simulate?: boolean;
-    }) => Promise<AssembledTransaction<Result<void>>>;
-    /**
-     * Construct and simulate a rm_sig 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.
-     */
-    rm_sig: ({ id, contract }: {
-        id: Buffer;
-        contract: string;
-    }, options?: {
-        /**
-         * The fee to pay for the transaction. Default: BASE_FEE
-         */
-        fee?: number;
-        /**
-         * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-         */
-        timeoutInSeconds?: number;
-        /**
-         * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-         */
-        simulate?: boolean;
-    }) => Promise<AssembledTransaction<Result<void>>>;
 }
 export declare class Client extends ContractClient {
     readonly options: ContractClientOptions;
     constructor(options: ContractClientOptions);
     readonly fromJSON: {
-        extend_ttl: (json: string) => AssembledTransaction<null>;
         init: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
         deploy: (json: string) => AssembledTransaction<Result<string, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
-        add_sig: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
-        rm_sig: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
     };
 }

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

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.8",
+  "version": "0.1.0",
   "name": "passkey-kit-sdk",
   "type": "module",
   "main": "src/index.ts",

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

@@ -15,7 +15,7 @@ if (typeof window !== 'undefined') {
 export const networks = {
   testnet: {
     networkPassphrase: "Test SDF Network ; September 2015",
-    contractId: "CBXQAM53YVVPKAPS2NCSOCXTOK6HOXA3JLURVLD6VFQUHJPKFVBJIBHQ",
+    contractId: "CA6DVSXLLOSI32JAPGP4MLOG64FGERLYCP2SGRX2A6MPWGA5KDUKL66P",
   }
 } as const
 
@@ -40,30 +40,10 @@ export interface Signature {
 }
 
 export interface Client {
-  /**
-   * Construct and simulate a extend_ttl 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.
-   */
-  extend_ttl: (options?: {
-    /**
-     * The fee to pay for the transaction. Default: BASE_FEE
-     */
-    fee?: number;
-
-    /**
-     * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-     */
-    timeoutInSeconds?: number;
-
-    /**
-     * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-     */
-    simulate?: boolean;
-  }) => Promise<AssembledTransaction<null>>
-
   /**
    * Construct and simulate a init 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.
    */
-  init: ({ id, pk, factory }: { id: Buffer, pk: Buffer, factory: string }, options?: {
+  init: ({ id, pk }: { id: Buffer, pk: Buffer }, options?: {
     /**
      * The fee to pay for the transaction. Default: BASE_FEE
      */
@@ -101,9 +81,9 @@ export interface Client {
   }) => Promise<AssembledTransaction<Result<void>>>
 
   /**
-   * Construct and simulate a resudo 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.
+   * Construct and simulate a add_sig 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.
    */
-  resudo: ({ id }: { id: Buffer }, options?: {
+  add_sig: ({ id, pk }: { id: Buffer, pk: Buffer }, options?: {
     /**
      * The fee to pay for the transaction. Default: BASE_FEE
      */
@@ -141,9 +121,9 @@ export interface Client {
   }) => Promise<AssembledTransaction<Result<void>>>
 
   /**
-   * Construct and simulate a add_sig 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.
+   * Construct and simulate a re_super 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_sig: ({ id, pk }: { id: Buffer, pk: Buffer }, options?: {
+  re_super: ({ id }: { id: Buffer }, options?: {
     /**
      * The fee to pay for the transaction. Default: BASE_FEE
      */
@@ -163,24 +143,22 @@ export interface Client {
 export class Client extends ContractClient {
   constructor(public readonly options: ContractClientOptions) {
     super(
-      new ContractSpec(["AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAACgAAAAAAAAAJTm90SW5pdGVkAAAAAAAAAQAAAAAAAAAITm90Rm91bmQAAAACAAAAAAAAAAxOb3RQZXJtaXR0ZWQAAAADAAAAAAAAAA1BbHJlYWR5SW5pdGVkAAAAAAAABAAAAAAAAAAOSnNvblBhcnNlRXJyb3IAAAAAAAUAAAAAAAAADkludmFsaWRDb250ZXh0AAAAAAAGAAAAAAAAACBDbGllbnREYXRhSnNvbkNoYWxsZW5nZUluY29ycmVjdAAAAAcAAAAAAAAAF1NlY3AyNTZyMVB1YmxpY0tleVBhcnNlAAAAAAgAAAAAAAAAF1NlY3AyNTZyMVNpZ25hdHVyZVBhcnNlAAAAAAkAAAAAAAAAFVNlY3AyNTZyMVZlcmlmeUZhaWxlZAAAAAAAAAo=",
-        "AAAAAAAAAAAAAAAKZXh0ZW5kX3R0bAAAAAAAAAAAAAA=",
-        "AAAAAAAAAAAAAAAEaW5pdAAAAAMAAAAAAAAAAmlkAAAAAAAOAAAAAAAAAAJwawAAAAAD7gAAAEEAAAAAAAAAB2ZhY3RvcnkAAAAAEwAAAAEAAAPpAAAD7QAAAAAAAAAD",
+      new ContractSpec(["AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAACgAAAAAAAAAOTm90SW5pdGlhbGl6ZWQAAAAAAAEAAAAAAAAACE5vdEZvdW5kAAAAAgAAAAAAAAAMTm90UGVybWl0dGVkAAAAAwAAAAAAAAASQWxyZWFkeUluaXRpYWxpemVkAAAAAAAEAAAAAAAAAA5Kc29uUGFyc2VFcnJvcgAAAAAABQAAAAAAAAAOSW52YWxpZENvbnRleHQAAAAAAAYAAAAAAAAAIENsaWVudERhdGFKc29uQ2hhbGxlbmdlSW5jb3JyZWN0AAAABwAAAAAAAAAXU2VjcDI1NnIxUHVibGljS2V5UGFyc2UAAAAACAAAAAAAAAAXU2VjcDI1NnIxU2lnbmF0dXJlUGFyc2UAAAAACQAAAAAAAAAVU2VjcDI1NnIxVmVyaWZ5RmFpbGVkAAAAAAAACg==",
+        "AAAAAAAAAAAAAAAEaW5pdAAAAAIAAAAAAAAAAmlkAAAAAAAOAAAAAAAAAAJwawAAAAAD7gAAAEEAAAABAAAD6QAAA+0AAAAAAAAAAw==",
         "AAAAAAAAAAAAAAAHdXBncmFkZQAAAAABAAAAAAAAAARoYXNoAAAD7gAAACAAAAABAAAD6QAAA+0AAAAAAAAAAw==",
-        "AAAAAAAAAAAAAAAGcmVzdWRvAAAAAAABAAAAAAAAAAJpZAAAAAAADgAAAAEAAAPpAAAD7QAAAAAAAAAD",
-        "AAAAAAAAAAAAAAAGcm1fc2lnAAAAAAABAAAAAAAAAAJpZAAAAAAADgAAAAEAAAPpAAAD7QAAAAAAAAAD",
         "AAAAAAAAAAAAAAAHYWRkX3NpZwAAAAACAAAAAAAAAAJpZAAAAAAADgAAAAAAAAACcGsAAAAAA+4AAABBAAAAAQAAA+kAAAPtAAAAAAAAAAM=",
+        "AAAAAAAAAAAAAAAGcm1fc2lnAAAAAAABAAAAAAAAAAJpZAAAAAAADgAAAAEAAAPpAAAD7QAAAAAAAAAD",
+        "AAAAAAAAAAAAAAAIcmVfc3VwZXIAAAABAAAAAAAAAAJpZAAAAAAADgAAAAEAAAPpAAAD7QAAAAAAAAAD",
         "AAAAAQAAAAAAAAAAAAAACVNpZ25hdHVyZQAAAAAAAAQAAAAAAAAAEmF1dGhlbnRpY2F0b3JfZGF0YQAAAAAADgAAAAAAAAAQY2xpZW50X2RhdGFfanNvbgAAAA4AAAAAAAAAAmlkAAAAAAAOAAAAAAAAAAlzaWduYXR1cmUAAAAAAAPuAAAAQA==",
         "AAAAAAAAAAAAAAAMX19jaGVja19hdXRoAAAAAwAAAAAAAAARc2lnbmF0dXJlX3BheWxvYWQAAAAAAAPuAAAAIAAAAAAAAAAJc2lnbmF0dXJlAAAAAAAH0AAAAAlTaWduYXR1cmUAAAAAAAAAAAAADWF1dGhfY29udGV4dHMAAAAAAAPqAAAH0AAAAAdDb250ZXh0AAAAAAEAAAPpAAAD7QAAAAAAAAAD"]),
       options
     )
   }
   public readonly fromJSON = {
-    extend_ttl: this.txFromJSON<null>,
     init: this.txFromJSON<Result<void>>,
     upgrade: this.txFromJSON<Result<void>>,
-    resudo: this.txFromJSON<Result<void>>,
-    rm_sig: this.txFromJSON<Result<void>>,
     add_sig: this.txFromJSON<Result<void>>,
+    rm_sig: this.txFromJSON<Result<void>>,
+    re_super: this.txFromJSON<Result<void>>
   }
 }

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

@@ -3,7 +3,7 @@ import { AssembledTransaction, Client as ContractClient, ClientOptions as Contra
 export declare const networks: {
     readonly testnet: {
         readonly networkPassphrase: "Test SDF Network ; September 2015";
-        readonly contractId: "CBXQAM53YVVPKAPS2NCSOCXTOK6HOXA3JLURVLD6VFQUHJPKFVBJIBHQ";
+        readonly contractId: "CA6DVSXLLOSI32JAPGP4MLOG64FGERLYCP2SGRX2A6MPWGA5KDUKL66P";
     };
 };
 export declare const Errors: {
@@ -45,30 +45,12 @@ export interface Signature {
     signature: Buffer;
 }
 export interface Client {
-    /**
-     * Construct and simulate a extend_ttl 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.
-     */
-    extend_ttl: (options?: {
-        /**
-         * The fee to pay for the transaction. Default: BASE_FEE
-         */
-        fee?: number;
-        /**
-         * The maximum amount of time to wait for the transaction to complete. Default: DEFAULT_TIMEOUT
-         */
-        timeoutInSeconds?: number;
-        /**
-         * Whether to automatically simulate the transaction when constructing the AssembledTransaction. Default: true
-         */
-        simulate?: boolean;
-    }) => Promise<AssembledTransaction<null>>;
     /**
      * Construct and simulate a init 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.
      */
-    init: ({ id, pk, factory }: {
+    init: ({ id, pk }: {
         id: Buffer;
         pk: Buffer;
-        factory: string;
     }, options?: {
         /**
          * The fee to pay for the transaction. Default: BASE_FEE
@@ -103,10 +85,11 @@ export interface Client {
         simulate?: boolean;
     }) => Promise<AssembledTransaction<Result<void>>>;
     /**
-     * Construct and simulate a resudo 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.
+     * Construct and simulate a add_sig 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.
      */
-    resudo: ({ id }: {
+    add_sig: ({ id, pk }: {
         id: Buffer;
+        pk: Buffer;
     }, options?: {
         /**
          * The fee to pay for the transaction. Default: BASE_FEE
@@ -141,11 +124,10 @@ export interface Client {
         simulate?: boolean;
     }) => Promise<AssembledTransaction<Result<void>>>;
     /**
-     * Construct and simulate a add_sig 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.
+     * Construct and simulate a re_super 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_sig: ({ id, pk }: {
+    re_super: ({ id }: {
         id: Buffer;
-        pk: Buffer;
     }, options?: {
         /**
          * The fee to pay for the transaction. Default: BASE_FEE
@@ -165,11 +147,10 @@ export declare class Client extends ContractClient {
     readonly options: ContractClientOptions;
     constructor(options: ContractClientOptions);
     readonly fromJSON: {
-        extend_ttl: (json: string) => AssembledTransaction<null>;
         init: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
         upgrade: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
-        resudo: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
-        rm_sig: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
         add_sig: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
+        rm_sig: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
+        re_super: (json: string) => AssembledTransaction<Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>;
     };
 }

package/src/kit.ts

@@ -1,5 +1,5 @@
 import { Client as PasskeyClient } from 'passkey-kit-sdk'
-import { Client as FactoryClient, networks } from 'passkey-factory-sdk'
+import { Client as FactoryClient } from 'passkey-factory-sdk'
 import { Address, Networks, StrKey, hash, xdr, Transaction, SorobanRpc, Operation, scValToNative, TransactionBuilder } from '@stellar/stellar-sdk'
 import { bufToBigint, bigintToBuf } from 'bigint-conversion'
 import base64url from 'base64url'
@@ -8,44 +8,30 @@ import { decode } from 'cbor-x/decode'
 import { Buffer } from 'buffer'
 import { PasskeyBase } from './base'
 
-/* TODO 
-    - Clean up these params and the interface as a whole
-        Might put wallet activities and maybe factory as well into the root of the class vs buried inside this.wallet and this.factory
-        @Later
-    - Right now publicKey can mean a Stellar public key or a passkey public key, there should be a noted difference
-*/
+type GetContractIdFunction = (keyId: string) => Promise<string>;
 
 export class PasskeyKit extends PasskeyBase {
     public keyId: string | undefined
-    public sudoKeyId: string | undefined
+    public keyExpired: boolean | undefined
     public wallet: PasskeyClient | undefined
     public factory: FactoryClient
     public networkPassphrase: Networks
     public rpcUrl: string
     public rpc: SorobanRpc.Server
-    public factoryContractId: string = networks.testnet.contractId
-
-    /* NOTE 
-        - Consider adding the ability to pass in a keyId and maybe even a contractId in order to preconnect to a wallet
-            If just a keyId call `connectWallet` in order to get the contractId
-            If both keyId and contractId are passed in then we can skip the connectWallet call (though we won't get the sudoKeyId in that case)
-            We don't strictly _need_ this as a dev can just call `connectWallet` after class instantiation but it might be a nice convenience
-            `connectWallet` is async making it tricky to know when the wallet is "ready". Thus I think it's better for `connectWallet` to be called externally
-            @No
-    */
+
     constructor(options: {
         rpcUrl: string,
         launchtubeUrl?: string,
         launchtubeJwt?: string,
-        factoryContractId?: string,
         networkPassphrase: string,
+        factoryContractId: string,
     }) {
         const {
             rpcUrl,
             launchtubeUrl,
             launchtubeJwt,
-            factoryContractId,
             networkPassphrase,
+            factoryContractId,
         } = options
 
         super({
@@ -53,14 +39,11 @@ export class PasskeyKit extends PasskeyBase {
             launchtubeJwt,
         })
 
-        if (factoryContractId)
-            this.factoryContractId = factoryContractId
-
         this.rpcUrl = rpcUrl
         this.rpc = new SorobanRpc.Server(rpcUrl)
         this.networkPassphrase = networkPassphrase as Networks
         this.factory = new FactoryClient({
-            contractId: this.factoryContractId,
+            contractId: factoryContractId,
             networkPassphrase,
             rpcUrl
         })
@@ -110,14 +93,9 @@ export class PasskeyKit extends PasskeyBase {
             attestation: "none",
         });
 
-        if (!this.keyId) {
+        if (!this.keyId)
             this.keyId = startRegistrationResponse.id
 
-            // If there was no keyId we're likely about to deploy a new wallet so we should set the sudoKeyId 
-            if (!this.sudoKeyId)
-                this.sudoKeyId = startRegistrationResponse.id
-        }
-
         const { publicKeyObject } = this.getPublicKeyObject(startRegistrationResponse.response.attestationObject);
 
         const publicKey = Buffer.from([
@@ -132,7 +110,13 @@ export class PasskeyKit extends PasskeyBase {
         }
     }
 
-    public async connectWallet(keyId?: string) {
+    public async connectWallet(opts: {
+        keyId?: string | Uint8Array,
+        getContractId?: GetContractIdFunction
+    }) {
+        let { keyId, getContractId } = opts
+        let keyIdBuffer: Uint8Array
+
         if (!keyId) {
             const { id } = await startAuthentication({
                 challenge: base64url("stellaristhebetterblockchain"),
@@ -143,45 +127,59 @@ export class PasskeyKit extends PasskeyBase {
             keyId = id
         }
 
+        if (keyId instanceof Uint8Array) {
+            keyIdBuffer = keyId
+            keyId = base64url(keyId)
+        } else {
+            keyIdBuffer = base64url.toBuffer(keyId)
+        }
+
         if (!this.keyId)
             this.keyId = keyId
 
-        const keyIdBuffer = base64url.toBuffer(keyId)
-
-        // NOTE might not need this for derivation as all signers are stored in the factory and we can use that lookup as both primary and secondary
-        let contractId = StrKey.encodeContract(hash(xdr.HashIdPreimage.envelopeTypeContractId(
+        // Check for the contractId on-chain as a derivation from the keyId. This is the easiest and "cheapest" check however it will only work for the initially deployed passkey if it was used as derivation
+        let contractId: string | undefined = StrKey.encodeContract(hash(xdr.HashIdPreimage.envelopeTypeContractId(
             new xdr.HashIdPreimageContractId({
                 networkId: hash(Buffer.from(this.networkPassphrase, 'utf-8')),
                 contractIdPreimage: xdr.ContractIdPreimage.contractIdPreimageFromAddress(
                     new xdr.ContractIdPreimageFromAddress({
-                        address: Address.fromString(this.factoryContractId).toScAddress(),
+                        address: Address.fromString(this.factory.options.contractId).toScAddress(),
                         salt: hash(keyIdBuffer),
                     })
                 )
             })
         ).toXDR()));
 
-        let contractData: SorobanRpc.Api.LedgerEntryResult | undefined
-
         // attempt passkey id derivation
         try {
-            contractData = await this.rpc.getContractData(contractId, xdr.ScVal.scvLedgerKeyContractInstance())
+            await this.rpc.getContractData(contractId, xdr.ScVal.scvLedgerKeyContractInstance())
         }
         // if that fails look up from the factory mapper
         catch {
-            const { val } = await this.rpc.getContractData(this.factoryContractId, xdr.ScVal.scvBytes(keyIdBuffer))
-            contractId = scValToNative(val.contractData().val())
+            contractId = undefined
+
+            if (getContractId) {
+                contractId = await getContractId(keyId)
+
+                // Handle case where temporary session signer is missing on-chain (so we can queue up a re-add)
+                try {
+                    await this.rpc.getContractData(contractId, xdr.ScVal.scvBytes(keyIdBuffer), SorobanRpc.Durability.Temporary)
+                    // throw true
+                } catch {
+                    this.keyExpired = true
+                }
+            }
         }
 
+        if (!contractId)
+            throw new Error('No `contractId` was found')
+
         this.wallet = new PasskeyClient({
             contractId,
             networkPassphrase: this.networkPassphrase,
             rpcUrl: this.rpcUrl
         })
 
-        // get and set the sudo signer (passing in `contractData` from the `getContractData` call above to avoid dupe requests)
-        await this.getData(contractData)
-
         return {
             keyId: keyIdBuffer,
             contractId
@@ -191,7 +189,7 @@ export class PasskeyKit extends PasskeyBase {
     public async signAuthEntry(
         entry: xdr.SorobanAuthorizationEntry,
         options?: {
-            keyId?: 'any' | 'sudo' | string | Uint8Array
+            keyId?: 'any' | string | Uint8Array
             ledgersToLive?: number
         }
     ) {
@@ -212,7 +210,6 @@ export class PasskeyKit extends PasskeyBase {
 
         const authenticationResponse = await startAuthentication(
             keyId === 'any'
-                || (keyId === 'sudo' && !this.sudoKeyId)
                 || (!keyId && !this.keyId)
                 ? {
                     challenge: base64url(payload),
@@ -224,11 +221,9 @@ export class PasskeyKit extends PasskeyBase {
                     // rpId: undefined,
                     allowCredentials: [
                         {
-                            id: keyId === 'sudo'
-                                ? this.sudoKeyId!
-                                : keyId instanceof Uint8Array
-                                    ? base64url(keyId)
-                                    : keyId || this.keyId!,
+                            id: keyId instanceof Uint8Array
+                                ? base64url(keyId)
+                                : keyId || this.keyId!,
                             type: "public-key",
                         },
                     ],
@@ -238,7 +233,7 @@ export class PasskeyKit extends PasskeyBase {
 
         const signatureRaw = base64url.toBuffer(authenticationResponse.response.signature);
         const signature = this.convertEcdsaSignatureAsnToCompact(signatureRaw);
-        
+
         credentials.signatureExpirationLedger(lastLedger + ledgersToLive)
         credentials.signature(xdr.ScVal.scvMap([
             new xdr.ScMapEntry({
@@ -258,13 +253,13 @@ export class PasskeyKit extends PasskeyBase {
                 val: xdr.ScVal.scvBytes(signature),
             }),
         ]))
-        
+
         return entry
     }
     public async signAuthEntries(
         entries: xdr.SorobanAuthorizationEntry[],
         options?: {
-            keyId?: 'any' | 'sudo' | string | Uint8Array
+            keyId?: 'any' | string | Uint8Array
             ledgersToLive?: number
         }
     ) {
@@ -281,21 +276,14 @@ export class PasskeyKit extends PasskeyBase {
 
         return entries
     }
-    /* NOTE 
-        - Is there anything to be done with using the TS bindings `signAuthEntries` logic? Likely not but worth exploring 
-            Perhaps not but maybe the js-sdk's `authorizeEntry` or `authorizeInvocation`
-            https://stellar.github.io/js-stellar-sdk/global.html#authorizeInvocation
-            These methods all only support ed25519 Keypairs
-            @No
-    */
     public async sign(
         txn: Transaction | string,
         options?: {
-            keyId?: 'any' | 'sudo' | string | Uint8Array
+            keyId?: 'any' | string | Uint8Array
             ledgersToLive?: number
         }
     ) {
-        /* NOTE 
+        /*
             - Hack to ensure we don't stack fees when simulating and assembling multiple times
                 AssembleTransaction always adds the resource fee onto the transaction fee. 
                 This is bad in cases where you need to simulate multiple times
@@ -315,7 +303,7 @@ export class PasskeyKit extends PasskeyBase {
                 op.type !== 'invokeHostFunction'
                 && op.type !== 'extendFootprintTtl'
                 && op.type !== 'restoreFootprint'
-            ) throw new Error('Must include only one operation of type `invokeHostFunction` or `extendFootprintTtl` or `restoreFootprint`')    
+            ) throw new Error('Must include only one operation of type `invokeHostFunction` or `extendFootprintTtl` or `restoreFootprint`')
         }
 
         // Only need to sign auth for `invokeHostFunction` operations
@@ -335,15 +323,10 @@ export class PasskeyKit extends PasskeyBase {
 
         return SorobanRpc.assembleTransaction(txn, sim).build().toXDR()
     }
-
-    public async getData(contractData?: SorobanRpc.Api.LedgerEntryResult) {
+    public async getSuperKeyId() {
         const data: Map<string, any> = new Map()
 
-        /* TODO 
-            - Pretty easy to get into a state where there is no contractId and this we error at `this.wallet!.options.contractId,`
-                We should have a better error or maybe just handle no-wallet scenarios more gracefully
-        */
-        const { val } = contractData || await this.rpc.getContractData(
+        const { val } = await this.rpc.getContractData(
             this.wallet!.options.contractId,
             xdr.ScVal.scvLedgerKeyContractInstance(),
         );
@@ -359,9 +342,7 @@ export class PasskeyKit extends PasskeyBase {
                 );
             });
 
-        this.sudoKeyId = base64url(data.get('sudo_sig'))
-
-        return data
+        return base64url(data.get('super'))
     }
 
     /* TODO 

package/tsconfig.json

@@ -26,5 +26,5 @@
     "noPropertyAccessFromIndexSignature": false,
     "strictNullChecks": true,
   },
-  "exclude": ["./demo", "./packages", "./types", "./contracts"]
+  "exclude": ["./demo", "./packages", "./types", "./contracts", "./zephyr"]
 }

package/types/kit.d.ts

@@ -3,21 +3,21 @@ import { Client as FactoryClient } from 'passkey-factory-sdk';
 import { Networks, xdr, Transaction, SorobanRpc } from '@stellar/stellar-sdk';
 import { Buffer } from 'buffer';
 import { PasskeyBase } from './base';
+type GetContractIdFunction = (keyId: string) => Promise<string>;
 export declare class PasskeyKit extends PasskeyBase {
     keyId: string | undefined;
-    sudoKeyId: string | undefined;
+    keyExpired: boolean | undefined;
     wallet: PasskeyClient | undefined;
     factory: FactoryClient;
     networkPassphrase: Networks;
     rpcUrl: string;
     rpc: SorobanRpc.Server;
-    factoryContractId: string;
     constructor(options: {
         rpcUrl: string;
         launchtubeUrl?: string;
         launchtubeJwt?: string;
-        factoryContractId?: string;
         networkPassphrase: string;
+        factoryContractId: string;
     });
     createWallet(name: string, user: string): Promise<{
         keyId: Buffer;
@@ -28,23 +28,27 @@ export declare class PasskeyKit extends PasskeyBase {
         keyId: Buffer;
         publicKey: Buffer;
     }>;
-    connectWallet(keyId?: string): Promise<{
-        keyId: Buffer;
+    connectWallet(opts: {
+        keyId?: string | Uint8Array;
+        getContractId?: GetContractIdFunction;
+    }): Promise<{
+        keyId: Uint8Array;
         contractId: string;
     }>;
     signAuthEntry(entry: xdr.SorobanAuthorizationEntry, options?: {
-        keyId?: 'any' | 'sudo' | string | Uint8Array;
+        keyId?: 'any' | string | Uint8Array;
         ledgersToLive?: number;
     }): Promise<xdr.SorobanAuthorizationEntry>;
     signAuthEntries(entries: xdr.SorobanAuthorizationEntry[], options?: {
-        keyId?: 'any' | 'sudo' | string | Uint8Array;
+        keyId?: 'any' | string | Uint8Array;
         ledgersToLive?: number;
     }): Promise<xdr.SorobanAuthorizationEntry[]>;
     sign(txn: Transaction | string, options?: {
-        keyId?: 'any' | 'sudo' | string | Uint8Array;
+        keyId?: 'any' | string | Uint8Array;
         ledgersToLive?: number;
     }): Promise<string>;
-    getData(contractData?: SorobanRpc.Api.LedgerEntryResult): Promise<Map<string, any>>;
+    getSuperKeyId(): Promise<string>;
     private getPublicKeyObject;
     private convertEcdsaSignatureAsnToCompact;
 }
+export {};