@rango-dev/provider-walletconnect-2 0.16.0 → 0.16.1-next.0

package/dist/session.d.ts

@@ -1,6 +1,7 @@
 import type { ConnectParams, CreateSessionParams, WCInstance } from './types';
 import type { SignClient } from '@walletconnect/sign-client/dist/types/client';
 import type { PairingTypes, SessionTypes, SignClientTypes } from '@walletconnect/types';
+import type { BlockchainMeta } from 'rango-types/lib';
 export declare function getLastSession(client: SignClient): SessionTypes.Struct;
 /**
  *
@@ -31,7 +32,10 @@ export declare function tryGetPairing(client: SignClient): PairingTypes.Struct |
  * Try to restore the session first, if couldn't, create a new session by showing a modal.
  *
  */
-export declare function tryConnect(client: SignClient, params: ConnectParams): Promise<SessionTypes.Struct>;
+export declare function tryConnect(client: SignClient, params: ConnectParams): Promise<{
+    session: SessionTypes.Struct;
+    isNew: boolean;
+}>;
 /**
  * Wallet connect is a multichain protocol and we can not determine the connected wallet
  * supports which wallet, `extend`ing session doesn't work during a bug in their utils packages.
@@ -50,7 +54,7 @@ export declare function cleanupSingleSession(client: SignClient, topic: string):
  *
  */
 export declare function disconnectSessions(client: SignClient): Promise<void[]>;
-export declare function getAccountsFromSession(session: SessionTypes.Struct): {
+export declare function getAccountsFromSession(session: SessionTypes.Struct, chainId?: string): {
     accounts: string[];
     chainId: string;
 }[];
@@ -60,4 +64,8 @@ export declare function getAccountsFromEvent(event: SignClientTypes.BaseEventArg
     accounts: string[];
     chainId: string;
 }[];
+export declare function updateSessionAccounts(instance: any, requestedNetwork: string, currentNetwork: string, meta: BlockchainMeta[]): Promise<void>;
+export declare function needSessionRecreateOnSwitchNetwork(instance: any): boolean;
+export declare function persistCurrentChainId(instance: any, chainId: string): any;
+export declare function getPersistedChainId(instance: any): Promise<any>;
 //# sourceMappingURL=session.d.ts.map

package/dist/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAe9B,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,uBAEhD;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,YAAY,CAAC,MAAM,GAC3B,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC,CAW1C;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CA+C9B;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,UAAU,GACjB,YAAY,CAAC,MAAM,GAAG,SAAS,CAMjC;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAkC9B;AAED;;;;GAIG;AACH,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CA0B9B;AAoBD;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAiB3E;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,UAAU,mBAwB1D;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM;;;IAkBlE;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,eAAe,CAAC,aAAa,CAAC;IACnC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC;CACrC,CAAC;;;IAeH"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAiBtD,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,uBAEhD;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,YAAY,CAAC,MAAM,GAC3B,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC,CAW1C;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CA+C9B;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,UAAU,GACjB,YAAY,CAAC,MAAM,GAAG,SAAS,CAMjC;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAoC3D;AAED;;;;GAIG;AACH,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CA0B9B;AAoBD;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAiB3E;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,UAAU,mBAwB1D;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,YAAY,CAAC,MAAM,EAC5B,OAAO,CAAC,EAAE,MAAM;;;IAgCjB;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,eAAe,CAAC,aAAa,CAAC;IACnC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC;CACrC,CAAC;;;IAeH;AAMD,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,GAAG,EACb,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,cAAc,EAAE,iBA8CvB;AAMD,wBAAgB,kCAAkC,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAIzE;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,OAInE;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,GAAG,gBAGtD"}

package/dist/signers/evm.d.ts

@@ -6,6 +6,7 @@ declare class EVMSigner implements GenericSigner<EvmTransaction> {
     private client;
     private session;
     constructor(client: SignClient, session: SessionTypes.Struct);
+    static buildTx(evmTx: EvmTransaction, disableV2?: boolean): {};
     signMessage(msg: string, address: string, chainId: string | null): Promise<string>;
     signAndSendTx(tx: EvmTransaction, address: string, chainId: string | null): Promise<{
         hash: string;

package/dist/signers/evm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../src/signers/evm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAK/D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,cAAM,SAAU,YAAW,aAAa,CAAC,cAAc,CAAC;IACtD,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,OAAO,CAAsB;gBAEzB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM;IAK/C,WAAW,CACtB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC,MAAM,CAAC;IAqCZ,aAAa,CACjB,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAsB5B,OAAO,CAAC,iCAAiC;CAwD1C;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../src/signers/evm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAK/D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,cAAM,SAAU,YAAW,aAAa,CAAC,cAAc,CAAC;IACtD,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,OAAO,CAAsB;gBAEzB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM;IAK5D,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,UAAQ;IAoC1C,WAAW,CACtB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC,MAAM,CAAC;IAqCZ,aAAa,CACjB,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAuB5B,OAAO,CAAC,iCAAiC;CAwD1C;AAED,eAAe,SAAS,CAAC"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@rango-dev/provider-walletconnect-2",
-  "version": "0.16.0",
+  "version": "0.16.1-next.0",
   "license": "MIT",
   "type": "module",
-  "module": "./dist/index.js",
+  "source": "./src/index.ts",
   "main": "./dist/index.js",
   "exports": {
     ".": "./dist/index.js"
@@ -15,6 +15,7 @@
   ],
   "scripts": {
     "build": "node ../../scripts/build/command.mjs --path wallets/provider-walletconnect-2",
+    "ts-check": "tsc --declaration --emitDeclarationOnly -p ./tsconfig.json",
     "clean": "rimraf dist",
     "format": "prettier --write '{.,src}/**/*.{ts,tsx}'",
     "lint": "eslint \"**/*.{ts,tsx}\" --ignore-path ../../.eslintignore"
@@ -23,24 +24,24 @@
     "@cosmjs/launchpad": "^0.27.1",
     "@keplr-wallet/cosmos": "^0.9.12",
     "@keplr-wallet/simple-fetch": "^0.12.14",
-    "@rango-dev/signer-cosmos": "^0.23.0",
-    "@rango-dev/signer-evm": "^0.23.0",
-    "@rango-dev/signer-solana": "^0.23.0",
-    "@rango-dev/wallets-shared": "^0.23.0",
-    "@solana/web3.js": "^1.67.2",
-    "@walletconnect/encoding": "^1.0.2",
-    "@walletconnect/modal": "^2.6.1",
-    "@walletconnect/sign-client": "^2.9.1",
-    "@walletconnect/utils": "^2.9.1",
+    "@rango-dev/signer-cosmos": "^0.23.1-next.0",
+    "@rango-dev/signer-evm": "^0.23.1-next.0",
+    "@rango-dev/signer-solana": "^0.23.1-next.0",
+    "@rango-dev/wallets-shared": "^0.23.1-next.0",
+    "@solana/web3.js": "1.67.2",
+    "@walletconnect/encoding": "1.0.2",
+    "@walletconnect/modal": "2.6.1",
+    "@walletconnect/sign-client": "2.9.1",
+    "@walletconnect/utils": "2.9.1",
     "bs58": "^5.0.0",
     "caip": "^1.1.0",
     "cosmos-wallet": "^1.2.0",
-    "rango-types": "^0.1.47"
+    "rango-types": "^0.1.57"
   },
   "devDependencies": {
-    "@walletconnect/types": "^2.9.1"
+    "@walletconnect/types": "2.9.1"
   },
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/constants.ts

@@ -13,6 +13,8 @@ export enum NAMESPACES {
   MULTIVERSX = 'multiversx',
 }
 
+export const CHAIN_ID_STORAGE = 'wc@2:client//namespaces';
+
 // Refrence: https://docs.walletconnect.com/2.0/advanced/rpc-reference/solana-rpc
 export enum SolanaRPCMethods {
   GET_ACCOUNTS = 'solana_getAccounts',
@@ -36,6 +38,9 @@ export enum EthereumRPCMethods {
   SIGN_TRANSACTION = 'eth_signTransaction',
   SEND_TRANSACTION = 'eth_sendTransaction',
   SEND_RAW_TRANSACTION = 'eth_sendRawTransaction',
+  SWITCH_CHAIN = 'wallet_switchEthereumChain',
+  ADD_CHAIN = 'wallet_addEthereumChain',
+  GET_CHAIN = 'eth_chainId',
 }
 
 export enum StarknetRPCMethods {
@@ -57,11 +62,16 @@ export const DEFAULT_ETHEREUM_METHODS = [
   EthereumRPCMethods.PERSONAL_SIGN,
   EthereumRPCMethods.SEND_TRANSACTION,
   EthereumRPCMethods.SIGN_TRANSACTION,
+  EthereumRPCMethods.SWITCH_CHAIN,
+  EthereumRPCMethods.ADD_CHAIN,
+  EthereumRPCMethods.GET_CHAIN,
 ];
+
 export const DEFAULT_SOLANA_METHODS = [
   SolanaRPCMethods.SIGN_TRANSACTION,
   SolanaRPCMethods.SIGN_MESSAGE,
 ];
+
 export const DEFAULT_COSMOS_METHODS = [
   CosmosRPCMethods.GET_ACCOUNTS,
   CosmosRPCMethods.SIGN_AMINO,
@@ -73,10 +83,9 @@ export const DEFAULT_SOLANA_CHAIN_ID = '4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ';
 
 export const DEFAULT_APP_METADATA = {
   name: 'Rango Exchange',
-  description:
-    'Easiest DEX UX with best price to exchange all coins on all blockchains.',
+  description: 'The Ultimate Cross-Chain Solution',
   url: 'https://app.rango.exchange/',
-  icons: ['https://avatars.githubusercontent.com/u/37784886'],
+  icons: ['https://app.rango.exchange/logo-rounded.png'],
 };
 
 export const RELAY_URL = 'wss://relay.walletconnect.com';

package/src/helpers.ts

@@ -3,10 +3,18 @@ import type { WalletState } from '@rango-dev/wallets-shared';
 import type { ProposalTypes } from '@walletconnect/types';
 import type { BlockchainMeta } from 'rango-types';
 
-import { Networks } from '@rango-dev/wallets-shared';
+import {
+  convertEvmBlockchainMetaToEvmChainInfo,
+  isEvmAddress,
+  Networks,
+} from '@rango-dev/wallets-shared';
 import { WalletConnectModal } from '@walletconnect/modal';
-import { ChainId } from 'caip';
-import { cosmosBlockchains, evmBlockchains } from 'rango-types';
+import { AccountId, ChainId } from 'caip';
+import {
+  cosmosBlockchains,
+  evmBlockchains,
+  isEvmBlockchain,
+} from 'rango-types';
 
 import {
   DEFAULT_COSMOS_METHODS,
@@ -14,6 +22,7 @@ import {
   DEFAULT_ETHEREUM_METHODS,
   DEFAULT_SOLANA_CHAIN_ID,
   DEFAULT_SOLANA_METHODS,
+  EthereumRPCMethods,
   NAMESPACES,
 } from './constants';
 import { getLastSession } from './session';
@@ -192,3 +201,84 @@ export function getChainIdByNetworkName(
 
   return chainId;
 }
+
+export async function switchOrAddEvmChain(
+  meta: BlockchainMeta[],
+  requestedNetwork: string,
+  currentNetwork: string,
+  instance: any
+) {
+  const evmBlockchains = meta.filter(isEvmBlockchain);
+  const evmNetworksChainInfo =
+    convertEvmBlockchainMetaToEvmChainInfo(evmBlockchains);
+  const targetChain = evmNetworksChainInfo[requestedNetwork];
+  const targetBlockchain = meta.find(
+    (blockchain: BlockchainMeta) => blockchain.name === requestedNetwork
+  );
+  const chainIdInHex = targetBlockchain?.chainId;
+
+  const currentChainId = getChainIdByNetworkName(currentNetwork, meta);
+  const currentChainEip = ChainId.format({
+    namespace: NAMESPACES.ETHEREUM,
+    reference: String(currentChainId),
+  });
+
+  const session = instance.session;
+
+  try {
+    await instance.client.request({
+      topic: session.topic,
+      request: {
+        method: EthereumRPCMethods.SWITCH_CHAIN,
+        params: [
+          {
+            chainId: chainIdInHex,
+          },
+        ],
+      },
+      // It's required to pass current chain, otherwise it won't work
+      chainId: currentChainEip,
+    });
+  } catch (err: any) {
+    const addChainError = 4902;
+    if (
+      err?.code === addChainError ||
+      err?.message?.includes(String(addChainError))
+    ) {
+      await instance.client.request({
+        topic: session.topic,
+        request: {
+          method: EthereumRPCMethods.ADD_CHAIN,
+          params: [targetChain],
+        },
+        // It's required to pass current chain, otherwise it won't work
+        chainId: currentChainEip,
+      });
+    } else {
+      throw err;
+    }
+  }
+}
+
+export function getCurrentEvmAccountAddress(instance: any) {
+  return instance.session.namespaces.eip155.accounts
+    ?.map((account: string) => {
+      return new AccountId(account).address;
+    })
+    ?.filter((address: string) => isEvmAddress(address))?.[0];
+}
+
+export function getEvmAccount(
+  network: string,
+  address: string,
+  meta: BlockchainMeta[]
+) {
+  const currentChainId = getChainIdByNetworkName(network, meta);
+  return AccountId.format({
+    chainId: {
+      namespace: NAMESPACES.ETHEREUM,
+      reference: String(currentChainId),
+    },
+    address,
+  });
+}

package/src/index.ts

@@ -12,8 +12,9 @@ import type {
 import type { ISignClient } from '@walletconnect/types';
 import type { BlockchainMeta, SignerFactory } from 'rango-types';
 
-import { WalletTypes } from '@rango-dev/wallets-shared';
+import { Networks, WalletTypes } from '@rango-dev/wallets-shared';
 import Client from '@walletconnect/sign-client';
+import { AccountId, ChainId } from 'caip';
 import { evmBlockchains } from 'rango-types';
 
 import {
@@ -22,14 +23,22 @@ import {
   EthereumEvents,
   RELAY_URL,
 } from './constants';
-import { createModalInstance, simulateRequest } from './helpers';
+import {
+  createModalInstance,
+  simulateRequest,
+  switchOrAddEvmChain,
+} from './helpers';
 import {
   cleanupSingleSession,
   disconnectSessions,
   getAccountsFromEvent,
   getAccountsFromSession,
+  getPersistedChainId,
+  needSessionRecreateOnSwitchNetwork,
+  persistCurrentChainId,
   tryConnect,
   trySwitchByCreatingNewSession,
+  updateSessionAccounts,
 } from './session';
 import signer from './signer';
 
@@ -51,14 +60,15 @@ export const config: WalletConfig = {
   checkInstallation: false,
   isAsyncInstance: true,
   defaultNetwork: DEFAULT_NETWORK,
+  isAsyncSwitchNetwork: true,
 };
 
 export const getInstance: GetInstance = async (options) => {
   const { currentProvider, getState, meta } = options;
 
   /*
-   *Create a new pair, if exists use the pair,
-   *Or use the already created one.
+   * Create a new pair, if exists use the pair,
+   * Or use the already created one.
    */
   let provider: ISignClient;
   if (!currentProvider) {
@@ -67,7 +77,6 @@ export const getInstance: GetInstance = async (options) => {
         'You need to set `WC_PROJECT_ID` in Wallet Connect provider.'
       );
     }
-
     provider = await Client.init({
       relayUrl: RELAY_URL,
       projectId: envs.WC_PROJECT_ID,
@@ -91,15 +100,29 @@ export const connect: Connect = async ({ instance, network, meta }) => {
   const requestedNetwork = network || DEFAULT_NETWORK;
 
   // Try to restore the session first, if couldn't, create a new session by showing a modal.
-  const session = await tryConnect(client, {
+  const { session, isNew } = await tryConnect(client, {
     network: requestedNetwork,
     meta,
   });
   // Override the value (session).
   instance.session = session;
-
-  const accounts = getAccountsFromSession(session);
-  return accounts;
+  const currentChainId = !isNew
+    ? String(await getPersistedChainId(instance))
+    : undefined;
+  const accounts = getAccountsFromSession(session, currentChainId);
+  /*
+   * TODO: we need to fix next lines to support multiple accounts
+   * for now, it will return the current evm account on the current chain
+   */
+  if (!isNew) {
+    return {
+      chainId: String(currentChainId),
+      accounts: accounts?.[0].accounts,
+    };
+  }
+  const newChainId = accounts?.[accounts.length - 1].chainId;
+  void persistCurrentChainId(instance, newChainId);
+  return accounts?.[accounts.length - 1];
 };
 
 export const subscribe: Subscribe = ({
@@ -126,13 +149,16 @@ export const subscribe: Subscribe = ({
   // Listen to events triggred by wallet. (e.g. accountsChanged and chainChanged)
   client.on('session_event', (args) => {
     if (args.params.event.name === EthereumEvents.ACCOUNTS_CHANGED) {
-      const accounts = args.params.event.data;
-      const chainId = args.params.chainId;
+      const accounts = args.params.event.data.map((account: string) => {
+        return new AccountId(account).address;
+      });
+      const chainId = ChainId.parse(args.params.chainId).reference;
       updateAccounts(accounts);
       updateChainId(chainId);
     } else if (args.params.event.name === EthereumEvents.CHAIN_CHANGED) {
-      const chainId = args.params.chainId;
+      const chainId = args.params.event.data;
       updateChainId(chainId);
+      void persistCurrentChainId(instance, chainId);
     } else {
       console.log('[WC2] session_event not supported', args.params.event);
     }
@@ -149,17 +175,27 @@ export const switchNetwork: SwitchNetwork = async ({
   network,
   instance,
   meta,
+  getState,
 }) => {
-  /**
-   * Wallet connect is a multichain protocol and we can not determine the connected wallet
-   * supports which wallet, `extend`ing session doesn't work during a bug in their utils packages.
-   * So we will try to make a new session with `network` that user needs to switch.
-   */
-  const session = await trySwitchByCreatingNewSession(instance, {
-    network,
-    meta,
-  });
-  instance.session = session;
+  const needRecreateSession = needSessionRecreateOnSwitchNetwork(instance);
+  config.isAsyncSwitchNetwork = true;
+  if (needRecreateSession) {
+    config.isAsyncSwitchNetwork = false;
+    /**
+     * In case of trust wallet that doesn't support switch chain method,
+     * we need to handle it manually by deleting last session and create a new one
+     * with correct chain id.
+     */
+    const session = await trySwitchByCreatingNewSession(instance, {
+      network,
+      meta,
+    });
+    instance.session = session;
+    return;
+  }
+  const currentNetwork = getState?.().network || Networks.ETHEREUM;
+  await updateSessionAccounts(instance, network, currentNetwork, meta);
+  await switchOrAddEvmChain(meta, network, currentNetwork, instance);
 };
 
 /**

package/src/session.ts

@@ -5,16 +5,19 @@ import type {
   SessionTypes,
   SignClientTypes,
 } from '@walletconnect/types';
+import type { BlockchainMeta } from 'rango-types/lib';
 
 import { Networks, timeout } from '@rango-dev/wallets-shared';
 import { getSdkError } from '@walletconnect/utils';
 import { AccountId } from 'caip';
 
-import { PING_TIMEOUT } from './constants';
+import { CHAIN_ID_STORAGE, PING_TIMEOUT } from './constants';
 import {
   generateOptionalNamespace,
   generateRequiredNamespace,
   getChainIdByNetworkName,
+  getCurrentEvmAccountAddress,
+  getEvmAccount,
   getModal,
   solanaChainIdToNetworkName,
 } from './helpers';
@@ -130,7 +133,7 @@ export function tryGetPairing(
 export async function tryConnect(
   client: SignClient,
   params: ConnectParams
-): Promise<SessionTypes.Struct> {
+): Promise<{ session: SessionTypes.Struct; isNew: boolean }> {
   const { network, meta } = params;
 
   const requiredNamespaces = generateRequiredNamespace(meta, network);
@@ -145,6 +148,7 @@ export async function tryConnect(
   }
 
   // Check if the user has a session, if yes, restore the session and use it.
+  let isNew = false;
   let session: SessionTypes.Struct | undefined;
   const pairing = tryGetPairing(client);
   if (pairing) {
@@ -161,9 +165,10 @@ export async function tryConnect(
       requiredNamespaces,
       optionalNamespaces,
     });
+    isNew = true;
   }
 
-  return session;
+  return { session, isNew };
 }
 
 /**
@@ -275,7 +280,10 @@ export async function disconnectSessions(client: SignClient) {
   return await Promise.all(allPromises);
 }
 
-export function getAccountsFromSession(session: SessionTypes.Struct) {
+export function getAccountsFromSession(
+  session: SessionTypes.Struct,
+  chainId?: string
+) {
   const accounts = Object.values(session.namespaces)
     .map((namespace) => namespace.accounts)
     .flat()
@@ -290,8 +298,21 @@ export function getAccountsFromSession(session: SessionTypes.Struct) {
         accounts: [address],
         chainId: chain,
       };
+    })
+    // TODO: fix, ignore solana and cosmos for now
+    .filter((account) => account.chainId !== Networks.SOLANA);
+  // sort accounts, so connected chain is first item in array
+  if (!!chainId) {
+    accounts.sort((a, b) => {
+      if (a.chainId === chainId) {
+        return 1;
+      }
+      if (b.chainId === chainId) {
+        return -1;
+      }
+      return 0;
     });
-
+  }
   return accounts;
 }
 
@@ -314,3 +335,80 @@ export function getAccountsFromEvent(
 
   return accounts;
 }
+
+/*
+ * Before switch network, we need to update session namespace accounts
+ * to contain both current chain and target chain accoutns.
+ */
+export async function updateSessionAccounts(
+  instance: any,
+  requestedNetwork: string,
+  currentNetwork: string,
+  meta: BlockchainMeta[]
+) {
+  const session = instance.session;
+
+  const namespaces = session.namespaces;
+  let needUpdateNamepspace = false;
+  const accounts = namespaces.eip155.accounts;
+
+  const currentAccountAddress = getCurrentEvmAccountAddress(instance);
+  const requestedAccount = getEvmAccount(
+    requestedNetwork,
+    currentAccountAddress,
+    meta
+  );
+  if (!accounts.includes(requestedAccount)) {
+    accounts.push(requestedAccount);
+    needUpdateNamepspace = true;
+  }
+
+  const currentAccount = getEvmAccount(
+    currentNetwork,
+    currentAccountAddress,
+    meta
+  );
+  if (!accounts.includes(currentAccount)) {
+    accounts.push(currentAccount);
+    needUpdateNamepspace = true;
+  }
+
+  if (needUpdateNamepspace) {
+    const updatedNamespaces = {
+      ...namespaces,
+      eip155: {
+        ...namespaces.eip155,
+        accounts,
+      },
+    };
+    await instance.client.session
+      .update({
+        topic: session.topic,
+        namespaces: updatedNamespaces,
+      })
+      .catch((err: unknown) => {
+        console.log(err);
+      });
+  }
+}
+
+/*
+ * For some wallet e.g. Trust Wallet Mobile which doesn't support
+ * RPC method for switch network, we need to recreate session
+ */
+export function needSessionRecreateOnSwitchNetwork(instance: any): boolean {
+  const TRUST_WALLET_KEYWORD = 'trust';
+  const peerName = instance?.session?.peer?.metadata?.name;
+  return peerName?.toLowerCase()?.includes(TRUST_WALLET_KEYWORD);
+}
+
+export function persistCurrentChainId(instance: any, chainId: string) {
+  return instance.client.core.storage.setItem(CHAIN_ID_STORAGE, {
+    defaultChainId: parseInt(chainId),
+  });
+}
+
+export async function getPersistedChainId(instance: any) {
+  return (await instance.client.core.storage.getItem(CHAIN_ID_STORAGE))
+    ?.defaultChainId;
+}

package/src/signers/evm.ts

@@ -20,6 +20,42 @@ class EVMSigner implements GenericSigner<EvmTransaction> {
     this.session = session;
   }
 
+  static buildTx(evmTx: EvmTransaction, disableV2 = false) {
+    let tx = {};
+    if (evmTx.from) {
+      tx = { ...tx, from: evmTx.from };
+    }
+    if (evmTx.to) {
+      tx = { ...tx, to: evmTx.to };
+    }
+    if (evmTx.data) {
+      tx = { ...tx, data: evmTx.data };
+    }
+    if (evmTx.value) {
+      tx = { ...tx, value: evmTx.value };
+    }
+    if (evmTx.nonce) {
+      tx = { ...tx, nonce: evmTx.nonce };
+    }
+    if (evmTx.gasLimit) {
+      tx = { ...tx, gasLimit: evmTx.gasLimit };
+    }
+    if (evmTx.gasPrice) {
+      const shift = 16;
+      tx = {
+        ...tx,
+        gasPrice: '0x' + parseInt(evmTx.gasPrice).toString(shift),
+      };
+    }
+    if (evmTx.maxFeePerGas && !disableV2) {
+      tx = { ...tx, maxFeePerGas: evmTx.maxFeePerGas };
+    }
+    if (evmTx.maxPriorityFeePerGas && !disableV2) {
+      tx = { ...tx, maxPriorityFeePerGas: evmTx.maxPriorityFeePerGas };
+    }
+    return tx;
+  }
+
   public async signMessage(
     msg: string,
     address: string,
@@ -71,12 +107,13 @@ class EVMSigner implements GenericSigner<EvmTransaction> {
       chainId,
     });
     try {
+      const transaction = EVMSigner.buildTx(tx);
       const hash: string = await this.client.request({
         topic: this.session.topic,
         chainId: requestedFor.caipChainId,
         request: {
           method: EthereumRPCMethods.SEND_TRANSACTION,
-          params: [tx],
+          params: [transaction],
         },
       });
       return {