From 544902a3481e2457a46527db9c87ed2fc4289c10 Mon Sep 17 00:00:00 2001 From: xujianxiang Date: Sat, 16 Mar 2024 22:15:18 +0800 Subject: [PATCH 1/4] fix(web3-errors): handle the undefined data in Eip838ExecutionError constructor(#6433) --- packages/web3-errors/src/errors/contract_errors.ts | 2 +- .../test/unit/__snapshots__/errors.test.ts.snap | 11 +++++++++++ packages/web3-errors/test/unit/errors.test.ts | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/packages/web3-errors/src/errors/contract_errors.ts b/packages/web3-errors/src/errors/contract_errors.ts index 3710d9f60f0..ccd2b7dd46a 100644 --- a/packages/web3-errors/src/errors/contract_errors.ts +++ b/packages/web3-errors/src/errors/contract_errors.ts @@ -159,7 +159,7 @@ export class Eip838ExecutionError extends Web3ContractError { // error.data, error.data.data or error.data.originalError.data (https://github.com/web3/web3.js/issues/4454#issuecomment-1485953455) if (typeof error.data === 'object') { let originalError: { data: string }; - if ('originalError' in error.data) { + if (error.data && 'originalError' in error.data) { originalError = error.data.originalError; } else { // Ganache has no `originalError` sub-object unlike others diff --git a/packages/web3-errors/test/unit/__snapshots__/errors.test.ts.snap b/packages/web3-errors/test/unit/__snapshots__/errors.test.ts.snap index 2eefbaa0814..22a863812e8 100644 --- a/packages/web3-errors/test/unit/__snapshots__/errors.test.ts.snap +++ b/packages/web3-errors/test/unit/__snapshots__/errors.test.ts.snap @@ -156,6 +156,17 @@ exports[`errors Eip838ExecutionError should get the data from error.data.origina } `; +exports[`errors Eip838ExecutionError should return correctly when data is undefined 1`] = ` +{ + "cause": undefined, + "code": undefined, + "data": undefined, + "innerError": undefined, + "message": "Error", + "name": "Eip838ExecutionError", +} +`; + exports[`errors InvalidConnectionError should have valid json structure 1`] = ` { "cause": undefined, diff --git a/packages/web3-errors/test/unit/errors.test.ts b/packages/web3-errors/test/unit/errors.test.ts index 7428cc9b6b3..0731f4dff37 100644 --- a/packages/web3-errors/test/unit/errors.test.ts +++ b/packages/web3-errors/test/unit/errors.test.ts @@ -329,6 +329,13 @@ describe('errors', () => { } as JsonRpcError).toJSON(), ).toMatchSnapshot(); }); + it('should return correctly when data is undefined', () => { + expect( + new contractErrors.Eip838ExecutionError({ + data: undefined, + } as JsonRpcError).toJSON(), + ).toMatchSnapshot(); + }); }); describe('ResponseError', () => { From 4d0b9b02df91427e028a403eb1d1a236e792adf9 Mon Sep 17 00:00:00 2001 From: xujianxiang Date: Mon, 25 Mar 2024 19:42:04 +0800 Subject: [PATCH 2/4] doc: update changelog --- packages/web3-errors/CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/web3-errors/CHANGELOG.md b/packages/web3-errors/CHANGELOG.md index 06946bb65df..dce63f85e27 100644 --- a/packages/web3-errors/CHANGELOG.md +++ b/packages/web3-errors/CHANGELOG.md @@ -165,5 +165,11 @@ Documentation: ### Fixed - Fixed grammar and spelling in `transactionTimeoutHint` (#6559) + +## [1.1.5] -## [Unreleased] \ No newline at end of file +### Fixed + +- Fixed the undefined data in `Eip838ExecutionError` constructor (#6433) + +## [Unreleased] From 7a01984516d457932e397e88f9f4d56d6e0994b8 Mon Sep 17 00:00:00 2001 From: Junaid <86780488+jdevcs@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:40:04 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md --- packages/web3-errors/CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/web3-errors/CHANGELOG.md b/packages/web3-errors/CHANGELOG.md index dce63f85e27..fd1e618a505 100644 --- a/packages/web3-errors/CHANGELOG.md +++ b/packages/web3-errors/CHANGELOG.md @@ -165,11 +165,5 @@ Documentation: ### Fixed - Fixed grammar and spelling in `transactionTimeoutHint` (#6559) - -## [1.1.5] - -### Fixed - -- Fixed the undefined data in `Eip838ExecutionError` constructor (#6433) ## [Unreleased] From 47b906b2dd60bcd1d694e182551ed0145817124a Mon Sep 17 00:00:00 2001 From: Junaid <86780488+jdevcs@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:43:13 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- packages/web3-errors/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/web3-errors/CHANGELOG.md b/packages/web3-errors/CHANGELOG.md index fd1e618a505..1d29cdd0b61 100644 --- a/packages/web3-errors/CHANGELOG.md +++ b/packages/web3-errors/CHANGELOG.md @@ -166,4 +166,10 @@ Documentation: - Fixed grammar and spelling in `transactionTimeoutHint` (#6559) +## [1.2.0] + +### Added + +- Added `InvalidIntegerError` error for fromWei and toWei (#7052) + ## [Unreleased]