@rango-dev/provider-walletconnect-2 0.20.1-next.2 → 0.21.1-next.0

package/dist/session.d.ts

@@ -1,7 +1,7 @@
-import type { ConnectParams, CreateSessionParams, WCInstance } from './types';
+import type { ConnectParams, CreateSessionParams } 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';
+import type { BlockchainMeta } from 'rango-types';
 export declare function getLastSession(client: SignClient): SessionTypes.Struct;
 /**
  *
@@ -9,7 +9,7 @@ export declare function getLastSession(client: SignClient): SessionTypes.Struct;
  * If the wallet didn't respond during 10 seconds (PING_TIME), we assume the wallet isn't available and we need to create a new session.
  *
  */
-export declare function restoreSession(client: SignClient, pairing: PairingTypes.Struct): Promise<SessionTypes.Struct | undefined>;
+export declare function restoreSession(client: SignClient, pairingTopic: PairingTypes.Struct['topic']): Promise<SessionTypes.Struct | undefined>;
 /**
  *
  * Getting a  pair of required and optional namespaces then tries to show a modal and connect (pair)
@@ -32,16 +32,7 @@ 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<{
-    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.
- * So we will try to make a new session with `network` that user needs to switch.
- */
-export declare function trySwitchByCreatingNewSession(instance: WCInstance, params: ConnectParams): Promise<SessionTypes.Struct>;
+export declare function tryConnect(client: SignClient, params: ConnectParams): Promise<SessionTypes.Struct>;
 /**
  *
  * Try to find sessions with a topic id and expire them.
@@ -54,8 +45,8 @@ export declare function cleanupSingleSession(client: SignClient, topic: string):
  *
  */
 export declare function disconnectSessions(client: SignClient): Promise<void[]>;
-export declare function getAccountsFromSession(session: SessionTypes.Struct, chainId?: string): {
-    accounts: string[];
+export declare function getAccountsFromSession(session: SessionTypes.Struct): {
+    address: string;
     chainId: string;
 }[];
 export declare function getAccountsFromEvent(event: SignClientTypes.BaseEventArgs<{
@@ -65,7 +56,7 @@ export declare function getAccountsFromEvent(event: SignClientTypes.BaseEventArg
     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>;
+export declare function ignoreNamespaceMethods(instance: any): boolean;
+export declare function persistCurrentChainId(client: SignClient, chainId?: string): Promise<void>;
+export declare function getPersistedChainId(client: SignClient): Promise<string | undefined>;
 //# 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;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"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAClE,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,aAAa,CAAC;AAelD,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,uBAEhD;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,GACzC,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,CA0B9B;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAiB3E;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,UAAU,mBA2B1D;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM;;;IAiBlE;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;AASD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAM7D;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,UAAU,EAClB,OAAO,CAAC,EAAE,MAAM,iBAKjB;AAMD,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,UAAU,+BAQ3D"}

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;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"}
+{"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;IA6B5B,OAAO,CAAC,iCAAiC;CAwD1C;AAED,eAAe,SAAS,CAAC"}

package/dist/types.d.ts

@@ -12,7 +12,6 @@ export interface CreateSessionParams {
     pairingTopic?: string;
 }
 export interface ConnectParams {
-    network: string;
     meta: BlockchainMeta[];
 }
 export interface CosmosMeta extends CosmosBlockchainMeta {

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC;IACpC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,aAAa,CAAC,kBAAkB,CAAC;IACrD,kBAAkB,CAAC,EAAE,aAAa,CAAC,kBAAkB,CAAC;IACtD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IAEtD,OAAO,EAAE,MAAM,CAAC;CACjB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC;IACpC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,aAAa,CAAC,kBAAkB,CAAC;IACrD,kBAAkB,CAAC,EAAE,aAAa,CAAC,kBAAkB,CAAC;IACtD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IAEtD,OAAO,EAAE,MAAM,CAAC;CACjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/provider-walletconnect-2",
-  "version": "0.20.1-next.2",
+  "version": "0.21.1-next.0",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -24,22 +24,23 @@
     "@cosmjs/launchpad": "^0.27.1",
     "@keplr-wallet/cosmos": "^0.9.12",
     "@keplr-wallet/simple-fetch": "^0.12.14",
-    "@rango-dev/signer-cosmos": "^0.25.1-next.0",
-    "@rango-dev/signer-evm": "^0.25.1-next.0",
-    "@rango-dev/signer-solana": "^0.25.1-next.0",
-    "@rango-dev/wallets-shared": "^0.27.1-next.2",
-    "@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/logging-core": "^0.1.1-next.0",
+    "@rango-dev/signer-cosmos": "^0.26.0",
+    "@rango-dev/signer-evm": "^0.26.0",
+    "@rango-dev/signer-solana": "^0.26.0",
+    "@rango-dev/wallets-shared": "^0.28.1-next.0",
+    "@solana/web3.js": "^1.67.2",
+    "@walletconnect/encoding": "^1.0.2",
+    "@walletconnect/modal": "^2.6.2",
+    "@walletconnect/sign-client": "^2.11.2",
+    "@walletconnect/utils": "^2.11.2",
     "bs58": "^5.0.0",
     "caip": "^1.1.0",
     "cosmos-wallet": "^1.2.0",
     "rango-types": "^0.1.59"
   },
   "devDependencies": {
-    "@walletconnect/types": "2.9.1"
+    "@walletconnect/types": "^2.11.2"
   },
   "publishConfig": {
     "access": "public"

package/src/helpers.ts

@@ -1,4 +1,3 @@
-import type { CosmosMeta } from './types';
 import type { WalletState } from '@rango-dev/wallets-shared';
 import type { ProposalTypes } from '@walletconnect/types';
 import type { BlockchainMeta } from 'rango-types';
@@ -10,18 +9,12 @@ import {
 } from '@rango-dev/wallets-shared';
 import { WalletConnectModal } from '@walletconnect/modal';
 import { AccountId, ChainId } from 'caip';
-import {
-  cosmosBlockchains,
-  evmBlockchains,
-  isEvmBlockchain,
-} from 'rango-types';
+import { evmBlockchains, isEvmBlockchain } from 'rango-types';
 
 import {
-  DEFAULT_COSMOS_METHODS,
   DEFAULT_ETHEREUM_EVENTS,
   DEFAULT_ETHEREUM_METHODS,
   DEFAULT_SOLANA_CHAIN_ID,
-  DEFAULT_SOLANA_METHODS,
   EthereumRPCMethods,
   NAMESPACES,
 } from './constants';
@@ -47,75 +40,21 @@ type FinalNamespaces = {
   [key in NAMESPACES]?: ProposalTypes.BaseRequiredNamespace;
 };
 
-export function generateRequiredNamespace(
-  meta: BlockchainMeta[],
-  network: string
-): FinalNamespaces | undefined {
-  const evm = evmBlockchains(meta);
-  const cosmos = cosmosBlockchains(meta);
-
-  const requiredEvmChain = evm.find((chain) => chain.name === network);
-  const requiredCosmosChain = cosmos.find((chain) => chain.name === network);
-  const requiredSolanaChain = network === Networks.SOLANA;
-
-  if (requiredEvmChain) {
-    return {
-      [NAMESPACES.ETHEREUM]: {
-        events: DEFAULT_ETHEREUM_EVENTS,
-        methods: DEFAULT_ETHEREUM_METHODS,
-        chains: [
-          new ChainId({
-            namespace: NAMESPACES.ETHEREUM,
-            reference: String(parseInt(requiredEvmChain.chainId)),
-          }).toString(),
-        ],
-      },
-    };
-  } else if (!!requiredCosmosChain) {
-    return {
-      [NAMESPACES.COSMOS]: {
-        events: [],
-        methods: DEFAULT_COSMOS_METHODS,
-        chains: [
-          new ChainId({
-            namespace: NAMESPACES.COSMOS,
-            reference: requiredCosmosChain.chainId!,
-          }).toString(),
-        ],
-      },
-    };
-  } else if (requiredSolanaChain) {
-    return {
-      [NAMESPACES.SOLANA]: {
-        events: [],
-        methods: DEFAULT_SOLANA_METHODS,
-        chains: [`solana:${DEFAULT_SOLANA_CHAIN_ID}`],
-      },
-    };
-  }
-
-  return undefined;
-}
-
+/*
+ * Some wallets like 1inch (android) has problem when we pass cosmos chains in optional namespace
+ * Also some wallets like keplr mobile doesn't work when we don't pass cosmos chains in required namespace
+ * It seems to be a bug in their current implementation.
+ */
 export function generateOptionalNamespace(
   meta: BlockchainMeta[]
 ): FinalNamespaces | undefined {
   const evm = evmBlockchains(meta);
-  const cosmos = cosmosBlockchains(meta);
   const evmChains = evm.map((chain) => {
     return new ChainId({
       namespace: NAMESPACES.ETHEREUM,
       reference: String(parseInt(chain.chainId)),
     }).toString();
   });
-  const cosmosChains = cosmos
-    .filter((chain): chain is CosmosMeta => !!chain.chainId)
-    .map((chain) => {
-      return new ChainId({
-        namespace: NAMESPACES.COSMOS,
-        reference: chain.chainId,
-      }).toString();
-    });
 
   const namespaces: FinalNamespaces = {
     [NAMESPACES.ETHEREUM]: {
@@ -123,21 +62,7 @@ export function generateOptionalNamespace(
       events: DEFAULT_ETHEREUM_EVENTS,
       chains: evmChains,
     },
-    [NAMESPACES.SOLANA]: {
-      methods: DEFAULT_SOLANA_METHODS,
-      events: [],
-      chains: [`solana:${DEFAULT_SOLANA_CHAIN_ID}`],
-    },
   };
-
-  if (cosmosChains.length) {
-    namespaces[NAMESPACES.COSMOS] = {
-      methods: DEFAULT_COSMOS_METHODS,
-      events: [],
-      chains: cosmosChains,
-    };
-  }
-
   return namespaces;
 }
 
@@ -282,3 +207,34 @@ export function getEvmAccount(
     address,
   });
 }
+
+// It's enough to return only connected network for the EVM networks and ignore others
+export function filterEvmAccounts(
+  accounts: {
+    address: string;
+    chainId: string;
+  }[],
+  currentChainId?: string
+) {
+  let firstEvmAddress = false;
+  return accounts
+    .filter(({ address, chainId }) => {
+      const isEvm = isEvmAddress(address);
+      if (isEvm) {
+        if (currentChainId && chainId !== currentChainId) {
+          return false;
+        }
+        if (!currentChainId) {
+          if (firstEvmAddress) {
+            return false;
+          }
+          firstEvmAddress = true;
+        }
+      }
+      return true;
+    })
+    .map(({ address, chainId }) => ({
+      accounts: [address],
+      chainId: chainId,
+    }));
+}

package/src/index.ts

@@ -12,6 +12,7 @@ import type {
 import type { ISignClient } from '@walletconnect/types';
 import type { BlockchainMeta, SignerFactory } from 'rango-types';
 
+import { debug, error as logError } from '@rango-dev/logging-core';
 import { Networks, WalletTypes } from '@rango-dev/wallets-shared';
 import Client from '@walletconnect/sign-client';
 import { AccountId, ChainId } from 'caip';
@@ -21,10 +22,13 @@ import {
   DEFAULT_APP_METADATA,
   DEFAULT_NETWORK,
   EthereumEvents,
+  EthereumRPCMethods,
+  NAMESPACES,
   RELAY_URL,
 } from './constants';
 import {
   createModalInstance,
+  filterEvmAccounts,
   simulateRequest,
   switchOrAddEvmChain,
 } from './helpers';
@@ -34,10 +38,9 @@ import {
   getAccountsFromEvent,
   getAccountsFromSession,
   getPersistedChainId,
-  needSessionRecreateOnSwitchNetwork,
+  ignoreNamespaceMethods,
   persistCurrentChainId,
   tryConnect,
-  trySwitchByCreatingNewSession,
   updateSessionAccounts,
 } from './session';
 import signer from './signer';
@@ -94,35 +97,15 @@ export const getInstance: GetInstance = async (options) => {
   };
 };
 
-export const connect: Connect = async ({ instance, network, meta }) => {
+export const connect: Connect = async ({ instance, meta }) => {
   const { client } = instance as WCInstance;
-
-  const requestedNetwork = network || DEFAULT_NETWORK;
-
   // Try to restore the session first, if couldn't, create a new session by showing a modal.
-  const { session, isNew } = await tryConnect(client, {
-    network: requestedNetwork,
-    meta,
-  });
+  const session = await tryConnect(client, { meta });
   // Override the value (session).
   instance.session = session;
-  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];
+  const currentChainId = await getPersistedChainId(client);
+  const accounts = getAccountsFromSession(session);
+  return filterEvmAccounts(accounts, currentChainId);
 };
 
 export const subscribe: Subscribe = ({
@@ -158,7 +141,7 @@ export const subscribe: Subscribe = ({
     } else if (args.params.event.name === EthereumEvents.CHAIN_CHANGED) {
       const chainId = args.params.event.data;
       updateChainId(chainId);
-      void persistCurrentChainId(instance, chainId);
+      void persistCurrentChainId(instance.client, chainId);
     } else {
       console.log('[WC2] session_event not supported', args.params.event);
     }
@@ -176,26 +159,40 @@ export const switchNetwork: SwitchNetwork = async ({
   instance,
   meta,
   getState,
+  updateChainId,
 }) => {
-  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;
+  const evm = evmBlockchains(meta);
+  const chainId = evm.find((chain) => chain.name === network)?.chainId;
+  if (!chainId) {
+    const error = new Error(`There is no match for ${chainId}`);
+    logError(error);
+    throw error;
+  }
+  const chaindIdStr = new ChainId({
+    namespace: NAMESPACES.ETHEREUM,
+    reference: String(parseInt(chainId)),
+  }).toString();
+
+  const session = instance.session;
+  const evmNamespace = session.namespaces[NAMESPACES.ETHEREUM];
+  const authorizedChains = evmNamespace?.chains || [];
+  const authorizedMethods = evmNamespace?.methods || [];
+
+  if (
+    authorizedMethods.includes(EthereumRPCMethods.SWITCH_CHAIN) &&
+    !ignoreNamespaceMethods(instance)
+  ) {
+    const currentNetwork = getState?.().network || Networks.ETHEREUM;
+    await updateSessionAccounts(instance, network, currentNetwork, meta);
+    await switchOrAddEvmChain(meta, network, currentNetwork, instance);
+  } else if (authorizedChains.includes(chaindIdStr)) {
+    updateChainId(chainId);
     return;
+  } else {
+    const error = new Error(`Chain ${chainId} is not configured.`);
+    logError(error);
+    throw error;
   }
-  const currentNetwork = getState?.().network || Networks.ETHEREUM;
-  await updateSessionAccounts(instance, network, currentNetwork, meta);
-  await switchOrAddEvmChain(meta, network, currentNetwork, instance);
 };
 
 /**
@@ -211,7 +208,7 @@ export const disconnect: Disconnect = async ({ instance }) => {
   const { client } = instance as WCInstance;
 
   if (client) {
-    void disconnectSessions(client);
+    void disconnectSessions(client).catch((error) => debug(error));
   }
 };
 

package/src/session.ts

@@ -1,11 +1,11 @@
-import type { ConnectParams, CreateSessionParams, WCInstance } from './types';
+import type { ConnectParams, CreateSessionParams } 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';
+import type { BlockchainMeta } from 'rango-types';
 
 import { Networks, timeout } from '@rango-dev/wallets-shared';
 import { getSdkError } from '@walletconnect/utils';
@@ -14,8 +14,6 @@ import { AccountId } from 'caip';
 import { CHAIN_ID_STORAGE, PING_TIMEOUT } from './constants';
 import {
   generateOptionalNamespace,
-  generateRequiredNamespace,
-  getChainIdByNetworkName,
   getCurrentEvmAccountAddress,
   getEvmAccount,
   getModal,
@@ -34,11 +32,11 @@ export function getLastSession(client: SignClient) {
  */
 export async function restoreSession(
   client: SignClient,
-  pairing: PairingTypes.Struct
+  pairingTopic: PairingTypes.Struct['topic']
 ): Promise<SessionTypes.Struct | undefined> {
   await timeout(
     client.ping({
-      topic: pairing.topic,
+      topic: pairingTopic,
     }),
     PING_TIMEOUT
   );
@@ -133,27 +131,18 @@ export function tryGetPairing(
 export async function tryConnect(
   client: SignClient,
   params: ConnectParams
-): Promise<{ session: SessionTypes.Struct; isNew: boolean }> {
-  const { network, meta } = params;
-
-  const requiredNamespaces = generateRequiredNamespace(meta, network);
-  /**
-   * We try to get all of our supported chains as optional.
-   * Currently, it only works on Trust Wallet (Note: the response is buggy and only returns eip155 optional namespaces).
-   */
-  const optionalNamespaces = generateOptionalNamespace(meta);
+): Promise<SessionTypes.Struct> {
+  const { meta } = params;
 
-  if (!requiredNamespaces) {
-    throw new Error(`Couldn't generate required namespace for ${network}`);
-  }
+  // We try to get all of our supported chains as optional.
+  const optionalNamespaces = generateOptionalNamespace(meta);
 
   // 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) {
     try {
-      session = await restoreSession(client, pairing);
+      session = await restoreSession(client, pairing.topic);
     } catch (e) {
       await disconnectSessions(client);
     }
@@ -162,67 +151,12 @@ export async function tryConnect(
   // In case of connecting for the first time or session couldn't be restored, we will create a new session.
   if (!session) {
     session = await createSession(client, {
-      requiredNamespaces,
+      requiredNamespaces: {},
       optionalNamespaces,
     });
-    isNew = true;
-  }
-
-  return { session, isNew };
-}
-
-/**
- * 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.
- */
-export async function trySwitchByCreatingNewSession(
-  instance: WCInstance,
-  params: ConnectParams
-): Promise<SessionTypes.Struct> {
-  const { client, session } = instance;
-  const { network, meta } = params;
-
-  if (!session) {
-    throw new Error(
-      'For switching network, you need to have an active session!'
-    );
   }
 
-  // If a session has the chain id in its namespace, we can use that session.
-  const chainId = getChainIdByNetworkName(network, params.meta) || network;
-  const requestedSession = getSessionByChainId(client, chainId);
-  if (requestedSession) {
-    return requestedSession;
-  }
-
-  // Creating a new session for requested network.
-  const requiredNamespaces = generateRequiredNamespace(meta, network);
-  if (!requiredNamespaces) {
-    throw new Error(`Couldn't generate requiredNamespaces for ${network}`);
-  }
-
-  const createdSession = await createSession(client, { requiredNamespaces });
-
-  return createdSession;
-}
-
-/**
- *
- * Looking for a chainId in sessions and return the session if found.
- *
- */
-function getSessionByChainId(
-  client: WCInstance['client'],
-  chainId: string
-): SessionTypes.Struct | undefined {
-  const sessions = client.session.getAll();
-  const requestedSession = sessions.find((session) => {
-    const accounts = getAccountsFromSession(session);
-    return accounts.find((account) => account.chainId === chainId);
-  });
-
-  return requestedSession;
+  return session;
 }
 
 /**
@@ -277,13 +211,13 @@ export async function disconnectSessions(client: SignClient) {
     );
   }
 
+  // reset the current chain id
+  void persistCurrentChainId(client, undefined);
+
   return await Promise.all(allPromises);
 }
 
-export function getAccountsFromSession(
-  session: SessionTypes.Struct,
-  chainId?: string
-) {
+export function getAccountsFromSession(session: SessionTypes.Struct) {
   const accounts = Object.values(session.namespaces)
     .map((namespace) => namespace.accounts)
     .flat()
@@ -295,24 +229,10 @@ export function getAccountsFromSession(
        */
       const chain = solanaChainIdToNetworkName(chainId.reference);
       return {
-        accounts: [address],
+        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;
 }
 
@@ -393,22 +313,39 @@ export async function updateSessionAccounts(
 }
 
 /*
- * For some wallet e.g. Trust Wallet Mobile which doesn't support
- * RPC method for switch network, we need to recreate session
+ * Certain wallets, such as Trust Wallet and 1inch, are providing incorrect methods in
+ * response to session proposal requests. These wallets do not support certain optional
+ * RPC methods like "wallet_xyz," but they include them in the response under the session namespace.
+ * For the time being, we should avoid their session namespace response.
+ * see also: https://github.com/trustwallet/wallet-core/issues/3588
  */
-export function needSessionRecreateOnSwitchNetwork(instance: any): boolean {
-  const TRUST_WALLET_KEYWORD = 'trust';
+export function ignoreNamespaceMethods(instance: any): boolean {
+  const WALLETS_WITH_WRONG_NAMESPACE_METHODS = ['trust', '1inch'];
   const peerName = instance?.session?.peer?.metadata?.name;
-  return peerName?.toLowerCase()?.includes(TRUST_WALLET_KEYWORD);
+  return WALLETS_WITH_WRONG_NAMESPACE_METHODS.some((name) =>
+    peerName?.toLowerCase()?.includes(name)
+  );
 }
 
-export function persistCurrentChainId(instance: any, chainId: string) {
-  return instance.client.core.storage.setItem(CHAIN_ID_STORAGE, {
-    defaultChainId: parseInt(chainId),
+export async function persistCurrentChainId(
+  client: SignClient,
+  chainId?: string
+) {
+  return client.core.storage.setItem(CHAIN_ID_STORAGE, {
+    defaultChainId: chainId ? parseInt(chainId) : '',
   });
 }
 
-export async function getPersistedChainId(instance: any) {
-  return (await instance.client.core.storage.getItem(CHAIN_ID_STORAGE))
-    ?.defaultChainId;
+/*
+ * get the latest chain id from the storage,
+ * used for setting current chain id in session reconnect.
+ */
+export async function getPersistedChainId(client: SignClient) {
+  try {
+    const chainId = (await client.core.storage.getItem(CHAIN_ID_STORAGE))
+      ?.defaultChainId;
+    return !!chainId ? String(chainId) : undefined;
+  } catch {
+    return undefined;
+  }
 }