Release 32.0.0 (#412)

* feat: release 32.0.0 * chore: changelogs * fix: early return when recovering invalid key exchange status and update unit tests accordingly * feat: optimize sdk build to remove qrcode-terminal on web * feat: optimize sdk build to remove qrcode-terminal on web+rn
MetaMask · Oct 19, 2023 · 74bac0b · 74bac0b
1 parent 65cd9ea
commit 74bac0b
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-sdk-monorepo",
-  "version": "31.0.0",
+  "version": "32.0.0",
   "private": true,
   "repository": {
     "type": "git",

diff --git a/packages/sdk-communication-layer/CHANGELOG.md b/packages/sdk-communication-layer/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0]
+### Added
+- feat: connection recovery edge case ([#411](https://github.com/MetaMask/metamask-sdk/pull/411))
+
 ## [0.9.0]
 ### Added
 - fix typos ([#401](https://github.com/MetaMask/metamask-sdk/pull/401))
@@ -82,7 +86,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - [FEAT] improve logging + update examples ([#99](https://github.com/MetaMask/metamask-sdk/pull/99))
 
-[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]
+[0.10.0]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.9.0]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.8.0]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.7.1]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]

diff --git a/packages/sdk-communication-layer/package.json b/packages/sdk-communication-layer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/sdk-communication-layer",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "",
   "homepage": "https://github.com/MetaMask/metamask-sdk#readme",
   "bugs": {

diff --git a/...s/sdk-communication-layer/src/services/SocketService/EventListeners/handleMessage.test.ts b/...s/sdk-communication-layer/src/services/SocketService/EventListeners/handleMessage.test.ts
@@ -8,13 +8,22 @@ import { handleMessage } from './handleMessage';
 
 jest.mock('../ChannelManager');
 
+const msgToDeEncrypt = 'encryptedMessage';
+
 describe('handleMessage', () => {
   let instance: SocketService;
 
   const mockCheckSameId = ChannelManager.checkSameId as jest.Mock;
   const mockEmit = jest.fn();
   const mockAreKeysExchanged = jest.fn();
-  const mockDecryptMessage = jest.fn();
+  const mockDecryptMessage = jest.fn((msg) => {
+    console.log(`mockDecrypt msg:`, msg);
+    if (msg === msgToDeEncrypt) {
+      throw new Error('invalid');
+    }
+    return '{}';
+  });
+  const mockSetKeysExchanged = jest.fn();
   const mockStart = jest.fn();
   const channelId = 'testChannel';
 
@@ -30,6 +39,7 @@ describe('handleMessage', () => {
         keyExchange: {
           areKeysExchanged: mockAreKeysExchanged,
           decryptMessage: mockDecryptMessage,
+          setKeysExchanged: mockSetKeysExchanged,
           start: mockStart,
         },
       },
@@ -80,7 +90,7 @@ describe('handleMessage', () => {
     );
 
     const handler = handleMessage(instance, channelId);
-    handler({ id: 'testId', message: 'encryptedMessage' });
+    handler({ id: 'testId', message: msgToDeEncrypt });
 
     expect(mockEmit).toHaveBeenCalledWith(EventType.MESSAGE, {
       message: { type: MessageType.PAUSE },
@@ -134,7 +144,7 @@ describe('handleMessage', () => {
     instance.sendMessage = mockSendMessage;
 
     const handler = handleMessage(instance, channelId);
-    handler({ id: 'testId', message: 'encryptedMessage' });
+    handler({ id: 'testId', message: msgToDeEncrypt });
 
     expect(mockSendMessage).toHaveBeenCalledWith({
       type: KeyExchangeMessageType.KEY_HANDSHAKE_START,
@@ -174,7 +184,7 @@ describe('handleMessage', () => {
     );
 
     const handler = handleMessage(instance, channelId);
-    handler({ id: 'testId', message: 'encryptedMessage' });
+    handler({ id: 'testId', message: msgToDeEncrypt });
 
     expect(instance.state.clientsPaused).toBe(true);
   });
@@ -205,7 +215,7 @@ describe('handleMessage', () => {
     );
 
     const handler = handleMessage(instance, channelId);
-    handler({ id: 'testId', message: 'encryptedMessage' });
+    handler({ id: 'testId', message: msgToDeEncrypt });
 
     expect(mockEmit).toHaveBeenCalledWith(EventType.MESSAGE, {
       message: { type: 'testType', data: 'testData' },
@@ -217,7 +227,7 @@ describe('handleMessage', () => {
     instance.state.isOriginator = true;
 
     const handler = handleMessage(instance, channelId);
-    handler({ id: 'testId', message: 'encryptedMessage' });
+    handler({ id: 'testId', message: msgToDeEncrypt });
 
     expect(mockStart).toHaveBeenCalledWith({
       isOriginator: true,

diff --git a/packages/sdk-communication-layer/src/services/SocketService/EventListeners/handleMessage.ts b/packages/sdk-communication-layer/src/services/SocketService/EventListeners/handleMessage.ts
@@ -112,7 +112,7 @@ export function handleMessage(instance: SocketService, channelId: string) {
         instance.state.keyExchange?.decryptMessage(message);
         canDecrypt = true;
       } catch (err) {
-        return;
+        // Ignore error.
       }
 
       if (canDecrypt) {
@@ -150,7 +150,7 @@ export function handleMessage(instance: SocketService, channelId: string) {
 
     const decryptedMessage =
       instance.state.keyExchange?.decryptMessage(message);
-    const messageReceived = JSON.parse(decryptedMessage ?? '');
+    const messageReceived = JSON.parse(decryptedMessage ?? '{}');
 
     if (messageReceived?.type === MessageType.PAUSE) {
       /**

diff --git a/packages/sdk-install-modal-web/CHANGELOG.md b/packages/sdk-install-modal-web/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0]
+### Uncategorized
+- Force align package version to sdk
+
 ## [0.9.0]
 ### Added
 - feat: add sdk version and change modal order ([#405](https://github.com/MetaMask/metamask-sdk/pull/405))
@@ -55,7 +59,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update GitHub actions workflows ([#102](https://github.com/MetaMask/metamask-sdk/pull/102))
 - [FEAT] Yarn v3 migration ([#100](https://github.com/MetaMask/metamask-sdk/pull/100))
 
-[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]
+[0.10.0]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.9.0]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.7.0]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.6.2]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]

diff --git a/packages/sdk-install-modal-web/package.json b/packages/sdk-install-modal-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/sdk-install-modal-web",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "MetaMask SDK Install Modal for Web",
   "homepage": "https://github.com/MetaMask/metamask-sdk#readme",
   "bugs": {

diff --git a/packages/sdk-react-ui/CHANGELOG.md b/packages/sdk-react-ui/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0]
+### Uncategorized
+- Force align package version to sdk
+
 ## [0.9.0]
 ### Added
 - feat: implementing internationalization via i18next package ([#403](https://github.com/MetaMask/metamask-sdk/pull/403))
@@ -32,7 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - [feat] initial beta released
 
-[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/v0.9.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/v0.10.0...HEAD
+[0.10.0]: https://github.com/MetaMask/metamask-sdk/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/MetaMask/metamask-sdk/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/MetaMask/metamask-sdk/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/MetaMask/metamask-sdk/compare/v0.6.2...v0.7.0

diff --git a/packages/sdk-react-ui/package.json b/packages/sdk-react-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/sdk-react-ui",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "A react component and react hooks to connect and use MetaMask",
   "homepage": "https://github.com/MetaMask/metamask-sdk#readme",
   "bugs": {

diff --git a/packages/sdk-react/CHANGELOG.md b/packages/sdk-react/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0]
+### Added
+- fix: balance only display when debug is set ([#408](https://github.com/MetaMask/metamask-sdk/pull/408))
+- feat: add unit tests to the sdk-react package ([#369](https://github.com/MetaMask/metamask-sdk/pull/369))
+
 ## [0.9.0]
 ### Added
 - feat: implementing internationalization via i18next package ([#403](https://github.com/MetaMask/metamask-sdk/pull/403))
@@ -55,7 +60,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [fix] publishing config ([#135](https://github.com/MetaMask/metamask-sdk/pull/135))
 - [feat] initial beta released
 
-[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/v0.9.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/v0.10.0...HEAD
+[0.10.0]: https://github.com/MetaMask/metamask-sdk/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/MetaMask/metamask-sdk/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/MetaMask/metamask-sdk/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/MetaMask/metamask-sdk/compare/v0.6.2...v0.7.0

diff --git a/packages/sdk-react/package.json b/packages/sdk-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/sdk-react",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "A react component and react hooks to connect and use MetaMask",
   "homepage": "https://github.com/MetaMask/metamask-sdk#readme",
   "bugs": {

diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0]
+### Added
+- feat: connectAndSign feature ([#410](https://github.com/MetaMask/metamask-sdk/pull/410))
+
 ## [0.9.0]
 ### Added
 - feat: add sdk version and change modal order ([#405](https://github.com/MetaMask/metamask-sdk/pull/405))
@@ -146,7 +150,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - [FEAT] improve logging + update examples ([#99](https://github.com/MetaMask/metamask-sdk/pull/99))
 
-[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]
+[0.10.0]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.9.0]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.8.0]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]
 [0.7.1]: https://github.com/MetaMask/metamask-sdk/compare/@metamask/[email protected]...@metamask/[email protected]

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/sdk",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "",
   "homepage": "https://github.com/MetaMask/metamask-sdk#readme",
   "bugs": {

diff --git a/packages/sdk/rollup.config.js b/packages/sdk/rollup.config.js
@@ -11,13 +11,15 @@ import globals from 'rollup-plugin-node-globals';
 const packageJson = require('./package.json');
 
 const listDepForRollup = ['@react-native-async-storage/async-storage'];
+const webExternalDeps = [...listDepForRollup, 'qrcode-terminal'];
+const rnExternalDeps = [...listDepForRollup, 'qrcode-terminal'];
 
 /**
  * @type {import('rollup').RollupOptions}
  */
 const config = [
   {
-    external: listDepForRollup,
+    external: webExternalDeps,
     input: 'src/index.ts',
     output: [
       {
@@ -59,7 +61,7 @@ const config = [
     ],
   },
   {
-    external: listDepForRollup,
+    external: rnExternalDeps,
     input: 'src/index.ts',
     output: [
       {