Merge branch '4.x' into ok/6746-Web3.js-Adapter-for-Wagmi-Implementation

CHANGELOG.md

@@ -2335,4 +2335,22 @@ If there are any bugs, improvements, optimizations or any new feature proposal f
 
 -   Fixed an issue with detecting Uint8Array (#6486)
 
+## [4.5.0]
+
+### Added
+
+#### web3-utils
+
+-   Adds missing exported type `AbiItem` from 1.x to v4 for compatabiltiy (#6678)
+
+#### web3-types
+
+-   Adds missing exported type `AbiItem` from 1.x to v4 for compatabiltiy (#6678)
+
+### Changed 
+
+#### web3
+
+-   Dependencies updated
+
 ## [Unreleased]

packages/web3-core/test/unit/__snapshots__/web3_context.test.ts.snap

@@ -40,14 +40,15 @@ exports[`Web3Context getContextObject should return correct context object 1`] =
   },
   "registeredSubscriptions": {},
   "requestManager": Web3RequestManager {
-    "_emitter": EventEmitter {
+    "_emitter": {
       "_events": {
         "BEFORE_PROVIDER_CHANGE": [Function],
         "PROVIDER_CHANGED": [Function],
       },
       "_eventsCount": 2,
       "_maxListeners": undefined,
       Symbol(kCapture): false,
+      Symbol(shapeMode): false,
     },
     "_provider": HttpProvider {
       "clientUrl": "http://test/abc",
@@ -59,14 +60,15 @@ exports[`Web3Context getContextObject should return correct context object 1`] =
     "_subscriptions": Map {},
     "registeredSubscriptions": {},
     "requestManager": Web3RequestManager {
-      "_emitter": EventEmitter {
+      "_emitter": {
         "_events": {
           "BEFORE_PROVIDER_CHANGE": [Function],
           "PROVIDER_CHANGED": [Function],
         },
         "_eventsCount": 2,
         "_maxListeners": undefined,
         Symbol(kCapture): false,
+        Symbol(shapeMode): false,
       },
       "_provider": HttpProvider {
         "clientUrl": "http://test/abc",

packages/web3-core/test/unit/web3_context.test.ts

@@ -69,6 +69,26 @@ describe('Web3Context', () => {
 		it('should return correct context object', () => {
 			const context = new Context1('http://test/abc');
 
+			// The following is because a specific property is different in node 18 than it is in node 20 and 21
+			// So the problematic property is removed from the object and then added to ensure its presence and its location
+			// And the snapshot is updated to reflect the change.
+			// Once node 18 is no longer supported, this can be removed. And the snapshot need to be updated then.
+
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const symbolForShapeMode = Object.getOwnPropertySymbols(
+				(context.getContextObject().requestManager as any)._emitter,
+			).find(s => s.description === 'shapeMode');
+			if (symbolForShapeMode) {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				delete (context.getContextObject().requestManager as any)._emitter[symbolForShapeMode];
+			}
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			(context.getContextObject().requestManager as any)._emitter = {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				...(context.getContextObject().requestManager as any)._emitter,
+				[Symbol.for('shapeMode')]: false,
+			};
+
 			expect(context.getContextObject()).toMatchSnapshot();
 		});
 	});

packages/web3-eth/CHANGELOG.md

@@ -220,3 +220,7 @@ Documentation:
 -   Catch `TransactionPollingTimeoutError` was added to send transaction events (#6623)
 
 ## [Unreleased]
+
+### Added
+
+-   Added `eth.getMaxPriorityFeePerGas` method (#6748)

packages/web3-eth/src/rpc_method_wrappers.ts

@@ -138,6 +138,18 @@ export async function getGasPrice<ReturnFormat extends DataFormat>(
 	return format({ format: 'uint' }, response as Numbers, returnFormat);
 }
 
+/**
+ * View additional documentations here: {@link Web3Eth.getMaxPriorityFeePerGas}
+ * @param web3Context ({@link Web3Context}) Web3 configuration object that contains things such as the provider, request manager, wallet, etc.
+ */
+export async function getMaxPriorityFeePerGas<ReturnFormat extends DataFormat>(
+	web3Context: Web3Context<EthExecutionAPI>,
+	returnFormat: ReturnFormat,
+) {
+	const response = await ethRpcMethods.getMaxPriorityFeePerGas(web3Context.requestManager);
+
+	return format({ format: 'uint' }, response as Numbers, returnFormat);
+}
 /**
  * View additional documentations here: {@link Web3Eth.getBlockNumber}
  * @param web3Context ({@link Web3Context}) Web3 configuration object that contains things such as the provider, request manager, wallet, etc.