feat(Multichain): Multichain Safes with same address

.github/workflows/e2e-ondemand.yml

@@ -28,7 +28,6 @@ jobs:
             cypress/e2e/regression/*.cy.js
             cypress/e2e/safe-apps/*.cy.js
             cypress/e2e/smoke/*.cy.js
-            cypress/e2e/prodhealthcheck/*.cy.js
           group: 'Regression on demand tests'
           tag: 'regression'
 

cypress/e2e/pages/create_wallet.pages.js

@@ -17,6 +17,7 @@ const googleSignedinBtn = '[data-testid="signed-in-account-btn"]'
 export const accountInfoHeader = '[data-testid="open-account-center"]'
 export const reviewStepOwnerInfo = '[data-testid="review-step-owner-info"]'
 const reviewStepNextBtn = '[data-testid="review-step-next-btn"]'
+const creationModalLetsGoBtn = '[data-testid="cf-creation-lets-go-btn"]'
 const safeCreationStatusInfo = '[data-testid="safe-status-info"]'
 const startUsingSafeBtn = '[data-testid="start-using-safe-btn"]'
 const sponsorIcon = '[data-testid="sponsor-icon"]'
@@ -36,6 +37,8 @@ export const activateAccountBtn = '[data-testid="activate-account-btn-cf"]'
 const notificationsSwitch = '[data-testid="notifications-switch"]'
 export const addFundsSection = '[data-testid="add-funds-section"]'
 export const noTokensAlert = '[data-testid="no-tokens-alert"]'
+const networkCheckbox = '[data-testid="network-checkbox"]'
+const cancelIcon = '[data-testid="CancelIcon"]'
 
 const sponsorStr = 'Your account is sponsored by Goerli'
 const safeCreationProcessing = 'Transaction is being executed'
@@ -61,8 +64,8 @@ export function checkNotificationsSwitchIs(status) {
   cy.get(notificationsSwitch).find('input').should(`be.${status}`)
 }
 
-export function clickOnActivateAccountBtn() {
-  cy.get(activateAccountBtn).click()
+export function clickOnActivateAccountBtn(index) {
+  cy.get(activateAccountBtn).eq(index).click()
 }
 
 export function clickOnQRCodeSwitch() {
@@ -123,6 +126,12 @@ export function clickOnReviewStepNextBtn() {
   cy.get(reviewStepNextBtn).click()
   cy.get(reviewStepNextBtn, { timeout: 60000 }).should('not.exist')
 }
+
+export function clickOnLetsGoBtn() {
+  cy.get(creationModalLetsGoBtn).click()
+  cy.get(creationModalLetsGoBtn, { timeout: 60000 }).should('not.exist')
+}
+
 export function verifyOwnerInfoIsPresent() {
   return cy.get(reviewStepOwnerInfo).shoul('exist')
 }
@@ -184,6 +193,17 @@ export function selectNetwork(network) {
   cy.get('li').parents('ul').contains(regex).click()
 }
 
+export function selectMultiNetwork(index, network) {
+  cy.get('input').eq(index).click()
+  cy.get('input').eq(index).type(network)
+  cy.get(networkCheckbox).eq(0).click()
+}
+
+export function clearNetworkInput(index) {
+  cy.get('input').eq(index).click()
+  cy.get(cancelIcon).click()
+}
+
 export function clickOnNextBtn() {
   cy.get(nextBtn).should('be.enabled').click()
 }
@@ -257,8 +277,8 @@ export function verifyThresholdStringInSummaryStep(startThreshold, endThreshold)
   cy.contains(`${startThreshold} out of ${endThreshold}`)
 }
 
-export function verifyNetworkInSummaryStep(network) {
-  cy.get('div').contains('Name').parent().parent().contains(network)
+export function verifySafeNetworkNameInSummaryStep(name) {
+  cy.get('div').contains('Name').parent().parent().contains(name)
 }
 
 export function verifyEstimatedFeeInSummaryStep() {

cypress/e2e/pages/load_safe.pages.js

@@ -210,7 +210,7 @@ export function verifyDataInReviewSection(safeName, ownerName, threshold = null,
   cy.findByText(ownerName).should('be.visible')
   if (ownerAddress !== null) cy.get(safeDataForm).contains(ownerAddress).should('be.visible')
   if (threshold !== null) cy.get(safeDataForm).contains(threshold).should('be.visible')
-  if (network !== null) cy.get(sidebar.chainLogo).eq(1).contains(network).should('be.visible')
+  if (network !== null) cy.get(sidebar.chainLogo).eq(0).contains(network).should('be.visible')
 }
 
 export function clickOnAddBtn() {

cypress/e2e/pages/owners.pages.js

@@ -16,7 +16,7 @@ const newOwnerNonceInput = 'input[name="nonce"]'
 const thresholdInput = 'input[name="threshold"]'
 const thresHoldDropDownIcon = 'svg[data-testid="ArrowDropDownIcon"]'
 const thresholdList = 'ul[role="listbox"]'
-const thresholdDropdown = 'div[aria-haspopup="listbox"]'
+const thresholdDropdown = '[data-testid="threshold-selector"]'
 const thresholdOption = 'li[role="option"]'
 const existingOwnerAddressInput = (index) => `input[name="owners.${index}.address"]`
 const existingOwnerNameInput = (index) => `input[name="owners.${index}.name"]`
@@ -80,7 +80,7 @@ export function verifyOwnerDeletionWindowDisplayed() {
 }
 
 function clickOnThresholdDropdown() {
-  cy.get(thresholdDropdown).eq(1).click()
+  cy.get(thresholdDropdown).eq(0).click()
 }
 
 export function getThresholdOptions() {

cypress/e2e/regression/create_safe_cf.cy.js

@@ -2,26 +2,15 @@ import * as constants from '../../support/constants'
 import * as main from '../pages/main.page'
 import * as createwallet from '../pages/create_wallet.pages'
 import * as owner from '../pages/owners.pages'
-import * as navigation from '../pages/navigation.page.js'
 import * as ls from '../../support/localstorage_data.js'
 import { getSafes, CATEGORIES } from '../../support/safes/safesHandler.js'
-import * as safeapps from '../pages/safeapps.pages'
 import * as wallet from '../../support/utils/wallet.js'
 
 let staticSafes = []
 const walletCredentials = JSON.parse(Cypress.env('CYPRESS_WALLET_CREDENTIALS'))
 // DO NOT use OWNER_2_PRIVATE_KEY for safe creation. Used for CF safes.
 const signer = walletCredentials.OWNER_2_PRIVATE_KEY
 
-const txOrder = [
-  'Activate Safe now',
-  'Add another signer',
-  'Set up recovery',
-  'Swap tokens',
-  'Custom transaction',
-  'Send token',
-]
-
 describe('CF Safe regression tests', () => {
   before(async () => {
     staticSafes = await getSafes(CATEGORIES.static)
@@ -31,19 +20,6 @@ describe('CF Safe regression tests', () => {
     cy.visit(constants.homeUrl + staticSafes.SEP_STATIC_SAFE_0)
   })
 
-  it('Verify Add native assets and Create tx modals can be opened', () => {
-    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
-    cy.reload()
-    wallet.connectSigner(signer)
-    owner.waitForConnectionStatus()
-    createwallet.clickOnAddFundsBtn()
-    main.verifyElementsIsVisible([createwallet.qrCode])
-    navigation.clickOnModalCloseBtn(0)
-
-    createwallet.clickOnCreateTxBtn()
-    navigation.clickOnModalCloseBtn(0)
-  })
-
   it('Verify "0 out of 2 step completed" is shown in the dashboard', () => {
     main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
     cy.reload()
@@ -70,68 +46,6 @@ describe('CF Safe regression tests', () => {
     createwallet.checkQRCodeSwitchStatus(constants.checkboxStates.unchecked)
   })
 
-  it('Verify "Create new transaction" modal contains tx types in sequence', () => {
-    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
-    cy.reload()
-    wallet.connectSigner(signer)
-    owner.waitForConnectionStatus()
-    createwallet.clickOnCreateTxBtn()
-    createwallet.checkAllTxTypesOrder(txOrder)
-  })
-
-  it('Verify "Add safe now" button takes to a tx "Activate account"', () => {
-    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
-    cy.reload()
-    wallet.connectSigner(signer)
-    owner.waitForConnectionStatus()
-    createwallet.clickOnCreateTxBtn()
-    createwallet.clickOnTxType(txOrder[0])
-    cy.contains(createwallet.deployWalletStr)
-  })
-
-  it('Verify "Add another Owner" takes to a tx Add owner', () => {
-    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
-    cy.reload()
-    wallet.connectSigner(signer)
-    owner.waitForConnectionStatus()
-    createwallet.clickOnCreateTxBtn()
-    createwallet.clickOnTxType(txOrder[1])
-    main.verifyTextVisibility([createwallet.addSignerStr])
-  })
-
-  it('Verify "Setup recovery" button takes to the "Account recovery" flow', () => {
-    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
-    cy.reload()
-    wallet.connectSigner(signer)
-    owner.waitForConnectionStatus()
-    createwallet.clickOnCreateTxBtn()
-    createwallet.clickOnTxType(txOrder[2])
-    main.verifyTextVisibility([createwallet.accountRecoveryStr])
-  })
-
-  it('Verify "Send token" takes to the tx form to send tokens', () => {
-    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
-    cy.reload()
-    wallet.connectSigner(signer)
-    owner.waitForConnectionStatus()
-    createwallet.clickOnCreateTxBtn()
-    createwallet.clickOnTxType(txOrder[5])
-    main.verifyTextVisibility([createwallet.sendTokensStr])
-  })
-
-  it('Verify "Custom transaction" takes to the tx builder app ', () => {
-    const iframeSelector = `iframe[id="iframe-${constants.TX_Builder_url}"]`
-    main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
-    cy.reload()
-    wallet.connectSigner(signer)
-    owner.waitForConnectionStatus()
-    createwallet.clickOnCreateTxBtn()
-    createwallet.clickOnTxType(txOrder[4])
-    main.getIframeBody(iframeSelector).within(() => {
-      cy.contains(safeapps.transactionBuilderStr)
-    })
-  })
-
   it('Verify "Notifications" in the settings are disabled', () => {
     main.addToLocalStorage(constants.localStorageKeys.SAFE_v2__undeployedSafes, ls.undeployedSafe.safe1)
     cy.reload()
@@ -151,7 +65,7 @@ describe('CF Safe regression tests', () => {
     cy.visit(constants.BALANCE_URL + staticSafes.SEP_STATIC_SAFE_0)
     wallet.connectSigner(signer)
     owner.waitForConnectionStatus()
-    createwallet.clickOnActivateAccountBtn()
-    main.verifyElementsIsVisible([createwallet.activateAccountBtn])
+    createwallet.clickOnActivateAccountBtn(1)
+    cy.contains(createwallet.deployWalletStr)
   })
 })

cypress/e2e/regression/create_safe_simple.cy.js

@@ -15,16 +15,6 @@ describe('Safe creation tests', () => {
     owner.waitForConnectionStatus()
   })
 
-  it('Verify Next button is disabled until switching to network is done', () => {
-    createwallet.clickOnContinueWithWalletBtn()
-    createwallet.selectNetwork(constants.networks.ethereum)
-    createwallet.clickOnCreateNewSafeBtn()
-    createwallet.checkNetworkChangeWarningMsg()
-    createwallet.verifyNextBtnIsDisabled()
-    createwallet.selectNetwork(constants.networks.sepolia)
-    createwallet.verifyNextBtnIsEnabled()
-  })
-
   // TODO: Check unit tests
   it('Verify error message is displayed if wallet name input exceeds 50 characters', () => {
     createwallet.clickOnContinueWithWalletBtn()
@@ -84,7 +74,7 @@ describe('Safe creation tests', () => {
     createwallet.verifyOwnerAddressInSummaryStep(constants.DEFAULT_OWNER_ADDRESS)
     createwallet.verifyOwnerAddressInSummaryStep(constants.DEFAULT_OWNER_ADDRESS)
     createwallet.verifyThresholdStringInSummaryStep(1, 2)
-    createwallet.verifyNetworkInSummaryStep(constants.networks.sepolia)
+    createwallet.verifySafeNetworkNameInSummaryStep(constants.networks.sepolia.toLowerCase())
     createwallet.clickOnBackBtn()
     createwallet.clickOnBackBtn()
     cy.wait(1000)
@@ -95,8 +85,7 @@ describe('Safe creation tests', () => {
     createwallet.verifyOwnerAddressInSummaryStep(constants.DEFAULT_OWNER_ADDRESS)
     createwallet.verifyOwnerAddressInSummaryStep(constants.DEFAULT_OWNER_ADDRESS)
     createwallet.verifyThresholdStringInSummaryStep(1, 2)
-    createwallet.verifyNetworkInSummaryStep(constants.networks.sepolia)
-    createwallet.verifyEstimatedFeeInSummaryStep()
+    createwallet.verifySafeNetworkNameInSummaryStep(constants.networks.sepolia.toLowerCase())
   })
 
   it('Verify tip is displayed on right side for threshold 1/1', () => {
@@ -133,11 +122,21 @@ describe('Safe creation tests', () => {
       )
       .then(() => {
         createwallet.waitForConnectionMsgDisappear()
+        createwallet.selectMultiNetwork(1, constants.networks.sepolia.toLowerCase())
         createwallet.clickOnNextBtn()
         createwallet.clickOnAddNewOwnerBtn()
         createwallet.clickOnSignerAddressInput(1)
         createwallet.selectSignerOnAutocomplete(2)
         owner.verifyErrorMsgInvalidAddress(constants.addressBookErrrMsg.ownerAdded)
       })
   })
+
+  // Unskip when the bug is fixed
+  it.skip('Verify Next button is disabled until switching to network is done', () => {
+    createwallet.clickOnContinueWithWalletBtn()
+    createwallet.clickOnCreateNewSafeBtn()
+    createwallet.verifyNextBtnIsEnabled()
+    createwallet.clearNetworkInput(1)
+    createwallet.verifyNextBtnIsDisabled()
+  })
 })

cypress/e2e/smoke/create_safe_cf.cy.js

@@ -40,6 +40,7 @@ describe('[SMOKE] CF Safe creation tests', () => {
         },
       ]
       checkDataLayerEvents(safe_created)
+      createwallet.clickOnLetsGoBtn()
       createwallet.verifyCFSafeCreated()
     })
   })

cypress/e2e/smoke/import_export_data.cy.js

@@ -3,7 +3,6 @@ import * as file from '../pages/import_export.pages'
 import * as main from '../pages/main.page'
 import * as constants from '../../support/constants'
 import * as ls from '../../support/localstorage_data.js'
-import * as createwallet from '../pages/create_wallet.pages'
 import * as sideBar from '../pages/sidebar.pages'
 import { getSafes, CATEGORIES } from '../../support/safes/safesHandler.js'
 
@@ -15,9 +14,7 @@ describe('[SMOKE] Import Export Data tests', () => {
   })
 
   beforeEach(() => {
-    cy.visit(constants.dataSettingsUrl).then(() => {
-      createwallet.selectNetwork(constants.networks.sepolia)
-    })
+    cy.visit(constants.dataSettingsUrl)
   })
 
   it('[SMOKE] Verify Safe can be accessed after test file upload', () => {

jest.setup.js

@@ -5,13 +5,15 @@
 // Learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom/extend-expect'
 import { TextEncoder, TextDecoder } from 'util'
+import { Headers, Request, Response } from 'node-fetch'
 
 jest.mock('@web3-onboard/coinbase', () => jest.fn())
 jest.mock('@web3-onboard/injected-wallets', () => ({ ProviderLabel: { MetaMask: 'MetaMask' } }))
 jest.mock('@web3-onboard/keystone/dist/index', () => jest.fn())
 jest.mock('@web3-onboard/ledger/dist/index', () => jest.fn())
 jest.mock('@web3-onboard/trezor', () => jest.fn())
 jest.mock('@web3-onboard/walletconnect', () => jest.fn())
+jest.mock('safe-client-gateway-sdk')
 
 const mockOnboardState = {
   chains: [],
@@ -68,3 +70,8 @@ Object.defineProperty(Uint8Array, Symbol.hasInstance, {
       : Uint8Array[Symbol.hasInstance].call(this, potentialInstance)
   },
 })
+
+// These are required for safe-client-gateway-sdk
+globalThis.Request = Request
+globalThis.Response = Response
+globalThis.Headers = Headers

package.json

@@ -57,7 +57,7 @@
     "@safe-global/api-kit": "^2.4.6",
     "@safe-global/protocol-kit": "^4.1.1",
     "@safe-global/safe-apps-sdk": "^9.1.0",
-    "@safe-global/safe-deployments": "^1.37.8",
+    "@safe-global/safe-deployments": "^1.37.10",
     "@safe-global/safe-gateway-typescript-sdk": "3.22.3-beta.15",
     "@safe-global/safe-modules-deployments": "^2.2.1",
     "@sentry/react": "^7.91.0",
@@ -91,6 +91,7 @@
     "react-hook-form": "7.41.1",
     "react-papaparse": "^4.0.2",
     "react-redux": "^9.1.2",
+    "safe-client-gateway-sdk": "git+https://github.com/safe-global/safe-client-gateway-sdk.git#v1.53.0-next-7344903",
     "semver": "^7.6.3",
     "zodiac-roles-deployments": "^2.2.5"
   },