@web3auth/no-modal 10.0.0-alpha.0 → 10.0.0-alpha.2

package/dist/lib.cjs/providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/interfaces.js

@@ -1,10 +1,8 @@
 'use strict';
 
-let SignTypedDataVersion = /*#__PURE__*/function (SignTypedDataVersion) {
+exports.SignTypedDataVersion = void 0;
+(function (SignTypedDataVersion) {
   SignTypedDataVersion["V1"] = "V1";
   SignTypedDataVersion["V3"] = "V3";
   SignTypedDataVersion["V4"] = "V4";
-  return SignTypedDataVersion;
-}({});
-
-exports.SignTypedDataVersion = SignTypedDataVersion;
+})(exports.SignTypedDataVersion || (exports.SignTypedDataVersion = {}));

package/dist/lib.cjs/providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/utils.js

@@ -29,7 +29,6 @@ async function fetchEip1159GasEstimates(url) {
   });
   return normalizedEstimates;
 }
-
 /**
  * Hit the legacy MetaSwaps gasPrices estimate api and return the low, medium
  * high values from that API.
@@ -63,7 +62,7 @@ async function validateTypedSignMessageDataV4(messageData, currentChainId) {
   } else {
     try {
       data = JSON.parse(messageData.data);
-    } catch (e) {
+    } catch {
       throw new Error("Data must be passed as a valid JSON string.");
     }
   }

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

@@ -29,47 +29,18 @@ function createEthMiddleware(providerHandlers) {
   return ethMiddleware;
 }
 function createEthChainSwitchMiddleware({
-  addChain,
   switchChain
 }) {
-  async function addNewChain(req, res) {
+  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;
-    if (!chainParams) throw auth.rpcErrors.invalidParams("Missing chain params");
-    if (!chainParams.chainId) throw auth.rpcErrors.invalidParams("Missing chainId in chainParams");
-    if (!chainParams.rpcUrls || chainParams.rpcUrls.length === 0) throw auth.rpcErrors.invalidParams("Missing rpcUrls in chainParams");
-    if (!chainParams.nativeCurrency) throw auth.rpcErrors.invalidParams("Missing nativeCurrency in chainParams");
-    res.result = await addChain(chainParams);
-  }
-  async function updateChain(req, res) {
-    var _req$params2;
-    const chainParams = (_req$params2 = req.params) !== null && _req$params2 !== void 0 && _req$params2.length ? req.params[0] : undefined;
     if (!chainParams) throw auth.rpcErrors.invalidParams("Missing chainId");
     res.result = await switchChain(chainParams);
   }
   return auth.createScaffoldMiddleware({
-    wallet_addEthereumChain: auth.createAsyncMiddleware(addNewChain),
     wallet_switchEthereumChain: auth.createAsyncMiddleware(updateChain)
   });
 }
 
-// #region account middlewares
-function createEthAccountMiddleware({
-  updatePrivatekey
-}) {
-  async function updateAccount(req, res) {
-    var _req$params3;
-    const accountParams = (_req$params3 = req.params) !== null && _req$params3 !== void 0 && _req$params3.length ? req.params[0] : undefined;
-    if (!(accountParams !== null && accountParams !== void 0 && accountParams.privateKey)) throw auth.rpcErrors.invalidParams("Missing privateKey");
-    res.result = await updatePrivatekey(accountParams);
-  }
-  return auth.createScaffoldMiddleware({
-    wallet_updateAccount: auth.createAsyncMiddleware(updateAccount)
-  });
-}
-
-// #endregion account middlewares
-
-exports.createEthAccountMiddleware = createEthAccountMiddleware;
 exports.createEthChainSwitchMiddleware = createEthChainSwitchMiddleware;
 exports.createEthMiddleware = createEthMiddleware;

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

@@ -16,11 +16,9 @@ function createWalletMiddleware({
   if (!getAccounts) {
     throw new Error("opts.getAccounts is required");
   }
-
   //
   // utility
   //
-
   /**
    * Validates the keyholder address, and returns a normalized (i.e. lowercase)
    * copy of it.
@@ -41,19 +39,15 @@ function createWalletMiddleware({
       message: `Invalid parameters: must provide an Ethereum address.`
     });
   }
-
   //
   // account lookups
   //
-
   async function lookupAccounts(req, res) {
     res.result = await getAccounts(req);
   }
-
   //
   // transaction signatures
   //
-
   async function sendTransaction(req, res) {
     if (!processTransaction) {
       throw auth.rpcErrors.methodNotSupported();
@@ -74,11 +68,9 @@ function createWalletMiddleware({
     txParams.from = await validateAndNormalizeKeyholder(txParams.from, req);
     res.result = await processSignTransaction(txParams, req);
   }
-
   //
   // message signatures
   //
-
   async function ethSign(req, res) {
     if (!processEthSignMessage) {
       throw auth.rpcErrors.methodNotSupported();

package/dist/lib.cjs/providers/solana-provider/providers/injectedProviders/base/baseInjectedProvider.js

@@ -2,9 +2,22 @@
 
 var auth = require('@web3auth/auth');
 var index = require('../../../../../base/errors/index.js');
+require('@toruslabs/base-controllers');
+require('@babel/runtime/helpers/defineProperty');
+require('../../../../../base/wallet/index.js');
+require('../../../../../base/connector/constants.js');
+require('jwt-decode');
+require('../../../../../base/loglevel.js');
+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');
+require('../../../../base-provider/utils.js');
 var JrpcClient = require('../../../rpc/JrpcClient.js');
 var solanaRpcMiddlewares = require('../../../rpc/solanaRpcMiddlewares.js');
-var baseProvider = require('../../../../base-provider/baseProvider.js');
 
 class BaseInjectedProvider extends baseProvider.BaseProvider {
   constructor({
@@ -17,14 +30,15 @@ class BaseInjectedProvider extends baseProvider.BaseProvider {
     });
   }
   async switchChain(_) {
-    throw index.WalletLoginError.unsupportedOperation("Chain switching is not supported by this adapter");
+    throw index.WalletLoginError.unsupportedOperation("Chain switching is not supported by this connector");
   }
-  async setupProvider(injectedProvider) {
+  async setupProvider(injectedProvider, chainId) {
     const engine = new auth.JRPCEngine();
+    const chain = this.getChain(chainId);
     const providerHandlers = this.getProviderHandlers(injectedProvider);
     const solanaMiddleware = solanaRpcMiddlewares.createSolanaMiddleware(providerHandlers);
     engine.push(solanaMiddleware);
-    const configMiddleware = JrpcClient.createConfigMiddleware(this.config.chainConfig);
+    const configMiddleware = JrpcClient.createConfigMiddleware(chain);
     engine.push(configMiddleware);
     const injectedProviderProxy = this.getInjectedProviderProxy(injectedProvider);
     if (injectedProviderProxy) {
@@ -32,16 +46,13 @@ class BaseInjectedProvider extends baseProvider.BaseProvider {
     }
     const provider = auth.providerFromEngine(engine);
     this.updateProviderEngineProxy(provider);
-    await this.lookupNetwork();
+    await this.lookupNetwork(injectedProvider, chainId);
   }
-  async lookupNetwork() {
-    const {
-      chainConfig
-    } = this.config;
+  async lookupNetwork(_injectedProvider, chainId) {
     this.update({
-      chainId: chainConfig.chainId
+      chainId
     });
-    return chainConfig.chainId || "";
+    return chainId || "";
   }
   getInjectedProviderProxy(_) {
     return undefined;

package/dist/lib.cjs/providers/solana-provider/providers/injectedProviders/base/providerHandlers.js

@@ -1,17 +1,17 @@
 'use strict';
 
+var bs58 = require('@toruslabs/bs58');
 var auth = require('@web3auth/auth');
-var bs58 = require('bs58');
 
 const getBaseProviderHandlers = injectedProvider => {
   const providerHandlers = {
     requestAccounts: async () => {
-      return injectedProvider.publicKey ? [bs58.encode(injectedProvider.publicKey.toBytes())] : [];
+      return injectedProvider.publicKey ? [bs58.bs58.encode(injectedProvider.publicKey.toBytes())] : [];
     },
     getPublicKey: async () => {
-      return injectedProvider.publicKey ? bs58.encode(injectedProvider.publicKey.toBytes()) : "";
+      return injectedProvider.publicKey ? bs58.bs58.encode(injectedProvider.publicKey.toBytes()) : "";
     },
-    getAccounts: async () => injectedProvider.publicKey ? [bs58.encode(injectedProvider.publicKey.toBytes())] : [],
+    getAccounts: async () => injectedProvider.publicKey ? [bs58.bs58.encode(injectedProvider.publicKey.toBytes())] : [],
     getPrivateKey: async () => {
       throw auth.rpcErrors.methodNotSupported();
     },
@@ -23,8 +23,8 @@ const getBaseProviderHandlers = injectedProvider => {
       return transaction;
     },
     signMessage: async req => {
-      const sigData = await injectedProvider.signMessage(req.params.message, req.params.display);
-      return sigData.signature;
+      const sigData = await injectedProvider.signMessage(req.params.data, req.params.from, req.params.display);
+      return sigData;
     },
     signAllTransactions: async req => {
       var _req$params, _req$params2;
@@ -36,9 +36,7 @@ const getBaseProviderHandlers = injectedProvider => {
     },
     signAndSendTransaction: async req => {
       const txRes = await injectedProvider.signAndSendTransaction(req.params.message);
-      return {
-        signature: txRes.signature
-      };
+      return txRes;
     }
   };
   return providerHandlers;

package/dist/lib.cjs/providers/solana-provider/providers/injectedProviders/walletStandardProvider.js

@@ -1,11 +1,99 @@
 'use strict';
 
+var walletStandardFeatures = require('@solana/wallet-standard-features');
+var web3_js = require('@solana/web3.js');
+var bs58 = require('@toruslabs/bs58');
+var index = require('../../../../base/errors/index.js');
+require('@toruslabs/base-controllers');
+require('@babel/runtime/helpers/defineProperty');
+require('@web3auth/auth');
+require('../../../../base/wallet/index.js');
+require('../../../../base/connector/constants.js');
+require('jwt-decode');
+require('../../../../base/loglevel.js');
+require('../../../../base/plugin/errors.js');
+require('../../../../base/plugin/IPlugin.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
 var baseInjectedProvider = require('./base/baseInjectedProvider.js');
 var providerHandlers = require('./base/providerHandlers.js');
+var utils = require('./utils.js');
 
 class WalletStandardProvider extends baseInjectedProvider.BaseInjectedProvider {
-  getProviderHandlers(injectedProvider) {
-    return providerHandlers.getBaseProviderHandlers(injectedProvider);
+  getProviderHandlers(wallet) {
+    const chainIdentifier = utils.getSolanaChainByChainConfig(this.config.chain);
+    const currentAccount = () => {
+      const account = wallet === null || wallet === void 0 ? void 0 : wallet.accounts[0];
+      if (!account) throw index.WalletLoginError.notConnectedError();
+      return account;
+    };
+    /**
+     * Signs a message and returns the signature
+     * @param message - The message to sign
+     * @returns The signature of the message encoded in base58
+     */
+    const signMessage = async message => {
+      const account = currentAccount();
+      const uint8ArrayMessage = new Uint8Array(Buffer.from(message, "utf-8"));
+      const signature = await wallet.features[walletStandardFeatures.SolanaSignMessage].signMessage({
+        account,
+        message: uint8ArrayMessage
+      });
+      return bs58.bs58.encode(signature[0].signature);
+    };
+    /**
+     * Signs a transaction and returns the signature
+     * @param transaction - The transaction to sign
+     * @returns The signature of the transaction encoded in base58
+     */
+    const signTransaction = async transaction => {
+      const account = currentAccount();
+      const output = await wallet.features[walletStandardFeatures.SolanaSignTransaction].signTransaction({
+        account,
+        transaction: new Uint8Array(Buffer.from(transaction, "base64")),
+        chain: chainIdentifier
+      });
+      return bs58.bs58.encode(web3_js.VersionedTransaction.deserialize(output[0].signedTransaction).signatures[0]);
+    };
+    /**
+     * Signs multiple transactions and returns the serialized transactions
+     * @param transactions - The transactions to sign
+     * @returns The serialized transactions encoded in base64
+     */
+    const signAllTransactions = async transactions => {
+      const account = currentAccount();
+      return Promise.all(transactions.map(async transaction => {
+        const output = await wallet.features[walletStandardFeatures.SolanaSignTransaction].signTransaction({
+          account,
+          transaction: new Uint8Array(Buffer.from(transaction, "base64")),
+          chain: chainIdentifier
+        });
+        return Buffer.from(output[0].signedTransaction).toString("base64");
+      }));
+    };
+    /**
+     * Signs a transaction and sends it to the network
+     * @param transaction - The transaction to sign and send
+     * @returns The signature of the transaction encoded in base58
+     */
+    const signAndSendTransaction = async transaction => {
+      const account = currentAccount();
+      const output = await wallet.features[walletStandardFeatures.SolanaSignAndSendTransaction].signAndSendTransaction({
+        account,
+        transaction: new Uint8Array(Buffer.from(transaction, "base64")),
+        chain: chainIdentifier
+      });
+      return bs58.bs58.encode(output[0].signature);
+    };
+    return providerHandlers.getBaseProviderHandlers({
+      get publicKey() {
+        return new web3_js.PublicKey(currentAccount().publicKey);
+      },
+      signMessage,
+      signTransaction,
+      signAllTransactions,
+      signAndSendTransaction
+    });
   }
 }
 

package/dist/lib.cjs/providers/solana-provider/providers/privateKeyProvider/solanaPrivateKeyProvider.js

@@ -2,12 +2,23 @@
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var auth = require('@web3auth/auth');
-var IChainInterface = require('../../../../base/chain/IChainInterface.js');
 var index = require('../../../../base/errors/index.js');
+var baseControllers = require('@toruslabs/base-controllers');
+require('../../../../base/wallet/index.js');
+require('../../../../base/connector/constants.js');
+require('jwt-decode');
+require('../../../../base/loglevel.js');
+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');
+require('../../../base-provider/utils.js');
 var JrpcClient = require('../../rpc/JrpcClient.js');
 var solanaRpcMiddlewares = require('../../rpc/solanaRpcMiddlewares.js');
 var solanaPrivateKeyUtils = require('./solanaPrivateKeyUtils.js');
-var baseProvider = require('../../../base-provider/baseProvider.js');
 
 var _SolanaPrivateKeyProvider;
 class SolanaPrivateKeyProvider extends baseProvider.BaseProvider {
@@ -19,14 +30,14 @@ class SolanaPrivateKeyProvider extends baseProvider.BaseProvider {
       config,
       state
     });
-    _defineProperty(this, "PROVIDER_CHAIN_NAMESPACE", IChainInterface.CHAIN_NAMESPACES.SOLANA);
+    _defineProperty(this, "PROVIDER_CHAIN_NAMESPACE", baseControllers.CHAIN_NAMESPACES.SOLANA);
   }
   async enable() {
     if (!this.state.privateKey) throw auth.providerErrors.custom({
       message: "Private key is not found in state, plz pass it in constructor state param",
       code: 4902
     });
-    await this.setupProvider(this.state.privateKey);
+    await this.setupProvider(this.state.privateKey, this.chainId);
     return this._providerEngineProxy.request({
       method: "eth_accounts"
     });
@@ -34,10 +45,11 @@ class SolanaPrivateKeyProvider extends baseProvider.BaseProvider {
   getEd25519Key(privateKey) {
     return auth.getED25519Key(privateKey).sk.toString("hex").padStart(128, "0");
   }
-  async setupProvider(privKey) {
+  async setupProvider(privKey, chainId) {
+    const chain = this.getChain(chainId);
     const {
       chainNamespace
-    } = this.config.chainConfig;
+    } = chain;
     if (chainNamespace !== this.PROVIDER_CHAIN_NAMESPACE) throw index.WalletInitializationError.incompatibleChainNameSpace("Invalid chain namespace");
     const providerHandlers = await solanaPrivateKeyUtils.getProviderHandlers({
       privKey,
@@ -48,14 +60,21 @@ class SolanaPrivateKeyProvider extends baseProvider.BaseProvider {
     const engine = new auth.JRPCEngine();
     const {
       networkMiddleware
-    } = JrpcClient.createSolanaJsonRpcClient(this.config.chainConfig);
+    } = JrpcClient.createSolanaJsonRpcClient(chain);
     engine.push(this.getChainSwitchMiddleware());
     engine.push(this.getAccountMiddleware());
     engine.push(solanaMiddleware);
     engine.push(networkMiddleware);
     const provider = auth.providerFromEngine(engine);
     this.updateProviderEngineProxy(provider);
-    await this.lookupNetwork();
+    await this.lookupNetwork(chainId);
+    this.emit("chainChanged", chainId);
+    this.emit("connect", {
+      chainId
+    });
+    this.update({
+      chainId
+    });
   }
   async updateAccount(params) {
     if (!this._providerEngineProxy) throw auth.providerErrors.custom({
@@ -66,7 +85,7 @@ class SolanaPrivateKeyProvider extends baseProvider.BaseProvider {
       method: "solanaPrivateKey"
     });
     if (existingKey !== params.privateKey) {
-      await this.setupProvider(params.privateKey);
+      await this.setupProvider(params.privateKey, this.chainId);
       const accounts = await this._providerEngineProxy.request({
         method: "requestAccounts"
       });
@@ -78,19 +97,17 @@ class SolanaPrivateKeyProvider extends baseProvider.BaseProvider {
       message: "Provider is not initialized",
       code: 4902
     });
-    const chainConfig = this.getChainConfig(params.chainId);
+    const newChainId = params.chainId;
+    if (this.chainId === newChainId) return;
     this.update({
       chainId: "loading"
     });
-    this.configure({
-      chainConfig
-    });
     const privKey = await this._providerEngineProxy.request({
       method: "solanaPrivateKey"
     });
-    await this.setupProvider(privKey);
+    await this.setupProvider(privKey, newChainId);
   }
-  async lookupNetwork() {
+  async lookupNetwork(chainId) {
     if (!this._providerEngineProxy) throw auth.providerErrors.custom({
       message: "Provider is not initialized",
       code: 4902
@@ -99,48 +116,11 @@ class SolanaPrivateKeyProvider extends baseProvider.BaseProvider {
       method: "getHealth",
       params: []
     });
-    const {
-      chainConfig
-    } = this.config;
-    if (health !== "ok") throw index.WalletInitializationError.rpcConnectionError(`Failed to lookup network for following rpc target: ${chainConfig.rpcTarget}`);
-    this.update({
-      chainId: chainConfig.chainId
-    });
-    if (this.state.chainId !== chainConfig.chainId) {
-      this.emit("chainChanged", this.state.chainId);
-      this.emit("connect", {
-        chainId: this.state.chainId
-      });
-    }
-    return this.state.chainId;
+    const chain = this.getChain(chainId);
+    if (health !== "ok") throw index.WalletInitializationError.rpcConnectionError(`Failed to lookup network for following rpc target: ${chain.rpcTarget}`);
   }
   getChainSwitchMiddleware() {
     const chainSwitchHandlers = {
-      addNewChainConfig: async req => {
-        if (!req.params) throw auth.rpcErrors.invalidParams("Missing request params");
-        const {
-          chainId,
-          chainName,
-          rpcUrls,
-          blockExplorerUrls,
-          nativeCurrency,
-          iconUrls
-        } = req.params;
-        if (!chainId) throw auth.rpcErrors.invalidParams("Missing chainId in chainParams");
-        if (!rpcUrls || rpcUrls.length === 0) throw auth.rpcErrors.invalidParams("Missing rpcUrls in chainParams");
-        if (!nativeCurrency) throw auth.rpcErrors.invalidParams("Missing nativeCurrency in chainParams");
-        this.addChain({
-          chainNamespace: IChainInterface.CHAIN_NAMESPACES.SOLANA,
-          chainId,
-          ticker: (nativeCurrency === null || nativeCurrency === void 0 ? void 0 : nativeCurrency.symbol) || "SOL",
-          tickerName: (nativeCurrency === null || nativeCurrency === void 0 ? void 0 : nativeCurrency.name) || "Solana",
-          displayName: chainName,
-          rpcTarget: rpcUrls[0],
-          blockExplorerUrl: (blockExplorerUrls === null || blockExplorerUrls === void 0 ? void 0 : blockExplorerUrls[0]) || "",
-          decimals: (nativeCurrency === null || nativeCurrency === void 0 ? void 0 : nativeCurrency.decimals) || 9,
-          logo: (iconUrls === null || iconUrls === void 0 ? void 0 : iconUrls[0]) || "https://images.toruswallet.io/sol.svg"
-        });
-      },
       switchSolanaChain: async req => {
         if (!req.params) throw auth.rpcErrors.invalidParams("Missing request params");
         if (!req.params.chainId) throw auth.rpcErrors.invalidParams("Missing chainId");
@@ -170,10 +150,11 @@ _SolanaPrivateKeyProvider = SolanaPrivateKeyProvider;
 _defineProperty(SolanaPrivateKeyProvider, "getProviderInstance", async params => {
   const providerFactory = new _SolanaPrivateKeyProvider({
     config: {
-      chainConfig: params.chainConfig
+      chain: params.chain,
+      chains: params.chains
     }
   });
-  await providerFactory.setupProvider(params.privKey);
+  await providerFactory.setupProvider(params.privKey, params.chain.chainId);
   return providerFactory;
 });
 

package/dist/lib.cjs/providers/solana-provider/providers/privateKeyProvider/solanaPrivateKeyUtils.js

@@ -1,10 +1,20 @@
 'use strict';
 
 var web3_js = require('@solana/web3.js');
+var bs58 = require('@toruslabs/bs58');
 var tweetnaclJs = require('@toruslabs/tweetnacl-js');
 var auth = require('@web3auth/auth');
-var bs58 = require('bs58');
 var index = require('../../../../base/errors/index.js');
+require('@toruslabs/base-controllers');
+require('@babel/runtime/helpers/defineProperty');
+require('../../../../base/wallet/index.js');
+require('../../../../base/connector/constants.js');
+require('jwt-decode');
+require('../../../../base/loglevel.js');
+require('../../../../base/plugin/errors.js');
+require('../../../../base/plugin/IPlugin.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
 
 async function getProviderHandlers({
   privKey,
@@ -31,27 +41,24 @@ async function getProviderHandlers({
       }
       return privKey;
     },
-    getSecretKey: async () => bs58.encode(keyPair.secretKey),
+    getSecretKey: async () => bs58.bs58.encode(keyPair.secretKey),
     signTransaction: async req => {
       var _req$params;
       if (!((_req$params = req.params) !== null && _req$params !== void 0 && _req$params.message)) {
         throw auth.rpcErrors.invalidParams("message");
       }
-      const transaction = req.params.message;
-      if (transaction.version !== undefined || transaction instanceof web3_js.VersionedTransaction) {
-        transaction.sign([keyPair]);
-      } else {
-        transaction.partialSign(keyPair);
-      }
-      return transaction;
+      const serializedTransaction = req.params.message;
+      const transaction = web3_js.VersionedTransaction.deserialize(Buffer.from(serializedTransaction, "base64"));
+      transaction.sign([keyPair]);
+      return bs58.bs58.encode(transaction.signatures[0]);
     },
     signMessage: async req => {
       var _req$params2;
-      if (!((_req$params2 = req.params) !== null && _req$params2 !== void 0 && _req$params2.message)) {
-        throw auth.rpcErrors.invalidParams("message");
+      if (!((_req$params2 = req.params) !== null && _req$params2 !== void 0 && _req$params2.data)) {
+        throw auth.rpcErrors.invalidParams("data");
       }
-      const signedMsg = tweetnaclJs.sign.detached(req.params.message, keyPair.secretKey);
-      return signedMsg;
+      const signedMsg = tweetnaclJs.sign.detached(Buffer.from(req.params.data, "utf-8"), keyPair.secretKey);
+      return bs58.bs58.encode(signedMsg);
     },
     signAndSendTransaction: async req => {
       var _req$params3;
@@ -63,12 +70,9 @@ async function getProviderHandlers({
         message: "Provider is not initialized",
         code: 4902
       });
-      const transaction = req.params.message;
-      if (transaction.version !== undefined || transaction instanceof web3_js.VersionedTransaction) {
-        transaction.sign([keyPair]);
-      } else {
-        transaction.partialSign(keyPair);
-      }
+      const serializedTransaction = req.params.message;
+      const transaction = web3_js.VersionedTransaction.deserialize(Buffer.from(serializedTransaction, "base64"));
+      transaction.sign([keyPair]);
       const sig = await _providerEngineProxy.request({
         method: "sendTransaction",
         params: [Buffer.from(transaction.serialize()).toString("base64"), {
@@ -76,9 +80,7 @@ async function getProviderHandlers({
           preflightCommitment: "confirmed"
         }]
       });
-      return {
-        signature: sig
-      };
+      return sig;
     },
     signAllTransactions: async req => {
       var _req$params4, _req$params5, _req$params6;
@@ -86,15 +88,14 @@ async function getProviderHandlers({
         throw auth.rpcErrors.invalidParams("message");
       }
       const txns = (_req$params6 = req.params) === null || _req$params6 === void 0 ? void 0 : _req$params6.message;
+      const res = [];
       for (const tx of txns || []) {
-        const transaction = tx;
-        if (transaction.version !== undefined || transaction instanceof web3_js.VersionedTransaction) {
-          transaction.sign([keyPair]);
-        } else {
-          transaction.partialSign(keyPair);
-        }
+        const serializedTransaction = tx;
+        const transaction = web3_js.VersionedTransaction.deserialize(Buffer.from(serializedTransaction, "base64"));
+        transaction.sign([keyPair]);
+        res.push(Buffer.from(transaction.serialize()).toString("base64"));
       }
-      return txns;
+      return res;
     }
   };
   return providerHandlers;

package/dist/lib.cjs/providers/solana-provider/rpc/solanaRpcMiddlewares.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var auth = require('@web3auth/auth');
+var wsEmbed = require('@web3auth/ws-embed');
 
 function createGetAccountsMiddleware({
   getAccounts
@@ -9,7 +10,7 @@ function createGetAccountsMiddleware({
     const {
       method
     } = request;
-    if (method !== "getAccounts") return next();
+    if (method !== wsEmbed.SOLANA_METHOD_TYPES.GET_ACCOUNTS) return next();
     if (!getAccounts) throw new Error("WalletMiddleware - opts.getAccounts not provided");
     // This calls from the prefs controller
     const accounts = await getAccounts(request);
@@ -38,7 +39,7 @@ function createRequestAccountsMiddleware({
     const {
       method
     } = request;
-    if (method !== "requestAccounts") return next();
+    if (method !== wsEmbed.SOLANA_METHOD_TYPES.SOLANA_REQUEST_ACCOUNTS) return next();
     if (!requestAccounts) throw new Error("WalletMiddleware - opts.requestAccounts not provided");
     // This calls the UI login function
     const accounts = await requestAccounts(request);
@@ -74,13 +75,12 @@ function createSolanaMiddleware(providerHandlers) {
     requestAccounts
   }), createGetAccountsMiddleware({
     getAccounts
-  }), createGenericJRPCMiddleware("signTransaction", signTransaction), createGenericJRPCMiddleware("signAndSendTransaction", signAndSendTransaction), createGenericJRPCMiddleware("signAllTransactions", signAllTransactions), createGenericJRPCMiddleware("signMessage", signMessage), createGenericJRPCMiddleware("solanaPrivateKey", getPrivateKey), createGenericJRPCMiddleware("private_key", getPrivateKey), createGenericJRPCMiddleware("public_key", getPublicKey), createGenericJRPCMiddleware("solanaPublicKey", getPublicKey), createGenericJRPCMiddleware("solanaSecretKey", getSecretKey)]);
+  }), createGenericJRPCMiddleware(wsEmbed.SOLANA_METHOD_TYPES.SIGN_TRANSACTION, signTransaction), createGenericJRPCMiddleware(wsEmbed.SOLANA_METHOD_TYPES.SEND_TRANSACTION, signAndSendTransaction), createGenericJRPCMiddleware(wsEmbed.SOLANA_METHOD_TYPES.SIGN_ALL_TRANSACTIONS, signAllTransactions), createGenericJRPCMiddleware(wsEmbed.SOLANA_METHOD_TYPES.SIGN_MESSAGE, signMessage), createGenericJRPCMiddleware("solanaPrivateKey", getPrivateKey), createGenericJRPCMiddleware("private_key", getPrivateKey), createGenericJRPCMiddleware("public_key", getPublicKey), createGenericJRPCMiddleware("solanaPublicKey", getPublicKey), createGenericJRPCMiddleware("solanaSecretKey", getSecretKey)]);
 }
 function createSolanaChainSwitchMiddleware({
-  addNewChainConfig,
   switchSolanaChain
 }) {
-  return auth.mergeMiddleware([createGenericJRPCMiddleware("addSolanaChain", addNewChainConfig), createGenericJRPCMiddleware("switchSolanaChain", switchSolanaChain)]);
+  return auth.mergeMiddleware([createGenericJRPCMiddleware("switchSolanaChain", switchSolanaChain)]);
 }
 function createSolanaAccountMiddleware({
   updatePrivatekey