Skip to content

Commit 5fd78c0

Browse files
authored
Enabling payload validation for Sequencer by default (#467)
* Enabling payload validation for Sequencer by default to send newPayload and ensure EL node doesn't return syncing * Simplifying setValidatorConfig logic
1 parent 0de5672 commit 5fd78c0

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

jvm-libs/test-utils/src/main/kotlin/maru/test/cluster/MaruConfigHelper.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,14 @@ internal fun setP2pConfig(
119119

120120
internal fun setValidatorConfig(
121121
config: MaruConfig,
122+
payloadValidationEnabled: Boolean,
122123
elNode: ElNode?,
123124
): MaruConfig {
124125
if (elNode == null) return config
125126

126127
val updatedValidatorConfig =
127-
config.validatorElNode?.copy(
128-
engineApiEndpoint =
129-
config.validatorElNode!!.engineApiEndpoint.copy(
130-
endpoint = URI.create(elNode.engineApiUrl()).toURL(),
131-
),
132-
) ?: ValidatorElNode(
133-
payloadValidationEnabled = false,
128+
ValidatorElNode(
129+
payloadValidationEnabled = payloadValidationEnabled,
134130
engineApiEndpoint = ApiEndpointConfig(endpoint = URI.create(elNode.engineApiUrl()).toURL()),
135131
)
136132
val updatedForkTransition =

jvm-libs/test-utils/src/main/kotlin/maru/test/cluster/TestMaruAppFactory.kt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,19 @@ fun createMaru(
2525
): MaruApp {
2626
initPersistence(config.persistence, nodeKeyData)
2727
var effectiveConfig = config
28-
effectiveConfig = setValidatorConfig(effectiveConfig, elNode)
2928
effectiveConfig =
30-
setQbftConfigIfSequencer(effectiveConfig, isSequencer = nodeRole == NodeRole.Sequencer, nodeKeyData)
31-
effectiveConfig = setP2pConfig(effectiveConfig, bootnodes, staticpeers)
29+
setValidatorConfig(
30+
config = effectiveConfig,
31+
payloadValidationEnabled = nodeRole == NodeRole.Sequencer,
32+
elNode = elNode,
33+
)
34+
effectiveConfig =
35+
setQbftConfigIfSequencer(
36+
config = effectiveConfig,
37+
isSequencer = nodeRole == NodeRole.Sequencer,
38+
nodeKeyData = nodeKeyData,
39+
)
40+
effectiveConfig = setP2pConfig(config = effectiveConfig, bootnodes = bootnodes, staticpeers = staticpeers)
3241

3342
return MaruAppFactory().create(
3443
config = effectiveConfig,

0 commit comments

Comments
 (0)