diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/L1DependentApp.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/L1DependentApp.kt index 9835b70c0..6c4b8f237 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/L1DependentApp.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/L1DependentApp.kt @@ -7,9 +7,9 @@ import build.linea.contract.l1.Web3JLineaRollupSmartContractClientReadOnly import build.linea.web3j.Web3JLogsClient import io.vertx.core.Vertx import kotlinx.datetime.Clock +import linea.domain.BlockNumberAndHash import linea.encoding.BlockRLPEncoder import linea.web3j.createWeb3jHttpClient -import net.consensys.linea.BlockNumberAndHash import net.consensys.linea.blob.ShnarfCalculatorVersion import net.consensys.linea.contract.Web3JL2MessageService import net.consensys.linea.contract.Web3JL2MessageServiceLogsClient diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/LastFinalizedBlockProvider.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/LastFinalizedBlockProvider.kt index cefdeff19..0a4393e48 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/LastFinalizedBlockProvider.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/LastFinalizedBlockProvider.kt @@ -2,7 +2,7 @@ package net.consensys.zkevm.coordinator.app import build.linea.contract.l1.LineaRollupSmartContractClientReadOnly import io.vertx.core.Vertx -import net.consensys.linea.BlockParameter +import linea.domain.BlockParameter import net.consensys.linea.async.AsyncRetryer import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger 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 938a8c59b..f12872b72 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 @@ -2,10 +2,10 @@ package net.consensys.zkevm.coordinator.app.config 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 linea.domain.BlockParameter +import linea.domain.assertIsValidAddress +import linea.kotlin.assertIs32Bytes +import linea.kotlin.decodeHex import net.consensys.linea.blob.BlobCompressorVersion import net.consensys.linea.ethereum.gaspricing.dynamiccap.MAX_FEE_HISTORIES_STORAGE_PERIOD import net.consensys.linea.ethereum.gaspricing.dynamiccap.MAX_FEE_HISTORY_BLOCK_COUNT diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/L2NetworkGasPricingConfig.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/L2NetworkGasPricingConfig.kt index cf2ed69c2..0466b27a2 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/L2NetworkGasPricingConfig.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/L2NetworkGasPricingConfig.kt @@ -1,6 +1,7 @@ package net.consensys.zkevm.coordinator.app.config import com.sksamuel.hoplite.ConfigAlias +import linea.kotlin.toKWeiUInt import net.consensys.linea.ethereum.gaspricing.BoundableFeeCalculator import net.consensys.linea.ethereum.gaspricing.staticcap.ExtraDataV1UpdaterImpl import net.consensys.linea.ethereum.gaspricing.staticcap.FeeHistoryFetcherImpl @@ -9,7 +10,6 @@ import net.consensys.linea.ethereum.gaspricing.staticcap.GasUsageRatioWeightedAv import net.consensys.linea.ethereum.gaspricing.staticcap.MinerExtraDataV1CalculatorImpl import net.consensys.linea.ethereum.gaspricing.staticcap.TransactionCostCalculator import net.consensys.linea.ethereum.gaspricing.staticcap.VariableFeesCalculator -import net.consensys.toKWeiUInt import net.consensys.zkevm.coordinator.app.L2NetworkGasPricingService import java.net.URL import java.time.Duration diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitor.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitor.kt index 27b658193..37e65a656 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitor.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitor.kt @@ -2,8 +2,8 @@ package net.consensys.zkevm.coordinator.blockcreation import io.vertx.core.Vertx import linea.domain.Block -import net.consensys.encodeHex -import net.consensys.linea.BlockParameter.Companion.toBlockParameter +import linea.domain.BlockParameter.Companion.toBlockParameter +import linea.kotlin.encodeHex import net.consensys.linea.async.AsyncRetryer import net.consensys.linea.web3j.ExtendedWeb3J import net.consensys.zkevm.PeriodicPollingService diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/GethCliqueSafeBlockProvider.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/GethCliqueSafeBlockProvider.kt index d66e80e0c..69932cfd7 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/GethCliqueSafeBlockProvider.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/GethCliqueSafeBlockProvider.kt @@ -2,8 +2,8 @@ package net.consensys.zkevm.coordinator.blockcreation import build.linea.web3j.domain.toWeb3j import linea.domain.Block +import linea.domain.BlockParameter.Companion.toBlockParameter import linea.web3j.toDomain -import net.consensys.linea.BlockParameter.Companion.toBlockParameter import net.consensys.linea.async.toSafeFuture import net.consensys.zkevm.ethereum.coordination.blockcreation.SafeBlockProvider import org.web3j.protocol.Web3j diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesClientV2Adapter.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesClientV2Adapter.kt index fecfdd609..5511d675b 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesClientV2Adapter.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesClientV2Adapter.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.coordinator.blockcreation import com.github.michaelbull.result.Result -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash import net.consensys.linea.errors.ErrorResponse import net.consensys.zkevm.coordinator.clients.GenerateTracesResponse import net.consensys.zkevm.coordinator.clients.GetTracesCountersResponse diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesCountersV1WatcherClient.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesCountersV1WatcherClient.kt index 72711c538..2c0fb6e17 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesCountersV1WatcherClient.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesCountersV1WatcherClient.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.coordinator.blockcreation import com.github.michaelbull.result.Result -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash import net.consensys.linea.errors.ErrorResponse import net.consensys.zkevm.coordinator.clients.GetTracesCountersResponse import net.consensys.zkevm.coordinator.clients.TracesCountersClientV1 diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobZkStateProviderImpl.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobZkStateProviderImpl.kt index fe27a91e6..67982a2ef 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobZkStateProviderImpl.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobZkStateProviderImpl.kt @@ -2,7 +2,7 @@ package net.consensys.zkevm.ethereum.coordination.blob import build.linea.clients.GetStateMerkleProofRequest import build.linea.clients.StateManagerClientV1 -import build.linea.domain.BlockInterval +import linea.domain.BlockInterval import tech.pegasys.teku.infrastructure.async.SafeFuture class BlobZkStateProviderImpl( diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImpl.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImpl.kt index a55383b11..56a027d6d 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImpl.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImpl.kt @@ -2,7 +2,7 @@ package net.consensys.zkevm.ethereum.coordination.blockcreation import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.onSuccess -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash import net.consensys.zkevm.coordinator.clients.RollupForkChoiceUpdatedClient import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/L1BasedLastFinalizedBlockProviderTest.kt b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/L1BasedLastFinalizedBlockProviderTest.kt index e9a655e99..54aae27b1 100644 --- a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/L1BasedLastFinalizedBlockProviderTest.kt +++ b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/L1BasedLastFinalizedBlockProviderTest.kt @@ -2,7 +2,7 @@ package net.consensys.zkevm.coordinator.app import build.linea.contract.l1.LineaRollupSmartContractClientReadOnly import io.vertx.core.Vertx -import net.consensys.linea.BlockParameter +import linea.domain.BlockParameter import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/SwitchProviderImplTest.kt b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/SwitchProviderImplTest.kt index 8e6b0d012..a9f3c0a83 100644 --- a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/SwitchProviderImplTest.kt +++ b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/SwitchProviderImplTest.kt @@ -6,9 +6,9 @@ import build.linea.web3j.Web3JLogsClient import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext +import linea.kotlin.toULong import net.consensys.linea.contract.EIP1559GasProvider import net.consensys.linea.contract.L2MessageService -import net.consensys.toULong import net.consensys.zkevm.ethereum.coordination.conflation.upgrade.SwitchProvider import net.consensys.zkevm.ethereum.signing.ECKeypairSigner import net.consensys.zkevm.ethereum.signing.ECKeypairSignerAdapter 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 9beab2237..309f6b575 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 @@ -4,7 +4,7 @@ import com.github.michaelbull.result.getError import com.sksamuel.hoplite.Masked import linea.coordinator.config.loadConfigs import linea.coordinator.config.loadConfigsOrError -import net.consensys.linea.BlockParameter +import linea.domain.BlockParameter import net.consensys.linea.blob.BlobCompressorVersion import net.consensys.linea.ethereum.gaspricing.BoundableFeeCalculator import net.consensys.linea.ethereum.gaspricing.staticcap.ExtraDataV1UpdaterImpl diff --git a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitorTest.kt b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitorTest.kt index bed693e9f..89acb5671 100644 --- a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitorTest.kt +++ b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitorTest.kt @@ -7,14 +7,14 @@ import linea.domain.Block import linea.domain.createBlock import linea.domain.toEthGetBlockResponse import linea.jsonrpc.TestingJsonRpcServer +import linea.kotlin.ByteArrayExt +import linea.kotlin.toHexString +import linea.kotlin.toULongFromHex import linea.log4j.configureLoggers import linea.web3j.createWeb3jHttpClient -import net.consensys.ByteArrayExt import net.consensys.linea.async.get import net.consensys.linea.web3j.ExtendedWeb3J import net.consensys.linea.web3j.ExtendedWeb3JImpl -import net.consensys.toHexString -import net.consensys.toULongFromHex import net.consensys.zkevm.ethereum.coordination.blockcreation.BlockCreated import net.consensys.zkevm.ethereum.coordination.blockcreation.BlockCreationListener import org.apache.logging.log4j.Level @@ -29,7 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith import org.mockito.kotlin.mock import tech.pegasys.teku.infrastructure.async.SafeFuture import java.util.concurrent.CopyOnWriteArrayList -import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds @@ -48,7 +47,6 @@ class BlockCreationMonitorTest { lastL2BlockNumberToProcessInclusive = null ) private lateinit var vertx: Vertx - private val executor = Executors.newSingleThreadScheduledExecutor() private lateinit var lastProvenBlockNumberProvider: LastProvenBlockNumberProviderDouble private lateinit var monitor: BlockCreationMonitor diff --git a/coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ConsecutiveProvenBlobsProviderWithLastEndBlockNumberTrackerTest.kt b/coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ConsecutiveProvenBlobsProviderWithLastEndBlockNumberTrackerTest.kt index 76e25d1d8..f8f58b45a 100644 --- a/coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ConsecutiveProvenBlobsProviderWithLastEndBlockNumberTrackerTest.kt +++ b/coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ConsecutiveProvenBlobsProviderWithLastEndBlockNumberTrackerTest.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.ethereum.coordination.aggregation -import build.linea.domain.BlockIntervals import kotlinx.datetime.Instant +import linea.domain.BlockIntervals import net.consensys.zkevm.domain.BlobAndBatchCounters import net.consensys.zkevm.domain.BlobCounters import net.consensys.zkevm.persistence.AggregationsRepository diff --git a/coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImplTest.kt b/coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImplTest.kt index 7a7513ff8..97ce5e3b8 100644 --- a/coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImplTest.kt +++ b/coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImplTest.kt @@ -2,8 +2,8 @@ package net.consensys.zkevm.ethereum.coordination.blockcreation import com.github.michaelbull.result.Err import com.github.michaelbull.result.Ok -import net.consensys.ByteArrayExt -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash +import linea.kotlin.ByteArrayExt import net.consensys.linea.errors.ErrorResponse import net.consensys.zkevm.coordinator.clients.RollupForkChoiceUpdatedClient import net.consensys.zkevm.coordinator.clients.RollupForkChoiceUpdatedError diff --git a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ABProverClientRouter.kt b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ABProverClientRouter.kt index dc118f3f3..810bc858d 100644 --- a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ABProverClientRouter.kt +++ b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ABProverClientRouter.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.coordinator.clients.prover -import build.linea.domain.BlockInterval +import linea.domain.BlockInterval import net.consensys.zkevm.coordinator.clients.ProverClient import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedExecutionProverClientV2.kt b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedExecutionProverClientV2.kt index 294c577b4..e2079006f 100644 --- a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedExecutionProverClientV2.kt +++ b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedExecutionProverClientV2.kt @@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.node.ArrayNode import io.vertx.core.Vertx import linea.encoding.BlockRLPEncoder -import net.consensys.encodeHex +import linea.kotlin.encodeHex +import linea.kotlin.toBigInteger import net.consensys.linea.async.toSafeFuture -import net.consensys.toBigInteger import net.consensys.zkevm.coordinator.clients.BatchExecutionProofRequestV1 import net.consensys.zkevm.coordinator.clients.BatchExecutionProofResponse import net.consensys.zkevm.coordinator.clients.ExecutionProverClientV2 diff --git a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedProofAggregationClientV2.kt b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedProofAggregationClientV2.kt index af06b425d..daf8d714f 100644 --- a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedProofAggregationClientV2.kt +++ b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedProofAggregationClientV2.kt @@ -2,7 +2,7 @@ package net.consensys.zkevm.coordinator.clients.prover import com.fasterxml.jackson.databind.ObjectMapper import io.vertx.core.Vertx -import net.consensys.encodeHex +import linea.kotlin.encodeHex import net.consensys.zkevm.coordinator.clients.ProofAggregationProverClientV2 import net.consensys.zkevm.coordinator.clients.prover.serialization.JsonSerialization import net.consensys.zkevm.coordinator.clients.prover.serialization.ProofToFinalizeJsonResponse diff --git a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClient.kt b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClient.kt index 4b71a022c..2c3c615b6 100644 --- a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClient.kt +++ b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClient.kt @@ -1,10 +1,10 @@ package net.consensys.zkevm.coordinator.clients.prover -import build.linea.domain.BlockInterval import com.github.michaelbull.result.Err import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.map import io.vertx.core.Vertx +import linea.domain.BlockInterval import net.consensys.linea.errors.ErrorResponse import net.consensys.zkevm.domain.ProofIndex import net.consensys.zkevm.fileio.FileMonitor diff --git a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactory.kt b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactory.kt index ed09edbce..690b4bf6a 100644 --- a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactory.kt +++ b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactory.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.coordinator.clients.prover -import build.linea.domain.BlockInterval import io.vertx.core.Vertx +import linea.domain.BlockInterval import net.consensys.linea.contract.Web3JL2MessageServiceLogsClient import net.consensys.linea.metrics.LineaMetricsCategory import net.consensys.linea.metrics.MetricsFacade diff --git a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvider.kt b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvider.kt index cbe03af24..55c95db14 100644 --- a/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvider.kt +++ b/coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvider.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.coordinator.clients.prover -import net.consensys.encodeHex +import linea.kotlin.encodeHex import net.consensys.zkevm.domain.ProofIndex open class ProverFileNameProvider(protected val fileNameSuffix: String) { diff --git a/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ExecutionProofRequestDataDecoratorTest.kt b/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ExecutionProofRequestDataDecoratorTest.kt index f5db49f45..85a819567 100644 --- a/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ExecutionProofRequestDataDecoratorTest.kt +++ b/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ExecutionProofRequestDataDecoratorTest.kt @@ -4,8 +4,8 @@ import build.linea.clients.GetZkEVMStateMerkleProofResponse import com.fasterxml.jackson.databind.node.ArrayNode import linea.domain.Block import linea.domain.createBlock -import net.consensys.ByteArrayExt -import net.consensys.encodeHex +import linea.kotlin.ByteArrayExt +import linea.kotlin.encodeHex import net.consensys.zkevm.coordinator.clients.BatchExecutionProofRequestV1 import net.consensys.zkevm.coordinator.clients.GenerateTracesResponse import net.consensys.zkevm.coordinator.clients.L2MessageServiceLogsClient diff --git a/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClientTest.kt b/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClientTest.kt index aef7c13f5..c7a73b7ac 100644 --- a/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClientTest.kt +++ b/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClientTest.kt @@ -1,8 +1,8 @@ package net.consensys.zkevm.coordinator.clients.prover -import build.linea.domain.BlockInterval import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension +import linea.domain.BlockInterval import net.consensys.zkevm.coordinator.clients.prover.serialization.JsonSerialization import net.consensys.zkevm.domain.ProofIndex import net.consensys.zkevm.fileio.FileReader diff --git a/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactoryTest.kt b/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactoryTest.kt index 66b01a8ed..dde9c0aed 100644 --- a/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactoryTest.kt +++ b/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactoryTest.kt @@ -1,12 +1,12 @@ package net.consensys.zkevm.coordinator.clients.prover -import build.linea.domain.BlockIntervals import io.micrometer.core.instrument.MeterRegistry import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension import kotlinx.datetime.Clock -import net.consensys.ByteArrayExt +import linea.domain.BlockIntervals +import linea.kotlin.ByteArrayExt import net.consensys.linea.metrics.MetricsFacade import net.consensys.linea.metrics.micrometer.MicrometerMetricsFacade import net.consensys.zkevm.domain.ProofIndex diff --git a/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvidersTest.kt b/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvidersTest.kt index ff31f15ef..c8fdbc6b5 100644 --- a/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvidersTest.kt +++ b/coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvidersTest.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.coordinator.clients.prover -import net.consensys.decodeHex +import linea.kotlin.decodeHex import net.consensys.zkevm.domain.ProofIndex import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/coordinator/clients/prover-client/serialization/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobJsonFileRequestResponse.kt b/coordinator/clients/prover-client/serialization/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobJsonFileRequestResponse.kt index 2ecfa52f1..a541675a4 100644 --- a/coordinator/clients/prover-client/serialization/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobJsonFileRequestResponse.kt +++ b/coordinator/clients/prover-client/serialization/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobJsonFileRequestResponse.kt @@ -1,6 +1,5 @@ package net.consensys.zkevm.coordinator.clients.prover.serialization -import build.linea.domain.BlockIntervals import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParser @@ -10,8 +9,9 @@ import com.fasterxml.jackson.databind.JsonSerializer import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import net.consensys.decodeHex -import net.consensys.encodeHex +import linea.domain.BlockIntervals +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import net.consensys.zkevm.coordinator.clients.BlobCompressionProof import net.consensys.zkevm.coordinator.clients.BlobCompressionProofRequest diff --git a/coordinator/clients/prover-client/serialization/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobCompressionProofJsonResponseTest.kt b/coordinator/clients/prover-client/serialization/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobCompressionProofJsonResponseTest.kt index 334d01a52..1d32ff5fd 100644 --- a/coordinator/clients/prover-client/serialization/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobCompressionProofJsonResponseTest.kt +++ b/coordinator/clients/prover-client/serialization/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobCompressionProofJsonResponseTest.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.coordinator.clients.prover.serialization -import build.linea.domain.BlockIntervals +import linea.domain.BlockIntervals import net.consensys.zkevm.coordinator.clients.prover.serialization.JsonSerialization.proofResponseMapperV1 import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/coordinator/clients/shomei-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClient.kt b/coordinator/clients/shomei-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClient.kt index f4001ecf5..6d5035bcd 100644 --- a/coordinator/clients/shomei-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClient.kt +++ b/coordinator/clients/shomei-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClient.kt @@ -5,8 +5,8 @@ import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.mapEither import com.github.michaelbull.result.runCatching import io.vertx.core.Vertx -import net.consensys.encodeHex -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash +import linea.kotlin.encodeHex import net.consensys.linea.async.toSafeFuture import net.consensys.linea.errors.ErrorResponse import net.consensys.linea.jsonrpc.JsonRpcErrorResponse diff --git a/coordinator/clients/shomei-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClientTest.kt b/coordinator/clients/shomei-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClientTest.kt index cf12d9e20..9dea1b2f6 100644 --- a/coordinator/clients/shomei-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClientTest.kt +++ b/coordinator/clients/shomei-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClientTest.kt @@ -9,9 +9,9 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.vertx.core.Vertx import io.vertx.core.json.JsonObject import io.vertx.junit5.VertxExtension -import net.consensys.ByteArrayExt -import net.consensys.encodeHex -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash +import linea.kotlin.ByteArrayExt +import linea.kotlin.encodeHex import net.consensys.linea.async.get import net.consensys.linea.jsonrpc.client.JsonRpcClient import net.consensys.linea.jsonrpc.client.VertxHttpJsonRpcClientFactory diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/EIP1559GasProvider.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/EIP1559GasProvider.kt index 221add0ba..6679b0c06 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/EIP1559GasProvider.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/EIP1559GasProvider.kt @@ -1,11 +1,11 @@ package net.consensys.linea.contract +import linea.kotlin.toBigInteger +import linea.kotlin.toIntervalString import net.consensys.linea.web3j.AtomicContractEIP1559GasProvider import net.consensys.linea.web3j.EIP1559GasFees import net.consensys.linea.web3j.blocksRange import net.consensys.linea.web3j.toLineaDomain -import net.consensys.toBigInteger -import net.consensys.toIntervalString import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import org.web3j.protocol.Web3j diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/LineaRollupAsyncFriendly.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/LineaRollupAsyncFriendly.kt index 4221324fe..262c0aa07 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/LineaRollupAsyncFriendly.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/LineaRollupAsyncFriendly.kt @@ -1,11 +1,11 @@ package net.consensys.linea.contract import build.linea.contract.LineaRollupV6 +import linea.kotlin.toBigInteger +import linea.kotlin.toULong import net.consensys.linea.web3j.AtomicContractEIP1559GasProvider import net.consensys.linea.web3j.EIP1559GasFees import net.consensys.linea.web3j.SmartContractErrors -import net.consensys.toBigInteger -import net.consensys.toULong import org.web3j.abi.FunctionEncoder import org.web3j.abi.datatypes.Function import org.web3j.crypto.Credentials diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/StaticGasProvider.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/StaticGasProvider.kt index bc68a61a7..4d76180e8 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/StaticGasProvider.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/StaticGasProvider.kt @@ -1,11 +1,11 @@ package net.consensys.linea.contract -import net.consensys.gwei +import linea.kotlin.gwei +import linea.kotlin.toBigInteger import net.consensys.linea.web3j.AtomicContractEIP1559GasProvider import net.consensys.linea.web3j.EIP1559GasFees import net.consensys.linea.web3j.EIP4844GasFees import net.consensys.linea.web3j.EIP4844GasProvider -import net.consensys.toBigInteger import java.math.BigInteger // this class is mainly intended to be used for testing purposes diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JContractAsyncHelper.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JContractAsyncHelper.kt index f90df0c54..a49fc90e9 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JContractAsyncHelper.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JContractAsyncHelper.kt @@ -1,5 +1,8 @@ package net.consensys.linea.contract +import linea.kotlin.toBigInteger +import linea.kotlin.toGWei +import linea.kotlin.toULong import net.consensys.linea.async.toSafeFuture import net.consensys.linea.web3j.AtomicContractEIP1559GasProvider import net.consensys.linea.web3j.EIP1559GasFees @@ -8,9 +11,6 @@ import net.consensys.linea.web3j.EIP4844GasProvider import net.consensys.linea.web3j.Eip4844Transaction import net.consensys.linea.web3j.SmartContractErrors import net.consensys.linea.web3j.informativeEthCall -import net.consensys.toBigInteger -import net.consensys.toGWei -import net.consensys.toULong import net.consensys.zkevm.ethereum.gaspricing.GasPriceCaps import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageService.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageService.kt index cf37f7c16..11dbd3038 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageService.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageService.kt @@ -1,8 +1,8 @@ package net.consensys.linea.contract import io.vertx.core.Vertx +import linea.kotlin.toULong import net.consensys.linea.async.toSafeFuture -import net.consensys.toULong import net.consensys.zkevm.coordinator.clients.L2MessageServiceClient import net.consensys.zkevm.coordinator.clients.L2MessageServiceLogsClient import net.consensys.zkevm.domain.L2RollingHashUpdatedEvent diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageServiceLogsClient.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageServiceLogsClient.kt index ee174c634..662f0715b 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageServiceLogsClient.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageServiceLogsClient.kt @@ -1,7 +1,7 @@ package net.consensys.linea.contract import build.linea.web3j.Web3JLogsClient -import net.consensys.toULong +import linea.kotlin.toULong import net.consensys.zkevm.coordinator.clients.L2MessageServiceLogsClient import net.consensys.zkevm.domain.BridgeLogsData import net.consensys.zkevm.domain.L2RollingHashUpdatedEvent diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/GenesisStateProvider.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/GenesisStateProvider.kt index 229cc8beb..c53820fc2 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/GenesisStateProvider.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/GenesisStateProvider.kt @@ -1,6 +1,6 @@ package net.consensys.linea.contract.l1 -import net.consensys.encodeHex +import linea.kotlin.encodeHex import net.consensys.zkevm.coordinator.clients.smartcontract.LineaGenesisStateProvider data class GenesisStateProvider( diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JFunctionBuildersV6.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JFunctionBuildersV6.kt index 0020b985c..ddfab6a4e 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JFunctionBuildersV6.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JFunctionBuildersV6.kt @@ -2,7 +2,7 @@ package net.consensys.linea.contract.l1 import build.linea.contract.LineaRollupV6 import build.linea.contract.l1.LineaContractVersion -import net.consensys.toBigInteger +import linea.kotlin.toBigInteger import net.consensys.zkevm.domain.BlobRecord import net.consensys.zkevm.domain.ProofToFinalize import org.web3j.abi.TypeReference diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClient.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClient.kt index 76e101026..c4c59d966 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClient.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClient.kt @@ -2,13 +2,13 @@ package net.consensys.linea.contract.l1 import build.linea.contract.LineaRollupV6 import build.linea.contract.l1.Web3JLineaRollupSmartContractClientReadOnly +import linea.kotlin.toULong import net.consensys.linea.contract.AsyncFriendlyTransactionManager import net.consensys.linea.contract.Web3JContractAsyncHelper import net.consensys.linea.contract.throwExceptionIfJsonRpcErrorReturned import net.consensys.linea.contract.toWeb3JTxBlob import net.consensys.linea.web3j.SmartContractErrors import net.consensys.linea.web3j.informativeEthCall -import net.consensys.toULong import net.consensys.zkevm.coordinator.clients.smartcontract.BlockAndNonce import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClient import net.consensys.zkevm.domain.BlobRecord diff --git a/coordinator/clients/traces-generator-api-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1.kt b/coordinator/clients/traces-generator-api-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1.kt index 9f0f85516..d76b26bf0 100644 --- a/coordinator/clients/traces-generator-api-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1.kt +++ b/coordinator/clients/traces-generator-api-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1.kt @@ -4,8 +4,8 @@ import com.github.michaelbull.result.Result import com.github.michaelbull.result.mapEither import io.vertx.core.Vertx import io.vertx.core.json.JsonObject -import net.consensys.encodeHex -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash +import linea.kotlin.encodeHex import net.consensys.linea.async.toSafeFuture import net.consensys.linea.errors.ErrorResponse import net.consensys.linea.jsonrpc.JsonRpcRequestMapParams diff --git a/coordinator/clients/traces-generator-api-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1Test.kt b/coordinator/clients/traces-generator-api-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1Test.kt index 59642d21b..79da7ab71 100644 --- a/coordinator/clients/traces-generator-api-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1Test.kt +++ b/coordinator/clients/traces-generator-api-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1Test.kt @@ -17,9 +17,9 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.vertx.core.Vertx import io.vertx.core.json.JsonObject import io.vertx.junit5.VertxExtension -import net.consensys.ByteArrayExt -import net.consensys.encodeHex -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash +import linea.kotlin.ByteArrayExt +import linea.kotlin.encodeHex import net.consensys.linea.async.get import net.consensys.linea.errors.ErrorResponse import net.consensys.linea.jsonrpc.client.JsonRpcClient diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BatchExecutionProverRequestResponse.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BatchExecutionProverRequestResponse.kt index d3af4a259..07dd8a7c5 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BatchExecutionProverRequestResponse.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BatchExecutionProverRequestResponse.kt @@ -1,8 +1,8 @@ package net.consensys.zkevm.coordinator.clients import build.linea.clients.GetZkEVMStateMerkleProofResponse -import build.linea.domain.BlockInterval import linea.domain.Block +import linea.domain.BlockInterval data class BatchExecutionProofRequestV1( val blocks: List, diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BlobCompressionProverRequestResponse.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BlobCompressionProverRequestResponse.kt index 2bf32a247..aecc4977f 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BlobCompressionProverRequestResponse.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BlobCompressionProverRequestResponse.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.coordinator.clients -import build.linea.domain.BlockInterval -import build.linea.domain.BlockIntervals +import linea.domain.BlockInterval +import linea.domain.BlockIntervals import net.consensys.zkevm.domain.ConflationCalculationResult import net.consensys.zkevm.ethereum.coordination.blob.ShnarfResult diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/RollupForkChoiceUpdatedClient.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/RollupForkChoiceUpdatedClient.kt index aab1da073..081dab6d8 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/RollupForkChoiceUpdatedClient.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/RollupForkChoiceUpdatedClient.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.coordinator.clients import com.github.michaelbull.result.Result -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash import net.consensys.linea.errors.ErrorResponse import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesServiceClient.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesServiceClient.kt index a5a6a72ec..f84407e11 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesServiceClient.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesServiceClient.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.coordinator.clients import com.github.michaelbull.result.Result -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash import net.consensys.linea.errors.ErrorResponse import net.consensys.linea.traces.TracesCounters import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Aggregation.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Aggregation.kt index 093ffd7a8..8f96a0663 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Aggregation.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Aggregation.kt @@ -1,8 +1,8 @@ package net.consensys.zkevm.domain -import build.linea.domain.BlockInterval -import build.linea.domain.BlockIntervals import kotlinx.datetime.Instant +import linea.domain.BlockInterval +import linea.domain.BlockIntervals typealias BlobsToAggregate = BlockInterval diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Blob.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Blob.kt index c4faacd38..2c2c36d56 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Blob.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Blob.kt @@ -1,9 +1,9 @@ package net.consensys.zkevm.domain -import build.linea.domain.BlockInterval -import build.linea.domain.BlockIntervals import kotlinx.datetime.Instant -import net.consensys.linea.CommonDomainFunctions +import linea.domain.BlockInterval +import linea.domain.BlockIntervals +import linea.domain.CommonDomainFunctions import net.consensys.zkevm.coordinator.clients.BlobCompressionProof data class Blob( diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Conflation.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Conflation.kt index 9ffe14eab..c01480aaf 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Conflation.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Conflation.kt @@ -1,10 +1,10 @@ package net.consensys.zkevm.domain -import build.linea.domain.BlockInterval import kotlinx.datetime.Instant import linea.domain.Block -import net.consensys.isSortedBy -import net.consensys.linea.CommonDomainFunctions +import linea.domain.BlockInterval +import linea.domain.CommonDomainFunctions +import linea.kotlin.isSortedBy import net.consensys.linea.traces.TracesCounters data class BlocksConflation( diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/ProofIndex.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/ProofIndex.kt index bdd1b408b..9ff75a352 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/ProofIndex.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/ProofIndex.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.domain -import build.linea.domain.BlockInterval +import linea.domain.BlockInterval data class ProofIndex( override val startBlockNumber: ULong, diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByTargetBlockNumbers.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByTargetBlockNumbers.kt index 865f60b62..477671c47 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByTargetBlockNumbers.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByTargetBlockNumbers.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.coordination.aggregation -import build.linea.domain.BlockInterval +import linea.domain.BlockInterval import net.consensys.zkevm.domain.BlobCounters import net.consensys.zkevm.domain.BlobsToAggregate import org.apache.logging.log4j.LogManager diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorService.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorService.kt index dbf84cf68..0518a93fa 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorService.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorService.kt @@ -1,9 +1,9 @@ package net.consensys.zkevm.ethereum.coordination.aggregation -import build.linea.domain.BlockIntervals -import build.linea.domain.toBlockIntervalsString import io.vertx.core.Vertx import kotlinx.datetime.Clock +import linea.domain.BlockIntervals +import linea.domain.toBlockIntervalsString import net.consensys.linea.metrics.LineaMetricsCategory import net.consensys.linea.metrics.MetricsFacade import net.consensys.zkevm.LongRunningService diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofCoordinator.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofCoordinator.kt index ed1e33973..cc86e7dab 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofCoordinator.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofCoordinator.kt @@ -1,11 +1,11 @@ package net.consensys.zkevm.ethereum.coordination.blob -import build.linea.domain.BlockInterval -import build.linea.domain.BlockIntervals -import build.linea.domain.toBlockIntervalsString import io.vertx.core.Handler import io.vertx.core.Vertx import kotlinx.datetime.Instant +import linea.domain.BlockInterval +import linea.domain.BlockIntervals +import linea.domain.toBlockIntervalsString import net.consensys.linea.metrics.LineaMetricsCategory import net.consensys.linea.metrics.MetricsFacade import net.consensys.zkevm.LongRunningService diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofHandler.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofHandler.kt index 9b95f5de9..827c92fc9 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofHandler.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofHandler.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.coordination.blob -import build.linea.domain.BlockInterval +import linea.domain.BlockInterval import net.consensys.zkevm.coordinator.clients.BlobCompressionProof import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressor.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressor.kt index 75c341177..1799e23da 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressor.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressor.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.coordination.blob -import net.consensys.encodeHex +import linea.kotlin.encodeHex import net.consensys.linea.blob.BlobCompressorVersion import net.consensys.linea.blob.GoNativeBlobCompressor import net.consensys.linea.blob.GoNativeBlobCompressorFactory diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobShnarfCalulator.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobShnarfCalulator.kt index 45566c20c..0d569b779 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobShnarfCalulator.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobShnarfCalulator.kt @@ -1,8 +1,8 @@ package net.consensys.zkevm.ethereum.coordination.blob -import build.linea.domain.BlockIntervals -import net.consensys.decodeHex -import net.consensys.encodeHex +import linea.domain.BlockIntervals +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import net.consensys.linea.blob.CalculateShnarfResult import net.consensys.linea.blob.GoNativeBlobShnarfCalculator import net.consensys.linea.blob.GoNativeShnarfCalculatorFactory diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculator.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculator.kt index 954743e0f..11dea61cb 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculator.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculator.kt @@ -1,13 +1,13 @@ package net.consensys.zkevm.ethereum.coordination.blob -import build.linea.domain.BlockInterval -import build.linea.domain.BlockIntervals import com.github.michaelbull.result.getOrThrow import com.github.michaelbull.result.map import com.github.michaelbull.result.onSuccess import com.github.michaelbull.result.recover import com.github.michaelbull.result.runCatching -import net.consensys.encodeHex +import linea.domain.BlockInterval +import linea.domain.BlockIntervals +import linea.kotlin.encodeHex import net.consensys.zkevm.domain.BlobRecord import net.consensys.zkevm.persistence.BlobsRepository import org.apache.logging.log4j.LogManager diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdater.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdater.kt index 79091deda..995cc6da1 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdater.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdater.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.coordination.blockcreation -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash import tech.pegasys.teku.infrastructure.async.SafeFuture interface ForkChoiceUpdater { diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculator.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculator.kt index 912ee571d..40e6f9dbd 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculator.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculator.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.ethereum.coordination.conflation -import build.linea.domain.toBlockIntervalsString -import net.consensys.linea.CommonDomainFunctions.blockIntervalString +import linea.domain.CommonDomainFunctions.blockIntervalString +import linea.domain.toBlockIntervalsString import net.consensys.zkevm.domain.Blob import net.consensys.zkevm.domain.BlockCounters import net.consensys.zkevm.domain.ConflationCalculationResult diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinator.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinator.kt index 2d37ad07d..4e5037753 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinator.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinator.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.ethereum.coordination.conflation import build.linea.clients.GetZkEVMStateMerkleProofResponse -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash import net.consensys.zkevm.coordinator.clients.GenerateTracesResponse import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImpl.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImpl.kt index 5ac363dea..2df9bb986 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImpl.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImpl.kt @@ -3,14 +3,14 @@ package net.consensys.zkevm.ethereum.coordination.conflation import build.linea.clients.GetStateMerkleProofRequest import build.linea.clients.GetZkEVMStateMerkleProofResponse import build.linea.clients.StateManagerClientV1 -import build.linea.domain.BlockInterval import com.github.michaelbull.result.Err import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.map import com.github.michaelbull.result.mapBoth -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockInterval +import linea.domain.BlockNumberAndHash import net.consensys.linea.errors.ErrorResponse import net.consensys.zkevm.coordinator.clients.GenerateTracesResponse import net.consensys.zkevm.coordinator.clients.TracesConflationClientV1 diff --git a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/gaspricing/GasPriceCapProvider.kt b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/gaspricing/GasPriceCapProvider.kt index 6872b9a8e..9df6516eb 100644 --- a/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/gaspricing/GasPriceCapProvider.kt +++ b/coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/gaspricing/GasPriceCapProvider.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.gaspricing -import net.consensys.toGWei +import linea.kotlin.toGWei import tech.pegasys.teku.infrastructure.async.SafeFuture data class GasPriceCaps( diff --git a/coordinator/core/src/test/kotlin/net/consensys/zkevm/coordination/blob/GoBackedCalculateShnarfCalculatorTest.kt b/coordinator/core/src/test/kotlin/net/consensys/zkevm/coordination/blob/GoBackedCalculateShnarfCalculatorTest.kt index 7e0b2fdab..280e1e5f3 100644 --- a/coordinator/core/src/test/kotlin/net/consensys/zkevm/coordination/blob/GoBackedCalculateShnarfCalculatorTest.kt +++ b/coordinator/core/src/test/kotlin/net/consensys/zkevm/coordination/blob/GoBackedCalculateShnarfCalculatorTest.kt @@ -1,9 +1,9 @@ package net.consensys.zkevm.coordination.blob -import build.linea.domain.BlockIntervals import io.micrometer.core.instrument.simple.SimpleMeterRegistry -import net.consensys.decodeHex -import net.consensys.encodeHex +import linea.domain.BlockIntervals +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import net.consensys.linea.blob.CalculateShnarfResult import net.consensys.linea.blob.GoNativeBlobShnarfCalculator import net.consensys.linea.metrics.MetricsFacade diff --git a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByDeadlineTest.kt b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByDeadlineTest.kt index 9aaf2eecd..0fc632efe 100644 --- a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByDeadlineTest.kt +++ b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByDeadlineTest.kt @@ -3,7 +3,7 @@ package net.consensys.zkevm.ethereum.coordination.aggregation import kotlinx.datetime.Clock import kotlinx.datetime.Instant import linea.domain.BlockHeaderSummary -import net.consensys.ByteArrayExt +import linea.kotlin.ByteArrayExt import net.consensys.zkevm.domain.BlobCounters import net.consensys.zkevm.domain.BlobsToAggregate import net.consensys.zkevm.ethereum.coordination.blockcreation.SafeBlockProvider diff --git a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/GlobalAggregationCalculatorTest.kt b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/GlobalAggregationCalculatorTest.kt index 101d2165f..3be67a04a 100644 --- a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/GlobalAggregationCalculatorTest.kt +++ b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/GlobalAggregationCalculatorTest.kt @@ -3,7 +3,7 @@ package net.consensys.zkevm.ethereum.coordination.aggregation import io.micrometer.core.instrument.simple.SimpleMeterRegistry import kotlinx.datetime.Instant import linea.domain.BlockHeaderSummary -import net.consensys.ByteArrayExt +import linea.kotlin.ByteArrayExt import net.consensys.FakeFixedClock import net.consensys.linea.metrics.MetricsFacade import net.consensys.linea.metrics.micrometer.MicrometerMetricsFacade diff --git a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorServiceTest.kt b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorServiceTest.kt index dd6ca7e2e..03c7c91b0 100644 --- a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorServiceTest.kt +++ b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorServiceTest.kt @@ -1,12 +1,12 @@ package net.consensys.zkevm.ethereum.coordination.aggregation -import build.linea.domain.BlockIntervals import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.vertx.core.Vertx import kotlinx.datetime.Clock import kotlinx.datetime.Instant +import linea.domain.BlockIntervals +import linea.kotlin.trimToSecondPrecision import net.consensys.linea.metrics.micrometer.MicrometerMetricsFacade -import net.consensys.trimToSecondPrecision import net.consensys.zkevm.coordinator.clients.ProofAggregationProverClientV2 import net.consensys.zkevm.domain.Aggregation import net.consensys.zkevm.domain.BlobAndBatchCounters diff --git a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculatorTest.kt b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculatorTest.kt index cb7faf0a0..99ef046e1 100644 --- a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculatorTest.kt +++ b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculatorTest.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.coordination.blob -import build.linea.domain.BlockIntervals +import linea.domain.BlockIntervals import net.consensys.zkevm.domain.BlobRecord import net.consensys.zkevm.persistence.BlobsRepository import org.assertj.core.api.Assertions.assertThat diff --git a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/ConflationCalculatorByTimeDeadlineTest.kt b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/ConflationCalculatorByTimeDeadlineTest.kt index 8b3b10208..a8f04abd1 100644 --- a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/ConflationCalculatorByTimeDeadlineTest.kt +++ b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/ConflationCalculatorByTimeDeadlineTest.kt @@ -3,7 +3,7 @@ package net.consensys.zkevm.ethereum.coordination.conflation import kotlinx.datetime.Clock import kotlinx.datetime.Instant import linea.domain.BlockHeaderSummary -import net.consensys.ByteArrayExt +import linea.kotlin.ByteArrayExt import net.consensys.linea.traces.fakeTracesCountersV1 import net.consensys.zkevm.domain.BlockCounters import net.consensys.zkevm.ethereum.coordination.blockcreation.SafeBlockProvider diff --git a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculatorTest.kt b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculatorTest.kt index 6bf564d2f..2571e5fa1 100644 --- a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculatorTest.kt +++ b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculatorTest.kt @@ -2,7 +2,7 @@ package net.consensys.zkevm.ethereum.coordination.conflation import kotlinx.datetime.Instant import linea.domain.BlockHeaderSummary -import net.consensys.ByteArrayExt +import linea.kotlin.ByteArrayExt import net.consensys.FakeFixedClock import net.consensys.linea.traces.TracesCountersV1 import net.consensys.linea.traces.fakeTracesCountersV1 diff --git a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlockConflationCalculatorIntTest.kt b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlockConflationCalculatorIntTest.kt index 8545dcc99..f09738b9e 100644 --- a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlockConflationCalculatorIntTest.kt +++ b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlockConflationCalculatorIntTest.kt @@ -2,7 +2,7 @@ package net.consensys.zkevm.ethereum.coordination.conflation import kotlinx.datetime.Instant import linea.domain.BlockHeaderSummary -import net.consensys.ByteArrayExt +import linea.kotlin.ByteArrayExt import net.consensys.FakeFixedClock import net.consensys.linea.metrics.MetricsFacade import net.consensys.linea.traces.TracesCountersV1 diff --git a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImplTest.kt b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImplTest.kt index 2efc77cde..a314f9bb2 100644 --- a/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImplTest.kt +++ b/coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImplTest.kt @@ -3,8 +3,8 @@ package net.consensys.zkevm.ethereum.coordination.conflation import com.github.michaelbull.result.Err import com.github.michaelbull.result.Ok import com.github.michaelbull.result.getError -import net.consensys.ByteArrayExt -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash +import linea.kotlin.ByteArrayExt import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/BlobRecord.kt b/coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/BlobRecord.kt index 71b692bd2..e2b9a888c 100644 --- a/coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/BlobRecord.kt +++ b/coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/BlobRecord.kt @@ -1,14 +1,14 @@ package net.consensys.zkevm.domain -import build.linea.domain.BlockIntervals import io.micrometer.core.instrument.simple.SimpleMeterRegistry import kotlinx.datetime.Clock import kotlinx.datetime.Instant +import linea.domain.BlockIntervals +import linea.kotlin.setFirstByteToZero +import linea.kotlin.trimToSecondPrecision import net.consensys.linea.blob.ShnarfCalculatorVersion import net.consensys.linea.metrics.MetricsFacade import net.consensys.linea.metrics.micrometer.MicrometerMetricsFacade -import net.consensys.setFirstByteToZero -import net.consensys.trimToSecondPrecision import net.consensys.zkevm.coordinator.clients.BlobCompressionProof import net.consensys.zkevm.domain.Constants.LINEA_BLOCK_INTERVAL import net.consensys.zkevm.ethereum.coordination.blob.BlobShnarfCalculator diff --git a/coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/ProofToFinalize.kt b/coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/ProofToFinalize.kt index a32bc373e..d713e3349 100644 --- a/coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/ProofToFinalize.kt +++ b/coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/ProofToFinalize.kt @@ -2,8 +2,8 @@ package net.consensys.zkevm.domain import kotlinx.datetime.Clock import kotlinx.datetime.Instant -import net.consensys.setFirstByteToZero -import net.consensys.trimToSecondPrecision +import linea.kotlin.setFirstByteToZero +import linea.kotlin.trimToSecondPrecision import kotlin.random.Random import kotlin.time.Duration.Companion.seconds diff --git a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/AggregationFinalizationCoordinator.kt b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/AggregationFinalizationCoordinator.kt index 1bb57cfa3..f62eb4523 100644 --- a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/AggregationFinalizationCoordinator.kt +++ b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/AggregationFinalizationCoordinator.kt @@ -2,8 +2,8 @@ package net.consensys.zkevm.ethereum.finalization import io.vertx.core.Vertx import kotlinx.datetime.Clock +import linea.kotlin.trimToMinutePrecision import net.consensys.linea.async.AsyncFilter -import net.consensys.trimToMinutePrecision import net.consensys.zkevm.PeriodicPollingService import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClient import net.consensys.zkevm.domain.BlobRecord diff --git a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinator.kt b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinator.kt index 1b411a315..32be5cb2e 100644 --- a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinator.kt +++ b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinator.kt @@ -1,12 +1,12 @@ package net.consensys.zkevm.ethereum.submission -import build.linea.domain.filterOutWithEndBlockNumberBefore -import build.linea.domain.toBlockIntervals -import build.linea.domain.toBlockIntervalsString import io.vertx.core.Vertx import kotlinx.datetime.Clock +import linea.domain.filterOutWithEndBlockNumberBefore +import linea.domain.toBlockIntervals +import linea.domain.toBlockIntervalsString +import linea.kotlin.trimToMinutePrecision import net.consensys.linea.async.AsyncFilter -import net.consensys.trimToMinutePrecision import net.consensys.zkevm.PeriodicPollingService import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClient import net.consensys.zkevm.domain.BlobRecord diff --git a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelper.kt b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelper.kt index 792fea54e..9c1919da3 100644 --- a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelper.kt +++ b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelper.kt @@ -1,9 +1,9 @@ package net.consensys.zkevm.ethereum.submission -import build.linea.domain.BlockInterval -import build.linea.domain.BlockIntervals -import build.linea.domain.assertConsecutiveIntervals -import build.linea.domain.toBlockIntervalsString +import linea.domain.BlockInterval +import linea.domain.BlockIntervals +import linea.domain.assertConsecutiveIntervals +import linea.domain.toBlockIntervalsString import org.apache.logging.log4j.Logger import kotlin.math.min diff --git a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmitterAsEIP4844MultipleBlobsPerTx.kt b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmitterAsEIP4844MultipleBlobsPerTx.kt index b2f9410df..57989716c 100644 --- a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmitterAsEIP4844MultipleBlobsPerTx.kt +++ b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmitterAsEIP4844MultipleBlobsPerTx.kt @@ -1,8 +1,8 @@ package net.consensys.zkevm.ethereum.submission -import build.linea.domain.BlockIntervalData -import build.linea.domain.toBlockIntervalsString import kotlinx.datetime.Clock +import linea.domain.BlockIntervalData +import linea.domain.toBlockIntervalsString import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClient import net.consensys.zkevm.domain.BlobRecord import net.consensys.zkevm.domain.BlobSubmittedEvent diff --git a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobsGrouperForSubmission.kt b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobsGrouperForSubmission.kt index 1fe37f605..3b390192f 100644 --- a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobsGrouperForSubmission.kt +++ b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobsGrouperForSubmission.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.submission -import build.linea.domain.BlockIntervals +import linea.domain.BlockIntervals import net.consensys.zkevm.domain.BlobRecord fun interface BlobsGrouperForSubmission { diff --git a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/ContractUpgradeSubmissionLatchFilter.kt b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/ContractUpgradeSubmissionLatchFilter.kt index b719c5a2b..41537fc53 100644 --- a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/ContractUpgradeSubmissionLatchFilter.kt +++ b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/ContractUpgradeSubmissionLatchFilter.kt @@ -2,7 +2,7 @@ package net.consensys.zkevm.ethereum.submission import build.linea.contract.l1.ContractVersionProvider import build.linea.contract.l1.LineaContractVersion -import build.linea.domain.BlockInterval +import linea.domain.BlockInterval import net.consensys.linea.async.AsyncFilter import org.apache.logging.log4j.LogManager import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/SwitchProviderImpl.kt b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/SwitchProviderImpl.kt index 9dae2b93b..5497d7555 100644 --- a/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/SwitchProviderImpl.kt +++ b/coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/SwitchProviderImpl.kt @@ -3,8 +3,8 @@ package net.consensys.zkevm.ethereum.submission import build.linea.web3j.Web3JLogsClient +import linea.kotlin.toULong import net.consensys.linea.contract.L2MessageService -import net.consensys.toULong import net.consensys.zkevm.ethereum.coordination.conflation.upgrade.SwitchProvider import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinatorTest.kt b/coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinatorTest.kt index 3e65c9252..4ce91c51a 100644 --- a/coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinatorTest.kt +++ b/coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinatorTest.kt @@ -1,8 +1,8 @@ package net.consensys.zkevm.ethereum.submission -import build.linea.domain.BlockIntervals -import build.linea.domain.toBlockIntervals import io.vertx.core.Vertx +import linea.domain.BlockIntervals +import linea.domain.toBlockIntervals import net.consensys.FakeFixedClock import net.consensys.linea.async.AsyncFilter import net.consensys.zkevm.coordinator.clients.smartcontract.BlockAndNonce diff --git a/coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelperKtTest.kt b/coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelperKtTest.kt index 6b9b5d602..4cae9c4fc 100644 --- a/coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelperKtTest.kt +++ b/coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelperKtTest.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.ethereum.submission -import build.linea.domain.BlockIntervalData -import build.linea.domain.BlockIntervals +import linea.domain.BlockIntervalData +import linea.domain.BlockIntervals import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows 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 155420bee..83c8774eb 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 @@ -2,8 +2,8 @@ package net.consensys.zkevm.ethereum.finalization import build.linea.contract.l1.LineaRollupSmartContractClientReadOnly import io.vertx.core.Vertx -import net.consensys.linea.BlockParameter -import net.consensys.toBigInteger +import linea.domain.BlockParameter +import linea.kotlin.toBigInteger import net.consensys.zkevm.PeriodicPollingService 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 dfded59cb..f14fd6bf7 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 @@ -4,9 +4,9 @@ import build.linea.contract.l1.LineaRollupSmartContractClientReadOnly import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext -import net.consensys.ByteArrayExt -import net.consensys.encodeHex -import net.consensys.linea.BlockParameter +import linea.domain.BlockParameter +import linea.kotlin.ByteArrayExt +import linea.kotlin.encodeHex import org.apache.tuweni.bytes.Bytes import org.apache.tuweni.bytes.Bytes32 import org.assertj.core.api.Assertions.assertThat diff --git a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/DynamicGasPriceCap.kt b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/DynamicGasPriceCap.kt index 8ae54a17f..0fef5bf5a 100644 --- a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/DynamicGasPriceCap.kt +++ b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/DynamicGasPriceCap.kt @@ -1,8 +1,8 @@ package net.consensys.linea.ethereum.gaspricing.dynamiccap import kotlinx.datetime.DayOfWeek -import net.consensys.linea.FeeHistory -import net.consensys.toGWei +import linea.domain.FeeHistory +import linea.kotlin.toGWei import tech.pegasys.teku.infrastructure.async.SafeFuture import kotlin.time.Duration import kotlin.time.Duration.Companion.days diff --git a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoriesRepository.kt b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoriesRepository.kt index 11c5d009e..c10cad19d 100644 --- a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoriesRepository.kt +++ b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoriesRepository.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing.dynamiccap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import tech.pegasys.teku.infrastructure.async.SafeFuture interface FeeHistoriesRepository { diff --git a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapCalculatorImpl.kt b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapCalculatorImpl.kt index 4ff1d2e3a..6d84606e7 100644 --- a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapCalculatorImpl.kt +++ b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapCalculatorImpl.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing.dynamiccap -import net.consensys.toGWei +import linea.kotlin.toGWei import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import kotlin.math.pow diff --git a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapFeeHistoryFetcherImpl.kt b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapFeeHistoryFetcherImpl.kt index 6c3f533a5..5ab62cf90 100644 --- a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapFeeHistoryFetcherImpl.kt +++ b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapFeeHistoryFetcherImpl.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing.dynamiccap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import net.consensys.linea.web3j.Web3jBlobExtended import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapProviderImpl.kt b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapProviderImpl.kt index f415015c5..d8ec228fd 100644 --- a/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapProviderImpl.kt +++ b/coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapProviderImpl.kt @@ -4,9 +4,9 @@ import kotlinx.datetime.Clock import kotlinx.datetime.Instant import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime +import linea.kotlin.toGWei +import linea.kotlin.toULong import net.consensys.linea.web3j.ExtendedWeb3J -import net.consensys.toGWei -import net.consensys.toULong import net.consensys.zkevm.ethereum.gaspricing.GasPriceCapProvider import net.consensys.zkevm.ethereum.gaspricing.GasPriceCaps import org.apache.logging.log4j.LogManager diff --git a/coordinator/ethereum/gas-pricing/dynamic-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoryCachingServiceTest.kt b/coordinator/ethereum/gas-pricing/dynamic-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoryCachingServiceTest.kt index e9eee092f..5a071a1c4 100644 --- a/coordinator/ethereum/gas-pricing/dynamic-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoryCachingServiceTest.kt +++ b/coordinator/ethereum/gas-pricing/dynamic-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoryCachingServiceTest.kt @@ -4,7 +4,7 @@ import io.vertx.core.Vertx import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import org.awaitility.Awaitility.await import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculator.kt b/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculator.kt index 6a1018409..180571424 100644 --- a/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculator.kt +++ b/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculator.kt @@ -1,8 +1,8 @@ package net.consensys.linea.ethereum.gaspricing -import net.consensys.linea.FeeHistory -import net.consensys.toGWei -import net.consensys.toIntervalString +import linea.domain.FeeHistory +import linea.kotlin.toGWei +import linea.kotlin.toIntervalString import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/DynamicGasPrice.kt b/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/DynamicGasPrice.kt index d73481754..72faebec1 100644 --- a/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/DynamicGasPrice.kt +++ b/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/DynamicGasPrice.kt @@ -1,8 +1,8 @@ package net.consensys.linea.ethereum.gaspricing -import net.consensys.decodeHex -import net.consensys.encodeHex -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import tech.pegasys.teku.infrastructure.async.SafeFuture import java.nio.ByteBuffer diff --git a/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculator.kt b/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculator.kt index 8ff768e1c..2fdb2f8f2 100644 --- a/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculator.kt +++ b/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculator.kt @@ -1,7 +1,7 @@ package net.consensys.linea.ethereum.gaspricing -import net.consensys.linea.FeeHistory -import net.consensys.toIntervalString +import linea.domain.FeeHistory +import linea.kotlin.toIntervalString import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProvider.kt b/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProvider.kt index 17143421e..ad460cc68 100644 --- a/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProvider.kt +++ b/coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProvider.kt @@ -1,10 +1,10 @@ package net.consensys.linea.ethereum.gaspricing +import linea.kotlin.toBigInteger import net.consensys.linea.web3j.AtomicContractEIP1559GasProvider import net.consensys.linea.web3j.EIP1559GasFees import net.consensys.linea.web3j.EIP4844GasFees import net.consensys.linea.web3j.EIP4844GasProvider -import net.consensys.toBigInteger import java.math.BigInteger import kotlin.math.min diff --git a/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculatorTest.kt b/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculatorTest.kt index 702acb537..94726bb45 100644 --- a/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculatorTest.kt +++ b/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculatorTest.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import org.assertj.core.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows diff --git a/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculatorTest.kt b/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculatorTest.kt index b59f2f589..29082ab28 100644 --- a/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculatorTest.kt +++ b/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculatorTest.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProviderTest.kt b/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProviderTest.kt index 0d58ee5a5..ca3407614 100644 --- a/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProviderTest.kt +++ b/coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProviderTest.kt @@ -1,7 +1,7 @@ package net.consensys.linea.ethereum.gaspricing -import net.consensys.linea.FeeHistory -import net.consensys.toULong +import linea.domain.FeeHistory +import linea.kotlin.toULong import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.mockito.kotlin.doReturn diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/coordination/dynamicgasprice/MinMineableFeesPricerServiceIntegrationTest.kt b/coordinator/ethereum/gas-pricing/static-cap/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/coordination/dynamicgasprice/MinMineableFeesPricerServiceIntegrationTest.kt index 1ff8f831d..34fd298a0 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/coordination/dynamicgasprice/MinMineableFeesPricerServiceIntegrationTest.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/coordination/dynamicgasprice/MinMineableFeesPricerServiceIntegrationTest.kt @@ -5,6 +5,8 @@ import io.vertx.core.Vertx import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext +import linea.kotlin.toHexString +import linea.kotlin.toULong import net.consensys.linea.contract.AsyncFriendlyTransactionManager import net.consensys.linea.ethereum.gaspricing.BoundableFeeCalculator import net.consensys.linea.ethereum.gaspricing.FeesCalculator @@ -19,8 +21,6 @@ import net.consensys.linea.jsonrpc.client.VertxHttpJsonRpcClientFactory import net.consensys.linea.metrics.MetricsFacade import net.consensys.linea.metrics.micrometer.MicrometerMetricsFacade import net.consensys.linea.web3j.Web3jBlobExtended -import net.consensys.toHexString -import net.consensys.toULong import org.apache.tuweni.bytes.Bytes import org.assertj.core.api.Assertions import org.junit.jupiter.api.AfterAll diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/AverageWeightedFeesCalculator.kt b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/AverageWeightedFeesCalculator.kt index e8f61f6fb..a675eb982 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/AverageWeightedFeesCalculator.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/AverageWeightedFeesCalculator.kt @@ -1,8 +1,8 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory +import linea.kotlin.toIntervalString import net.consensys.linea.ethereum.gaspricing.FeesCalculator -import net.consensys.toIntervalString import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/ExtraDataV1PricerService.kt b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/ExtraDataV1PricerService.kt index 8338a335b..b1d0f2dc4 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/ExtraDataV1PricerService.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/ExtraDataV1PricerService.kt @@ -1,10 +1,10 @@ package net.consensys.linea.ethereum.gaspricing.staticcap import io.vertx.core.Vertx +import linea.kotlin.toIntervalString import net.consensys.linea.ethereum.gaspricing.ExtraDataUpdater import net.consensys.linea.ethereum.gaspricing.FeesFetcher import net.consensys.linea.ethereum.gaspricing.MinerExtraDataV1 -import net.consensys.toIntervalString import net.consensys.zkevm.PeriodicPollingService import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/FeeHistoryFetcherImpl.kt b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/FeeHistoryFetcherImpl.kt index 147fc03d8..e094e80fa 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/FeeHistoryFetcherImpl.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/FeeHistoryFetcherImpl.kt @@ -1,9 +1,9 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory +import linea.kotlin.toIntervalString import net.consensys.linea.ethereum.gaspricing.FeesFetcher import net.consensys.linea.web3j.Web3jBlobExtended -import net.consensys.toIntervalString import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import org.web3j.protocol.Web3j diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/GasUsageRatioWeightedAverageFeesCalculator.kt b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/GasUsageRatioWeightedAverageFeesCalculator.kt index d9ef43ad7..7ec542a1f 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/GasUsageRatioWeightedAverageFeesCalculator.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/GasUsageRatioWeightedAverageFeesCalculator.kt @@ -1,8 +1,8 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory +import linea.kotlin.toIntervalString import net.consensys.linea.ethereum.gaspricing.FeesCalculator -import net.consensys.toIntervalString import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinMineableFeesPricerService.kt b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinMineableFeesPricerService.kt index 0f47a35a1..a27e3df0f 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinMineableFeesPricerService.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinMineableFeesPricerService.kt @@ -1,11 +1,11 @@ package net.consensys.linea.ethereum.gaspricing.staticcap import io.vertx.core.Vertx +import linea.kotlin.toGWei +import linea.kotlin.toIntervalString import net.consensys.linea.ethereum.gaspricing.FeesCalculator import net.consensys.linea.ethereum.gaspricing.FeesFetcher import net.consensys.linea.ethereum.gaspricing.GasPriceUpdater -import net.consensys.toGWei -import net.consensys.toIntervalString import net.consensys.zkevm.PeriodicPollingService import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinerExtraDataV1CalculatorImpl.kt b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinerExtraDataV1CalculatorImpl.kt index a409d236d..197ba454f 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinerExtraDataV1CalculatorImpl.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinerExtraDataV1CalculatorImpl.kt @@ -1,10 +1,10 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory +import linea.kotlin.tokWeiUInt import net.consensys.linea.ethereum.gaspricing.FeesCalculator import net.consensys.linea.ethereum.gaspricing.MinerExtraDataCalculator import net.consensys.linea.ethereum.gaspricing.MinerExtraDataV1 -import net.consensys.tokWeiUInt class MinerExtraDataV1CalculatorImpl( val config: Config, diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/TransactionCostCalculator.kt b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/TransactionCostCalculator.kt index 05fce3287..783f2ea24 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/TransactionCostCalculator.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/TransactionCostCalculator.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import net.consensys.linea.ethereum.gaspricing.FeesCalculator import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/VariableFeesCalculator.kt b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/VariableFeesCalculator.kt index 7ead5d9a9..cf8cfbc87 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/VariableFeesCalculator.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/VariableFeesCalculator.kt @@ -1,8 +1,8 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory +import linea.kotlin.toIntervalString import net.consensys.linea.ethereum.gaspricing.FeesCalculator -import net.consensys.toIntervalString import org.apache.logging.log4j.LogManager /* diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/AverageWeightedFeesCalculatorTest.kt b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/AverageWeightedFeesCalculatorTest.kt index 543d32571..97ffa2364 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/AverageWeightedFeesCalculatorTest.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/AverageWeightedFeesCalculatorTest.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import org.apache.logging.log4j.Logger import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.params.ParameterizedTest diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/ExtraDataV1PricerServiceTest.kt b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/ExtraDataV1PricerServiceTest.kt index ad018fbef..68c62513a 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/ExtraDataV1PricerServiceTest.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/ExtraDataV1PricerServiceTest.kt @@ -4,12 +4,12 @@ import io.vertx.core.Vertx import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory +import linea.kotlin.toKWei import net.consensys.linea.ethereum.gaspricing.ExtraDataUpdater import net.consensys.linea.ethereum.gaspricing.FeesCalculator import net.consensys.linea.ethereum.gaspricing.FeesFetcher import net.consensys.linea.ethereum.gaspricing.MinerExtraDataV1 -import net.consensys.toKWei import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.extension.ExtendWith diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/GasUsageRatioWeightedAverageFeesCalculatorTest.kt b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/GasUsageRatioWeightedAverageFeesCalculatorTest.kt index 28bd4f847..f475b5619 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/GasUsageRatioWeightedAverageFeesCalculatorTest.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/GasUsageRatioWeightedAverageFeesCalculatorTest.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import org.assertj.core.api.Assertions import org.junit.jupiter.api.Test diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinMineableFeesPricerServiceTest.kt b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinMineableFeesPricerServiceTest.kt index e91983dd4..feb9a894b 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinMineableFeesPricerServiceTest.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/MinMineableFeesPricerServiceTest.kt @@ -4,7 +4,7 @@ import io.vertx.core.Vertx import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import net.consensys.linea.ethereum.gaspricing.BoundableFeeCalculator import net.consensys.linea.ethereum.gaspricing.FeesCalculator import net.consensys.linea.ethereum.gaspricing.FeesFetcher diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/TransactionCostCalculatorTest.kt b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/TransactionCostCalculatorTest.kt index 3b052d184..07d5f2afd 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/TransactionCostCalculatorTest.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/TransactionCostCalculatorTest.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import kotlin.math.abs diff --git a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/VariableFeesCalculatorTest.kt b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/VariableFeesCalculatorTest.kt index 061a756df..83fd71d56 100644 --- a/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/VariableFeesCalculatorTest.kt +++ b/coordinator/ethereum/gas-pricing/static-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/VariableFeesCalculatorTest.kt @@ -1,6 +1,6 @@ package net.consensys.linea.ethereum.gaspricing.staticcap -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.mockito.kotlin.eq diff --git a/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/L1EventQuerierIntegrationTest.kt b/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/L1EventQuerierIntegrationTest.kt index 37e17a160..453054c55 100644 --- a/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/L1EventQuerierIntegrationTest.kt +++ b/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/L1EventQuerierIntegrationTest.kt @@ -6,9 +6,9 @@ import io.vertx.core.Vertx import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext +import linea.kotlin.toBigInteger +import linea.kotlin.toULong import net.consensys.linea.contract.LineaRollupAsyncFriendly -import net.consensys.toBigInteger -import net.consensys.toULong import net.consensys.zkevm.ethereum.ContractsManager import net.consensys.zkevm.ethereum.Web3jClientManager 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 e5a03a44b..4e4be099a 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 linea.domain.BlockParameter +import linea.kotlin.toBigInteger 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.LineaRollupSmartContractClient import net.consensys.zkevm.ethereum.ContractsManager import net.consensys.zkevm.ethereum.Web3jClientManager diff --git a/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/MessageServiceIntegrationTest.kt b/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/MessageServiceIntegrationTest.kt index 78b3edd64..8ec828e48 100644 --- a/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/MessageServiceIntegrationTest.kt +++ b/coordinator/ethereum/message-anchoring/src/integrationTest/kotlin/net.consensys.zkevm.ethereum.coordination.messageanchoring/MessageServiceIntegrationTest.kt @@ -5,12 +5,12 @@ import build.linea.contract.l1.LineaContractVersion import io.vertx.core.Vertx import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension +import linea.kotlin.toBigInteger +import linea.kotlin.toULong import net.consensys.linea.async.toSafeFuture import net.consensys.linea.contract.AsyncFriendlyTransactionManager import net.consensys.linea.contract.L2MessageService import net.consensys.linea.contract.LineaRollupAsyncFriendly -import net.consensys.toBigInteger -import net.consensys.toULong import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClient import net.consensys.zkevm.ethereum.ContractsManager import net.consensys.zkevm.ethereum.Web3jClientManager diff --git a/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L1EventQuerierImpl.kt b/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L1EventQuerierImpl.kt index 28d831eb7..82440503c 100644 --- a/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L1EventQuerierImpl.kt +++ b/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L1EventQuerierImpl.kt @@ -2,8 +2,8 @@ package net.consensys.zkevm.ethereum.coordination.messageanchoring import build.linea.contract.LineaRollupV6 import io.vertx.core.Vertx +import linea.kotlin.toULong import net.consensys.linea.async.toSafeFuture -import net.consensys.toULong import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import org.apache.tuweni.bytes.Bytes32 diff --git a/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerImpl.kt b/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerImpl.kt index 4ec4188c6..30115205d 100644 --- a/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerImpl.kt +++ b/coordinator/ethereum/message-anchoring/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerImpl.kt @@ -1,10 +1,10 @@ package net.consensys.zkevm.ethereum.coordination.messageanchoring import io.vertx.core.Vertx +import linea.kotlin.toBigInteger import net.consensys.linea.async.AsyncRetryer import net.consensys.linea.async.toSafeFuture import net.consensys.linea.contract.L2MessageService -import net.consensys.toBigInteger import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import org.web3j.protocol.Web3j 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 46e86e327..3501abadb 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 @@ -2,7 +2,7 @@ package net.consensys.zkevm.ethereum.coordination.messageanchoring import build.linea.contract.l1.LineaRollupSmartContractClientReadOnly import io.vertx.core.Vertx -import net.consensys.linea.BlockParameter +import linea.domain.BlockParameter import net.consensys.linea.contract.AsyncFriendlyTransactionManager import net.consensys.linea.contract.L2MessageService import net.consensys.zkevm.PeriodicPollingService diff --git a/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerGasLimitEstimationTest.kt b/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerGasLimitEstimationTest.kt index da24543cc..8242b9b03 100644 --- a/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerGasLimitEstimationTest.kt +++ b/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerGasLimitEstimationTest.kt @@ -4,11 +4,11 @@ import io.vertx.core.Vertx import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext +import linea.kotlin.toHexString +import linea.kotlin.toULong import net.consensys.linea.contract.AsyncFriendlyTransactionManager import net.consensys.linea.contract.EIP1559GasProvider import net.consensys.linea.contract.l2.L2MessageServiceGasLimitEstimate -import net.consensys.toHexString -import net.consensys.toULong import org.apache.tuweni.bytes.Bytes32 import org.assertj.core.api.Assertions import org.junit.jupiter.api.Test diff --git a/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerImplTest.kt b/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerImplTest.kt index 10bd0b146..5a45e7a54 100644 --- a/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerImplTest.kt +++ b/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L2MessageAnchorerImplTest.kt @@ -4,10 +4,10 @@ import io.vertx.core.Vertx import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext +import linea.kotlin.toHexString +import linea.kotlin.toULong import net.consensys.linea.contract.EIP1559GasProvider import net.consensys.linea.contract.L2MessageService -import net.consensys.toHexString -import net.consensys.toULong import net.consensys.zkevm.ethereum.signing.ECKeypairSigner import net.consensys.zkevm.ethereum.signing.ECKeypairSignerAdapter import org.apache.tuweni.bytes.Bytes32 diff --git a/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/AccountManager.kt b/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/AccountManager.kt index 1dda586bd..33f825e65 100644 --- a/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/AccountManager.kt +++ b/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/AccountManager.kt @@ -3,11 +3,11 @@ package net.consensys.zkevm.ethereum import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import kotlinx.datetime.Clock +import linea.kotlin.toULong import linea.web3j.waitForTxReceipt import net.consensys.linea.contract.AsyncFriendlyTransactionManager import net.consensys.linea.jsonrpc.JsonRpcErrorResponseException import net.consensys.linea.testing.filesystem.getPathTo -import net.consensys.toULong import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import org.apache.tuweni.bytes.Bytes diff --git a/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/ContractsManager.kt b/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/ContractsManager.kt index ab51cc60a..7b7b27147 100644 --- a/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/ContractsManager.kt +++ b/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/ContractsManager.kt @@ -3,7 +3,7 @@ package net.consensys.zkevm.ethereum import build.linea.contract.l1.LineaContractVersion import com.sksamuel.hoplite.ConfigLoaderBuilder import com.sksamuel.hoplite.addFileSource -import net.consensys.gwei +import linea.kotlin.gwei import net.consensys.linea.contract.AsyncFriendlyTransactionManager import net.consensys.linea.contract.EIP1559GasProvider import net.consensys.linea.contract.LineaRollupAsyncFriendly diff --git a/coordinator/persistence/aggregation/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/aggregation/AggregationsPostgresDaoTest.kt b/coordinator/persistence/aggregation/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/aggregation/AggregationsPostgresDaoTest.kt index d01a709e4..722bc8b7a 100644 --- a/coordinator/persistence/aggregation/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/aggregation/AggregationsPostgresDaoTest.kt +++ b/coordinator/persistence/aggregation/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/aggregation/AggregationsPostgresDaoTest.kt @@ -1,14 +1,14 @@ package net.consensys.zkevm.persistence.dao.aggregation -import build.linea.domain.BlockIntervals import io.vertx.junit5.VertxExtension import io.vertx.sqlclient.Row import io.vertx.sqlclient.RowSet import kotlinx.datetime.Clock import kotlinx.datetime.Instant +import linea.domain.BlockIntervals +import linea.kotlin.trimToSecondPrecision import net.consensys.FakeFixedClock import net.consensys.linea.async.get -import net.consensys.trimToSecondPrecision import net.consensys.zkevm.domain.Aggregation import net.consensys.zkevm.domain.Batch import net.consensys.zkevm.domain.BlobAndBatchCounters diff --git a/coordinator/persistence/aggregation/src/main/kotlin/net/consensys/zkevm/persistence/dao/aggregation/PostgresAggregationsDao.kt b/coordinator/persistence/aggregation/src/main/kotlin/net/consensys/zkevm/persistence/dao/aggregation/PostgresAggregationsDao.kt index cb092e6c9..5596c4052 100644 --- a/coordinator/persistence/aggregation/src/main/kotlin/net/consensys/zkevm/persistence/dao/aggregation/PostgresAggregationsDao.kt +++ b/coordinator/persistence/aggregation/src/main/kotlin/net/consensys/zkevm/persistence/dao/aggregation/PostgresAggregationsDao.kt @@ -1,7 +1,5 @@ package net.consensys.zkevm.persistence.dao.aggregation -import build.linea.domain.BlockIntervals -import build.linea.domain.toBlockIntervalsString import io.vertx.core.Future import io.vertx.pgclient.PgException import io.vertx.sqlclient.Row @@ -9,7 +7,9 @@ import io.vertx.sqlclient.SqlClient import io.vertx.sqlclient.Tuple import kotlinx.datetime.Clock import kotlinx.datetime.Instant -import net.consensys.decodeHex +import linea.domain.BlockIntervals +import linea.domain.toBlockIntervalsString +import linea.kotlin.decodeHex import net.consensys.linea.async.toSafeFuture import net.consensys.zkevm.coordinator.clients.prover.serialization.ProofToFinalizeJsonResponse import net.consensys.zkevm.domain.Aggregation diff --git a/coordinator/persistence/aggregation/src/test/kotlin/net/consensys/zkevm/persistence/dao/aggregation/RetryingPostgresAggregationsDaoTest.kt b/coordinator/persistence/aggregation/src/test/kotlin/net/consensys/zkevm/persistence/dao/aggregation/RetryingPostgresAggregationsDaoTest.kt index 5adc9da39..4524dbaeb 100644 --- a/coordinator/persistence/aggregation/src/test/kotlin/net/consensys/zkevm/persistence/dao/aggregation/RetryingPostgresAggregationsDaoTest.kt +++ b/coordinator/persistence/aggregation/src/test/kotlin/net/consensys/zkevm/persistence/dao/aggregation/RetryingPostgresAggregationsDaoTest.kt @@ -1,9 +1,9 @@ package net.consensys.zkevm.persistence.dao.aggregation -import build.linea.domain.BlockIntervals import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension import kotlinx.datetime.Instant +import linea.domain.BlockIntervals import net.consensys.FakeFixedClock import net.consensys.zkevm.domain.BlobAndBatchCounters import net.consensys.zkevm.domain.blobCounters diff --git a/coordinator/persistence/blob/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofCoordinatorIntTest.kt b/coordinator/persistence/blob/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofCoordinatorIntTest.kt index 2ff07c71e..fd57d96db 100644 --- a/coordinator/persistence/blob/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofCoordinatorIntTest.kt +++ b/coordinator/persistence/blob/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofCoordinatorIntTest.kt @@ -2,7 +2,6 @@ package net.consensys.zkevm.ethereum.coordination.blob import build.linea.clients.GetZkEVMStateMerkleProofResponse import build.linea.clients.StateManagerClientV1 -import build.linea.domain.BlockIntervals import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.github.michaelbull.result.Ok @@ -11,7 +10,8 @@ import io.vertx.junit5.VertxExtension import io.vertx.junit5.VertxTestContext import kotlinx.datetime.Clock import kotlinx.datetime.Instant -import net.consensys.ByteArrayExt +import linea.domain.BlockIntervals +import linea.kotlin.ByteArrayExt import net.consensys.linea.traces.TracesCountersV1 import net.consensys.zkevm.coordinator.clients.BlobCompressionProof import net.consensys.zkevm.coordinator.clients.BlobCompressionProofRequest diff --git a/coordinator/persistence/blob/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/blob/BlobsPostgresDaoTest.kt b/coordinator/persistence/blob/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/blob/BlobsPostgresDaoTest.kt index 28a6eeb84..73b94d0a6 100644 --- a/coordinator/persistence/blob/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/blob/BlobsPostgresDaoTest.kt +++ b/coordinator/persistence/blob/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/blob/BlobsPostgresDaoTest.kt @@ -5,11 +5,11 @@ import io.vertx.sqlclient.PreparedQuery import io.vertx.sqlclient.Row import io.vertx.sqlclient.RowSet import kotlinx.datetime.Clock +import linea.kotlin.trimToMillisecondPrecision +import linea.kotlin.trimToSecondPrecision import net.consensys.FakeFixedClock import net.consensys.linea.async.get import net.consensys.linea.async.toSafeFuture -import net.consensys.trimToMillisecondPrecision -import net.consensys.trimToSecondPrecision import net.consensys.zkevm.domain.BlobRecord import net.consensys.zkevm.domain.BlobStatus import net.consensys.zkevm.domain.createBlobRecord diff --git a/coordinator/persistence/blob/src/main/kotlin/net/consensys/zkevm/persistence/dao/blob/BlobsPostgresDao.kt b/coordinator/persistence/blob/src/main/kotlin/net/consensys/zkevm/persistence/dao/blob/BlobsPostgresDao.kt index 88d0edef1..2e2fd08ef 100644 --- a/coordinator/persistence/blob/src/main/kotlin/net/consensys/zkevm/persistence/dao/blob/BlobsPostgresDao.kt +++ b/coordinator/persistence/blob/src/main/kotlin/net/consensys/zkevm/persistence/dao/blob/BlobsPostgresDao.kt @@ -6,8 +6,8 @@ import io.vertx.sqlclient.SqlClient import io.vertx.sqlclient.Tuple import kotlinx.datetime.Clock import kotlinx.datetime.Instant -import net.consensys.decodeHex -import net.consensys.encodeHex +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import net.consensys.linea.async.toSafeFuture import net.consensys.zkevm.coordinator.clients.BlobCompressionProof import net.consensys.zkevm.coordinator.clients.prover.serialization.BlobCompressionProofJsonResponse diff --git a/coordinator/persistence/blob/src/test/kotlin/net/consensys/zkevm/ethereum/coordinator/blob/BlobCompressionProofCoordinatorTest.kt b/coordinator/persistence/blob/src/test/kotlin/net/consensys/zkevm/ethereum/coordinator/blob/BlobCompressionProofCoordinatorTest.kt index 416356d30..6da1c271d 100644 --- a/coordinator/persistence/blob/src/test/kotlin/net/consensys/zkevm/ethereum/coordinator/blob/BlobCompressionProofCoordinatorTest.kt +++ b/coordinator/persistence/blob/src/test/kotlin/net/consensys/zkevm/ethereum/coordinator/blob/BlobCompressionProofCoordinatorTest.kt @@ -1,8 +1,8 @@ package net.consensys.zkevm.ethereum.coordinator.blob -import build.linea.domain.BlockIntervals import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension +import linea.domain.BlockIntervals import net.consensys.FakeFixedClock import net.consensys.linea.traces.TracesCountersV1 import net.consensys.zkevm.coordinator.clients.BlobCompressionProof diff --git a/coordinator/persistence/blob/src/test/kotlin/net/consensys/zkevm/persistence/dao/blob/RetryingBlobsPostgresDaoTest.kt b/coordinator/persistence/blob/src/test/kotlin/net/consensys/zkevm/persistence/dao/blob/RetryingBlobsPostgresDaoTest.kt index 62b9767cb..401b62478 100644 --- a/coordinator/persistence/blob/src/test/kotlin/net/consensys/zkevm/persistence/dao/blob/RetryingBlobsPostgresDaoTest.kt +++ b/coordinator/persistence/blob/src/test/kotlin/net/consensys/zkevm/persistence/dao/blob/RetryingBlobsPostgresDaoTest.kt @@ -1,11 +1,11 @@ package net.consensys.zkevm.persistence.dao.blob -import build.linea.domain.BlockIntervals import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension +import linea.domain.BlockIntervals +import linea.kotlin.setFirstByteToZero +import linea.kotlin.trimToSecondPrecision import net.consensys.FakeFixedClock -import net.consensys.setFirstByteToZero -import net.consensys.trimToSecondPrecision import net.consensys.zkevm.coordinator.clients.BlobCompressionProof import net.consensys.zkevm.domain.createBlobRecord import net.consensys.zkevm.persistence.db.PersistenceRetryer diff --git a/coordinator/persistence/db-common/src/integrationTest/kotlin/net/consensys/zkevm/persistence/db/test/DbSchemaUpdatesIntTest.kt b/coordinator/persistence/db-common/src/integrationTest/kotlin/net/consensys/zkevm/persistence/db/test/DbSchemaUpdatesIntTest.kt index a6ffc662b..cc69a2533 100644 --- a/coordinator/persistence/db-common/src/integrationTest/kotlin/net/consensys/zkevm/persistence/db/test/DbSchemaUpdatesIntTest.kt +++ b/coordinator/persistence/db-common/src/integrationTest/kotlin/net/consensys/zkevm/persistence/db/test/DbSchemaUpdatesIntTest.kt @@ -5,7 +5,7 @@ import io.vertx.junit5.VertxExtension import io.vertx.sqlclient.Pool import io.vertx.sqlclient.SqlClient import kotlinx.datetime.Clock -import net.consensys.encodeHex +import linea.kotlin.encodeHex import net.consensys.linea.async.get import net.consensys.zkevm.persistence.db.Db import net.consensys.zkevm.persistence.db.DbHelper diff --git a/coordinator/persistence/feehistory/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesPostgresDaoTest.kt b/coordinator/persistence/feehistory/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesPostgresDaoTest.kt index 57b3b1130..e01275f13 100644 --- a/coordinator/persistence/feehistory/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesPostgresDaoTest.kt +++ b/coordinator/persistence/feehistory/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesPostgresDaoTest.kt @@ -5,8 +5,8 @@ import io.vertx.sqlclient.PreparedQuery import io.vertx.sqlclient.Row import io.vertx.sqlclient.RowSet import kotlinx.datetime.Clock +import linea.domain.FeeHistory import net.consensys.FakeFixedClock -import net.consensys.linea.FeeHistory import net.consensys.linea.async.get import net.consensys.zkevm.persistence.db.DbHelper import net.consensys.zkevm.persistence.db.test.CleanDbTestSuiteParallel diff --git a/coordinator/persistence/feehistory/src/main/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesPostgresDao.kt b/coordinator/persistence/feehistory/src/main/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesPostgresDao.kt index 0d82755b7..d66b496d1 100644 --- a/coordinator/persistence/feehistory/src/main/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesPostgresDao.kt +++ b/coordinator/persistence/feehistory/src/main/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesPostgresDao.kt @@ -4,9 +4,8 @@ import io.vertx.core.Future import io.vertx.sqlclient.SqlClient import io.vertx.sqlclient.Tuple import kotlinx.datetime.Clock -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import net.consensys.linea.async.toSafeFuture -import net.consensys.toULong import net.consensys.zkevm.persistence.db.SQLQueryLogger import org.apache.logging.log4j.Level import org.apache.logging.log4j.LogManager diff --git a/coordinator/persistence/feehistory/src/main/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesRepositoryImpl.kt b/coordinator/persistence/feehistory/src/main/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesRepositoryImpl.kt index 0e37f8fea..a5e558fe8 100644 --- a/coordinator/persistence/feehistory/src/main/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesRepositoryImpl.kt +++ b/coordinator/persistence/feehistory/src/main/kotlin/net/consensys/zkevm/persistence/dao/feehistory/FeeHistoriesRepositoryImpl.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.persistence.dao.feehistory -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import net.consensys.linea.ethereum.gaspricing.dynamiccap.FeeHistoriesRepositoryWithCache import net.consensys.linea.ethereum.gaspricing.dynamiccap.PercentileGasFees import net.consensys.zkevm.persistence.db.DuplicatedRecordException diff --git a/docker/compose-spec-l2-services.yml b/docker/compose-spec-l2-services.yml index bd6ded3f0..0ecb2bd13 100644 --- a/docker/compose-spec-l2-services.yml +++ b/docker/compose-spec-l2-services.yml @@ -614,7 +614,7 @@ services: - -c - | (rm /opt/besu/plugins/linea-staterecovery-besu-plugin-v* || true) && \ - (rm /opt/besu/plugins/finalized-tag-updater-v* || true) && \ + (rm /opt/besu/plugins/linea-finalized-tag-updater* || true) && \ ls -lh /opt/besu/plugins && \ sed -i '/^CLASSPATH/c\CLASSPATH=/opt/besu/lib/\*\:/opt/besu/plugins/\*' /opt/besu/bin/besu && \ /opt/besu/bin/besu \ diff --git a/finalized-tag-updater/src/main/kotlin/net/consensys/linea/FinalizationUpdatePoller.kt b/finalized-tag-updater/src/main/kotlin/net/consensys/linea/FinalizationUpdatePoller.kt index 57cffeca6..5902792b4 100644 --- a/finalized-tag-updater/src/main/kotlin/net/consensys/linea/FinalizationUpdatePoller.kt +++ b/finalized-tag-updater/src/main/kotlin/net/consensys/linea/FinalizationUpdatePoller.kt @@ -2,7 +2,7 @@ package net.consensys.zkevm.ethereum.finalization import build.linea.contract.l1.Web3JLineaRollupSmartContractClientReadOnly import io.vertx.core.Vertx -import net.consensys.linea.BlockParameter +import linea.domain.BlockParameter import net.consensys.linea.async.AsyncRetryer import net.consensys.linea.async.toSafeFuture import net.consensys.zkevm.PeriodicPollingService diff --git a/finalized-tag-updater/src/main/kotlin/net/consensys/linea/LineaL1FinalizationUpdaterService.kt b/finalized-tag-updater/src/main/kotlin/net/consensys/linea/LineaL1FinalizationUpdaterService.kt index b07a4bcdc..c832f1999 100644 --- a/finalized-tag-updater/src/main/kotlin/net/consensys/linea/LineaL1FinalizationUpdaterService.kt +++ b/finalized-tag-updater/src/main/kotlin/net/consensys/linea/LineaL1FinalizationUpdaterService.kt @@ -3,6 +3,7 @@ package net.consensys.linea import build.linea.contract.l1.Web3JLineaRollupSmartContractClientReadOnly import io.vertx.core.Vertx import linea.consensus.EngineBlockTagUpdater +import linea.domain.BlockParameter import net.consensys.linea.web3j.okHttpClientBuilder import net.consensys.zkevm.LongRunningService import net.consensys.zkevm.ethereum.finalization.FinalizationUpdatePoller diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/jvm/ResourcesUtil.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/jvm/ResourcesUtil.kt index 7cb9a6256..c0ae17495 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/jvm/ResourcesUtil.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/jvm/ResourcesUtil.kt @@ -1,7 +1,5 @@ package build.linea.jvm -import java.io.File -import java.nio.file.Files import java.nio.file.Path object ResourcesUtil { @@ -19,17 +17,8 @@ object ResourcesUtil { classLoader: ClassLoader, tmpDirPrefix: String = "linea-resources-" ): Path { - val fileDestination = File( - Files.createTempDirectory(tmpDirPrefix) - .resolve(Path.of(resourcePath).fileName) - .toString() - ) - val resourceInputStream = classLoader.getResourceAsStream(resourcePath) - ?: throw IllegalStateException("Resource not found: $resourcePath") - Files.copy( - resourceInputStream, - fileDestination.toPath() - ) - return fileDestination.toPath() + // WARNING: this is to keep backwards compatibility with package location + // otherwise, the we may get error at runtime: java.lang.NoClassDefFoundError: build/linea/jvm/ResourcesUtil + return linea.jvm.ResourcesUtil.copyResourceToTmpDir(resourcePath, classLoader, tmpDirPrefix) } } diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/Constants.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/Constants.kt new file mode 100644 index 000000000..e1b89290d --- /dev/null +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/Constants.kt @@ -0,0 +1,10 @@ +package linea + +import java.math.BigDecimal + +const val OneGWei = 1_000_000_000L +const val OneEth = 1_000_000_000_000_000_000L +val OneGWeiBigDecimal: BigDecimal = BigDecimal.valueOf(OneGWei) + +const val OneKWei = 1_000L +val OneKWeiBigDecimal: BigDecimal = BigDecimal.valueOf(OneKWei) diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/URIExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/URIExtensions.kt similarity index 94% rename from jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/URIExtensions.kt rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/URIExtensions.kt index a4453ea7b..e80b588d5 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/URIExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/URIExtensions.kt @@ -1,4 +1,4 @@ -package build.linea +package linea import java.net.URI diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/UrlExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/UrlExtensions.kt similarity index 94% rename from jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/UrlExtensions.kt rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/UrlExtensions.kt index 30a5e0f8e..269a27e69 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/build/linea/UrlExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/UrlExtensions.kt @@ -1,4 +1,4 @@ -package build.linea +package linea import java.net.URI diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/jvm/ResourcesUtil.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/jvm/ResourcesUtil.kt new file mode 100644 index 000000000..163b64328 --- /dev/null +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/jvm/ResourcesUtil.kt @@ -0,0 +1,35 @@ +package linea.jvm + +import java.io.File +import java.nio.file.Files +import java.nio.file.Path + +object ResourcesUtil { + + /** + * Moves jar resource files to a temporary directory. + * @param resourcePath The path to the resource file inside the jar + * @param classLoader to use to find the resource. It's recommended to use SomeClass::class.java.classLoader + * where SomeClass is a class in the same jar as the resource file, otherwise the resource might not be found. + * @param tmpDirPrefix The prefix to use for the temporary directory. + */ + @JvmStatic + fun copyResourceToTmpDir( + resourcePath: String, + classLoader: ClassLoader, + tmpDirPrefix: String = "linea-resources-" + ): Path { + val fileDestination = File( + Files.createTempDirectory(tmpDirPrefix) + .resolve(Path.of(resourcePath).fileName) + .toString() + ) + val resourceInputStream = classLoader.getResourceAsStream(resourcePath) + ?: throw IllegalStateException("Resource not found: $resourcePath") + Files.copy( + resourceInputStream, + fileDestination.toPath() + ) + return fileDestination.toPath() + } +} diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/ByteArrayExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/ByteArrayExtensions.kt similarity index 99% rename from jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/ByteArrayExtensions.kt rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/ByteArrayExtensions.kt index 343224c7d..090e5273c 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/ByteArrayExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/ByteArrayExtensions.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin import java.math.BigInteger import java.util.HexFormat diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/CollectionsExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/CollectionsExtensions.kt similarity index 95% rename from jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/CollectionsExtensions.kt rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/CollectionsExtensions.kt index 6ead247b0..bcbed26c9 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/CollectionsExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/CollectionsExtensions.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin inline fun > Iterable.isSortedBy(crossinline selector: (T) -> R?): Boolean { if (this is Collection) { diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/InstantExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/InstantExtensions.kt similarity index 94% rename from jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/InstantExtensions.kt rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/InstantExtensions.kt index df6d2fa50..ccd2ecc80 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/InstantExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/InstantExtensions.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin import kotlinx.datetime.Instant diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/MathExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/MathExtensions.kt similarity index 97% rename from jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/MathExtensions.kt rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/MathExtensions.kt index 509163b12..aefc74f31 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/MathExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/MathExtensions.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin class KMath { companion object { @@ -20,9 +20,9 @@ class KMath { } } -fun ULong.plusExact(other: ULong): ULong = KMath.addExact(this, other) fun UInt.plusExact(other: UInt): UInt = KMath.addExact(this, other) +fun ULong.plusExact(other: ULong): ULong = KMath.addExact(this, other) fun ULong.multiplyExact(other: ULong): ULong { if (this != 0UL && other != 0UL && ULong.MAX_VALUE / this < other) { throw ArithmeticException("ULong overflow") diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/RangeExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/RangeExtensions.kt similarity index 95% rename from jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/RangeExtensions.kt rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/RangeExtensions.kt index aad182fb2..edeaf8755 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/RangeExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/RangeExtensions.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin internal fun > isRangeWithin(outer: ClosedRange, inner: ClosedRange): Boolean { return inner.start >= outer.start && inner.endInclusive <= outer.endInclusive diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/StringExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/StringExtensions.kt similarity index 96% rename from jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/StringExtensions.kt rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/StringExtensions.kt index e7dadd7df..e2228f2ff 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/StringExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/StringExtensions.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin import java.math.BigInteger import java.util.HexFormat diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/TypingsExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/TypingsExtensions.kt new file mode 100644 index 000000000..e4d64cdcb --- /dev/null +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/TypingsExtensions.kt @@ -0,0 +1,45 @@ +package linea.kotlin + +import linea.OneGWei +import linea.OneGWeiBigDecimal +import linea.OneKWei +import linea.OneKWeiBigDecimal +import java.math.BigDecimal +import java.math.BigInteger +import java.math.MathContext +import java.math.RoundingMode + +inline val Long.gwei get() = Math.multiplyExact(this, OneGWei) + +// Double extensions +fun Double.toGWei(): Double = this / OneGWei +fun Double.tokWeiUInt(): UInt = (this / OneKWei).toUInt() +fun Double.toKWei(): Double = this / OneKWei + +// BigDecimal extensions +fun BigDecimal.roundUpToBigInteger(): BigInteger = this.setScale(0, RoundingMode.HALF_UP).toBigInteger() +fun BigDecimal.toGWei(): BigDecimal = this.divide(OneGWeiBigDecimal, MathContext.DECIMAL128) +fun BigDecimal.toKWei(): BigDecimal = this.divide(OneKWeiBigDecimal, MathContext.DECIMAL128) +fun BigDecimal.toUInt(): UInt = this.roundUpToBigInteger().toUInt() + +// BigInteger extensions +fun BigInteger.multiply(multiplicand: Double): BigInteger = this.toBigDecimal() + .multiply(BigDecimal.valueOf(multiplicand)).toBigInteger() + +fun BigInteger.toGWei(): BigDecimal = this.toBigDecimal().toGWei() +inline val BigInteger.gwei: BigInteger get() = this.multiply(OneGWei.toBigInteger()) +fun BigInteger.toKWei(): BigDecimal = this.toBigDecimal().toKWei() +inline val BigInteger.kwei: BigInteger get() = this.multiply(OneKWei.toBigInteger()) +fun BigInteger.toULong(): ULong = this.toString().toULong() +fun BigInteger.toUInt(): UInt = this.toString().toUInt() + +// ULong extensions + +fun > ClosedRange.toIntervalString(): String { + val size = if (start <= endInclusive) { + this.endInclusive.toString().toBigDecimal() - this.start.toString().toBigDecimal() + 1.toBigDecimal() + } else { + this.start.toString().toBigDecimal() - this.endInclusive.toString().toBigDecimal() + 1.toBigDecimal() + } + return "[${this.start}..${this.endInclusive}]${size.toInt()}" +} diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/ULongExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/ULongExtensions.kt index 505254679..665d516eb 100644 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/ULongExtensions.kt +++ b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/linea/kotlin/ULongExtensions.kt @@ -1,5 +1,36 @@ package linea.kotlin +import linea.OneEth +import linea.OneGWei +import java.math.BigInteger + +fun ULong.toKWeiUInt(): UInt = this.toDouble().tokWeiUInt() +inline val ULong.gwei: ULong get() = this.multiplyExact(OneGWei.toULong()) +inline val ULong.eth: ULong get() = this.multiplyExact(OneEth.toULong()) +fun ULong.toGWei(): Double = this.toDouble().toGWei() + +/** + * Parses an hexadecimal string as [ULong] number and returns the result. + * @throws NumberFormatException if the string is not a valid hexadecimal representation of a number. + */ +fun ULong.Companion.fromHexString(value: String): ULong = value.removePrefix("0x").toULong(16) +fun ULong.toBigInteger(): BigInteger = BigInteger(this.toString()) +fun ULong.toHexString(): String = "0x${this.toString(16)}" +fun ULong.toHexStringPaddedToBitSize(targetBitSize: Int): String { + require(targetBitSize % 4 == 0) { "targetBitSize=$targetBitSize should be a multiple of 4" } + val targetNumberOfHexDigits = targetBitSize / 4 + val rawHex = this.toString(16) + require(rawHex.length <= targetNumberOfHexDigits) { + val requiredBits = rawHex.length * 4 + "Number $this needs ${rawHex.length} hex digits ($requiredBits bits), targetBitSize=$targetBitSize" + } + return "0x${rawHex.padStart(targetNumberOfHexDigits, '0')}" +} +fun ULong.toHexStringPaddedToByteSize(targetByteSize: Int): String = + this.toHexStringPaddedToBitSize(targetByteSize * 8) + +fun ULong.toHexStringUInt256(): String = this.toHexStringPaddedToBitSize(256) + fun List.hasSequentialElements(): Boolean { if (this.size < 2) return true // A list with less than 2 elements is trivially continuous @@ -10,3 +41,21 @@ fun List.hasSequentialElements(): Boolean { } return true } + +fun ULong.minusCoercingUnderflow(other: ULong): ULong { + return if (this > other) { + this - other + } else { + 0UL + } +} + +fun ULongRange.intersection(other: ULongRange): ULongRange { + val start = maxOf(this.first, other.first) + val end = minOf(this.last, other.last) + return if (start <= end) { + start..end + } else { + ULongRange.EMPTY + } +} diff --git a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/TypingsExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/TypingsExtensions.kt deleted file mode 100644 index 0f6d6ff32..000000000 --- a/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/TypingsExtensions.kt +++ /dev/null @@ -1,96 +0,0 @@ -package net.consensys - -import java.math.BigDecimal -import java.math.BigInteger -import java.math.MathContext -import java.math.RoundingMode - -const val OneGWei = 1_000_000_000L -const val OneEth = 1_000_000_000_000_000_000L -val OneGWeiBigDecimal: BigDecimal = BigDecimal.valueOf(OneGWei) - -const val OneKWei = 1_000L -val OneKWeiBigDecimal: BigDecimal = BigDecimal.valueOf(OneKWei) - -inline val Long.gwei get() = Math.multiplyExact(this, OneGWei) - -// Double extensions -fun Double.toGWei(): Double = this / OneGWei -fun Double.tokWeiUInt(): UInt = (this / OneKWei).toUInt() -fun Double.toKWei(): Double = this / OneKWei - -// BigDecimal extensions -fun BigDecimal.roundUpToBigInteger(): BigInteger = this.setScale(0, RoundingMode.HALF_UP).toBigInteger() -fun BigDecimal.toGWei(): BigDecimal = this.divide(OneGWeiBigDecimal, MathContext.DECIMAL128) -fun BigDecimal.toKWei(): BigDecimal = this.divide(OneKWeiBigDecimal, MathContext.DECIMAL128) -fun BigDecimal.toUInt(): UInt = this.roundUpToBigInteger().toUInt() - -// BigInteger extensions -fun BigInteger.multiply(multiplicand: Double): BigInteger = this.toBigDecimal() - .multiply(BigDecimal.valueOf(multiplicand)).toBigInteger() - -fun BigInteger.toGWei(): BigDecimal = this.toBigDecimal().toGWei() -inline val BigInteger.gwei: BigInteger get() = this.multiply(OneGWei.toBigInteger()) -fun BigInteger.toKWei(): BigDecimal = this.toBigDecimal().toKWei() -inline val BigInteger.kwei: BigInteger get() = this.multiply(OneKWei.toBigInteger()) -fun BigInteger.toULong(): ULong = this.toString().toULong() -fun BigInteger.toUInt(): UInt = this.toString().toUInt() - -// ULong extensions -fun ULong.toBigInteger(): BigInteger = BigInteger(this.toString()) -fun ULong.toHexString(): String = "0x${this.toString(16)}" -fun ULong.toHexStringPaddedToBitSize(targetBitSize: Int): String { - require(targetBitSize % 4 == 0) { "targetBitSize=$targetBitSize should be a multiple of 4" } - val targetNumberOfHexDigits = targetBitSize / 4 - val rawHex = this.toString(16) - require(rawHex.length <= targetNumberOfHexDigits) { - val requiredBits = rawHex.length * 4 - "Number $this needs ${rawHex.length} hex digits ($requiredBits bits), targetBitSize=$targetBitSize" - } - return "0x${rawHex.padStart(targetNumberOfHexDigits, '0')}" -} - -fun ULong.toHexStringPaddedToByteSize(targetByteSize: Int): String = - this.toHexStringPaddedToBitSize(targetByteSize * 8) - -fun ULong.toHexStringUInt256(): String = this.toHexStringPaddedToBitSize(256) - -fun ULong.toKWeiUInt(): UInt = this.toDouble().tokWeiUInt() - -inline val ULong.gwei: ULong get() = this.multiplyExact(OneGWei.toULong()) -inline val ULong.eth: ULong get() = this.multiplyExact(OneEth.toULong()) - -fun ULong.toGWei(): Double = this.toDouble().toGWei() - -/** - * Parses an hexadecimal string as [ULong] number and returns the result. - * @throws NumberFormatException if the string is not a valid hexadecimal representation of a number. - */ -fun ULong.Companion.fromHexString(value: String): ULong = value.removePrefix("0x").toULong(16) - -fun ULongRange.intersection(other: ULongRange): ULongRange { - val start = maxOf(this.first, other.first) - val end = minOf(this.last, other.last) - return if (start <= end) { - start..end - } else { - ULongRange.EMPTY - } -} - -fun ULong.minusCoercingUnderflow(other: ULong): ULong { - return if (this > other) { - this - other - } else { - 0UL - } -} - -fun > ClosedRange.toIntervalString(): String { - val size = if (start <= endInclusive) { - this.endInclusive.toString().toBigDecimal() - this.start.toString().toBigDecimal() + 1.toBigDecimal() - } else { - this.start.toString().toBigDecimal() - this.endInclusive.toString().toBigDecimal() + 1.toBigDecimal() - } - return "[${this.start}..${this.endInclusive}]${size.toInt()}" -} diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/URIExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/URIExtensionsTest.kt similarity index 97% rename from jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/URIExtensionsTest.kt rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/URIExtensionsTest.kt index 18701f6e2..c8202a8c9 100644 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/URIExtensionsTest.kt +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/URIExtensionsTest.kt @@ -1,4 +1,4 @@ -package build.linea +package linea import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/jvm/ResourcesUtilTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/jvm/ResourcesUtilTest.kt similarity index 95% rename from jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/jvm/ResourcesUtilTest.kt rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/jvm/ResourcesUtilTest.kt index dbd7cf436..1db623c82 100644 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/build/linea/jvm/ResourcesUtilTest.kt +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/jvm/ResourcesUtilTest.kt @@ -1,6 +1,6 @@ -package build.linea.jvm +package linea.jvm -import build.linea.jvm.ResourcesUtil.copyResourceToTmpDir +import linea.jvm.ResourcesUtil.copyResourceToTmpDir import org.assertj.core.api.AssertionsForClassTypes.assertThat import org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy import org.junit.jupiter.api.Test diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/ByteArrayExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/ByteArrayExtensionsTest.kt similarity index 99% rename from jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/ByteArrayExtensionsTest.kt rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/ByteArrayExtensionsTest.kt index 7e468d7db..3bdd549cb 100644 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/ByteArrayExtensionsTest.kt +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/ByteArrayExtensionsTest.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/CollectionsExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/CollectionsExtensionsTest.kt similarity index 94% rename from jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/CollectionsExtensionsTest.kt rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/CollectionsExtensionsTest.kt index 560cd8383..7d923bf5f 100644 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/CollectionsExtensionsTest.kt +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/CollectionsExtensionsTest.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/InstantExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/InstantExtensionsTest.kt similarity index 98% rename from jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/InstantExtensionsTest.kt rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/InstantExtensionsTest.kt index 278563e5b..ec8a921ff 100644 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/InstantExtensionsTest.kt +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/InstantExtensionsTest.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin import kotlinx.datetime.Instant import org.assertj.core.api.Assertions.assertThat diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/MathExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/MathExtensionsTest.kt similarity index 98% rename from jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/MathExtensionsTest.kt rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/MathExtensionsTest.kt index 799dc878f..02543660a 100644 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/MathExtensionsTest.kt +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/MathExtensionsTest.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/StringExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/StringExtensionsTest.kt similarity index 98% rename from jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/StringExtensionsTest.kt rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/StringExtensionsTest.kt index d69e71b5d..d239794d8 100644 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/StringExtensionsTest.kt +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/StringExtensionsTest.kt @@ -1,4 +1,4 @@ -package net.consensys +package linea.kotlin import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/TypingsExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/TypingsExtensionsTest.kt new file mode 100644 index 000000000..9a5f17afa --- /dev/null +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/TypingsExtensionsTest.kt @@ -0,0 +1,34 @@ +package linea.kotlin + +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows +import java.math.BigInteger + +class TypingsExtensionsTest { + @Test + fun `BigInteger#ULong`() { + assertThrows { BigInteger.valueOf(-1).toULong() } + assertThat(BigInteger.valueOf(0).toULong()).isEqualTo(0u.toULong()) + assertThat(BigInteger.valueOf(123).toULong()).isEqualTo(123u.toULong()) + assertThat(BigInteger(ULong.MAX_VALUE.toString(), 10).toULong()).isEqualTo(ULong.MAX_VALUE) + } + + @Test + fun `ULong#BigInteger`() { + assertThat(0UL.toBigInteger()).isEqualTo(BigInteger.valueOf(0)) + assertThat(123UL.toBigInteger()).isEqualTo(BigInteger.valueOf(123)) + assertThat(ULong.MAX_VALUE.toBigInteger()).isEqualTo(BigInteger(ULong.MAX_VALUE.toString(), 10)) + } + + @Test + fun `toIntervalString`() { + assertThat((0..0).toIntervalString()).isEqualTo("[0..0]1") + assertThat((0..1).toIntervalString()).isEqualTo("[0..1]2") + assertThat((0..10).toIntervalString()).isEqualTo("[0..10]11") + assertThat((0.0..10.0).toIntervalString()).isEqualTo("[0.0..10.0]11") + + assertThat((0..-1).toIntervalString()).isEqualTo("[0..-1]2") + assertThat((0..-10).toIntervalString()).isEqualTo("[0..-10]11") + } +} diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/ULongExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/ULongExtensionsTest.kt index df658b833..4be0573fd 100644 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/ULongExtensionsTest.kt +++ b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/linea/kotlin/ULongExtensionsTest.kt @@ -1,8 +1,89 @@ package linea.kotlin import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows class ULongExtensionsTest { + val uLongParsingTestCases = mapOf( + 0.toULong() to "0x0", + 1.toULong() to "0x1", + 0xABC_DEF_123_456u to "0xabcdef123456", + ULong.MAX_VALUE to "0xffffffffffffffff" + ) + + @Test + fun `toHexString`() { + uLongParsingTestCases.forEach { (number: ULong, hexString: String) -> + assertThat(number.toHexString()).isEqualTo(hexString) + } + } + + @Test + fun `fromHexString`() { + uLongParsingTestCases.forEach { (number: ULong, hexString: String) -> + assertThat(ULong.fromHexString(hexString)).isEqualTo(number) + } + } + + @Test + fun `toHexStringPaddedToBitSize_shouldPadToDesireNumberOfBitsWhenItFits`() { + assertThat(0.toULong().toHexStringPaddedToBitSize(4)).isEqualTo("0x0") + assertThat(0.toULong().toHexStringPaddedToBitSize(8)).isEqualTo("0x00") + assertThat(1.toULong().toHexStringPaddedToBitSize(4)).isEqualTo("0x1") + assertThat(1.toULong().toHexStringPaddedToBitSize(12)).isEqualTo("0x001") + assertThat(255.toULong().toHexStringPaddedToBitSize(8)).isEqualTo("0xff") + + assertThat(ULong.MAX_VALUE.toHexStringPaddedToBitSize(64)) + .isEqualTo("0xffffffffffffffff") + assertThat(ULong.MAX_VALUE.toHexStringPaddedToBitSize(80)) + .isEqualTo("0x0000ffffffffffffffff") + } + + @Test + fun `toHexStringPaddedToBitSize_shouldThrowErrorWhenBitSizeIsNotMultipleOf4`() { + assertThatThrownBy { 2.toULong().toHexStringPaddedToBitSize(9) } + .isInstanceOf(IllegalArgumentException::class.java) + .hasMessage("targetBitSize=9 should be a multiple of 4") + } + + @Test + fun `toHexStringPaddedToBitSize_shouldThrowErrorWhenNumberDoesNotFitWithTargetNumberOfBits`() { + assertThatThrownBy { 256.toULong().toHexStringPaddedToBitSize(8) } + .isInstanceOf(IllegalArgumentException::class.java) + .hasMessage("Number 256 needs 3 hex digits (12 bits), targetBitSize=8") + } + + @Test + fun `toHexStringPaddedToByteSize_shouldPadToDesireNumberOfBitsWhenItFits`() { + assertThat(0.toULong().toHexStringPaddedToByteSize(1)).isEqualTo("0x00") + assertThat(1.toULong().toHexStringPaddedToByteSize(1)).isEqualTo("0x01") + assertThat(2.toULong().toHexStringPaddedToByteSize(3)).isEqualTo("0x000002") + assertThat(255.toULong().toHexStringPaddedToByteSize(1)).isEqualTo("0xff") + assertThat(ULong.MAX_VALUE.toHexStringPaddedToByteSize(8)) + .isEqualTo("0xffffffffffffffff") + assertThat(ULong.MAX_VALUE.toHexStringPaddedToByteSize(10)) + .isEqualTo("0x0000ffffffffffffffff") + } + + @Test + fun `toHexStringPaddedToByteSize_shouldThrowErrorWhenNumberDoesNotFitWithTargetNumber`() { + assertThatThrownBy { 256.toULong().toHexStringPaddedToByteSize(1) } + .isInstanceOf(IllegalArgumentException::class.java) + .hasMessage("Number 256 needs 3 hex digits (12 bits), targetBitSize=8") + } + + @Test + fun `toHexStringUInt256_shouldPadTo256Bit`() { + assertThat(0.toULong().toHexStringUInt256()).isEqualTo("0x" + "0".repeat(64)) + assertThat(15.toULong().toHexStringUInt256()).isEqualTo("0x" + "0".repeat(63) + "f") + } + + @Test + fun `ULong fromHexString invalid format`() { + assertThrows { ULong.fromHexString("0x23J") } + } + @Test fun `hasSequentialElements should return true for an empty list`() { val list = emptyList() @@ -32,4 +113,19 @@ class ULongExtensionsTest { val list = listOf(1UL, 2UL, 4UL, 5UL) assertThat(list.hasSequentialElements()).isFalse() } + + @Test + fun `minusCoercingUnderflow should return the difference when minuend is greater than subtrahend`() { + assertThat(10UL.minusCoercingUnderflow(5UL)).isEqualTo(5UL) + } + + @Test + fun `minusCoercingUnderflow should return zero when minuend is less than subtrahend`() { + assertThat(5UL.minusCoercingUnderflow(10UL)).isEqualTo(0UL) + } + + @Test + fun `minusCoercingUnderflow should return zero when minuend is equal to subtrahend`() { + assertThat(5UL.minusCoercingUnderflow(5UL)).isEqualTo(0UL) + } } diff --git a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/TypingsExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/TypingsExtensionsTest.kt deleted file mode 100644 index adee45695..000000000 --- a/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/TypingsExtensionsTest.kt +++ /dev/null @@ -1,115 +0,0 @@ -package net.consensys - -import org.assertj.core.api.Assertions.assertThat -import org.assertj.core.api.Assertions.assertThatThrownBy -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.assertThrows -import java.math.BigInteger - -class TypingsExtensionsTest { - - private val uLongParsingTestCases = mapOf( - 0.toULong() to "0x0", - 1.toULong() to "0x1", - 0xABC_DEF_123_456u to "0xabcdef123456", - ULong.MAX_VALUE to "0xffffffffffffffff" - ) - - @Test - fun `ULong toHexString`() { - uLongParsingTestCases.forEach { (number: ULong, hexString: String) -> - assertThat(number.toHexString()).isEqualTo(hexString) - } - } - - @Test - fun `toHexStringPaddedToBitSize_shouldPadToDesireNumberOfBitsWhenItFits`() { - assertThat(0.toULong().toHexStringPaddedToBitSize(4)).isEqualTo("0x0") - assertThat(0.toULong().toHexStringPaddedToBitSize(8)).isEqualTo("0x00") - assertThat(1.toULong().toHexStringPaddedToBitSize(4)).isEqualTo("0x1") - assertThat(1.toULong().toHexStringPaddedToBitSize(12)).isEqualTo("0x001") - assertThat(255.toULong().toHexStringPaddedToBitSize(8)).isEqualTo("0xff") - - assertThat(ULong.MAX_VALUE.toHexStringPaddedToBitSize(64)) - .isEqualTo("0xffffffffffffffff") - assertThat(ULong.MAX_VALUE.toHexStringPaddedToBitSize(80)) - .isEqualTo("0x0000ffffffffffffffff") - } - - @Test - fun `toHexStringPaddedToBitSize_shouldThrowErrorWhenBitSizeIsNotMultipleOf4`() { - assertThatThrownBy { 2.toULong().toHexStringPaddedToBitSize(9) } - .isInstanceOf(IllegalArgumentException::class.java) - .hasMessage("targetBitSize=9 should be a multiple of 4") - } - - @Test - fun `toHexStringPaddedToBitSize_shouldThrowErrorWhenNumberDoesNotFitWithTargetNumberOfBits`() { - assertThatThrownBy { 256.toULong().toHexStringPaddedToBitSize(8) } - .isInstanceOf(IllegalArgumentException::class.java) - .hasMessage("Number 256 needs 3 hex digits (12 bits), targetBitSize=8") - } - - @Test - fun `toHexStringPaddedToByteSize_shouldPadToDesireNumberOfBitsWhenItFits`() { - assertThat(0.toULong().toHexStringPaddedToByteSize(1)).isEqualTo("0x00") - assertThat(1.toULong().toHexStringPaddedToByteSize(1)).isEqualTo("0x01") - assertThat(2.toULong().toHexStringPaddedToByteSize(3)).isEqualTo("0x000002") - assertThat(255.toULong().toHexStringPaddedToByteSize(1)).isEqualTo("0xff") - assertThat(ULong.MAX_VALUE.toHexStringPaddedToByteSize(8)) - .isEqualTo("0xffffffffffffffff") - assertThat(ULong.MAX_VALUE.toHexStringPaddedToByteSize(10)) - .isEqualTo("0x0000ffffffffffffffff") - } - - @Test - fun `toHexStringPaddedToByteSize_shouldThrowErrorWhenNumberDoesNotFitWithTargetNumber`() { - assertThatThrownBy { 256.toULong().toHexStringPaddedToByteSize(1) } - .isInstanceOf(IllegalArgumentException::class.java) - .hasMessage("Number 256 needs 3 hex digits (12 bits), targetBitSize=8") - } - - @Test - fun `toHexStringUInt256_shouldPadTo256Bit`() { - assertThat(0.toULong().toHexStringUInt256()).isEqualTo("0x" + "0".repeat(64)) - assertThat(15.toULong().toHexStringUInt256()).isEqualTo("0x" + "0".repeat(63) + "f") - } - - @Test - fun `ULong fromHexString`() { - uLongParsingTestCases.forEach { (number: ULong, hexString: String) -> - assertThat(ULong.fromHexString(hexString)).isEqualTo(number) - } - } - - @Test - fun `ULong fromHexString invalid format`() { - assertThrows { ULong.fromHexString("0x23J") } - } - - @Test - fun `BigInteger#ULong`() { - assertThrows { BigInteger.valueOf(-1).toULong() } - assertThat(BigInteger.valueOf(0).toULong()).isEqualTo(0u.toULong()) - assertThat(BigInteger.valueOf(123).toULong()).isEqualTo(123u.toULong()) - assertThat(BigInteger(ULong.MAX_VALUE.toString(), 10).toULong()).isEqualTo(ULong.MAX_VALUE) - } - - @Test - fun `ULong#BigInteger`() { - assertThat(0UL.toBigInteger()).isEqualTo(BigInteger.valueOf(0)) - assertThat(123UL.toBigInteger()).isEqualTo(BigInteger.valueOf(123)) - assertThat(ULong.MAX_VALUE.toBigInteger()).isEqualTo(BigInteger(ULong.MAX_VALUE.toString(), 10)) - } - - @Test - fun `toIntervalString`() { - assertThat((0..0).toIntervalString()).isEqualTo("[0..0]1") - assertThat((0..1).toIntervalString()).isEqualTo("[0..1]2") - assertThat((0..10).toIntervalString()).isEqualTo("[0..10]11") - assertThat((0.0..10.0).toIntervalString()).isEqualTo("[0.0..10.0]11") - - assertThat((0..-1).toIntervalString()).isEqualTo("[0..-1]2") - assertThat((0..-10).toIntervalString()).isEqualTo("[0..-10]11") - } -} diff --git a/jvm-libs/generic/extensions/tuweni/src/main/kotlin/build/linea/tuweni/Bytes32.kt b/jvm-libs/generic/extensions/tuweni/src/main/kotlin/build/linea/tuweni/Bytes32.kt index 2c9336aa3..3dc54adc9 100644 --- a/jvm-libs/generic/extensions/tuweni/src/main/kotlin/build/linea/tuweni/Bytes32.kt +++ b/jvm-libs/generic/extensions/tuweni/src/main/kotlin/build/linea/tuweni/Bytes32.kt @@ -1,6 +1,6 @@ package build.linea.tuweni -import net.consensys.toULong +import linea.kotlin.toULong import org.apache.tuweni.bytes.Bytes32 import java.math.BigInteger diff --git a/jvm-libs/generic/extensions/tuweni/src/test/kotlin/build/linea/tuweni/Bytes32Test.kt b/jvm-libs/generic/extensions/tuweni/src/test/kotlin/build/linea/tuweni/Bytes32Test.kt index 87d176137..d95a25b6a 100644 --- a/jvm-libs/generic/extensions/tuweni/src/test/kotlin/build/linea/tuweni/Bytes32Test.kt +++ b/jvm-libs/generic/extensions/tuweni/src/test/kotlin/build/linea/tuweni/Bytes32Test.kt @@ -1,6 +1,6 @@ package build.linea.tuweni -import net.consensys.toBigInteger +import linea.kotlin.toBigInteger import org.apache.tuweni.bytes.Bytes32 import org.apache.tuweni.units.bigints.UInt256 import org.assertj.core.api.Assertions.assertThat diff --git a/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt index 6a497e9b4..582c27ff7 100644 --- a/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt +++ b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt @@ -24,7 +24,7 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.vertx.core.Vertx import io.vertx.core.json.JsonObject import io.vertx.junit5.VertxExtension -import net.consensys.decodeHex +import linea.kotlin.decodeHex import net.consensys.linea.jsonrpc.JsonRpcErrorResponseException import net.consensys.linea.metrics.MetricsFacade import net.consensys.linea.metrics.micrometer.MicrometerMetricsFacade diff --git a/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientTest.kt b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientTest.kt index ce6e61c02..b1a345204 100644 --- a/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientTest.kt +++ b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientTest.kt @@ -19,7 +19,7 @@ import io.vertx.core.http.HttpClientOptions import io.vertx.core.http.HttpVersion import io.vertx.core.json.JsonArray import io.vertx.core.json.JsonObject -import net.consensys.decodeHex +import linea.kotlin.decodeHex import net.consensys.linea.async.get import net.consensys.linea.async.toSafeFuture import net.consensys.linea.jsonrpc.JsonRpcError diff --git a/jvm-libs/generic/persistence/db/src/main/kotlin/net/consensys/zkevm/persistence/db/SQLQueryLogger.kt b/jvm-libs/generic/persistence/db/src/main/kotlin/net/consensys/zkevm/persistence/db/SQLQueryLogger.kt index 3881b58fd..f1dcd6d08 100644 --- a/jvm-libs/generic/persistence/db/src/main/kotlin/net/consensys/zkevm/persistence/db/SQLQueryLogger.kt +++ b/jvm-libs/generic/persistence/db/src/main/kotlin/net/consensys/zkevm/persistence/db/SQLQueryLogger.kt @@ -1,7 +1,7 @@ package net.consensys.zkevm.persistence.db import io.vertx.sqlclient.Tuple -import net.consensys.encodeHex +import linea.kotlin.encodeHex import org.apache.logging.log4j.Level import org.apache.logging.log4j.Logger diff --git a/jvm-libs/generic/serialization/jackson/src/test/kotlin/build/linea/s11n/jackson/BytesSerDeTest.kt b/jvm-libs/generic/serialization/jackson/src/test/kotlin/build/linea/s11n/jackson/BytesSerDeTest.kt index 8a00ea485..86d405f23 100644 --- a/jvm-libs/generic/serialization/jackson/src/test/kotlin/build/linea/s11n/jackson/BytesSerDeTest.kt +++ b/jvm-libs/generic/serialization/jackson/src/test/kotlin/build/linea/s11n/jackson/BytesSerDeTest.kt @@ -3,8 +3,8 @@ package build.linea.s11n.jackson import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue -import net.consensys.decodeHex -import net.consensys.encodeHex +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach diff --git a/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ClientOptions.kt b/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ClientOptions.kt index 3f46023c9..98e129890 100644 --- a/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ClientOptions.kt +++ b/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ClientOptions.kt @@ -1,7 +1,7 @@ package net.consensys.linea.vertx -import build.linea.getPortWithSchemeDefaults import io.vertx.core.http.HttpClientOptions +import linea.getPortWithSchemeDefaults import java.net.URI fun T.setDefaultsFrom(uri: URI): T { diff --git a/jvm-libs/linea/besu-rlp-and-mappers/src/main/kotlin/linea/domain/MapperBesuToLineaDomain.kt b/jvm-libs/linea/besu-rlp-and-mappers/src/main/kotlin/linea/domain/MapperBesuToLineaDomain.kt index 1ca3416e0..e9405e2c8 100644 --- a/jvm-libs/linea/besu-rlp-and-mappers/src/main/kotlin/linea/domain/MapperBesuToLineaDomain.kt +++ b/jvm-libs/linea/besu-rlp-and-mappers/src/main/kotlin/linea/domain/MapperBesuToLineaDomain.kt @@ -1,7 +1,7 @@ package linea.domain import linea.domain.MapperBesuToLineaDomain.mapToDomain -import net.consensys.toULong +import linea.kotlin.toULong import org.hyperledger.besu.ethereum.core.Transaction import kotlin.jvm.optionals.getOrNull diff --git a/jvm-libs/linea/besu-rlp-and-mappers/src/main/kotlin/linea/domain/MapperLineaDomainToBesu.kt b/jvm-libs/linea/besu-rlp-and-mappers/src/main/kotlin/linea/domain/MapperLineaDomainToBesu.kt index bf5a93cc5..881ac0571 100644 --- a/jvm-libs/linea/besu-rlp-and-mappers/src/main/kotlin/linea/domain/MapperLineaDomainToBesu.kt +++ b/jvm-libs/linea/besu-rlp-and-mappers/src/main/kotlin/linea/domain/MapperLineaDomainToBesu.kt @@ -1,8 +1,8 @@ package linea.domain import linea.domain.MapperLineaDomainToBesu.mapToBesu -import net.consensys.encodeHex -import net.consensys.toBigInteger +import linea.kotlin.encodeHex +import linea.kotlin.toBigInteger import org.apache.tuweni.bytes.Bytes import org.apache.tuweni.bytes.Bytes32 import org.hyperledger.besu.crypto.SECP256K1 diff --git a/jvm-libs/linea/blob-compressor/src/main/kotlin/linea/blob/BlobCompressor.kt b/jvm-libs/linea/blob-compressor/src/main/kotlin/linea/blob/BlobCompressor.kt index 58f36cccf..ffebd7ecd 100644 --- a/jvm-libs/linea/blob-compressor/src/main/kotlin/linea/blob/BlobCompressor.kt +++ b/jvm-libs/linea/blob-compressor/src/main/kotlin/linea/blob/BlobCompressor.kt @@ -1,6 +1,6 @@ package linea.blob -import net.consensys.encodeHex +import linea.kotlin.encodeHex import net.consensys.linea.blob.BlobCompressorVersion import net.consensys.linea.blob.GoNativeBlobCompressor import net.consensys.linea.blob.GoNativeBlobCompressorFactory diff --git a/jvm-libs/linea/blob-compressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobCompressor.kt b/jvm-libs/linea/blob-compressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobCompressor.kt index 8e6d40920..fa09ac4ae 100644 --- a/jvm-libs/linea/blob-compressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobCompressor.kt +++ b/jvm-libs/linea/blob-compressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobCompressor.kt @@ -1,8 +1,8 @@ package net.consensys.linea.blob -import build.linea.jvm.ResourcesUtil.copyResourceToTmpDir import com.sun.jna.Library import com.sun.jna.Native +import linea.jvm.ResourcesUtil.copyResourceToTmpDir interface GoNativeBlobCompressor { diff --git a/jvm-libs/linea/blob-compressor/src/test/kotlin/net/consensys/linea/blob/GoNativeCompressorAndShnarfCalculatorIntTest.kt b/jvm-libs/linea/blob-compressor/src/test/kotlin/net/consensys/linea/blob/GoNativeCompressorAndShnarfCalculatorIntTest.kt index efcbb3bb9..394ae48bc 100644 --- a/jvm-libs/linea/blob-compressor/src/test/kotlin/net/consensys/linea/blob/GoNativeCompressorAndShnarfCalculatorIntTest.kt +++ b/jvm-libs/linea/blob-compressor/src/test/kotlin/net/consensys/linea/blob/GoNativeCompressorAndShnarfCalculatorIntTest.kt @@ -1,7 +1,7 @@ package net.consensys.linea.blob -import net.consensys.decodeHex -import net.consensys.encodeHex +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import net.consensys.linea.nativecompressor.CompressorTestData import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Assertions.assertTrue diff --git a/jvm-libs/linea/blob-compressor/src/testFixtures/kotlin/net/consensys/linea/nativecompressor/TestDataGeneratorHelper.kt b/jvm-libs/linea/blob-compressor/src/testFixtures/kotlin/net/consensys/linea/nativecompressor/TestDataGeneratorHelper.kt index 47d9729ce..6278acf50 100644 --- a/jvm-libs/linea/blob-compressor/src/testFixtures/kotlin/net/consensys/linea/nativecompressor/TestDataGeneratorHelper.kt +++ b/jvm-libs/linea/blob-compressor/src/testFixtures/kotlin/net/consensys/linea/nativecompressor/TestDataGeneratorHelper.kt @@ -1,9 +1,9 @@ package net.consensys.linea.nativecompressor import io.vertx.core.json.JsonObject +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import linea.rlp.RLP -import net.consensys.decodeHex -import net.consensys.encodeHex import net.consensys.linea.testing.filesystem.getPathTo import org.hyperledger.besu.ethereum.core.Block import java.nio.file.Files diff --git a/jvm-libs/linea/blob-decompressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressor.kt b/jvm-libs/linea/blob-decompressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressor.kt index d4dcef6e2..36a45dcc2 100644 --- a/jvm-libs/linea/blob-decompressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressor.kt +++ b/jvm-libs/linea/blob-decompressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressor.kt @@ -1,8 +1,8 @@ package net.consensys.linea.blob -import build.linea.jvm.ResourcesUtil.copyResourceToTmpDir import com.sun.jna.Library import com.sun.jna.Native +import linea.jvm.ResourcesUtil.copyResourceToTmpDir import java.nio.file.Path class DecompressionException(message: String) : RuntimeException(message) diff --git a/jvm-libs/linea/blob-decompressor/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressorTest.kt b/jvm-libs/linea/blob-decompressor/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressorTest.kt index 1327577d3..2b327dfdf 100644 --- a/jvm-libs/linea/blob-decompressor/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressorTest.kt +++ b/jvm-libs/linea/blob-decompressor/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobDecompressorTest.kt @@ -7,12 +7,12 @@ import linea.domain.AccessListEntry import linea.domain.TransactionFactory import linea.domain.createBlock import linea.domain.toBesu +import linea.kotlin.decodeHex +import linea.kotlin.eth +import linea.kotlin.toBigInteger import linea.rlp.BesuRlpBlobDecoder import linea.rlp.RLP -import net.consensys.decodeHex -import net.consensys.eth import net.consensys.linea.nativecompressor.CompressorTestData -import net.consensys.toBigInteger import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/jvm-libs/linea/blob-shnarf-calculator/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculatorTest.kt b/jvm-libs/linea/blob-shnarf-calculator/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculatorTest.kt index 841b1a083..02a374f11 100644 --- a/jvm-libs/linea/blob-shnarf-calculator/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculatorTest.kt +++ b/jvm-libs/linea/blob-shnarf-calculator/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculatorTest.kt @@ -1,7 +1,7 @@ package net.consensys.linea.blob -import net.consensys.decodeHex -import net.consensys.encodeHex +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.BeforeEach diff --git a/jvm-libs/linea/clients/interfaces/src/main/kotlin/build/linea/contract/l1/LineaRollupSmartContractClient.kt b/jvm-libs/linea/clients/interfaces/src/main/kotlin/build/linea/contract/l1/LineaRollupSmartContractClient.kt index 0544afd90..bcf3e07ca 100644 --- a/jvm-libs/linea/clients/interfaces/src/main/kotlin/build/linea/contract/l1/LineaRollupSmartContractClient.kt +++ b/jvm-libs/linea/clients/interfaces/src/main/kotlin/build/linea/contract/l1/LineaRollupSmartContractClient.kt @@ -1,6 +1,6 @@ package build.linea.contract.l1 -import net.consensys.linea.BlockParameter +import linea.domain.BlockParameter import tech.pegasys.teku.infrastructure.async.SafeFuture enum class LineaContractVersion : Comparable { diff --git a/jvm-libs/linea/clients/interfaces/src/main/kotlin/linea/EthLogsSearcher.kt b/jvm-libs/linea/clients/interfaces/src/main/kotlin/linea/EthLogsSearcher.kt index c2b524c7d..34d6d254a 100644 --- a/jvm-libs/linea/clients/interfaces/src/main/kotlin/linea/EthLogsSearcher.kt +++ b/jvm-libs/linea/clients/interfaces/src/main/kotlin/linea/EthLogsSearcher.kt @@ -1,6 +1,7 @@ package linea -import net.consensys.linea.BlockParameter +import linea.domain.BlockParameter +import linea.domain.EthLog import tech.pegasys.teku.infrastructure.async.SafeFuture enum class SearchDirection { @@ -20,13 +21,13 @@ interface EthLogsSearcher { chunkSize: Int = 1000, address: String, topics: List, - shallContinueToSearch: (build.linea.domain.EthLog) -> SearchDirection? // null means stop searching - ): SafeFuture + shallContinueToSearch: (EthLog) -> SearchDirection? // null means stop searching + ): SafeFuture fun getLogs( fromBlock: BlockParameter, toBlock: BlockParameter, address: String, topics: List - ): SafeFuture> + ): SafeFuture> } diff --git a/jvm-libs/linea/clients/linea-l1-contract-client/src/main/kotlin/build/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt b/jvm-libs/linea/clients/linea-l1-contract-client/src/main/kotlin/build/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt index b3df1dcf2..54cd471c8 100644 --- a/jvm-libs/linea/clients/linea-l1-contract-client/src/main/kotlin/build/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt +++ b/jvm-libs/linea/clients/linea-l1-contract-client/src/main/kotlin/build/linea/contract/l1/Web3JLineaRollupSmartContractClientReadOnly.kt @@ -1,11 +1,11 @@ package build.linea.contract.l1 import build.linea.contract.LineaRollupV6 -import net.consensys.encodeHex -import net.consensys.linea.BlockParameter +import linea.domain.BlockParameter +import linea.kotlin.encodeHex +import linea.kotlin.toBigInteger +import linea.kotlin.toULong import net.consensys.linea.async.toSafeFuture -import net.consensys.toBigInteger -import net.consensys.toULong import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import org.web3j.crypto.Credentials diff --git a/jvm-libs/linea/clients/linea-state-manager/src/main/kotlin/build/linea/clients/StateManagerClientV1.kt b/jvm-libs/linea/clients/linea-state-manager/src/main/kotlin/build/linea/clients/StateManagerClientV1.kt index f0ca4a0e8..fbfd442e2 100644 --- a/jvm-libs/linea/clients/linea-state-manager/src/main/kotlin/build/linea/clients/StateManagerClientV1.kt +++ b/jvm-libs/linea/clients/linea-state-manager/src/main/kotlin/build/linea/clients/StateManagerClientV1.kt @@ -1,9 +1,9 @@ package build.linea.clients -import build.linea.domain.BlockInterval import com.fasterxml.jackson.databind.node.ArrayNode import com.github.michaelbull.result.Result -import net.consensys.encodeHex +import linea.domain.BlockInterval +import linea.kotlin.encodeHex import net.consensys.linea.errors.ErrorResponse import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/jvm-libs/linea/clients/linea-state-manager/src/main/kotlin/build/linea/clients/StateManagerV1JsonRpcClient.kt b/jvm-libs/linea/clients/linea-state-manager/src/main/kotlin/build/linea/clients/StateManagerV1JsonRpcClient.kt index a00ef9781..fb56e609f 100644 --- a/jvm-libs/linea/clients/linea-state-manager/src/main/kotlin/build/linea/clients/StateManagerV1JsonRpcClient.kt +++ b/jvm-libs/linea/clients/linea-state-manager/src/main/kotlin/build/linea/clients/StateManagerV1JsonRpcClient.kt @@ -1,14 +1,14 @@ package build.linea.clients -import build.linea.domain.BlockInterval import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.node.ArrayNode import com.github.michaelbull.result.Err import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result import io.vertx.core.json.JsonObject -import net.consensys.decodeHex -import net.consensys.fromHexString +import linea.domain.BlockInterval +import linea.kotlin.decodeHex +import linea.kotlin.fromHexString import net.consensys.linea.errors.ErrorResponse import net.consensys.linea.jsonrpc.JsonRpcErrorResponseException import net.consensys.linea.jsonrpc.client.JsonRpcClientFactory diff --git a/jvm-libs/linea/clients/linea-state-manager/src/test/kotlin/build/linea/clients/StateManagerV1JsonRpcClientTest.kt b/jvm-libs/linea/clients/linea-state-manager/src/test/kotlin/build/linea/clients/StateManagerV1JsonRpcClientTest.kt index 6735ccd0c..82f3e4058 100644 --- a/jvm-libs/linea/clients/linea-state-manager/src/test/kotlin/build/linea/clients/StateManagerV1JsonRpcClientTest.kt +++ b/jvm-libs/linea/clients/linea-state-manager/src/test/kotlin/build/linea/clients/StateManagerV1JsonRpcClientTest.kt @@ -1,6 +1,5 @@ package build.linea.clients -import build.linea.domain.BlockInterval import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.github.michaelbull.result.Err @@ -13,8 +12,9 @@ import com.github.tomakehurst.wiremock.core.WireMockConfiguration.options import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension -import net.consensys.decodeHex -import net.consensys.fromHexString +import linea.domain.BlockInterval +import linea.kotlin.decodeHex +import linea.kotlin.fromHexString import net.consensys.linea.async.get import net.consensys.linea.errors.ErrorResponse import net.consensys.linea.jsonrpc.client.RequestRetryConfig diff --git a/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Block.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Block.kt index ba8c87a87..68e7c4bfc 100644 --- a/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Block.kt +++ b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Block.kt @@ -1,8 +1,7 @@ package linea.domain import kotlinx.datetime.Instant -import net.consensys.encodeHex -import net.consensys.linea.BlockNumberAndHash +import linea.kotlin.encodeHex data class Block( val number: ULong, diff --git a/jvm-libs/linea/core/domain-models/src/main/kotlin/build/linea/domain/BlockInterval.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/BlockInterval.kt similarity index 97% rename from jvm-libs/linea/core/domain-models/src/main/kotlin/build/linea/domain/BlockInterval.kt rename to jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/BlockInterval.kt index b14bc89f4..d683f977a 100644 --- a/jvm-libs/linea/core/domain-models/src/main/kotlin/build/linea/domain/BlockInterval.kt +++ b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/BlockInterval.kt @@ -1,7 +1,6 @@ -package build.linea.domain +package linea.domain -import net.consensys.isSortedBy -import net.consensys.linea.CommonDomainFunctions +import linea.kotlin.isSortedBy /** * Represents a block interval, with inclusive start and end block numbers diff --git a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockNumberAndHash.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/BlockNumberAndHash.kt similarity index 91% rename from jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockNumberAndHash.kt rename to jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/BlockNumberAndHash.kt index 9750aaedb..21eed0903 100644 --- a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockNumberAndHash.kt +++ b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/BlockNumberAndHash.kt @@ -1,6 +1,6 @@ -package net.consensys.linea +package linea.domain -import net.consensys.encodeHex +import linea.kotlin.encodeHex data class BlockNumberAndHash( val number: ULong, diff --git a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockParameter.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/BlockParameter.kt similarity index 98% rename from jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockParameter.kt rename to jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/BlockParameter.kt index 9a18cbed6..c8b8095ac 100644 --- a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockParameter.kt +++ b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/BlockParameter.kt @@ -1,4 +1,4 @@ -package net.consensys.linea +package linea.domain sealed interface BlockParameter { fun getTag(): String diff --git a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/CommonDomainFunctions.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/CommonDomainFunctions.kt similarity index 85% rename from jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/CommonDomainFunctions.kt rename to jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/CommonDomainFunctions.kt index 4f165d8e0..8839b27bb 100644 --- a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/CommonDomainFunctions.kt +++ b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/CommonDomainFunctions.kt @@ -1,7 +1,7 @@ -package net.consensys.linea +package linea.domain -import net.consensys.assertIs20Bytes -import net.consensys.decodeHex +import linea.kotlin.assertIs20Bytes +import linea.kotlin.decodeHex import java.math.BigInteger object CommonDomainFunctions { diff --git a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/Constants.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Constants.kt similarity index 76% rename from jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/Constants.kt rename to jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Constants.kt index f246bd70e..ad10ff197 100644 --- a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/Constants.kt +++ b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Constants.kt @@ -1,4 +1,4 @@ -package net.consensys.linea +package linea.domain object Constants { const val Eip4844BlobSize = 131072 // 4096 fields of 32bytes = 128KB diff --git a/jvm-libs/linea/core/domain-models/src/main/kotlin/build/linea/domain/EthLog.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/EthLog.kt similarity index 97% rename from jvm-libs/linea/core/domain-models/src/main/kotlin/build/linea/domain/EthLog.kt rename to jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/EthLog.kt index f048b71bc..457ea4371 100644 --- a/jvm-libs/linea/core/domain-models/src/main/kotlin/build/linea/domain/EthLog.kt +++ b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/EthLog.kt @@ -1,6 +1,6 @@ -package build.linea.domain +package linea.domain -import net.consensys.encodeHex +import linea.kotlin.encodeHex data class EthLog( val removed: Boolean, diff --git a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/FeeHistory.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/FeeHistory.kt similarity index 92% rename from jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/FeeHistory.kt rename to jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/FeeHistory.kt index d96d66daf..956f64006 100644 --- a/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/FeeHistory.kt +++ b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/FeeHistory.kt @@ -1,4 +1,4 @@ -package net.consensys.linea +package linea.domain data class FeeHistory( val oldestBlock: ULong, diff --git a/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Transaction.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Transaction.kt index 309028866..35fdc7838 100644 --- a/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Transaction.kt +++ b/jvm-libs/linea/core/domain-models/src/main/kotlin/linea/domain/Transaction.kt @@ -1,6 +1,6 @@ package linea.domain -import net.consensys.encodeHex +import linea.kotlin.encodeHex import java.math.BigInteger import java.util.EnumSet diff --git a/jvm-libs/linea/core/domain-models/src/test/kotlin/build/linea/domain/BlockIntervalsTest.kt b/jvm-libs/linea/core/domain-models/src/test/kotlin/linea/domain/BlockIntervalsTest.kt similarity index 98% rename from jvm-libs/linea/core/domain-models/src/test/kotlin/build/linea/domain/BlockIntervalsTest.kt rename to jvm-libs/linea/core/domain-models/src/test/kotlin/linea/domain/BlockIntervalsTest.kt index f76d706e0..4fff9aff9 100644 --- a/jvm-libs/linea/core/domain-models/src/test/kotlin/build/linea/domain/BlockIntervalsTest.kt +++ b/jvm-libs/linea/core/domain-models/src/test/kotlin/linea/domain/BlockIntervalsTest.kt @@ -1,4 +1,4 @@ -package build.linea.domain +package linea.domain import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test diff --git a/jvm-libs/linea/core/domain-models/src/test/kotlin/linea/domain/BlockParameterTest.kt b/jvm-libs/linea/core/domain-models/src/test/kotlin/linea/domain/BlockParameterTest.kt index aaaae3faa..2a9a3731d 100644 --- a/jvm-libs/linea/core/domain-models/src/test/kotlin/linea/domain/BlockParameterTest.kt +++ b/jvm-libs/linea/core/domain-models/src/test/kotlin/linea/domain/BlockParameterTest.kt @@ -1,6 +1,5 @@ package linea.domain -import net.consensys.linea.BlockParameter import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.jupiter.api.Test diff --git a/jvm-libs/linea/core/domain-models/src/test/kotlin/net/consensys/linea/FeeHistoryTest.kt b/jvm-libs/linea/core/domain-models/src/test/kotlin/net/consensys/linea/FeeHistoryTest.kt index b95ac526c..3352a3b7d 100644 --- a/jvm-libs/linea/core/domain-models/src/test/kotlin/net/consensys/linea/FeeHistoryTest.kt +++ b/jvm-libs/linea/core/domain-models/src/test/kotlin/net/consensys/linea/FeeHistoryTest.kt @@ -1,5 +1,6 @@ package net.consensys.linea +import linea.domain.FeeHistory import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/jvm-libs/linea/core/domain-models/src/testFixtures/kotlin/linea/domain/BlockFactory.kt b/jvm-libs/linea/core/domain-models/src/testFixtures/kotlin/linea/domain/BlockFactory.kt index 767cbd16b..c0a357c80 100644 --- a/jvm-libs/linea/core/domain-models/src/testFixtures/kotlin/linea/domain/BlockFactory.kt +++ b/jvm-libs/linea/core/domain-models/src/testFixtures/kotlin/linea/domain/BlockFactory.kt @@ -2,7 +2,7 @@ package linea.domain import kotlinx.datetime.Clock import kotlinx.datetime.Instant -import net.consensys.ByteArrayExt +import linea.kotlin.ByteArrayExt val zeroHash = ByteArray(32) { 0 } val zeroAddress = ByteArray(20) { 0 } diff --git a/jvm-libs/linea/core/domain-models/src/testFixtures/kotlin/linea/domain/TransactionFactory.kt b/jvm-libs/linea/core/domain-models/src/testFixtures/kotlin/linea/domain/TransactionFactory.kt index 60bddeae8..9226c16b7 100644 --- a/jvm-libs/linea/core/domain-models/src/testFixtures/kotlin/linea/domain/TransactionFactory.kt +++ b/jvm-libs/linea/core/domain-models/src/testFixtures/kotlin/linea/domain/TransactionFactory.kt @@ -1,8 +1,8 @@ package linea.domain -import net.consensys.eth -import net.consensys.gwei -import net.consensys.toBigInteger +import linea.kotlin.eth +import linea.kotlin.gwei +import linea.kotlin.toBigInteger import org.apache.tuweni.bytes.Bytes import org.apache.tuweni.bytes.Bytes32 import org.hyperledger.besu.crypto.KeyPair diff --git a/jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracesCounters.kt b/jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracesCounters.kt index c9c56d123..50fc771cf 100644 --- a/jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracesCounters.kt +++ b/jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracesCounters.kt @@ -1,6 +1,6 @@ package net.consensys.linea.traces -import net.consensys.KMath +import linea.kotlin.KMath /** * These operations are immutable. Each operation creates a new instance. diff --git a/jvm-libs/linea/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt b/jvm-libs/linea/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt index 2023ad822..ffedc01a9 100644 --- a/jvm-libs/linea/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt +++ b/jvm-libs/linea/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt @@ -1,6 +1,6 @@ package net.consensys.linea.testing.filesystem -import net.consensys.encodeHex +import linea.kotlin.encodeHex import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import kotlin.random.Random diff --git a/jvm-libs/linea/testing/l1-blob-and-proof-submission/src/main/kotlin/net/consensys/linea/testing/submission/SubmissionTestHelper.kt b/jvm-libs/linea/testing/l1-blob-and-proof-submission/src/main/kotlin/net/consensys/linea/testing/submission/SubmissionTestHelper.kt index 93281851b..0b282fe92 100644 --- a/jvm-libs/linea/testing/l1-blob-and-proof-submission/src/main/kotlin/net/consensys/linea/testing/submission/SubmissionTestHelper.kt +++ b/jvm-libs/linea/testing/l1-blob-and-proof-submission/src/main/kotlin/net/consensys/linea/testing/submission/SubmissionTestHelper.kt @@ -1,6 +1,6 @@ package net.consensys.linea.testing.submission -import build.linea.domain.BlockInterval +import linea.domain.BlockInterval import linea.web3j.waitForTxReceipt import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClient import net.consensys.zkevm.domain.Aggregation diff --git a/jvm-libs/linea/web3j-extensions/src/main/kotlin/build/linea/web3j/domain/BlockParameterExtensions.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/build/linea/web3j/domain/BlockParameterExtensions.kt index 03f312e04..e9a720aab 100644 --- a/jvm-libs/linea/web3j-extensions/src/main/kotlin/build/linea/web3j/domain/BlockParameterExtensions.kt +++ b/jvm-libs/linea/web3j-extensions/src/main/kotlin/build/linea/web3j/domain/BlockParameterExtensions.kt @@ -1,7 +1,7 @@ package build.linea.web3j.domain -import net.consensys.linea.BlockParameter -import net.consensys.toBigInteger +import linea.domain.BlockParameter +import linea.kotlin.toBigInteger import org.web3j.protocol.core.DefaultBlockParameter fun BlockParameter.toWeb3j(): DefaultBlockParameter { diff --git a/jvm-libs/linea/web3j-extensions/src/main/kotlin/build/linea/web3j/domain/EthLog.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/build/linea/web3j/domain/EthLog.kt index 01dc1fdd7..3d7f033dd 100644 --- a/jvm-libs/linea/web3j-extensions/src/main/kotlin/build/linea/web3j/domain/EthLog.kt +++ b/jvm-libs/linea/web3j-extensions/src/main/kotlin/build/linea/web3j/domain/EthLog.kt @@ -1,8 +1,8 @@ package build.linea.web3j.domain -import build.linea.domain.EthLog -import net.consensys.decodeHex -import net.consensys.toULong +import linea.domain.EthLog +import linea.kotlin.decodeHex +import linea.kotlin.toULong import org.web3j.protocol.core.methods.response.Log fun Log.toDomain(): EthLog { diff --git a/jvm-libs/linea/web3j-extensions/src/main/kotlin/linea/web3j/EthGetBlockToLineaBlockMappers.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/linea/web3j/EthGetBlockToLineaBlockMappers.kt index b5c1d3baa..05053a0de 100644 --- a/jvm-libs/linea/web3j-extensions/src/main/kotlin/linea/web3j/EthGetBlockToLineaBlockMappers.kt +++ b/jvm-libs/linea/web3j-extensions/src/main/kotlin/linea/web3j/EthGetBlockToLineaBlockMappers.kt @@ -4,11 +4,11 @@ import linea.domain.AccessListEntry import linea.domain.Block import linea.domain.Transaction import linea.domain.TransactionType -import net.consensys.decodeHex -import net.consensys.toBigIntegerFromHex -import net.consensys.toIntFromHex -import net.consensys.toULong -import net.consensys.toULongFromHex +import linea.kotlin.decodeHex +import linea.kotlin.toBigIntegerFromHex +import linea.kotlin.toIntFromHex +import linea.kotlin.toULong +import linea.kotlin.toULongFromHex import org.web3j.protocol.core.methods.response.EthBlock fun EthBlock.Block.toDomain(): Block = mapToDomain(this) diff --git a/jvm-libs/linea/web3j-extensions/src/main/kotlin/linea/web3j/Web3JLogsSearcher.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/linea/web3j/Web3JLogsSearcher.kt index 794646499..1b6e498c4 100644 --- a/jvm-libs/linea/web3j-extensions/src/main/kotlin/linea/web3j/Web3JLogsSearcher.kt +++ b/jvm-libs/linea/web3j-extensions/src/main/kotlin/linea/web3j/Web3JLogsSearcher.kt @@ -5,13 +5,13 @@ import build.linea.web3j.domain.toWeb3j import io.vertx.core.Vertx import linea.EthLogsSearcher import linea.SearchDirection +import linea.domain.BlockParameter +import linea.domain.BlockParameter.Companion.toBlockParameter +import linea.domain.CommonDomainFunctions import linea.domain.RetryConfig -import net.consensys.linea.BlockParameter -import net.consensys.linea.BlockParameter.Companion.toBlockParameter -import net.consensys.linea.CommonDomainFunctions +import linea.kotlin.toULong import net.consensys.linea.async.AsyncRetryer import net.consensys.linea.async.toSafeFuture -import net.consensys.toULong import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import org.web3j.protocol.Web3j @@ -24,7 +24,7 @@ import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds private sealed interface SearchResult { - data class ItemFound(val log: build.linea.domain.EthLog) : SearchResult + data class ItemFound(val log: linea.domain.EthLog) : SearchResult data class KeepSearching(val direction: SearchDirection) : SearchResult data object NoResultsInInterval : SearchResult } @@ -46,8 +46,8 @@ class Web3JLogsSearcher( chunkSize: Int, address: String, topics: List, - shallContinueToSearch: (build.linea.domain.EthLog) -> SearchDirection? - ): SafeFuture { + shallContinueToSearch: (linea.domain.EthLog) -> SearchDirection? + ): SafeFuture { require(chunkSize > 0) { "chunkSize=$chunkSize must be greater than 0" } return getAbsoluteBlockNumbers(fromBlock, toBlock) @@ -76,8 +76,8 @@ class Web3JLogsSearcher( chunkSize: Int, address: String, topics: List, - shallContinueToSearchPredicate: (build.linea.domain.EthLog) -> SearchDirection? - ): SafeFuture { + shallContinueToSearchPredicate: (linea.domain.EthLog) -> SearchDirection? + ): SafeFuture { val cursor = SearchCursor(fromBlock, toBlock, chunkSize) log.trace("searching between blocks={}", CommonDomainFunctions.blockIntervalString(fromBlock, toBlock)) @@ -121,7 +121,7 @@ class Web3JLogsSearcher( toBlock: ULong, address: String, topics: List, - shallContinueToSearchPredicate: (build.linea.domain.EthLog) -> SearchDirection? + shallContinueToSearchPredicate: (linea.domain.EthLog) -> SearchDirection? ): SafeFuture { return getLogs( fromBlock = fromBlock.toBlockParameter(), @@ -152,7 +152,7 @@ class Web3JLogsSearcher( toBlock: BlockParameter, address: String, topics: List - ): SafeFuture> { + ): SafeFuture> { return if (config.requestRetryConfig.isRetryEnabled) { AsyncRetryer.retry( vertx = vertx, @@ -172,7 +172,7 @@ class Web3JLogsSearcher( toBlock: BlockParameter, address: String, topics: List - ): SafeFuture> { + ): SafeFuture> { val ethFilter = EthFilter( /*fromBlock*/ fromBlock.toWeb3j(), /*toBlock*/ toBlock.toWeb3j(), diff --git a/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Blob.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Blob.kt index 8e10d0030..63741fed1 100644 --- a/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Blob.kt +++ b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Blob.kt @@ -1,6 +1,6 @@ package net.consensys.linea.web3j -import net.consensys.linea.Constants +import linea.domain.Constants fun padBlobForEip4844Submission(blob: ByteArray): ByteArray { return ByteArray(Constants.Eip4844BlobSize).apply { blob.copyInto(this) } diff --git a/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtended.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtended.kt index 025b60eda..9c8035d73 100644 --- a/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtended.kt +++ b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtended.kt @@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.DeserializationContext import com.fasterxml.jackson.databind.JsonDeserializer import com.fasterxml.jackson.databind.ObjectReader import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import net.consensys.linea.FeeHistory -import net.consensys.linea.uLongFromPrefixedHex +import linea.domain.FeeHistory +import linea.domain.uLongFromPrefixedHex import org.web3j.protocol.ObjectMapperFactory import org.web3j.protocol.Web3jService import org.web3j.protocol.core.DefaultBlockParameter diff --git a/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/ExtendedWeb3J.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/ExtendedWeb3J.kt index c2fc8c171..b50abae01 100644 --- a/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/ExtendedWeb3J.kt +++ b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/ExtendedWeb3J.kt @@ -2,8 +2,8 @@ package net.consensys.linea.web3j import build.linea.web3j.domain.toWeb3j import linea.domain.Block +import linea.domain.BlockParameter import linea.web3j.toDomain -import net.consensys.linea.BlockParameter import net.consensys.linea.async.toSafeFuture import org.web3j.protocol.Web3j import org.web3j.protocol.core.DefaultBlockParameter diff --git a/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/FeeHistoryExtensions.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/FeeHistoryExtensions.kt index c0c7c79e1..d6cb26c0c 100644 --- a/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/FeeHistoryExtensions.kt +++ b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/FeeHistoryExtensions.kt @@ -1,7 +1,7 @@ package net.consensys.linea.web3j -import net.consensys.linea.FeeHistory -import net.consensys.toULong +import linea.domain.FeeHistory +import linea.kotlin.toULong import org.web3j.protocol.core.methods.response.EthFeeHistory fun EthFeeHistory.FeeHistory.toLineaDomain(): FeeHistory { diff --git a/jvm-libs/linea/web3j-extensions/src/test/kotlin/build/linea/web3j/Web3JLogsClientIntTest.kt b/jvm-libs/linea/web3j-extensions/src/test/kotlin/build/linea/web3j/Web3JLogsClientIntTest.kt index 578dc543d..0dff9d7a0 100644 --- a/jvm-libs/linea/web3j-extensions/src/test/kotlin/build/linea/web3j/Web3JLogsClientIntTest.kt +++ b/jvm-libs/linea/web3j-extensions/src/test/kotlin/build/linea/web3j/Web3JLogsClientIntTest.kt @@ -7,8 +7,8 @@ import com.github.tomakehurst.wiremock.client.WireMock.post import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo import com.github.tomakehurst.wiremock.core.WireMockConfiguration import io.vertx.core.Vertx -import net.consensys.encodeHex -import net.consensys.toBigInteger +import linea.kotlin.encodeHex +import linea.kotlin.toBigInteger import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.jupiter.api.AfterEach diff --git a/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/EthGetBlockToLineaBlockMapperTest.kt b/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/EthGetBlockToLineaBlockMapperTest.kt index ed6d4097e..d00beb47e 100644 --- a/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/EthGetBlockToLineaBlockMapperTest.kt +++ b/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/EthGetBlockToLineaBlockMapperTest.kt @@ -4,9 +4,9 @@ import linea.domain.AccessListEntry import linea.domain.Transaction import linea.domain.TransactionType import linea.domain.toBesu -import net.consensys.decodeHex -import net.consensys.toBigInteger -import net.consensys.toBigIntegerFromHex +import linea.kotlin.decodeHex +import linea.kotlin.toBigInteger +import linea.kotlin.toBigIntegerFromHex import org.apache.tuweni.bytes.Bytes import org.apache.tuweni.bytes.Bytes32 import org.assertj.core.api.Assertions.assertThat diff --git a/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/ULongRangesHelperTest.kt b/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/ULongRangesHelperTest.kt index 82bd7b2b3..58af3ecb4 100644 --- a/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/ULongRangesHelperTest.kt +++ b/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/ULongRangesHelperTest.kt @@ -1,6 +1,6 @@ package linea.web3j -import net.consensys.intersection +import linea.kotlin.intersection import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/Web3JLogsSearcherIntTest.kt b/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/Web3JLogsSearcherIntTest.kt index 45cfad662..3224111e1 100644 --- a/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/Web3JLogsSearcherIntTest.kt +++ b/jvm-libs/linea/web3j-extensions/src/test/kotlin/linea/web3j/Web3JLogsSearcherIntTest.kt @@ -1,6 +1,5 @@ package linea.web3j -import build.linea.domain.EthLog import com.github.tomakehurst.wiremock.WireMockServer import com.github.tomakehurst.wiremock.client.WireMock.aResponse import com.github.tomakehurst.wiremock.client.WireMock.containing @@ -9,16 +8,17 @@ import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo import com.github.tomakehurst.wiremock.core.WireMockConfiguration import io.vertx.core.Vertx import linea.SearchDirection +import linea.domain.BlockParameter.Companion.toBlockParameter +import linea.domain.EthLog import linea.domain.RetryConfig import linea.jsonrpc.TestingJsonRpcServer +import linea.kotlin.encodeHex +import linea.kotlin.fromHexString +import linea.kotlin.toHexString +import linea.kotlin.toHexStringUInt256 import linea.log4j.configureLoggers -import net.consensys.encodeHex -import net.consensys.fromHexString -import net.consensys.linea.BlockParameter.Companion.toBlockParameter import net.consensys.linea.jsonrpc.JsonRpcError import net.consensys.linea.jsonrpc.JsonRpcRequest -import net.consensys.toHexString -import net.consensys.toHexStringUInt256 import org.apache.logging.log4j.Level import org.apache.logging.log4j.LogManager import org.assertj.core.api.Assertions.assertThat diff --git a/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/Eip4844TransactionTest.kt b/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/Eip4844TransactionTest.kt index fa2f6e30d..496045e61 100644 --- a/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/Eip4844TransactionTest.kt +++ b/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/Eip4844TransactionTest.kt @@ -1,6 +1,6 @@ package net.consensys.linea.web3j -import net.consensys.linea.Constants +import linea.domain.Constants import org.apache.tuweni.bytes.Bytes import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/FeeHistoryExtensionsTest.kt b/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/FeeHistoryExtensionsTest.kt index 1483d8a3a..98fbb772e 100644 --- a/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/FeeHistoryExtensionsTest.kt +++ b/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/FeeHistoryExtensionsTest.kt @@ -1,6 +1,6 @@ package net.consensys.linea.web3j -import net.consensys.linea.FeeHistory +import linea.domain.FeeHistory import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.web3j.protocol.core.methods.response.EthFeeHistory diff --git a/state-recovery/appcore/clients-interfaces/src/main/kotlin/linea/staterecovery/ExecutionLayerClient.kt b/state-recovery/appcore/clients-interfaces/src/main/kotlin/linea/staterecovery/ExecutionLayerClient.kt index 3926efcdd..1eb1d09f7 100644 --- a/state-recovery/appcore/clients-interfaces/src/main/kotlin/linea/staterecovery/ExecutionLayerClient.kt +++ b/state-recovery/appcore/clients-interfaces/src/main/kotlin/linea/staterecovery/ExecutionLayerClient.kt @@ -1,7 +1,7 @@ package linea.staterecovery -import net.consensys.linea.BlockNumberAndHash -import net.consensys.linea.BlockParameter +import linea.domain.BlockNumberAndHash +import linea.domain.BlockParameter import tech.pegasys.teku.infrastructure.async.SafeFuture data class StateRecoveryStatus( diff --git a/state-recovery/appcore/domain-models/src/main/kotlin/linea/staterecovery/BlockFromL1RecoveredData.kt b/state-recovery/appcore/domain-models/src/main/kotlin/linea/staterecovery/BlockFromL1RecoveredData.kt index ce8888b76..b2698e315 100644 --- a/state-recovery/appcore/domain-models/src/main/kotlin/linea/staterecovery/BlockFromL1RecoveredData.kt +++ b/state-recovery/appcore/domain-models/src/main/kotlin/linea/staterecovery/BlockFromL1RecoveredData.kt @@ -1,7 +1,7 @@ package linea.staterecovery import kotlinx.datetime.Instant -import net.consensys.encodeHex +import linea.kotlin.encodeHex data class BlockHeaderFromL1RecoveredData( val blockNumber: ULong, diff --git a/state-recovery/appcore/domain-models/src/main/kotlin/linea/staterecovery/TransactionFromL1RecoveredData.kt b/state-recovery/appcore/domain-models/src/main/kotlin/linea/staterecovery/TransactionFromL1RecoveredData.kt index a86e950b5..d15d22f73 100644 --- a/state-recovery/appcore/domain-models/src/main/kotlin/linea/staterecovery/TransactionFromL1RecoveredData.kt +++ b/state-recovery/appcore/domain-models/src/main/kotlin/linea/staterecovery/TransactionFromL1RecoveredData.kt @@ -1,6 +1,6 @@ package linea.staterecovery -import net.consensys.encodeHex +import linea.kotlin.encodeHex import java.math.BigInteger data class TransactionFromL1RecoveredData( diff --git a/state-recovery/appcore/logic/build.gradle b/state-recovery/appcore/logic/build.gradle index d82b904b8..15276ae28 100644 --- a/state-recovery/appcore/logic/build.gradle +++ b/state-recovery/appcore/logic/build.gradle @@ -19,6 +19,7 @@ dependencies { api project(':jvm-libs:linea:besu-rlp-and-mappers') api project(':jvm-libs:linea:besu-libs') + testImplementation(project(':jvm-libs:linea:blob-decompressor')) testImplementation(project(":jvm-libs:linea:testing:file-system")) testImplementation(testFixtures(project(":jvm-libs:linea:blob-compressor"))) testImplementation("org.bouncycastle:bcprov-jdk18on:1.78.1") diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/BlobDecompressorAndDeserializer.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/BlobDecompressorAndDeserializer.kt index 4f702a66c..d349001a1 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/BlobDecompressorAndDeserializer.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/BlobDecompressorAndDeserializer.kt @@ -4,11 +4,11 @@ import io.vertx.core.Vertx import kotlinx.datetime.Clock import kotlinx.datetime.Instant import linea.domain.BinaryDecoder +import linea.domain.CommonDomainFunctions +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import linea.rlp.BesuRlpBlobDecoder import linea.rlp.RLP -import net.consensys.decodeHex -import net.consensys.encodeHex -import net.consensys.linea.CommonDomainFunctions import net.consensys.linea.async.toSafeFuture import net.consensys.linea.blob.BlobDecompressor import org.apache.logging.log4j.LogManager diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/BlockImporter.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/BlockImporter.kt index bfa109dc4..a5a4d06e3 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/BlockImporter.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/BlockImporter.kt @@ -1,8 +1,8 @@ package linea.staterecovery import build.linea.clients.StateManagerClientV1 -import build.linea.domain.BlockInterval import io.vertx.core.Vertx +import linea.domain.BlockInterval import net.consensys.linea.async.AsyncRetryer import tech.pegasys.teku.infrastructure.async.SafeFuture import kotlin.time.Duration diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LineaSubmissionEventsClient.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LineaSubmissionEventsClient.kt index ef7626564..3af606cfc 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LineaSubmissionEventsClient.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LineaSubmissionEventsClient.kt @@ -1,12 +1,12 @@ package linea.staterecovery -import build.linea.domain.BlockInterval -import build.linea.domain.EthLog -import build.linea.domain.EthLogEvent -import net.consensys.encodeHex -import net.consensys.linea.BlockParameter -import net.consensys.sliceOf32 -import net.consensys.toULongFromLast8Bytes +import linea.domain.BlockInterval +import linea.domain.BlockParameter +import linea.domain.EthLog +import linea.domain.EthLogEvent +import linea.kotlin.encodeHex +import linea.kotlin.sliceOf32 +import linea.kotlin.toULongFromLast8Bytes import tech.pegasys.teku.infrastructure.async.SafeFuture data class DataSubmittedV3( diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LineaSubmissionEventsClientImpl.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LineaSubmissionEventsClientImpl.kt index 8986cf9f3..1684deab8 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LineaSubmissionEventsClientImpl.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LineaSubmissionEventsClientImpl.kt @@ -1,12 +1,12 @@ package linea.staterecovery -import build.linea.domain.EthLogEvent import linea.EthLogsSearcher import linea.SearchDirection -import net.consensys.encodeHex -import net.consensys.linea.BlockParameter -import net.consensys.linea.BlockParameter.Companion.toBlockParameter -import net.consensys.toHexStringUInt256 +import linea.domain.BlockParameter +import linea.domain.BlockParameter.Companion.toBlockParameter +import linea.domain.EthLogEvent +import linea.kotlin.encodeHex +import linea.kotlin.toHexStringUInt256 import tech.pegasys.teku.infrastructure.async.SafeFuture class LineaSubmissionEventsClientImpl( diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LookBackBlockHashesFetcher.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LookBackBlockHashesFetcher.kt index 39c1b59d0..284ef8fb3 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LookBackBlockHashesFetcher.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/LookBackBlockHashesFetcher.kt @@ -1,10 +1,10 @@ package linea.staterecovery -import build.linea.domain.BlockInterval import io.vertx.core.Vertx +import linea.domain.BlockInterval +import linea.domain.BlockParameter.Companion.toBlockParameter import linea.staterecovery.datafetching.SubmissionEventsAndData import linea.staterecovery.datafetching.SubmissionsFetchingTask -import net.consensys.linea.BlockParameter.Companion.toBlockParameter import net.consensys.linea.async.AsyncRetryer import tech.pegasys.teku.infrastructure.async.SafeFuture import kotlin.time.Duration.Companion.seconds diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StartingBlockCalculator.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StartingBlockCalculator.kt index 977a442a2..68af9cf90 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StartingBlockCalculator.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StartingBlockCalculator.kt @@ -1,7 +1,7 @@ package linea.staterecovery -import build.linea.domain.BlockInterval -import net.consensys.minusCoercingUnderflow +import linea.domain.BlockInterval +import linea.kotlin.minusCoercingUnderflow fun startBlockToFetchFromL1( headBlockNumber: ULong, diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StateRecoveryApp.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StateRecoveryApp.kt index bbfb0f9b6..56e814e05 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StateRecoveryApp.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StateRecoveryApp.kt @@ -4,8 +4,8 @@ import build.linea.clients.StateManagerClientV1 import build.linea.contract.l1.LineaRollupSmartContractClientReadOnly import io.vertx.core.Vertx import linea.EthLogsSearcher -import net.consensys.linea.BlockParameter -import net.consensys.linea.BlockParameter.Companion.toBlockParameter +import linea.domain.BlockParameter +import linea.domain.BlockParameter.Companion.toBlockParameter import net.consensys.linea.async.AsyncRetryer import net.consensys.linea.blob.BlobDecompressorVersion import net.consensys.linea.blob.GoNativeBlobDecompressorFactory diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StateSynchronizerService.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StateSynchronizerService.kt index 84da81be8..77c2b3c79 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StateSynchronizerService.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/StateSynchronizerService.kt @@ -1,10 +1,10 @@ package linea.staterecovery import io.vertx.core.Vertx +import linea.domain.BlockParameter +import linea.domain.CommonDomainFunctions +import linea.kotlin.encodeHex import linea.staterecovery.datafetching.SubmissionsFetchingTask -import net.consensys.encodeHex -import net.consensys.linea.BlockParameter -import net.consensys.linea.CommonDomainFunctions import net.consensys.zkevm.PeriodicPollingService import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/datafetching/SubmissionEventsFetchingTask.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/datafetching/SubmissionEventsFetchingTask.kt index 712d55987..d335b342a 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/datafetching/SubmissionEventsFetchingTask.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/datafetching/SubmissionEventsFetchingTask.kt @@ -1,12 +1,12 @@ package linea.staterecovery.datafetching -import build.linea.domain.EthLogEvent import io.vertx.core.Vertx +import linea.domain.BlockParameter +import linea.domain.BlockParameter.Companion.toBlockParameter +import linea.domain.EthLogEvent import linea.staterecovery.DataFinalizedV3 import linea.staterecovery.FinalizationAndDataEventsV3 import linea.staterecovery.LineaRollupSubmissionEventsClient -import net.consensys.linea.BlockParameter -import net.consensys.linea.BlockParameter.Companion.toBlockParameter import net.consensys.zkevm.PeriodicPollingService import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/datafetching/SubmissionsFetchingTask.kt b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/datafetching/SubmissionsFetchingTask.kt index 9e13e2a55..663aa1450 100644 --- a/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/datafetching/SubmissionsFetchingTask.kt +++ b/state-recovery/appcore/logic/src/main/kotlin/linea/staterecovery/datafetching/SubmissionsFetchingTask.kt @@ -1,13 +1,13 @@ package linea.staterecovery.datafetching import io.vertx.core.Vertx +import linea.domain.BlockParameter import linea.staterecovery.BlobDecompressorAndDeserializer import linea.staterecovery.BlobFetcher import linea.staterecovery.BlockFromL1RecoveredData import linea.staterecovery.FinalizationAndDataEventsV3 import linea.staterecovery.LineaRollupSubmissionEventsClient import linea.staterecovery.TransactionDetailsClient -import net.consensys.linea.BlockParameter import net.consensys.zkevm.PeriodicPollingService import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/state-recovery/appcore/logic/src/test/kotlin/linea/staterecovery/BlobDecompressorAndDeserializerV1Test.kt b/state-recovery/appcore/logic/src/test/kotlin/linea/staterecovery/BlobDecompressorAndDeserializerV1Test.kt index 578e6e6cd..6de0dc3c9 100644 --- a/state-recovery/appcore/logic/src/test/kotlin/linea/staterecovery/BlobDecompressorAndDeserializerV1Test.kt +++ b/state-recovery/appcore/logic/src/test/kotlin/linea/staterecovery/BlobDecompressorAndDeserializerV1Test.kt @@ -4,8 +4,8 @@ import io.vertx.core.Vertx import kotlinx.datetime.Instant import linea.blob.BlobCompressor import linea.blob.GoBackedBlobCompressor +import linea.kotlin.encodeHex import linea.rlp.RLP -import net.consensys.encodeHex import net.consensys.linea.blob.BlobCompressorVersion import net.consensys.linea.blob.BlobDecompressorVersion import net.consensys.linea.blob.GoNativeBlobDecompressorFactory diff --git a/state-recovery/appcore/logic/src/test/kotlin/linea/staterecovery/StartingBlockCalculatorTest.kt b/state-recovery/appcore/logic/src/test/kotlin/linea/staterecovery/StartingBlockCalculatorTest.kt index ce785efd9..151e0b58a 100644 --- a/state-recovery/appcore/logic/src/test/kotlin/linea/staterecovery/StartingBlockCalculatorTest.kt +++ b/state-recovery/appcore/logic/src/test/kotlin/linea/staterecovery/StartingBlockCalculatorTest.kt @@ -1,6 +1,6 @@ package linea.staterecovery -import build.linea.domain.BlockInterval +import linea.domain.BlockInterval import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test diff --git a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/clients/ExecutionLayerInProcessClient.kt b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/clients/ExecutionLayerInProcessClient.kt index 8023a372f..e341369d4 100644 --- a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/clients/ExecutionLayerInProcessClient.kt +++ b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/clients/ExecutionLayerInProcessClient.kt @@ -1,14 +1,14 @@ package linea.staterecovery.clients +import linea.domain.BlockNumberAndHash +import linea.domain.BlockParameter +import linea.domain.CommonDomainFunctions import linea.staterecovery.BlockFromL1RecoveredData import linea.staterecovery.ExecutionLayerClient import linea.staterecovery.RecoveryStatusPersistence import linea.staterecovery.StateRecoveryStatus import linea.staterecovery.plugin.BlockImporter import linea.staterecovery.plugin.RecoveryModeManager -import net.consensys.linea.BlockNumberAndHash -import net.consensys.linea.BlockParameter -import net.consensys.linea.CommonDomainFunctions import org.apache.logging.log4j.LogManager import org.hyperledger.besu.plugin.data.BlockHeader import org.hyperledger.besu.plugin.services.BlockSimulationService diff --git a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/BlockHashLookupWithRecoverySupport.kt b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/BlockHashLookupWithRecoverySupport.kt index c5084fd77..fa1c8bd1e 100644 --- a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/BlockHashLookupWithRecoverySupport.kt +++ b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/BlockHashLookupWithRecoverySupport.kt @@ -1,8 +1,8 @@ package linea.staterecovery.plugin +import linea.kotlin.encodeHex import linea.kotlin.hasSequentialElements -import net.consensys.encodeHex -import net.consensys.minusCoercingUnderflow +import linea.kotlin.minusCoercingUnderflow import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import org.apache.tuweni.bytes.Bytes32 diff --git a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/BlockImporter.kt b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/BlockImporter.kt index 97f684b81..5ff0dc3f4 100644 --- a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/BlockImporter.kt +++ b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/BlockImporter.kt @@ -1,9 +1,9 @@ package linea.staterecovery.plugin +import linea.kotlin.encodeHex +import linea.kotlin.toBigInteger +import linea.kotlin.toULong import linea.staterecovery.BlockFromL1RecoveredData -import net.consensys.encodeHex -import net.consensys.toBigInteger -import net.consensys.toULong import org.apache.logging.log4j.LogManager import org.apache.tuweni.bytes.Bytes32 import org.hyperledger.besu.datatypes.Address diff --git a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/PluginOptions.kt b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/PluginOptions.kt index 26b6d2e19..2b4fcbe24 100644 --- a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/PluginOptions.kt +++ b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/PluginOptions.kt @@ -1,7 +1,7 @@ package linea.staterecovery.plugin +import linea.domain.BlockParameter import linea.domain.RetryConfig -import net.consensys.linea.BlockParameter import org.hyperledger.besu.datatypes.Address import picocli.CommandLine import java.net.URI diff --git a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/TransactionMapper.kt b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/TransactionMapper.kt index 9484f7d2c..d96a8fd71 100644 --- a/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/TransactionMapper.kt +++ b/state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/TransactionMapper.kt @@ -1,9 +1,9 @@ package linea.staterecovery.plugin +import linea.kotlin.encodeHex +import linea.kotlin.toBigInteger import linea.staterecovery.TransactionFromL1RecoveredData import linea.staterecovery.TransactionFromL1RecoveredData.AccessTuple -import net.consensys.encodeHex -import net.consensys.toBigInteger import org.apache.tuweni.bytes.Bytes import org.hyperledger.besu.crypto.SECPSignature import org.hyperledger.besu.datatypes.AccessListEntry diff --git a/state-recovery/besu-plugin/src/test/kotlin/linea/staterecovery/plugin/BlockHashLookupWithRecoverySupportTest.kt b/state-recovery/besu-plugin/src/test/kotlin/linea/staterecovery/plugin/BlockHashLookupWithRecoverySupportTest.kt index 623ed7149..f2516ba10 100644 --- a/state-recovery/besu-plugin/src/test/kotlin/linea/staterecovery/plugin/BlockHashLookupWithRecoverySupportTest.kt +++ b/state-recovery/besu-plugin/src/test/kotlin/linea/staterecovery/plugin/BlockHashLookupWithRecoverySupportTest.kt @@ -1,7 +1,7 @@ package linea.staterecovery.plugin -import net.consensys.decodeHex -import net.consensys.toHexStringUInt256 +import linea.kotlin.decodeHex +import linea.kotlin.toHexStringUInt256 import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy import org.hyperledger.besu.datatypes.Hash diff --git a/state-recovery/clients/blobscan-client/src/main/kotlin/linea/staterecovery/clients/blobscan/BlobScanClient.kt b/state-recovery/clients/blobscan-client/src/main/kotlin/linea/staterecovery/clients/blobscan/BlobScanClient.kt index 63b8fcaff..3b6c8417a 100644 --- a/state-recovery/clients/blobscan-client/src/main/kotlin/linea/staterecovery/clients/blobscan/BlobScanClient.kt +++ b/state-recovery/clients/blobscan-client/src/main/kotlin/linea/staterecovery/clients/blobscan/BlobScanClient.kt @@ -4,9 +4,9 @@ import io.vertx.core.Vertx import io.vertx.core.json.JsonObject import io.vertx.ext.web.client.WebClient import io.vertx.ext.web.client.WebClientOptions +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import linea.staterecovery.BlobFetcher -import net.consensys.decodeHex -import net.consensys.encodeHex import net.consensys.linea.jsonrpc.client.RequestRetryConfig import net.consensys.linea.vertx.setDefaultsFrom import org.apache.logging.log4j.LogManager diff --git a/state-recovery/clients/blobscan-client/src/test/kotlin/linea/staterecovery/clients/blobscan/BlobScanClientTest.kt b/state-recovery/clients/blobscan-client/src/test/kotlin/linea/staterecovery/clients/blobscan/BlobScanClientTest.kt index 15f1e8717..0089b3e0f 100644 --- a/state-recovery/clients/blobscan-client/src/test/kotlin/linea/staterecovery/clients/blobscan/BlobScanClientTest.kt +++ b/state-recovery/clients/blobscan-client/src/test/kotlin/linea/staterecovery/clients/blobscan/BlobScanClientTest.kt @@ -7,7 +7,7 @@ import com.github.tomakehurst.wiremock.http.RequestListener import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension -import net.consensys.encodeHex +import linea.kotlin.encodeHex import net.consensys.linea.async.get import net.consensys.linea.jsonrpc.client.RequestRetryConfig import org.assertj.core.api.Assertions.assertThat diff --git a/state-recovery/clients/eth-api/src/main/kotlin/linea/staterecovery/clients/VertxTransactionDetailsClient.kt b/state-recovery/clients/eth-api/src/main/kotlin/linea/staterecovery/clients/VertxTransactionDetailsClient.kt index 3c6233fcb..b430b8c27 100644 --- a/state-recovery/clients/eth-api/src/main/kotlin/linea/staterecovery/clients/VertxTransactionDetailsClient.kt +++ b/state-recovery/clients/eth-api/src/main/kotlin/linea/staterecovery/clients/VertxTransactionDetailsClient.kt @@ -2,8 +2,8 @@ package linea.staterecovery.clients import com.fasterxml.jackson.databind.JsonNode import com.github.michaelbull.result.Err +import linea.kotlin.decodeHex import linea.staterecovery.TransactionDetailsClient -import net.consensys.decodeHex import net.consensys.linea.jsonrpc.client.JsonRpcClientFactory import net.consensys.linea.jsonrpc.client.JsonRpcV2Client import net.consensys.linea.jsonrpc.client.RequestRetryConfig diff --git a/state-recovery/test-cases/src/e2eTest/kotlin/linea/staterecovery/StateRecoveryE2ETest.kt b/state-recovery/test-cases/src/e2eTest/kotlin/linea/staterecovery/StateRecoveryE2ETest.kt index 39605a635..323339e45 100644 --- a/state-recovery/test-cases/src/e2eTest/kotlin/linea/staterecovery/StateRecoveryE2ETest.kt +++ b/state-recovery/test-cases/src/e2eTest/kotlin/linea/staterecovery/StateRecoveryE2ETest.kt @@ -2,12 +2,14 @@ package linea.staterecovery import build.linea.clients.StateManagerClientV1 import build.linea.clients.StateManagerV1JsonRpcClient -import build.linea.domain.EthLogEvent import io.micrometer.core.instrument.simple.SimpleMeterRegistry import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension import kotlinx.datetime.Clock +import linea.domain.EthLogEvent import linea.domain.RetryConfig +import linea.kotlin.gwei +import linea.kotlin.toBigInteger import linea.log4j.configureLoggers import linea.staterecovery.test.assertBesuAndShomeiRecoveredAsExpected import linea.staterecovery.test.execCommandAndAssertSuccess @@ -18,13 +20,10 @@ import linea.testing.Runner import linea.web3j.Web3JLogsSearcher import linea.web3j.createWeb3jHttpClient import linea.web3j.waitForTxReceipt -import net.consensys.gwei import net.consensys.linea.jsonrpc.client.RequestRetryConfig import net.consensys.linea.jsonrpc.client.VertxHttpJsonRpcClientFactory import net.consensys.linea.metrics.micrometer.MicrometerMetricsFacade import net.consensys.linea.testing.filesystem.getPathTo -import net.consensys.toBigInteger -import net.consensys.toULong import net.consensys.zkevm.ethereum.L2AccountManager import net.consensys.zkevm.ethereum.Web3jClientManager import org.apache.logging.log4j.Level diff --git a/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/LineaSubmissionEventsClientIntTest.kt b/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/LineaSubmissionEventsClientIntTest.kt index 0f6cfa9f2..3a4257c7b 100644 --- a/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/LineaSubmissionEventsClientIntTest.kt +++ b/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/LineaSubmissionEventsClientIntTest.kt @@ -3,10 +3,10 @@ package linea.staterecovery import build.linea.contract.l1.LineaContractVersion import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension +import linea.domain.BlockParameter import linea.domain.RetryConfig import linea.log4j.configureLoggers import linea.web3j.Web3JLogsSearcher -import net.consensys.linea.BlockParameter import net.consensys.linea.testing.submission.AggregationAndBlobs import net.consensys.linea.testing.submission.loadBlobsAndAggregationsSortedAndGrouped import net.consensys.linea.testing.submission.submitBlobsAndAggregationsAndWaitExecution diff --git a/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/StateRecoveryAppWithFakeExecutionClientIntTest.kt b/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/StateRecoveryAppWithFakeExecutionClientIntTest.kt index 948c3b840..ad6aa78e1 100644 --- a/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/StateRecoveryAppWithFakeExecutionClientIntTest.kt +++ b/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/StateRecoveryAppWithFakeExecutionClientIntTest.kt @@ -3,6 +3,8 @@ package linea.staterecovery import build.linea.contract.l1.LineaContractVersion import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension +import linea.domain.BlockNumberAndHash +import linea.domain.BlockParameter import linea.domain.RetryConfig import linea.log4j.configureLoggers import linea.staterecovery.plugin.AppClients @@ -11,8 +13,6 @@ import linea.staterecovery.test.FakeExecutionLayerClient import linea.staterecovery.test.FakeStateManagerClient import linea.staterecovery.test.FakeStateManagerClientBasedOnBlobsRecords import linea.web3j.createWeb3jHttpClient -import net.consensys.linea.BlockNumberAndHash -import net.consensys.linea.BlockParameter import net.consensys.linea.testing.submission.AggregationAndBlobs import net.consensys.linea.testing.submission.loadBlobsAndAggregationsSortedAndGrouped import net.consensys.linea.testing.submission.submitBlobsAndAggregationsAndWaitExecution diff --git a/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/datafetching/SubmissionsFetchingTaskIntTest.kt b/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/datafetching/SubmissionsFetchingTaskIntTest.kt index 32d3c2f80..ea12192f0 100644 --- a/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/datafetching/SubmissionsFetchingTaskIntTest.kt +++ b/state-recovery/test-cases/src/integrationTest/kotlin/linea/staterecovery/datafetching/SubmissionsFetchingTaskIntTest.kt @@ -3,6 +3,7 @@ package linea.staterecovery.datafetching import build.linea.contract.l1.LineaContractVersion import io.vertx.core.Vertx import io.vertx.junit5.VertxExtension +import linea.domain.BlockParameter import linea.domain.RetryConfig import linea.log4j.configureLoggers import linea.staterecovery.BlobDecompressorAndDeserializer @@ -14,7 +15,6 @@ import linea.staterecovery.LineaSubmissionEventsClientImpl import linea.staterecovery.plugin.AppClients import linea.staterecovery.plugin.createAppClients import linea.web3j.createWeb3jHttpClient -import net.consensys.linea.BlockParameter import net.consensys.linea.blob.BlobDecompressorVersion import net.consensys.linea.blob.GoNativeBlobDecompressorFactory import net.consensys.linea.testing.submission.AggregationAndBlobs diff --git a/state-recovery/test-cases/src/main/kotlin/linea/staterecovery/test/FakeExecutionLayerClient.kt b/state-recovery/test-cases/src/main/kotlin/linea/staterecovery/test/FakeExecutionLayerClient.kt index c3642cfc2..2ed5e3678 100644 --- a/state-recovery/test-cases/src/main/kotlin/linea/staterecovery/test/FakeExecutionLayerClient.kt +++ b/state-recovery/test-cases/src/main/kotlin/linea/staterecovery/test/FakeExecutionLayerClient.kt @@ -1,11 +1,11 @@ package linea.staterecovery.test +import linea.domain.BlockNumberAndHash +import linea.domain.BlockParameter +import linea.domain.CommonDomainFunctions import linea.staterecovery.BlockFromL1RecoveredData import linea.staterecovery.ExecutionLayerClient import linea.staterecovery.StateRecoveryStatus -import net.consensys.linea.BlockNumberAndHash -import net.consensys.linea.BlockParameter -import net.consensys.linea.CommonDomainFunctions import org.apache.logging.log4j.LogManager import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/state-recovery/test-cases/src/main/kotlin/linea/staterecovery/test/FakeStateManagerClient.kt b/state-recovery/test-cases/src/main/kotlin/linea/staterecovery/test/FakeStateManagerClient.kt index d87475ad4..46f6c48da 100644 --- a/state-recovery/test-cases/src/main/kotlin/linea/staterecovery/test/FakeStateManagerClient.kt +++ b/state-recovery/test-cases/src/main/kotlin/linea/staterecovery/test/FakeStateManagerClient.kt @@ -3,15 +3,15 @@ package linea.staterecovery.test import build.linea.clients.GetZkEVMStateMerkleProofResponse import build.linea.clients.StateManagerClientV1 import build.linea.clients.StateManagerErrorType -import build.linea.domain.BlockInterval import com.fasterxml.jackson.databind.node.ArrayNode import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result import linea.EthLogsSearcher +import linea.domain.BlockInterval +import linea.domain.BlockParameter +import linea.kotlin.toHexStringUInt256 import linea.staterecovery.DataFinalizedV3 -import net.consensys.linea.BlockParameter import net.consensys.linea.errors.ErrorResponse -import net.consensys.toHexStringUInt256 import net.consensys.zkevm.domain.BlobRecord import tech.pegasys.teku.infrastructure.async.SafeFuture import java.util.concurrent.ConcurrentHashMap diff --git a/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/ManualTestWithFakeExecutionClient.kt b/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/ManualTestWithFakeExecutionClient.kt index 7c69a26bb..d06051a2f 100644 --- a/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/ManualTestWithFakeExecutionClient.kt +++ b/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/ManualTestWithFakeExecutionClient.kt @@ -2,13 +2,13 @@ package linea.staterecovery import build.linea.clients.StateManagerClientV1 import io.vertx.core.Vertx +import linea.domain.BlockNumberAndHash +import linea.domain.BlockParameter import linea.domain.RetryConfig import linea.log4j.configureLoggers import linea.staterecovery.plugin.createAppClients import linea.staterecovery.test.FakeExecutionLayerClient import linea.staterecovery.test.FakeStateManagerClientReadFromL1 -import net.consensys.linea.BlockNumberAndHash -import net.consensys.linea.BlockParameter import net.consensys.linea.async.get import net.consensys.linea.vertx.VertxFactory import org.apache.logging.log4j.Level diff --git a/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/test/AssertionsHelper.kt b/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/test/AssertionsHelper.kt index 6d7aef67d..555b85737 100644 --- a/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/test/AssertionsHelper.kt +++ b/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/test/AssertionsHelper.kt @@ -1,11 +1,11 @@ package linea.staterecovery.test import build.linea.clients.StateManagerClientV1 -import build.linea.domain.BlockInterval +import linea.domain.BlockInterval +import linea.kotlin.toULong import linea.testing.CommandResult import linea.testing.Runner import linea.web3j.createWeb3jHttpClient -import net.consensys.toULong import org.apache.logging.log4j.Logger import org.assertj.core.api.Assertions.assertThat import org.awaitility.Awaitility.await diff --git a/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/test/LogEventsFetchHelper.kt b/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/test/LogEventsFetchHelper.kt index f8af8fd97..1970ad374 100644 --- a/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/test/LogEventsFetchHelper.kt +++ b/state-recovery/test-cases/src/test/kotlin/linea/staterecovery/test/LogEventsFetchHelper.kt @@ -1,9 +1,9 @@ package linea.staterecovery.test -import build.linea.domain.EthLogEvent +import linea.domain.BlockParameter +import linea.domain.EthLogEvent import linea.staterecovery.DataFinalizedV3 import linea.web3j.Web3JLogsSearcher -import net.consensys.linea.BlockParameter fun getLastFinalizationOnL1( logsSearcher: Web3JLogsSearcher, diff --git a/testing-tools/app/src/main/kotlin/net/consensys/zkevm/load/LineaEstimateGasResponse.kt b/testing-tools/app/src/main/kotlin/net/consensys/zkevm/load/LineaEstimateGasResponse.kt index 632bc3026..1ed40c022 100644 --- a/testing-tools/app/src/main/kotlin/net/consensys/zkevm/load/LineaEstimateGasResponse.kt +++ b/testing-tools/app/src/main/kotlin/net/consensys/zkevm/load/LineaEstimateGasResponse.kt @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.DeserializationContext import com.fasterxml.jackson.databind.JsonDeserializer import com.fasterxml.jackson.databind.ObjectReader import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import net.consensys.linea.bigIntFromPrefixedHex +import linea.domain.bigIntFromPrefixedHex import org.web3j.protocol.ObjectMapperFactory import org.web3j.protocol.core.Response import java.io.IOException diff --git a/traces-api-facade/app/src/main/kotlin/net/consensys/linea/traces/app/api/ArgumentParser.kt b/traces-api-facade/app/src/main/kotlin/net/consensys/linea/traces/app/api/ArgumentParser.kt index 4ab57b31b..b3d375d4c 100644 --- a/traces-api-facade/app/src/main/kotlin/net/consensys/linea/traces/app/api/ArgumentParser.kt +++ b/traces-api-facade/app/src/main/kotlin/net/consensys/linea/traces/app/api/ArgumentParser.kt @@ -1,6 +1,6 @@ package net.consensys.linea.traces.app.api -import net.consensys.fromHexString +import linea.kotlin.fromHexString import net.consensys.linea.jsonrpc.argument.getArgument import org.apache.tuweni.bytes.Bytes32 diff --git a/traces-api-facade/app/src/main/kotlin/net/consensys/linea/traces/app/api/RequestHandlersV1.kt b/traces-api-facade/app/src/main/kotlin/net/consensys/linea/traces/app/api/RequestHandlersV1.kt index 37504ed64..b09b87a5f 100644 --- a/traces-api-facade/app/src/main/kotlin/net/consensys/linea/traces/app/api/RequestHandlersV1.kt +++ b/traces-api-facade/app/src/main/kotlin/net/consensys/linea/traces/app/api/RequestHandlersV1.kt @@ -10,8 +10,8 @@ import com.github.michaelbull.result.mapError import io.vertx.core.Future import io.vertx.core.json.JsonObject import io.vertx.ext.auth.User -import net.consensys.decodeHex -import net.consensys.linea.BlockNumberAndHash +import linea.domain.BlockNumberAndHash +import linea.kotlin.decodeHex import net.consensys.linea.TracesConflationServiceV1 import net.consensys.linea.TracesCountingServiceV1 import net.consensys.linea.TracesError diff --git a/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesConflationServiceV1Impl.kt b/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesConflationServiceV1Impl.kt index c9f2a2d41..f04bcd84c 100644 --- a/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesConflationServiceV1Impl.kt +++ b/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesConflationServiceV1Impl.kt @@ -5,7 +5,8 @@ import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result import com.github.michaelbull.result.flatMap import io.vertx.core.json.JsonObject -import net.consensys.linea.CommonDomainFunctions.blockIntervalString +import linea.domain.BlockNumberAndHash +import linea.domain.CommonDomainFunctions.blockIntervalString import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesCountingService.kt b/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesCountingService.kt index cebac83b7..0bd18a1f3 100644 --- a/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesCountingService.kt +++ b/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesCountingService.kt @@ -2,6 +2,7 @@ package net.consensys.linea import com.github.michaelbull.result.Result import com.github.michaelbull.result.flatMap +import linea.domain.BlockNumberAndHash import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesRepository.kt b/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesRepository.kt index 0b97070ac..3d1a2f43a 100644 --- a/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesRepository.kt +++ b/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesRepository.kt @@ -2,6 +2,7 @@ package net.consensys.linea import com.github.michaelbull.result.Result import io.vertx.core.json.JsonObject +import linea.domain.BlockNumberAndHash import tech.pegasys.teku.infrastructure.async.SafeFuture class BlockTraces( diff --git a/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesServices.kt b/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesServices.kt index 011b4b53f..18ae0f4fc 100644 --- a/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesServices.kt +++ b/traces-api-facade/core/src/main/kotlin/net/consensys/linea/TracesServices.kt @@ -2,6 +2,7 @@ package net.consensys.linea import com.github.michaelbull.result.Result import io.vertx.core.json.JsonObject +import linea.domain.BlockNumberAndHash import net.consensys.linea.traces.TracesCounters import tech.pegasys.teku.infrastructure.async.SafeFuture diff --git a/transaction-decoder-tool/src/test/kotlin/linea/test/BlockEncodingValidator.kt b/transaction-decoder-tool/src/test/kotlin/linea/test/BlockEncodingValidator.kt index c45edb0e2..9e494c1e1 100644 --- a/transaction-decoder-tool/src/test/kotlin/linea/test/BlockEncodingValidator.kt +++ b/transaction-decoder-tool/src/test/kotlin/linea/test/BlockEncodingValidator.kt @@ -3,11 +3,11 @@ package linea.test import io.vertx.core.Vertx import linea.blob.GoBackedBlobCompressor import linea.domain.Block +import linea.domain.CommonDomainFunctions import linea.domain.toBesu import linea.rlp.BesuRlpDecoderAsyncVertxImpl import linea.rlp.BesuRlpMainnetEncoderAsyncVertxImpl import linea.rlp.RLP -import net.consensys.linea.CommonDomainFunctions import net.consensys.linea.blob.BlobCompressorVersion import net.consensys.linea.blob.BlobDecompressorVersion import net.consensys.linea.blob.GoNativeBlobDecompressorFactory diff --git a/transaction-decoder-tool/src/test/kotlin/linea/test/BlocksFetcher.kt b/transaction-decoder-tool/src/test/kotlin/linea/test/BlocksFetcher.kt index 3165d6b8f..598801c88 100644 --- a/transaction-decoder-tool/src/test/kotlin/linea/test/BlocksFetcher.kt +++ b/transaction-decoder-tool/src/test/kotlin/linea/test/BlocksFetcher.kt @@ -3,8 +3,8 @@ package linea.test import build.linea.web3j.domain.toWeb3j import io.vertx.core.Vertx import linea.domain.Block +import linea.domain.BlockParameter.Companion.toBlockParameter import linea.web3j.toDomain -import net.consensys.linea.BlockParameter.Companion.toBlockParameter import net.consensys.linea.async.AsyncRetryer import net.consensys.linea.async.toSafeFuture import org.apache.logging.log4j.LogManager diff --git a/transaction-decoder-tool/src/test/kotlin/linea/test/FetchAndValidationRunner.kt b/transaction-decoder-tool/src/test/kotlin/linea/test/FetchAndValidationRunner.kt index 0991e31d6..66c7c9a7d 100644 --- a/transaction-decoder-tool/src/test/kotlin/linea/test/FetchAndValidationRunner.kt +++ b/transaction-decoder-tool/src/test/kotlin/linea/test/FetchAndValidationRunner.kt @@ -1,8 +1,8 @@ package linea.test import io.vertx.core.Vertx +import linea.domain.CommonDomainFunctions import linea.web3j.createWeb3jHttpClient -import net.consensys.linea.CommonDomainFunctions import org.apache.logging.log4j.Level import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger diff --git a/transaction-exclusion-api/app/src/integrationTest/kotlin/net/consensys/linea/transactionexclusion/TransactionExclusionAppTest.kt b/transaction-exclusion-api/app/src/integrationTest/kotlin/net/consensys/linea/transactionexclusion/TransactionExclusionAppTest.kt index b95f287c4..370a46b8e 100644 --- a/transaction-exclusion-api/app/src/integrationTest/kotlin/net/consensys/linea/transactionexclusion/TransactionExclusionAppTest.kt +++ b/transaction-exclusion-api/app/src/integrationTest/kotlin/net/consensys/linea/transactionexclusion/TransactionExclusionAppTest.kt @@ -7,7 +7,8 @@ import io.restassured.http.ContentType import io.restassured.specification.RequestSpecification import io.vertx.junit5.VertxExtension import kotlinx.datetime.Clock -import net.consensys.encodeHex +import linea.kotlin.encodeHex +import linea.kotlin.trimToMillisecondPrecision import net.consensys.linea.async.get import net.consensys.linea.transactionexclusion.app.AppConfig import net.consensys.linea.transactionexclusion.app.DatabaseConfig @@ -18,7 +19,6 @@ import net.consensys.linea.transactionexclusion.app.TransactionExclusionApp import net.consensys.linea.transactionexclusion.app.api.ApiConfig import net.consensys.linea.transactionexclusion.test.defaultRejectedTransaction import net.consensys.linea.transactionexclusion.test.rejectedContractDeploymentTransaction -import net.consensys.trimToMillisecondPrecision import net.consensys.zkevm.persistence.db.DbHelper import net.consensys.zkevm.persistence.db.test.CleanDbTestSuiteParallel import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson diff --git a/transaction-exclusion-api/app/src/main/kotlin/net/consensys/linea/transactionexclusion/app/api/ArgumentParser.kt b/transaction-exclusion-api/app/src/main/kotlin/net/consensys/linea/transactionexclusion/app/api/ArgumentParser.kt index be7330a67..2624629c3 100644 --- a/transaction-exclusion-api/app/src/main/kotlin/net/consensys/linea/transactionexclusion/app/api/ArgumentParser.kt +++ b/transaction-exclusion-api/app/src/main/kotlin/net/consensys/linea/transactionexclusion/app/api/ArgumentParser.kt @@ -1,8 +1,8 @@ package net.consensys.linea.transactionexclusion.app.api import kotlinx.datetime.Instant -import net.consensys.assertIs32Bytes -import net.consensys.decodeHex +import linea.kotlin.assertIs32Bytes +import linea.kotlin.decodeHex import net.consensys.linea.transactionexclusion.ModuleOverflow import net.consensys.linea.transactionexclusion.RejectedTransaction import net.consensys.linea.transactionexclusion.TransactionInfo diff --git a/transaction-exclusion-api/app/src/main/kotlin/net/consensys/linea/transactionexclusion/app/api/RequestHandlersV1.kt b/transaction-exclusion-api/app/src/main/kotlin/net/consensys/linea/transactionexclusion/app/api/RequestHandlersV1.kt index c7eb4fb22..899b41579 100644 --- a/transaction-exclusion-api/app/src/main/kotlin/net/consensys/linea/transactionexclusion/app/api/RequestHandlersV1.kt +++ b/transaction-exclusion-api/app/src/main/kotlin/net/consensys/linea/transactionexclusion/app/api/RequestHandlersV1.kt @@ -10,7 +10,8 @@ import com.github.michaelbull.result.mapError import io.vertx.core.Future import io.vertx.core.json.JsonObject import io.vertx.ext.auth.User -import net.consensys.encodeHex +import linea.kotlin.encodeHex +import linea.kotlin.toHexString import net.consensys.linea.async.toVertxFuture import net.consensys.linea.jsonrpc.JsonRpcErrorResponse import net.consensys.linea.jsonrpc.JsonRpcRequest @@ -21,7 +22,6 @@ import net.consensys.linea.jsonrpc.JsonRpcSuccessResponse import net.consensys.linea.transactionexclusion.RejectedTransaction import net.consensys.linea.transactionexclusion.TransactionExclusionServiceV1 import net.consensys.linea.transactionexclusion.dto.RejectedTransactionJsonDto -import net.consensys.toHexString private fun validateIsMapOrListParams(request: JsonRpcRequest): Result { if (request.params !is Map<*, *> && request.params !is List<*>) { diff --git a/transaction-exclusion-api/app/src/test/kotlin/net/consensys/linea/transactionexclusion/app/api/ArgumentParserTest.kt b/transaction-exclusion-api/app/src/test/kotlin/net/consensys/linea/transactionexclusion/app/api/ArgumentParserTest.kt index 92e3f517a..df1635ded 100644 --- a/transaction-exclusion-api/app/src/test/kotlin/net/consensys/linea/transactionexclusion/app/api/ArgumentParserTest.kt +++ b/transaction-exclusion-api/app/src/test/kotlin/net/consensys/linea/transactionexclusion/app/api/ArgumentParserTest.kt @@ -2,8 +2,8 @@ package net.consensys.linea.transactionexclusion.app.api import io.vertx.core.json.JsonObject import kotlinx.datetime.Instant -import net.consensys.decodeHex -import net.consensys.encodeHex +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex import net.consensys.linea.transactionexclusion.ModuleOverflow import net.consensys.linea.transactionexclusion.RejectedTransaction import net.consensys.linea.transactionexclusion.test.defaultRejectedTransaction diff --git a/transaction-exclusion-api/app/src/test/kotlin/net/consensys/linea/transactionexclusion/app/api/RequestHandlersTest.kt b/transaction-exclusion-api/app/src/test/kotlin/net/consensys/linea/transactionexclusion/app/api/RequestHandlersTest.kt index f8480331f..e081e7756 100644 --- a/transaction-exclusion-api/app/src/test/kotlin/net/consensys/linea/transactionexclusion/app/api/RequestHandlersTest.kt +++ b/transaction-exclusion-api/app/src/test/kotlin/net/consensys/linea/transactionexclusion/app/api/RequestHandlersTest.kt @@ -5,7 +5,8 @@ import com.github.michaelbull.result.Ok import com.github.michaelbull.result.get import com.github.michaelbull.result.getError import io.vertx.core.json.JsonObject -import net.consensys.encodeHex +import linea.kotlin.encodeHex +import linea.kotlin.toHexString import net.consensys.linea.async.get import net.consensys.linea.jsonrpc.JsonRpcErrorResponse import net.consensys.linea.jsonrpc.JsonRpcRequestListParams @@ -15,7 +16,6 @@ import net.consensys.linea.transactionexclusion.ErrorType import net.consensys.linea.transactionexclusion.TransactionExclusionError import net.consensys.linea.transactionexclusion.TransactionExclusionServiceV1 import net.consensys.linea.transactionexclusion.test.defaultRejectedTransaction -import net.consensys.toHexString import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/transaction-exclusion-api/core/src/main/kotlin/net/consensys/linea/transactionexclusion/RejectedTransaction.kt b/transaction-exclusion-api/core/src/main/kotlin/net/consensys/linea/transactionexclusion/RejectedTransaction.kt index e6c940680..85db221ee 100644 --- a/transaction-exclusion-api/core/src/main/kotlin/net/consensys/linea/transactionexclusion/RejectedTransaction.kt +++ b/transaction-exclusion-api/core/src/main/kotlin/net/consensys/linea/transactionexclusion/RejectedTransaction.kt @@ -1,7 +1,7 @@ package net.consensys.linea.transactionexclusion import kotlinx.datetime.Instant -import net.consensys.encodeHex +import linea.kotlin.encodeHex data class ModuleOverflow( val count: Long, diff --git a/transaction-exclusion-api/core/src/testFixtures/kotlin/net.consensys.linea.transactionexclusion.test/Common.kt b/transaction-exclusion-api/core/src/testFixtures/kotlin/net.consensys.linea.transactionexclusion.test/Common.kt index dd9d3736d..8e0052cfc 100644 --- a/transaction-exclusion-api/core/src/testFixtures/kotlin/net.consensys.linea.transactionexclusion.test/Common.kt +++ b/transaction-exclusion-api/core/src/testFixtures/kotlin/net.consensys.linea.transactionexclusion.test/Common.kt @@ -1,7 +1,7 @@ package net.consensys.linea.transactionexclusion.test import kotlinx.datetime.Instant -import net.consensys.decodeHex +import linea.kotlin.decodeHex import net.consensys.linea.transactionexclusion.ModuleOverflow import net.consensys.linea.transactionexclusion.RejectedTransaction import net.consensys.linea.transactionexclusion.TransactionInfo diff --git a/transaction-exclusion-api/persistence/rejectedtransaction/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/rejectedtransaction/RejectedTransactionsPostgresDaoTest.kt b/transaction-exclusion-api/persistence/rejectedtransaction/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/rejectedtransaction/RejectedTransactionsPostgresDaoTest.kt index 00df47c04..5a46bb36e 100644 --- a/transaction-exclusion-api/persistence/rejectedtransaction/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/rejectedtransaction/RejectedTransactionsPostgresDaoTest.kt +++ b/transaction-exclusion-api/persistence/rejectedtransaction/src/integrationTest/kotlin/net/consensys/zkevm/persistence/dao/rejectedtransaction/RejectedTransactionsPostgresDaoTest.kt @@ -7,16 +7,16 @@ import io.vertx.sqlclient.Row import io.vertx.sqlclient.RowSet import kotlinx.datetime.Clock import kotlinx.datetime.Instant +import linea.kotlin.decodeHex +import linea.kotlin.encodeHex +import linea.kotlin.trimToMillisecondPrecision import net.consensys.FakeFixedClock -import net.consensys.decodeHex -import net.consensys.encodeHex import net.consensys.linea.async.get import net.consensys.linea.transactionexclusion.ModuleOverflow import net.consensys.linea.transactionexclusion.RejectedTransaction import net.consensys.linea.transactionexclusion.TransactionInfo import net.consensys.linea.transactionexclusion.test.defaultRejectedTransaction import net.consensys.linea.transactionexclusion.test.rejectedContractDeploymentTransaction -import net.consensys.trimToMillisecondPrecision import net.consensys.zkevm.persistence.db.DbHelper import net.consensys.zkevm.persistence.db.DuplicatedRecordException import net.consensys.zkevm.persistence.db.test.CleanDbTestSuiteParallel diff --git a/transaction-exclusion-api/persistence/rejectedtransaction/src/main/kotlin/net/consensys/zkevm/persistence/dao/rejectedtransaction/RejectedTransactionsPostgresDao.kt b/transaction-exclusion-api/persistence/rejectedtransaction/src/main/kotlin/net/consensys/zkevm/persistence/dao/rejectedtransaction/RejectedTransactionsPostgresDao.kt index 1c4cf500e..59ab1b2af 100644 --- a/transaction-exclusion-api/persistence/rejectedtransaction/src/main/kotlin/net/consensys/zkevm/persistence/dao/rejectedtransaction/RejectedTransactionsPostgresDao.kt +++ b/transaction-exclusion-api/persistence/rejectedtransaction/src/main/kotlin/net/consensys/zkevm/persistence/dao/rejectedtransaction/RejectedTransactionsPostgresDao.kt @@ -7,7 +7,7 @@ import io.vertx.sqlclient.SqlClient import io.vertx.sqlclient.Tuple import kotlinx.datetime.Clock import kotlinx.datetime.Instant -import net.consensys.encodeHex +import linea.kotlin.encodeHex import net.consensys.linea.async.toSafeFuture import net.consensys.linea.transactionexclusion.ModuleOverflow import net.consensys.linea.transactionexclusion.RejectedTransaction