chore: improve package consistency jvm lib

Consensys · Feb 20, 2025 · fa21285 · fa21285
1 parent 3caceed
commit fa21285
Show file tree

Hide file tree

Showing 173 changed files with 502 additions and 463 deletions.
diff --git a/...nator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt b/...nator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt
@@ -2,8 +2,8 @@ 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 linea.kotlin.assertIs32Bytes
+import linea.kotlin.decodeHex
 import net.consensys.linea.BlockParameter
 import net.consensys.linea.assertIsValidAddress
 import net.consensys.linea.blob.BlobCompressorVersion

diff --git a/...p/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/L2NetworkGasPricingConfig.kt b/...p/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/...app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitor.kt b/...app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitor.kt
@@ -2,7 +2,7 @@ package net.consensys.zkevm.coordinator.blockcreation
 
 import io.vertx.core.Vertx
 import linea.domain.Block
-import net.consensys.encodeHex
+import linea.kotlin.encodeHex
 import net.consensys.linea.BlockParameter.Companion.toBlockParameter
 import net.consensys.linea.async.AsyncRetryer
 import net.consensys.linea.web3j.ExtendedWeb3J

diff --git a/...dinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/SwitchProviderImplTest.kt b/...dinator/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/...src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitorTest.kt b/...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/...tlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImplTest.kt b/...tlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImplTest.kt
@@ -2,7 +2,7 @@ package net.consensys.zkevm.ethereum.coordination.blockcreation
 
 import com.github.michaelbull.result.Err
 import com.github.michaelbull.result.Ok
-import net.consensys.ByteArrayExt
+import linea.kotlin.ByteArrayExt
 import net.consensys.linea.BlockNumberAndHash
 import net.consensys.linea.errors.ErrorResponse
 import net.consensys.zkevm.coordinator.clients.RollupForkChoiceUpdatedClient

diff --git a/...kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedExecutionProverClientV2.kt b/...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/...otlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedProofAggregationClientV2.kt b/...otlin/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/.../src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvider.kt b/.../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/.../net/consensys/zkevm/coordinator/clients/prover/ExecutionProofRequestDataDecoratorTest.kt b/.../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/...src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactoryTest.kt b/...src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactoryTest.kt
@@ -6,7 +6,7 @@ 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.kotlin.ByteArrayExt
 import net.consensys.linea.metrics.MetricsFacade
 import net.consensys.linea.metrics.micrometer.MicrometerMetricsFacade
 import net.consensys.zkevm.domain.ProofIndex

diff --git a/...test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvidersTest.kt b/...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/...t/consensys/zkevm/coordinator/clients/prover/serialization/BlobJsonFileRequestResponse.kt b/...t/consensys/zkevm/coordinator/clients/prover/serialization/BlobJsonFileRequestResponse.kt
@@ -10,8 +10,8 @@ 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.kotlin.decodeHex
+import linea.kotlin.encodeHex
 import net.consensys.zkevm.coordinator.clients.BlobCompressionProof
 import net.consensys.zkevm.coordinator.clients.BlobCompressionProofRequest
 

diff --git a/...nts/shomei-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClient.kt b/...nts/shomei-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClient.kt
@@ -5,7 +5,7 @@ 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 linea.kotlin.encodeHex
 import net.consensys.linea.BlockNumberAndHash
 import net.consensys.linea.async.toSafeFuture
 import net.consensys.linea.errors.ErrorResponse

diff --git a/...shomei-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClientTest.kt b/...shomei-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClientTest.kt
@@ -9,8 +9,8 @@ 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 linea.kotlin.ByteArrayExt
+import linea.kotlin.encodeHex
 import net.consensys.linea.BlockNumberAndHash
 import net.consensys.linea.async.get
 import net.consensys.linea.jsonrpc.client.JsonRpcClient

diff --git a/.../smart-contract-client/src/main/kotlin/net/consensys/linea/contract/EIP1559GasProvider.kt b/.../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/...-contract-client/src/main/kotlin/net/consensys/linea/contract/LineaRollupAsyncFriendly.kt b/...-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/...s/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/StaticGasProvider.kt b/...s/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/...-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JContractAsyncHelper.kt b/...-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/...art-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageService.kt b/...art-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/...ct-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageServiceLogsClient.kt b/...ct-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/...t-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/GenesisStateProvider.kt b/...t-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/...ontract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JFunctionBuildersV6.kt b/...ontract-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/...nt/src/main/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClient.kt b/...nt/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/...src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1.kt b/...src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1.kt
@@ -4,7 +4,7 @@ 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 linea.kotlin.encodeHex
 import net.consensys.linea.BlockNumberAndHash
 import net.consensys.linea.async.toSafeFuture
 import net.consensys.linea.errors.ErrorResponse

diff --git a/...test/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1Test.kt b/...test/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1Test.kt
@@ -17,8 +17,8 @@ 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 linea.kotlin.ByteArrayExt
+import linea.kotlin.encodeHex
 import net.consensys.linea.BlockNumberAndHash
 import net.consensys.linea.async.get
 import net.consensys.linea.errors.ErrorResponse

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
@@ -3,7 +3,7 @@ package net.consensys.zkevm.domain
 import build.linea.domain.BlockInterval
 import kotlinx.datetime.Instant
 import linea.domain.Block
-import net.consensys.isSortedBy
+import linea.kotlin.isSortedBy
 import net.consensys.linea.CommonDomainFunctions
 import net.consensys.linea.traces.TracesCounters
 

diff --git a/...tor/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressor.kt b/...tor/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/...ore/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobShnarfCalulator.kt b/...ore/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.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/...main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculator.kt b/...main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculator.kt
@@ -7,7 +7,7 @@ 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.kotlin.encodeHex
 import net.consensys.zkevm.domain.BlobRecord
 import net.consensys.zkevm.persistence.BlobsRepository
 import org.apache.logging.log4j.LogManager

diff --git a/...nator/core/src/main/kotlin/net/consensys/zkevm/ethereum/gaspricing/GasPriceCapProvider.kt b/...nator/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/...est/kotlin/net/consensys/zkevm/coordination/blob/GoBackedCalculateShnarfCalculatorTest.kt b/...est/kotlin/net/consensys/zkevm/coordination/blob/GoBackedCalculateShnarfCalculatorTest.kt
@@ -2,8 +2,8 @@ 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.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/...sys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByDeadlineTest.kt b/...sys/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/.../net/consensys/zkevm/ethereum/coordination/aggregation/GlobalAggregationCalculatorTest.kt b/.../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/...nsensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorServiceTest.kt b/...nsensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorServiceTest.kt
@@ -5,8 +5,8 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import io.vertx.core.Vertx
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
+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