Merge branch '4.x' into 4.x

web3 · Jan 10, 2024 · 789f937 · 789f937
2 parents fe66034 + 1eb07d1
commit 789f937
Show file tree

Hide file tree

Showing 39 changed files with 232 additions and 754 deletions.
diff --git a/docs/docs/guides/advanced/_category_.yml b/docs/docs/guides/advanced/_category_.yml
@@ -2,4 +2,4 @@ label: '🧠 Advanced'
 collapsible: true
 collapsed: true
 link: null
-position: 11
+position: 12
diff --git a/docs/docs/guides/ens/_category_.yml b/docs/docs/guides/ens/_category_.yml
@@ -0,0 +1,5 @@
+label: '📦 Web3 ENS module'
+collapsible: true
+collapsed: true
+link: null
+position: 9
diff --git a/docs/docs/guides/ens/index.md b/docs/docs/guides/ens/index.md
@@ -1,6 +1,7 @@
 ---
-sidebar_position: 9
-sidebar_label: 'Web3 ENS'
+sidebar_position: 8
+sidebar_label: 'Mastering the Web3 ENS package'
+title: Mastering the Web3 ENS package
 ---
 
 # Using web3.js ENS Package

diff --git a/docs/docs/guides/glossary/index.md b/docs/docs/guides/glossary/index.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 13
+sidebar_position: 14
 sidebar_label: '📖 Glossary'
 title: Glossary
 ---

diff --git a/docs/docs/guides/migration_from_other_libs/_category_.yml b/docs/docs/guides/migration_from_other_libs/_category_.yml
@@ -2,4 +2,4 @@ label: '🔄 Migration Guides'
 collapsible: true
 collapsed: true
 link: null
-position: 10
+position: 11
diff --git a/docs/docs/guides/web3_config/_category_.yml b/docs/docs/guides/web3_config/_category_.yml
@@ -2,4 +2,4 @@ label: '⚙️ Web3 config'
 collapsible: true
 collapsed: true
 link: null
-position: 8
+position: 9
diff --git a/docs/docs/guides/web3_plugin_guide/_category_.yml b/docs/docs/guides/web3_plugin_guide/_category_.yml
@@ -2,4 +2,4 @@ label: '🧩🛠️ Web3 Plugin'
 collapsible: true
 collapsed: true
 link: null
-position: 12
+position: 13
diff --git a/docs/docs/guides/web3_upgrade_guide/_category_.yml b/docs/docs/guides/web3_upgrade_guide/_category_.yml
@@ -2,4 +2,4 @@ label: '⬆️ Upgrading'
 collapsible: true
 collapsed: true
 link: null
-position: 9
+position: 10
diff --git a/package.json b/package.json
@@ -120,14 +120,14 @@
 		"http-browserify": "^1.7.0",
 		"https-browserify": "^1.0.0",
 		"husky": "^8.0.3",
-		"jest": "^28.1.3",
+		"jest": "^29.7.0",
 		"lerna": "^6.6.2",
 		"npm-auth-to-token": "^1.0.0",
 		"prettier": "^2.7.1",
 		"prettier-plugin-solidity": "^1.0.0-beta.20",
 		"process": "^0.11.10",
 		"solc": "^0.8.15",
-		"ts-jest": "^28.0.7",
+		"ts-jest": "^29.1.1",
 		"ts-loader": "^9.3.1",
 		"ts-node": "^10.9.1",
 		"typedoc": "^0.25.6",

diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json
@@ -63,11 +63,11 @@
 		"eslint-config-base-web3": "0.1.0",
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-import": "^2.26.0",
-		"jest": "^28.1.3",
+		"jest": "^29.7.0",
 		"jest-extended": "^3.0.1",
 		"jest-when": "^3.5.1",
 		"prettier": "^2.7.1",
-		"ts-jest": "^28.0.7",
+		"ts-jest": "^29.1.1",
 		"typescript": "^4.7.4"
 	}
 }
diff --git a/packages/web3-core/test/unit/__snapshots__/web3_context.test.ts.snap b/packages/web3-core/test/unit/__snapshots__/web3_context.test.ts.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Web3Context getContextObject should return correct context object 1`] = `
-Object {
+{
   "accountProvider": undefined,
-  "config": Object {
+  "config": {
     "blockHeaderTimeout": 10,
     "contractDataInputFill": "data",
     "defaultAccount": undefined,
@@ -14,7 +14,7 @@ Object {
     "defaultMaxPriorityFeePerGas": "0x9502f900",
     "defaultNetworkId": undefined,
     "defaultTransactionType": "0x2",
-    "enableExperimentalFeatures": Object {
+    "enableExperimentalFeatures": {
       "useRpcCallSpecification": false,
       "useSubscriptionWhenCheckingBlockTimeout": false,
     },
@@ -34,14 +34,14 @@ Object {
     "clientUrl": "http://test/abc",
     "httpProviderOptions": undefined,
   },
-  "providers": Object {
+  "providers": {
     "HttpProvider": [Function],
     "WebsocketProvider": [Function],
   },
-  "registeredSubscriptions": Object {},
+  "registeredSubscriptions": {},
   "requestManager": Web3RequestManager {
     "_emitter": EventEmitter {
-      "_events": Object {
+      "_events": {
         "BEFORE_PROVIDER_CHANGE": [Function],
         "PROVIDER_CHANGED": [Function],
       },
@@ -57,10 +57,10 @@ Object {
   },
   "subscriptionManager": Web3SubscriptionManager {
     "_subscriptions": Map {},
-    "registeredSubscriptions": Object {},
+    "registeredSubscriptions": {},
     "requestManager": Web3RequestManager {
       "_emitter": EventEmitter {
-        "_events": Object {
+        "_events": {
           "BEFORE_PROVIDER_CHANGE": [Function],
           "PROVIDER_CHANGED": [Function],
         },

diff --git a/packages/web3-errors/package.json b/packages/web3-errors/package.json
@@ -51,10 +51,10 @@
 		"eslint-config-base-web3": "0.1.0",
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-import": "^2.26.0",
-		"jest": "^28.1.3",
+		"jest": "^29.7.0",
 		"jest-extended": "^3.0.1",
 		"prettier": "^2.7.1",
-		"ts-jest": "^28.0.7",
+		"ts-jest": "^29.1.1",
 		"typescript": "^4.7.4"
 	}
 }