L1 Data submission config and validium blob submitter #1788
+381
−82
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,8 +15,28 @@ data class L1SubmissionConfigToml( | |
| val fallbackGasPrice: FallbackGasPriceToml, | ||
| val blob: BlobSubmissionConfigToml, | ||
| val aggregation: AggregationSubmissionToml, | ||
| val dataSubmission: DataSubmission = DataSubmission.ROLLUP, | ||
| ) { | ||
|
|
||
| enum class DataSubmission(val mame: String) { | ||
|
Contributor
Author
There was a problem hiding this comment. No, |
||
| ROLLUP("rollup"), | ||
| VALIDIUM("validium"), | ||
| ; | ||
|
|
||
| companion object { | ||
| fun valueOfIgnoreCase(name: String): DataSubmission { | ||
| return DataSubmission.entries.firstOrNull { it.name.equals(name, ignoreCase = true) } | ||
|
There was a problem hiding this comment. Bug: Unused property in DataSubmission enumThe
Contributor
There was a problem hiding this comment. please address this. Also, I don't thing we need the name property...
Contributor
Author
There was a problem hiding this comment. ok, I was just following what was done for a similar TOML config enum SignerType |
||
| ?: throw IllegalArgumentException("Unknown data submission type: $name") | ||
| } | ||
| } | ||
| fun reified(): L1SubmissionConfig.DataSubmission { | ||
| return when (this) { | ||
| ROLLUP -> L1SubmissionConfig.DataSubmission.ROLLUP | ||
| VALIDIUM -> L1SubmissionConfig.DataSubmission.VALIDIUM | ||
| } | ||
| } | ||
| } | ||
|
|
||
| data class DynamicGasPriceCapToml( | ||
| val disabled: Boolean = false, | ||
| val gasPriceCapCalculation: GasPriceCapCalculationToml, | ||
|
|
@@ -167,6 +187,7 @@ data class L1SubmissionConfigToml( | |
| gas = this.aggregation.gas.reified(), | ||
| signer = this.aggregation.signer.reified(), | ||
| ), | ||
| dataSubmission = this.dataSubmission.reified(), | ||
| ) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import com.sksamuel.hoplite.StringNode | |
| import com.sksamuel.hoplite.decoder.Decoder | ||
| import com.sksamuel.hoplite.fp.invalid | ||
| import com.sksamuel.hoplite.fp.valid | ||
| import linea.coordinator.config.v2.toml.L1SubmissionConfigToml | ||
| import linea.coordinator.config.v2.toml.SignerConfigToml | ||
| import linea.kotlin.decodeHex | ||
| import kotlin.reflect.KType | ||
|
|
@@ -81,3 +82,28 @@ class TomlSignerTypeDecoder : Decoder<SignerConfigToml.SignerType> { | |
| return type.classifier == SignerConfigToml.SignerType::class | ||
| } | ||
| } | ||
|
|
||
| class TomlDataSubmissionDecoder : Decoder<L1SubmissionConfigToml.DataSubmission> { | ||
|
Contributor
There was a problem hiding this comment. why do we need a specific decoder. Toml library shall handle that out for the box, no?
Contributor
Author
There was a problem hiding this comment. Again, i did not experiment with enum and toml library, I just followed a similar pattern we have for SignerType. You can notice the |
||
| override fun decode( | ||
| node: Node, | ||
| type: KType, | ||
| context: DecoderContext, | ||
| ): ConfigResult<L1SubmissionConfigToml.DataSubmission> { | ||
| return when (node) { | ||
| is StringNode -> runCatching { | ||
| L1SubmissionConfigToml.DataSubmission.valueOfIgnoreCase(node.value.lowercase()) | ||
| }.fold( | ||
| { it.valid() }, | ||
| { ConfigFailure.DecodeError(node, type).invalid() }, | ||
| ) | ||
|
|
||
| else -> { | ||
| ConfigFailure.DecodeError(node, type).invalid() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun supports(type: KType): Boolean { | ||
| return type.classifier == L1SubmissionConfigToml.DataSubmission::class | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ class L1SubmissionConfigParsingTest { | |
| val toml = """ | ||
| [l1-submission] | ||
| disabled = true | ||
| data-submission = "validium" | ||
|
Contributor
There was a problem hiding this comment. In our meeting with @julien-marchand we agreed on this config layout What's the motivation/rationale to:
Contributor
Author
There was a problem hiding this comment.
|
||
| [l1-submission.dynamic-gas-price-cap] | ||
| disabled = true | ||
| [l1-submission.dynamic-gas-price-cap.gas-price-cap-calculation] | ||
|
|
@@ -118,6 +119,7 @@ class L1SubmissionConfigParsingTest { | |
| val config = | ||
| L1SubmissionConfigToml( | ||
| disabled = true, | ||
| dataSubmission = L1SubmissionConfigToml.DataSubmission.VALIDIUM, | ||
| dynamicGasPriceCap = L1SubmissionConfigToml.DynamicGasPriceCapToml( | ||
| disabled = true, | ||
| gasPriceCapCalculation = L1SubmissionConfigToml.DynamicGasPriceCapToml.GasPriceCapCalculationToml( | ||
|
|
@@ -377,6 +379,7 @@ class L1SubmissionConfigParsingTest { | |
|
|
||
| @Test | ||
| fun `should parse l1 submission minimal config`() { | ||
| val config = parseConfig<WrapperConfig>(tomlMinimal) | ||
| assertThat(config.l1Submission).isEqualTo(configMinimal) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package net.consensys.linea.contract.l1 | ||
|
|
||
| import build.linea.contract.ValidiumV1 | ||
| import linea.web3j.transactionmanager.AsyncFriendlyTransactionManager | ||
| import net.consensys.linea.contract.Web3JContractAsyncHelper | ||
| import org.web3j.abi.datatypes.Function | ||
| import org.web3j.protocol.Web3j | ||
| import org.web3j.protocol.core.RemoteFunctionCall | ||
| import org.web3j.protocol.core.methods.response.TransactionReceipt | ||
| import org.web3j.tx.gas.ContractGasProvider | ||
| import java.math.BigInteger | ||
|
|
||
| internal class LineaValidiumEnhancedWrapper( | ||
| contractAddress: String, | ||
| web3j: Web3j, | ||
| transactionManager: AsyncFriendlyTransactionManager, | ||
| contractGasProvider: ContractGasProvider, | ||
| private val web3jContractHelper: Web3JContractAsyncHelper, | ||
| ) : ValidiumV1( | ||
| contractAddress, | ||
| web3j, | ||
| transactionManager, | ||
| contractGasProvider, | ||
| ) { | ||
| @Synchronized | ||
| override fun executeRemoteCallTransaction( | ||
| function: Function, | ||
| weiValue: BigInteger, | ||
| ): RemoteFunctionCall<TransactionReceipt> = web3jContractHelper.executeRemoteCallTransaction(function, weiValue) | ||
|
|
||
| @Synchronized | ||
| override fun executeRemoteCallTransaction( | ||
| function: Function, | ||
| ): RemoteFunctionCall<TransactionReceipt> = web3jContractHelper.executeRemoteCallTransaction( | ||
| function, | ||
| BigInteger.ZERO, | ||
| ) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DataSubmission is not appropriate IMO
suggestions:
@julien-marchand any inputs on this?
This will have impact on logic/proving once filly implemented