Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coordinator: move BlockParameter to domain module #45

Merged
merged 1 commit into from
Sep 17, 2024
Merged

coordinator: move BlockParameter to domain module #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...nator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...r/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ain/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions ...n/net/consensys/zkevm/coordinator/clients/smartcontract/LineaRollupSmartContractClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...itor/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...onsensys.zkevm.ethereum.coordination.messageanchoring/L2MessageAnchorerIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...lin/net/consensys/zkevm/ethereum/coordination/messageanchoring/MessageAnchoringService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...r/clients/smartcontract/BlockParameter.kt → ...lin/net/consensys/linea/BlockParameter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.consensys.zkevm.coordinator.clients.smartcontract
package net.consensys.linea

sealed interface BlockParameter {
fun getTag(): String
Expand Down
Loading