Skip to content
This repository has been archived by the owner on Feb 19, 2024. It is now read-only.

Add a separate testnets forks module #687

Merged
merged 1 commit into from
May 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
import com.radixdlt.statecomputer.InvalidProposedTxn;
import com.radixdlt.statecomputer.checkpoint.MockedGenesisModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.store.DatabaseEnvironment;
import com.radixdlt.store.DatabaseLocation;
import com.radixdlt.store.berkeley.BerkeleyAdditionalStore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@
import com.radixdlt.harness.simulation.monitors.ledger.LedgerMonitors;
import com.radixdlt.harness.simulation.monitors.radix_engine.RadixEngineMonitors;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import java.util.concurrent.TimeUnit;
import org.junit.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
import com.radixdlt.harness.simulation.monitors.ledger.LedgerMonitors;
import com.radixdlt.harness.simulation.monitors.radix_engine.RadixEngineMonitors;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import java.util.OptionalInt;
import java.util.Set;
import java.util.concurrent.TimeUnit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
import com.radixdlt.harness.simulation.monitors.ledger.LedgerMonitors;
import com.radixdlt.harness.simulation.monitors.radix_engine.RadixEngineMonitors;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@
import com.radixdlt.harness.simulation.monitors.ledger.LedgerMonitors;
import com.radixdlt.harness.simulation.monitors.radix_engine.RadixEngineMonitors;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import java.util.concurrent.TimeUnit;
import org.assertj.core.api.AssertionsForClassTypes;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
import com.radixdlt.mempool.MempoolConfig;
import com.radixdlt.statecomputer.checkpoint.Genesis;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.sync.SyncConfig;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
import com.radixdlt.harness.simulation.monitors.radix_engine.RadixEngineMonitors;
import com.radixdlt.mempool.MempoolConfig;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.sync.SyncConfig;
import com.radixdlt.utils.UInt256;
import java.time.Duration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
import com.radixdlt.harness.simulation.monitors.radix_engine.RadixEngineMonitors;
import com.radixdlt.mempool.MempoolConfig;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.sync.SyncConfig;
import java.util.Collection;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
import com.radixdlt.mempool.MempoolConfig;
import com.radixdlt.statecomputer.forks.ForkOverwritesWithShorterEpochsModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.sync.SyncConfig;
import com.radixdlt.utils.UInt256;
import java.time.Duration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
import com.radixdlt.mempool.MempoolConfig;
import com.radixdlt.statecomputer.checkpoint.MockedGenesisModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.store.DatabaseLocation;
import com.radixdlt.utils.PrivateKeys;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
import com.radixdlt.statecomputer.RadixEngineStateComputer;
import com.radixdlt.statecomputer.checkpoint.MockedGenesisModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.store.DatabaseLocation;
import com.radixdlt.utils.PrivateKeys;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@
import com.radixdlt.network.p2p.PeersView;
import com.radixdlt.statecomputer.checkpoint.MockedGenesisModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.store.DatabaseEnvironment;
import com.radixdlt.store.DatabaseLocation;
import com.radixdlt.store.berkeley.BerkeleyLedgerEntryStore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@
import com.radixdlt.network.p2p.PeersView;
import com.radixdlt.statecomputer.checkpoint.MockedGenesisModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.store.DatabaseEnvironment;
import com.radixdlt.store.DatabaseLocation;
import com.radixdlt.store.berkeley.BerkeleyLedgerEntryStore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@
import com.radixdlt.statecomputer.RadixEngineStateComputer;
import com.radixdlt.statecomputer.checkpoint.MockedGenesisModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.store.DatabaseLocation;
import com.radixdlt.utils.PrivateKeys;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
import com.radixdlt.statecomputer.LedgerAndBFTProof;
import com.radixdlt.statecomputer.checkpoint.MockedGenesisModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.store.DatabaseLocation;
import com.radixdlt.store.LastStoredProof;
import com.radixdlt.utils.PrivateKeys;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
import com.radixdlt.statecomputer.LedgerAndBFTProof;
import com.radixdlt.statecomputer.checkpoint.MockedGenesisModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.RadixEngineForksLatestOnlyModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.store.DatabaseLocation;
import com.radixdlt.store.LastStoredProof;
import com.radixdlt.utils.PrivateKeys;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@
import com.radixdlt.statecomputer.checkpoint.RadixEngineCheckpointModule;
import com.radixdlt.statecomputer.forks.ForkOverwritesFromPropertiesModule;
import com.radixdlt.statecomputer.forks.ForksModule;
import com.radixdlt.statecomputer.forks.MainnetForksModule;
import com.radixdlt.statecomputer.forks.StokenetForksModule;
import com.radixdlt.statecomputer.forks.modules.GenericTestnetForksModule;
import com.radixdlt.statecomputer.forks.modules.MainnetForksModule;
import com.radixdlt.statecomputer.forks.modules.StokenetForksModule;
import com.radixdlt.statecomputer.forks.testing.TestingForksLoader;
import com.radixdlt.store.DatabasePropertiesModule;
import com.radixdlt.store.PersistenceModule;
Expand All @@ -109,6 +110,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand All @@ -118,7 +120,18 @@

/** Module which manages everything in a single node */
public final class RadixNodeModule extends AbstractModule {
private static final String TESTING_FORKS_VERSION_KEY = "testing_forks.version";

private static final Map<Integer, AbstractModule> FORKS_MODULE_BY_NETWORK_ID =
Map.of(
Network.MAINNET.getId(), new MainnetForksModule(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use Network.MAINNET as the key instead of Id?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we could but then I'd need an extra Network.ofId call when accessing

Network.STOKENET.getId(), new StokenetForksModule(),
Network.RELEASENET.getId(), new GenericTestnetForksModule(),
Network.RCNET.getId(), new GenericTestnetForksModule(),
Network.MILESTONENET.getId(), new GenericTestnetForksModule(),
Network.DEVOPSNET.getId(), new GenericTestnetForksModule(),
Network.SANDPITNET.getId(), new GenericTestnetForksModule(),
Network.LOCALNET.getId(), new GenericTestnetForksModule());

private static final int DEFAULT_CORE_PORT = 3333;
private static final String DEFAULT_BIND_ADDRESS = "0.0.0.0";
private static final Logger log = LogManager.getLogger();
Expand Down Expand Up @@ -264,26 +277,25 @@ protected void configure() {
// State Computer
install(new ForksModule());

if (networkId == Network.MAINNET.getId()) {
log.info("Using mainnet forks");
install(new MainnetForksModule());
} else if (properties.get("testing_forks.enable", false)) {
String testingForkConfigName =
if (properties.get("testing_forks.enable", false)) {
String testingForksModuleName =
properties.get("testing_forks.fork_config_name", "TestingForksModuleV1");
if (testingForkConfigName.isBlank()) {
testingForkConfigName = "TestingForksModuleV1";
if (testingForksModuleName.isBlank()) {
diegomrsantos marked this conversation as resolved.
Show resolved Hide resolved
testingForksModuleName = "TestingForksModuleV1";
}
log.info("Using testing fork config '{}'", testingForkConfigName);
log.info("Using testing forks module '{}'", testingForksModuleName);
install(
new TestingForksLoader()
.createTestingForksModuleConfigFromClassName(testingForkConfigName));
.createTestingForksModuleConfigFromClassName(testingForksModuleName));
} else {
log.info("Using stokenet forks");
install(new StokenetForksModule());
final var forksModule =
FORKS_MODULE_BY_NETWORK_ID.getOrDefault(networkId, new GenericTestnetForksModule());
log.info("Using a predefined forks module '{}'", forksModule.getClass().getSimpleName());
install(forksModule);
}

if (properties.get("overwrite_forks.enable", false)) {
log.info("Enabling fork overwrites");
log.info("Enabling fork overwrites from properties");
install(new ForkOverwritesFromPropertiesModule());
}
install(new RadixEngineStateComputerModule());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/* Copyright 2021 Radix Publishing Ltd incorporated in Jersey (Channel Islands).
*
* Licensed under the Radix License, Version 1.0 (the "License"); you may not use this
* file except in compliance with the License. You may obtain a copy of the License at:
*
* radixfoundation.org/licenses/LICENSE-v1
*
* The Licensor hereby grants permission for the Canonical version of the Work to be
* published, distributed and used under or by reference to the Licensor’s trademark
* Radix ® and use of any unregistered trade names, logos or get-up.
*
* The Licensor provides the Work (and each Contributor provides its Contributions) on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
* including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
* MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
*
* Whilst the Work is capable of being deployed, used and adopted (instantiated) to create
* a distributed ledger it is your responsibility to test and validate the code, together
* with all logic and performance of that code under all foreseeable scenarios.
*
* The Licensor does not make or purport to make and hereby excludes liability for all
* and any representation, warranty or undertaking in any form whatsoever, whether express
* or implied, to any entity or person, including any representation, warranty or
* undertaking, as to the functionality security use, value or other characteristics of
* any distributed ledger nor in respect the functioning or value of any tokens which may
* be created stored or transferred using the Work. The Licensor does not warrant that the
* Work or any use of the Work complies with any law or regulation in any territory where
* it may be implemented or used or that it will be appropriate for any specific purpose.
*
* Neither the licensor nor any current or former employees, officers, directors, partners,
* trustees, representatives, agents, advisors, contractors, or volunteers of the Licensor
* shall be liable for any direct or indirect, special, incidental, consequential or other
* losses of any kind, in tort, contract or otherwise (including but not limited to loss
* of revenue, income or profits, or loss of use or data, or loss of reputation, or loss
* of any economic or other opportunity of whatsoever nature or howsoever arising), arising
* out of or in connection with (without limitation of any use, misuse, of any ledger system
* or use made or its functionality or any performance or operation of any code or protocol
* caused by bugs or programming or logic errors or otherwise);
*
* A. any offer, purchase, holding, use, sale, exchange or transmission of any
* cryptographic keys, tokens or assets created, exchanged, stored or arising from any
* interaction with the Work;
*
* B. any failure in a transmission or loss of any token or assets keys or other digital
* artefacts due to errors in transmission;
*
* C. bugs, hacks, logic errors or faults in the Work or any communication;
*
* D. system software or apparatus including but not limited to losses caused by errors
* in holding or transmitting tokens by any third-party;
*
* E. breaches or failure of security including hacker attacks, loss or disclosure of
* password, loss of private key, unauthorised use or misuse of such passwords or keys;
*
* F. any losses including loss of anticipated savings or other benefits resulting from
* use of the Work or any changes to the Work (however implemented).
*
* You are solely responsible for; testing, validating and evaluation of all operation
* logic, functionality, security and appropriateness of using the Work for any commercial
* or non-commercial purpose and for any reproduction or redistribution by You of the
* Work. You assume all risks associated with Your use of the Work and the exercise of
* permissions under this License.
*/

package com.radixdlt.statecomputer.forks.modules;

import static com.radixdlt.constraintmachine.REInstruction.REMicroOp.MSG;

import com.google.inject.AbstractModule;
import com.google.inject.multibindings.ProvidesIntoSet;
import com.radixdlt.application.system.FeeTable;
import com.radixdlt.application.tokens.Amount;
import com.radixdlt.application.tokens.state.PreparedStake;
import com.radixdlt.application.tokens.state.PreparedUnstakeOwnership;
import com.radixdlt.application.tokens.state.TokenResource;
import com.radixdlt.application.validators.state.AllowDelegationFlag;
import com.radixdlt.application.validators.state.ValidatorFeeCopy;
import com.radixdlt.application.validators.state.ValidatorMetaData;
import com.radixdlt.application.validators.state.ValidatorOwnerCopy;
import com.radixdlt.application.validators.state.ValidatorRegisteredCopy;
import com.radixdlt.statecomputer.forks.ForkBuilder;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RERulesVersion;
import java.util.Map;
import java.util.OptionalInt;
import java.util.Set;
import java.util.regex.Pattern;

public final class GenericTestnetForksModule extends AbstractModule {
private static final Set<String> RESERVED_SYMBOLS =
Set.of("xrd", "xrds", "exrd", "exrds", "rad", "rads", "rdx", "rdxs", "radix");

@ProvidesIntoSet
ForkBuilder testnetGenesis() {
return new ForkBuilder(
"testnet-genesis",
0L,
RERulesVersion.OLYMPIA_V1,
new RERulesConfig(
RESERVED_SYMBOLS,
Pattern.compile("[a-z0-9]+"),
FeeTable.create(
Amount.ofMicroTokens(200), // 0.0002XRD per byte fee
Map.of(
TokenResource.class, Amount.ofTokens(100), // 100XRD per resource
ValidatorRegisteredCopy.class, Amount.ofTokens(5), // 5XRD per validator update
ValidatorFeeCopy.class, Amount.ofTokens(5), // 5XRD per register update
ValidatorOwnerCopy.class, Amount.ofTokens(5), // 5XRD per register update
ValidatorMetaData.class, Amount.ofTokens(5), // 5XRD per register update
AllowDelegationFlag.class, Amount.ofTokens(5), // 5XRD per register update
PreparedStake.class, Amount.ofMilliTokens(500), // 0.5XRD per stake
PreparedUnstakeOwnership.class, Amount.ofMilliTokens(500) // 0.5XRD per unstake
)),
(long) 1024 * 1024, // 1MB max user transaction size
OptionalInt.of(50), // 50 Txns per round
10_000, // Rounds per epoch
500, // Two weeks worth of epochs
Amount.ofTokens(90), // Minimum stake
500, // Two weeks worth of epochs
Amount.ofMicroTokens(2307700), // Rewards per proposal
9800, // 98.00% threshold for completed proposals to get any rewards,
100, // 100 max validators
MSG.maxLength()));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
* permissions under this License.
*/

package com.radixdlt.statecomputer.forks;
package com.radixdlt.statecomputer.forks.modules;

import static com.radixdlt.constraintmachine.REInstruction.REMicroOp.MSG;

Expand All @@ -78,6 +78,9 @@
import com.radixdlt.application.validators.state.ValidatorMetaData;
import com.radixdlt.application.validators.state.ValidatorOwnerCopy;
import com.radixdlt.application.validators.state.ValidatorRegisteredCopy;
import com.radixdlt.statecomputer.forks.ForkBuilder;
import com.radixdlt.statecomputer.forks.RERulesConfig;
import com.radixdlt.statecomputer.forks.RERulesVersion;
import java.util.Map;
import java.util.OptionalInt;
import java.util.Set;
Expand Down