kokio-sdk 0.0.10 → 0.1.0

package/.github/workflows/npm_publish.yaml

@@ -1,19 +1,45 @@
 name: Publish SDK
 
 on:
-  # Publishing only happens when pushing to publish branch is made
   push:
     branches: [ "main" ]
 
+permissions:
+  id-token: write
+  contents: write
+
 jobs:
   publish-npm:
+    if: contains(github.event.head_commit.message, 'Release')
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version: 22
           registry-url: https://registry.npmjs.org/
-      - run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+
+      - name: Get version from package.json
+        id: pkg
+        run: |
+          VERSION=$(node -p "require('./package.json').version")
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Create Git tag
+        run: |
+          git tag v${{ steps.pkg.outputs.version }}
+          git push origin v${{ steps.pkg.outputs.version }}
+
+      - name: Install deps (also runs postinstall)
+        run: npm install
+
+      - name: Publish to npm
+        run: npm publish --access public
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ steps.pkg.outputs.version }}
+          generate_release_notes: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kokio-sdk",
-  "version": "0.0.10",
+  "version": "0.1.0",
   "description": "",
   "type": "module",
   "main": "./dist/esm/config.js",
@@ -42,8 +42,6 @@
     "@peculiar/asn1-ecc": "^2.3.15",
     "@peculiar/asn1-schema": "^2.3.15",
     "@simplewebauthn/server": "^13.1.1",
-    "@turnkey/http": "^3.0.0",
-    "@turnkey/react-native-passkey-stamper": "^1.0.13",
     "ethers": "^6.13.5",
     "react-native-passkey": "^3.1.0",
     "viem": "^2.23.5"

package/src/config.ts

@@ -8,11 +8,9 @@ import { DeviceWalletSubPackage } from "./interface/deviceWalletClass.js";
 import { ESIMWalletSubPackage } from "./interface/eSIMWalletClass.js";
 import { ESIMWalletFactorySubPackage } from "./interface/eSIMWalletFactoryClass.js";
 import { SmartAccountClient } from "@aa-sdk/core";
-import { TurnkeyClient } from "@turnkey/http";
 
 export class Kokio {
     viemWalletClient: WalletClient;
-    turnkeyClient: TurnkeyClient;
     credentialId: string;
     rpId: string;
     organizationId: string;
@@ -31,7 +29,6 @@ export class Kokio {
 
     constructor(
         viemWalletClient: WalletClient,
-        turnkeyClient: TurnkeyClient,
         credentialId: string,
         rpId: string,
         organizationId: string,
@@ -42,7 +39,6 @@ export class Kokio {
         eSIMWalletAddress?: Address
     ) {
         this.viemWalletClient = viemWalletClient;
-        this.turnkeyClient = turnkeyClient;
         this.credentialId = credentialId;
         this.rpId = rpId;
         this.organizationId = organizationId;
@@ -51,7 +47,7 @@ export class Kokio {
 
         this.constants = new ConstantsSubPackage(this.viemWalletClient, this.pimlicoAPIKey);
 
-        this.smartAccount = new SmartAccountSubPackage(this.viemWalletClient, this.turnkeyClient, this.credentialId, this.rpId, this.organizationId, this.pimlicoAPIKey, this.gasPolicyId);
+        this.smartAccount = new SmartAccountSubPackage(this.viemWalletClient, this.credentialId, this.rpId, this.organizationId, this.pimlicoAPIKey, this.gasPolicyId);
         this.deviceWalletFactory = smartAccountClient? new DeviceWalletFactorySubPackage(viemWalletClient, smartAccountClient): undefined;
         this.eSIMWalletFactory = smartAccountClient? new ESIMWalletFactorySubPackage(viemWalletClient, smartAccountClient): undefined;
         this.lazyWalletRegistry = smartAccountClient? new LazyWalletRegistrySubPackage(smartAccountClient): undefined;

package/src/interface/smartAccountClass.ts

@@ -2,21 +2,18 @@ import { Address, WalletClient } from "viem";
 import { _getSmartWallet, _getSmartWalletClient } from "../logic/account-kit/createSmartAccount.js";
 import { P256Key, SignedRequest } from "../types";
 import { SmartAccountClient, SmartContractAccount } from "@aa-sdk/core";
-import { TurnkeyClient } from "@turnkey/http";
 
 export class SmartAccountSubPackage {
 
     client;
-    turnkeyClient;
     credentialId;
     rpId;
     organizationId;
     pimlicoAPIKey;
     gasPolicyId;
     
-    constructor(client: WalletClient, turnkeyClient: TurnkeyClient, credentialId: string, rpId: string, organiationId: string, pimlicoAPIKey: string, gasPolicyId: string) {
+    constructor(client: WalletClient, credentialId: string, rpId: string, organiationId: string, pimlicoAPIKey: string, gasPolicyId: string) {
         this.client = client;
-        this.turnkeyClient = turnkeyClient;
         this.credentialId = credentialId;
         this.rpId = rpId;
         this.organizationId = organiationId;
@@ -25,7 +22,7 @@ export class SmartAccountSubPackage {
     }
 
     getSmartWallet (deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key, salt: bigint) {
-        return _getSmartWallet(this.client, this.turnkeyClient, this.credentialId, this.rpId, this.organizationId, deviceUniqueIdentifier, deviceWalletOwnerKey, salt);
+        return _getSmartWallet(this.client, this.credentialId, this.rpId, this.organizationId, deviceUniqueIdentifier, deviceWalletOwnerKey, salt);
     }
 
     getSmartWalletClient (account: SmartContractAccount) {

package/src/logic/account-kit/createSmartAccount.ts

@@ -1,38 +1,113 @@
 import { 
-	AccountOp,
-	createSmartAccountClient,
-	getEntryPoint,
-	SmartContractAccount,
-	toSmartContractAccount,
-	split,
-	SmartAccountClient
+	AccountOp, createSmartAccountClient, getEntryPoint, SmartContractAccount,
+	toSmartContractAccount, split, SmartAccountClient
 } from "@aa-sdk/core";
 import { 
-	http,
-	type SignableMessage,
-	type Hash,
-	WalletClient,
-	Hex,
-	encodeFunctionData,
-	Address,
-	encodePacked,
-	encodeAbiParameters,
-	getContract,
-	TypedDataDefinition,
-	TypedData,
-	hashMessage,
-	stringToBytes,
-	toHex
+	http, type SignableMessage, type Hash, WalletClient, Hex, encodeFunctionData,
+	Address, encodePacked, encodeAbiParameters, getContract,
+	TypedDataDefinition, TypedData, hashMessage, stringToBytes, toHex, hashTypedData, hexToBytes, bytesToHex
 } from "viem";
-import { TurnkeyClient } from "@turnkey/http";
 import { BytesLike, ethers, hexlify, toBeHex, toBigInt, zeroPadValue } from "ethers";
 import { _getChainSpecificConstants, ZERO, SIGNATURE_VALIDITY_SECONDS } from "../constants.js";
 import { _add0x, _concatUint8Arrays, _remove0x, _shouldRemoveLeadingZero } from "../utils.js";
 import { P256Key, WebAuthnSignature } from "../../types.js";
 import { DeviceWallet, DeviceWalletFactory } from "../../abis/index.js";
-import { _signMessageWithTurnkey, _signTypedDataWithTurnkey, _stamp, _stampAndSignMessageWithTurnkey, _stampAndSignTypedDataWithTurnkey } from "../services/turnkeyClient.js";
 import { alchemyGasManagerMiddleware } from "@account-kit/infra";
 
+import { decodeAttestationObject, decodeClientDataJSON, isoBase64URL, parseAuthenticatorData } from "@simplewebauthn/server/helpers";
+import { Passkey, PasskeyGetRequest, PasskeyGetResult } from "react-native-passkey";
+import { p256 } from "@noble/curves/nist.js";
+
+type BrokenPasskeyGetResult = PasskeyGetResult | string;
+
+enum AuthenticatorTransport {
+	usb = "usb",
+	nfc = "nfc",
+	ble = "ble",
+	smartCard = "smart-card",
+	hybrid = "hybrid",
+	internal = "internal"
+}
+
+/*
+** Stamp is client-side authentication. Since the passkeys are one the user's mobile device
+** react-native-passkey helps fetch passkey for the user (provided credentialId, rpId).
+** This is exactly how the WebAuthn.sol contract needs it to be.
+*/
+export const _stamp = async (credentialId: string, rpId: string, payload: Hex): Promise<WebAuthnSignature> => {
+	const signingOptions: PasskeyGetRequest = {
+		challenge: isoBase64URL.fromBuffer(
+			(hexToBytes(payload) as unknown) as Uint8Array<ArrayBuffer>
+		),
+		allowCredentials: [{
+			id: credentialId,
+			type: "public-key",
+			transports: [AuthenticatorTransport.internal]
+		}],
+		rpId,
+		userVerification: "required"
+	};
+
+	let authenticationResult;
+	try {
+		authenticationResult = await Passkey.get(signingOptions);
+	} catch (e) {
+		console.log("Failed to get authenticationResult");
+		console.error(JSON.stringify(e, Object.getOwnPropertyNames(e)))
+	}
+
+	// See https://github.com/f-23/react-native-passkey/issues/54
+	// On Android the typedef lies. Authentication result is actually a string!
+	// TODO: remove me once the above is resolved.
+	const brokenAuthenticationResult =
+		authenticationResult as BrokenPasskeyGetResult;
+	if (typeof brokenAuthenticationResult === "string") {
+		authenticationResult = JSON.parse(brokenAuthenticationResult);
+	}
+
+	const { clientDataJSON, authenticatorData, signature } = authenticationResult.response;
+
+	// 1. Decode clientDataJSON
+	const clientDataJSONBuffer = isoBase64URL.toBuffer(clientDataJSON);
+	const clientDataJSONString = new TextDecoder().decode(clientDataJSONBuffer);
+
+	// 2. Calculate indices for the contract (byte offsets)
+	const typeSearchString = '"type":"webauthn.get"';
+	const challengeSearchString = '"challenge":';
+
+	const typeIndex = clientDataJSONString.indexOf(typeSearchString);
+	const challengeIndex = clientDataJSONString.indexOf(challengeSearchString);
+
+	if (typeIndex === -1) {
+		console.warn(`Warning: Could not find type substring '${typeSearchString}' in clientDataJSON. Setting typeIndex to 0.`);
+	}
+	if (challengeIndex === -1) {
+		throw new Error(`Could not find challenge substring '${challengeSearchString}' in clientDataJSON for index calculation.`);
+	}
+
+	// 3. Decode authenticatorData
+	const authenticatorDataBytes = isoBase64URL.toBuffer(authenticatorData);
+	const authenticatorDataHex = bytesToHex(authenticatorDataBytes);
+
+	// 4. Decode signature (ASN.1 DER encoded)
+	const signatureBytes = isoBase64URL.toBuffer(signature);
+	let parsedSignature = p256.Signature.fromDER(signatureBytes);
+	parsedSignature = parsedSignature.normalizeS();
+	let r = parsedSignature.r;
+	let s = parsedSignature.s;
+
+	const webAuthnSig =  {
+		authenticatorData: authenticatorDataHex,
+		clientDataJSON: clientDataJSONString,
+		challengeIndex: BigInt(challengeIndex),
+		typeIndex: BigInt(typeIndex),
+		r: r,
+		s: s
+	};
+
+	return webAuthnSig;
+}
+
 const _encodeExecute = async (tx: AccountOp) => {
 
 	return encodeFunctionData({
@@ -177,7 +252,7 @@ const _signMessage = async (message: SignableMessage, credentialId: string, rpId
 	const payload = hashMessage({raw: stringToBytes(message as string)});
 	// The original message is passed to the stamp and sign function.
 	// The stamp and sign function creates the EIP-191 digest hash using its hashMessage function
-	// The result of the hashMessage(message) will be the `payload` used by Turnkey as a challenge
+	// The result of the hashMessage(message) will be the `payload` used as a challenge
 	const webAuthnSignature = await _stamp(credentialId, rpId, payload);
 
 	return _encodeSignature(webAuthnSignature, validUntil);
@@ -186,12 +261,20 @@ const _signMessage = async (message: SignableMessage, credentialId: string, rpId
 const _signTypedData = async <
     const typedData extends TypedData | Record<string, unknown>,
     primaryType extends keyof typedData | "EIP712Domain" = keyof typedData
-> (typedData: TypedDataDefinition<typedData, primaryType>, turnkeyClient: TurnkeyClient, organiationId: string, signWith: Address): Promise<Hex> => {
+> (typedData: TypedDataDefinition<typedData, primaryType>, organiationId: string, signWith: Address): Promise<Hex> => {
 
 	// signature valid until, UNIX timestamp in seconds
 	const validUntil = Math.floor(Date.now() / 1000) + SIGNATURE_VALIDITY_SECONDS;
 
-	const webAuthnSignature = await _stampAndSignTypedDataWithTurnkey(turnkeyClient, organiationId, signWith, typedData);
+	// TODO: Implement stamping for Typed Data
+	let webAuthnSignature = {
+		authenticatorData: `0x` as `0x${string}`,
+		clientDataJSON: "",
+		challengeIndex: BigInt(0),
+		typeIndex: BigInt(0),
+		r: BigInt(0),
+		s: BigInt(0)
+	}
 
 	return _encodeSignature(webAuthnSignature, validUntil);
 }
@@ -215,7 +298,6 @@ const _signUserOperationHash = async (credentialId: string, rpId: string, userOp
 
 export const _getSmartWallet = async (
 	client: WalletClient,
-	turnkeyClient: TurnkeyClient,
 	credentialId: string,
 	rpId: string,
 	organiationId: string,
@@ -253,7 +335,7 @@ export const _getSmartWallet = async (
 		
 		signMessage: async ({ message}): Promise<Hash> => _signMessage(message, credentialId, rpId),
 
-		signTypedData: async (typedData): Promise<Hash> => _signTypedData(typedData, turnkeyClient, organiationId, signWith),
+		signTypedData: async (typedData): Promise<Hash> => _signTypedData(typedData, organiationId, signWith),
 		
 		/// OPTIONAL PARAMS ///
 		// if you already know your account's address, pass that in here to avoid generating a new counterfactual

package/src/logic/services/turnkeyClient.ts

@@ -1,296 +0,0 @@
-import { assertActivityCompleted, assertNonNull, TurnkeyClient, TActivityResponse } from "@turnkey/http"
-import { Address, hashMessage, hashTypedData, Hex, hexToBytes, SignableMessage, toHex, TypedData, TypedDataDefinition, bytesToHex } from "viem";
-import { decodeAttestationObject, decodeClientDataJSON, isoBase64URL, parseAuthenticatorData } from "@simplewebauthn/server/helpers";
-import { _add0x, base64UrlToBuffer, parseSignature } from "../utils.js";
-import { WebAuthnSignature } from "../../types.js";
-import { Passkey, PasskeyGetResult } from "react-native-passkey";
-import { p256 } from "@noble/curves/nist.js";
-import { AuthenticatorTransport } from "@turnkey/react-native-passkey-stamper";
-
-type BrokenPasskeyGetResult = PasskeyGetResult | string;
-
-/*
-** Stamp is client-side authentication. Since the passkeys are one the user's mobile device
-** react-native-passkey helps fetch passkey for the user (provided credentialId, rpId).
-** This is exactly how the WebAuthn.sol contract needs it to be.
-*/
-export const _stamp = async (credentialId: string, rpId: string, payload: Hex): Promise<WebAuthnSignature> => {
-    const signingOptions = {
-        challenge: isoBase64URL.fromBuffer((hexToBytes(payload) as unknown) as Uint8Array<ArrayBuffer> ), // Base64URL of the raw EIP-191 hash bytes
-        allowCredentials: [{
-            id: credentialId,
-            type: 'public-key',
-            transports: [AuthenticatorTransport.internal]
-        }],
-        rpId: rpId,
-        userVerification: "required"
-    };
-
-    let authenticationResult;
-    try {
-        authenticationResult = await Passkey.get(signingOptions);
-    } catch (e) {
-        console.log("Failed to get authenticationResult");
-        console.error(JSON.stringify(e, Object.getOwnPropertyNames(e)))
-    }
-
-    // See https://github.com/f-23/react-native-passkey/issues/54
-    // On Android the typedef lies. Authentication result is actually a string!
-    // TODO: remove me once the above is resolved.
-    const brokenAuthenticationResult =
-        authenticationResult as BrokenPasskeyGetResult;
-    if (typeof brokenAuthenticationResult === "string") {
-        authenticationResult = JSON.parse(brokenAuthenticationResult);
-    }
-
-    const { clientDataJSON, authenticatorData, signature } = authenticationResult.response;
-
-    // 1. Decode clientDataJSON
-    const clientDataJSONBuffer = isoBase64URL.toBuffer(clientDataJSON);
-    const clientDataJSONString = new TextDecoder().decode(clientDataJSONBuffer);
-
-    // 2. Calculate indices for the contract (byte offsets)
-    const typeSearchString = '"type":"webauthn.get"';
-    const challengeSearchString = '"challenge":';
-
-    const typeIndex = clientDataJSONString.indexOf(typeSearchString);
-    const challengeIndex = clientDataJSONString.indexOf(challengeSearchString);
-
-    if (typeIndex === -1) {
-        console.warn(`Warning: Could not find type substring '${typeSearchString}' in clientDataJSON. Setting typeIndex to 0.`);
-    }
-    if (challengeIndex === -1) {
-        throw new Error(`Could not find challenge substring '${challengeSearchString}' in clientDataJSON for index calculation.`);
-    }
-
-    // 3. Decode authenticatorData
-    const authenticatorDataBytes = isoBase64URL.toBuffer(authenticatorData);
-    const authenticatorDataHex = bytesToHex(authenticatorDataBytes);
-
-    // 4. Decode signature (ASN.1 DER encoded)
-    const signatureBytes = isoBase64URL.toBuffer(signature);
-    let parsedSignature = p256.Signature.fromDER(signatureBytes);
-    parsedSignature = parsedSignature.normalizeS();
-    let r = parsedSignature.r;
-    let s = parsedSignature.s;
-
-    const webAuthnSig =  {
-        authenticatorData: authenticatorDataHex,
-        clientDataJSON: clientDataJSONString,
-        challengeIndex: BigInt(challengeIndex),
-        typeIndex: BigInt(typeIndex),
-        r: r,
-        s: s
-    };
-
-    return webAuthnSig;
-}
-
-const getBytesFromPayload = (payloadHex: Hex): Uint8Array => {
-    return hexToBytes(payloadHex);
-};
-
-export const _signMessageWithTurnkey = async (client: TurnkeyClient, organizationId: string, signWith: Address, message: SignableMessage): Promise<WebAuthnSignature> => {
-    
-    const payload = hashMessage(message);
-    
-    const { activity } = await client.signRawPayload({
-        type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2",
-        organizationId: organizationId,
-        parameters: {
-            signWith: signWith,
-            payload: payload,
-            encoding: "PAYLOAD_ENCODING_HEXADECIMAL",
-            hashFunction: "HASH_FUNCTION_NO_OP",
-        },
-        timestampMs: String(Date.now()), // millisecond timestamp
-    });
-
-    assertActivityCompleted(activity);
-
-    const attestationObject = assertNonNull(activity.intent.createOrganizationIntent?.rootAuthenticator.attestation.response.attestationObject);
-    const decodedAttestationObj = decodeAttestationObject((base64UrlToBuffer(attestationObject) as unknown) as Uint8Array<ArrayBuffer>)
-
-    const clientDataJson = assertNonNull(activity.intent.createOrganizationIntent?.rootAuthenticator.attestation.response.clientDataJson);
-    const decodedClientDataJson = decodeClientDataJSON(clientDataJson);
-
-    const signature = assertNonNull(activity.result.signRawPayloadResult);
-
-    return {
-        authenticatorData: toHex(decodedAttestationObj.get("authData")),
-        clientDataJSON: JSON.stringify(decodedClientDataJson),
-        challengeIndex: BigInt(23),
-        typeIndex: BigInt(1),
-        r: BigInt(signature.r),
-        s: BigInt(signature.s) 
-    }
-} 
-
-export const _signTypedDataWithTurnkey = async <
-    const typedData extends TypedData | Record<string, unknown>,
-    primaryType extends keyof typedData | "EIP712Domain" = keyof typedData
-> (client: TurnkeyClient, organizationId: string, signWith: Address, typedData: TypedDataDefinition<typedData, primaryType>): Promise<WebAuthnSignature> => {
-    
-    const payload = hashTypedData(typedData);
-    
-    const { activity } = await client.signRawPayload({
-        type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2",
-        organizationId: organizationId,
-        parameters: {
-            signWith: signWith,
-            payload: payload,
-            encoding: "PAYLOAD_ENCODING_HEXADECIMAL",
-            hashFunction: "HASH_FUNCTION_NO_OP",
-        },
-        timestampMs: String(Date.now()), // millisecond timestamp
-    });
-
-    assertActivityCompleted(activity);
-
-    const attestationObject = assertNonNull(activity.intent.createOrganizationIntent?.rootAuthenticator.attestation.response.attestationObject);
-    const decodedAttestationObj = decodeAttestationObject((base64UrlToBuffer(attestationObject) as unknown) as Uint8Array<ArrayBuffer>)
-
-    const clientDataJson = assertNonNull(activity.intent.createOrganizationIntent?.rootAuthenticator.attestation.response.clientDataJson);
-    const decodedClientDataJson = decodeClientDataJSON(clientDataJson);
-
-    const signature = assertNonNull(activity.result.signRawPayloadResult);
-
-    return {
-        authenticatorData: toHex(decodedAttestationObj.get("authData")),
-        clientDataJSON: JSON.stringify(decodedClientDataJson),
-        challengeIndex: BigInt(23),
-        typeIndex: BigInt(1),
-        r: BigInt(signature.r),
-        s: BigInt(signature.s) 
-    }
-}
-
-export const _stampAndSignMessageWithTurnkey = async (client: TurnkeyClient, organizationId: string, signWith: Address, payload: SignableMessage): Promise<WebAuthnSignature> => {
-    let signedRequest;
-    try {
-        signedRequest = await client.stampSignRawPayload({
-            type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2",
-            organizationId: organizationId,
-            parameters: {
-                signWith: signWith,
-                payload: `${payload}`,
-                encoding: "PAYLOAD_ENCODING_HEXADECIMAL",
-                hashFunction: "HASH_FUNCTION_NO_OP",
-            },
-            timestampMs: String(Date.now()), // millisecond timestamp
-        });
-    }
-    catch (e) {
-        console.log("SDK error with signedRequest: ", e);
-    }
-    if (!signedRequest)
-        throw new Error('Error: Failed to get signed request');
-
-    const stampedHeaderValue = JSON.parse(signedRequest.stamp.stampHeaderValue);
-    let response;
-    try {
-        const res = await fetch(signedRequest.url, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                [signedRequest.stamp.stampHeaderName]: signedRequest.stamp.stampHeaderValue
-            },
-            body: signedRequest.body
-        });
-        if (!res.ok) {
-            const errorBody = await res.text();
-            throw new Error(`SDK Turnkey API request failed: ${res.status} ${res.statusText} - ${errorBody}`);
-        }
-        const responseData = await res.json();
-        response = responseData;
-    }
-    catch (e) {
-        console.log("SDK error with response: ", e);
-    }
-
-    const authenticatorData = isoBase64URL.toBuffer(stampedHeaderValue.authenticatorData);
-    const decodedClientDataJson = decodeClientDataJSON(stampedHeaderValue.clientDataJson);
-    // `payload` here is the hex string (e.g., "0x...") that was sent to Turnkey
-    // const originalPayloadBytes = Buffer.from(payload.startsWith('0x') ? payload.substring(2) : payload, 'hex');
-    const originalPayloadBytes = getBytesFromPayload(payload as Hex);
-    // Replace the challenge in decodedClientDataJson with the Base64URL of the *actual bytes*
-    // isoBase64URL.fromBuffer from simplewebauthn/server removes padding, which is standard for WebAuthn.
-    decodedClientDataJson.challenge = isoBase64URL.fromBuffer((originalPayloadBytes as unknown) as Uint8Array<ArrayBuffer>);
-    const typeIndex = JSON.stringify(decodedClientDataJson).indexOf('"type":"webauthn.get"');
-    const challengeIndex = JSON.stringify(decodedClientDataJson).indexOf('"challenge":');
-    if (typeIndex === -1 || challengeIndex === -1) {
-        throw new Error("Could not find type or challenge in clientDataJSON");
-    }
-    const signature = assertNonNull(response.activity.result.signRawPayloadResult);
-
-    return {
-        authenticatorData: toHex(authenticatorData),
-        clientDataJSON: JSON.stringify(decodedClientDataJson),
-        challengeIndex: BigInt(challengeIndex),
-        typeIndex: BigInt(typeIndex),
-        r: BigInt(_add0x(signature.r)),
-        s: BigInt(_add0x(signature.s))
-    };
-}
-
-export const _stampAndSignTypedDataWithTurnkey = async <
-    const typedData extends TypedData | Record<string, unknown>,
-    primaryType extends keyof typedData | "EIP712Domain" = keyof typedData
-> (client: TurnkeyClient, organizationId: string, signWith: Address, typedData: TypedDataDefinition<typedData, primaryType>): Promise<WebAuthnSignature> => {
-    const payload = hashTypedData(typedData);
-    let signedRequest;
-    try {
-        signedRequest = await client.stampSignRawPayload({
-            type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2",
-            organizationId: organizationId,
-            parameters: {
-                signWith: signWith,
-                payload: payload,
-                encoding: "PAYLOAD_ENCODING_HEXADECIMAL",
-                hashFunction: "HASH_FUNCTION_NO_OP",
-            },
-            timestampMs: String(Date.now()), // millisecond timestamp
-        });
-    }
-    catch (e) {
-        console.log("SDK error: stampAndSignTypedData");
-        console.error(e);
-    }
-
-    if (!signedRequest)
-        throw new Error('Error: Failed to get signed request');
-    const stampedHeaderValue = JSON.parse(signedRequest.stamp.stampHeaderValue);
-    let response;
-    try {
-        const res = await fetch(signedRequest.url, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                [signedRequest.stamp.stampHeaderName]: signedRequest.stamp.stampHeaderValue
-            },
-            body: signedRequest.body
-        });
-        if (!res.ok) {
-            const errorBody = await res.text();
-            throw new Error(`SDK Turnkey API request failed: ${res.status} ${res.statusText} - ${errorBody}`);
-        }
-        const responseData = await res.json();
-        response = responseData;
-    }
-    catch (e) {
-        console.log("SDK error with response: ", e);
-    }
-
-    const authenticatorData = isoBase64URL.toBuffer(stampedHeaderValue.authenticatorData);
-    const decodedClientDataJson = decodeClientDataJSON(stampedHeaderValue.clientDataJson);
-    const signature = assertNonNull(response.activity.result.signRawPayloadResult);
-
-    return {
-        authenticatorData: toHex(authenticatorData),
-        clientDataJSON: JSON.stringify(decodedClientDataJson),
-        challengeIndex: BigInt(23),
-        typeIndex: BigInt(1),
-        r: BigInt(_add0x(signature.r)),
-        s: BigInt(_add0x(signature.s))
-    };
-}