kokio-sdk 3.0.2 → 3.1.0

package/dist/esm/logic/admin/reads/paymentAdapter.reads.js

@@ -1,5 +1,5 @@
 import { publicActions } from "viem";
-import { _getChainSpecificConstants } from "../../constants.js";
+import { _chainId, _getChainSpecificConstants } from "../../constants.js";
 import { PaymentAdapter } from "../../../abis/index.js";
 // Read-only admin logic for `PaymentAdapter`. Every write on it
 // (registerAsset/updateAsset) is `onlyOwner`, i.e. only reachable through the
@@ -7,7 +7,7 @@ import { PaymentAdapter } from "../../../abis/index.js";
 // rather than here.
 /** The registry this adapter reads `vault()` and `isESIMWalletValid()` from. */
 export const _registry = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -19,7 +19,7 @@ export const _registry = async (client) => {
 };
 /** The ERC-20 registered under the `USDC` symbol at configure time. */
 export const _settlementToken = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -35,7 +35,7 @@ export const _settlementToken = async (client) => {
  * from "registered but withdrawn" (`allowed: false`).
  */
 export const _assets = async (client, symbol) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     const [allowed, isDollarUnit, decimals, token] = await client.extend(publicActions).readContract({
@@ -48,7 +48,7 @@ export const _assets = async (client, symbol) => {
 };
 /** A currency's full entry, reverting if the symbol was never registered. */
 export const _resolveAsset = async (client, symbol) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -64,7 +64,7 @@ export const _resolveAsset = async (client, symbol) => {
  * `_tokenAmount` for the backend's own settlement record.
  */
 export const _quote = async (client, symbol, priceUSDCents) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -82,7 +82,7 @@ export const _quote = async (client, symbol, priceUSDCents) => {
  * still reads the adapter's own record from before that move.
  */
 export const _usedReferences = async (client, paymentReference) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -94,7 +94,7 @@ export const _usedReferences = async (client, paymentReference) => {
 };
 /** The address holding upgrade authority over this adapter (its owner). */
 export const _upgradeManager = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({

package/dist/esm/logic/admin/reads/protocolAdmin.reads.js

@@ -1,5 +1,5 @@
 import { publicActions } from "viem";
-import { _getChainSpecificConstants } from "../../constants.js";
+import { _chainId, _getChainSpecificConstants } from "../../constants.js";
 import { ProtocolAdmin } from "../../../abis/index.js";
 // Read-only logic for `ProtocolAdmin`, the timelock that owns the four
 // upgradeable contracts. Every read extends the `WalletClient` with
@@ -13,7 +13,7 @@ export var OperationState;
     OperationState[OperationState["Done"] = 3] = "Done";
 })(OperationState || (OperationState = {}));
 const _resolve = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     return _getChainSpecificConstants(chainID, rpcURL);
 };

package/dist/esm/logic/admin/reads/registry.reads.js

@@ -1,5 +1,5 @@
 import { publicActions } from "viem";
-import { _getChainSpecificConstants } from "../../constants.js";
+import { _chainId, _getChainSpecificConstants } from "../../constants.js";
 import { Registry } from "../../../abis/index.js";
 // Read-only admin logic for `Registry` (which inherits `RegistryHelper`, so its
 // ABI carries the helper mappings too). Surfaces the public storage getters for
@@ -11,7 +11,7 @@ import { Registry } from "../../../abis/index.js";
  * dormant rather than unset.
  */
 export const _eSIMWalletAdmin = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -27,7 +27,7 @@ export const _eSIMWalletAdmin = async (client) => {
  * who may actually act.
  */
 export const _adminOfRecord = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -43,7 +43,7 @@ export const _adminOfRecord = async (client) => {
  * this alongside `_newRequestedAdmin` to tell them apart.
  */
 export const _adminDisabled = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -58,7 +58,7 @@ export const _adminDisabled = async (client) => {
  * paths on the device wallets and eSIM wallets revert `ProtocolPaused`.
  */
 export const _paused = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -73,7 +73,7 @@ export const _paused = async (client) => {
  * cap of its own. Never zero.
  */
 export const _defaultPriceCapUSDCents = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -85,7 +85,7 @@ export const _defaultPriceCapUSDCents = async (client) => {
 };
 /** The vault EOA recorded in the registry. */
 export const _vault = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -97,7 +97,7 @@ export const _vault = async (client) => {
 };
 /** The pending admin nominated via `requestAdminUpdate` (zero address if none). */
 export const _newRequestedAdmin = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -113,7 +113,7 @@ export const _newRequestedAdmin = async (client) => {
  * be scheduled instead.
  */
 export const _owner = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -125,7 +125,7 @@ export const _owner = async (client) => {
 };
 /** The upgrade-manager (owner) EOA recorded in the registry. */
 export const _upgradeManager = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -141,7 +141,7 @@ export const _upgradeManager = async (client) => {
  * been offered to the timelock.
  */
 export const _pendingOwner = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -153,7 +153,7 @@ export const _pendingOwner = async (client) => {
 };
 /** The `DeviceWalletFactory` address wired into the registry. */
 export const _deviceWalletFactory = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -165,7 +165,7 @@ export const _deviceWalletFactory = async (client) => {
 };
 /** The `ESIMWalletFactory` address wired into the registry. */
 export const _eSIMWalletFactory = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -177,7 +177,7 @@ export const _eSIMWalletFactory = async (client) => {
 };
 /** The EntryPoint the registry recognises. One per chain. */
 export const _entryPoint = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -193,7 +193,7 @@ export const _entryPoint = async (client) => {
  * failure to carry the protocol's own revert reason.
  */
 export const _requireNotPaused = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     await client.extend(publicActions).readContract({
@@ -205,7 +205,7 @@ export const _requireNotPaused = async (client) => {
 };
 /** The `LazyWalletRegistry` address wired into the registry. */
 export const _lazyWalletRegistry = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -217,7 +217,7 @@ export const _lazyWalletRegistry = async (client) => {
 };
 /** The device wallet registered for a device unique identifier (zero if none). */
 export const _uniqueIdentifierToDeviceWallet = async (client, deviceIdentifier) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -232,7 +232,7 @@ export const _uniqueIdentifierToDeviceWallet = async (client, deviceIdentifier)
  * `bytes32[2]` array takes the element index (`0` or `1`) and returns one key.
  */
 export const _deviceWalletToOwner = async (client, deviceWallet, index) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -244,7 +244,7 @@ export const _deviceWalletToOwner = async (client, deviceWallet, index) => {
 };
 /** The device wallet registered for a hash of owner P-256 keys (zero if none). */
 export const _registeredP256Keys = async (client, hashOfOwnerP256Keys) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -256,7 +256,7 @@ export const _registeredP256Keys = async (client, hashOfOwnerP256Keys) => {
 };
 /** Whether a device wallet is registered/valid. */
 export const _isDeviceWalletValid = async (client, deviceWallet) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -276,7 +276,7 @@ export const _isDeviceWalletValid = async (client, deviceWallet) => {
  * `DeviceWallet.isValidESIMWallet` on the device wallet.
  */
 export const _isESIMWalletValid = async (client, eSIMWallet) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -296,7 +296,7 @@ export const _isESIMWalletValid = async (client, eSIMWallet) => {
  * this to decide whether an eSIM wallet belongs to the protocol.
  */
 export const _isESIMWalletOnStandby = async (client, eSIMWallet) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -312,7 +312,7 @@ export const _isESIMWalletOnStandby = async (client, eSIMWallet) => {
  * as soon as history is recorded and well before anything is deployed.
  */
 export const _isDeviceIdentifierAlreadyUsed = async (client, deviceUniqueIdentifier) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -324,7 +324,7 @@ export const _isDeviceIdentifierAlreadyUsed = async (client, deviceUniqueIdentif
 };
 /** Whether an eSIM identifier is already held by a wallet. */
 export const _isESIMIdentifierClaimed = async (client, eSIMUniqueIdentifier) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -340,7 +340,7 @@ export const _isESIMIdentifierClaimed = async (client, eSIMUniqueIdentifier) =>
  * belongs to the wallet rather than to whichever device is holding it.
  */
 export const _eSIMWalletForIdentifier = async (client, eSIMUniqueIdentifier) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -356,7 +356,7 @@ export const _eSIMWalletForIdentifier = async (client, eSIMUniqueIdentifier) =>
  * string version and skip the hashing.
  */
 export const _claimedESIMIdentifiers = async (client, hashOfESIMIdentifier) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -376,7 +376,7 @@ export const _claimedESIMIdentifiers = async (client, hashOfESIMIdentifier) => {
  * all then refuse it.
  */
 export const _requireDeviceIdentifierNotReserved = async (client, deviceUniqueIdentifier) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     await client.extend(publicActions).readContract({
@@ -392,7 +392,7 @@ export const _requireDeviceIdentifierNotReserved = async (client, deviceUniqueId
  * is what stops a non-UUPS address being installed.
  */
 export const _proxiableUUID = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -404,7 +404,7 @@ export const _proxiableUUID = async (client) => {
 };
 /** The OpenZeppelin upgrade interface this proxy speaks, currently `"5.0.0"`. */
 export const _upgradeInterfaceVersion = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -416,7 +416,7 @@ export const _upgradeInterfaceVersion = async (client) => {
 };
 /** The payment adapter this registry currently points at. */
 export const _paymentAdapter = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({
@@ -432,7 +432,7 @@ export const _paymentAdapter = async (client) => {
  * the contract keys `usedPaymentReferences` by, not the bare reference.
  */
 export const _usedPaymentReferences = async (client, scopedReference) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return client.extend(publicActions).readContract({

package/dist/esm/logic/admin/registry.eoa.js

@@ -1,4 +1,4 @@
-import { _getChainSpecificConstants } from "../constants.js";
+import { _chainId, _getChainSpecificConstants } from "../constants.js";
 import { MissingEOAWalletError, writeContractOrThrow } from "../errors.js";
 import { Registry } from "../../abis/index.js";
 // Admin-EOA logic for `Registry`. Most of this is `onlyOwner`, so the `client`
@@ -11,7 +11,7 @@ import { Registry } from "../../abis/index.js";
 // deployments whose owner is a plain EOA or multisig.
 /** Wire (or rewire) the LazyWalletRegistry into the Registry. `onlyOwner`. */
 export const _addOrUpdateLazyWalletRegistryAddress = async (client, lazyWalletRegistry) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -19,7 +19,7 @@ export const _addOrUpdateLazyWalletRegistryAddress = async (client, lazyWalletRe
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'addOrUpdateLazyWalletRegistryAddress',
         args: [lazyWalletRegistry]
@@ -27,7 +27,7 @@ export const _addOrUpdateLazyWalletRegistryAddress = async (client, lazyWalletRe
 };
 /** Update the vault that receives eSIM payments. `onlyOwner`. */
 export const _updateVaultAddress = async (client, newVaultAddress) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -35,7 +35,7 @@ export const _updateVaultAddress = async (client, newVaultAddress) => {
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'updateVaultAddress',
         args: [newVaultAddress]
@@ -51,7 +51,7 @@ export const _updateVaultAddress = async (client, newVaultAddress) => {
  * incumbent instead withdraws a pending nomination and hands the role back.
  */
 export const _requestAdminUpdate = async (client, newAdmin) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -59,7 +59,7 @@ export const _requestAdminUpdate = async (client, newAdmin) => {
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'requestAdminUpdate',
         args: [newAdmin]
@@ -73,7 +73,7 @@ export const _requestAdminUpdate = async (client, newAdmin) => {
  * rather than passing quietly and leaving the caller believing it acted.
  */
 export const _disableAdmin = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -81,7 +81,7 @@ export const _disableAdmin = async (client) => {
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'disableAdmin',
         args: []
@@ -95,7 +95,7 @@ export const _disableAdmin = async (client) => {
  * incumbent. Reverts if the admin was never suspended.
  */
 export const _enableAdmin = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -103,7 +103,7 @@ export const _enableAdmin = async (client) => {
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'enableAdmin',
         args: []
@@ -119,7 +119,7 @@ export const _enableAdmin = async (client) => {
  * funds through their device wallet's `execute`, which a pause never reaches.
  */
 export const _pause = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -127,7 +127,7 @@ export const _pause = async (client) => {
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'pause',
         args: []
@@ -141,7 +141,7 @@ export const _pause = async (client) => {
  * `unpauseInstantly` if the wait is not acceptable.
  */
 export const _unpause = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -149,7 +149,7 @@ export const _unpause = async (client) => {
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'unpause',
         args: []
@@ -164,7 +164,7 @@ export const _unpause = async (client) => {
  * for every wallet without one of its own.
  */
 export const _setDefaultPriceCapUSDCents = async (client, cap) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -172,7 +172,7 @@ export const _setDefaultPriceCapUSDCents = async (client, cap) => {
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'setDefaultPriceCapUSDCents',
         args: [cap]
@@ -185,7 +185,7 @@ export const _setDefaultPriceCapUSDCents = async (client, cap) => {
  * wallet reverts rather than moving.
  */
 export const _assignESIMIdentifier = async (client, eSIMWalletAddress, eSIMUniqueIdentifier) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -193,7 +193,7 @@ export const _assignESIMIdentifier = async (client, eSIMWalletAddress, eSIMUniqu
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'assignESIMIdentifier',
         args: [eSIMWalletAddress, eSIMUniqueIdentifier]
@@ -209,7 +209,7 @@ export const _assignESIMIdentifier = async (client, eSIMWalletAddress, eSIMUniqu
  * `_paymentReference` is spendable once per eSIM wallet.
  */
 export const _recordSettledPurchase = async (client, eSIMWalletAddress, dataBundleDetail, asset, tokenAmount, paymentReference) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -217,7 +217,7 @@ export const _recordSettledPurchase = async (client, eSIMWalletAddress, dataBund
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'recordSettledPurchase',
         args: [eSIMWalletAddress, dataBundleDetail, asset, tokenAmount, paymentReference]
@@ -229,7 +229,7 @@ export const _recordSettledPurchase = async (client, eSIMWalletAddress, dataBund
  * newly nominated admin EOA.
  */
 export const _acceptAdminUpdate = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -237,7 +237,7 @@ export const _acceptAdminUpdate = async (client) => {
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'acceptAdminUpdate',
         args: []
@@ -253,7 +253,7 @@ export const _acceptAdminUpdate = async (client) => {
  * accepts for every contract at once and needs no delay.
  */
 export const _acceptOwnership = async (client) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     if (!client.account)
@@ -261,7 +261,7 @@ export const _acceptOwnership = async (client) => {
     return writeContractOrThrow(client, {
         address: values.factoryAddresses.REGISTRY,
         chain: values.chain,
-        account: client.account.address,
+        account: client.account,
         abi: Registry,
         functionName: 'acceptOwnership',
         args: []
@@ -282,7 +282,7 @@ export const _acceptOwnership = async (client) => {
  * ownership where it is rather than stranding it.
  */
 export const _transferOwnershipCall = async (client, newOwner) => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return {
@@ -305,7 +305,7 @@ export const _transferOwnershipCall = async (client, newOwner) => {
  * again ends the proxy's life. Diff the storage layout before scheduling.
  */
 export const _upgradeCall = async (client, newImplementation, data = '0x') => {
-    const chainID = await client.getChainId();
+    const chainID = await _chainId(client);
     const rpcURL = client.transport.url;
     const values = _getChainSpecificConstants(chainID, rpcURL);
     return {

package/dist/esm/logic/constants.js

@@ -54,11 +54,24 @@ export const customErrors = {
     MISSING_SMART_WALLET: "Error: Client does not have smart wallet account associated",
     MISSING_EOA_WALLET: "Error: Client does not have EOA wallet associated"
 };
+// A client's RPC URL is fixed, so its chain id is too. Asking once per client
+// saves every later SDK call a round trip to the node.
+const chainIds = new WeakMap();
+export const _chainId = (client) => {
+    let chainId = chainIds.get(client);
+    if (!chainId) {
+        chainId = client.getChainId();
+        chainIds.set(client, chainId);
+        // A failed lookup is not remembered, so the next call asks again.
+        chainId.catch(() => chainIds.delete(client));
+    }
+    return chainId;
+};
 export const _extractChainID = async (client) => {
     if (!client) {
         throw new InvalidClientError();
     }
-    return client.getChainId();
+    return _chainId(client);
 };
 // Maps each supported chain id to its factory-address book + viem chain. Base
 // Mainnet is listed with '0x' placeholders so the guard below rejects it with a

package/dist/esm/logic/deviceWallet.js

@@ -1,6 +1,8 @@
 import { encodeFunctionData, getContract } from "viem";
-import { DeviceWallet } from "../abis/index.js";
+import { DeviceWallet, ESIMWalletFactory } from "../abis/index.js";
 import { MissingSmartWalletError } from "./errors.js";
+import { _chainId, _getChainSpecificConstants } from "./constants.js";
+import { _getESIMWalletCounterFactualAddress } from "./eSIMWalletFactory.js";
 // A userOp from a device wallet runs through `execute`, so at the target contract
 // msg.sender is the device-wallet account itself. That constrains which DeviceWallet
 // functions this surface can expose:
@@ -72,6 +74,38 @@ export const _addESIMWallet = async (client, address, eSIMWalletAddress) => {
             }]
     });
 };
+/**
+ * Deploy an eSIM wallet for this device wallet and bind it, in one user operation.
+ *
+ * Fund access cannot be granted at bind time, so `grantAccessToFunds` adds a
+ * `toggleAccessToFunds` after the bind in the same operation. The device wallet
+ * must already be registered (`registry.isDeviceWalletValid`), or the factory
+ * refuses it.
+ */
+export const _deployAndBindESIMWallet = async (client, address, salt, grantAccessToFunds) => {
+    const chainID = await _chainId(client);
+    const rpcURL = client.transport.url;
+    const values = _getChainSpecificConstants(chainID, rpcURL);
+    if (!client.account)
+        throw new MissingSmartWalletError();
+    const eSIMWalletAddress = await _getESIMWalletCounterFactualAddress(client, address, salt);
+    const self = (functionName, hasAccessToFunds) => ({
+        to: address,
+        data: encodeFunctionData({ abi: DeviceWallet, functionName, args: [eSIMWalletAddress, hasAccessToFunds] })
+    });
+    const userOpHash = await client.sendUserOperation({
+        account: client.account,
+        calls: [
+            {
+                to: values.factoryAddresses.ESIM_WALLET_FACTORY,
+                data: encodeFunctionData({ abi: ESIMWalletFactory, functionName: "deployESIMWallet", args: [address, salt] })
+            },
+            self("addESIMWallet", false),
+            ...(grantAccessToFunds ? [self("toggleAccessToFunds", true)] : [])
+        ]
+    });
+    return { userOpHash, eSIMWalletAddress };
+};
 /**
  * Release an eSIM wallet and put it on standby for a transfer.
  *