kokio-sdk 0.0.4 → 0.0.6

package/src/config.ts

@@ -13,7 +13,10 @@ import { TurnkeyClient } from "@turnkey/http";
 export class Kokio {
     viemWalletClient: WalletClient;
     turnkeyClient: TurnkeyClient;
+    credentialId: string;
+    rpId: string;
     organizationId: string;
+    pimlicoAPIKey: string;
     gasPolicyId: string;
 
     constants: ConstantsSubPackage;
@@ -29,7 +32,10 @@ export class Kokio {
     constructor(
         viemWalletClient: WalletClient,
         turnkeyClient: TurnkeyClient,
+        credentialId: string,
+        rpId: string,
         organizationId: string,
+        pimlicoAPIKey: string,
         gasPolicyId: string,
         smartAccountClient?: SmartAccountClient,
         deviceWalletAddress?: Address,
@@ -37,12 +43,15 @@ export class Kokio {
     ) {
         this.viemWalletClient = viemWalletClient;
         this.turnkeyClient = turnkeyClient;
+        this.credentialId = credentialId;
+        this.rpId = rpId;
         this.organizationId = organizationId;
+        this.pimlicoAPIKey = pimlicoAPIKey;
         this.gasPolicyId = gasPolicyId;
 
-        this.constants = new ConstantsSubPackage(this.viemWalletClient);
+        this.constants = new ConstantsSubPackage(this.viemWalletClient, this.pimlicoAPIKey);
 
-        this.smartAccount = new SmartAccountSubPackage(this.viemWalletClient, this.turnkeyClient, this.organizationId, this.gasPolicyId);
+        this.smartAccount = new SmartAccountSubPackage(this.viemWalletClient, this.turnkeyClient, 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/P256VerifierClass.ts

@@ -16,4 +16,4 @@ export class P256VerifierSubPackage {
     verifySignature (message: string, requireMessageVerification: boolean, webAuthnSignature: WebAuthnSignature, x: bigint, y: bigint) {
         return _verifySignature(this.client, message, requireMessageVerification, webAuthnSignature, x, y);
     }
-}
+}

package/src/interface/constantsClass.ts

@@ -21,11 +21,11 @@ export class ConstantsSubPackage {
             typeof arbitrumSepoliaFactoryAddresses;
     customErrors!: typeof customErrors;
 
-    constructor(client: WalletClient) {
+    constructor(client: WalletClient, pimlicoAPIKey: string) {
         (async () => {
           const chainID = await _extractChainID(client);
           const rpcURL = client.transport.url;
-          const values = _getChainSpecificConstants(chainID, rpcURL);
+          const values = _getChainSpecificConstants(chainID, rpcURL, pimlicoAPIKey);
     
           this.factoryAddresses = values?.factoryAddresses;
           this.customErrors = values?.customErrors;
@@ -33,4 +33,4 @@ export class ConstantsSubPackage {
           return this;
         })();
     }
-}
+}

package/src/interface/deviceWalletClass.ts

@@ -59,4 +59,4 @@ export class DeviceWalletSubPackage {
     getOwner () {
         return _getOwner (this.walletClient, this.address);
     }
-}
+}

package/src/interface/eSIMWalletClass.ts

@@ -52,4 +52,4 @@ export class ESIMWalletSubPackage {
     _transferOwnership (amount: bigint) {
         return _transferOwnership(this.client, this.address, amount);
     }
-}
+}

package/src/interface/eSIMWalletFactoryClass.ts

@@ -33,4 +33,4 @@ export class ESIMWalletFactorySubPackage {
     _getCurrentESIMWalletImplementation () {
         return _getCurrentESIMWalletImplementation(this.smartAccountClient);
     }
-}
+}

package/src/interface/lazyWalletRegistryClass.ts

@@ -31,4 +31,4 @@ export class LazyWalletRegistrySubPackage {
     _switchESIMIdentifierToNewDeviceIdentifier (eSIMIdentifier: string, oldDeviceIdentifier: string, newDeviceIdentifier: string) {
         return _switchESIMIdentifierToNewDeviceIdentifier(this.client, eSIMIdentifier, oldDeviceIdentifier, newDeviceIdentifier);
     }
-}
+}

package/src/interface/smartAccountClass.ts

@@ -8,21 +8,27 @@ export class SmartAccountSubPackage {
 
     client;
     turnkeyClient;
-    organizationId; 
+    credentialId;
+    rpId;
+    organizationId;
+    pimlicoAPIKey;
     gasPolicyId;
     
-    constructor(client: WalletClient, turnkeyClient: TurnkeyClient, organiationId: string, gasPolicyId: string) {
+    constructor(client: WalletClient, turnkeyClient: TurnkeyClient, 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;
+        this.pimlicoAPIKey = pimlicoAPIKey;
         this.gasPolicyId = gasPolicyId;
     }
 
-    getSmartWallet (deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key, salt: bigint, sender?: Address) {
-        return _getSmartWallet(this.client, this.turnkeyClient, this.organizationId, deviceUniqueIdentifier, deviceWalletOwnerKey, salt, sender)
+    getSmartWallet (deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key, salt: bigint) {
+        return _getSmartWallet(this.client, this.turnkeyClient, this.credentialId, this.rpId, this.organizationId, deviceUniqueIdentifier, deviceWalletOwnerKey, salt);
     }
 
     getSmartWalletClient (account: SmartContractAccount) {
-        return _getSmartWalletClient(this.client, this.gasPolicyId, account)
+        return _getSmartWalletClient(this.client, this.pimlicoAPIKey, this.gasPolicyId, account);
     }
-}
+}

package/src/interface/utilsClass.ts

@@ -18,4 +18,4 @@ export class UtilsSubPackage {
         _remove0x(data);
     }
     
-}
+}

package/src/logic/P256Verifier.ts

@@ -25,7 +25,7 @@ export const _verifySignature = async (
             target: values.factoryAddresses.P256VERIFIER,
             data: encodeFunctionData({
                 abi: P256Verifier,
-                functionName: "deployLazyWalletAndSetESIMIdentifier",
+                functionName: "verifySignature",
                 args: [message, requireMessageVerification, webAuthnSignature, x, y]
             })
         }

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

@@ -4,6 +4,7 @@ import {
 	getEntryPoint,
 	SmartContractAccount,
 	toSmartContractAccount,
+	split
 } from "@aa-sdk/core";
 import { 
 	http,
@@ -17,15 +18,18 @@ import {
 	encodeAbiParameters,
 	getContract,
 	TypedDataDefinition,
-	TypedData
+	TypedData,
+	hashMessage,
+	stringToBytes,
+	toHex
 } from "viem";
 import { TurnkeyClient } from "@turnkey/http";
-import { BytesLike, ethers, hexlify } from "ethers";
-import { _getChainSpecificConstants, ZERO } from "../constants.js";
+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, _stampAndSignMessageWithTurnkey, _stampAndSignTypedDataWithTurnkey } from "../services/turnkeyClient.js";
+import { _signMessageWithTurnkey, _signTypedDataWithTurnkey, _stamp, _stampAndSignMessageWithTurnkey, _stampAndSignTypedDataWithTurnkey } from "../services/turnkeyClient.js";
 import { alchemyGasManagerMiddleware } from "@account-kit/infra";
 
 const _encodeExecute = async (tx: AccountOp) => {
@@ -70,7 +74,7 @@ const _getAccountInitCode = async (client: WalletClient, deviceUniqueIdentifier:
 	const callData =  encodeFunctionData({
 		abi: DeviceWalletFactory, 
 		functionName: "createAccount",
-		args: [deviceUniqueIdentifier, deviceWalletOwnerKey, salt, ZERO],
+		args: [deviceUniqueIdentifier, deviceWalletOwnerKey, salt],
 	})
 
 	return values.factoryAddresses.DEVICE_WALLET_FACTORY.concat(_remove0x(callData)) as Hex;
@@ -85,6 +89,7 @@ const getInitCodeHash = async (client: WalletClient, deviceUniqueIdentifier: str
 	// off-chain computation of the DeviceWallet address
 	const registry = values.factoryAddresses.REGISTRY;
 	const deviceWalletFactoryAddress = values.factoryAddresses.DEVICE_WALLET_FACTORY;
+	const eSIMWalletFactoryAddress = values.factoryAddresses.ESIM_WALLET_FACTORY;
 
 	const deviceWalletFactory = getContract({
 		abi: DeviceWalletFactory,
@@ -102,9 +107,10 @@ const getInitCodeHash = async (client: WalletClient, deviceUniqueIdentifier: str
 		registry,
 		deviceWalletOwnerKey,
 		deviceUniqueIdentifier,
+		eSIMWalletFactoryAddress
 	]);
 
-	const beaconProxyBytecode = "0x60a06040526040516105bf3803806105bf83398101604081905261002291610387565b61002c828261003e565b506001600160a01b031660805261047e565b610047826100fe565b6040516001600160a01b038316907f1cf3b03a6cf19fa2baba4df148e9dcabedea7f8a5c07840e207e5c089be95d3e90600090a28051156100f2576100ed826001600160a01b0316635c60da1b6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100c3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100e79190610447565b82610211565b505050565b6100fa610288565b5050565b806001600160a01b03163b60000361013957604051631933b43b60e21b81526001600160a01b03821660048201526024015b60405180910390fd5b807fa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d5080546001600160a01b0319166001600160a01b0392831617905560408051635c60da1b60e01b81529051600092841691635c60da1b9160048083019260209291908290030181865afa1580156101b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d99190610447565b9050806001600160a01b03163b6000036100fa57604051634c9c8ce360e01b81526001600160a01b0382166004820152602401610130565b6060600080846001600160a01b03168460405161022e9190610462565b600060405180830381855af49150503d8060008114610269576040519150601f19603f3d011682016040523d82523d6000602084013e61026e565b606091505b50909250905061027f8583836102a9565b95945050505050565b34156102a75760405163b398979f60e01b815260040160405180910390fd5b565b6060826102be576102b982610308565b610301565b81511580156102d557506001600160a01b0384163b155b156102fe57604051639996b31560e01b81526001600160a01b0385166004820152602401610130565b50805b9392505050565b8051156103185780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b80516001600160a01b038116811461034857600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b8381101561037e578181015183820152602001610366565b50506000910152565b6000806040838503121561039a57600080fd5b6103a383610331565b60208401519092506001600160401b03808211156103c057600080fd5b818501915085601f8301126103d457600080fd5b8151818111156103e6576103e661034d565b604051601f8201601f19908116603f0116810190838211818310171561040e5761040e61034d565b8160405282815288602084870101111561042757600080fd5b610438836020830160208801610363565b80955050505050509250929050565b60006020828403121561045957600080fd5b61030182610331565b60008251610474818460208701610363565b9190910192915050565b6080516101276104986000396000601e01526101276000f3fe6080604052600a600c565b005b60186014601a565b60a0565b565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316635c60da1b6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156079573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190609b919060c3565b905090565b3660008037600080366000845af43d6000803e80801560be573d6000f35b3d6000fd5b60006020828403121560d457600080fd5b81516001600160a01b038116811460ea57600080fd5b939250505056fea2646970667358221220d2ef783a147afe4beaf6cec0d85c3b6cd6a11a48e1a7f60eac2d7a83dac8508e64736f6c63430008190033";
+	const beaconProxyBytecode = "0x60a06040908082526104a8803803809161001982856102ae565b8339810182828203126101e95761002f826102e7565b60208084015191939091906001600160401b0382116101e9570182601f820112156101e957805190610060826102fb565b9361006d875195866102ae565b8285528383830101116101e957829060005b83811061029a57505060009184010152823b1561027a577fa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d5080546001600160a01b0319166001600160a01b038581169182179092558551635c60da1b60e01b8082529194928482600481895afa91821561026f57600092610238575b50813b1561021f5750508551847f1cf3b03a6cf19fa2baba4df148e9dcabedea7f8a5c07840e207e5c089be95d3e600080a282511561020057508290600487518096819382525afa9283156101f5576000936101b3575b5091600080848461019096519101845af4903d156101aa573d610174816102fb565b90610181885192836102ae565b8152600081943d92013e610316565b505b6080525161012e908161037a82396080518160180152f35b60609250610316565b92508183813d83116101ee575b6101ca81836102ae565b810103126101e9576000806101e1610190956102e7565b945050610152565b600080fd5b503d6101c0565b85513d6000823e3d90fd5b9350505050346102105750610192565b63b398979f60e01b8152600490fd5b8751634c9c8ce360e01b81529116600482015260249150fd5b9091508481813d8311610268575b61025081836102ae565b810103126101e957610261906102e7565b90386100fb565b503d610246565b88513d6000823e3d90fd5b8351631933b43b60e21b81526001600160a01b0384166004820152602490fd5b81810183015186820184015284920161007f565b601f909101601f19168101906001600160401b038211908210176102d157604052565b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b03821682036101e957565b6001600160401b0381116102d157601f01601f191660200190565b9061033d575080511561032b57805190602001fd5b604051630a12f52160e11b8152600490fd5b81511580610370575b61034e575090565b604051639996b31560e01b81526001600160a01b039091166004820152602490fd5b50803b1561034656fe60806040819052635c60da1b60e01b81526020816004817f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03165afa90811560a9576000916054575b5060da565b905060203d60201160a3575b601f8101601f191682019167ffffffffffffffff831181841017608d576088926040520160b5565b38604f565b634e487b7160e01b600052604160045260246000fd5b503d6060565b6040513d6000823e3d90fd5b602090607f19011260d5576080516001600160a01b038116810360d55790565b600080fd5b6000808092368280378136915af43d82803e1560f4573d90f35b3d90fdfea264697066735822122099ba460fd62b3e22c737d15959887e6cae3498f3495d31e43e2bcf1283aec7d264736f6c63430008190033";
 
 	// Encode BeaconProxy constructor args
 	const beaconProxyConstructorArgs = abiCoder.encode(
@@ -118,31 +124,14 @@ const getInitCodeHash = async (client: WalletClient, deviceUniqueIdentifier: str
 	return ethers.keccak256(initCode);
 }
 
-const prepareSaltForCreate2 = (sender: Address, salt: BigInt): BytesLike => {
-
-	// Calculating unique salt based on createAccount function's implementation
-	const abiCoder = ethers.AbiCoder.defaultAbiCoder();
-	const encoded = abiCoder.encode(
-		["address", "uint256"],
-		[sender, salt]
-	);
-	const uniqueSaltBytes32 = ethers.keccak256(encoded);
-
-	return uniqueSaltBytes32;
-}
-
-// NOTE: Sender is the address that deploys the contract.
-// In case of ERC-4337, it is the Entry Point contract address
-const getCounterFactualAddress = async (client: WalletClient, deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key, salt: BigInt, sender?: Address):Promise<Hex> => {
+const getCounterFactualAddress = async (client: WalletClient, deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key, salt: bigint):Promise<Hex> => {
 
 	const chainID = await client.getChainId();
 	const rpcURL = client.transport.url;
 	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 uniqueSaltBytes32 = toHex(salt, {size: 32});
 	const initCodeHash = await getInitCodeHash(client, deviceUniqueIdentifier, deviceWalletOwnerKey);
 
 	// Calculate deterministic address from init code hash
@@ -151,66 +140,46 @@ const getCounterFactualAddress = async (client: WalletClient, deviceUniqueIdenti
 	return ethers.getAddress(create2Address) as Address;
 }
 
-const _encodeSignature = async (webAuthnSignature: WebAuthnSignature): Promise<Hex> => {
+const _encodeSignature = async (webAuthnSignature: WebAuthnSignature, validUntil: number): Promise<Hex> => {
+
+	const encodedWebAuthnSignatureBytes = encodeAbiParameters([
+		{
+			type: "tuple",
+			name: "WebAuthnSignature",
+			components: [
+				{ name: "authenticatorData", type: "bytes", },
+				{ name: "clientDataJSON", type: "string", },
+				{ name: "challengeIndex", type: "uint256", },
+				{ name: "typeIndex", type: "uint256", },
+				{ name: "r", type: "uint256", },
+				{ name: "s", type: "uint256", },
+			],
+		},
+	], 
+	[
+		webAuthnSignature
+	]);
 
 	const signature = encodePacked(
 		["uint8", "uint48", "bytes"],
-		[
-		1,
-		0,
-		encodeAbiParameters([
-			{
-				type: "tuple",
-				name: "credentials",
-				components: [
-					{
-						name: "authenticatorData",
-						type: "bytes",
-					},
-					{
-						name: "clientDataJSON",
-						type: "string",
-					},
-					{
-						name: "challengeIndex",
-						type: "uint256",
-					},
-					{
-						name: "typeIndex",
-						type: "uint256",
-					},
-					{
-						name: "r",
-						type: "uint256",
-					},
-					{
-						name: "s",
-						type: "uint256",
-					},
-				],
-			},
-		],
-		[
-			{
-				authenticatorData: _add0x(webAuthnSignature.authenticatorData),
-				clientDataJSON: JSON.stringify(webAuthnSignature.clientDataJSON),
-				challengeIndex: BigInt(23),
-				typeIndex: BigInt(1),
-				r: webAuthnSignature.r,
-				s: webAuthnSignature.s,
-			},
-		]),
-		],
+		[1, validUntil, encodedWebAuthnSignatureBytes]
 	);
 
 	return signature;
-}
+};
 
-const _signMessage = async (message: SignableMessage, turnkeyClient: TurnkeyClient, organiationId: string, signWith: Address): Promise<Hex> => {
+// message here is the original message data (string or Uint8Array) directly from the app
+const _signMessage = async (message: SignableMessage, credentialId: string, rpId: string): Promise<Hex> => {
 
-	const webAuthnSignature = await _stampAndSignMessageWithTurnkey(turnkeyClient, organiationId, signWith, message);
+	const validUntil = Math.floor(Date.now() / 1000) + SIGNATURE_VALIDITY_SECONDS;
 
-	return _encodeSignature(webAuthnSignature);
+	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
+	const webAuthnSignature = await _stamp(credentialId, rpId, payload);
+
+	return _encodeSignature(webAuthnSignature, validUntil);
 }
 
 const _signTypedData = async <
@@ -218,25 +187,40 @@ const _signTypedData = async <
     primaryType extends keyof typedData | "EIP712Domain" = keyof typedData
 > (typedData: TypedDataDefinition<typedData, primaryType>, turnkeyClient: TurnkeyClient, 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);
 
-	return _encodeSignature(webAuthnSignature);
+	return _encodeSignature(webAuthnSignature, validUntil);
 }
 
-const _signUserOperationHash = async (hash: Hex, turnkeyClient: TurnkeyClient, organiationId: string, signWith: Address): Promise<Hex> => {
+const _signUserOperationHash = async (credentialId: string, rpId: string, userOpHash: Hex): Promise<Hex> => {
+
+	const validUntil = Math.floor(Date.now() / 1000) + SIGNATURE_VALIDITY_SECONDS;
+
+	const messagePrecursor = encodePacked(["uint8", "uint48", "bytes32"], [
+        1,
+        validUntil,
+        userOpHash
+    ]);
+
+	const payload = hashMessage({ raw: messagePrecursor });
 
-	const message = encodePacked(["uint8", "uint48", "bytes32"], [1, 0, hash]);
-	return _signMessage(message, turnkeyClient, organiationId, signWith);
+	const webAuthnSignature = await _stamp(credentialId, rpId, payload);
+
+	return _encodeSignature(webAuthnSignature, validUntil);
 }
 
 export const _getSmartWallet = async (
 	client: WalletClient,
 	turnkeyClient: TurnkeyClient,
+	credentialId: string,
+	rpId: string,
 	organiationId: string,
 	deviceUniqueIdentifier: string,
 	deviceWalletOwnerKey: P256Key,
-	salt: bigint,
-	sender?: Address
+	salt: bigint
 ): Promise<SmartContractAccount> => {
 
 	const chainID = await client.getChainId();
@@ -266,33 +250,51 @@ export const _getSmartWallet = async (
 		// 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),
 		
-		signMessage: async ({ message }): Promise<Hash> => _signMessage(message, turnkeyClient, organiationId, signWith),
+		signMessage: async ({ message}): Promise<Hash> => _signMessage(message, credentialId, rpId),
 
 		signTypedData: async (typedData): Promise<Hash> => _signTypedData(typedData, turnkeyClient, organiationId, signWith),
 		
 		/// OPTIONAL PARAMS ///
 		// if you already know your account's address, pass that in here to avoid generating a new counterfactual
-		accountAddress: await getCounterFactualAddress(client, deviceUniqueIdentifier, deviceWalletOwnerKey, salt, sender),
+		accountAddress: await getCounterFactualAddress(client, deviceUniqueIdentifier, deviceWalletOwnerKey, salt),
 		// if your account supports batching, this should take an array of UOs and return the calldata for calling your contract's batchExecute method
 		encodeBatchExecute: async (uos): Promise<Hash> => _encodeBatchExecute(uos),
 		// if your contract expects a different signing scheme than the default signMessage scheme, you can override that here
-		signUserOperationHash: async (hash): Promise<Hash> => _signUserOperationHash(hash, turnkeyClient, organiationId, signWith),
+		signUserOperationHash: async (hash): Promise<Hash> => _signUserOperationHash(credentialId, rpId, hash),
 		// allows you to define the calldata for upgrading your account
 		// encodeUpgradeToAndCall: async (params): Promise<Hash> => "0x...",
 	});
 }
 
-export const _getSmartWalletClient = async (client: WalletClient, gasPolicyId: string, account: SmartContractAccount) => {
+export const _getSmartWalletClient = async (client: WalletClient, pimlicoAPIKey: string, gasPolicyId: string, account: SmartContractAccount) => {
 
 	const chainID = await client.getChainId();
 	const rpcURL = client.transport.url;
-	const values = _getChainSpecificConstants(chainID, rpcURL);
+	const values = _getChainSpecificConstants(chainID, rpcURL, pimlicoAPIKey);
 
+	const bundlerMethods = [
+			"eth_sendUserOperation",
+			"eth_estimateUserOperationGas",
+			"eth_getUserOperationReceipt",
+			"eth_getUserOperationByHash",
+			"eth_supportedEntryPoints",
+	];
+
+	// Uses Pimlico paymaster by default for above defined bundler methods and Alchemy as fallback
 	return createSmartAccountClient({
 		// created above
 		account: account,
 		chain: values.chain,
-		transport: http(values.rpcURL),
+		transport: split({
+			overrides: [
+				{
+					methods: bundlerMethods,
+					transport: http(`${values.pimlicoRpcURL}`),
+				},
+			],
+			fallback: http(values.rpcURL),
+		}),
+		// transport: http(values.rpcURL),
 		...alchemyGasManagerMiddleware(gasPolicyId)
 	});
 }

package/src/logic/constants.ts

@@ -10,6 +10,8 @@ import {
 
 export const ZERO = BigInt('0');
 
+export const SIGNATURE_VALIDITY_SECONDS = 180; // 3 minutes validity
+
 export enum CHAIN_ID  {
     MAINNET = 1,
     SEPOLIA = 11155111,
@@ -34,7 +36,8 @@ export interface chainSpecifcConstants {
         typeof optimismSepolia |
         typeof arbitrum |
         typeof arbitrumSepolia
-    rpcURL: string; 
+    rpcURL: string;
+    pimlicoRpcURL: string;
     customErrors: typeof customErrors;
 }
 
@@ -69,13 +72,13 @@ export const optimismMainnetFactoryAddresses: Record<string, Address> = {
 }
 
 export const optimismSepoliaFactoryAddresses: Record<string, Address> = {
-    DEVICE_WALLET_FACTORY: '0x3feA4dB0C0bBB73142d5bB6b776EE238884a3705',
-    ESIM_WALLET_FACTORY: '0xaD2Ba6248D0e6990a844C94ACE78F8775A68b631',
-    LAZY_WALLET_REGISTRY: '0x29b98C32D83604664fd0742b9112b0825a74849F',
-    REGISTRY: '0xaeB98F0f092fCb4a476ea3a5EB6A4B9E3D63A686',
+    DEVICE_WALLET_FACTORY: '0x243cCdE6a56b0Ba740E067f39896772748E20fFD',
+    ESIM_WALLET_FACTORY: '0x8444bF9C39F01e4B092e42DC11695C61f8B93957',
+    LAZY_WALLET_REGISTRY: '0x3F14D060074B174B0784056bDe5e0f8970D25ff1',
+    REGISTRY: '0x96dA9cE92D2C09f7b3ADE01260608e9079f16d12',
     ENTRY_POINT: '0x0000000071727De22E5E9d8BAf0edAc6f37da032',
     SENDER_CREATOR: '0xefc2c1444ebcc4db75e7613d20c6a62ff67a167c',
-    P256VERIFIER: '0x5349aEA97Faa6D5d6D78A8847068300a4eC9D39E'
+    P256VERIFIER: '0x3c15a78046838481788613A9F111F972B562623C'
 }
 
 export const arbitrumOneFactoryAddresses: Record<string, Address> = {
@@ -120,7 +123,8 @@ export const _getChainSpecificConstants = (
         CHAIN_ID.OPTIMISM_SEPOLIA |
         CHAIN_ID.ARBITRUM_ONE |
         CHAIN_ID.ARBITRUM_SEPOLIA,
-    rpcURL: string
+    rpcURL: string,
+    pimlicoAPIKey?: string
     ): chainSpecifcConstants => {
 
     if (chainID == CHAIN_ID.SEPOLIA) {
@@ -128,6 +132,7 @@ export const _getChainSpecificConstants = (
             factoryAddresses: sepoliaFactoryAddresses,
             chain: sepolia,
             rpcURL: rpcURL,
+            pimlicoRpcURL: pimlicoAPIKey ? `https://api.pimlico.io/v2/${chainID}/rpc?apikey=${pimlicoAPIKey}` : "",
             customErrors: customErrors
         }
     }
@@ -136,6 +141,7 @@ export const _getChainSpecificConstants = (
             factoryAddresses: mainnetFactoryAddresses,
             chain: mainnet,
             rpcURL: rpcURL,
+            pimlicoRpcURL: pimlicoAPIKey ? `https://api.pimlico.io/v2/${chainID}/rpc?apikey=${pimlicoAPIKey}` : "",
             customErrors: customErrors
         }
     }
@@ -144,6 +150,7 @@ export const _getChainSpecificConstants = (
             factoryAddresses: optimismMainnetFactoryAddresses,
             chain: optimism,
             rpcURL: rpcURL,
+            pimlicoRpcURL: pimlicoAPIKey ? `https://api.pimlico.io/v2/${chainID}/rpc?apikey=${pimlicoAPIKey}` : "",
             customErrors: customErrors
         }
     }
@@ -152,6 +159,7 @@ export const _getChainSpecificConstants = (
             factoryAddresses: optimismSepoliaFactoryAddresses,
             chain: optimismSepolia,
             rpcURL: rpcURL,
+            pimlicoRpcURL: pimlicoAPIKey ? `https://api.pimlico.io/v2/${chainID}/rpc?apikey=${pimlicoAPIKey}` : "",
             customErrors: customErrors
         }
     }
@@ -160,6 +168,7 @@ export const _getChainSpecificConstants = (
             factoryAddresses: arbitrumOneFactoryAddresses,
             chain: arbitrum,
             rpcURL: rpcURL,
+            pimlicoRpcURL: pimlicoAPIKey ? `https://api.pimlico.io/v2/${chainID}/rpc?apikey=${pimlicoAPIKey}` : "",
             customErrors: customErrors
         }
     }
@@ -168,6 +177,7 @@ export const _getChainSpecificConstants = (
             factoryAddresses: arbitrumSepoliaFactoryAddresses,
             chain: arbitrumSepolia,
             rpcURL: rpcURL,
+            pimlicoRpcURL: pimlicoAPIKey ? `https://api.pimlico.io/v2/${chainID}/rpc?apikey=${pimlicoAPIKey}` : "",
             customErrors: customErrors
         }
     }

package/src/logic/deviceWallet.ts

@@ -78,7 +78,7 @@ export const _pullETH = async (client: SmartAccountClient, address: Address, amo
             data: encodeFunctionData({
                 abi: DeviceWallet,
                 functionName: "pullETH",
-                args: [address, amount]
+                args: [amount]
             })
         }
     });
@@ -96,7 +96,7 @@ export const _getVaultAddress = async (client: SmartAccountClient, address: Addr
             data: encodeFunctionData({
                 abi: DeviceWallet,
                 functionName: "getVaultAddress",
-                args: [address]
+                args: []
             })
         }
     });
@@ -114,7 +114,7 @@ export const _toggleAccessToETH = async (client: SmartAccountClient, address: Ad
             data: encodeFunctionData({
                 abi: DeviceWallet,
                 functionName: "toggleAccessToETH",
-                args: [address, eSIMWalletAddress, hasAccessToETH]
+                args: [eSIMWalletAddress, hasAccessToETH]
             })
         }
     });
@@ -132,7 +132,7 @@ export const _addESIMWallet = async (client: SmartAccountClient, address: Addres
             data: encodeFunctionData({
                 abi: DeviceWallet,
                 functionName: "addESIMWallet",
-                args: [address, eSIMWalletAddress, hasAccessToETH]
+                args: [eSIMWalletAddress, hasAccessToETH]
             })
         }
     });
@@ -150,7 +150,7 @@ export const _removeESIMWallet = async (client: SmartAccountClient, address: Add
             data: encodeFunctionData({
                 abi: DeviceWallet,
                 functionName: "removeESIMWallet",
-                args: [address, eSIMWalletAddress, hasAccessToETH]
+                args: [eSIMWalletAddress, hasAccessToETH]
             })
         }
     });
@@ -169,4 +169,4 @@ export const _getOwner = async (client: WalletClient, address: Address) => {
 
     const owner = [x,y]; 
     return owner as P256Key;
-}
+}

package/src/logic/eSIMWallet.ts

@@ -70,7 +70,7 @@ export const _owner = async (client: SmartAccountClient, address: Address) => {
             target: address,
             data: encodeFunctionData({
                 abi: ESIMWallet,
-                functionName: "ow",
+                functionName: "owner",
                 args: []
             })
         }