kokio-sdk 0.0.1 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kokio-sdk",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "",
   "type": "module",
   "main": "./dist/esm/config.js",
@@ -10,6 +10,10 @@
       "import": "./dist/esm/config.js",
       "default": "./dist/esm/config.js"
     },
+    "./types": {
+      "types": "./dist/types/types-export.d.ts",
+      "import": "./dist/esm/types.js"
+    },
     "./package.json": "./package.json"
   },
   "scripts": {

package/src/abis/index.ts

@@ -1,12 +1,12 @@
-import DeviceWallet from './DeviceWallet.json' assert { type: 'json' };
-import DeviceWalletFactory from './DeviceWalletFactory.json' assert { type: 'json' };
-import ESIMWallet from './ESIMWallet.json' assert { type: 'json' };
-import ESIMWalletFactory from './ESIMWalletFactory.json' assert { type: 'json' };
-import LazyWalletRegistry from './LazyWalletRegistry.json' assert { type: 'json' };
-import P256Verifier from './P256Verifier.json' assert { type: 'json' };
-import Registry from './Registry.json' assert { type: 'json' };
-import RegistryHelper from './RegistryHelper.json' assert { type: 'json' };
-import BeaconProxy from './BeaconProxy.json' assert { type: 'json' }
+import DeviceWallet from './DeviceWallet.json' with { type: 'json' };
+import DeviceWalletFactory from './DeviceWalletFactory.json' with { type: 'json' };
+import ESIMWallet from './ESIMWallet.json' with { type: 'json' };
+import ESIMWalletFactory from './ESIMWalletFactory.json' with { type: 'json' };
+import LazyWalletRegistry from './LazyWalletRegistry.json' with { type: 'json' };
+import P256Verifier from './P256Verifier.json' with { type: 'json' };
+import Registry from './Registry.json' with { type: 'json' };
+import RegistryHelper from './RegistryHelper.json' with { type: 'json' };
+import BeaconProxy from './BeaconProxy.json' with { type: 'json' }
 
 export {
     DeviceWallet,

package/src/config.ts

@@ -1,12 +1,12 @@
 import { Address, WalletClient } from "viem";
 import { ConstantsSubPackage } from "./interface/constantsClass.js";
-import { smartAccountSubPackage } from "./interface/smartAccountClass.js";
-import { deviceWalletFactorySubPackage } from "./interface/deviceWalletFactoryClass.js";
+import { SmartAccountSubPackage } from "./interface/smartAccountClass.js";
+import { DeviceWalletFactorySubPackage } from "./interface/deviceWalletFactoryClass.js";
 import { P256VerifierSubPackage } from "./interface/P256VerifierClass.js";
-import { lazyWalletRegistrySubPackage } from "./interface/lazyWalletRegistryClass.js";
-import { deviceWalletSubPackage } from "./interface/deviceWalletClass.js";
-import { eSIMWalletSubPackage } from "./interface/eSIMWalletClass.js";
-import { eSIMWalletFactorySubPackage } from "./interface/eSIMWalletFactoryClass.js";
+import { LazyWalletRegistrySubPackage } from "./interface/lazyWalletRegistryClass.js";
+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";
 
@@ -14,19 +14,23 @@ export class Kokio {
     viemWalletClient: WalletClient;
     turnkeyClient: TurnkeyClient;
     organizationId: string;
+    gasPolicyId: string;
+
     constants: ConstantsSubPackage;
-    smartAccount: smartAccountSubPackage;
-    deviceWalletFactory?: deviceWalletFactorySubPackage;
-    eSIMWalletFactory?: eSIMWalletFactorySubPackage;
-    lazyWalletRegistry?: lazyWalletRegistrySubPackage;
-    deviceWallet?: deviceWalletSubPackage;
-    eSIMWallet?: eSIMWalletSubPackage;
+
+    smartAccount: SmartAccountSubPackage;
+    deviceWalletFactory?: DeviceWalletFactorySubPackage;
+    eSIMWalletFactory?: ESIMWalletFactorySubPackage;
+    lazyWalletRegistry?: LazyWalletRegistrySubPackage;
+    deviceWallet?: DeviceWalletSubPackage;
+    eSIMWallet?: ESIMWalletSubPackage;
     P256Verifier?: P256VerifierSubPackage;
 
     constructor(
         viemWalletClient: WalletClient,
         turnkeyClient: TurnkeyClient,
         organizationId: string,
+        gasPolicyId: string,
         smartAccountClient?: SmartAccountClient,
         deviceWalletAddress?: Address,
         eSIMWalletAddress?: Address
@@ -34,13 +38,16 @@ 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.deviceWalletFactory = smartAccountClient? new deviceWalletFactorySubPackage(viemWalletClient, smartAccountClient): undefined;
-        this.eSIMWalletFactory = smartAccountClient? new eSIMWalletFactorySubPackage(viemWalletClient, smartAccountClient): undefined;
-        this.lazyWalletRegistry = smartAccountClient? new lazyWalletRegistrySubPackage(smartAccountClient): undefined;
+
+        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;
         this.P256Verifier = smartAccountClient? new P256VerifierSubPackage(smartAccountClient): undefined;
-        this.deviceWallet = deviceWalletAddress && smartAccountClient? new deviceWalletSubPackage(viemWalletClient, smartAccountClient, deviceWalletAddress): undefined;
-        this.eSIMWallet = eSIMWalletAddress && smartAccountClient? new eSIMWalletSubPackage(smartAccountClient, eSIMWalletAddress): undefined;
+        this.deviceWallet = deviceWalletAddress && smartAccountClient? new DeviceWalletSubPackage(viemWalletClient, smartAccountClient, deviceWalletAddress): undefined;
+        this.eSIMWallet = eSIMWalletAddress && smartAccountClient? new ESIMWalletSubPackage(smartAccountClient, eSIMWalletAddress): undefined;
     }
 }

package/src/interface/constantsClass.ts

@@ -24,7 +24,8 @@ export class ConstantsSubPackage {
     constructor(client: WalletClient) {
         (async () => {
           const chainID = await _extractChainID(client);
-          const values = _getChainSpecificConstants(chainID);
+          const rpcURL = client.transport.url;
+          const values = _getChainSpecificConstants(chainID, rpcURL);
     
           this.factoryAddresses = values?.factoryAddresses;
           this.customErrors = values?.customErrors;

package/src/interface/deviceWalletClass.ts

@@ -12,7 +12,7 @@ import {
 } from "../logic/deviceWallet.js"
 import { SmartAccountClient } from "@aa-sdk/core";
 
-export class deviceWalletSubPackage {
+export class DeviceWalletSubPackage {
 
     smartAccountClient;
     walletClient;

package/src/interface/deviceWalletFactoryClass.ts

@@ -6,7 +6,7 @@ import {
 } from "../logic/deviceWalletFactory.js"
 import { SmartAccountClient } from "@aa-sdk/core";
 
-export class deviceWalletFactorySubPackage {
+export class DeviceWalletFactorySubPackage {
 
     smartAccountClient;
     walletClient;

package/src/interface/eSIMWalletClass.ts

@@ -12,7 +12,7 @@ import {
 import { DataBundleDetails } from "../types";
 import { SmartAccountClient } from "@aa-sdk/core";
 
-export class eSIMWalletSubPackage {
+export class ESIMWalletSubPackage {
 
     client;
     address;

package/src/interface/eSIMWalletFactoryClass.ts

@@ -7,7 +7,7 @@ import {
 } from "../logic/eSIMWalletFactory.js"
 import { SmartAccountClient } from "@aa-sdk/core";
 
-export class eSIMWalletFactorySubPackage {
+export class ESIMWalletFactorySubPackage {
 
     smartAccountClient;
     walletClient;

package/src/interface/lazyWalletRegistryClass.ts

@@ -8,7 +8,7 @@ import {
 import { DataBundleDetails } from "../types";
 import { SmartAccountClient } from "@aa-sdk/core";
 
-export class lazyWalletRegistrySubPackage {
+export class LazyWalletRegistrySubPackage {
 
     client;
 

package/src/interface/smartAccountClass.ts

@@ -4,16 +4,18 @@ import { P256Key, SignedRequest } from "../types";
 import { SmartAccountClient, SmartContractAccount } from "@aa-sdk/core";
 import { TurnkeyClient } from "@turnkey/http";
 
-export class smartAccountSubPackage {
+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/P256Verifier.ts

@@ -13,7 +13,9 @@ export const _verifySignature = async (
     y: bigint
 ) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+    const rpcURL = client.transport.url;
+    const values = _getChainSpecificConstants(chainID, rpcURL);
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp

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

@@ -26,6 +26,7 @@ import { _add0x, _concatUint8Arrays, _remove0x, _shouldRemoveLeadingZero } from
 import { P256Key, WebAuthnSignature } from "../../types.js";
 import { DeviceWallet, DeviceWalletFactory } from "../../abis/index.js";
 import { _signMessageWithTurnkey, _signTypedDataWithTurnkey } from "../services/turnkeyClient.js";
+import { alchemyGasManagerMiddleware } from "@account-kit/infra";
 
 const _encodeExecute = async (tx: AccountOp) => {
 
@@ -61,25 +62,27 @@ const _encodeBatchExecute = async (txs: AccountOp[]) => {
 
 const _getAccountInitCode = async (client: WalletClient, deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key, salt: bigint): Promise<Hex> => {
 
-  // To send with user operations
-  const chainID = await client.getChainId();
-  const values = _getChainSpecificConstants(chainID);
+	// To send with user operations
+	const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
 
-  const callData =  encodeFunctionData({
-    abi: DeviceWalletFactory, 
-    functionName: "createAccount",
-    args: [deviceUniqueIdentifier, deviceWalletOwnerKey, salt, ZERO],
-  })
+	const callData =  encodeFunctionData({
+		abi: DeviceWalletFactory, 
+		functionName: "createAccount",
+		args: [deviceUniqueIdentifier, deviceWalletOwnerKey, salt, ZERO],
+	})
 
-  return values.factoryAddresses.DEVICE_WALLET_FACTORY.concat(_remove0x(callData)) as Hex;
+	return values.factoryAddresses.DEVICE_WALLET_FACTORY.concat(_remove0x(callData)) as Hex;
 }
 
 const getInitCodeHash = async (client: WalletClient, deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key): Promise<BytesLike> => {
   
 	const chainID = await client.getChainId();
-	const values = _getChainSpecificConstants(chainID);
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
   
-  // off-chain computation of the DeviceWallet address
+	// off-chain computation of the DeviceWallet address
 	const registry = values.factoryAddresses.REGISTRY;
 	const deviceWalletFactoryAddress = values.factoryAddresses.DEVICE_WALLET_FACTORY;
 
@@ -133,7 +136,8 @@ const prepareSaltForCreate2 = (sender: Address, salt: BigInt): BytesLike => {
 const getCounterFactualAddress = async (client: WalletClient, deviceUniqueIdentifier: string, deviceWalletOwnerKey: P256Key, salt: BigInt, sender?: Address):Promise<Hex> => {
 
 	const chainID = await client.getChainId();
-	const values = _getChainSpecificConstants(chainID);
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
 	const deviceWalletFactoryAddress = values.factoryAddresses.DEVICE_WALLET_FACTORY;
 
 	sender = sender? sender : values.factoryAddresses.SENDER_CREATOR;
@@ -224,10 +228,19 @@ 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 values = _getChainSpecificConstants(chainID);
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
 
 	if (!client.account) throw new Error ('Error: No signer account found with WalletClient')
 	const signWith = client.account.address;
@@ -240,14 +253,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),
@@ -268,15 +281,17 @@ 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 values = _getChainSpecificConstants(chainID);
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
 
 	return createSmartAccountClient({
 		// created above
 		account: account,
 		chain: values.chain,
 		transport: http(values.rpcURL),
+		...alchemyGasManagerMiddleware(gasPolicyId)
 	});
 }

package/src/logic/constants.ts

@@ -1,8 +1,4 @@
-import * as dotenv from 'dotenv';
-dotenv.config();
-
-import { WalletClient } from "viem";
-
+import { WalletClient, Address } from 'viem';
 import {
     mainnet,
     sepolia,
@@ -14,8 +10,6 @@ import {
 
 export const ZERO = BigInt('0');
 
-export const API_KEY = process.env.API_KEY;
-
 export enum CHAIN_ID  {
     MAINNET = 1,
     SEPOLIA = 11155111,
@@ -25,15 +19,6 @@ export enum CHAIN_ID  {
     ARBITRUM_SEPOLIA = 421614,
 }
 
-export const rpcURLs: Record<string, string> = {
-    mainnet: `https://eth-mainnet.g.alchemy.com/v2/${API_KEY}`,
-    sepolia: `https://eth-sepolia.g.alchemy.com/v2/${API_KEY}`,
-    optimismMainnet : `https://opt-mainnet.g.alchemy.com/v2/${API_KEY}`,
-    optimismSepolia: `https://opt-sepolia.g.alchemy.com/v2/${API_KEY}`,
-    arbitrum: `https://arb-mainnet.g.alchemy.com/v2/${API_KEY}`,
-    arbitrumSepolia: `https://arb-sepolia.g.alchemy.com/v2/${API_KEY}`,
-}
-
 export interface chainSpecifcConstants {
     factoryAddresses: 
         typeof sepoliaFactoryAddresses |
@@ -53,17 +38,17 @@ export interface chainSpecifcConstants {
     customErrors: typeof customErrors;
 }
 
-export const sepoliaFactoryAddresses: Record<string, `0x${string}`> = {
+export const sepoliaFactoryAddresses: Record<string, Address> = {
     DEVICE_WALLET_FACTORY: '0x63005d8214533fC7209678Aa39F7b9b0b51a7bcB',
     ESIM_WALLET_FACTORY: '0xB4473979ff8cE4e09161B08f74EEb66BD7718076',
     LAZY_WALLET_REGISTRY: '0x8a1E53b903efcc6b252CE4bD3b255202318505Ef',
     REGISTRY: '0xCa447f5C75C57f6C59027304A5Fb5A09F0E005c9',
     ENTRY_POINT: '0x0000000071727De22E5E9d8BAf0edAc6f37da032',
-    SENDER_CREATOR: '0x9406Cc6185a346906296840746125a0E44976454',
+    SENDER_CREATOR: '0xefc2c1444ebcc4db75e7613d20c6a62ff67a167c',
     P256VERIFIER: '0xF04f3b3935aD461D17d4a8a78E7ea21d4a61AEb1'
 }
 
-export const mainnetFactoryAddresses: Record<string, `0x${string}`> = {
+export const mainnetFactoryAddresses: Record<string, Address> = {
     DEVICE_WALLET_FACTORY: '0x',
     ESIM_WALLET_FACTORY: '0x',
     LAZY_WALLET_REGISTRY: '0x',
@@ -73,7 +58,7 @@ export const mainnetFactoryAddresses: Record<string, `0x${string}`> = {
     P256VERIFIER: '0x'
 }
 
-export const optimismMainnetFactoryAddresses: Record<string, `0x${string}`> = {
+export const optimismMainnetFactoryAddresses: Record<string, Address> = {
     DEVICE_WALLET_FACTORY: '0x',
     ESIM_WALLET_FACTORY: '0x',
     LAZY_WALLET_REGISTRY: '0x',
@@ -83,17 +68,17 @@ export const optimismMainnetFactoryAddresses: Record<string, `0x${string}`> = {
     P256VERIFIER: '0x'
 }
 
-export const optimismSepoliaFactoryAddresses: Record<string, `0x${string}`> = {
+export const optimismSepoliaFactoryAddresses: Record<string, Address> = {
     DEVICE_WALLET_FACTORY: '0x3feA4dB0C0bBB73142d5bB6b776EE238884a3705',
     ESIM_WALLET_FACTORY: '0xaD2Ba6248D0e6990a844C94ACE78F8775A68b631',
     LAZY_WALLET_REGISTRY: '0x29b98C32D83604664fd0742b9112b0825a74849F',
     REGISTRY: '0xaeB98F0f092fCb4a476ea3a5EB6A4B9E3D63A686',
-    ENTRY_POINT: '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789',
-    SENDER_CREATOR: '0x7fc98430eaedbb6070b35b39d798725049088348',
+    ENTRY_POINT: '0x0000000071727De22E5E9d8BAf0edAc6f37da032',
+    SENDER_CREATOR: '0xefc2c1444ebcc4db75e7613d20c6a62ff67a167c',
     P256VERIFIER: '0x5349aEA97Faa6D5d6D78A8847068300a4eC9D39E'
 }
 
-export const arbitrumOneFactoryAddresses: Record<string, `0x${string}`> = {
+export const arbitrumOneFactoryAddresses: Record<string, Address> = {
     DEVICE_WALLET_FACTORY: '0x',
     ESIM_WALLET_FACTORY: '0x',
     LAZY_WALLET_REGISTRY: '0x',
@@ -103,7 +88,7 @@ export const arbitrumOneFactoryAddresses: Record<string, `0x${string}`> = {
     P256VERIFIER: '0x'
 }
 
-export const arbitrumSepoliaFactoryAddresses: Record<string, `0x${string}`> = {
+export const arbitrumSepoliaFactoryAddresses: Record<string, Address> = {
     DEVICE_WALLET_FACTORY: '0x',
     ESIM_WALLET_FACTORY: '0x',
     LAZY_WALLET_REGISTRY: '0x',
@@ -134,14 +119,15 @@ export const _getChainSpecificConstants = (
         CHAIN_ID.OPTIMISM_MAINNET | 
         CHAIN_ID.OPTIMISM_SEPOLIA |
         CHAIN_ID.ARBITRUM_ONE |
-        CHAIN_ID.ARBITRUM_SEPOLIA
+        CHAIN_ID.ARBITRUM_SEPOLIA,
+    rpcURL: string
     ): chainSpecifcConstants => {
 
     if (chainID == CHAIN_ID.SEPOLIA) {
         return {
             factoryAddresses: sepoliaFactoryAddresses,
             chain: sepolia,
-            rpcURL: rpcURLs.sepolia,
+            rpcURL: rpcURL,
             customErrors: customErrors
         }
     }
@@ -149,7 +135,7 @@ export const _getChainSpecificConstants = (
         return {
             factoryAddresses: mainnetFactoryAddresses,
             chain: mainnet,
-            rpcURL: rpcURLs.mainnet,
+            rpcURL: rpcURL,
             customErrors: customErrors
         }
     }
@@ -157,7 +143,7 @@ export const _getChainSpecificConstants = (
         return {
             factoryAddresses: optimismMainnetFactoryAddresses,
             chain: optimism,
-            rpcURL: rpcURLs.optimismMainnet,
+            rpcURL: rpcURL,
             customErrors: customErrors
         }
     }
@@ -165,7 +151,7 @@ export const _getChainSpecificConstants = (
         return {
             factoryAddresses: optimismSepoliaFactoryAddresses,
             chain: optimismSepolia,
-            rpcURL: rpcURLs.optimismSepolia,
+            rpcURL: rpcURL,
             customErrors: customErrors
         }
     }
@@ -173,7 +159,7 @@ export const _getChainSpecificConstants = (
         return {
             factoryAddresses: arbitrumOneFactoryAddresses,
             chain: arbitrum,
-            rpcURL: rpcURLs.arbitrum,
+            rpcURL: rpcURL,
             customErrors: customErrors
         }
     }
@@ -181,7 +167,7 @@ export const _getChainSpecificConstants = (
         return {
             factoryAddresses: arbitrumSepoliaFactoryAddresses,
             chain: arbitrumSepolia,
-            rpcURL: rpcURLs.arbitrumSepolia,
+            rpcURL: rpcURL,
             customErrors: customErrors
         }
     }

package/src/logic/deviceWallet.ts

@@ -1,7 +1,7 @@
 import { Address, createPublicClient, encodeFunctionData, getContract, PublicClient, WalletClient } from "viem";
 import { SmartAccountClient } from "@aa-sdk/core";
 import { DeviceWallet } from "../abis/index.js";
-import { _getChainSpecificConstants, customErrors } from "./constants.js";
+import { customErrors } from "./constants.js";
 import { P256Key } from "../types.js";
 
 export const _deployESIMWallet = async (client: SmartAccountClient, address: Address, hasAccessToETH: boolean, salt: bigint) => {
@@ -158,9 +158,6 @@ export const _removeESIMWallet = async (client: SmartAccountClient, address: Add
 
 export const _getOwner = async (client: WalletClient, address: Address) => {
 
-    const chainID = await client.getChainId();
-    const values = _getChainSpecificConstants(chainID);
-
     const contract = getContract({
         abi: DeviceWallet,
         address: address,

package/src/logic/deviceWalletFactory.ts

@@ -12,7 +12,8 @@ export const _createAccountWithEOA = async (
 ) => {
 
     const chainID = await client.getChainId();
-    const values = _getChainSpecificConstants(chainID);
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
 
     if (!client.account) throw new Error(customErrors.MISSING_EOA_WALLET);
 
@@ -33,7 +34,10 @@ export const _getAddress = async (
     salt: bigint,
 ) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
+
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp
@@ -52,7 +56,10 @@ export const _getAddress = async (
 
 export const _getCurrentDeviceWalletImplementation = async (client: SmartAccountClient) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
+
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp

package/src/logic/eSIMWalletFactory.ts

@@ -5,7 +5,10 @@ import { ESIMWalletFactory } from "../abis/index.js";
 
 export const _addRegistryAddress = async (client: SmartAccountClient, registryContractAddress: Address) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
+
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp
@@ -25,7 +28,8 @@ export const _addRegistryAddress = async (client: SmartAccountClient, registryCo
 export const _deployESIMWalletWithEOA = async (client: WalletClient, deviceWalletAddress: Address, salt: bigint) => {
 
     const chainID = await client.getChainId();
-    const values = _getChainSpecificConstants(chainID);
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
 
     if (!client.account) throw new Error(customErrors.MISSING_EOA_WALLET);
 
@@ -41,7 +45,10 @@ export const _deployESIMWalletWithEOA = async (client: WalletClient, deviceWalle
 
 export const _deployESIMWalletWithUserOp = async (client: SmartAccountClient, deviceWalletAddress: Address, salt: bigint) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
+
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp
@@ -60,7 +67,10 @@ export const _deployESIMWalletWithUserOp = async (client: SmartAccountClient, de
 
 export const _getCurrentESIMWalletImplementation = async (client: SmartAccountClient) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
+
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp

package/src/logic/lazyWalletRegistry.ts

@@ -7,7 +7,10 @@ import { LazyWalletRegistry } from "../abis/index.js";
 
 export const _isLazyWalletDeployed = async (client: SmartAccountClient, deviceUniqueIdentifier: string) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
+
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp
@@ -31,7 +34,10 @@ export const _batchPopulateHistory = async (
     dataBundleDetails: Array<Array<DataBundleDetails>>
 ) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
+
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp
@@ -56,7 +62,10 @@ export const _deployLazyWalletAndSetESIMIdentifier = async (
     depositAmount: bigint
 ) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
+
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp
@@ -80,7 +89,10 @@ export const _switchESIMIdentifierToNewDeviceIdentifier = async (
     newDeviceIdentifier: string
 ) => {
 
-    const values = _getChainSpecificConstants(await client.getChainId());
+    const chainID = await client.getChainId();
+	const rpcURL = client.transport.url;
+	const values = _getChainSpecificConstants(chainID, rpcURL);
+
     if(!client.account) throw new Error(customErrors.MISSING_SMART_WALLET)
     
     // UserOp

package/src/logic/utils.ts

@@ -1,5 +1,5 @@
 import { Hex, isHex } from "viem";
-import { _getChainSpecificConstants, customErrors } from "./constants.js"
+import { customErrors } from "./constants.js"
 
 export const _add0x = (data: Hex | string): Hex => {
     if(!data) {

package/src/types-export.ts

@@ -0,0 +1,7 @@
+export type {
+    P256Key,
+    WebAuthnSignature,
+    P256Credential,
+    DataBundleDetails,
+    SignedRequest
+} from './types';

package/.env.example

@@ -1 +0,0 @@
-API_KEY=<YOUR_ALCHEMY_API_KEY>