diff --git a/config/coordinator/coordinator-docker.config.toml b/config/coordinator/coordinator-docker.config.toml index 781bb0b67..8096ef01c 100644 --- a/config/coordinator/coordinator-docker.config.toml +++ b/config/coordinator/coordinator-docker.config.toml @@ -110,11 +110,11 @@ finalized-block-tag="latest" # reset this once we know what to do on dev/UAT earliest-block=0 genesis-state-root-hash="0x072ead6777750dc20232d1cee8dc9a395c2d350df4bbaa5096c6f59b214dcecd" -# shnarf for contract V5 +# shnarf for contract V6 # Keccak256(parentShnarf="0x00...00", snarkHash="0x00...00", # parentStateRootHash="0x072ead6777750dc20232d1cee8dc9a395c2d350df4bbaa5096c6f59b214dcecd", # evaludationClaim="0x00...00", evaludationPoint="0x00...00") -genesis-shnarf-v5="0x47452a1b9ebadfe02bdd02f580fa1eba17680d57eec968a591644d05d78ee84f" +genesis-shnarf-v6="0x47452a1b9ebadfe02bdd02f580fa1eba17680d57eec968a591644d05d78ee84f" [l2] rpc-endpoint="http://sequencer:8545" 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 bfdd2d4bc..4221324fe 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,6 +1,6 @@ package net.consensys.linea.contract -import build.linea.contract.LineaRollupV5 +import build.linea.contract.LineaRollupV6 import net.consensys.linea.web3j.AtomicContractEIP1559GasProvider import net.consensys.linea.web3j.EIP1559GasFees import net.consensys.linea.web3j.SmartContractErrors @@ -28,7 +28,7 @@ class LineaRollupAsyncFriendly( private val asyncTransactionManager: AsyncFriendlyTransactionManager, contractGasProvider: ContractGasProvider, private val smartContractErrors: SmartContractErrors -) : LineaRollupV5( +) : LineaRollupV6( contractAddress, web3j, asyncTransactionManager, diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/LineaRollupEnhancedWrapper.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/LineaRollupEnhancedWrapper.kt index 593eafcd1..b9b742af0 100644 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/LineaRollupEnhancedWrapper.kt +++ b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/LineaRollupEnhancedWrapper.kt @@ -1,6 +1,6 @@ package net.consensys.linea.contract.l1 -import build.linea.contract.LineaRollupV5 +import build.linea.contract.LineaRollupV6 import net.consensys.linea.contract.AsyncFriendlyTransactionManager import net.consensys.linea.contract.Web3JContractAsyncHelper import org.web3j.abi.datatypes.Function @@ -16,7 +16,7 @@ internal class LineaRollupEnhancedWrapper( asyncTransactionManager: AsyncFriendlyTransactionManager, contractGasProvider: ContractGasProvider, val helper: Web3JContractAsyncHelper -) : LineaRollupV5( +) : LineaRollupV6( contractAddress, web3j, asyncTransactionManager, diff --git a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JFunctionBuilders.kt b/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JFunctionBuilders.kt deleted file mode 100644 index ad9fbdc9b..000000000 --- a/coordinator/clients/smart-contract-client/src/main/kotlin/net/consensys/linea/contract/l1/Web3JFunctionBuilders.kt +++ /dev/null @@ -1,104 +0,0 @@ -package net.consensys.linea.contract.l1 - -import build.linea.contract.LineaRollupV5 -import build.linea.contract.LineaRollupV5.BlobSubmissionData -import net.consensys.toBigInteger -import net.consensys.zkevm.domain.BlobRecord -import net.consensys.zkevm.domain.ProofToFinalize -import org.web3j.abi.TypeReference -import org.web3j.abi.datatypes.DynamicArray -import org.web3j.abi.datatypes.DynamicBytes -import org.web3j.abi.datatypes.Function -import org.web3j.abi.datatypes.Type -import org.web3j.abi.datatypes.generated.Bytes32 -import org.web3j.abi.datatypes.generated.Uint256 -import java.math.BigInteger -import java.util.Arrays - -internal fun buildSubmitBlobsFunction( - blobs: List -): Function { - val blobsSubmissionData = blobs.map { blob -> - val blobCompressionProof = blob.blobCompressionProof!! - val supportingSubmissionData = LineaRollupV5.SupportingSubmissionDataV2( - /*finalStateRootHash*/ blobCompressionProof.finalStateRootHash, - /*firstBlockInData*/ blob.startBlockNumber.toBigInteger(), - /*finalBlockInData*/ blob.endBlockNumber.toBigInteger(), - /*snarkHash*/ blobCompressionProof.snarkHash - ) - - BlobSubmissionData( - /*submissionData*/ supportingSubmissionData, - /*dataEvaluationClaim*/ BigInteger(blobCompressionProof.expectedY), - /*kzgCommitment*/ blobCompressionProof.commitment, - /*kzgProof*/ blobCompressionProof.kzgProofContract - ) - } - - /** - * function submitBlobs( - * BlobSubmissionData[] calldata _blobSubmissionData, - * bytes32 _parentShnarf, - * bytes32 _finalBlobShnarf - * ) external; - */ - return Function( - LineaRollupV5.FUNC_SUBMITBLOBS, - Arrays.asList>( - DynamicArray(BlobSubmissionData::class.java, blobsSubmissionData), - Bytes32(blobs.first().blobCompressionProof!!.prevShnarf), - Bytes32(blobs.last().blobCompressionProof!!.expectedShnarf) - ), - emptyList>() - ) -} - -internal fun buildFinalizeBlobsFunction( - aggregationProof: ProofToFinalize, - aggregationLastBlob: BlobRecord, - parentShnarf: ByteArray, - parentL1RollingHash: ByteArray, - parentL1RollingHashMessageNumber: Long -): Function { - val aggregationEndBlobInfo = LineaRollupV5.ShnarfData( - /*parentShnarf*/ aggregationLastBlob.blobCompressionProof!!.prevShnarf, - /*snarkHash*/ aggregationLastBlob.blobCompressionProof!!.snarkHash, - /*finalStateRootHash*/ aggregationLastBlob.blobCompressionProof!!.finalStateRootHash, - /*dataEvaluationPoint*/ aggregationLastBlob.blobCompressionProof!!.expectedX, - /*dataEvaluationClaim*/ aggregationLastBlob.blobCompressionProof!!.expectedY - ) - - val finalizationData = LineaRollupV5.FinalizationDataV2( - /*parentStateRootHash*/ aggregationProof.parentStateRootHash, - /*lastFinalizedShnarf*/ parentShnarf, - /*finalBlockInData*/ aggregationProof.finalBlockNumber.toBigInteger(), - /*shnarfData*/ aggregationEndBlobInfo, - /*lastFinalizedTimestamp*/ aggregationProof.parentAggregationLastBlockTimestamp.epochSeconds.toBigInteger(), - /*finalTimestamp*/ aggregationProof.finalTimestamp.epochSeconds.toBigInteger(), - /*lastFinalizedL1RollingHash*/ parentL1RollingHash, - /*l1RollingHash*/ aggregationProof.l1RollingHash, - /*lastFinalizedL1RollingHashMessageNumber*/ parentL1RollingHashMessageNumber.toBigInteger(), - /*l1RollingHashMessageNumber*/ aggregationProof.l1RollingHashMessageNumber.toBigInteger(), - /*l2MerkleTreesDepth*/ aggregationProof.l2MerkleTreesDepth.toBigInteger(), - /*l2MerkleRoots*/ aggregationProof.l2MerkleRoots, - /*l2MessagingBlocksOffsets*/ aggregationProof.l2MessagingBlocksOffsets - ) - - /** - * function finalizeBlocksWithProof( - * bytes calldata _aggregatedProof, - * uint256 _aggregatedVerifierIndex, - * FinalizationData calldata _finalizationData - * ) external; - */ - val function = Function( - LineaRollupV5.FUNC_FINALIZEBLOCKSWITHPROOF, - Arrays.asList>( - DynamicBytes(aggregationProof.aggregatedProof), - Uint256(aggregationProof.aggregatedVerifierIndex.toLong()), - finalizationData - ), - emptyList>() - ) - return function -} 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 23cb67cda..0020b985c 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 @@ -20,7 +20,6 @@ internal fun buildSubmitBlobsFunction( blobs: List ): Function { return when (version) { - LineaContractVersion.V5 -> buildSubmitBlobsFunction(blobs) LineaContractVersion.V6 -> buildSubmitBlobsFunctionV6(blobs) } } @@ -63,21 +62,10 @@ fun buildFinalizeBlocksFunction( version: LineaContractVersion, aggregationProof: ProofToFinalize, aggregationLastBlob: BlobRecord, - parentShnarf: ByteArray, parentL1RollingHash: ByteArray, parentL1RollingHashMessageNumber: Long ): Function { when (version) { - LineaContractVersion.V5 -> { - return buildFinalizeBlobsFunction( - aggregationProof, - aggregationLastBlob, - parentShnarf, - parentL1RollingHash, - parentL1RollingHashMessageNumber - ) - } - LineaContractVersion.V6 -> { return buildFinalizeBlockFunctionV6( aggregationProof, 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 aea80c718..76e101026 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 @@ -1,6 +1,6 @@ package net.consensys.linea.contract.l1 -import build.linea.contract.LineaRollupV5 +import build.linea.contract.LineaRollupV6 import build.linea.contract.l1.Web3JLineaRollupSmartContractClientReadOnly import net.consensys.linea.contract.AsyncFriendlyTransactionManager import net.consensys.linea.contract.Web3JContractAsyncHelper @@ -37,7 +37,7 @@ class Web3JLineaRollupSmartContractClient internal constructor( contractGasProvider, smartContractErrors ), - private val web3jLineaClient: LineaRollupV5 = LineaRollupEnhancedWrapper( + private val web3jLineaClient: LineaRollupV6 = LineaRollupEnhancedWrapper( contractAddress, web3j, asyncTransactionManager, @@ -155,7 +155,6 @@ class Web3JLineaRollupSmartContractClient internal constructor( version, aggregation, aggregationLastBlob, - parentShnarf, parentL1RollingHash, parentL1RollingHashMessageNumber ) @@ -180,7 +179,6 @@ class Web3JLineaRollupSmartContractClient internal constructor( version, aggregation, aggregationLastBlob, - parentShnarf, parentL1RollingHash, parentL1RollingHashMessageNumber ) diff --git a/coordinator/ethereum/blob-submitter/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/finalization/BlobAndAggregationFinalizationIntTest.kt b/coordinator/ethereum/blob-submitter/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/finalization/BlobAndAggregationFinalizationIntTest.kt index 88876b55e..abc11db33 100644 --- a/coordinator/ethereum/blob-submitter/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/finalization/BlobAndAggregationFinalizationIntTest.kt +++ b/coordinator/ethereum/blob-submitter/src/integrationTest/kotlin/net/consensys/zkevm/ethereum/finalization/BlobAndAggregationFinalizationIntTest.kt @@ -70,7 +70,7 @@ class BlobAndAggregationFinalizationIntTest : CleanDbTestSuiteParallel() { vertx: Vertx, smartContractVersion: LineaContractVersion ) { - if (listOf(LineaContractVersion.V5, LineaContractVersion.V6).contains(smartContractVersion).not()) { + if (listOf(LineaContractVersion.V6).contains(smartContractVersion).not()) { // V6 with prover V3 is soon comming, so we will need to update/extend this test setup throw IllegalArgumentException("unsupported contract version=$smartContractVersion!") } @@ -99,13 +99,13 @@ class BlobAndAggregationFinalizationIntTest : CleanDbTestSuiteParallel() { ) aggregationsRepository = AggregationsRepositoryImpl(PostgresAggregationsDao(sqlClient, fakeClock)) - val lineaRollupContractForDataSubmissionV5 = rollupDeploymentResult.rollupOperatorClient + val lineaRollupContractForDataSubmissionV6 = rollupDeploymentResult.rollupOperatorClient val acceptedBlobEndBlockNumberConsumer = Consumer { acceptedBlob = it } @Suppress("DEPRECATION") val alreadySubmittedBlobFilter = L1ShnarfBasedAlreadySubmittedBlobsFilter( - lineaRollup = lineaRollupContractForDataSubmissionV5, + lineaRollup = lineaRollupContractForDataSubmissionV6, acceptedBlobEndBlockNumberConsumer = acceptedBlobEndBlockNumberConsumer ) val blobSubmittedEventConsumers = mapOf( @@ -123,7 +123,7 @@ class BlobAndAggregationFinalizationIntTest : CleanDbTestSuiteParallel() { ), blobsRepository = blobsRepository, aggregationsRepository = aggregationsRepository, - lineaSmartContractClient = lineaRollupContractForDataSubmissionV5, + lineaSmartContractClient = lineaRollupContractForDataSubmissionV6, alreadySubmittedBlobsFilter = alreadySubmittedBlobFilter, gasPriceCapProvider = FakeGasPriceCapProvider(), blobSubmittedEventDispatcher = EventDispatcher(blobSubmittedEventConsumers), @@ -208,15 +208,6 @@ class BlobAndAggregationFinalizationIntTest : CleanDbTestSuiteParallel() { }.whenException(testContext::failNow) } - @Test - @Timeout(3, timeUnit = TimeUnit.MINUTES) - fun `submission works with contract V5`( - vertx: Vertx, - testContext: VertxTestContext - ) { - testSubmission(vertx, testContext, LineaContractVersion.V5) - } - @Test @Timeout(3, timeUnit = TimeUnit.MINUTES) fun `submission works with contract V6`( 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 c4347a2e8..37e17a160 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 @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.coordination.messageanchoring -import build.linea.contract.LineaRollupV5 +import build.linea.contract.LineaRollupV6 import build.linea.contract.l1.LineaContractVersion import io.vertx.core.Vertx import io.vertx.junit5.Timeout @@ -37,7 +37,7 @@ class L1EventQuerierIntegrationTest { @BeforeEach fun beforeEach() { val deploymentResult = ContractsManager.get() - .deployLineaRollup(contractVersion = LineaContractVersion.V5) + .deployLineaRollup(contractVersion = LineaContractVersion.V6) .get() testLineaRollupContractAddress = deploymentResult.contractAddress web3Client = Web3jClientManager.l1Client @@ -82,9 +82,9 @@ class L1EventQuerierIntegrationTest { contract.sendMessage(it.recipient, it.fee, it.calldata, it.value).sendAsync() .thenApply { receipt -> Pair( - LineaRollupV5.getMessageSentEventFromLog( + LineaRollupV6.getMessageSentEventFromLog( receipt.logs.first { log -> - log.topics.contains(EventEncoder.encode(LineaRollupV5.MESSAGESENT_EVENT)) + log.topics.contains(EventEncoder.encode(LineaRollupV6.MESSAGESENT_EVENT)) } ), receipt @@ -103,9 +103,9 @@ class L1EventQuerierIntegrationTest { contract.sendMessage(it.recipient, it.fee, it.calldata, it.value).sendAsync() .thenApply { receipt -> Pair( - LineaRollupV5.getMessageSentEventFromLog( + LineaRollupV6.getMessageSentEventFromLog( receipt.logs.first { log -> - log.topics.contains(EventEncoder.encode(LineaRollupV5.MESSAGESENT_EVENT)) + log.topics.contains(EventEncoder.encode(LineaRollupV6.MESSAGESENT_EVENT)) } ), receipt @@ -159,10 +159,10 @@ class L1EventQuerierIntegrationTest { contract.sendMessage(it.recipient, it.fee, it.calldata, it.value).sendAsync() .thenApply { receipt -> Pair( - LineaRollupV5.staticExtractEventParameters( - LineaRollupV5.MESSAGESENT_EVENT, + LineaRollupV6.staticExtractEventParameters( + LineaRollupV6.MESSAGESENT_EVENT, receipt.logs.first { log -> - log.topics.contains(EventEncoder.encode(LineaRollupV5.MESSAGESENT_EVENT)) + log.topics.contains(EventEncoder.encode(LineaRollupV6.MESSAGESENT_EVENT)) } ), receipt 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 134931334..78b3edd64 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 @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.coordination.messageanchoring -import build.linea.contract.LineaRollupV5 +import build.linea.contract.LineaRollupV6 import build.linea.contract.l1.LineaContractVersion import io.vertx.core.Vertx import io.vertx.junit5.Timeout @@ -49,7 +49,7 @@ class MessageServiceIntegrationTest { private fun deployContracts() { val l1RollupDeploymentResult = ContractsManager.get() - .deployLineaRollup(contractVersion = LineaContractVersion.V5) + .deployLineaRollup(contractVersion = LineaContractVersion.V6) .get() @Suppress("DEPRECATION") l1ContractLegacyClient = l1RollupDeploymentResult.rollupOperatorClientLegacy @@ -202,10 +202,10 @@ class MessageServiceIntegrationTest { .toSafeFuture() .thenApply { transactionReceipt -> log.debug("Message has been sent in block {}", transactionReceipt.blockNumber) - val eventValues = LineaRollupV5.staticExtractEventParameters( - LineaRollupV5.MESSAGESENT_EVENT, + val eventValues = LineaRollupV6.staticExtractEventParameters( + LineaRollupV6.MESSAGESENT_EVENT, transactionReceipt.logs.first { log -> - log.topics.contains(EventEncoder.encode(LineaRollupV5.MESSAGESENT_EVENT)) + log.topics.contains(EventEncoder.encode(LineaRollupV6.MESSAGESENT_EVENT)) } ) MessageSentResult( 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 da8b339bd..28d831eb7 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 @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.coordination.messageanchoring -import build.linea.contract.LineaRollupV5 +import build.linea.contract.LineaRollupV6 import io.vertx.core.Vertx import net.consensys.linea.async.toSafeFuture import net.consensys.toULong @@ -24,10 +24,10 @@ class L1EventQuerierImpl( private val l1Web3jClient: Web3j ) : L1EventQuerier { companion object { - val encodedMessageSentEvent: String = EventEncoder.encode(LineaRollupV5.MESSAGESENT_EVENT) + val encodedMessageSentEvent: String = EventEncoder.encode(LineaRollupV6.MESSAGESENT_EVENT) fun parseMessageSentEventLogs(log: Log): SendMessageEvent { - val messageSentEvent = LineaRollupV5.getMessageSentEventFromLog(log) + val messageSentEvent = LineaRollupV6.getMessageSentEventFromLog(log) return SendMessageEvent( Bytes32.wrap(messageSentEvent._messageHash), messageSentEvent._nonce.toULong(), diff --git a/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L1EventQuerierImplTest.kt b/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L1EventQuerierImplTest.kt index 140d5c8af..e2e9cd620 100644 --- a/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L1EventQuerierImplTest.kt +++ b/coordinator/ethereum/message-anchoring/src/test/kotlin/net/consensys/zkevm/ethereum/coordination/messageanchoring/L1EventQuerierImplTest.kt @@ -1,6 +1,6 @@ package net.consensys.zkevm.ethereum.coordination.messageanchoring -import build.linea.contract.LineaRollupV5 +import build.linea.contract.LineaRollupV6 import io.vertx.core.Vertx import io.vertx.junit5.Timeout import io.vertx.junit5.VertxExtension @@ -603,7 +603,7 @@ class L1EventQuerierImplTest { private fun createRandomSendEvent(blockNumber: String, logIndex: String): LogResult { val log = Log() - val eventSignature: String = EventEncoder.encode(LineaRollupV5.MESSAGESENT_EVENT) + val eventSignature: String = EventEncoder.encode(LineaRollupV6.MESSAGESENT_EVENT) val messageHashValue = Bytes32.random() val messageHash = org.web3j.abi.datatypes.generated.Bytes32(messageHashValue.toArray()) 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 f83c8a746..ab51cc60a 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 @@ -57,7 +57,7 @@ interface ContractsManager { fun deployRollupAndL2MessageService( dataCompressionAndProofAggregationMigrationBlock: ULong = 1000UL, numberOfOperators: Int = 1, - l1ContractVersion: LineaContractVersion = LineaContractVersion.V5 + l1ContractVersion: LineaContractVersion = LineaContractVersion.V6 ): SafeFuture fun connectToLineaRollupContract( diff --git a/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/MakefileContractDeploymentHelper.kt b/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/MakefileContractDeploymentHelper.kt index 27cda0e7c..b8edf0f62 100644 --- a/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/MakefileContractDeploymentHelper.kt +++ b/coordinator/ethereum/test-utils/src/main/kotlin/net/consensys/zkevm/ethereum/MakefileContractDeploymentHelper.kt @@ -117,7 +117,7 @@ fun main() { makeDeployLineaRollup( L1AccountManager.generateAccount().privateKey, listOf("03dfa322A95039BB679771346Ee2dBfEa0e2B773"), - LineaContractVersion.V5 + LineaContractVersion.V6 ), makeDeployL2MessageService( L2AccountManager.generateAccount().privateKey, 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 a79346839..0544afd90 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 @@ -4,7 +4,6 @@ import net.consensys.linea.BlockParameter import tech.pegasys.teku.infrastructure.async.SafeFuture enum class LineaContractVersion : Comparable { - V5, // "EIP4844 multiple blobs per tx support - version in all networks" V6 // more efficient data submission and new events for state recovery }