From e5b3089434121301f727e3fa4d2b247c19704371 Mon Sep 17 00:00:00 2001 From: Pedro Novais <1478752+jpnovais@users.noreply.github.com> Date: Tue, 17 Sep 2024 17:19:19 +0100 Subject: [PATCH] coordinator: move BlockParameter to domain module (#45) --- .../consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt | 2 +- .../zkevm/coordinator/app/config/CoordinatorConfigTest.kt | 2 +- .../contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt | 2 +- .../clients/smartcontract/LineaRollupSmartContractClient.kt | 1 + .../zkevm/ethereum/finalization/FinalizationMonitorImpl.kt | 2 +- .../zkevm/ethereum/finalization/FinalizationMonitorImplTest.kt | 2 +- .../L2MessageAnchorerIntegrationTest.kt | 2 +- .../coordination/messageanchoring/MessageAnchoringService.kt | 2 +- .../src/main/kotlin/net/consensys/linea}/BlockParameter.kt | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) rename {coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/smartcontract => jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea}/BlockParameter.kt (96%) diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt index 4400e1fd8..f727ea077 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt +++ b/coordinator/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/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt index ca65a06d1..9549ae6d1 100644 --- a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt +++ b/coordinator/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/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt index 125751c9a..b13734da4 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt +++ b/coordinator/clients/smart-contract-client/src/main/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/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/smartcontract/LineaRollupSmartContractClient.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/smartcontract/LineaRollupSmartContractClient.kt index e4813f661..638029329 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/smartcontract/LineaRollupSmartContractClient.kt +++ b/coordinator/core/src/main/kotlin/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/coordinator/ethereum/finalization-monitor/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImpl.kt b/coordinator/ethereum/finalization-monitor/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImpl.kt index e3d6f28e4..5cd0d7840 100644 --- a/coordinator/ethereum/finalization-monitor/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImpl.kt +++ b/coordinator/ethereum/finalization-monitor/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/coordinator/ethereum/finalization-monitor/src/test/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImplTest.kt b/coordinator/ethereum/finalization-monitor/src/test/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImplTest.kt index 5148fc150..7b5ec28fe 100644 --- a/coordinator/ethereum/finalization-monitor/src/test/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImplTest.kt +++ b/coordinator/ethereum/finalization-monitor/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/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/L2MessageAnchorerIntegrationTest.kt b/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/L2MessageAnchorerIntegrationTest.kt index f60c2e06a..4c49913f6 100644 --- a/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/L2MessageAnchorerIntegrationTest.kt +++ b/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.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/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/MessageAnchoringService.kt b/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/MessageAnchoringService.kt index d5e03612c..077dc88fb 100644 --- a/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/MessageAnchoringService.kt +++ b/coordinator/ethereum/message-anchoring/src/main/kotlin/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/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/smartcontract/BlockParameter.kt b/jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/BlockParameter.kt similarity index 96% rename from coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/smartcontract/BlockParameter.kt rename to jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/BlockParameter.kt index 50e4f2956..899558f8b 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/smartcontract/BlockParameter.kt +++ b/jvm-libs/core/domain-models/src/main/kotlin/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