@toruslabs/ethereum-controllers 8.13.0 → 8.15.0

package/dist/ethereumControllers.umd.min.js.LICENSE.txt

@@ -28,6 +28,8 @@
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
+/*! noble-ciphers - MIT License (c) 2023 Paul Miller (paulmillr.com) */
+
 /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 
 /*! noble-hashes - MIT License (c) 2022 Paul Miller (paulmillr.com) */
@@ -36,6 +38,8 @@
 
 /*! scure-base - MIT License (c) 2022 Paul Miller (paulmillr.com) */
 
+/*! scure-bip32 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) */
+
 /**
  * @license
  * Lodash <https://lodash.com/>

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

@@ -130,7 +130,6 @@ class AccountAbstractionController extends baseControllers.BaseController {
       throw new Error("Invalid address");
     }
     const txParams = tx;
-    // @ts-expect-error TODO: viem types are too deep
     const userOperationParams = {
       account: this.smartAccount,
       calls: [{

package/dist/lib.cjs/AccountAbstraction/smartAccounts/MetamaskSmartAccount.js

@@ -2,7 +2,7 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var delegationToolkit = require('@metamask/delegation-toolkit');
+var smartAccountsKit = require('@metamask/smart-accounts-kit');
 var constants = require('../../utils/constants.js');
 
 class MetamaskSmartAccount {
@@ -28,21 +28,21 @@ class MetamaskSmartAccount {
       client: input.client,
       deploySalt: (_this$options$deployS = (_this$options0 = this.options) === null || _this$options0 === void 0 ? void 0 : _this$options0.deploySalt) !== null && _this$options$deployS !== void 0 ? _this$options$deployS : "0x0"
     };
-    const implementation = (_this$options$impleme = (_this$options1 = this.options) === null || _this$options1 === void 0 ? void 0 : _this$options1.implementation) !== null && _this$options$impleme !== void 0 ? _this$options$impleme : delegationToolkit.Implementation.Hybrid;
-    if (implementation === delegationToolkit.Implementation.Hybrid) {
+    const implementation = (_this$options$impleme = (_this$options1 = this.options) === null || _this$options1 === void 0 ? void 0 : _this$options1.implementation) !== null && _this$options$impleme !== void 0 ? _this$options$impleme : smartAccountsKit.Implementation.Hybrid;
+    if (implementation === smartAccountsKit.Implementation.Hybrid) {
       const params = _objectSpread(_objectSpread({}, baseParams), {}, {
         implementation,
         deployParams: hybridDeployParams,
         signer: hybridSignatory
       });
-      return delegationToolkit.toMetaMaskSmartAccount(params);
-    } else if (implementation === delegationToolkit.Implementation.MultiSig) {
+      return smartAccountsKit.toMetaMaskSmartAccount(params);
+    } else if (implementation === smartAccountsKit.Implementation.MultiSig) {
       const params = _objectSpread(_objectSpread({}, baseParams), {}, {
         implementation,
         deployParams: multiSigDeployParams,
         signer: multiSigSignatory
       });
-      return delegationToolkit.toMetaMaskSmartAccount(params);
+      return smartAccountsKit.toMetaMaskSmartAccount(params);
     } else {
       throw new Error(`MetamaskSmartAccount - unsupported implementation: ${implementation}`);
     }

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

@@ -3,6 +3,7 @@
 var baseControllers = require('@toruslabs/base-controllers');
 var auth = require('@web3auth/auth');
 var constants = require('../utils/constants.js');
+var transaction = require('../utils/transaction.js');
 
 function createGetAccountsMiddleware({
   getAccounts
@@ -321,7 +322,8 @@ function createAAMiddleware({
   const bundlerFetchMiddleware = baseControllers.createFetchMiddleware({
     rpcTarget: bundlerUrl,
     providerConfig,
-    analytics
+    analytics,
+    transactionDecoder: transaction.transactionDecoder
   });
   middlewares.push(idNumberRemapMiddleware);
   middlewares.push((request, response, next, end) => {
@@ -334,7 +336,8 @@ function createAAMiddleware({
     const paymasterFetchMiddleware = baseControllers.createFetchMiddleware({
       rpcTarget: paymasterUrl,
       providerConfig,
-      analytics
+      analytics,
+      transactionDecoder: transaction.transactionDecoder
     });
     middlewares.push((request, response, next, end) => {
       if (!constants.PAYMASTER_METHOD_TYPES.includes(request.method)) {

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

@@ -4,6 +4,7 @@ var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var baseControllers = require('@toruslabs/base-controllers');
 var auth = require('@web3auth/auth');
 var PollingBlockTracker = require('../Block/PollingBlockTracker.js');
+var transaction = require('../utils/transaction.js');
 var cacheIdentifier = require('./cacheIdentifier.js');
 
 function createChainIdMiddleware(chainId) {
@@ -37,7 +38,8 @@ function createJsonRpcClient(providerConfig, networkConfig, idleTimeTracker, ana
   const fetchMiddleware = baseControllers.createFetchMiddleware({
     rpcTarget,
     providerConfig,
-    analytics
+    analytics,
+    transactionDecoder: transaction.transactionDecoder
   });
   const blockProvider = auth.providerFromMiddleware(fetchMiddleware);
   const blockTracker = new PollingBlockTracker.PollingBlockTracker({

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/MetamaskSmartAccount.d.ts

@@ -1,4 +1,4 @@
-import { Implementation } from "@metamask/delegation-toolkit";
+import { Implementation } from "@metamask/smart-accounts-kit";
 import { Client, WalletClient } from "viem";
 import { SmartAccount } from "viem/account-abstraction";
 import { ISmartAccount, MetamaskSmartAccountConfig } from "../../utils/interfaces";

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

@@ -1,4 +1,4 @@
-import { Implementation, toMetaMaskSmartAccount } from "@metamask/delegation-toolkit";
+import { Implementation, toMetaMaskSmartAccount } from "@metamask/smart-accounts-kit";
 import { BASE_TX_EVENT_TYPE, BaseBlockTrackerState, BaseControllerEvents, BaseFormattedTransactionActivity, BaseTokenInfo, BaseTransactionEvents, MESSAGE_EVENTS, MessageStatus, NetworkConfig, NetworkState, PaymentTransaction, PollingBlockTrackerConfig, PopupWhitelabelData, ProviderConfig, TRANSACTION_TYPE, TransactionMeta, TransactionState, TransactionStatus, TX_CONFIRMED_EVENT_TYPE, TX_DROPPED_EVENT_TYPE, TX_EVENTS, TX_FAILED_EVENT_TYPE, TX_WARNING_EVENT_TYPE, User } from "@toruslabs/base-controllers";
 import { JRPCRequest, Json } from "@web3auth/auth";
 import { MutexInterface } from "async-mutex";

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

@@ -0,0 +1,6 @@
+import { JRPCRequest } from "@web3auth/auth";
+/**
+ * Transaction decoder for analytics.
+ * Decodes eth_sendRawTransaction and eth_sendUserOperation requests.
+ */
+export declare const transactionDecoder: (req: JRPCRequest<unknown>, chainId: string) => [string, string];

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

@@ -0,0 +1,40 @@
+'use strict';
+
+var common = require('@ethereumjs/common');
+var tx = require('@ethereumjs/tx');
+var util = require('@ethereumjs/util');
+var log = require('loglevel');
+var constants = require('./constants.js');
+
+/**
+ * Transaction decoder for analytics.
+ * Decodes eth_sendRawTransaction and eth_sendUserOperation requests.
+ */
+const transactionDecoder = (req, chainId) => {
+  let sender = "";
+  let txHash = "";
+  try {
+    if (req.method === constants.METHOD_TYPES.ETH_SEND_RAW_TRANSACTION) {
+      const rawTx = req.params[0];
+      const txBytes = util.hexToBytes(util.addHexPrefix(rawTx));
+      const tx$1 = tx.createTxFromRLP(txBytes, {
+        common: common.createCustomCommon({
+          chainId
+        }, common.Mainnet)
+      });
+      sender = tx$1.getSenderAddress().toString();
+      txHash = util.bytesToHex(tx$1.hash());
+    } else if (req.method === constants.METHOD_TYPES.ETH_SEND_USER_OPERATION) {
+      const userOpReq = req;
+      sender = userOpReq.params.map(p => p.sender).join(",");
+    }
+  } catch (error) {
+    log.error("Error decoding transaction", error, {
+      req,
+      chainId
+    });
+  }
+  return [sender, txHash];
+};
+
+exports.transactionDecoder = transactionDecoder;

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

@@ -129,7 +129,6 @@ class AccountAbstractionController extends BaseController {
       throw new Error("Invalid address");
     }
     const txParams = tx;
-    // @ts-expect-error TODO: viem types are too deep
     const userOperationParams = {
       account: this.smartAccount,
       calls: [{

package/dist/lib.esm/AccountAbstraction/smartAccounts/MetamaskSmartAccount.js

@@ -1,6 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { Implementation, toMetaMaskSmartAccount } from '@metamask/delegation-toolkit';
+import { Implementation, toMetaMaskSmartAccount } from '@metamask/smart-accounts-kit';
 import { SMART_ACCOUNT } from '../../utils/constants.js';
 
 class MetamaskSmartAccount {

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

@@ -1,6 +1,7 @@
 import { PROVIDER_JRPC_METHODS, createFetchMiddleware, createGenericJRPCMiddleware } from '@toruslabs/base-controllers';
 import { createAsyncMiddleware, mergeMiddleware, createScaffoldMiddleware } from '@web3auth/auth';
 import { METHOD_TYPES, TRANSACTION_ENVELOPE_TYPES, BUNDLER_METHOD_TYPES, PAYMASTER_METHOD_TYPES } from '../utils/constants.js';
+import { transactionDecoder } from '../utils/transaction.js';
 
 function createGetAccountsMiddleware({
   getAccounts
@@ -321,7 +322,8 @@ function createAAMiddleware({
   const bundlerFetchMiddleware = createFetchMiddleware({
     rpcTarget: bundlerUrl,
     providerConfig,
-    analytics
+    analytics,
+    transactionDecoder
   });
   middlewares.push(idNumberRemapMiddleware);
   middlewares.push((request, response, next, end) => {
@@ -334,7 +336,8 @@ function createAAMiddleware({
     const paymasterFetchMiddleware = createFetchMiddleware({
       rpcTarget: paymasterUrl,
       providerConfig,
-      analytics
+      analytics,
+      transactionDecoder
     });
     middlewares.push((request, response, next, end) => {
       if (!PAYMASTER_METHOD_TYPES.includes(request.method)) {

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

@@ -2,6 +2,7 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { createFetchMiddleware, createInflightCacheMiddleware } from '@toruslabs/base-controllers';
 import { providerFromMiddleware, mergeMiddleware } from '@web3auth/auth';
 import { PollingBlockTracker } from '../Block/PollingBlockTracker.js';
+import { transactionDecoder } from '../utils/transaction.js';
 import { cacheIdentifierForRequest } from './cacheIdentifier.js';
 
 function createChainIdMiddleware(chainId) {
@@ -35,7 +36,8 @@ function createJsonRpcClient(providerConfig, networkConfig, idleTimeTracker, ana
   const fetchMiddleware = createFetchMiddleware({
     rpcTarget,
     providerConfig,
-    analytics
+    analytics,
+    transactionDecoder
   });
   const blockProvider = providerFromMiddleware(fetchMiddleware);
   const blockTracker = new PollingBlockTracker({

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

@@ -0,0 +1,38 @@
+import { createCustomCommon, Mainnet } from '@ethereumjs/common';
+import { createTxFromRLP } from '@ethereumjs/tx';
+import { hexToBytes, addHexPrefix, bytesToHex } from '@ethereumjs/util';
+import log from 'loglevel';
+import { METHOD_TYPES } from './constants.js';
+
+/**
+ * Transaction decoder for analytics.
+ * Decodes eth_sendRawTransaction and eth_sendUserOperation requests.
+ */
+const transactionDecoder = (req, chainId) => {
+  let sender = "";
+  let txHash = "";
+  try {
+    if (req.method === METHOD_TYPES.ETH_SEND_RAW_TRANSACTION) {
+      const rawTx = req.params[0];
+      const txBytes = hexToBytes(addHexPrefix(rawTx));
+      const tx = createTxFromRLP(txBytes, {
+        common: createCustomCommon({
+          chainId
+        }, Mainnet)
+      });
+      sender = tx.getSenderAddress().toString();
+      txHash = bytesToHex(tx.hash());
+    } else if (req.method === METHOD_TYPES.ETH_SEND_USER_OPERATION) {
+      const userOpReq = req;
+      sender = userOpReq.params.map(p => p.sender).join(",");
+    }
+  } catch (error) {
+    log.error("Error decoding transaction", error, {
+      req,
+      chainId
+    });
+  }
+  return [sender, txHash];
+};
+
+export { transactionDecoder };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "8.13.0",
+  "version": "8.15.0",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "sideEffects": false,
@@ -19,22 +19,24 @@
     "test": "vitest run --config test/configs/browsers.config.mts --coverage"
   },
   "dependencies": {
+    "@ethereumjs/common": "^10.1.0",
+    "@ethereumjs/tx": "^10.1.0",
     "@ethereumjs/util": "^10.1.0",
-    "@metamask/delegation-toolkit": "~0.13.0",
-    "@toruslabs/base-controllers": "^8.13.0",
+    "@metamask/smart-accounts-kit": "~0.3.0",
+    "@toruslabs/base-controllers": "^8.15.0",
     "@toruslabs/http-helpers": "^8.1.1",
-    "@web3auth/auth": "^10.7.0",
+    "@web3auth/auth": "^10.8.0",
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.3.1",
     "bn.js": "^5.2.2",
     "deepmerge": "^4.3.1",
     "ethereum-cryptography": "^3.2.0",
-    "ethers": "^6.15.0",
+    "ethers": "^6.16.0",
     "fast-json-patch": "^3.1.1",
     "fast-safe-stringify": "^2.1.1",
     "jsonschema": "^1.5.0",
     "loglevel": "^1.9.2",
-    "permissionless": "^0.2.57"
+    "permissionless": "^0.3.2"
   },
   "peerDependencies": {
     "@babel/runtime": "7.x",
@@ -64,7 +66,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d0504d55cda8ab22e439c812ce24ea685d73e36b",
+  "gitHead": "34e5c37fb5f516e1d5900bbe46c6c879ceb90bd3",
   "devDependencies": {
     "@typechain/ethers-v6": "^0.5.1",
     "typechain": "^8.3.2"