@toruslabs/ethereum-controllers 8.4.2 → 8.4.3

package/dist/lib.cjs/AccountAbstraction/AccountAbstractionController.js

@@ -147,7 +147,7 @@ class AccountAbstractionController extends baseControllers.BaseController {
       calls: [{
         to: txParams.to,
         // Explicit conversation required to avoid value being passed as hex
-        value: BigInt(txParams.value),
+        value: txParams.value ? BigInt(txParams.value) : undefined,
         data: txParams.data
       }],
       maxFeePerGas: txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined,
@@ -186,6 +186,42 @@ class AccountAbstractionController extends baseControllers.BaseController {
     });
     return txReceipt.receipt.transactionHash;
   }
+  async signTransaction(id, tx, address) {
+    var _txParams$chainId2;
+    if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) {
+      throw new Error("Invalid address");
+    }
+    const txParams = tx;
+    const userOpMeta = {
+      transactionParams: txParams,
+      chainId: (_txParams$chainId2 = txParams.chainId) !== null && _txParams$chainId2 !== void 0 ? _txParams$chainId2 : this.getProviderConfig().chainId,
+      createdAt: new Date(),
+      status: baseControllers.TransactionStatus.approved
+    };
+    this.updateUserOpMeta(id, userOpMeta);
+    const request = await this.bundlerClient.prepareUserOperation({
+      account: this.smartAccount,
+      calls: [{
+        to: txParams.to,
+        // Explicit conversation required to avoid value being passed as hex
+        value: txParams.value ? BigInt(txParams.value) : undefined,
+        data: txParams.data
+      }],
+      maxFeePerGas: txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined,
+      maxPriorityFeePerGas: txParams.maxPriorityFeePerGas ? BigInt(txParams.maxPriorityFeePerGas) : undefined,
+      callGasLimit: txParams.callGasLimit ? BigInt(txParams.callGasLimit) : undefined,
+      preVerificationGas: txParams.preVerificationGas ? BigInt(txParams.preVerificationGas) : undefined,
+      verificationGasLimit: txParams.verificationGasLimit ? BigInt(txParams.verificationGasLimit) : undefined,
+      paymasterVerificationGasLimit: txParams.paymasterVerificationGasLimit ? BigInt(txParams.paymasterVerificationGasLimit) : undefined,
+      paymasterPostOpGasLimit: txParams.paymasterPostOpGasLimit ? BigInt(txParams.paymasterPostOpGasLimit) : undefined
+    });
+    const signature = await this.smartAccount.signUserOperation(request);
+    this.updateUserOpMeta(id, {
+      signature,
+      status: baseControllers.TransactionStatus.signed
+    });
+    return signature;
+  }
   async estimateGas(txParams, address) {
     if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) throw new Error("Invalid address");
     const calls = [{

package/dist/lib.cjs/Network/createEthereumMiddleware.js

@@ -295,6 +295,7 @@ function createEthereumMiddleware(providerHandlers) {
     requestAccounts,
     getAccounts,
     getPrivateKey,
+    getPublicKey,
     processTransaction,
     processSignTransaction,
     processEstimateUserOperationGas,
@@ -316,7 +317,7 @@ function createEthereumMiddleware(providerHandlers) {
     requestAccounts
   }), createGetAccountsMiddleware({
     getAccounts
-  }), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.ETH_PRIVATE_KEY, getPrivateKey), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.PRIVATE_KEY, getPrivateKey), createProcessTransactionMiddleware({
+  }), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.ETH_PRIVATE_KEY, getPrivateKey), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.PRIVATE_KEY, getPrivateKey), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.ETH_PUBLIC_KEY, getPublicKey), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.PUBLIC_KEY, getPublicKey), createProcessTransactionMiddleware({
     processTransaction
   }), createProcessSignTransactionMiddleware({
     processSignTransaction

package/dist/lib.cjs/types/AccountAbstraction/AccountAbstractionController.d.ts

@@ -1,14 +1,15 @@
-import { BaseConfig, BaseController, BaseState, TransactionStatus } from "@toruslabs/base-controllers";
-import { JRPCMiddleware, JRPCRequest, JRPCResponse, SafeEventEmitterProvider } from "@web3auth/auth";
-import { WalletClient } from "viem";
-import { BundlerClient, SmartAccount } from "viem/account-abstraction";
-import { NetworkController } from "../Network/NetworkController";
-import { BundlerConfig, EthereumNetworkState, ISmartAccount, PaymasterConfig, SignTypedDataMessageV4, SmartAccountType, TransactionParams, UserOperationGas } from "../utils/interfaces";
+import { type BaseConfig, BaseController, type BaseState, TransactionStatus } from "@toruslabs/base-controllers";
+import { JRPCMiddleware, type JRPCRequest, type JRPCResponse, type SafeEventEmitterProvider } from "@web3auth/auth";
+import { type WalletClient } from "viem";
+import { type BundlerClient, type SmartAccount } from "viem/account-abstraction";
+import { type NetworkController } from "../Network/NetworkController";
+import type { BundlerConfig, EthereumNetworkState, ISmartAccount, PaymasterConfig, SignTypedDataMessageV4, SmartAccountType, TransactionParams, UserOperationGas } from "../utils/interfaces";
 export interface UserOperationMeta {
     transactionParams: TransactionParams;
     userOpHash?: string;
     status: TransactionStatus;
     chainId: string;
+    signature?: string;
     createdAt: Date;
     receipt?: {
         transactionHash: string;
@@ -50,6 +51,7 @@ export declare class AccountAbstractionController extends BaseController<Account
     get walletClient(): WalletClient | null;
     setupProvider(eoaProvider: SafeEventEmitterProvider, eoaAddress: string): Promise<void>;
     sendTransaction(id: string, tx: TransactionParams, address: string): Promise<string>;
+    signTransaction(id: string, tx: TransactionParams, address: string): Promise<string>;
     estimateGas(txParams: TransactionParams, address: string): Promise<UserOperationGas>;
     signMessage(message: string, address: string): Promise<string>;
     signPersonalMessage(message: string, address: string): Promise<string>;

package/dist/lib.cjs/types/Network/createEthereumMiddleware.d.ts

@@ -6,6 +6,7 @@ export interface IProviderHandlers {
     requestAccounts?: (req: JRPCRequest<string[]>) => Promise<string[]>;
     getAccounts: (req: JRPCRequest<string[]>) => Promise<string[]>;
     getPrivateKey?: (req: JRPCRequest<unknown>) => Promise<string>;
+    getPublicKey?: (req: JRPCRequest<unknown>) => Promise<string>;
     processTransaction?: (txParams: TransactionParams, req: JRPCRequest<TransactionParams> & UserRequestApprovalParams) => Promise<string>;
     processSignTransaction?: (txParams: TransactionParams, req: JRPCRequest<TransactionParams> & UserRequestApprovalParams) => Promise<string>;
     processEthSignMessage?: (msgParams: MessageParams, req: JRPCRequest<unknown> & UserRequestApprovalParams) => Promise<string>;

package/dist/lib.cjs/types/utils/constants.d.ts

@@ -46,6 +46,8 @@ export declare const METHOD_TYPES: {
     readonly ETH_GET_GAS_PRICE: "eth_gasPrice";
     readonly ETH_PRIVATE_KEY: "eth_privateKey";
     readonly PRIVATE_KEY: "private_key";
+    readonly ETH_PUBLIC_KEY: "eth_publicKey";
+    readonly PUBLIC_KEY: "public_key";
     readonly SWITCH_CHAIN: "wallet_switchEthereumChain";
     readonly ADD_CHAIN: "wallet_addEthereumChain";
 };

package/dist/lib.cjs/utils/constants.js

@@ -246,6 +246,8 @@ const METHOD_TYPES = {
   ETH_GET_GAS_PRICE: "eth_gasPrice",
   ETH_PRIVATE_KEY: "eth_privateKey",
   PRIVATE_KEY: "private_key",
+  ETH_PUBLIC_KEY: "eth_publicKey",
+  PUBLIC_KEY: "public_key",
   SWITCH_CHAIN: "wallet_switchEthereumChain",
   ADD_CHAIN: "wallet_addEthereumChain"
 };

package/dist/lib.esm/AccountAbstraction/AccountAbstractionController.js

@@ -146,7 +146,7 @@ class AccountAbstractionController extends BaseController {
       calls: [{
         to: txParams.to,
         // Explicit conversation required to avoid value being passed as hex
-        value: BigInt(txParams.value),
+        value: txParams.value ? BigInt(txParams.value) : undefined,
         data: txParams.data
       }],
       maxFeePerGas: txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined,
@@ -185,6 +185,42 @@ class AccountAbstractionController extends BaseController {
     });
     return txReceipt.receipt.transactionHash;
   }
+  async signTransaction(id, tx, address) {
+    var _txParams$chainId2;
+    if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) {
+      throw new Error("Invalid address");
+    }
+    const txParams = tx;
+    const userOpMeta = {
+      transactionParams: txParams,
+      chainId: (_txParams$chainId2 = txParams.chainId) !== null && _txParams$chainId2 !== void 0 ? _txParams$chainId2 : this.getProviderConfig().chainId,
+      createdAt: new Date(),
+      status: TransactionStatus.approved
+    };
+    this.updateUserOpMeta(id, userOpMeta);
+    const request = await this.bundlerClient.prepareUserOperation({
+      account: this.smartAccount,
+      calls: [{
+        to: txParams.to,
+        // Explicit conversation required to avoid value being passed as hex
+        value: txParams.value ? BigInt(txParams.value) : undefined,
+        data: txParams.data
+      }],
+      maxFeePerGas: txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined,
+      maxPriorityFeePerGas: txParams.maxPriorityFeePerGas ? BigInt(txParams.maxPriorityFeePerGas) : undefined,
+      callGasLimit: txParams.callGasLimit ? BigInt(txParams.callGasLimit) : undefined,
+      preVerificationGas: txParams.preVerificationGas ? BigInt(txParams.preVerificationGas) : undefined,
+      verificationGasLimit: txParams.verificationGasLimit ? BigInt(txParams.verificationGasLimit) : undefined,
+      paymasterVerificationGasLimit: txParams.paymasterVerificationGasLimit ? BigInt(txParams.paymasterVerificationGasLimit) : undefined,
+      paymasterPostOpGasLimit: txParams.paymasterPostOpGasLimit ? BigInt(txParams.paymasterPostOpGasLimit) : undefined
+    });
+    const signature = await this.smartAccount.signUserOperation(request);
+    this.updateUserOpMeta(id, {
+      signature,
+      status: TransactionStatus.signed
+    });
+    return signature;
+  }
   async estimateGas(txParams, address) {
     if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) throw new Error("Invalid address");
     const calls = [{

package/dist/lib.esm/Network/createEthereumMiddleware.js

@@ -293,6 +293,7 @@ function createEthereumMiddleware(providerHandlers) {
     requestAccounts,
     getAccounts,
     getPrivateKey,
+    getPublicKey,
     processTransaction,
     processSignTransaction,
     processEstimateUserOperationGas,
@@ -314,7 +315,7 @@ function createEthereumMiddleware(providerHandlers) {
     requestAccounts
   }), createGetAccountsMiddleware({
     getAccounts
-  }), createGenericJRPCMiddleware(METHOD_TYPES.ETH_PRIVATE_KEY, getPrivateKey), createGenericJRPCMiddleware(METHOD_TYPES.PRIVATE_KEY, getPrivateKey), createProcessTransactionMiddleware({
+  }), createGenericJRPCMiddleware(METHOD_TYPES.ETH_PRIVATE_KEY, getPrivateKey), createGenericJRPCMiddleware(METHOD_TYPES.PRIVATE_KEY, getPrivateKey), createGenericJRPCMiddleware(METHOD_TYPES.ETH_PUBLIC_KEY, getPublicKey), createGenericJRPCMiddleware(METHOD_TYPES.PUBLIC_KEY, getPublicKey), createProcessTransactionMiddleware({
     processTransaction
   }), createProcessSignTransactionMiddleware({
     processSignTransaction

package/dist/lib.esm/utils/constants.js

@@ -244,6 +244,8 @@ const METHOD_TYPES = {
   ETH_GET_GAS_PRICE: "eth_gasPrice",
   ETH_PRIVATE_KEY: "eth_privateKey",
   PRIVATE_KEY: "private_key",
+  ETH_PUBLIC_KEY: "eth_publicKey",
+  PUBLIC_KEY: "public_key",
   SWITCH_CHAIN: "wallet_switchEthereumChain",
   ADD_CHAIN: "wallet_addEthereumChain"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "8.4.2",
+  "version": "8.4.3",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "sideEffects": false,
@@ -21,20 +21,20 @@
   "dependencies": {
     "@ethereumjs/util": "^9.1.0",
     "@metamask/delegation-toolkit": "^0.10.2",
-    "@toruslabs/base-controllers": "^8.4.2",
+    "@toruslabs/base-controllers": "^8.4.3",
     "@toruslabs/http-helpers": "^8.1.1",
     "@web3auth/auth": "^10.4.0",
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.2.1",
-    "bn.js": "^5.2.1",
+    "bn.js": "^5.2.2",
     "deepmerge": "^4.3.1",
-    "ethers": "^6.13.5",
+    "ethers": "^6.13.7",
     "fast-json-patch": "^3.1.1",
     "fast-safe-stringify": "^2.1.1",
     "jsonschema": "^1.5.0",
     "loglevel": "^1.9.2",
-    "permissionless": "^0.2.42",
-    "viem": "^2.27.2"
+    "permissionless": "^0.2.43",
+    "viem": "^2.23.2"
   },
   "peerDependencies": {
     "@babel/runtime": "7.x"
@@ -63,7 +63,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3b10ca0321c6cee1a575e2e63d9f21643d42d373",
+  "gitHead": "2cfad6d6b757e41cc91efa040e6cf489cdd3eb65",
   "devDependencies": {
     "@typechain/ethers-v6": "^0.5.1",
     "typechain": "^8.3.2"