From 06b14f3af7ea113973163b88e4aa09fe9a98b04f Mon Sep 17 00:00:00 2001 From: Raul Duarte Pereira Date: Wed, 19 Jun 2024 12:35:02 -0300 Subject: [PATCH] CU-86dtv56f6 - Consume new version of NeonDappKit that resolves ByteArray conversion issues --- .../CU-86dtv56f6_2024-06-20-16-21.json | 10 +++++++++ .../CU-86dtv56f6_2024-06-20-16-21.json | 10 +++++++++ .../CU-86dtv56f6_2024-06-19-15-34.json | 10 +++++++++ common/config/rush/pnpm-lock.yaml | 22 +++++++++---------- examples/wc-wallet-react/config-overrides.js | 11 ++++++++++ examples/wc-wallet-react/package.json | 1 + packages/wallet-connect-sdk-core/package.json | 2 +- .../wallet-connect-sdk-react/package.json | 2 +- .../package.json | 2 +- 9 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 common/changes/@cityofzion/wallet-connect-sdk-core/CU-86dtv56f6_2024-06-20-16-21.json create mode 100644 common/changes/@cityofzion/wallet-connect-sdk-react/CU-86dtv56f6_2024-06-20-16-21.json create mode 100644 common/changes/@cityofzion/wallet-connect-sdk-wallet-core/CU-86dtv56f6_2024-06-19-15-34.json diff --git a/common/changes/@cityofzion/wallet-connect-sdk-core/CU-86dtv56f6_2024-06-20-16-21.json b/common/changes/@cityofzion/wallet-connect-sdk-core/CU-86dtv56f6_2024-06-20-16-21.json new file mode 100644 index 0000000..f6e286f --- /dev/null +++ b/common/changes/@cityofzion/wallet-connect-sdk-core/CU-86dtv56f6_2024-06-20-16-21.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@cityofzion/wallet-connect-sdk-core", + "comment": "Update neon-dappkit-types package version", + "type": "patch" + } + ], + "packageName": "@cityofzion/wallet-connect-sdk-core" +} \ No newline at end of file diff --git a/common/changes/@cityofzion/wallet-connect-sdk-react/CU-86dtv56f6_2024-06-20-16-21.json b/common/changes/@cityofzion/wallet-connect-sdk-react/CU-86dtv56f6_2024-06-20-16-21.json new file mode 100644 index 0000000..97635da --- /dev/null +++ b/common/changes/@cityofzion/wallet-connect-sdk-react/CU-86dtv56f6_2024-06-20-16-21.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@cityofzion/wallet-connect-sdk-react", + "comment": "Update neon-dappkit-types package version", + "type": "patch" + } + ], + "packageName": "@cityofzion/wallet-connect-sdk-react" +} \ No newline at end of file diff --git a/common/changes/@cityofzion/wallet-connect-sdk-wallet-core/CU-86dtv56f6_2024-06-19-15-34.json b/common/changes/@cityofzion/wallet-connect-sdk-wallet-core/CU-86dtv56f6_2024-06-19-15-34.json new file mode 100644 index 0000000..03ebb5b --- /dev/null +++ b/common/changes/@cityofzion/wallet-connect-sdk-wallet-core/CU-86dtv56f6_2024-06-19-15-34.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@cityofzion/wallet-connect-sdk-wallet-core", + "comment": "Update neon-dappkit package version", + "type": "patch" + } + ], + "packageName": "@cityofzion/wallet-connect-sdk-wallet-core" +} \ No newline at end of file diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 3f04e40..c324f6d 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -14,8 +14,8 @@ importers: specifier: 5.5.1 version: 5.5.1 '@cityofzion/neon-dappkit-types': - specifier: 0.3.1 - version: 0.3.1 + specifier: 0.4.0 + version: 0.4.0 '@walletconnect/sign-client': specifier: 2.13.0 version: 2.13.0 @@ -45,8 +45,8 @@ importers: ../../packages/wallet-connect-sdk-react: dependencies: '@cityofzion/neon-dappkit-types': - specifier: 0.3.1 - version: 0.3.1 + specifier: 0.4.0 + version: 0.4.0 '@cityofzion/wallet-connect-sdk-core': specifier: workspace:* version: link:../wallet-connect-sdk-core @@ -155,8 +155,8 @@ importers: specifier: 5.5.1 version: 5.5.1 '@cityofzion/neon-dappkit': - specifier: 0.4.2 - version: 0.4.2 + specifier: 0.5.1 + version: 0.5.1 '@cityofzion/neon-js': specifier: 5.5.1 version: 5.5.1 @@ -2793,14 +2793,14 @@ packages: - encoding dev: false - /@cityofzion/neon-dappkit-types@0.3.1: - resolution: {integrity: sha512-bQA/EBQUU6ZPmDARXB0w6I2iJqdo4S2s3xERPN91wCHd9WMkCIrtec269X1Yjd9qGoVibLMyA3xjqrOTyUBpxw==} + /@cityofzion/neon-dappkit-types@0.4.0: + resolution: {integrity: sha512-UjveRGBuj/OlwlX39IutXFPBalosc+dZClC32+wm5JLOsAy12vFeI+dNFe6nnV8HIrFRZSLcHyfq08ILA68LVQ==} dev: false - /@cityofzion/neon-dappkit@0.4.2: - resolution: {integrity: sha512-W9I+1kxEyOasPE5eVHgR+jNk8PDi+TMeghboLBWGfmMxWJVWPu/LTQf9PGkz2oY2q9/fswPgneDxzXCY8Rg0Sw==} + /@cityofzion/neon-dappkit@0.5.1: + resolution: {integrity: sha512-EIO+UvrufXKBwXSuJ5HJJnpM5qq8rDmbxg7c+esS531UNXLL8PRxR9Lb9LxeYsgELI48ZF0oUhn/SX4VlnM/uA==} dependencies: - '@cityofzion/neon-dappkit-types': 0.3.1 + '@cityofzion/neon-dappkit-types': 0.4.0 '@cityofzion/neon-js': 5.5.1 crypto-browserify: 3.12.0 crypto-js: 4.2.0 diff --git a/examples/wc-wallet-react/config-overrides.js b/examples/wc-wallet-react/config-overrides.js index ee680b6..74f0b93 100644 --- a/examples/wc-wallet-react/config-overrides.js +++ b/examples/wc-wallet-react/config-overrides.js @@ -1,3 +1,5 @@ +const webpack = require('webpack') + module.exports = function override(config) { config.module.rules.push({ test: /\.m?js/, @@ -9,8 +11,17 @@ module.exports = function override(config) { querystring: require.resolve('querystring-es3'), stream: require.resolve('stream-browserify'), events: require.resolve('events'), + buffer: require.resolve('buffer/'), }, }, }) + + config.plugins = (config.plugins || []).concat([ + new webpack.ProvidePlugin({ + process: 'process/browser', + Buffer: ['buffer', 'Buffer'], + }), + ]) + return config } diff --git a/examples/wc-wallet-react/package.json b/examples/wc-wallet-react/package.json index f9e818d..f36f418 100644 --- a/examples/wc-wallet-react/package.json +++ b/examples/wc-wallet-react/package.json @@ -69,6 +69,7 @@ "@types/react-router-dom": "^5.3.3", "@typescript-eslint/eslint-plugin": "^4.27.0", "@typescript-eslint/parser": "^4.27.0", + "buffer": "^6.0.3", "cross-env": "^7.0.3", "eslint": "^7.28.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/wallet-connect-sdk-core/package.json b/packages/wallet-connect-sdk-core/package.json index d85fe55..78591a4 100644 --- a/packages/wallet-connect-sdk-core/package.json +++ b/packages/wallet-connect-sdk-core/package.json @@ -41,7 +41,7 @@ "@cityofzion/neon-core": "5.5.1", "@walletconnect/sign-client": "2.13.0", "@walletconnect/types": "2.13.0", - "@cityofzion/neon-dappkit-types": "0.3.1", + "@cityofzion/neon-dappkit-types": "0.4.0", "typed-emitter": "^2.1.0" }, "devDependencies": { diff --git a/packages/wallet-connect-sdk-react/package.json b/packages/wallet-connect-sdk-react/package.json index 92b04d8..64a64b7 100644 --- a/packages/wallet-connect-sdk-react/package.json +++ b/packages/wallet-connect-sdk-react/package.json @@ -38,7 +38,7 @@ "dependencies": { "@cityofzion/wallet-connect-sdk-core": "workspace:*", "@walletconnect/types": "2.13.0", - "@cityofzion/neon-dappkit-types": "0.3.1" + "@cityofzion/neon-dappkit-types": "0.4.0" }, "peerDependencies": { "react": "*" diff --git a/packages/wallet-connect-sdk-wallet-core/package.json b/packages/wallet-connect-sdk-wallet-core/package.json index 58aa42e..8d66893 100644 --- a/packages/wallet-connect-sdk-wallet-core/package.json +++ b/packages/wallet-connect-sdk-wallet-core/package.json @@ -38,7 +38,7 @@ "@walletconnect/sign-client": "2.13.0", "@walletconnect/types": "2.13.0", "moment": "^2.29.4", - "@cityofzion/neon-dappkit": "0.4.2", + "@cityofzion/neon-dappkit": "0.5.1", "ethers": "5.7.2", "@ethersproject/abstract-signer": "~5.7.0" },