passkey-kit 0.7.2 → 0.7.3

package/cheatsheet

@@ -13,7 +13,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 "CDONKSPO6DUH46JRRIAK4O5ZINA5C2RXHP57BMFHKVBGOQXAT3IW6QCO"
+mercury-cli --jwt $JWT --local false --mainnet false catchup --project-name "smart-wallets-data-multi-signer-multi-sig" --contracts "CBMMJ55OQSFSYASVENVHW55QNA4Q52GE42P23E4V7O37GKMETKOFFENA"
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "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.1",
-    "passkey-kit-sdk": "0.3.1",
-    "sac-sdk": "0.1.0"
+    "sac-sdk": "0.1.0",
+    "passkey-kit-sdk": "0.3.1"
   },
   "devDependencies": {
     "@simplewebauthn/types": "^10.0.0",

package/src/index.ts

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

package/src/kit.ts

@@ -1,6 +1,6 @@
 import { Client as PasskeyClient, type Signature, type SignerKey } from 'passkey-kit-sdk'
 import { Client as FactoryClient } from 'passkey-factory-sdk'
-import { Address, StrKey, hash, xdr, Transaction, SorobanRpc, Operation, TransactionBuilder, Keypair } from '@stellar/stellar-sdk'
+import { Address, StrKey, hash, xdr, Transaction, SorobanRpc, TransactionBuilder, Keypair } from '@stellar/stellar-sdk'
 import base64url from 'base64url'
 import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import type { AuthenticatorAttestationResponseJSON, AuthenticatorSelectionCriteria } from "@simplewebauthn/types"
@@ -8,8 +8,6 @@ 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
     declare public rpcUrl: string
@@ -195,17 +193,24 @@ export class PasskeyKit extends PasskeyBase {
         if (keyId && keypair)
             throw new Error('Provide either `options.keyId` or `options.keypair` but not both')
 
+        const credentials = entry.credentials().address();
+
         if (!validUntilLedgerSeq) {
-            const lastLedger = await this.rpc.getLatestLedger().then(({ sequence }) => sequence)
-            validUntilLedgerSeq = lastLedger + DEFAULT_TIMEOUT / 5;
+            validUntilLedgerSeq = credentials.signatureExpirationLedger()
+
+            if (!validUntilLedgerSeq) {
+                const lastLedger = await this.rpc.getLatestLedger().then(({ sequence }) => sequence)
+                validUntilLedgerSeq = lastLedger + DEFAULT_TIMEOUT / 5;
+            }
         }
 
-        const credentials = entry.credentials().address();
+        credentials.signatureExpirationLedger(validUntilLedgerSeq)
+        
         const preimage = xdr.HashIdPreimage.envelopeTypeSorobanAuthorization(
             new xdr.HashIdPreimageSorobanAuthorization({
                 networkId: hash(Buffer.from(this.networkPassphrase)),
                 nonce: credentials.nonce(),
-                signatureExpirationLedger: validUntilLedgerSeq,
+                signatureExpirationLedger: credentials.signatureExpirationLedger(),
                 invocation: entry.rootInvocation()
             })
         )
@@ -295,14 +300,17 @@ export class PasskeyKit extends PasskeyBase {
                 credentials.signature(xdr.ScVal.scvMap([scEntry]))
                 break;
             case 'scvMap':
+                // Add the new signature to the existing map
                 credentials.signature().map()?.push(scEntry)
+                // Order the map by key
+                credentials.signature().map()?.sort((a, b) => 
+                    a.key().toXDR().compare(b.key().toXDR())
+                )
                 break;
             default:
                 throw new Error('Unsupported signature')
         }
 
-        credentials.signatureExpirationLedger(validUntilLedgerSeq)
-
         return entry
     }
 
@@ -315,6 +323,8 @@ export class PasskeyKit extends PasskeyBase {
             validUntilLedgerSeq?: number
         }
     ) {
+        // TODO should there be more control over which auth entries are signed? Especially given we support multiple signers now?
+        // As-is .sign() will always sign every smart wallet auth entry. This may be okay but likely we should have more control over which auth entry the signer is signing
         for (const auth of entries) {
             if (
                 auth.credentials().switch().name === 'sorobanCredentialsAddress'

package/types/index.d.ts

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

package/types/kit.d.ts

@@ -5,7 +5,6 @@ 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;