From fa7948733b122d84e916a4c4d994d601f9e9433f Mon Sep 17 00:00:00 2001 From: 3commascapital <3commascapital@gmail.com> Date: Mon, 25 Sep 2023 10:02:58 -0500 Subject: [PATCH 1/6] Fixup base fee type --- packages/web3-core/src/formatters.ts | 2 +- packages/web3-core/test/unit/formatters.test.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/web3-core/src/formatters.ts b/packages/web3-core/src/formatters.ts index 47b25802e17..b6d6af3bd3b 100644 --- a/packages/web3-core/src/formatters.ts +++ b/packages/web3-core/src/formatters.ts @@ -450,7 +450,7 @@ export const outputBlockFormatter = (block: BlockInput): BlockOutput => { } if (block.baseFeePerGas) { - modifiedBlock.baseFeePerGas = hexToNumber(block.baseFeePerGas); + modifiedBlock.baseFeePerGas = outputBigIntegerFormatter(block.baseFeePerGas); } return modifiedBlock; diff --git a/packages/web3-core/test/unit/formatters.test.ts b/packages/web3-core/test/unit/formatters.test.ts index eddc95fc60c..e836316c3e6 100644 --- a/packages/web3-core/test/unit/formatters.test.ts +++ b/packages/web3-core/test/unit/formatters.test.ts @@ -537,12 +537,13 @@ describe('formatters', () => { }); it('should convert "baseFeePerGas" from hex to number', () => { + jest.spyOn(formatters, 'outputBigIntegerFormatter').mockReturnValue(123 as any); const result = outputBlockFormatter({ ...validBlock, baseFeePerGas: 'baseFeePerGas', } as any); - expect(utils.hexToNumber).toHaveBeenCalledWith('baseFeePerGas'); + expect(outputBigIntegerFormatter).toHaveBeenCalledWith('baseFeePerGas'); expect(result).toEqual(expect.objectContaining({ baseFeePerGas: hexToNumberResult })); }); }); From b281e4ed3b6fe829eb23221f45cd3c841a646d8d Mon Sep 17 00:00:00 2001 From: 3commascapital <8562488-3commascapital@users.noreply.gitlab.com> Date: Mon, 25 Sep 2023 12:44:01 -0500 Subject: [PATCH 2/6] Removes any --- packages/web3-core/test/unit/formatters.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-core/test/unit/formatters.test.ts b/packages/web3-core/test/unit/formatters.test.ts index e836316c3e6..d1aedd01d71 100644 --- a/packages/web3-core/test/unit/formatters.test.ts +++ b/packages/web3-core/test/unit/formatters.test.ts @@ -537,7 +537,7 @@ describe('formatters', () => { }); it('should convert "baseFeePerGas" from hex to number', () => { - jest.spyOn(formatters, 'outputBigIntegerFormatter').mockReturnValue(123 as any); + jest.spyOn(formatters, 'outputBigIntegerFormatter').mockReturnValue(123); const result = outputBlockFormatter({ ...validBlock, baseFeePerGas: 'baseFeePerGas', From c6aa648ea9268771040e1197e6989871fc6bc232 Mon Sep 17 00:00:00 2001 From: 3commascapital <8562488-3commascapital@users.noreply.gitlab.com> Date: Mon, 25 Sep 2023 15:23:42 -0500 Subject: [PATCH 3/6] v4.2.0-bigint --- packages/web3-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json index 2fb6ee258eb..1e87c105fbc 100644 --- a/packages/web3-core/package.json +++ b/packages/web3-core/package.json @@ -1,6 +1,6 @@ { "name": "web3-core", - "version": "4.2.0", + "version": "4.2.0-bigint", "description": "Web3 core tools for sub-packages. This is an internal package.", "main": "./lib/commonjs/index.js", "module": "./lib/esm/index.js", From 231fcdf0ffaa5fae818bd92d1c876c69a7f4b7b0 Mon Sep 17 00:00:00 2001 From: 3commascapital <8562488-3commascapital@users.noreply.gitlab.com> Date: Fri, 29 Sep 2023 11:54:27 -0500 Subject: [PATCH 4/6] Adds changelog --- packages/web3-core/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/web3-core/CHANGELOG.md b/packages/web3-core/CHANGELOG.md index 57c4bf140d5..04e7d565f44 100644 --- a/packages/web3-core/CHANGELOG.md +++ b/packages/web3-core/CHANGELOG.md @@ -183,4 +183,5 @@ Documentation: ### Changed -- defaultTransactionType is now type 0x2 instead of 0x0 (#6282) \ No newline at end of file +- defaultTransactionType is now type 0x2 instead of 0x0 (#6282) +- Allows formatter to parse large base fee From 83c612d807f0873c3dcbe371d4467d0a62438efc Mon Sep 17 00:00:00 2001 From: 3commascapital <90629478+3commascapital@users.noreply.github.com> Date: Fri, 29 Sep 2023 16:03:07 -0500 Subject: [PATCH 5/6] Update packages/web3-core/CHANGELOG.md Co-authored-by: Alex --- packages/web3-core/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-core/CHANGELOG.md b/packages/web3-core/CHANGELOG.md index 04e7d565f44..2dd584bee94 100644 --- a/packages/web3-core/CHANGELOG.md +++ b/packages/web3-core/CHANGELOG.md @@ -184,4 +184,4 @@ Documentation: ### Changed - defaultTransactionType is now type 0x2 instead of 0x0 (#6282) -- Allows formatter to parse large base fee +- Allows formatter to parse large base fee (#6456) From e1c768448784c085c7b1ecbd73be57dcc6bfb6b7 Mon Sep 17 00:00:00 2001 From: 3commascapital <8562488-3commascapital@users.noreply.gitlab.com> Date: Fri, 29 Sep 2023 16:03:53 -0500 Subject: [PATCH 6/6] Remove version name --- packages/web3-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json index 1e87c105fbc..2fb6ee258eb 100644 --- a/packages/web3-core/package.json +++ b/packages/web3-core/package.json @@ -1,6 +1,6 @@ { "name": "web3-core", - "version": "4.2.0-bigint", + "version": "4.2.0", "description": "Web3 core tools for sub-packages. This is an internal package.", "main": "./lib/commonjs/index.js", "module": "./lib/esm/index.js",