kokio-sdk 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kokio-sdk",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "",
   "type": "module",
   "main": "./dist/esm/config.js",

package/src/config.ts

@@ -14,6 +14,7 @@ export class Kokio {
     viemWalletClient: WalletClient;
     turnkeyClient: TurnkeyClient;
     organizationId: string;
+    gasPolicyId: string;
 
     constants: ConstantsSubPackage;
 
@@ -29,6 +30,7 @@ export class Kokio {
         viemWalletClient: WalletClient,
         turnkeyClient: TurnkeyClient,
         organizationId: string,
+        gasPolicyId: string,
         smartAccountClient?: SmartAccountClient,
         deviceWalletAddress?: Address,
         eSIMWalletAddress?: Address
@@ -36,10 +38,11 @@ export class Kokio {
         this.viemWalletClient = viemWalletClient;
         this.turnkeyClient = turnkeyClient;
         this.organizationId = organizationId;
+        this.gasPolicyId = gasPolicyId;
 
         this.constants = new ConstantsSubPackage(this.viemWalletClient);
 
-        this.smartAccount = new SmartAccountSubPackage(this.viemWalletClient, this.turnkeyClient, this.organizationId);
+        this.smartAccount = new SmartAccountSubPackage(this.viemWalletClient, this.turnkeyClient, this.organizationId, 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

@@ -9,11 +9,13 @@ export class SmartAccountSubPackage {
     client;
     turnkeyClient;
     organizationId; 
+    gasPolicyId;
     
-    constructor(client: WalletClient, turnkeyClient: TurnkeyClient, organiationId: string) {
+    constructor(client: WalletClient, turnkeyClient: TurnkeyClient, organiationId: string, gasPolicyId: string) {
         this.client = client;
         this.turnkeyClient = turnkeyClient;
         this.organizationId = organiationId;
+        this.gasPolicyId = gasPolicyId;
     }
 
     getSmartWallet (deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key, salt: bigint, sender?: Address) {
@@ -21,6 +23,6 @@ export class SmartAccountSubPackage {
     }
 
     getSmartWalletClient (account: SmartContractAccount) {
-        return _getSmartWalletClient(this.client, account)
+        return _getSmartWalletClient(this.client, this.gasPolicyId, account)
     }
 }

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

@@ -25,7 +25,8 @@ import { _getChainSpecificConstants, ZERO } 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 } from "../services/turnkeyClient.js";
+import { _signMessageWithTurnkey, _signTypedDataWithTurnkey, _stampAndSignMessageWithTurnkey, _stampAndSignTypedDataWithTurnkey } from "../services/turnkeyClient.js";
+import { alchemyGasManagerMiddleware } from "@account-kit/infra";
 
 const _encodeExecute = async (tx: AccountOp) => {
 
@@ -139,6 +140,7 @@ const getCounterFactualAddress = async (client: WalletClient, deviceUniqueIdenti
 	const values = _getChainSpecificConstants(chainID, rpcURL);
 	const deviceWalletFactoryAddress = values.factoryAddresses.DEVICE_WALLET_FACTORY;
 
+	
 	sender = sender? sender : values.factoryAddresses.SENDER_CREATOR;
 	const uniqueSaltBytes32 = prepareSaltForCreate2(sender, salt);
 	const initCodeHash = await getInitCodeHash(client, deviceUniqueIdentifier, deviceWalletOwnerKey);
@@ -206,7 +208,7 @@ const _encodeSignature = async (webAuthnSignature: WebAuthnSignature): Promise<H
 
 const _signMessage = async (message: SignableMessage, turnkeyClient: TurnkeyClient, organiationId: string, signWith: Address): Promise<Hex> => {
 
-	const webAuthnSignature = await _signMessageWithTurnkey(turnkeyClient, organiationId, signWith, message);
+	const webAuthnSignature = await _stampAndSignMessageWithTurnkey(turnkeyClient, organiationId, signWith, message);
 
 	return _encodeSignature(webAuthnSignature);
 }
@@ -216,7 +218,7 @@ const _signTypedData = async <
     primaryType extends keyof typedData | "EIP712Domain" = keyof typedData
 > (typedData: TypedDataDefinition<typedData, primaryType>, turnkeyClient: TurnkeyClient, organiationId: string, signWith: Address): Promise<Hex> => {
 
-	const webAuthnSignature = await _signTypedDataWithTurnkey(turnkeyClient, organiationId, signWith, typedData);
+	const webAuthnSignature = await _stampAndSignTypedDataWithTurnkey(turnkeyClient, organiationId, signWith, typedData);
 
 	return _encodeSignature(webAuthnSignature);
 }
@@ -227,7 +229,15 @@ const _signUserOperationHash = async (hash: Hex, turnkeyClient: TurnkeyClient, o
 	return _signMessage(message, turnkeyClient, organiationId, signWith);
 }
 
-export const _getSmartWallet = async (client: WalletClient, turnkeyClient: TurnkeyClient, organiationId: string, deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key, salt: bigint, sender?: Address): Promise<SmartContractAccount> => {
+export const _getSmartWallet = async (
+	client: WalletClient,
+	turnkeyClient: TurnkeyClient,
+	organiationId: string,
+	deviceUniqueIdentifier: string,
+	deviceWalletOwnerKey: P256Key,
+	salt: bigint,
+	sender?: Address
+): Promise<SmartContractAccount> => {
 
 	const chainID = await client.getChainId();
 	const rpcURL = client.transport.url;
@@ -244,14 +254,14 @@ export const _getSmartWallet = async (client: WalletClient, turnkeyClient: Turnk
 		chain: values.chain,
 
 		// The EntryPointDef that your account is compatible with
-		entryPoint: getEntryPoint(values.chain, {addressOverride: values.factoryAddresses.ENTRY_POINT}), 
+        entryPoint: getEntryPoint(values.chain, {version: "0.7.0"}), 
 
 		getAccountInitCode: async (): Promise<Hex> => await _getAccountInitCode(client, deviceUniqueIdentifier, deviceWalletOwnerKey, salt),
 
 		// getAccountInitCodeHash: async (): Promise<BytesLike> => await getInitCodeHash(client, deviceUniqueIdentifier, deviceWalletOwnerKey),
 		
 		// an invalid signature that doesn't cause your account to revert during validation
-		getDummySignature: async (): Promise<Hash> => "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c", //from Alchemy docs
+		getDummySignature: async (): Promise<Hash> => "0x",
 		
 		// given a UO in the form of {target, data, value} should output the calldata for calling your contract's execution method
 		encodeExecute: async (uo): Promise<Hash> => _encodeExecute(uo),
@@ -272,7 +282,7 @@ export const _getSmartWallet = async (client: WalletClient, turnkeyClient: Turnk
 	});
 }
 
-export const _getSmartWalletClient = async (client: WalletClient, account: SmartContractAccount) => {
+export const _getSmartWalletClient = async (client: WalletClient, gasPolicyId: string, account: SmartContractAccount) => {
 
 	const chainID = await client.getChainId();
 	const rpcURL = client.transport.url;
@@ -283,5 +293,6 @@ export const _getSmartWalletClient = async (client: WalletClient, account: Smart
 		account: account,
 		chain: values.chain,
 		transport: http(values.rpcURL),
+		...alchemyGasManagerMiddleware(gasPolicyId)
 	});
 }

package/src/logic/constants.ts

@@ -44,7 +44,7 @@ export const sepoliaFactoryAddresses: Record<string, Address> = {
     LAZY_WALLET_REGISTRY: '0x8a1E53b903efcc6b252CE4bD3b255202318505Ef',
     REGISTRY: '0xCa447f5C75C57f6C59027304A5Fb5A09F0E005c9',
     ENTRY_POINT: '0x0000000071727De22E5E9d8BAf0edAc6f37da032',
-    SENDER_CREATOR: '0x9406Cc6185a346906296840746125a0E44976454',
+    SENDER_CREATOR: '0xefc2c1444ebcc4db75e7613d20c6a62ff67a167c',
     P256VERIFIER: '0xF04f3b3935aD461D17d4a8a78E7ea21d4a61AEb1'
 }
 
@@ -73,8 +73,8 @@ export const optimismSepoliaFactoryAddresses: Record<string, Address> = {
     ESIM_WALLET_FACTORY: '0xaD2Ba6248D0e6990a844C94ACE78F8775A68b631',
     LAZY_WALLET_REGISTRY: '0x29b98C32D83604664fd0742b9112b0825a74849F',
     REGISTRY: '0xaeB98F0f092fCb4a476ea3a5EB6A4B9E3D63A686',
-    ENTRY_POINT: '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789',
-    SENDER_CREATOR: '0x7fc98430eaedbb6070b35b39d798725049088348',
+    ENTRY_POINT: '0x0000000071727De22E5E9d8BAf0edAc6f37da032',
+    SENDER_CREATOR: '0xefc2c1444ebcc4db75e7613d20c6a62ff67a167c',
     P256VERIFIER: '0x5349aEA97Faa6D5d6D78A8847068300a4eC9D39E'
 }
 

package/src/logic/services/turnkeyClient.ts

@@ -1,6 +1,6 @@
-import { assertActivityCompleted, assertNonNull, TurnkeyClient } from "@turnkey/http"
+import { assertActivityCompleted, assertNonNull, TurnkeyClient, TActivityResponse } from "@turnkey/http"
 import { Address, hashMessage, hashTypedData, SignableMessage, toHex, TypedData, TypedDataDefinition } from "viem";
-import { decodeAttestationObject, decodeClientDataJSON } from "@simplewebauthn/server/helpers";
+import { decodeAttestationObject, decodeClientDataJSON, parseAuthenticatorData } from "@simplewebauthn/server/helpers";
 import { base64UrlToBuffer } from "../utils.js";
 import { WebAuthnSignature } from "../../types.js";
 
@@ -78,3 +78,91 @@ export const _signTypedDataWithTurnkey = async <
         s: BigInt(signature.s) 
     }
 }
+
+export const _stampAndSignMessageWithTurnkey = async (client: TurnkeyClient, organizationId: string, signWith: Address, message: SignableMessage): Promise<WebAuthnSignature> => {
+    
+    const payload = hashMessage(message);
+    
+    const 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
+    });
+
+    if (!signedRequest) throw new Error('Error: Failed to get signed request')
+    
+    const stampedHeaderValue = JSON.parse(signedRequest.stamp.stampHeaderValue);
+
+    const response:TActivityResponse = await client.request('/public/v1/submit/sign_raw_payload', signedRequest)
+
+    if (!response || !response.activity) throw new Error('Error: Failed to sign payload');
+
+    const activity = response.activity;
+
+    assertActivityCompleted(activity);
+
+    const authenticatorData = base64UrlToBuffer(stampedHeaderValue.authenticatorData);
+    const decodedClientDataJson = decodeClientDataJSON(stampedHeaderValue.clientDataJson);
+
+    const signature = assertNonNull(activity.result.signRawPayloadResult);
+
+    return {
+        authenticatorData: toHex(authenticatorData),
+        clientDataJSON: JSON.stringify(decodedClientDataJson),
+        challengeIndex: BigInt(23),
+        typeIndex: BigInt(1),
+        r: BigInt(signature.r),
+        s: BigInt(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);
+    
+    const 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
+    });
+
+    if (!signedRequest) throw new Error('Error: Failed to get signed request')
+    
+    const stampedHeaderValue = JSON.parse(signedRequest.stamp.stampHeaderValue);
+
+    const response:TActivityResponse = await client.request('/public/v1/submit/sign_raw_payload', signedRequest)
+
+    if (!response || !response.activity) throw new Error('Error: Failed to sign payload');
+
+    const activity = response.activity;
+
+    assertActivityCompleted(activity);
+
+    const authenticatorData = base64UrlToBuffer(stampedHeaderValue.authenticatorData);
+    const decodedClientDataJson = decodeClientDataJSON(stampedHeaderValue.clientDataJson);
+    const signature = assertNonNull(activity.result.signRawPayloadResult);
+
+    return {
+        authenticatorData: toHex(authenticatorData),
+        clientDataJSON: JSON.stringify(decodedClientDataJson),
+        challengeIndex: BigInt(23),
+        typeIndex: BigInt(1),
+        r: BigInt(signature.r),
+        s: BigInt(signature.s) 
+    }
+}