vacp2p/linea-monorepo
1
0
Fork 0
mirror of https://github.com/vacp2p/linea-monorepo.git synced 2026-01-09 20:27:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: improve package consistency jvm lib (#719)

Browse Source 
* chore: improve package consistency jvm lib

* chore: improve package consistency jvm lib

* chore: improve package consistency domain models

* package rename improve consistency

* chore: fix docker config
This commit is contained in:
Pedro Novais
2025-02-20 15:20:02 +00:00
committed by GitHub
parent e16fe6cf66
commit 3c4f4c26db
266 changed files with 717 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/L1DependentApp.kt
View File

@@ -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

2
coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/LastFinalizedBlockProvider.kt
View File

@@ -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

8
coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt
View File

@@ -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

2
coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/L2NetworkGasPricingConfig.kt
View File

@@ -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

4
coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitor.kt
View File

@@ -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

2
coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/GethCliqueSafeBlockProvider.kt
View File

@@ -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

2
coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesClientV2Adapter.kt
View File

@@ -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

2
coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/blockcreation/TracesCountersV1WatcherClient.kt
View File

@@ -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

2
coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobZkStateProviderImpl.kt
View File

@@ -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(

2
coordinator/app/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImpl.kt
View File

@@ -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

2
coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/L1BasedLastFinalizedBlockProviderTest.kt
View File

@@ -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

2
coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/SwitchProviderImplTest.kt
View File

@@ -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

2
coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt
View File

@@ -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

8
coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/blockcreation/BlockCreationMonitorTest.kt
View File

@@ -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

2
coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ConsecutiveProvenBlobsProviderWithLastEndBlockNumberTrackerTest.kt
View File

@@ -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

4
coordinator/app/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdaterImplTest.kt
View File

@@ -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

2
coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ABProverClientRouter.kt
View File

@@ -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

4
coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedExecutionProverClientV2.kt
View File

@@ -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

2
coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/FileBasedProofAggregationClientV2.kt
View File

@@ -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

2
coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClient.kt
View File

@@ -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

2
coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactory.kt
View File

@@ -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

2
coordinator/clients/prover-client/file-based-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvider.kt
View File

@@ -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) {

4
coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ExecutionProofRequestDataDecoratorTest.kt
View File

@@ -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

2
coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/GenericFileBasedProverClientTest.kt
View File

@@ -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

4
coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverClientFactoryTest.kt
View File

@@ -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

2
coordinator/clients/prover-client/file-based-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/ProverFileNameProvidersTest.kt
View File

@@ -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

6
coordinator/clients/prover-client/serialization/src/main/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobJsonFileRequestResponse.kt
View File

@@ -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

2
coordinator/clients/prover-client/serialization/src/test/kotlin/net/consensys/zkevm/coordinator/clients/prover/serialization/BlobCompressionProofJsonResponseTest.kt
View File

@@ -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

4
coordinator/clients/shomei-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClient.kt
View File

@@ -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

6
coordinator/clients/shomei-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/ShomeiClientTest.kt
View File

@@ -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

4
coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/EIP1559GasProvider.kt
View File

@@ -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

4
coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/LineaRollupAsyncFriendly.kt
View File

@@ -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

4
coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/StaticGasProvider.kt
View File

@@ -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

6
coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JContractAsyncHelper.kt
View File

@@ -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

2
coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageService.kt
View File

@@ -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

2
coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/Web3JL2MessageServiceLogsClient.kt
View File

@@ -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

2
coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/GenesisStateProvider.kt
View File

@@ -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(

2
coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JFunctionBuildersV6.kt
View File

@@ -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

2
coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JLineaRollupSmartContractClient.kt
View File

@@ -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

4
coordinator/clients/traces-generator-api-client/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1.kt
View File

@@ -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

6
coordinator/clients/traces-generator-api-client/src/test/kotlin/net/consensys/zkevm/coordinator/clients/TracesGeneratorJsonRpcClientV1Test.kt
View File

@@ -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

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BatchExecutionProverRequestResponse.kt
View File

@@ -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<Block>,

4
coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/BlobCompressionProverRequestResponse.kt
View File

@@ -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

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/RollupForkChoiceUpdatedClient.kt
View File

@@ -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

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/coordinator/clients/TracesServiceClient.kt
View File

@@ -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

4
coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Aggregation.kt
View File

@@ -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

6
coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Blob.kt
View File

@@ -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(

6
coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/Conflation.kt
View File

@@ -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(

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/domain/ProofIndex.kt
View File

@@ -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,

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByTargetBlockNumbers.kt
View File

@@ -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

4
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorService.kt
View File

@@ -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

6
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofCoordinator.kt
View File

@@ -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

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressionProofHandler.kt
View File

@@ -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

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobCompressor.kt
View File

@@ -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

6
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/BlobShnarfCalulator.kt
View File

@@ -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

6
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculator.kt
View File

@@ -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

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/blockcreation/ForkChoiceUpdater.kt
View File

@@ -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 {

4
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculator.kt
View File

@@ -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

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinator.kt
View File

@@ -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

4
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImpl.kt
View File

@@ -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

2
coordinator/core/src/main/kotlin/net/consensys/zkevm/ethereum/gaspricing/GasPriceCapProvider.kt
View File

@@ -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(

6
coordinator/core/src/test/kotlin/net/consensys/zkevm/coordination/blob/GoBackedCalculateShnarfCalculatorTest.kt
View File

@@ -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

2
coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/AggregationTriggerCalculatorByDeadlineTest.kt
View File

@@ -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

2
coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/GlobalAggregationCalculatorTest.kt
View File

@@ -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

4
coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/aggregation/ProofAggregationCoordinatorServiceTest.kt
View File

@@ -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

2
coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/blob/RollingBlobShnarfCalculatorTest.kt
View File

@@ -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

2
coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/ConflationCalculatorByTimeDeadlineTest.kt
View File

@@ -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

2
coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlobAwareConflationCalculatorTest.kt
View File

@@ -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

2
coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/GlobalBlockConflationCalculatorIntTest.kt
View File

@@ -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

4
coordinator/core/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/conflation/TracesConflationCoordinatorImplTest.kt
View File

@@ -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

6
coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/BlobRecord.kt
View File

@@ -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

4
coordinator/core/src/testFixtures/kotlin/net/consensys/zkevm/domain/ProofToFinalize.kt
View File

@@ -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

2
coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/AggregationFinalizationCoordinator.kt
View File

@@ -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

8
coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinator.kt
View File

@@ -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

8
coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelper.kt
View File

@@ -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

4
coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmitterAsEIP4844MultipleBlobsPerTx.kt
View File

@@ -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

2
coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/BlobsGrouperForSubmission.kt
View File

@@ -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 {

2
coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/ContractUpgradeSubmissionLatchFilter.kt
View File

@@ -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

2
coordinator/ethereum/blob-submitter/src/main/kotlin/net/consensys/zkevm/ethereum/submission/SwitchProviderImpl.kt
View File

@@ -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

4
coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionCoordinatorTest.kt
View File

@@ -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

4
coordinator/ethereum/blob-submitter/src/test/kotlin/net/consensys/zkevm/ethereum/submission/BlobSubmissionHelperKtTest.kt
View File

@@ -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

4
coordinator/ethereum/finalization-monitor/src/main/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImpl.kt
View File

@@ -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

6
coordinator/ethereum/finalization-monitor/src/test/kotlin/net/consensys/zkevm/ethereum/finalization/FinalizationMonitorImplTest.kt
View File

@@ -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

4
coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/DynamicGasPriceCap.kt
View File

@@ -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

2
coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoriesRepository.kt
View File

@@ -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 {

2
coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapCalculatorImpl.kt
View File

@@ -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

2
coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapFeeHistoryFetcherImpl.kt
View File

@@ -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

4
coordinator/ethereum/gas-pricing/dynamic-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/GasPriceCapProviderImpl.kt
View File

@@ -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

2
coordinator/ethereum/gas-pricing/dynamic-cap/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/dynamiccap/FeeHistoryCachingServiceTest.kt
View File

@@ -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

6
coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculator.kt
View File

@@ -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

6
coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/DynamicGasPrice.kt
View File

@@ -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

4
coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculator.kt
View File

@@ -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

2
coordinator/ethereum/gas-pricing/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProvider.kt
View File

@@ -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

2
coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/BoundableFeeCalculatorTest.kt
View File

@@ -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

2
coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAFeesCalculatorTest.kt
View File

@@ -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

4
coordinator/ethereum/gas-pricing/src/test/kotlin/net/consensys/linea/ethereum/gaspricing/WMAGasProviderTest.kt
View File

@@ -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

4
coordinator/ethereum/gas-pricing/static-cap/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/coordination/dynamicgasprice/MinMineableFeesPricerServiceIntegrationTest.kt
View File

@@ -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

4
coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/AverageWeightedFeesCalculator.kt
View File

@@ -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

2
coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/ExtraDataV1PricerService.kt
View File

@@ -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

4
coordinator/ethereum/gas-pricing/static-cap/src/main/kotlin/net/consensys/linea/ethereum/gaspricing/staticcap/FeeHistoryFetcherImpl.kt
View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More