@web3auth/no-modal 10.14.1 → 11.0.0-beta.0

package/dist/lib.cjs/plugins/wallet-services-plugin/plugin.js

@@ -4,16 +4,18 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var auth = require('@web3auth/auth');
 var analytics = require('../../base/analytics.js');
 var baseControllers = require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 require('../../base/errors/index.js');
+var loglevel = require('../../base/loglevel.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../base/constants.js');
 var index = require('../../base/wallet/index.js');
 var connectorStatus = require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
-var loglevel = require('../../base/loglevel.js');
 var errors = require('../../base/plugin/errors.js');
 var IPlugin = require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var wsEmbed = require('@web3auth/ws-embed');
 
 class WalletServicesPlugin extends auth.SafeEventEmitter {
@@ -24,25 +26,16 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     _defineProperty(this, "SUPPORTED_CONNECTORS", [index.WALLET_CONNECTORS.AUTH]);
     _defineProperty(this, "pluginNamespace", IPlugin.PLUGIN_NAMESPACES.MULTICHAIN);
     _defineProperty(this, "wsEmbedInstance", void 0);
-    _defineProperty(this, "provider", null);
     _defineProperty(this, "web3auth", null);
     _defineProperty(this, "isInitialized", false);
     _defineProperty(this, "analytics", void 0);
   }
-  get proxyProvider() {
-    var _this$wsEmbedInstance;
-    return (_this$wsEmbedInstance = this.wsEmbedInstance) !== null && _this$wsEmbedInstance !== void 0 && _this$wsEmbedInstance.provider ? this.wsEmbedInstance.provider : null;
-  }
   async initWithWeb3Auth(web3auth, _whiteLabel, analytics) {
     if (this.isInitialized) return;
     if (!web3auth) throw errors.WalletServicesPluginError.web3authRequired();
-    if (web3auth.provider && !this.SUPPORTED_CONNECTORS.includes(web3auth.connectedConnectorName)) throw errors.WalletServicesPluginError.notInitialized();
+    if (web3auth.connection && !this.SUPPORTED_CONNECTORS.includes(web3auth.connectedConnectorName)) throw errors.WalletServicesPluginError.notInitialized();
     const currentChainConfig = web3auth.currentChain;
     if (![baseControllers.CHAIN_NAMESPACES.EIP155, baseControllers.CHAIN_NAMESPACES.SOLANA].includes(currentChainConfig === null || currentChainConfig === void 0 ? void 0 : currentChainConfig.chainNamespace)) throw errors.WalletServicesPluginError.unsupportedChainNamespace();
-    // Not connected yet to auth
-    if (web3auth.provider) {
-      this.provider = web3auth.provider;
-    }
     this.web3auth = web3auth;
     this.analytics = analytics;
     // Auth connector uses WS embed
@@ -53,23 +46,14 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     this.status = IPlugin.PLUGIN_STATUS.READY;
     this.emit(IPlugin.PLUGIN_EVENTS.READY);
   }
-  initWithProvider() {
-    throw new Error("Method not implemented.");
-  }
   async connect() {
     // if web3auth is being used and connected to unsupported connector throw error
     if (!this.isInitialized) throw errors.WalletServicesPluginError.notInitialized();
     this.emit(IPlugin.PLUGIN_EVENTS.CONNECTING);
     this.status = IPlugin.PLUGIN_STATUS.CONNECTING;
-    if (!this.provider) {
-      var _this$web3auth;
-      if ((_this$web3auth = this.web3auth) !== null && _this$web3auth !== void 0 && _this$web3auth.provider) {
-        this.provider = this.web3auth.provider;
-      }
-    }
     if (!connectorStatus.CAN_AUTHORIZE_STATUSES.includes(this.web3auth.status)) {
       throw errors.WalletServicesPluginError.web3AuthNotConnected();
-    } else if (!this.web3auth.provider) {
+    } else if (!this.web3auth.connection) {
       throw errors.WalletServicesPluginError.providerRequired();
     }
     try {
@@ -84,8 +68,8 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     }
   }
   async showWalletConnectScanner(showWalletConnectParams) {
-    var _this$wsEmbedInstance2, _this$analytics;
-    if (!((_this$wsEmbedInstance2 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance2 !== void 0 && _this$wsEmbedInstance2.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance, _this$analytics;
+    if (!((_this$wsEmbedInstance = this.wsEmbedInstance) !== null && _this$wsEmbedInstance !== void 0 && _this$wsEmbedInstance.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
     // analytics
     (_this$analytics = this.analytics) === null || _this$analytics === void 0 || _this$analytics.track(analytics.ANALYTICS_EVENTS.WALLET_CONNECT_SCANNER_CLICKED, {
       is_visible: showWalletConnectParams === null || showWalletConnectParams === void 0 ? void 0 : showWalletConnectParams.show
@@ -93,8 +77,8 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     return this.wsEmbedInstance.showWalletConnectScanner(showWalletConnectParams);
   }
   async showFunding(showFundingParams) {
-    var _this$wsEmbedInstance3, _this$analytics2;
-    if (!((_this$wsEmbedInstance3 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance3 !== void 0 && _this$wsEmbedInstance3.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance2, _this$analytics2;
+    if (!((_this$wsEmbedInstance2 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance2 !== void 0 && _this$wsEmbedInstance2.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
     // analytics
     (_this$analytics2 = this.analytics) === null || _this$analytics2 === void 0 || _this$analytics2.track(analytics.ANALYTICS_EVENTS.WALLET_FUNDING_CLICKED, {
       is_visible: showFundingParams === null || showFundingParams === void 0 ? void 0 : showFundingParams.show
@@ -102,8 +86,8 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     return this.wsEmbedInstance.showFunding(showFundingParams);
   }
   async showCheckout(showCheckoutParams) {
-    var _this$wsEmbedInstance4, _this$analytics3;
-    if (!((_this$wsEmbedInstance4 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance4 !== void 0 && _this$wsEmbedInstance4.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance3, _this$analytics3;
+    if (!((_this$wsEmbedInstance3 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance3 !== void 0 && _this$wsEmbedInstance3.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
     // analytics
     (_this$analytics3 = this.analytics) === null || _this$analytics3 === void 0 || _this$analytics3.track(analytics.ANALYTICS_EVENTS.WALLET_CHECKOUT_CLICKED, {
       is_visible: showCheckoutParams === null || showCheckoutParams === void 0 ? void 0 : showCheckoutParams.show,
@@ -118,8 +102,8 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     return this.wsEmbedInstance.showCheckout(showCheckoutParams);
   }
   async showReceive(showReceiveParams) {
-    var _this$wsEmbedInstance5, _this$analytics4;
-    if (!((_this$wsEmbedInstance5 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance5 !== void 0 && _this$wsEmbedInstance5.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance4, _this$analytics4;
+    if (!((_this$wsEmbedInstance4 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance4 !== void 0 && _this$wsEmbedInstance4.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
     // analytics
     (_this$analytics4 = this.analytics) === null || _this$analytics4 === void 0 || _this$analytics4.track(analytics.ANALYTICS_EVENTS.WALLET_RECEIVE_CLICKED, {
       is_visible: showReceiveParams === null || showReceiveParams === void 0 ? void 0 : showReceiveParams.show
@@ -127,8 +111,8 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     return this.wsEmbedInstance.showReceive(showReceiveParams);
   }
   async showWalletUi(showWalletUiParams) {
-    var _this$wsEmbedInstance6, _this$analytics5;
-    if (!((_this$wsEmbedInstance6 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance6 !== void 0 && _this$wsEmbedInstance6.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance5, _this$analytics5;
+    if (!((_this$wsEmbedInstance5 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance5 !== void 0 && _this$wsEmbedInstance5.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
     // analytics
     (_this$analytics5 = this.analytics) === null || _this$analytics5 === void 0 || _this$analytics5.track(analytics.ANALYTICS_EVENTS.WALLET_UI_CLICKED, {
       is_visible: showWalletUiParams === null || showWalletUiParams === void 0 ? void 0 : showWalletUiParams.show,
@@ -137,8 +121,8 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     return this.wsEmbedInstance.showWalletUi(showWalletUiParams);
   }
   async showSwap(showSwapParams) {
-    var _this$wsEmbedInstance7, _this$analytics6;
-    if (!((_this$wsEmbedInstance7 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance7 !== void 0 && _this$wsEmbedInstance7.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
+    var _this$wsEmbedInstance6, _this$analytics6;
+    if (!((_this$wsEmbedInstance6 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance6 !== void 0 && _this$wsEmbedInstance6.isLoggedIn)) throw errors.WalletServicesPluginError.walletPluginNotConnected();
     // analytics
     (_this$analytics6 = this.analytics) === null || _this$analytics6 === void 0 || _this$analytics6.track(analytics.ANALYTICS_EVENTS.WALLET_SWAP_CLICKED, {
       is_visible: showSwapParams === null || showSwapParams === void 0 ? void 0 : showSwapParams.show,
@@ -150,13 +134,13 @@ class WalletServicesPlugin extends auth.SafeEventEmitter {
     return this.wsEmbedInstance.showSwap(showSwapParams);
   }
   async cleanup() {
-    var _this$wsEmbedInstance8;
-    return (_this$wsEmbedInstance8 = this.wsEmbedInstance) === null || _this$wsEmbedInstance8 === void 0 ? void 0 : _this$wsEmbedInstance8.cleanUp();
+    var _this$wsEmbedInstance7;
+    return (_this$wsEmbedInstance7 = this.wsEmbedInstance) === null || _this$wsEmbedInstance7 === void 0 ? void 0 : _this$wsEmbedInstance7.cleanUp();
   }
   async disconnect() {
-    var _this$wsEmbedInstance9;
+    var _this$wsEmbedInstance8;
     if (this.status !== IPlugin.PLUGIN_STATUS.CONNECTED) throw errors.WalletServicesPluginError.invalidSession("Wallet Services plugin is not connected");
-    if ((_this$wsEmbedInstance9 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance9 !== void 0 && _this$wsEmbedInstance9.isLoggedIn) {
+    if ((_this$wsEmbedInstance8 = this.wsEmbedInstance) !== null && _this$wsEmbedInstance8 !== void 0 && _this$wsEmbedInstance8.isLoggedIn) {
       await this.wsEmbedInstance.logout();
     }
     this.emit(IPlugin.PLUGIN_EVENTS.DISCONNECTED);

package/dist/lib.cjs/providers/account-abstraction-provider/providers/AccountAbstractionProvider.js

@@ -9,15 +9,17 @@ var accountAbstraction = require('viem/account-abstraction');
 require('@segment/analytics-next');
 require('../../../base/loglevel.js');
 var baseControllers = require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 var index = require('../../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../../base/constants.js');
 require('../../../base/wallet/index.js');
 require('../../../base/connector/connectorStatus.js');
 require('../../../base/connector/constants.js');
 require('jwt-decode');
 require('../../../base/plugin/errors.js');
 require('../../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var baseProvider = require('../../base-provider/baseProvider.js');
 require('../../base-provider/CommonJRPCProvider.js');
 require('../../base-provider/commonPrivateKeyProvider.js');
@@ -142,15 +144,15 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
       eoaProvider
     });
     // setup rpc engine and AA middleware
-    const engine = new auth.JRPCEngine();
     const aaMiddleware = await ethRpcMiddlewares.createAaMiddleware({
       eoaProvider,
       handlers: providerHandlers
     });
-    engine.push(aaMiddleware);
     const eoaMiddleware = ethRpcMiddlewares.providerAsMiddleware(eoaProvider);
-    engine.push(eoaMiddleware);
-    const provider = auth.providerFromEngine(engine);
+    const engine = auth.JRPCEngineV2.create({
+      middleware: [aaMiddleware, eoaMiddleware]
+    });
+    const provider = auth.providerFromEngineV2(engine);
     this.updateProviderEngineProxy(provider);
     eoaProvider.once("chainChanged", chainId => {
       this.update({
@@ -263,13 +265,13 @@ const accountAbstractionProvider = async ({
 };
 const toEoaProvider = async aaProvider => {
   // derive EOA provider from AA provider
-  const engine = new auth.JRPCEngine();
   const eoaMiddleware = await ethRpcMiddlewares.createEoaMiddleware({
     aaProvider
   });
-  engine.push(eoaMiddleware);
-  engine.push(ethRpcMiddlewares.providerAsMiddleware(aaProvider));
-  return auth.providerFromEngine(engine);
+  const engine = auth.JRPCEngineV2.create({
+    middleware: [eoaMiddleware, ethRpcMiddlewares.providerAsMiddleware(aaProvider)]
+  });
+  return auth.providerFromEngineV2(engine);
 };
 
 Object.defineProperty(exports, "SMART_ACCOUNT", {

package/dist/lib.cjs/providers/account-abstraction-provider/providers/utils.js

@@ -1,22 +1,24 @@
 'use strict';
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
-var util = require('@ethereumjs/util');
+var metadataHelpers = require('@toruslabs/metadata-helpers');
 var auth = require('@web3auth/auth');
 var viem = require('viem');
 require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
 var loglevel = require('../../../base/loglevel.js');
 require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 require('../../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../../base/constants.js');
 require('../../../base/wallet/index.js');
 require('../../../base/connector/connectorStatus.js');
 require('../../../base/connector/constants.js');
 require('jwt-decode');
 require('../../../base/plugin/errors.js');
 require('../../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 
 function getProviderHandlers({
   bundlerClient,
@@ -51,7 +53,7 @@ function getProviderHandlers({
       });
     },
     processTransaction: async txParams => {
-      if (txParams.input && !txParams.data) txParams.data = util.addHexPrefix(txParams.input);
+      if (txParams.input && !txParams.data) txParams.data = metadataHelpers.add0x(txParams.input);
       const {
         to,
         value,
@@ -112,8 +114,8 @@ function getProviderHandlers({
       const message = msgParams.data;
       return walletClient.signMessage({
         account: smartAccount,
-        message: util.isHexString(message) ? {
-          raw: message
+        message: metadataHelpers.isHexString(message) ? {
+          raw: metadataHelpers.add0x(message)
         } : message
       });
     },

package/dist/lib.cjs/providers/account-abstraction-provider/rpc/ethRpcMiddlewares.js

@@ -46,26 +46,28 @@ async function createAaMiddleware({
       message: `Invalid parameters: must provide valid sender address.`
     });
   }
-  async function lookupAccounts(req, res) {
-    res.result = await handlers.getAccounts(req);
+  async function lookupAccounts(params) {
+    return handlers.getAccounts(params.request);
   }
-  async function fetchPrivateKey(req, res) {
+  async function fetchPrivateKey(params) {
     if (!handlers.getPrivateKey) {
       throw auth.rpcErrors.methodNotSupported();
     }
-    res.result = await handlers.getPrivateKey(req);
+    return handlers.getPrivateKey(params.request);
   }
-  async function sendTransaction(req, res) {
+  async function sendTransaction(params) {
     if (!handlers.processTransaction) {
       throw auth.rpcErrors.methodNotSupported();
     }
+    const req = params.request;
     const txParams = req.params[0] || {
       from: ""
     };
     txParams.from = await validateAndNormalizeKeyholder(txParams.from, req);
-    res.result = handlers.processTransaction(txParams, req);
+    return handlers.processTransaction(txParams, req);
   }
-  async function signTransaction(req, res) {
+  async function signTransaction(params) {
+    const req = params.request;
     const txParams = req.params[0] || {
       from: ""
     };
@@ -73,9 +75,10 @@ async function createAaMiddleware({
     if (txParams.from) {
       txParams.from = await normalizeSignSenderAddress(txParams.from, req);
     }
-    res.result = await handlers.processSignTransaction(txParams, req);
+    return handlers.processSignTransaction(txParams, req);
   }
-  async function ethSign(req, res) {
+  async function ethSign(params) {
+    const req = params.request;
     let msgParams = req.params;
     const extraParams = req.params[2] || {};
     if (Array.isArray(req.params)) {
@@ -89,9 +92,10 @@ async function createAaMiddleware({
       };
     }
     msgParams = _objectSpread(_objectSpread({}, extraParams), msgParams);
-    res.result = await handlers.processEthSignMessage(msgParams, req);
+    return handlers.processEthSignMessage(msgParams, req);
   }
-  async function signTypedDataV4(req, res) {
+  async function signTypedDataV4(params) {
+    const req = params.request;
     if (!(req !== null && req !== void 0 && req.params)) throw new Error("WalletMiddleware - missing params");
     let msgParams = req.params;
     if (Array.isArray(req.params)) {
@@ -104,9 +108,10 @@ async function createAaMiddleware({
         data: message
       };
     }
-    res.result = await handlers.processTypedMessageV4(msgParams, req);
+    return handlers.processTypedMessageV4(msgParams, req);
   }
-  async function personalSign(req, res) {
+  async function personalSign(params) {
+    const req = params.request;
     let msgParams = req.params;
     const extraParams = req.params[2] || {};
     if (Array.isArray(req.params)) {
@@ -131,61 +136,59 @@ async function createAaMiddleware({
       }
     }
     msgParams = _objectSpread(_objectSpread({}, extraParams), msgParams);
-    res.result = await handlers.processPersonalMessage(msgParams, req);
+    return handlers.processPersonalMessage(msgParams, req);
   }
-  async function fetchPublicKey(req, res) {
+  async function fetchPublicKey(params) {
     if (!handlers.getPublicKey) {
       throw auth.rpcErrors.methodNotSupported();
     }
-    res.result = await handlers.getPublicKey(req);
+    return handlers.getPublicKey(params.request);
   }
-  return auth.createScaffoldMiddleware({
+  return auth.createScaffoldMiddlewareV2({
     // account lookups
-    eth_accounts: auth.createAsyncMiddleware(lookupAccounts),
-    eth_requestAccounts: auth.createAsyncMiddleware(lookupAccounts),
-    eth_private_key: auth.createAsyncMiddleware(fetchPrivateKey),
-    private_key: auth.createAsyncMiddleware(fetchPrivateKey),
-    eth_public_key: auth.createAsyncMiddleware(fetchPublicKey),
-    public_key: auth.createAsyncMiddleware(fetchPublicKey),
+    eth_accounts: lookupAccounts,
+    eth_requestAccounts: lookupAccounts,
+    eth_private_key: fetchPrivateKey,
+    private_key: fetchPrivateKey,
+    eth_public_key: fetchPublicKey,
+    public_key: fetchPublicKey,
     // tx signatures
-    eth_sendTransaction: auth.createAsyncMiddleware(sendTransaction),
-    eth_signTransaction: auth.createAsyncMiddleware(signTransaction),
+    eth_sendTransaction: sendTransaction,
+    eth_signTransaction: signTransaction,
     // message signatures
-    eth_sign: auth.createAsyncMiddleware(ethSign),
-    eth_signTypedData_v4: auth.createAsyncMiddleware(signTypedDataV4),
-    personal_sign: auth.createAsyncMiddleware(personalSign)
+    eth_sign: ethSign,
+    eth_signTypedData_v4: signTypedDataV4,
+    personal_sign: personalSign
   });
 }
 async function createEoaMiddleware({
   aaProvider
 }) {
-  async function getAccounts(_req, res) {
+  async function getAccounts() {
     const [, eoaAddress] = await aaProvider.request({
       method: ethereumControllers.METHOD_TYPES.GET_ACCOUNTS
     });
-    res.result = [eoaAddress];
+    return [eoaAddress];
   }
-  async function requestAccounts(_req, res) {
+  async function requestAccounts() {
     const [, eoaAddress] = await aaProvider.request({
       method: ethereumControllers.METHOD_TYPES.ETH_REQUEST_ACCOUNTS
     });
-    res.result = [eoaAddress];
+    return [eoaAddress];
   }
-  return auth.createScaffoldMiddleware({
-    eth_accounts: auth.createAsyncMiddleware(getAccounts),
-    eth_requestAccounts: auth.createAsyncMiddleware(requestAccounts)
+  return auth.createScaffoldMiddlewareV2({
+    eth_accounts: getAccounts,
+    eth_requestAccounts: requestAccounts
   });
 }
 function providerAsMiddleware(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
+  }) => {
+    return provider.request({
+      method: request.method,
+      params: request.params
+    });
   };
 }
 

package/dist/lib.cjs/providers/base-provider/CommonJRPCProvider.js

@@ -25,9 +25,7 @@ class CommonJRPCProvider extends baseProvider.BaseProvider {
     const {
       networkMiddleware
     } = jrpcClient.createJsonRpcClient(chain);
-    const engine = new auth.JRPCEngine();
-    engine.push(networkMiddleware);
-    const provider = auth.providerFromEngine(engine);
+    const provider = auth.providerFromMiddlewareV2(networkMiddleware);
     this.updateProviderEngineProxy(provider);
     this.emit("chainChanged", chainId);
     this.emit("connect", {

package/dist/lib.cjs/providers/base-provider/baseProvider.js

@@ -6,15 +6,17 @@ var baseControllers = require('@toruslabs/base-controllers');
 var auth = require('@web3auth/auth');
 require('@segment/analytics-next');
 require('../../base/loglevel.js');
+require('@toruslabs/session-manager');
 var index = require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var utils = require('./utils.js');
 
 class BaseProvider extends baseControllers.BaseController {

package/dist/lib.cjs/providers/base-provider/commonPrivateKeyProvider.js

@@ -25,9 +25,10 @@ class CommonPrivateKeyProvider extends baseProvider.BaseProvider {
   }
   async setupProvider(privKey) {
     const privKeyMiddleware = this.getPrivKeyMiddleware(privKey);
-    const engine = new auth.JRPCEngine();
-    engine.push(privKeyMiddleware);
-    const provider = auth.providerFromEngine(engine);
+    const engine = auth.JRPCEngineV2.create({
+      middleware: [privKeyMiddleware]
+    });
+    const provider = auth.providerFromEngineV2(engine);
     this.updateProviderEngineProxy(provider);
   }
   async switchChain(_) {
@@ -51,15 +52,11 @@ class CommonPrivateKeyProvider extends baseProvider.BaseProvider {
   createPrivKeyMiddleware({
     getPrivatekey
   }) {
-    async function getPrivatekeyHandler(_, res) {
-      try {
-        res.result = await getPrivatekey();
-      } catch (error) {
-        res.error = error instanceof Error ? error.message : error;
-      }
+    async function getPrivatekeyHandler() {
+      return getPrivatekey();
     }
-    return auth.createScaffoldMiddleware({
-      private_key: auth.createAsyncMiddleware(getPrivatekeyHandler)
+    return auth.createScaffoldMiddlewareV2({
+      private_key: getPrivatekeyHandler
     });
   }
 }

package/dist/lib.cjs/providers/base-provider/index.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "EIP1193_EVENTS", {
 	enumerable: true,
 	get: function () { return utils.EIP1193_EVENTS; }
 });
-exports.createRandomId = utils.createRandomId;
 Object.defineProperty(exports, "getED25519Key", {
 	enumerable: true,
 	get: function () { return auth.getED25519Key; }

package/dist/lib.cjs/providers/base-provider/jrpcClient.js

@@ -4,21 +4,21 @@ var baseControllers = require('@toruslabs/base-controllers');
 var auth = require('@web3auth/auth');
 
 function createChainIdMiddleware(chainId) {
-  return (req, res, next, end) => {
-    if (req.method === "chainId") {
-      res.result = chainId;
-      return end();
-    }
-    return next();
+  return ({
+    request,
+    next
+  }) => {
+    if (request.method === "chainId") return chainId;
+    return next(request);
   };
 }
 function createProviderConfigMiddleware(providerConfig) {
-  return (req, res, next, end) => {
-    if (req.method === "provider_config") {
-      res.result = providerConfig;
-      return end();
-    }
-    return next();
+  return ({
+    request,
+    next
+  }) => {
+    if (request.method === "provider_config") return providerConfig;
+    return next(request);
   };
 }
 function createJsonRpcClient(providerConfig) {
@@ -26,16 +26,15 @@ function createJsonRpcClient(providerConfig) {
     chainId,
     rpcTarget
   } = providerConfig;
-  const fetchMiddleware = baseControllers.createFetchMiddleware({
-    rpcTarget
+  const engine = auth.JRPCEngineV2.create({
+    middleware: [createChainIdMiddleware(chainId), createProviderConfigMiddleware(providerConfig), baseControllers.createFetchMiddleware({
+      rpcTarget
+    })]
   });
-  const networkMiddleware = auth.mergeMiddleware([createChainIdMiddleware(chainId), createProviderConfigMiddleware(providerConfig), fetchMiddleware]);
+  const networkMiddleware = engine.asMiddleware();
   return {
-    networkMiddleware,
-    fetchMiddleware
+    networkMiddleware
   };
 }
 
-exports.createChainIdMiddleware = createChainIdMiddleware;
 exports.createJsonRpcClient = createJsonRpcClient;
-exports.createProviderConfigMiddleware = createProviderConfigMiddleware;

package/dist/lib.cjs/providers/base-provider/utils.js

@@ -1,9 +1,7 @@
 'use strict';
 
-var getCreateRandomId = require('json-rpc-random-id');
 var auth = require('@web3auth/auth');
 
-const createRandomId = getCreateRandomId();
 exports.EIP1193_EVENTS = void 0;
 (function (EIP1193_EVENTS) {
   EIP1193_EVENTS["ACCOUNTS_CHANGED"] = "accountsChanged";
@@ -17,4 +15,3 @@ Object.defineProperty(exports, "getED25519Key", {
     enumerable: true,
     get: function () { return auth.getED25519Key; }
 });
-exports.createRandomId = createRandomId;

package/dist/lib.cjs/providers/ethereum-provider/rpc/ethRpcMiddlewares.js

@@ -1,52 +1,39 @@
 'use strict';
 
 var auth = require('@web3auth/auth');
-var walletMidddleware = require('./walletMidddleware.js');
+var walletMiddleware = require('./walletMiddleware.js');
 
 function createEthMiddleware(providerHandlers) {
-  const {
-    getAccounts,
-    getPrivateKey,
-    getPublicKey,
-    processTransaction,
-    processSignTransaction,
-    processEthSignMessage,
-    processTypedMessageV4,
-    processPersonalMessage
-  } = providerHandlers;
-  const ethMiddleware = auth.mergeMiddleware([auth.createScaffoldMiddleware({
-    eth_syncing: false
-  }), walletMidddleware.createWalletMiddleware({
-    getAccounts,
-    getPrivateKey,
-    getPublicKey,
-    processTransaction,
-    processEthSignMessage,
-    processSignTransaction,
-    processTypedMessageV4,
-    processPersonalMessage
-  })]);
-  return ethMiddleware;
+  const engine = auth.JRPCEngineV2.create({
+    middleware: [auth.createScaffoldMiddlewareV2({
+      eth_syncing: false
+    }), walletMiddleware.createWalletMiddlewareV2(providerHandlers)]
+  });
+  return engine.asMiddleware();
 }
 function createEthChainSwitchMiddleware({
   switchChain,
   addChain
 }) {
-  async function updateChain(req, res) {
-    var _req$params;
-    const chainParams = (_req$params = req.params) !== null && _req$params !== void 0 && _req$params.length ? req.params[0] : undefined;
+  async function walletSwitchEthereumChainHandler(params) {
+    var _request$params;
+    const request = params.request;
+    const chainParams = (_request$params = request.params) !== null && _request$params !== void 0 && _request$params.length ? request.params[0] : undefined;
     if (!chainParams) throw auth.rpcErrors.invalidParams("Missing chainId");
-    res.result = await switchChain(chainParams);
+    await switchChain(chainParams);
+    return null;
   }
-  async function addChainConfig(req, res) {
-    var _req$params2;
-    const chainConfig = (_req$params2 = req.params) !== null && _req$params2 !== void 0 && _req$params2.length ? req.params[0] : undefined;
+  async function walletAddEthereumChainHandler(params) {
+    var _request$params2;
+    const request = params.request;
+    const chainConfig = (_request$params2 = request.params) !== null && _request$params2 !== void 0 && _request$params2.length ? request.params[0] : undefined;
     if (!chainConfig) throw auth.rpcErrors.invalidParams("Missing chainConfig");
-    res.result = await addChain(chainConfig);
+    await addChain(chainConfig);
+    return null;
   }
-  return auth.createScaffoldMiddleware({
-    wallet_switchEthereumChain: auth.createAsyncMiddleware(updateChain),
-    wallet_addEthereumChain: auth.createAsyncMiddleware(addChainConfig)
+  return auth.createScaffoldMiddlewareV2({
+    wallet_switchEthereumChain: walletSwitchEthereumChainHandler,
+    wallet_addEthereumChain: walletAddEthereumChainHandler
   });
 }