passkey-kit 0.7.12 → 0.7.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.7.12",
+  "version": "0.7.13",
   "description": "A helper library for creating and using passkey accounts on the Stellar blockchain.",
   "author": "Tyler van der Hoeven",
   "license": "MIT",
@@ -14,8 +14,8 @@
     "base64url": "^3.0.1",
     "buffer": "^6.0.3",
     "passkey-factory-sdk": "0.3.4",
-    "sac-sdk": "0.1.1",
-    "passkey-kit-sdk": "0.3.4"
+    "passkey-kit-sdk": "0.3.4",
+    "sac-sdk": "0.1.1"
   },
   "devDependencies": {
     "@simplewebauthn/types": "^10.0.0",

package/src/kit.ts

@@ -8,21 +8,19 @@ import { Buffer } from 'buffer'
 import { PasskeyBase } from './base'
 import { AssembledTransaction, DEFAULT_TIMEOUT } from '@stellar/stellar-sdk/contract'
 
-// TODO ensure we're outputting a built transaction that's actually useful in the case you don't intend to use Launchtube
-
 export class SignerKey {
-    private constructor(public type: "Policy" | "Ed25519" | "Secp256r1", public value: string | Buffer) { }
+    private constructor(public key: "Policy" | "Ed25519" | "Secp256r1", public value: string) { }
 
-    static Policy(value: string): SignerKey {
-        return new SignerKey("Policy", value);
+    static Policy(policy: string): SignerKey {
+        return new SignerKey("Policy", policy);
     }
 
-    static Ed25519(value: Buffer): SignerKey {
-        return new SignerKey("Ed25519", value);
+    static Ed25519(publicKey: string): SignerKey {
+        return new SignerKey("Ed25519", publicKey);
     }
 
-    static Secp256r1(value: Buffer): SignerKey {
-        return new SignerKey("Secp256r1", value);
+    static Secp256r1(id: string): SignerKey {
+        return new SignerKey("Secp256r1", id);
     }
 }
 
@@ -219,7 +217,7 @@ export class PasskeyKit extends PasskeyBase {
         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(); // TODO review this for using the Signatures type again. Might be just `credentials`
+        const credentials = entry.credentials().address();
 
         if (!expiration) {
             expiration = credentials.signatureExpirationLedger()
@@ -402,6 +400,8 @@ export class PasskeyKit extends PasskeyBase {
             expiration?: number
         }
     ) {
+        // TODO ensure we're outputting a built transaction that's actually useful in the case you don't intend to use launchtube
+        // Pretty sure we'll always be woefully under budget
         return txn.signAuthEntries({
             address: this.wallet!.options.contractId,
             authorizeEntry: (entry) => {
@@ -449,32 +449,9 @@ export class PasskeyKit extends PasskeyBase {
         });
     }
 
-    public remove(key: SignerKey) {
-        let signer_key: SDKSignerKey
-
-        switch (key.type) {
-            case 'Policy':
-                signer_key = {
-                    tag: key.type,
-                    values: [key.value as string]
-                }
-                break;
-            case 'Ed25519':
-                signer_key = {
-                    tag: key.type,
-                    values: [key.value as Buffer]
-                }
-                break;
-            case 'Secp256r1':
-                signer_key = {
-                    tag: key.type,
-                    values: [key.value as Buffer]
-                }
-                break;
-        }
-
+    public remove(signer: SignerKey) {
         return this.wallet!.remove({
-            signer_key,
+            signer_key: this.getSignerKey(signer)
         });
     }
 
@@ -493,26 +470,9 @@ export class PasskeyKit extends PasskeyBase {
                 sdk_signer_keys = []
 
                 for (const signer_key of signer_keys) {
-                    switch (signer_key.type) {
-                        case 'Policy':
-                            sdk_signer_keys.push({
-                                tag: signer_key.type,
-                                values: [signer_key.value as string]
-                            })
-                            break;
-                        case 'Ed25519':
-                            sdk_signer_keys.push({
-                                tag: signer_key.type,
-                                values: [signer_key.value as Buffer]
-                            })
-                            break;
-                        case 'Secp256r1':
-                            sdk_signer_keys.push({
-                                tag: signer_key.type,
-                                values: [signer_key.value as Buffer]
-                            })
-                            break;
-                    }
+                    sdk_signer_keys.push(
+                        this.getSignerKey(signer_key)
+                    )
                 }
             }
 
@@ -522,6 +482,33 @@ export class PasskeyKit extends PasskeyBase {
         return sdk_limits
     }
 
+    private getSignerKey({ key: tag, value }: SignerKey) {
+        let signer_key: SDKSignerKey
+
+        switch (tag) {
+            case 'Policy':
+                signer_key = {
+                    tag,
+                    values: [value]
+                }
+                break;
+            case 'Ed25519':
+                signer_key = {
+                    tag,
+                    values: [Keypair.fromPublicKey(value).rawPublicKey()]
+                }
+                break;
+            case 'Secp256r1':
+                signer_key = {
+                    tag,
+                    values: [base64url.toBuffer(value)]
+                }
+                break;
+        }
+
+        return signer_key
+    }
+
     private async getPublicKey(response: AuthenticatorAttestationResponseJSON) {
         let publicKey: Buffer | undefined
 

package/types/kit.d.ts

@@ -7,12 +7,12 @@ import { Buffer } from 'buffer';
 import { PasskeyBase } from './base';
 import { AssembledTransaction } from '@stellar/stellar-sdk/contract';
 export declare class SignerKey {
-    type: "Policy" | "Ed25519" | "Secp256r1";
-    value: string | Buffer;
+    key: "Policy" | "Ed25519" | "Secp256r1";
+    value: string;
     private constructor();
-    static Policy(value: string): SignerKey;
-    static Ed25519(value: Buffer): SignerKey;
-    static Secp256r1(value: Buffer): SignerKey;
+    static Policy(policy: string): SignerKey;
+    static Ed25519(publicKey: string): SignerKey;
+    static Secp256r1(id: string): SignerKey;
 }
 export type SignerLimits = Map<string, SignerKey[] | undefined>;
 export declare enum SignerStore {
@@ -76,8 +76,9 @@ export declare class PasskeyKit extends PasskeyBase {
     addSecp256r1(keyId: Uint8Array, publicKey: Uint8Array, limits: SignerLimits, store: SignerStore): Promise<AssembledTransaction<import("@stellar/stellar-sdk/contract").Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>>;
     addEd25519(publicKey: string, limits: SignerLimits, store: SignerStore): Promise<AssembledTransaction<import("@stellar/stellar-sdk/contract").Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>>;
     addPolicy(policy: string, limits: SignerLimits, store: SignerStore): Promise<AssembledTransaction<import("@stellar/stellar-sdk/contract").Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>>;
-    remove(key: SignerKey): Promise<AssembledTransaction<import("@stellar/stellar-sdk/contract").Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>>;
+    remove(signer: SignerKey): Promise<AssembledTransaction<import("@stellar/stellar-sdk/contract").Result<void, import("@stellar/stellar-sdk/contract").ErrorMessage>>>;
     private getSignerLimits;
+    private getSignerKey;
     private getPublicKey;
     private compactSignature;
 }