passkey-kit 0.10.10 → 0.10.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passkey-kit",
-  "version": "0.10.10",
+  "version": "0.10.12",
   "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

@@ -1,12 +1,12 @@
 import { Client as PasskeyClient, type Signature, type SignerKey as SDKSignerKey, type SignerLimits as SDKSignerLimits } from 'passkey-kit-sdk'
-import { StrKey, hash, xdr, Keypair, Address } from '@stellar/stellar-sdk/minimal'
+import { StrKey, hash, xdr, Keypair, Address, TransactionBuilder, Operation } from '@stellar/stellar-sdk/minimal'
 import type { AuthenticatorAttestationResponseJSON, AuthenticatorSelectionCriteria } from "@simplewebauthn/types"
 import { startRegistration, startAuthentication } from "@simplewebauthn/browser"
 import { Buffer } from 'buffer'
 import base64url from 'base64url'
 import type { SignerKey, SignerLimits, SignerStore } from './types'
 import { PasskeyBase } from './base'
-import { AssembledTransaction, basicNodeSigner, DEFAULT_TIMEOUT, type Tx } from '@stellar/stellar-sdk/minimal/contract'
+import { AssembledTransaction, basicNodeSigner, DEFAULT_TIMEOUT, type AssembledTransactionOptions, type Tx } from '@stellar/stellar-sdk/minimal/contract'
 import type { Server } from '@stellar/stellar-sdk/minimal/rpc'
 
 export class PasskeyKit extends PasskeyBase {
@@ -396,10 +396,22 @@ export class PasskeyKit extends PasskeyBase {
             expiration?: number
         }
     ) {
-        if (typeof txn === 'string') {
-            txn = AssembledTransaction.fromXDR(this.wallet!.options, txn, this.wallet!.spec)
-        } else if (!(txn instanceof AssembledTransaction)) {
-            txn = AssembledTransaction.fromXDR(this.wallet!.options, txn.toXDR(), this.wallet!.spec)
+        if (!(txn instanceof AssembledTransaction)) {
+            txn = typeof txn === 'string' ? txn : txn.toXDR()
+
+            try {
+                txn = AssembledTransaction.fromXDR(this.wallet!.options, txn, this.wallet!.spec)
+            } catch {
+                if (!(txn instanceof AssembledTransaction)) {
+                    const built = TransactionBuilder.fromXDR(txn, this.networkPassphrase);
+                    const operation = built.operations[0] as Operation.InvokeHostFunction;
+
+                    txn = await AssembledTransaction.buildWithOp<T>(
+                        Operation.invokeHostFunction({ func: operation.func }), 
+                        this.wallet!.options as AssembledTransactionOptions<T>
+                    );
+                }
+            }
         }
 
         await txn.signAuthEntries({