fix: merge conficts

Consensys · Sep 18, 2024 · 2ba5a84 · 2ba5a84
2 parents 3bcb624 + 1561fe8
commit 2ba5a84
Show file tree

Hide file tree

Showing 13 changed files with 157 additions and 216 deletions.
diff --git a/.github/workflows/bridge-ui-e2e-tests.yml b/.github/workflows/bridge-ui-e2e-tests.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   run-e2e-tests:
-    runs-on: ubuntu-22.04-16core
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/bridge-ui/test/e2e/bridge-l1-l2.spec.ts b/bridge-ui/test/e2e/bridge-l1-l2.spec.ts
@@ -7,7 +7,7 @@ const test = testWithSynpress(advancedFixtures);
 const { expect, describe } = test;
 
 describe("Bridge L1 > L2", () => {
-  test("should set up the UI and metamask correctly", async ({ page, metamask, initUI }) => {
+  test.skip("should set up the UI and metamask correctly", async ({ page, metamask, initUI }) => {
     await initUI(true);
 
     await page.locator("#wallet-connect-btn").click();
@@ -23,14 +23,14 @@ describe("Bridge L1 > L2", () => {
     expect(pageUrl).toEqual(TEST_URL);
   });
 
-  test("should successfully display the correct heading", async ({ page, initUI }) => {
+  test.skip("should successfully display the correct heading", async ({ page, initUI }) => {
     await initUI(true);
 
     const header = "Bridge";
     await page.locator("h2", { hasText: header }).waitFor({ state: "visible" });
   });
 
-  test("metamask should be connected to the right network", async ({ page, metamask, initUI }) => {
+  test.skip("metamask should be connected to the right network", async ({ page, metamask, initUI }) => {
     await initUI(true);
 
     await page.locator("#wallet-connect-btn").click();
@@ -62,7 +62,7 @@ describe("Bridge L1 > L2", () => {
     await page.locator("#transactions-list").locator("ul").nth(1).waitFor({ timeout: 10_000 });
   });
 
-  test("should be able to switch network", async ({ page, metamask, initUI }) => {
+  test.skip("should be able to switch network", async ({ page, metamask, initUI }) => {
     await initUI(true);
     await page.locator("#wallet-connect-btn").click();
     await page.locator("wui-list-wallet", { hasText: "MetaMask" }).nth(1).click();

diff --git a/contracts/package.json b/contracts/package.json
@@ -32,7 +32,7 @@
     "@openzeppelin/hardhat-upgrades": "2.5.1",
     "@safe-global/protocol-kit": "3.0.2",
     "@safe-global/safe-core-sdk-types": "4.0.2",
-    "@typechain/hardhat": "9.0.0",
+    "@typechain/hardhat": "9.1.0",
     "@types/diff": "5.2.0",
     "@types/yargs": "17.0.32",
     "c-kzg": "2.1.2",
@@ -42,7 +42,7 @@
     "dotenv": "16.4.5",
     "edit-json-file": "1.8.0",
     "ethers": "6.12.0",
-    "hardhat": "2.22.6",
+    "hardhat": "2.22.10",
     "hardhat-deploy": "0.12.4",
     "hardhat-storage-layout": "0.1.7",
     "hardhat-tracer": "2.8.2",

diff --git a/...nator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt b/...nator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt
@@ -4,6 +4,7 @@ import com.sksamuel.hoplite.ConfigAlias
 import com.sksamuel.hoplite.Masked
 import net.consensys.assertIs32Bytes
 import net.consensys.decodeHex
+import net.consensys.linea.BlockParameter
 import net.consensys.linea.assertIsValidAddress
 import net.consensys.linea.ethereum.gaspricing.dynamiccap.MAX_FEE_HISTORIES_STORAGE_PERIOD
 import net.consensys.linea.ethereum.gaspricing.dynamiccap.MAX_FEE_HISTORY_BLOCK_COUNT
@@ -18,7 +19,6 @@ import net.consensys.linea.traces.TracingModuleV1
 import net.consensys.linea.traces.TracingModuleV2
 import net.consensys.linea.web3j.SmartContractErrors
 import net.consensys.zkevm.coordinator.clients.prover.ProversConfig
-import net.consensys.zkevm.coordinator.clients.smartcontract.BlockParameter
 import java.math.BigInteger
 import java.net.URL
 import java.nio.file.Path

diff --git a/...r/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt b/...r/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt
@@ -5,6 +5,7 @@ import com.github.michaelbull.result.getError
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.onSuccess
 import com.sksamuel.hoplite.Masked
+import net.consensys.linea.BlockParameter
 import net.consensys.linea.traces.TracesCountersV1
 import net.consensys.linea.traces.TracesCountersV2
 import net.consensys.linea.traces.TracingModuleV1
@@ -14,7 +15,6 @@ import net.consensys.zkevm.coordinator.app.CoordinatorAppCli
 import net.consensys.zkevm.coordinator.clients.prover.FileBasedProverConfig
 import net.consensys.zkevm.coordinator.clients.prover.ProverConfig
 import net.consensys.zkevm.coordinator.clients.prover.ProversConfig
-import net.consensys.zkevm.coordinator.clients.smartcontract.BlockParameter
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.fail

diff --git a/...ain/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt b/...ain/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt
@@ -1,11 +1,11 @@
 package net.consensys.linea.contract.l1
 
 import net.consensys.encodeHex
+import net.consensys.linea.BlockParameter
 import net.consensys.linea.async.toSafeFuture
 import net.consensys.linea.contract.LineaRollup
 import net.consensys.toBigInteger
 import net.consensys.toULong
-import net.consensys.zkevm.coordinator.clients.smartcontract.BlockParameter
 import net.consensys.zkevm.coordinator.clients.smartcontract.LineaContractVersion
 import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClientReadOnly
 import org.apache.logging.log4j.LogManager

diff --git a/...n/net/consensys/zkevm/coordinator/clients/smartcontract/LineaRollupSmartContractClient.kt b/...n/net/consensys/zkevm/coordinator/clients/smartcontract/LineaRollupSmartContractClient.kt
@@ -1,5 +1,6 @@
 package net.consensys.zkevm.coordinator.clients.smartcontract
 
+import net.consensys.linea.BlockParameter
 import net.consensys.zkevm.domain.BlobRecord
 import net.consensys.zkevm.domain.ProofToFinalize
 import net.consensys.zkevm.ethereum.gaspricing.GasPriceCaps

diff --git a/...itor/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImpl.kt b/...itor/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImpl.kt
@@ -1,9 +1,9 @@
 package net.consensys.zkevm.ethereum.finalization
 
 import io.vertx.core.Vertx
+import net.consensys.linea.BlockParameter
 import net.consensys.toBigInteger
 import net.consensys.zkevm.PeriodicPollingService
-import net.consensys.zkevm.coordinator.clients.smartcontract.BlockParameter
 import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClientReadOnly
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger

diff --git a/.../src/test/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImplTest.kt b/.../src/test/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImplTest.kt
@@ -3,7 +3,7 @@ package net.consensys.zkevm.ethereum.finalization
 import io.vertx.core.Vertx
 import io.vertx.junit5.VertxExtension
 import io.vertx.junit5.VertxTestContext
-import net.consensys.zkevm.coordinator.clients.smartcontract.BlockParameter
+import net.consensys.linea.BlockParameter
 import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClientReadOnly
 import org.apache.tuweni.bytes.Bytes
 import org.apache.tuweni.bytes.Bytes32

diff --git a/...onsensys.zkevm.ethereum.coordination.messageanchoring/L2MessageAnchorerIntegrationTest.kt b/...onsensys.zkevm.ethereum.coordination.messageanchoring/L2MessageAnchorerIntegrationTest.kt
@@ -4,13 +4,13 @@ import io.vertx.core.Vertx
 import io.vertx.junit5.Timeout
 import io.vertx.junit5.VertxExtension
 import io.vertx.junit5.VertxTestContext
+import net.consensys.linea.BlockParameter
 import net.consensys.linea.async.toSafeFuture
 import net.consensys.linea.contract.AsyncFriendlyTransactionManager
 import net.consensys.linea.contract.EIP1559GasProvider
 import net.consensys.linea.contract.L2MessageService
 import net.consensys.linea.contract.LineaRollupAsyncFriendly
 import net.consensys.toBigInteger
-import net.consensys.zkevm.coordinator.clients.smartcontract.BlockParameter
 import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClient
 import net.consensys.zkevm.ethereum.ContractsManager
 import net.consensys.zkevm.ethereum.L1AccountManager

diff --git a/...lin/net/consensys/zkevm/ethereum/coordination/messageanchoring/MessageAnchoringService.kt b/...lin/net/consensys/zkevm/ethereum/coordination/messageanchoring/MessageAnchoringService.kt
@@ -1,10 +1,10 @@
 package net.consensys.zkevm.ethereum.coordination.messageanchoring
 
 import io.vertx.core.Vertx
+import net.consensys.linea.BlockParameter
 import net.consensys.linea.contract.AsyncFriendlyTransactionManager
 import net.consensys.linea.contract.L2MessageService
 import net.consensys.zkevm.PeriodicPollingService
-import net.consensys.zkevm.coordinator.clients.smartcontract.BlockParameter
 import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClientReadOnly
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger

diff --git a/...r/clients/smartcontract/BlockParameter.kt → ...lin/net/consensys/linea/BlockParameter.kt b/...r/clients/smartcontract/BlockParameter.kt → ...lin/net/consensys/linea/BlockParameter.kt
@@ -1,4 +1,4 @@
-package net.consensys.zkevm.coordinator.clients.smartcontract
+package net.consensys.linea
 
 sealed interface BlockParameter {
   fun getTag(): String