Merge pull request #12 from WalletConnect/chore/update-deps

chore: update deps to latest

package.json

@@ -23,7 +23,7 @@
     "build:types": "tsc",
     "build:source": "rollup --config rollup.config.js",
     "build": "npm run build:pre; npm run build:source; npm run build:types",
-    "test": "vitest run --dir test --no-threads",
+    "test": "vitest run --dir test",
     "lint": "eslint --fix './src/**/*.ts'",
     "prettier": "prettier --check '{src,test}/**/*.{js,ts,jsx,tsx}'",
     "run:examples": "cd ./examples/dapp && yarn dev & cd ./examples/wallet && yarn dev",
@@ -33,7 +33,7 @@
     "install:all": "yarn && cd ./examples/dapp && yarn && cd ./../wallet && yarn"
   },
   "dependencies": {
-    "@walletconnect/web3wallet": "1.7.0"
+    "@walletconnect/web3wallet": "1.7.4"
   },
   "devDependencies": {
     "@ethersproject/wallet": "^5.7.0",
@@ -57,7 +57,7 @@
     "rollup-plugin-polyfill-node": "0.10.2",
     "typescript": "4.7.4",
     "utf-8-validate": "6.0.3",
-    "vitest": "0.21.1",
+    "vitest": "^0.31.1",
     "eslint-plugin-n": "^15.6.1"
   },
   "exports": {

src/controllers/engine.ts

@@ -72,17 +72,9 @@ export class Engine extends ISingleEthereumEngine {
 
     const session = await this.web3wallet.approveSession(approveParams);
     this.chainId = chainId;
-
     // emit chainChanged if a different chain is approved other than the required
     if (approvedChains.length > 1) {
-      await this.web3wallet.emitSessionEvent({
-        topic: session.topic,
-        event: {
-          name: "chainChanged",
-          data: chainId,
-        },
-        chainId: prefixChainWithNamespace(chainId),
-      });
+      setTimeout(() => this.changeChain(session.topic, chainId), 2_000);
     }
 
     return session;
@@ -117,14 +109,7 @@ export class Engine extends ISingleEthereumEngine {
     });
 
     if (this.chainId !== chainId) {
-      await this.web3wallet.emitSessionEvent({
-        topic,
-        event: {
-          name: "chainChanged",
-          data: chainId,
-        },
-        chainId: formattedChain,
-      });
+      await this.changeChain(topic, chainId);
       this.chainId = chainId;
     }
 
@@ -245,11 +230,10 @@ export class Engine extends ISingleEthereumEngine {
         error: getSdkError("UNSUPPORTED_CHAINS"),
       });
     }
-
     return this.client.events.emit("session_proposal", {
       id: event.id,
       params: proposal,
-      context: event.context,
+      verifyContext: event.verifyContext,
     });
   };
 
@@ -279,4 +263,16 @@ export class Engine extends ISingleEthereumEngine {
       );
     }
   };
+
+  private changeChain = async (topic: string, chainId: number) => {
+    await this.web3wallet.engine.signClient.ping({ topic });
+    await this.web3wallet.emitSessionEvent({
+      topic,
+      event: {
+        name: "chainChanged",
+        data: chainId,
+      },
+      chainId: prefixChainWithNamespace(chainId),
+    });
+  };
 }

src/types/client.ts

@@ -18,7 +18,7 @@ export declare namespace SingleEthereumTypes {
     request: { method: string; params: unknown };
     chainId: string;
   }> & {
-    context: Verify.Context;
+    verifyContext: Verify.Context;
   };
 
   type SessionProposal = Web3WalletTypes.SessionProposal;

test/shared/values.ts

@@ -33,7 +33,7 @@ export const TEST_NAMESPACES = {
 
 export const TEST_UPDATED_NAMESPACES = {
   eip155: {
-    methods: TEST_METHODS,
+    methods: TEST_METHODS.concat(TEST_OPTIONAL_METHODS),
     accounts: [TEST_ETHEREUM_ACCOUNT, TEST_GOERLI_ACCOUNT],
     events: TEST_EVENTS,
   },

test/sign.spec.ts

@@ -66,9 +66,9 @@ describe("Sign Integration", () => {
     await Promise.all([
       new Promise((resolve) => {
         wallet.on("session_proposal", async (sessionProposal) => {
-          const { id, params, context } = sessionProposal;
-          expect(context).to.be.exist;
-          expect(context.verified.validation).to.eq("UNKNOWN");
+          const { id, params, verifyContext } = sessionProposal;
+          expect(verifyContext).to.be.exist;
+          expect(verifyContext.verified.validation).to.eq("UNKNOWN");
           session = await wallet.approveSession({
             id,
             ...TEST_APPROVE_PARAMS,
@@ -95,9 +95,9 @@ describe("Sign Integration", () => {
       }),
       new Promise((resolve) => {
         wallet.on("session_proposal", async (sessionProposal) => {
-          const { id, params, context } = sessionProposal;
-          expect(context).to.be.exist;
-          expect(context.verified.validation).to.eq("UNKNOWN");
+          const { id, params, verifyContext } = sessionProposal;
+          expect(verifyContext).to.be.exist;
+          expect(verifyContext.verified.validation).to.eq("UNKNOWN");
           session = await wallet.approveSession({
             id,
             ...TEST_APPROVE_PARAMS,
@@ -117,9 +117,9 @@ describe("Sign Integration", () => {
     await Promise.all([
       new Promise((resolve) => {
         wallet.on("session_proposal", async (sessionProposal) => {
-          const { id, params, context } = sessionProposal;
-          expect(context).to.be.exist;
-          expect(context.verified.validation).to.eq("UNKNOWN");
+          const { id, params, verifyContext } = sessionProposal;
+          expect(verifyContext).to.be.exist;
+          expect(verifyContext.verified.validation).to.eq("UNKNOWN");
           session = await wallet.approveSession({
             id,
             ...TEST_APPROVE_PARAMS,
@@ -218,9 +218,9 @@ describe("Sign Integration", () => {
     await Promise.all([
       new Promise((resolve) => {
         wallet.on("session_request", async (sessionRequest) => {
-          const { id, params, context } = sessionRequest;
-          expect(context).to.be.exist;
-          expect(context.verified.validation).to.eq("UNKNOWN");
+          const { id, params, verifyContext } = sessionRequest;
+          expect(verifyContext).to.be.exist;
+          expect(verifyContext.verified.validation).to.eq("UNKNOWN");
           const requestParams = params.request.params as TransactionRequest[];
           const signTransaction = requestParams[0];
           const signature = await cryptoWallet.signTransaction(signTransaction);