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

Added a separate config to support blob switch without ties to linea … (#151)

Browse Source 
* Added a separate config to support blob switch without ties to linea besu switch

* Added a separate config to support blob switch without ties to linea besu switch
This commit is contained in:
Roman Vaseev
2024-10-09 13:07:10 +02:00
committed by GitHub
parent ca278a0ae7
commit d86aa9ab3a
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/coordinator/coordinator-docker.config.toml
View File

@@ -43,6 +43,7 @@ new-block-polling-interval="PT1S"
[traces]
switch-to-linea-besu=false
blob-compressor-version="V0_1_0"
raw-execution-traces-version="0.2.0"
expected-traces-api-version="0.2.0"
[traces.counters]

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

@@ -3,7 +3,6 @@ package net.consensys.zkevm.coordinator.app
import io.vertx.core.Vertx
import kotlinx.datetime.Clock
import net.consensys.linea.BlockNumberAndHash
import net.consensys.linea.blob.BlobCompressorVersion
import net.consensys.linea.blob.ShnarfCalculatorVersion
import net.consensys.linea.contract.LineaRollupAsyncFriendly
import net.consensys.linea.contract.Web3JL2MessageService
@@ -394,12 +393,7 @@ class L1DependentApp(
val logger = LogManager.getLogger(GlobalBlockConflationCalculator::class.java)
// To fail faster for JNA reasons
val compressorVersion =
if (configs.traces.switchToLineaBesu) {
BlobCompressorVersion.V1_0_1
} else {
BlobCompressorVersion.V0_1_0
}
val compressorVersion = configs.traces.blobCompressorVersion
val blobCompressor = GoBackedBlobCompressor.getInstance(
compressorVersion = compressorVersion,
dataLimit = configs.blobCompression.blobSizeLimit.toUInt()

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

@@ -6,6 +6,7 @@ import net.consensys.assertIs32Bytes
import net.consensys.decodeHex
import net.consensys.linea.BlockParameter
import net.consensys.linea.assertIsValidAddress
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
import net.consensys.linea.ethereum.gaspricing.dynamiccap.MAX_REWARD_PERCENTILES_SIZE
@@ -165,6 +166,7 @@ data class TracesConfig(
val conflation: FunctionalityEndpoint,
val fileManager: FileManager,
val switchToLineaBesu: Boolean = false,
val blobCompressorVersion: BlobCompressorVersion,
val expectedTracesApiVersionV2: String? = null,
val countersV2: FunctionalityEndpoint? = null,
val conflationV2: FunctionalityEndpoint? = null

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

@@ -6,6 +6,7 @@ import com.github.michaelbull.result.onFailure
import com.github.michaelbull.result.onSuccess
import com.sksamuel.hoplite.Masked
import net.consensys.linea.BlockParameter
import net.consensys.linea.blob.BlobCompressorVersion
import net.consensys.linea.ethereum.gaspricing.BoundableFeeCalculator
import net.consensys.linea.ethereum.gaspricing.staticcap.ExtraDataV1UpdaterImpl
import net.consensys.linea.ethereum.gaspricing.staticcap.FeeHistoryFetcherImpl
@@ -239,6 +240,7 @@ class CoordinatorConfigTest {
private val tracesConfig = TracesConfig(
switchToLineaBesu = false,
blobCompressorVersion = BlobCompressorVersion.V0_1_0,
rawExecutionTracesVersion = "0.2.0",
expectedTracesApiVersion = "0.2.0",
counters = TracesConfig.FunctionalityEndpoint(