Merge branch '4.x' into wyatt/4.x/5670-contract-method-error-tests

web3 · Jun 20, 2023 · 95f9a3e · 95f9a3e
2 parents ff38941 + 023f02d
commit 95f9a3e
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1603,3 +1603,7 @@ If there are any bugs, improvements, optimizations or any new feature proposal f
 #### web3-eth-contract
 
 -   Event filtering using non-indexed and indexed string event arguments (#6167)
+
+#### web3-eth-types
+
+-   Receive fragment type added (#6204)
diff --git a/package.json b/package.json
@@ -98,7 +98,7 @@
 		"@cypress/webpack-preprocessor": "^5.12.0",
 		"@droppedcode/typedoc-plugin-relative-includes": "^1.0.2",
 		"@openzeppelin/contracts": "^4.7.1",
-		"@types/node": "^17.0.40",
+		"@types/node": "^18.11.9",
 		"@types/webpack": "^5.28.0",
 		"assert": "^2.0.0",
 		"buffer": "^6.0.3",

diff --git a/packages/web3-eth-ens/CHANGELOG.md b/packages/web3-eth-ens/CHANGELOG.md
@@ -100,3 +100,7 @@ Documentation:
 [Migration Guide from 1.x](https://docs.web3js.org/guides/web3_upgrade_guide/x/)
 
 ## [Unreleased]
+
+### Fixed
+
+-   Fixed bug #6185, now web3.js compiles on typescript v5 (#6195)
diff --git a/packages/web3-providers-ws/CHANGELOG.md b/packages/web3-providers-ws/CHANGELOG.md
@@ -93,3 +93,7 @@ Documentation:
 [Migration Guide from 1.x](https://docs.web3js.org/guides/web3_upgrade_guide/x/)
 
 ## [Unreleased]
+
+### Fixed
+
+-   Fixed #6162 @types/ws issue (#6205)
diff --git a/packages/web3-providers-ws/package.json b/packages/web3-providers-ws/package.json
@@ -45,7 +45,6 @@
 		"@types/express": "^4.17.13",
 		"@types/jest": "^28.1.6",
 		"@types/morgan": "^1.9.3",
-		"@types/ws": "^8.5.3",
 		"@typescript-eslint/eslint-plugin": "^5.30.7",
 		"@typescript-eslint/parser": "^5.30.7",
 		"eslint": "^8.20.0",
@@ -66,6 +65,7 @@
 		"web3-errors": "^1.0.0",
 		"web3-types": "^1.0.0",
 		"web3-utils": "^4.0.1",
-		"ws": "^8.8.1"
+		"ws": "^8.8.1",
+		"@types/ws": "^8.5.3"
 	}
 }
diff --git a/packages/web3-types/CHANGELOG.md b/packages/web3-types/CHANGELOG.md
@@ -120,3 +120,7 @@ Documentation:
 [Migration Guide from 1.x](https://docs.web3js.org/guides/web3_upgrade_guide/x/)
 
 ## [Unreleased]
+
+### Fixed
+
+-   Fixed bug #6185, now web3.js compiles on typescript v5 (#6195)
diff --git a/packages/web3-types/src/eth_abi_types.ts b/packages/web3-types/src/eth_abi_types.ts
@@ -84,7 +84,7 @@ export type AbiParameter = {
 	readonly internalType?: string;
 };
 
-type FragmentTypes = 'constructor' | 'event' | 'function' | 'fallback';
+type FragmentTypes = 'constructor' | 'event' | 'function' | 'fallback' | 'receive';
 
 export type AbiBaseFragment = {
 	// type will default to string if passed ABI is declared without "as const"
@@ -220,7 +220,7 @@ export type PrimitiveBytesType<Type extends string> = Type extends `bytes${strin
 
 export type PrimitiveTupleType<
 	Type extends string,
-	TypeComponents extends ReadonlyArray<AbiParameter> | undefined = [],
+	TypeComponents extends ReadonlyArray<AbiParameter> | undefined | unknown = [],
 > = TypeComponents extends ReadonlyArray<AbiParameter>
 	? Type extends 'tuple'
 		? {
@@ -251,7 +251,7 @@ type ArrToObjectWithFunctions<T extends unknown[]> = Array<unknown> & ObjectToAr
 
 export type MatchPrimitiveType<
 	Type extends string,
-	TypeComponents extends ReadonlyArray<AbiParameter> | undefined,
+	TypeComponents extends ReadonlyArray<AbiParameter> | undefined | unknown,
 > =
 	| PrimitiveAddressType<Type>
 	| PrimitiveStringType<Type>

diff --git a/packages/web3/CHANGELOG.md b/packages/web3/CHANGELOG.md
@@ -117,3 +117,8 @@ Documentation:
 ### Added
 
 -   Exported `Web3Context`, `Web3PluginBase`, `Web3EthPluginBase` from `'web3-core'`, and `Web3Validator` from `'web3-validator'` (#6165)
+
+### Fixed
+
+-   Fixed bug #6185, now web3.js compiles on typescript v5 (#6195)
+-   Fixed #6162 @types/ws issue (#6205)
diff --git a/yarn.lock b/yarn.lock
@@ -2114,10 +2114,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.6.tgz#31743bc5772b6ac223845e18c3fc26f042713c83"
   integrity sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A==
 
-"@types/node@^17.0.40":
-  version "17.0.45"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
-  integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
+"@types/node@^18.11.9":
+  version "18.16.18"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.18.tgz#85da09bafb66d4bc14f7c899185336d0c1736390"
+  integrity sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"