From 94b69f78a7619e7c9b5064f534985991a33eb62a Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Fri, 10 Oct 2025 11:30:28 +0530 Subject: [PATCH 01/13] Fix smart transaction related e2e on mobile --- .../batch-transaction.spec.ts} | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) rename e2e/specs/{quarantine/batch-transaction.failing.ts => confirmations/batch-transaction.spec.ts} (80%) diff --git a/e2e/specs/quarantine/batch-transaction.failing.ts b/e2e/specs/confirmations/batch-transaction.spec.ts similarity index 80% rename from e2e/specs/quarantine/batch-transaction.failing.ts rename to e2e/specs/confirmations/batch-transaction.spec.ts index 17a0d6773d73..99af82f23adb 100644 --- a/e2e/specs/quarantine/batch-transaction.failing.ts +++ b/e2e/specs/confirmations/batch-transaction.spec.ts @@ -156,49 +156,49 @@ describe(SmokeConfirmationsRedesigned('7702 - smart account'), () => { ); }); - it('upgrades an account', async () => { - await withFixtures( - { - dapps: [ - { - dappVariant: DappVariants.TEST_DAPP, - }, - ], - fixture: new FixtureBuilder().build(), - restartDevice: true, - localNodeOptions: [ - { - type: LocalNodeType.anvil, - options: localNodeOptions[0].options as AnvilNodeOptions, - }, - ], - testSpecificMock, - }, - async () => { - await loginToApp(); - - // Create confirmation to upgrade account - await TabBarComponent.tapWallet(); - await changeNetworkFromNetworkListModal(); - await tapSwitchAccountModal(); - - // Check all expected elements are visible - await Assertions.expectTextDisplayed('Account update'); - await Assertions.expectTextDisplayed( - "You're switching to a smart account.", - ); - await Assertions.expectElementToBeVisible( - ConfirmationUITypes.ModalConfirmationContainer, - ); - await checkConfirmationPage(); - - // Accept confirmation - await FooterActions.tapConfirmButton(); - - // Check activity tab - await TabBarComponent.tapActivity(); - await Assertions.expectTextDisplayed('Upgrade to smart account'); - }, - ); - }); + // it('upgrades an account', async () => { + // await withFixtures( + // { + // dapps: [ + // { + // dappVariant: DappVariants.TEST_DAPP, + // }, + // ], + // fixture: new FixtureBuilder().build(), + // restartDevice: true, + // localNodeOptions: [ + // { + // type: LocalNodeType.anvil, + // options: localNodeOptions[0].options as AnvilNodeOptions, + // }, + // ], + // testSpecificMock, + // }, + // async () => { + // await loginToApp(); + + // // Create confirmation to upgrade account + // await TabBarComponent.tapWallet(); + // await changeNetworkFromNetworkListModal(); + // await tapSwitchAccountModal(); + + // // Check all expected elements are visible + // await Assertions.expectTextDisplayed('Account update'); + // await Assertions.expectTextDisplayed( + // "You're switching to a smart account.", + // ); + // await Assertions.expectElementToBeVisible( + // ConfirmationUITypes.ModalConfirmationContainer, + // ); + // await checkConfirmationPage(); + + // // Accept confirmation + // await FooterActions.tapConfirmButton(); + + // // Check activity tab + // await TabBarComponent.tapActivity(); + // await Assertions.expectTextDisplayed('Upgrade to smart account'); + // }, + // ); + // }); }); From 35dc19602b953bd753fca3822ebc90041060b66f Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Fri, 10 Oct 2025 18:37:30 +0530 Subject: [PATCH 02/13] update --- .../components/SmartAccount/SmartAccount.tsx | 2 +- .../SmartAccountModal/SmartAccountModal.tsx | 1 + e2e/pages/wallet/SwitchAccountModal.ts | 37 +++++- .../wallet/SwitchAccountModal.selectors.js | 2 + .../confirmations/batch-transaction.spec.ts | 112 ++++++++++-------- 5 files changed, 100 insertions(+), 54 deletions(-) diff --git a/app/components/Views/MultichainAccounts/AccountDetails/components/SmartAccount/SmartAccount.tsx b/app/components/Views/MultichainAccounts/AccountDetails/components/SmartAccount/SmartAccount.tsx index 1484f57eab5d..954768813d09 100644 --- a/app/components/Views/MultichainAccounts/AccountDetails/components/SmartAccount/SmartAccount.tsx +++ b/app/components/Views/MultichainAccounts/AccountDetails/components/SmartAccount/SmartAccount.tsx @@ -37,7 +37,7 @@ export const SmartAccountDetails = ({ account }: SmartAccountDetailsProps) => { } return ( - + { labelTextVariant={TextVariant.BodyMDMedium} label={} onPress={() => navigation.goBack()} + testID="smart-account-back-button" /> } > diff --git a/e2e/pages/wallet/SwitchAccountModal.ts b/e2e/pages/wallet/SwitchAccountModal.ts index 4046f57a88d7..1162985c2c16 100644 --- a/e2e/pages/wallet/SwitchAccountModal.ts +++ b/e2e/pages/wallet/SwitchAccountModal.ts @@ -1,19 +1,54 @@ import Matchers from '../../framework/Matchers.ts'; import Gestures from '../../framework/Gestures.ts'; import { SwitchAccountModalSelectorIDs } from '../../selectors/wallet/SwitchAccountModal.selectors.js'; +import { AccountDetailsIds } from '../../selectors/MultichainAccounts/AccountDetails.selectors.ts'; class SwitchAccountModal { - get switchAccountButton(): DetoxElement { + get smartAccountLink(): DetoxElement { return Matchers.getElementByID( + SwitchAccountModalSelectorIDs.SMART_ACCOUNT_LINK, + ); + } + + get switchAccountButton(): DetoxElement { + return Matchers.getElementByLabel( SwitchAccountModalSelectorIDs.SWITCH_ACCOUNT_BUTTON_LOCALHOST, ); } + get smartAccountBackButton(): DetoxElement { + return Matchers.getElementByID( + SwitchAccountModalSelectorIDs.SMART_ACCOUNT_BACK_BUTTON, + ); + } + + get accountModalBackButton(): DetoxElement { + return Matchers.getElementByID(AccountDetailsIds.BACK_BUTTON); + } + async tapSwitchAccountButton(): Promise { await Gestures.waitAndTap(this.switchAccountButton, { checkEnabled: false, elemDescription: 'Switch Account button', }); } + + async tapSmartAccountLink(): Promise { + await Gestures.waitAndTap(this.smartAccountLink, { + elemDescription: 'Smart Account link', + }); + } + + async tapSmartAccountBackButton(): Promise { + await Gestures.waitAndTap(this.smartAccountBackButton, { + elemDescription: 'Smart Account back button', + }); + } + + async tapAccountModalBackButton(): Promise { + await Gestures.waitAndTap(this.accountModalBackButton, { + elemDescription: 'Account Modal back button', + }); + } } export default new SwitchAccountModal(); diff --git a/e2e/selectors/wallet/SwitchAccountModal.selectors.js b/e2e/selectors/wallet/SwitchAccountModal.selectors.js index 9b693b6493b2..657ea07ffd16 100644 --- a/e2e/selectors/wallet/SwitchAccountModal.selectors.js +++ b/e2e/selectors/wallet/SwitchAccountModal.selectors.js @@ -1,4 +1,6 @@ export const SwitchAccountModalSelectorIDs = { + SMART_ACCOUNT_BACK_BUTTON: 'smart-account-back-button', + SMART_ACCOUNT_LINK: 'smart-account-link', SWITCH_ACCOUNT_BUTTON: 'switch_account_button', SWITCH_ACCOUNT_BUTTON_LOCALHOST: 'switch_account_button-Localhost', }; diff --git a/e2e/specs/confirmations/batch-transaction.spec.ts b/e2e/specs/confirmations/batch-transaction.spec.ts index 99af82f23adb..20df63df896d 100644 --- a/e2e/specs/confirmations/batch-transaction.spec.ts +++ b/e2e/specs/confirmations/batch-transaction.spec.ts @@ -1,4 +1,3 @@ -import AccountActionsBottomSheet from '../../pages/wallet/AccountActionsBottomSheet'; import SwitchAccountModal from '../../pages/wallet/SwitchAccountModal'; import AccountListBottomSheet from '../../pages/wallet/AccountListBottomSheet'; import Assertions from '../../framework/Assertions'; @@ -6,7 +5,6 @@ import Browser from '../../pages/Browser/BrowserView'; import ConfirmationUITypes from '../../pages/Browser/Confirmations/ConfirmationUITypes'; import FixtureBuilder from '../../framework/fixtures/FixtureBuilder'; import FooterActions from '../../pages/Browser/Confirmations/FooterActions'; -import NetworkEducationModal from '../../pages/Network/NetworkEducationModal'; import NetworkListModal from '../../pages/Network/NetworkListModal'; import RowComponents from '../../pages/Browser/Confirmations/RowComponents'; import TabBarComponent from '../../pages/wallet/TabBarComponent'; @@ -41,9 +39,6 @@ async function changeNetworkFromNetworkListModal() { await TabBarComponent.tapWallet(); await WalletView.tapNetworksButtonOnNavBar(); await NetworkListModal.changeNetworkTo(LOCAL_CHAIN_NAME); - await device.disableSynchronization(); - await NetworkEducationModal.tapGotItButton(); - await device.enableSynchronization(); } async function checkConfirmationPage() { @@ -55,10 +50,21 @@ async function checkConfirmationPage() { async function tapSwitchAccountModal() { await WalletView.tapIdenticon(); await AccountListBottomSheet.tapEditAccountActionsAtIndex(0); - await AccountActionsBottomSheet.tapSwitchToSmartAccount(); + await SwitchAccountModal.tapSmartAccountLink(); await SwitchAccountModal.tapSwitchAccountButton(); } +async function goBackToWalletPage() { + await SwitchAccountModal.tapSmartAccountBackButton(); + await SwitchAccountModal.tapAccountModalBackButton(); + try { + await AccountListBottomSheet.dismissAccountListModalV2(); + } catch (error) { + // Modal might already be dismissed, continue with test + console.log('Modal already dismissed or not found, continuing...'); + } +} + async function connectTestDappToLocalhost() { await TabBarComponent.tapBrowser(); await Browser.navigateToTestDApp(); @@ -110,7 +116,6 @@ describe(SmokeConfirmationsRedesigned('7702 - smart account'), () => { await loginToApp(); // Submit send calls - await TabBarComponent.tapWallet(); await changeNetworkFromNetworkListModal(); await connectTestDappToLocalhost(); await TestDApp.tapSendCallsButton(); @@ -149,6 +154,7 @@ describe(SmokeConfirmationsRedesigned('7702 - smart account'), () => { // Accept confirmation await FooterActions.tapConfirmButton(); + await goBackToWalletPage(); // Check activity tab await TabBarComponent.tapActivity(); await Assertions.expectTextDisplayed('Switch to standard account'); @@ -156,49 +162,51 @@ describe(SmokeConfirmationsRedesigned('7702 - smart account'), () => { ); }); - // it('upgrades an account', async () => { - // await withFixtures( - // { - // dapps: [ - // { - // dappVariant: DappVariants.TEST_DAPP, - // }, - // ], - // fixture: new FixtureBuilder().build(), - // restartDevice: true, - // localNodeOptions: [ - // { - // type: LocalNodeType.anvil, - // options: localNodeOptions[0].options as AnvilNodeOptions, - // }, - // ], - // testSpecificMock, - // }, - // async () => { - // await loginToApp(); - - // // Create confirmation to upgrade account - // await TabBarComponent.tapWallet(); - // await changeNetworkFromNetworkListModal(); - // await tapSwitchAccountModal(); - - // // Check all expected elements are visible - // await Assertions.expectTextDisplayed('Account update'); - // await Assertions.expectTextDisplayed( - // "You're switching to a smart account.", - // ); - // await Assertions.expectElementToBeVisible( - // ConfirmationUITypes.ModalConfirmationContainer, - // ); - // await checkConfirmationPage(); - - // // Accept confirmation - // await FooterActions.tapConfirmButton(); - - // // Check activity tab - // await TabBarComponent.tapActivity(); - // await Assertions.expectTextDisplayed('Upgrade to smart account'); - // }, - // ); - // }); + it('upgrades an account', async () => { + await withFixtures( + { + dapps: [ + { + dappVariant: DappVariants.TEST_DAPP, + }, + ], + fixture: new FixtureBuilder().build(), + restartDevice: true, + localNodeOptions: [ + { + type: LocalNodeType.anvil, + options: localNodeOptions[0].options as AnvilNodeOptions, + }, + ], + testSpecificMock, + }, + async () => { + await loginToApp(); + await device.disableSynchronization(); + + // Create confirmation to upgrade account + await TabBarComponent.tapWallet(); + await changeNetworkFromNetworkListModal(); + await tapSwitchAccountModal(); + + // Check all expected elements are visible + await Assertions.expectTextDisplayed('Account update'); + await Assertions.expectTextDisplayed( + "You're switching to a smart account.", + ); + await Assertions.expectElementToBeVisible( + ConfirmationUITypes.ModalConfirmationContainer, + ); + await checkConfirmationPage(); + + // Accept confirmation + await FooterActions.tapConfirmButton(); + + await goBackToWalletPage(); + // Check activity tab + await TabBarComponent.tapActivity(); + await Assertions.expectTextDisplayed('Upgrade to smart account'); + }, + ); + }); }); From 73073cb7724cc3d242346ac29456f0fd5d79650a Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Fri, 10 Oct 2025 18:42:51 +0530 Subject: [PATCH 03/13] update --- e2e/pages/wallet/SwitchAccountModal.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/pages/wallet/SwitchAccountModal.ts b/e2e/pages/wallet/SwitchAccountModal.ts index 1162985c2c16..22753b7c38bc 100644 --- a/e2e/pages/wallet/SwitchAccountModal.ts +++ b/e2e/pages/wallet/SwitchAccountModal.ts @@ -10,7 +10,7 @@ class SwitchAccountModal { } get switchAccountButton(): DetoxElement { - return Matchers.getElementByLabel( + return Matchers.getElementByID( SwitchAccountModalSelectorIDs.SWITCH_ACCOUNT_BUTTON_LOCALHOST, ); } From a0280e5020440d7a7822d2f8ca329ffefaa70287 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Fri, 10 Oct 2025 18:46:31 +0530 Subject: [PATCH 04/13] update --- e2e/pages/wallet/SwitchAccountModal.ts | 13 +------------ e2e/specs/confirmations/batch-transaction.spec.ts | 5 +++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/e2e/pages/wallet/SwitchAccountModal.ts b/e2e/pages/wallet/SwitchAccountModal.ts index 22753b7c38bc..34111e1c4e21 100644 --- a/e2e/pages/wallet/SwitchAccountModal.ts +++ b/e2e/pages/wallet/SwitchAccountModal.ts @@ -1,7 +1,6 @@ -import Matchers from '../../framework/Matchers.ts'; import Gestures from '../../framework/Gestures.ts'; +import Matchers from '../../framework/Matchers.ts'; import { SwitchAccountModalSelectorIDs } from '../../selectors/wallet/SwitchAccountModal.selectors.js'; -import { AccountDetailsIds } from '../../selectors/MultichainAccounts/AccountDetails.selectors.ts'; class SwitchAccountModal { get smartAccountLink(): DetoxElement { return Matchers.getElementByID( @@ -21,10 +20,6 @@ class SwitchAccountModal { ); } - get accountModalBackButton(): DetoxElement { - return Matchers.getElementByID(AccountDetailsIds.BACK_BUTTON); - } - async tapSwitchAccountButton(): Promise { await Gestures.waitAndTap(this.switchAccountButton, { checkEnabled: false, @@ -43,12 +38,6 @@ class SwitchAccountModal { elemDescription: 'Smart Account back button', }); } - - async tapAccountModalBackButton(): Promise { - await Gestures.waitAndTap(this.accountModalBackButton, { - elemDescription: 'Account Modal back button', - }); - } } export default new SwitchAccountModal(); diff --git a/e2e/specs/confirmations/batch-transaction.spec.ts b/e2e/specs/confirmations/batch-transaction.spec.ts index 20df63df896d..9269a69c3593 100644 --- a/e2e/specs/confirmations/batch-transaction.spec.ts +++ b/e2e/specs/confirmations/batch-transaction.spec.ts @@ -1,4 +1,4 @@ -import SwitchAccountModal from '../../pages/wallet/SwitchAccountModal'; +import AccountDetails from '../../pages/MultichainAccounts/AccountDetails'; import AccountListBottomSheet from '../../pages/wallet/AccountListBottomSheet'; import Assertions from '../../framework/Assertions'; import Browser from '../../pages/Browser/BrowserView'; @@ -7,6 +7,7 @@ import FixtureBuilder from '../../framework/fixtures/FixtureBuilder'; import FooterActions from '../../pages/Browser/Confirmations/FooterActions'; import NetworkListModal from '../../pages/Network/NetworkListModal'; import RowComponents from '../../pages/Browser/Confirmations/RowComponents'; +import SwitchAccountModal from '../../pages/wallet/SwitchAccountModal'; import TabBarComponent from '../../pages/wallet/TabBarComponent'; import TestDApp from '../../pages/Browser/TestDApp'; import WalletView from '../../pages/wallet/WalletView'; @@ -56,7 +57,7 @@ async function tapSwitchAccountModal() { async function goBackToWalletPage() { await SwitchAccountModal.tapSmartAccountBackButton(); - await SwitchAccountModal.tapAccountModalBackButton(); + await AccountDetails.tapBackButton(); try { await AccountListBottomSheet.dismissAccountListModalV2(); } catch (error) { From 34c3d5142ec66ce4081fe1ff8f400e4b8062442e Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Fri, 10 Oct 2025 19:23:57 +0530 Subject: [PATCH 05/13] update --- .../7702}/batch-transaction.spec.ts | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) rename e2e/specs/{confirmations => confirmations-redesigned/transactions/7702}/batch-transaction.spec.ts (76%) diff --git a/e2e/specs/confirmations/batch-transaction.spec.ts b/e2e/specs/confirmations-redesigned/transactions/7702/batch-transaction.spec.ts similarity index 76% rename from e2e/specs/confirmations/batch-transaction.spec.ts rename to e2e/specs/confirmations-redesigned/transactions/7702/batch-transaction.spec.ts index 9269a69c3593..3a91811925cf 100644 --- a/e2e/specs/confirmations/batch-transaction.spec.ts +++ b/e2e/specs/confirmations-redesigned/transactions/7702/batch-transaction.spec.ts @@ -1,27 +1,27 @@ -import AccountDetails from '../../pages/MultichainAccounts/AccountDetails'; -import AccountListBottomSheet from '../../pages/wallet/AccountListBottomSheet'; -import Assertions from '../../framework/Assertions'; -import Browser from '../../pages/Browser/BrowserView'; -import ConfirmationUITypes from '../../pages/Browser/Confirmations/ConfirmationUITypes'; -import FixtureBuilder from '../../framework/fixtures/FixtureBuilder'; -import FooterActions from '../../pages/Browser/Confirmations/FooterActions'; -import NetworkListModal from '../../pages/Network/NetworkListModal'; -import RowComponents from '../../pages/Browser/Confirmations/RowComponents'; -import SwitchAccountModal from '../../pages/wallet/SwitchAccountModal'; -import TabBarComponent from '../../pages/wallet/TabBarComponent'; -import TestDApp from '../../pages/Browser/TestDApp'; -import WalletView from '../../pages/wallet/WalletView'; -import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../api-mocking/mock-responses/simulations'; -import { buildPermissions } from '../../framework/fixtures/FixtureUtils'; -import { loginToApp } from '../../viewHelper'; -import { SmokeConfirmationsRedesigned } from '../../tags'; -import { withFixtures } from '../../framework/fixtures/FixtureHelper'; -import { DappVariants } from '../../framework/Constants'; -import { AnvilNodeOptions, LocalNodeType } from '../../framework'; +import AccountDetails from '../../../../pages/MultichainAccounts/AccountDetails'; +import AccountListBottomSheet from '../../../../pages/wallet/AccountListBottomSheet'; +import Assertions from '../../../../framework/Assertions'; +import Browser from '../../../../pages/Browser/BrowserView'; +import ConfirmationUITypes from '../../../../pages/Browser/Confirmations/ConfirmationUITypes'; +import FixtureBuilder from '../../../../framework/fixtures/FixtureBuilder'; +import FooterActions from '../../../../pages/Browser/Confirmations/FooterActions'; +import NetworkListModal from '../../../../pages/Network/NetworkListModal'; +import RowComponents from '../../../../pages/Browser/Confirmations/RowComponents'; +import SwitchAccountModal from '../../../../pages/wallet/SwitchAccountModal'; +import TabBarComponent from '../../../../pages/wallet/TabBarComponent'; +import TestDApp from '../../../../pages/Browser/TestDApp'; +import WalletView from '../../../../pages/wallet/WalletView'; +import { SIMULATION_ENABLED_NETWORKS_MOCK } from '../../../../api-mocking/mock-responses/simulations'; +import { buildPermissions } from '../../../../framework/fixtures/FixtureUtils'; +import { loginToApp } from '../../../../viewHelper'; +import { SmokeConfirmationsRedesigned } from '../../../../tags'; +import { withFixtures } from '../../../../framework/fixtures/FixtureHelper'; +import { DappVariants } from '../../../../framework/Constants'; +import { AnvilNodeOptions, LocalNodeType } from '../../../../framework'; import { Mockttp } from 'mockttp'; -import { setupMockRequest } from '../../api-mocking/helpers/mockHelpers'; -import { confirmationsRedesignedFeatureFlags } from '../../api-mocking/mock-responses/feature-flags-mocks'; -import { setupRemoteFeatureFlagsMock } from '../../api-mocking/helpers/remoteFeatureFlagsHelper'; +import { setupMockRequest } from '../../../../api-mocking/helpers/mockHelpers'; +import { confirmationsRedesignedFeatureFlags } from '../../../../api-mocking/mock-responses/feature-flags-mocks'; +import { setupRemoteFeatureFlagsMock } from '../../../../api-mocking/helpers/remoteFeatureFlagsHelper'; const LOCAL_CHAIN_NAME = 'Localhost'; From fe1f2b9232d6a2cb5413b880eac1d2575d346389 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Fri, 10 Oct 2025 19:34:08 +0530 Subject: [PATCH 06/13] update --- .../transactions/7702/batch-transaction.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/e2e/specs/confirmations-redesigned/transactions/7702/batch-transaction.spec.ts b/e2e/specs/confirmations-redesigned/transactions/7702/batch-transaction.spec.ts index 3a91811925cf..0f017c658a17 100644 --- a/e2e/specs/confirmations-redesigned/transactions/7702/batch-transaction.spec.ts +++ b/e2e/specs/confirmations-redesigned/transactions/7702/batch-transaction.spec.ts @@ -183,7 +183,6 @@ describe(SmokeConfirmationsRedesigned('7702 - smart account'), () => { }, async () => { await loginToApp(); - await device.disableSynchronization(); // Create confirmation to upgrade account await TabBarComponent.tapWallet(); From c62dd58ea8b365478c02ac55ef0f7aca143c884d Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Fri, 10 Oct 2025 22:18:43 +0530 Subject: [PATCH 07/13] update --- .../transactions/7702/withDelegatorContracts.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json index 56f2f499b7ef..82269346adbe 100644 --- a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json +++ b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json @@ -219,9 +219,9 @@ } } }, - "best_block_number": "0x4", + "best_block_number": "4", "block": { - "number": "0x4", + "number": "4", "coinbase": "0x0000000000000000000000000000000000000000", "timestamp": "0x67e150f4", "gas_limit": "0x1c9c380", @@ -290,7 +290,7 @@ "receiptsRoot": "0x13f38bfac4f328a7b8287f747295102524cbba6fcb7508ac5f41cf7a89540707", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "difficulty": "0x0", - "number": "0x4", + "number": "4", "gasLimit": "0x1c9c380", "gasUsed": "0x143b63", "timestamp": "0x67e150f4", From 1dc8b456171c55f8b2451bd80fb423f4328a8fd5 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Mon, 13 Oct 2025 10:27:04 +0530 Subject: [PATCH 08/13] update --- .../transactions/7702/withDelegatorContracts.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json index 82269346adbe..db3f7b53e022 100644 --- a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json +++ b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json @@ -219,9 +219,9 @@ } } }, - "best_block_number": "4", + "best_block_number": 4, "block": { - "number": "4", + "number": 4, "coinbase": "0x0000000000000000000000000000000000000000", "timestamp": "0x67e150f4", "gas_limit": "0x1c9c380", @@ -290,7 +290,7 @@ "receiptsRoot": "0x13f38bfac4f328a7b8287f747295102524cbba6fcb7508ac5f41cf7a89540707", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "difficulty": "0x0", - "number": "4", + "number": 4, "gasLimit": "0x1c9c380", "gasUsed": "0x143b63", "timestamp": "0x67e150f4", From 0d12bbab0bc2f56d3dae9c7cb2d99e7385318342 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Mon, 13 Oct 2025 11:53:48 +0530 Subject: [PATCH 09/13] update --- .../transactions/7702/withDelegatorContracts.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json index db3f7b53e022..bc7300f7d69f 100644 --- a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json +++ b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json @@ -224,7 +224,7 @@ "number": 4, "coinbase": "0x0000000000000000000000000000000000000000", "timestamp": "0x67e150f4", - "gas_limit": "0x1c9c380", + "gas_limit": 30000000, "basefee": "0x2d81f0ba", "difficulty": "0x0", "prevrandao": "0x76d5ccfe10566cec19b4cb071969bfb3b3f7ae18b8f5e23d9c3056505c8128a2", @@ -242,7 +242,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "difficulty": "0x0", "number": "0x2", - "gasLimit": "0x1c9c380", + "gasLimit": 30000000, "gasUsed": "0x5acf3c", "timestamp": "0x67e150f4", "extraData": "0x", @@ -291,7 +291,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "difficulty": "0x0", "number": 4, - "gasLimit": "0x1c9c380", + "gasLimit": 30000000, "gasUsed": "0x143b63", "timestamp": "0x67e150f4", "extraData": "0x", @@ -340,7 +340,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "difficulty": "0x0", "number": "0x0", - "gasLimit": "0x1c9c380", + "gasLimit": 30000000, "gasUsed": "0x0", "timestamp": "0x67e150f2", "extraData": "0x", @@ -367,7 +367,7 @@ "logsBloom": "0x00000000000000000000002000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000810000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000800000000000000000000000000008000000000000000000000000800000001400000000000000000020000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040", "difficulty": "0x0", "number": "0x3", - "gasLimit": "0x1c9c380", + "gasLimit": 30000000, "gasUsed": "0x40f07f", "timestamp": "0x67e150f4", "extraData": "0x", @@ -416,7 +416,7 @@ "logsBloom": "0x00000000000000000002000000000000000000004000000000800000004000000000000000000000000000000000000000000000000000000000001000000020000000000000000000000000000000000001000000000020000000000000000000000800020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000080000000000000001000000000000000000000000000800000000000000000000000000000000000000000000000000000000008040001000000000000000000000000000000000000200000020000000000000000000000000000000000001000000000000000000000000000000", "difficulty": "0x0", "number": "0x1", - "gasLimit": "0x1c9c380", + "gasLimit": 30000000, "gasUsed": "0x3a8613", "timestamp": "0x67e150f3", "extraData": "0x", From d76580df30bc62070d4e6b8bca5f146c6c6c1f2f Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Mon, 13 Oct 2025 12:13:38 +0530 Subject: [PATCH 10/13] update --- .../transactions/7702/withDelegatorContracts.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json index bc7300f7d69f..a6fc76189cd0 100644 --- a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json +++ b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json @@ -225,7 +225,7 @@ "coinbase": "0x0000000000000000000000000000000000000000", "timestamp": "0x67e150f4", "gas_limit": 30000000, - "basefee": "0x2d81f0ba", + "basefee": 763490490, "difficulty": "0x0", "prevrandao": "0x76d5ccfe10566cec19b4cb071969bfb3b3f7ae18b8f5e23d9c3056505c8128a2", "blob_excess_gas_and_price": { "excess_blob_gas": 0, "blob_gasprice": 1 } @@ -297,7 +297,7 @@ "extraData": "0x", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", - "baseFeePerGas": "0x2d81f0ba", + "baseFeePerGas": 763490490, "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "blobGasUsed": "0x0", "excessBlobGas": "0x0", From 139560918953a71a348f11fb86db48b8032e3a4b Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Mon, 13 Oct 2025 12:46:36 +0530 Subject: [PATCH 11/13] update --- .../transactions/7702/withDelegatorContracts.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json index a6fc76189cd0..081f55666057 100644 --- a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json +++ b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json @@ -228,7 +228,8 @@ "basefee": 763490490, "difficulty": "0x0", "prevrandao": "0x76d5ccfe10566cec19b4cb071969bfb3b3f7ae18b8f5e23d9c3056505c8128a2", - "blob_excess_gas_and_price": { "excess_blob_gas": 0, "blob_gasprice": 1 } + "blob_excess_gas_and_price": { "excess_blob_gas": 0, "blob_gasprice": 1 }, + "beneficiary": "" }, "blocks": [ { From bbbc431069f21ad2079b4c22e58c540d6789f969 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Mon, 13 Oct 2025 13:14:44 +0530 Subject: [PATCH 12/13] update --- .../transactions/7702/withDelegatorContracts.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json index 081f55666057..a6fc76189cd0 100644 --- a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json +++ b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json @@ -228,8 +228,7 @@ "basefee": 763490490, "difficulty": "0x0", "prevrandao": "0x76d5ccfe10566cec19b4cb071969bfb3b3f7ae18b8f5e23d9c3056505c8128a2", - "blob_excess_gas_and_price": { "excess_blob_gas": 0, "blob_gasprice": 1 }, - "beneficiary": "" + "blob_excess_gas_and_price": { "excess_blob_gas": 0, "blob_gasprice": 1 } }, "blocks": [ { From 70aba951499b0658009365eedb50072f3421f061 Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Tue, 28 Oct 2025 18:23:49 +0530 Subject: [PATCH 13/13] update --- .../7702/withDelegatorContracts.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json index a6fc76189cd0..56f2f499b7ef 100644 --- a/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json +++ b/e2e/specs/confirmations-redesigned/transactions/7702/withDelegatorContracts.json @@ -219,13 +219,13 @@ } } }, - "best_block_number": 4, + "best_block_number": "0x4", "block": { - "number": 4, + "number": "0x4", "coinbase": "0x0000000000000000000000000000000000000000", "timestamp": "0x67e150f4", - "gas_limit": 30000000, - "basefee": 763490490, + "gas_limit": "0x1c9c380", + "basefee": "0x2d81f0ba", "difficulty": "0x0", "prevrandao": "0x76d5ccfe10566cec19b4cb071969bfb3b3f7ae18b8f5e23d9c3056505c8128a2", "blob_excess_gas_and_price": { "excess_blob_gas": 0, "blob_gasprice": 1 } @@ -242,7 +242,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "difficulty": "0x0", "number": "0x2", - "gasLimit": 30000000, + "gasLimit": "0x1c9c380", "gasUsed": "0x5acf3c", "timestamp": "0x67e150f4", "extraData": "0x", @@ -290,14 +290,14 @@ "receiptsRoot": "0x13f38bfac4f328a7b8287f747295102524cbba6fcb7508ac5f41cf7a89540707", "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "difficulty": "0x0", - "number": 4, - "gasLimit": 30000000, + "number": "0x4", + "gasLimit": "0x1c9c380", "gasUsed": "0x143b63", "timestamp": "0x67e150f4", "extraData": "0x", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "nonce": "0x0000000000000000", - "baseFeePerGas": 763490490, + "baseFeePerGas": "0x2d81f0ba", "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "blobGasUsed": "0x0", "excessBlobGas": "0x0", @@ -340,7 +340,7 @@ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "difficulty": "0x0", "number": "0x0", - "gasLimit": 30000000, + "gasLimit": "0x1c9c380", "gasUsed": "0x0", "timestamp": "0x67e150f2", "extraData": "0x", @@ -367,7 +367,7 @@ "logsBloom": "0x00000000000000000000002000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000810000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000800000000000000000000000000008000000000000000000000000800000001400000000000000000020000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040", "difficulty": "0x0", "number": "0x3", - "gasLimit": 30000000, + "gasLimit": "0x1c9c380", "gasUsed": "0x40f07f", "timestamp": "0x67e150f4", "extraData": "0x", @@ -416,7 +416,7 @@ "logsBloom": "0x00000000000000000002000000000000000000004000000000800000004000000000000000000000000000000000000000000000000000000000001000000020000000000000000000000000000000000001000000000020000000000000000000000800020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000080000000000000001000000000000000000000000000800000000000000000000000000000000000000000000000000000000008040001000000000000000000000000000000000000200000020000000000000000000000000000000000001000000000000000000000000000000", "difficulty": "0x0", "number": "0x1", - "gasLimit": 30000000, + "gasLimit": "0x1c9c380", "gasUsed": "0x3a8613", "timestamp": "0x67e150f3", "extraData": "0x",