@toruslabs/ethereum-controllers 9.0.0 → 9.1.0

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

@@ -8,25 +8,23 @@ var log = require('loglevel');
 var viem = require('viem');
 var accountAbstraction = require('viem/account-abstraction');
 
-const eoaInterceptorMiddleware = eoaAddress => (req, res, next, end) => {
-  req.isAAProviderRequest = true;
-  if (req.method === "eth_accounts" || req.method === "eth_requestAccounts") {
-    res.result = [eoaAddress];
-    end();
-    return;
+const eoaInterceptorMiddleware = eoaAddress => async ({
+  request,
+  next,
+  context
+}) => {
+  context.set("isAAProviderRequest", true);
+  if (request.method === "eth_accounts" || request.method === "eth_requestAccounts") {
+    return [eoaAddress];
   }
-  next();
+  return next();
 };
 function eoaProviderAsMiddleware(provider) {
-  return async (req, res, _next, end) => {
-    // send request to provider
-    try {
-      const providerRes = await provider.request(req);
-      res.result = providerRes;
-      return end();
-    } catch (error) {
-      return end(error);
-    }
+  return async ({
+    request
+  }) => {
+    const result = await provider.request(request);
+    return result;
   };
 }
 class AccountAbstractionController extends baseControllers.BaseController {
@@ -92,10 +90,10 @@ class AccountAbstractionController extends baseControllers.BaseController {
       transport: viem.http(providerConfig.rpcTarget)
     });
     // viem wallet client using json-rpc account from eoaProvider
-    const aaEngine = new auth.JRPCEngine();
-    aaEngine.push(eoaInterceptorMiddleware(eoaAddress));
-    aaEngine.push(eoaProviderAsMiddleware(eoaProvider));
-    const provider = auth.providerFromEngine(aaEngine);
+    const aaEngine = auth.JRPCEngineV2.create({
+      middleware: [eoaInterceptorMiddleware(eoaAddress), eoaProviderAsMiddleware(eoaProvider)]
+    });
+    const provider = auth.providerFromEngineV2(aaEngine);
     // need to hoist the account address https://viem.sh/docs/clients/wallet#optional-hoist-the-account
     const eoaWalletClient = viem.createWalletClient({
       account: eoaAddress,

package/dist/lib.cjs/Eip5792/walletGetCallsStatus.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var baseControllers = require('@toruslabs/base-controllers');
+var metadataHelpers = require('@toruslabs/metadata-helpers');
 var auth = require('@web3auth/auth');
 var eip5792Types = require('../utils/eip5792Types.js');
-var hex = require('../utils/hex.js');
 
 /**
  * Maps a TransactionStatus to an EIP-5792 GetCallsStatusCode.
@@ -65,7 +65,7 @@ function walletGetCallsStatus(request, getTransactionByBatchId) {
   return {
     status: mapTransactionStatusToEip5792Status(batchTx.status),
     id: batchId,
-    chainId: hex.addHexPrefix(batchTx.chainId),
+    chainId: metadataHelpers.add0x(batchTx.chainId),
     atomic: true,
     receipts: batchTx.txReceipt ? [batchTx.txReceipt] : []
   };

package/dist/lib.cjs/Eip7702/eip7702Utils.js

@@ -1,10 +1,10 @@
 'use strict';
 
+var metadataHelpers = require('@toruslabs/metadata-helpers');
 var viem = require('viem');
 var abis = require('../utils/abis.js');
 var constants = require('../utils/constants.js');
 var eip7702Types = require('../utils/eip7702Types.js');
-var hex = require('../utils/hex.js');
 
 /**
  * The MetaMask EIP-7702 Stateless Delegator contract address.
@@ -14,10 +14,10 @@ const MetaMask_EIP7702_Stateless_Delegator = "0x63c0c19a282a1B52b07dD5a65b58948A
 async function getDelegationAddress(walletAddress, chainId, getEthCode) {
   // query eth_getCode
   const code = await getEthCode(walletAddress, chainId);
-  const normalizedCode = code ? hex.addHexPrefix(code).toLowerCase() : "0x0";
+  const normalizedCode = code ? metadataHelpers.add0x(code).toLowerCase() : "0x0";
   const hasDelegation = normalizedCode.length === 48 && normalizedCode.startsWith(eip7702Types.EIP_7702_PREFIX);
   if (hasDelegation) {
-    const delegationAddress = hex.addHexPrefix(normalizedCode.slice(eip7702Types.EIP_7702_PREFIX.length));
+    const delegationAddress = metadataHelpers.add0x(normalizedCode.slice(eip7702Types.EIP_7702_PREFIX.length));
     return delegationAddress;
   }
   return null;

package/dist/lib.cjs/Gas/GasFeeController.js

@@ -2,10 +2,9 @@
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var baseControllers = require('@toruslabs/base-controllers');
+var metadataHelpers = require('@toruslabs/metadata-helpers');
 var log = require('loglevel');
-var viem = require('viem');
 var constants = require('../utils/constants.js');
-var hex = require('../utils/hex.js');
 var gasUtil = require('./gasUtil.js');
 
 const GAS_FEE_API = "https://mock-gas-server.herokuapp.com/";
@@ -120,7 +119,7 @@ class GasFeeController extends baseControllers.BaseController {
     const chainId = this.getNetworkIdentifier();
     if (chainId === "loading") return;
     let chainIdInt;
-    if (typeof chainId === "string" && viem.isHex(hex.addHexPrefix(chainId))) {
+    if (metadataHelpers.isHexString(chainId)) {
       chainIdInt = Number.parseInt(chainId, 16);
     }
     try {

package/dist/lib.cjs/Keyring/KeyringController.js

@@ -5,7 +5,6 @@ var baseControllers = require('@toruslabs/base-controllers');
 var metadataHelpers = require('@toruslabs/metadata-helpers');
 var viem$1 = require('viem');
 var accounts = require('viem/accounts');
-var hex = require('../utils/hex.js');
 var viem = require('../utils/viem.js');
 
 class KeyringController extends baseControllers.BaseKeyringController {
@@ -24,7 +23,7 @@ class KeyringController extends baseControllers.BaseKeyringController {
   }
   async signTransaction(tx, address) {
     const wallet = this._getWalletForAccount(address);
-    const account = accounts.privateKeyToAccount(hex.addHexPrefix(wallet.privateKey));
+    const account = accounts.privateKeyToAccount(metadataHelpers.add0x(wallet.privateKey));
     const localTx = tx;
     const txToSign = viem.prepareViemTx(localTx);
     // NOTE: don't use account.signTransaction directly because it only return signed serialized transaction
@@ -44,7 +43,7 @@ class KeyringController extends baseControllers.BaseKeyringController {
   }
   async signEip7702Authorization(authorization, address) {
     const wallet = this._getWalletForAccount(address);
-    const account = accounts.privateKeyToAccount(hex.addHexPrefix(wallet.privateKey));
+    const account = accounts.privateKeyToAccount(metadataHelpers.add0x(wallet.privateKey));
     // Convert hex strings to proper types for RLP encoding
     // EIP-7702 authorization tuple: [chain_id_decimal, address, nonce_decimal]
     const chainIdDecimal = parseInt(authorization.chainId, 16);
@@ -68,8 +67,8 @@ class KeyringController extends baseControllers.BaseKeyringController {
   }
   async importAccount(accountPrivateKey) {
     try {
-      const hexPrivateKey = accountPrivateKey.padStart(64, "0");
-      const account = accounts.privateKeyToAccount(hex.addHexPrefix(hexPrivateKey));
+      const hexPrivateKey = metadataHelpers.remove0x(accountPrivateKey).padStart(64, "0");
+      const account = accounts.privateKeyToAccount(metadataHelpers.add0x(hexPrivateKey));
       const publicKey = account.publicKey;
       const address = account.address;
       const existingWallet = this.state.wallets.find(w => w.address === address);
@@ -100,8 +99,7 @@ class KeyringController extends baseControllers.BaseKeyringController {
     }
   }
   getPrivateKeyBytes(privateKey) {
-    const stripped = hex.stripHexPrefix(privateKey);
-    return metadataHelpers.hexToBytes(stripped);
+    return metadataHelpers.hexToBytes(privateKey);
   }
   // For eth_sign, we need to sign arbitrary data:
   async signMessage(data, address) {
@@ -110,14 +108,14 @@ class KeyringController extends baseControllers.BaseKeyringController {
     }
     const wallet = this._getWalletForAccount(address);
     const privKey = this.getPrivateKeyBytes(wallet.privateKey);
-    const payload = metadataHelpers.hexToBytes(hex.stripHexPrefix(data));
+    const payload = metadataHelpers.hexToBytes(data);
     const messageSig = baseControllers.ecsignature(payload, privKey);
     const sig = baseControllers.concatSig(messageSig.v, messageSig.r, messageSig.s);
     return sig;
   }
   async signPersonalMessage(data, address) {
     const wallet = this._getWalletForAccount(address);
-    const account = accounts.privateKeyToAccount(hex.addHexPrefix(wallet.privateKey));
+    const account = accounts.privateKeyToAccount(metadataHelpers.add0x(wallet.privateKey));
     // we need to check if the data is hex or not
     // For historical reasons, you must submit the message to sign in hex-encoded UTF-8.
     // https://docs.metamask.io/wallet/how-to/sign-data/#use-personal_sign
@@ -131,7 +129,7 @@ class KeyringController extends baseControllers.BaseKeyringController {
   // personal_signTypedData, signs data along with the schema
   async signTypedData(typedData, address) {
     const wallet = this._getWalletForAccount(address);
-    const account = accounts.privateKeyToAccount(hex.addHexPrefix(wallet.privateKey));
+    const account = accounts.privateKeyToAccount(metadataHelpers.add0x(wallet.privateKey));
     delete typedData.types.EIP712Domain;
     const primaryType = typedData.primaryType;
     if (!primaryType) {

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

@@ -3,9 +3,7 @@
 var baseControllers = require('@toruslabs/base-controllers');
 var metadataHelpers = require('@toruslabs/metadata-helpers');
 var viem = require('viem');
-var hex = require('../utils/hex.js');
 
-const hexRe = /^[0-9A-Fa-f]+$/gu;
 function validateAddress(address, propertyName) {
   if (!address || typeof address !== "string" || !viem.isAddress(address)) {
     throw new Error(`Invalid "${propertyName}" address: ${address} must be a valid string.`);
@@ -23,14 +21,13 @@ function validateSignMessageData(messageData) {
 }
 function normalizeMessageData(data) {
   try {
-    const stripped = hex.stripHexPrefix(data);
-    if (stripped.match(hexRe)) {
-      return hex.addHexPrefix(stripped);
+    if (metadataHelpers.isHexString(data)) {
+      return metadataHelpers.add0x(data);
     }
   } catch {
     // do nothing
   }
-  return hex.addHexPrefix(metadataHelpers.bytesToHex(metadataHelpers.utf8ToBytes(data)));
+  return metadataHelpers.add0x(metadataHelpers.bytesToHex(metadataHelpers.utf8ToBytes(data)));
 }
 async function validateTypedSignMessageDataV4(messageData, currentChainId) {
   validateAddress(messageData.from, "from");

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

@@ -150,15 +150,13 @@ class NetworkController extends baseControllers.BaseController {
     networkMiddleware,
     blockTracker
   }) {
-    const ethereumMiddleware = createEthereumMiddleware.createEthereumMiddleware(this.baseProviderHandlers, this.getProviderConfig(), this.analytics);
-    const engine = new auth.JRPCEngine();
-    engine.push(baseControllers.createAnalyticsMiddleware({
-      providerConfig: this.getProviderConfig(),
-      analytics: this.analytics
-    }));
-    engine.push(ethereumMiddleware);
-    engine.push(networkMiddleware);
-    const provider = auth.providerFromEngine(engine);
+    const engine = auth.JRPCEngineV2.create({
+      middleware: [baseControllers.createAnalyticsMiddleware({
+        providerConfig: this.getProviderConfig(),
+        analytics: this.analytics
+      }), createEthereumMiddleware.createEthereumMiddleware(this.baseProviderHandlers, this.getProviderConfig(), this.analytics), networkMiddleware]
+    });
+    const provider = auth.providerFromEngineV2(engine);
     this.setProvider({
       provider,
       blockTracker