Skip to content

Commit 271502f

Browse files
jakrawcz-rdxjakrawcz-rdx
committed
Merge branch 'develop' of github.com:radixdlt/babylon-node into refactor/panic_to_http_500_in_core_api
2 parents 249a0c9 + ce4892e commit 271502f

36 files changed

+669
-139
lines changed

‎core/src/integration/java/com/radixdlt/integration/steady_state/deterministic/rev2/IncreasingValidatorsTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
8686
import com.radixdlt.identifiers.Address;
8787
import com.radixdlt.lang.Tuple;
8888
import com.radixdlt.mempool.MempoolAdd;
89-
import com.radixdlt.mempool.MempoolRelayConfig;
89+
import com.radixdlt.mempool.MempoolReceiverConfig;
90+
import com.radixdlt.mempool.MempoolRelayerConfig;
9091
import com.radixdlt.modules.FunctionalRadixNodeModule;
9192
import com.radixdlt.modules.FunctionalRadixNodeModule.NodeStorageConfig;
9293
import com.radixdlt.modules.StateComputerConfig;
@@ -126,8 +127,9 @@ private DeterministicTest createTest() {
126127
Decimal.of(1),
127128
GenesisConsensusManagerConfig.Builder.testWithRoundsPerEpoch(10)),
128129
REv2StateManagerModule.DatabaseType.ROCKS_DB,
129-
StateComputerConfig.REV2ProposerConfig.defaultMempool(
130-
new MempoolRelayConfig(5, 5))),
130+
StateComputerConfig.REV2ProposerConfig.Mempool.defaults()
131+
.withReceiverConfig(new MempoolReceiverConfig(5))
132+
.withRelayerConfig(MempoolRelayerConfig.defaults().withMaxPeers(5))),
131133
SyncRelayConfig.of(5000, 10, 3000L))));
132134
}
133135

‎core/src/integration/java/com/radixdlt/integration/steady_state/deterministic/rev2/RandomValidatorsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
import com.radixdlt.harness.invariants.Checkers;
8282
import com.radixdlt.identifiers.Address;
8383
import com.radixdlt.mempool.MempoolAdd;
84-
import com.radixdlt.mempool.MempoolRelayConfig;
84+
import com.radixdlt.mempool.MempoolReceiverConfig;
8585
import com.radixdlt.modules.FunctionalRadixNodeModule;
8686
import com.radixdlt.modules.FunctionalRadixNodeModule.NodeStorageConfig;
8787
import com.radixdlt.modules.StateComputerConfig;
@@ -127,8 +127,8 @@ private DeterministicTest createTest() {
127127
Network.INTEGRATIONTESTNET.getId(),
128128
GENESIS,
129129
REv2StateManagerModule.DatabaseType.ROCKS_DB,
130-
StateComputerConfig.REV2ProposerConfig.defaultMempool(
131-
MempoolRelayConfig.of(5, 5))),
130+
StateComputerConfig.REV2ProposerConfig.Mempool.defaults()
131+
.withReceiverConfig(MempoolReceiverConfig.of(5))),
132132
SyncRelayConfig.of(5000, 10, 3000L))));
133133
}
134134

‎core/src/integration/java/com/radixdlt/integration/steady_state/deterministic/rev2/RandomVoteDropperTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
import com.radixdlt.harness.invariants.Checkers;
7676
import com.radixdlt.harness.predicates.NodePredicate;
7777
import com.radixdlt.harness.predicates.NodesPredicate;
78-
import com.radixdlt.mempool.MempoolRelayConfig;
78+
import com.radixdlt.mempool.MempoolReceiverConfig;
7979
import com.radixdlt.modules.FunctionalRadixNodeModule;
8080
import com.radixdlt.modules.FunctionalRadixNodeModule.*;
8181
import com.radixdlt.modules.FunctionalRadixNodeModule.NodeStorageConfig;
@@ -112,8 +112,8 @@ private DeterministicTest createTest() {
112112
Decimal.of(1),
113113
GenesisConsensusManagerConfig.Builder.testWithRoundsPerEpoch(10)),
114114
REv2StateManagerModule.DatabaseType.ROCKS_DB,
115-
StateComputerConfig.REV2ProposerConfig.defaultMempool(
116-
MempoolRelayConfig.of(5, 5))),
115+
StateComputerConfig.REV2ProposerConfig.Mempool.defaults()
116+
.withReceiverConfig(MempoolReceiverConfig.of(5))),
117117
SyncRelayConfig.of(5000, 10, 3000L))));
118118
}
119119

‎core/src/integration/java/com/radixdlt/integration/steady_state/deterministic/rev2/SanityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private DeterministicTest createTest() {
140140
GenesisConsensusManagerConfig.Builder.testWithRoundsPerEpoch(
141141
roundsPerEpoch)),
142142
REv2StateManagerModule.DatabaseType.ROCKS_DB,
143-
REV2ProposerConfig.defaultMempool()),
143+
REV2ProposerConfig.Mempool.defaults()),
144144
SyncRelayConfig.of(5000, 10, 3000L))));
145145
}
146146

‎core/src/integration/java/com/radixdlt/integration/steady_state/simulation/rev2/consensus_mempool_ledger/SanityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private SimulationTest createTest() {
112112
Decimal.of(1),
113113
GenesisConsensusManagerConfig.Builder.testWithRoundsPerEpoch(100000)),
114114
REv2StateManagerModule.DatabaseType.ROCKS_DB,
115-
REV2ProposerConfig.defaultMempool()))))
115+
REV2ProposerConfig.Mempool.defaults()))))
116116
.addTestModules(
117117
ConsensusMonitors.safety(),
118118
ConsensusMonitors.proposerTimestampChecker(),

‎core/src/integration/java/com/radixdlt/integration/steady_state/simulation/rev2/consensus_mempool_ledger_sync/SanityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private SimulationTest createTest() {
113113
Decimal.of(1),
114114
GenesisConsensusManagerConfig.Builder.testWithRoundsPerEpoch(100000)),
115115
REv2StateManagerModule.DatabaseType.ROCKS_DB,
116-
REV2ProposerConfig.defaultMempool()),
116+
REV2ProposerConfig.Mempool.defaults()),
117117
SyncRelayConfig.of(5000, 10, 3000L))))
118118
.addTestModules(
119119
ConsensusMonitors.safety(),

‎core/src/integration/java/com/radixdlt/integration/targeted/rev2/mempool/REv2MempoolFillAndEmptyTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ private DeterministicTest createTest() {
126126
10,
127127
10 * 1024 * 1024,
128128
new RustMempoolConfig(100 * 1024 * 1024, MAX_MEMPOOL_TRANSACTION_COUNT),
129-
new MempoolRelayConfig(0, 100))),
129+
new MempoolReceiverConfig(0),
130+
MempoolRelayerConfig.defaults())),
130131
SyncRelayConfig.of(5000, 10, 3000L))));
131132
}
132133

‎core/src/integration/java/com/radixdlt/integration/targeted/rev2/mempool/REv2MempoolRelayerTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@
7474
import com.radixdlt.genesis.GenesisConsensusManagerConfig;
7575
import com.radixdlt.harness.deterministic.DeterministicTest;
7676
import com.radixdlt.harness.deterministic.PhysicalNodeConfig;
77-
import com.radixdlt.mempool.MempoolAdd;
78-
import com.radixdlt.mempool.MempoolRelayConfig;
79-
import com.radixdlt.mempool.RustMempoolConfig;
77+
import com.radixdlt.mempool.*;
8078
import com.radixdlt.modules.FunctionalRadixNodeModule;
8179
import com.radixdlt.modules.FunctionalRadixNodeModule.ConsensusConfig;
8280
import com.radixdlt.modules.FunctionalRadixNodeModule.LedgerConfig;
@@ -115,7 +113,8 @@ private DeterministicTest createTest() {
115113
0,
116114
0,
117115
new RustMempoolConfig(MEMPOOL_TX_SIZE * 1024 * 1024, MEMPOOL_TX_SIZE),
118-
new MempoolRelayConfig(0, 100))),
116+
new MempoolReceiverConfig(0),
117+
MempoolRelayerConfig.defaults())),
119118
SyncRelayConfig.of(5000, 10, 3000L))));
120119
}
121120

‎core/src/main/java/com/radixdlt/RadixNodeModule.java

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,37 @@ protected void configure() {
191191
install(new MempoolReceiverModule());
192192

193193
// Mempool Relay
194-
install(new MempoolRelayConfig(5, 100).asModule());
195-
install(new MempoolRelayerModule(20000));
196-
install(new MempoolReevaluationModule(Duration.ofSeconds(10), 5));
194+
install(new MempoolReceiverConfig(5).asModule());
195+
var mempoolRelayerIntervalMs =
196+
properties.get("mempool.relayer.interval_ms", MempoolRelayerConfig.DEFAULT_INTERVAL_MS);
197+
var mempoolRelayerMaxPeers =
198+
properties.get("mempool.relayer.max_peers", MempoolRelayerConfig.DEFAULT_MAX_PEERS);
199+
var mempoolRelayerMaxRelayedSize =
200+
properties.get(
201+
"mempool.relayer.max_relayed_size", MempoolRelayerConfig.DEFAULT_MAX_RELAYED_SIZE);
202+
var mempoolRelayerMaxMessageTransactionCount =
203+
properties.get(
204+
"mempool.relayer.max_message_transaction_count",
205+
MempoolRelayerConfig.DEFAULT_MAX_MESSAGE_TRANSACTION_COUNT);
206+
var mempoolRelayerMaxMessagePayloadSize =
207+
properties.get(
208+
"mempool.relayer.max_message_payload_size",
209+
MempoolRelayerConfig.DEFAULT_MAX_MESSAGE_PAYLOAD_SIZE);
210+
install(
211+
new MempoolRelayerModule(
212+
new MempoolRelayerConfig(
213+
mempoolRelayerIntervalMs,
214+
mempoolRelayerMaxPeers,
215+
mempoolRelayerMaxRelayedSize,
216+
mempoolRelayerMaxMessageTransactionCount,
217+
mempoolRelayerMaxMessagePayloadSize)));
218+
219+
// Mempool Reevaluation
220+
var mempoolReevaluationIntervalMs = properties.get("mempool.reevaluation.interval_ms", 10000);
221+
var mempoolReevaluationMaxCount = properties.get("mempool.reevaluation.max_count", 5);
222+
install(
223+
new MempoolReevaluationModule(
224+
Duration.ofMillis(mempoolReevaluationIntervalMs), mempoolReevaluationMaxCount));
197225

198226
// Ledger Sync
199227
final long syncPatience = properties.get("sync.patience", 5000L);
@@ -208,8 +236,8 @@ protected void configure() {
208236
install(new NodeStorageLocationFromPropertiesModule());
209237
// State Computer
210238
var mempoolMaxTotalTransactionsSize =
211-
properties.get("mempool.maxTotalTransactionsSize", 100 * 1024 * 1024);
212-
var mempoolMaxTransactionCount = properties.get("mempool.maxTransactionCount", 10_000);
239+
properties.get("mempool.max_total_transactions_size", 100 * 1024 * 1024);
240+
var mempoolMaxTransactionCount = properties.get("mempool.max_transaction_count", 10_000);
213241
var mempoolConfig =
214242
new RustMempoolConfig(mempoolMaxTotalTransactionsSize, mempoolMaxTransactionCount);
215243
var enableLocalTransactionExecutionIndex =

‎core/src/main/java/com/radixdlt/mempool/MempoolRelayConfig.java renamed to ‎core/src/main/java/com/radixdlt/mempool/MempoolReceiverConfig.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,26 +66,21 @@
6666

6767
import com.google.inject.AbstractModule;
6868

69-
/** Configuration parameters for mempool. */
70-
public record MempoolRelayConfig(long throttleMs, int relayMaxPeers) {
71-
public static MempoolRelayConfig of() {
72-
return new MempoolRelayConfig(10000, 100);
69+
/** Configuration parameters for mempool receiver. */
70+
public record MempoolReceiverConfig(long throttleMs) {
71+
public static MempoolReceiverConfig of() {
72+
return new MempoolReceiverConfig(10000);
7373
}
7474

75-
public static MempoolRelayConfig of(long throttleMs) {
76-
return new MempoolRelayConfig(throttleMs, 100);
77-
}
78-
79-
public static MempoolRelayConfig of(long throttleMs, int relayMaxPeers) {
80-
return new MempoolRelayConfig(throttleMs, relayMaxPeers);
75+
public static MempoolReceiverConfig of(long throttleMs) {
76+
return new MempoolReceiverConfig(throttleMs);
8177
}
8278

8379
public AbstractModule asModule() {
8480
return new AbstractModule() {
8581
@Override
8682
protected void configure() {
8783
bindConstant().annotatedWith(MempoolThrottleMs.class).to(throttleMs);
88-
bindConstant().annotatedWith(MempoolRelayMaxPeers.class).to(relayMaxPeers);
8984
}
9085
};
9186
}

0 commit comments

Comments
 (0)