Merge branch 'main' into get-chainid

iotaledger · Dec 2, 2023 · 52fb023 · 52fb023
2 parents fc226f6 + 5a306ca
commit 52fb023
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 65 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -25,7 +25,7 @@
     "@babel/parser": "^7.23.0",
     "@babel/types": "^7.21.5",
     "@iota-wiki/core": "workspace:^",
-    "@yarnpkg/shell": "^3.2.0",
+    "@yarnpkg/shell": "^3.3.0",
     "axios": "^1.6.0",
     "clipanion": "^3.2.0-rc.10",
     "ink": "^3.2.0",
@@ -45,12 +45,12 @@
   "devDependencies": {
     "@types/babel__generator": "^7",
     "@types/copyfiles": "^2",
-    "@types/node": "^16.18.60",
+    "@types/node": "^16.18.66",
     "@types/prettier": "^2",
     "copyfiles": "^2.4.1",
     "nodemon": "^2.0.16",
     "raw-loader": "^4.0.2",
-    "tsc-alias": "^1.8.6",
+    "tsc-alias": "^1.8.8",
     "typescript-plugin-css-modules": "^4.1.1"
   },
   "peerDependencies": {

diff --git a/docs/get-started/sidebars.ts b/docs/get-started/sidebars.ts
@@ -70,6 +70,7 @@ module.exports = {
       },
       items: [
         'wallets/firefly',
+        'wallets/bloom',
         {
           type: 'link',
           label: 'TanglePay',

diff --git a/docs/get-started/wallets/bloom.md b/docs/get-started/wallets/bloom.md
@@ -0,0 +1,19 @@
+---
+title: Bloom Wallet
+description: A feature-laden Shimmer wallet.
+keywords:
+  - Bloom Wallet
+  - Shimmer Wallet
+  - IOTA Wallet
+  - Software Wallet
+  - EVM
+  - DLT
+  - Cryptocurrency
+---
+Bloom is a desktop wallet with first-class security developed by former members of the Firefly team. Bloom includes both Shimmer L1 and ShimmerEVM L2 in the same application, so you can seamlessly transfer assets back and forth between Shimmer and ShimmerEVM without the need for other tooling. Over time, Bloom will support the entirety of the IOTA ecosystem, integrating both Shimmer and IOTA networks in a single app experience.
+
+
+Find more information on the official website and download the Bloom wallet exclusively from:
+
+- [**Bloom**](https://bloomwallet.io/)**:** Official Website
+- [**Bloom GitHub Releases**](https://github.com/bloomwalletio/bloom/releases): Official Bloom GitHub Repo
diff --git a/docs/learn/protocols/introduction.md b/docs/learn/protocols/introduction.md
@@ -1,5 +1,5 @@
 ---
-description: Get an overview around IOTA's different protocol versions.
+description: Get an overview of IOTA's different protocol versions.
 keywords: [
     IOTA,
     Stardust,
@@ -15,7 +15,7 @@ keywords: [
 
 # Introduction
 
-This page provides an overview around the different protocol versions within the IOTA ecosystem.
+This page provides an overview of the different IOTA protocol versions.
 
 | Name                                                         | Release Date                                          | Description                                                                                                                                                                                                                                                                                                                                             | Consensus                                         | Features                                                                                               | Networks                                                                                                                                                         |
 | ------------------------------------------------------------ | ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- |

diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "remark-math": "^3.0.1",
     "remark-remove-comments": "^0.2.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.81.0"
+    "webpack": "^5.89.0"
   },
   "resolutions": {
     "@types/react": "18.2.24",

diff --git a/theme/package.json b/theme/package.json
@@ -19,7 +19,7 @@
     "@iota-wiki/plugin-docs": "workspace:^",
     "@metamask/providers": "^10.2.1",
     "clsx": "^1.2.1",
-    "html-react-parser": "^4.2.2",
+    "html-react-parser": "^4.2.10",
     "react-markdown": "6",
     "web3": "^4.2.2"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -2781,9 +2781,9 @@ __metadata:
     "@iota-wiki/core": "workspace:^"
     "@types/babel__generator": ^7
     "@types/copyfiles": ^2
-    "@types/node": ^16.18.60
+    "@types/node": ^16.18.66
     "@types/prettier": ^2
-    "@yarnpkg/shell": ^3.2.0
+    "@yarnpkg/shell": ^3.3.0
     axios: ^1.6.0
     clipanion: ^3.2.0-rc.10
     copyfiles: ^2.4.1
@@ -2801,7 +2801,7 @@ __metadata:
     raw-loader: ^4.0.2
     remark: ^14.0.2
     remark-lint-no-dead-urls: ^1.1.0
-    tsc-alias: ^1.8.6
+    tsc-alias: ^1.8.8
     typescript-plugin-css-modules: ^4.1.1
     unified-engine: ^10.1.0
   peerDependencies:
@@ -2873,7 +2873,7 @@ __metadata:
     svgo: ^2.8.0
     typescript: ^4.5.4
     url-loader: ^4.1.1
-    webpack: ^5.81.0
+    webpack: ^5.89.0
   languageName: unknown
   linkType: soft
 
@@ -2909,7 +2909,7 @@ __metadata:
     "@types/react": 18.2.24
     clsx: ^1.2.1
     copyfiles: ^2.4.1
-    html-react-parser: ^4.2.2
+    html-react-parser: ^4.2.10
     nodemon: ^2.0.16
     prettier: ^2.8.8
     react: 18.2.0
@@ -5080,10 +5080,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^16.18.60":
-  version: 16.18.60
-  resolution: "@types/node@npm:16.18.60"
-  checksum: aa0c81c3f20e663584bf17a5968e54c419277af7982ef41f9d83edd1b7ab4c8af2583a3c8a9e1cf659c6307e6f787e1be20522855121371f5a46d1d54f8a70e3
+"@types/node@npm:^16.18.66":
+  version: 16.18.66
+  resolution: "@types/node@npm:16.18.66"
+  checksum: 84408652068f8c7e3aa1fa6f333be8044ae802a700eb3b4101fc27d047eefcc742e636809a6318fb0100b1355658649f4a0fc2398fb04f27b1a357f6f3579cd0
   languageName: node
   linkType: hard
 
@@ -5733,7 +5733,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@yarnpkg/fslib@npm:^2.9.0":
+"@yarnpkg/fslib@npm:^2.10.3":
   version: 2.10.3
   resolution: "@yarnpkg/fslib@npm:2.10.3"
   dependencies:
@@ -5753,32 +5753,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@yarnpkg/parsers@npm:^2.5.1":
-  version: 2.5.1
-  resolution: "@yarnpkg/parsers@npm:2.5.1"
+"@yarnpkg/parsers@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "@yarnpkg/parsers@npm:2.6.0"
   dependencies:
     js-yaml: ^3.10.0
     tslib: ^1.13.0
-  checksum: 42f98b8bd635add304ce392c6f600b46e40c2c4429d7b6c38b70f50b5fd6a854dd2369e0987b70546a3c8f690d280f040a885b35acfde891f5e173fc3f974277
+  checksum: 4bad9f077c338b702342964544d426762323d9f70af3242373194eb2f3982cfd551b860d615fbdd2715aba1cefdb793f4e2f3a8c69ddffe7989682cd03102ede
   languageName: node
   linkType: hard
 
-"@yarnpkg/shell@npm:^3.2.0":
-  version: 3.2.5
-  resolution: "@yarnpkg/shell@npm:3.2.5"
+"@yarnpkg/shell@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "@yarnpkg/shell@npm:3.3.0"
   dependencies:
-    "@yarnpkg/fslib": ^2.9.0
-    "@yarnpkg/parsers": ^2.5.1
+    "@yarnpkg/fslib": ^2.10.3
+    "@yarnpkg/parsers": ^2.6.0
     chalk: ^3.0.0
     clipanion: 3.2.0-rc.4
     cross-spawn: 7.0.3
     fast-glob: ^3.2.2
     micromatch: ^4.0.2
-    stream-buffers: ^3.0.2
     tslib: ^1.13.0
   bin:
     shell: ./lib/cli.js
-  checksum: 89fe80fec6ccd5a1a713ea11285bce17fe1f3cc42507b4e63565818c4afb41e588d368cf7c198fe2b3eeb900cae87233c2d52c27da288a57f82f85a07cf9b221
+  checksum: 02a0ab902560f80486d52a46da57e8c5ea391c6ff9173bda24e449c4169925b46b8cb7c2ca7d14cdc0c61fcd1731139bdf8295b7d7c41d997bdb6fea614c2ba3
   languageName: node
   linkType: hard
 
@@ -10631,13 +10630,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-dom-parser@npm:4.0.0":
-  version: 4.0.0
-  resolution: "html-dom-parser@npm:4.0.0"
+"html-dom-parser@npm:5.0.3":
+  version: 5.0.3
+  resolution: "html-dom-parser@npm:5.0.3"
   dependencies:
     domhandler: 5.0.3
     htmlparser2: 9.0.0
-  checksum: 95e483b2c945e1158e102e4eb69768124b06c94cf3c0abff8e9b02e146b7391dcdd620df8d54331efb9952c9187e0352ea436226e9ba5f26a0cc3cfe85853d4b
+  checksum: 7bfe242372016a677cd9ed173f54081d82bb038de580d0b8761fcdcb0abef1d4a03cdc620314b7485e4c9dfcb8c451a59b0556e9b937f1243b4ca118363d9b04
   languageName: node
   linkType: hard
 
@@ -10665,17 +10664,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-react-parser@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "html-react-parser@npm:4.2.2"
+"html-react-parser@npm:^4.2.10":
+  version: 4.2.10
+  resolution: "html-react-parser@npm:4.2.10"
   dependencies:
     domhandler: 5.0.3
-    html-dom-parser: 4.0.0
-    react-property: 2.0.0
-    style-to-js: 1.1.4
+    html-dom-parser: 5.0.3
+    react-property: 2.0.2
+    style-to-js: 1.1.8
   peerDependencies:
     react: 0.14 || 15 || 16 || 17 || 18
-  checksum: 5f8c0aeba02d7d3ff2bce4c32eafbbf77fd1aa664f15555ef49d75cce666211edb9c87a73a9b5648467442361f617438da038d27185fdbae983ac9731d67cbb7
+  checksum: 26784eb0619e7fe073104768039f4e6f81e19956b79533e836938faae2aae9819c78cfcb3251b564d0e5eab46fcfdcc89570bc227d53414a2d961a7f6ac99f97
   languageName: node
   linkType: hard
 
@@ -11167,6 +11166,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"inline-style-parser@npm:0.2.2":
+  version: 0.2.2
+  resolution: "inline-style-parser@npm:0.2.2"
+  checksum: 698893d6542d4e7c0377936a1c7daec34a197765bd77c5599384756a95ce8804e6b79347b783aa591d5e9c6f3d33dae74c6d4cad3a94647eb05f3a785e927a3f
+  languageName: node
+  linkType: hard
+
 "internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.5":
   version: 1.0.5
   resolution: "internal-slot@npm:1.0.5"
@@ -15670,10 +15676,10 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom:
   languageName: node
   linkType: hard
 
-"react-property@npm:2.0.0":
-  version: 2.0.0
-  resolution: "react-property@npm:2.0.0"
-  checksum: 8a444df30ef0937689c7968dae2501a0ca523777169f450e1f7ef5beeb855d6509bd058bf612f6ed8f459aa35468335d356e50264492e1938586e59fdb988262
+"react-property@npm:2.0.2":
+  version: 2.0.2
+  resolution: "react-property@npm:2.0.2"
+  checksum: c67fb2590dad9102239b2e574fbc078b472e227b66c3d64e1949426e33889d78c2ac5369cc4c740bb8fe61665505940e39a78d113261ac52410f7538089fe367
   languageName: node
   linkType: hard
 
@@ -17355,13 +17361,6 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom:
   languageName: node
   linkType: hard
 
-"stream-buffers@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "stream-buffers@npm:3.0.2"
-  checksum: b09fdeea606e3113ebd0e07010ed0cf038608fa396130add9e45deaff5cc3ba845dc25c31ad24f8341f85907846344cb7c85f75ea52c6572e2ac646e9b6072d0
-  languageName: node
-  linkType: hard
-
 "stream-http@npm:^3.2.0":
   version: 3.2.0
   resolution: "stream-http@npm:3.2.0"
@@ -17541,12 +17540,12 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom:
   languageName: node
   linkType: hard
 
-"style-to-js@npm:1.1.4":
-  version: 1.1.4
-  resolution: "style-to-js@npm:1.1.4"
+"style-to-js@npm:1.1.8":
+  version: 1.1.8
+  resolution: "style-to-js@npm:1.1.8"
   dependencies:
-    style-to-object: 0.4.2
-  checksum: 0ed2b3400fb602f9ab6d024fb2ff23630e2f2cbdd98150e13ba16a2d9b46d7213b5e71fde15cef30b7e24f336f87ef6e8c7a29b520ff8c6a1dca92f8762e7358
+    style-to-object: 1.0.3
+  checksum: cc4d4284af587bf74559a6da17dadb88c96c8054755666cce1b768615ac2bd6231ce332a8cee118acafb577f51f243b795b716326b3c617ec12151d23f660d8f
   languageName: node
   linkType: hard
 
@@ -17559,12 +17558,12 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom:
   languageName: node
   linkType: hard
 
-"style-to-object@npm:0.4.2":
-  version: 0.4.2
-  resolution: "style-to-object@npm:0.4.2"
+"style-to-object@npm:1.0.3":
+  version: 1.0.3
+  resolution: "style-to-object@npm:1.0.3"
   dependencies:
-    inline-style-parser: 0.1.1
-  checksum: 314a80bcfadde41c2b9c8d717a4b1f2220954561040c2c7740496715da5cb95f99920a8eeefe2d4a862149875f352a12eda9bbef5816d7e0a71910da00d1521f
+    inline-style-parser: 0.2.2
+  checksum: fca6b35dc704656163c4b11d514ada9f9998fb434c9cec5995445d7d7d595ba3a4fda0476016d625cbb282d43ba5123ef0b5871d855d391400bb0dc2c2beeae1
   languageName: node
   linkType: hard
 
@@ -17995,9 +17994,9 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom:
   languageName: node
   linkType: hard
 
-"tsc-alias@npm:^1.8.6":
-  version: 1.8.7
-  resolution: "tsc-alias@npm:1.8.7"
+"tsc-alias@npm:^1.8.8":
+  version: 1.8.8
+  resolution: "tsc-alias@npm:1.8.8"
   dependencies:
     chokidar: ^3.5.3
     commander: ^9.0.0
@@ -18007,7 +18006,7 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom:
     plimit-lit: ^1.2.6
   bin:
     tsc-alias: dist/bin/index.js
-  checksum: 77f721ea797a62a7cc74acda0baf928bb654bccb210471b63fef1e70a27a823c60f5832f51aa5976d573412bc90731e90774abf9127f3b6b13f284839f988d47
+  checksum: 204852f75ce516c991813c371e4b3cda8767c50b6ad12b5c1b5f0227eb7e69fef559775fc829ba744b37dfd9930a1632dbabd62366a474fa0e174b2625ccb54f
   languageName: node
   linkType: hard
 
@@ -19502,7 +19501,7 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom:
   languageName: node
   linkType: hard
 
-"webpack@npm:^5.61.0, webpack@npm:^5.73.0, webpack@npm:^5.81.0":
+"webpack@npm:^5.61.0, webpack@npm:^5.73.0":
   version: 5.88.1
   resolution: "webpack@npm:5.88.1"
   dependencies:
@@ -19539,6 +19538,43 @@ plugin-image-zoom@flexanalytics/plugin-image-zoom:
   languageName: node
   linkType: hard
 
+"webpack@npm:^5.89.0":
+  version: 5.89.0
+  resolution: "webpack@npm:5.89.0"
+  dependencies:
+    "@types/eslint-scope": ^3.7.3
+    "@types/estree": ^1.0.0
+    "@webassemblyjs/ast": ^1.11.5
+    "@webassemblyjs/wasm-edit": ^1.11.5
+    "@webassemblyjs/wasm-parser": ^1.11.5
+    acorn: ^8.7.1
+    acorn-import-assertions: ^1.9.0
+    browserslist: ^4.14.5
+    chrome-trace-event: ^1.0.2
+    enhanced-resolve: ^5.15.0
+    es-module-lexer: ^1.2.1
+    eslint-scope: 5.1.1
+    events: ^3.2.0
+    glob-to-regexp: ^0.4.1
+    graceful-fs: ^4.2.9
+    json-parse-even-better-errors: ^2.3.1
+    loader-runner: ^4.2.0
+    mime-types: ^2.1.27
+    neo-async: ^2.6.2
+    schema-utils: ^3.2.0
+    tapable: ^2.1.1
+    terser-webpack-plugin: ^5.3.7
+    watchpack: ^2.4.0
+    webpack-sources: ^3.2.3
+  peerDependenciesMeta:
+    webpack-cli:
+      optional: true
+  bin:
+    webpack: bin/webpack.js
+  checksum: 43fe0dbc30e168a685ef5a86759d5016a705f6563b39a240aa00826a80637d4a3deeb8062e709d6a4b05c63e796278244c84b04174704dc4a37bedb0f565c5ed
+  languageName: node
+  linkType: hard
+
 "webpackbar@npm:^5.0.2":
   version: 5.0.2
   resolution: "webpackbar@npm:5.0.2"