Merge branch '4.x' into 6007-parse-nested-error-for-smartcontract-errors

CHANGELOG.md

@@ -1476,6 +1476,12 @@ should use 4.0.1-alpha.0 for testing.
 
 -   Added `filters` param to the `Filter` type (#6010)
 
+### Fixed
+
+#### web3-eth-accounts
+
+-   Fixed ESM import bugs reported in (#6032) and (#6034)
+
 ### Changed
 
 #### web3-eth

packages/web3-eth-accounts/CHANGELOG.md

@@ -85,6 +85,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+-   Fixed ESM import bugs reported in (#6032) and (#6034)
+
 ### Changed
 
 -   Replaced `Buffer` for `Uint8Array` (#6004)

packages/web3-eth-accounts/src/common/chains/goerli.json → packages/web3-eth-accounts/src/common/chains/goerli.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "goerli",
 	"chainId": 5,
 	"networkId": 5,
@@ -94,3 +94,4 @@
 		"enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.goerli.ethdisco.net"
 	]
 }
+ ;

packages/web3-eth-accounts/src/common/chains/mainnet.json → packages/web3-eth-accounts/src/common/chains/mainnet.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "mainnet",
 	"chainId": 1,
 	"networkId": 1,
@@ -110,3 +110,4 @@
 		"enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.mainnet.ethdisco.net"
 	]
 }
+ ;

packages/web3-eth-accounts/src/common/chains/sepolia.json → packages/web3-eth-accounts/src/common/chains/sepolia.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "sepolia",
 	"chainId": 11155111,
 	"networkId": 11155111,
@@ -97,3 +97,4 @@
 		"enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.sepolia.ethdisco.net"
 	]
 }
+ ;

packages/web3-eth-accounts/src/common/common.ts

@@ -14,19 +14,20 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { buf as crc32Uint8Array } from 'crc-32';
+import pkg from 'crc-32';
 import { EventEmitter } from 'events';
 import type { Numbers } from 'web3-types';
 import { bytesToHex, hexToBytes, uint8ArrayConcat } from 'web3-utils';
 import { TypeOutput } from './types';
 import { intToUint8Array, toType, parseGethGenesis } from './utils';
-import goerli from './chains/goerli.json';
-import mainnet from './chains/mainnet.json';
-import sepolia from './chains/sepolia.json';
+import goerli from './chains/goerli';
+import mainnet from './chains/mainnet';
+import sepolia from './chains/sepolia';
 import { EIPs } from './eips';
 import type { ConsensusAlgorithm, ConsensusType } from './enums';
 import { Chain, CustomChain, Hardfork } from './enums';
 import { hardforks as HARDFORK_SPECS } from './hardforks';
+
 import type {
 	BootstrapNodeConfig,
 	CasperConfig,
@@ -42,6 +43,8 @@ import type {
 	HardforkConfig,
 } from './types';
 
+const { buf: crc32Uint8Array } = pkg;
+
 type HardforkSpecKeys = keyof typeof HARDFORK_SPECS;
 type HardforkSpecValues = typeof HARDFORK_SPECS[HardforkSpecKeys];
 /**

packages/web3-eth-accounts/src/common/eips/1153.json → packages/web3-eth-accounts/src/common/eips/1153.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-1153",
 	"number": 1153,
 	"comment": "Transient Storage",
@@ -20,3 +20,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/1559.json → packages/web3-eth-accounts/src/common/eips/1559.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-1559",
 	"number": 1559,
 	"comment": "Fee market change for ETH 1.0 chain",
@@ -24,3 +24,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/2315.json → packages/web3-eth-accounts/src/common/eips/2315.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-2315",
 	"number": 2315,
 	"comment": "Simple subroutines for the EVM",
@@ -23,3 +23,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/2537.json → packages/web3-eth-accounts/src/common/eips/2537.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-2537",
 	"number": 2537,
 	"comment": "BLS12-381 precompiles",
@@ -176,3 +176,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/2565.json → packages/web3-eth-accounts/src/common/eips/2565.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-2565",
 	"number": 2565,
 	"comment": "ModExp gas cost",
@@ -15,3 +15,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/2718.json → packages/web3-eth-accounts/src/common/eips/2718.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-2718",
 	"comment": "Typed Transaction Envelope",
 	"url": "https://eips.ethereum.org/EIPS/eip-2718",
@@ -9,3 +9,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/2929.json → packages/web3-eth-accounts/src/common/eips/2929.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-2929",
 	"comment": "Gas cost increases for state access opcodes",
 	"url": "https://eips.ethereum.org/EIPS/eip-2929",
@@ -82,3 +82,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/2930.json → packages/web3-eth-accounts/src/common/eips/2930.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-2930",
 	"comment": "Optional access lists",
 	"url": "https://eips.ethereum.org/EIPS/eip-2930",
@@ -19,3 +19,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3074.json → packages/web3-eth-accounts/src/common/eips/3074.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3074",
 	"number": 3074,
 	"comment": "AUTH and AUTHCALL opcodes",
@@ -23,3 +23,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3198.json → packages/web3-eth-accounts/src/common/eips/3198.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3198",
 	"number": 3198,
 	"comment": "BASEFEE opcode",
@@ -15,3 +15,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3529.json → packages/web3-eth-accounts/src/common/eips/3529.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3529",
 	"comment": "Reduction in refunds",
 	"url": "https://eips.ethereum.org/EIPS/eip-3529",
@@ -24,3 +24,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3540.json → packages/web3-eth-accounts/src/common/eips/3540.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3540",
 	"number": 3540,
 	"comment": "EVM Object Format (EOF) v1",
@@ -11,3 +11,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3541.json → packages/web3-eth-accounts/src/common/eips/3541.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3541",
 	"comment": "Reject new contracts starting with the 0xEF byte",
 	"url": "https://eips.ethereum.org/EIPS/eip-3541",
@@ -10,3 +10,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3554.json → packages/web3-eth-accounts/src/common/eips/3554.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3554",
 	"comment": "Reduction in refunds",
 	"url": "Difficulty Bomb Delay to December 1st 2021",
@@ -15,3 +15,4 @@
 		}
 	}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3607.json → packages/web3-eth-accounts/src/common/eips/3607.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3607",
 	"number": 3607,
 	"comment": "Reject transactions from senders with deployed code",
@@ -11,3 +11,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3651.json → packages/web3-eth-accounts/src/common/eips/3651.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3651",
 	"number": 3198,
 	"comment": "Warm COINBASE",
@@ -11,3 +11,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3670.json → packages/web3-eth-accounts/src/common/eips/3670.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3670",
 	"number": 3670,
 	"comment": "EOF - Code Validation",
@@ -11,3 +11,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3675.json → packages/web3-eth-accounts/src/common/eips/3675.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3675",
 	"number": 3675,
 	"comment": "Upgrade consensus to Proof-of-Stake",
@@ -11,3 +11,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3855.json → packages/web3-eth-accounts/src/common/eips/3855.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3855",
 	"number": 3855,
 	"comment": "PUSH0 instruction",
@@ -16,3 +16,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/3860.json → packages/web3-eth-accounts/src/common/eips/3860.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-3860",
 	"number": 3860,
 	"comment": "Limit and meter initcode",
@@ -21,3 +21,4 @@
 	},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/4345.json → packages/web3-eth-accounts/src/common/eips/4345.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-4345",
 	"number": 4345,
 	"comment": "Difficulty Bomb Delay to June 2022",
@@ -15,3 +15,4 @@
 		}
 	}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/4399.json → packages/web3-eth-accounts/src/common/eips/4399.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-4399",
 	"number": 4399,
 	"comment": "Supplant DIFFICULTY opcode with PREVRANDAO",
@@ -11,3 +11,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/4844.json → packages/web3-eth-accounts/src/common/eips/4844.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-4844",
 	"number": 4844,
 	"comment": "Shard Blob Transactions",
@@ -55,3 +55,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/4895.json → packages/web3-eth-accounts/src/common/eips/4895.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-4895",
 	"number": 4895,
 	"comment": "Beacon chain push withdrawals as operations",
@@ -11,3 +11,4 @@
 	"vm": {},
 	"pow": {}
 }
+ ;

packages/web3-eth-accounts/src/common/eips/5133.json → packages/web3-eth-accounts/src/common/eips/5133.ts

@@ -1,4 +1,4 @@
-{
+export default {
 	"name": "EIP-5133",
 	"number": 5133,
 	"comment": "Delaying Difficulty Bomb to mid-September 2022",
@@ -15,3 +15,4 @@
 		}
 	}
 }
+ ;