passkey-kit 0.10.15 → 0.10.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.10.15",
+  "version": "0.10.16",
   "description": "A helper library for creating and using smart wallet accounts on the Stellar blockchain.",
   "author": "Tyler van der Hoeven",
   "license": "MIT",
@@ -12,8 +12,8 @@
     "@stellar/stellar-sdk": "^13.1.0",
     "base64url": "^3.0.1",
     "buffer": "^6.0.3",
-    "passkey-kit-sdk": "0.6.5",
-    "sac-sdk": "0.3.5"
+    "sac-sdk": "0.3.5",
+    "passkey-kit-sdk": "0.6.5"
   },
   "devDependencies": {
     "@simplewebauthn/types": "^12.0.0",

package/src/kit.ts

@@ -136,7 +136,7 @@ export class PasskeyKit extends PasskeyBase {
         rpId?: string,
         keyId?: string | Uint8Array,
         getContractId?: (keyId: string) => Promise<string | undefined>,
-        walletPublicKey?: string // TEMP for backwards compatibility when we seeded wallets from a factory address
+        walletPublicKey?: string // TEMP for backwards compatibility for when we seeded wallets from a factory address
     }) {
         let { keyId, rpId, getContractId, walletPublicKey } = opts || {}
         let keyIdBuffer: Buffer
@@ -164,17 +164,7 @@ export class PasskeyKit extends PasskeyBase {
             this.keyId = keyId
 
         // 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)),
-                contractIdPreimage: xdr.ContractIdPreimage.contractIdPreimageFromAddress(
-                    new xdr.ContractIdPreimageFromAddress({
-                        address: Address.fromString(walletPublicKey || this.walletPublicKey).toScAddress(),
-                        salt: hash(keyIdBuffer),
-                    })
-                )
-            })
-        ).toXDR()));
+        let contractId: string | undefined = this.encodeContract(this.walletPublicKey, keyIdBuffer);
 
         // attempt passkey id derivation
         try {
@@ -186,6 +176,19 @@ export class PasskeyKit extends PasskeyBase {
             contractId = getContractId && await getContractId(keyId)
         }
 
+        ////
+        // TEMP for backwards compatibility for when we seeded wallets from a factory address
+        if (!contractId && walletPublicKey) {
+            contractId = this.encodeContract(walletPublicKey, keyIdBuffer);
+
+            try {
+                await this.rpc.getContractData(contractId, xdr.ScVal.scvLedgerKeyContractInstance())
+            } catch {
+                contractId = undefined
+            }
+        }
+        ////
+
         if (!contractId)
             throw new Error('Failed to connect wallet')
 
@@ -556,6 +559,22 @@ export class PasskeyKit extends PasskeyBase {
         return signer_key
     }
 
+    private encodeContract(walletPublicKey: string, keyIdBuffer: Buffer) {
+        let contractId: string | undefined = StrKey.encodeContract(hash(xdr.HashIdPreimage.envelopeTypeContractId(
+            new xdr.HashIdPreimageContractId({
+                networkId: hash(Buffer.from(this.networkPassphrase)),
+                contractIdPreimage: xdr.ContractIdPreimage.contractIdPreimageFromAddress(
+                    new xdr.ContractIdPreimageFromAddress({
+                        address: Address.fromString(walletPublicKey).toScAddress(),
+                        salt: hash(keyIdBuffer),
+                    })
+                )
+            })
+        ).toXDR()));
+
+        return contractId
+    }
+
     private async getPublicKey(response: AuthenticatorAttestationResponseJSON) {
         let publicKey: Buffer | undefined
 

package/types/kit.d.ts

@@ -76,6 +76,7 @@ export declare class PasskeyKit extends PasskeyBase {
     private policy;
     private getSignerLimits;
     private getSignerKey;
+    private encodeContract;
     private getPublicKey;
     private compactSignature;
 }