diff --git a/DOCKER.md b/DOCKER.md
index 14e92f860b..7766a06900 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -2,13 +2,13 @@
Run the official iotaledger/iri container, passing the mandatory -p option:
-```docker run iotaledger/iri:v1.6.1-RELEASE -p 14265```
+```docker run iotaledger/iri:v1.7.0-RELEASE -p 14265```
This will get your a running IRI with its API listening on port 14265, no neighbours and an empty database. The IRI Docker container by default expects data at /iri/data. Use the `-v` option of the `docker run` command to mount volumes so to have persistent data. You can also pass more command line options to the docker run command and those will be passed to IRI.
If you want to use a iri.ini file with the docker container, supposing it's stored under /path/to/conf/iri.ini on your docker host, then pass `-v /path/to/conf:/iri/conf` and add -c /iri/conf/iri.ini as docker run arguments. So for example the `docker run` command above would become:
-```docker run -v /path/to/conf:/iri/conf -v /path/to/data:/iri/data iotaledger/iri:v1.6.1-RELEASE -p 14265 -c /iri/conf/iri.ini```
+```docker run -v /path/to/conf:/iri/conf -v /path/to/data:/iri/data iotaledger/iri:v1.7.0-RELEASE -p 14265 -c /iri/conf/iri.ini```
Please refer to the IRI documentation for further command line options and iri.ini options.
@@ -61,7 +61,7 @@ ExecStart=/usr/bin/docker run \
-p 14265:14265 \
-p 15600:15600 \
-p 14600:14600/udp \
-iotaledger/iri:v1.6.1-RELEASE \
+iotaledger/iri:v1.7.0-RELEASE \
-p 14265 \
--zmq-enabled \
--testnet
diff --git a/changelog.txt b/changelog.txt
index e2b7e93691..85d96bc9fa 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+1.7.0
+ - refactor milestone signature parameters to be configurable (#1322)
+ - migration from legacy coordinator to compass
+
1.6.1
- Fix: Db exists() method optimization (#1338)
- Fix: Do not persist pruner state (#1342)
diff --git a/pom.xml b/pom.xml
index 660fbe35b6..7edc71d4bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.iota
iri
- 1.6.1-RELEASE
+ 1.7.0-RELEASE
IRI
IOTA Reference Implementation
diff --git a/src/main/java/com/iota/iri/IRI.java b/src/main/java/com/iota/iri/IRI.java
index bd84b60d52..327d822044 100644
--- a/src/main/java/com/iota/iri/IRI.java
+++ b/src/main/java/com/iota/iri/IRI.java
@@ -42,7 +42,7 @@ public class IRI {
public static final String MAINNET_NAME = "IRI";
public static final String TESTNET_NAME = "IRI Testnet";
- public static final String VERSION = "1.6.1-RELEASE";
+ public static final String VERSION = "1.7.0-RELEASE";
/**
* The entry point of IRI.
diff --git a/src/main/java/com/iota/iri/conf/BaseIotaConfig.java b/src/main/java/com/iota/iri/conf/BaseIotaConfig.java
index edb1dd038b..6e859ab590 100644
--- a/src/main/java/com/iota/iri/conf/BaseIotaConfig.java
+++ b/src/main/java/com/iota/iri/conf/BaseIotaConfig.java
@@ -1,19 +1,20 @@
package com.iota.iri.conf;
-import com.iota.iri.IRI;
-import com.iota.iri.utils.IotaUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
-
+import com.iota.iri.IRI;
+import com.iota.iri.crypto.SpongeFactory;
+import com.iota.iri.model.Hash;
+import com.iota.iri.model.HashFactory;
+import com.iota.iri.utils.IotaUtils;
import org.apache.commons.lang3.ArrayUtils;
+import java.util.ArrayList;
+import java.util.List;
+
/*
Note: the fields in this class are being deserialized from Jackson so they must follow Java Bean convention.
Meaning that every field must have a getter that is prefixed with `get` unless it is a boolean and then it should be
@@ -589,6 +590,11 @@ public int getMilestoneStartIndex() {
return Defaults.MILESTONE_START_INDEX;
}
+ @Override
+ public int getMaxMilestoneIndex() {
+ return Defaults.MAX_MILESTONE_INDEX;
+ }
+
@Override
public int getNumberOfKeysInMilestone() {
return Defaults.NUM_KEYS_IN_MILESTONE;
@@ -694,10 +700,20 @@ protected void setCacheSizeBytes(int cacheSizeBytes) {
}
@Override
- public String getCoordinator() {
+ public Hash getCoordinator() {
return Defaults.COORDINATOR_ADDRESS;
}
+ @Override
+ public int getCoordinatorSecurityLevel() {
+ return Defaults.COORDINATOR_SECURITY_LEVEL;
+ }
+
+ @Override
+ public SpongeFactory.Mode getCoordinatorSignatureMode() {
+ return Defaults.COORDINATOR_SIGNATURE_MODE;
+ }
+
@Override
public boolean isDontValidateTestnetMilestoneSig() {
return false;
@@ -822,8 +838,12 @@ public interface Defaults {
int POW_THREADS = 0;
//Coo
- String COORDINATOR_ADDRESS =
- "KPWCHICGJZXKE9GSUDXZYUAPLHAKAHYHDXNPHENTERYMMBQOPSQIDENXKLKCEYCPVTZQLEEJVYJZV9BWU";
+ Hash COORDINATOR_ADDRESS = HashFactory.ADDRESS.create(
+ "EQSAUZXULTTYZCLNJNTXQTQHOMOFZERHTCGTXOLTVAHKSA9OGAZDEKECURBRIXIJWNPFCQIOVFVVXJVD9");
+ int COORDINATOR_SECURITY_LEVEL = 2;
+ SpongeFactory.Mode COORDINATOR_SIGNATURE_MODE = SpongeFactory.Mode.KERL;
+ int NUM_KEYS_IN_MILESTONE = 23;
+ int MAX_MILESTONE_INDEX = 1 << NUM_KEYS_IN_MILESTONE;
//Snapshot
boolean LOCAL_SNAPSHOTS_ENABLED = true;
@@ -844,9 +864,9 @@ public interface Defaults {
String PREVIOUS_EPOCHS_SPENT_ADDRESSES_TXT =
"/previousEpochsSpentAddresses1.txt /previousEpochsSpentAddresses2.txt " +
"/previousEpochsSpentAddresses3.txt";
- long GLOBAL_SNAPSHOT_TIME = 1545469620;
- int MILESTONE_START_INDEX = 933_210;
- int NUM_KEYS_IN_MILESTONE = 20;
+ long GLOBAL_SNAPSHOT_TIME = 1554904800;
+ int MILESTONE_START_INDEX = 1050000;
int MAX_ANALYZED_TXS = 20_000;
+
}
}
diff --git a/src/main/java/com/iota/iri/conf/MilestoneConfig.java b/src/main/java/com/iota/iri/conf/MilestoneConfig.java
index 94afaf28b2..540509ff51 100644
--- a/src/main/java/com/iota/iri/conf/MilestoneConfig.java
+++ b/src/main/java/com/iota/iri/conf/MilestoneConfig.java
@@ -1,5 +1,8 @@
package com.iota.iri.conf;
+import com.iota.iri.crypto.SpongeFactory;
+import com.iota.iri.model.Hash;
+
/**
* Configs that should be used for tracking milestones
*/
@@ -8,16 +11,44 @@ public interface MilestoneConfig extends Config {
/**
* @return Descriptions#COORDINATOR
*/
- String getCoordinator();
+ Hash getCoordinator();
/**
* @return {@value Descriptions#DONT_VALIDATE_TESTNET_MILESTONE_SIG}
*/
boolean isDontValidateTestnetMilestoneSig();
+ /**
+ * Default Value: {@value BaseIotaConfig.Defaults#NUM_KEYS_IN_MILESTONE}
+ * @return {@value Descriptions#NUMBER_OF_KEYS_IN_A_MILESTONE}
+ */
+ int getNumberOfKeysInMilestone();
+
+ /**
+ * This is a meta-config. Its value depends on {@link #getNumberOfKeysInMilestone()}
+ * @return the maximal amount of possible milestones that can be issued
+ */
+ int getMaxMilestoneIndex();
+
+ /**
+ * Default Value: {@value BaseIotaConfig.Defaults#COORDINATOR_SECURITY_LEVEL}
+ * @return {@value Descriptions#COORDINATOR_SECURITY_LEVEL}
+ */
+ int getCoordinatorSecurityLevel();
+
+ /**
+ * Default Value: {@link BaseIotaConfig.Defaults#COORDINATOR_SIGNATURE_MODE}
+ * @return {@value Descriptions#COORDINATOR_SIGNATURE_MODE}
+ */
+ SpongeFactory.Mode getCoordinatorSignatureMode();
+
interface Descriptions {
String COORDINATOR = "The address of the coordinator";
+ String COORDINATOR_SECURITY_LEVEL = "The security level used in coordinator signatures";
+ String COORDINATOR_SIGNATURE_MODE = "The signature mode used in coordinator signatures";
String DONT_VALIDATE_TESTNET_MILESTONE_SIG = "Disable coordinator validation on testnet";
+ String NUMBER_OF_KEYS_IN_A_MILESTONE = "The depth of the Merkle tree which in turn determines the number of" +
+ "leaves (private keys) that the coordinator can use to sign a message.";
}
}
diff --git a/src/main/java/com/iota/iri/conf/SnapshotConfig.java b/src/main/java/com/iota/iri/conf/SnapshotConfig.java
index 5a1bb36679..33c30fb705 100644
--- a/src/main/java/com/iota/iri/conf/SnapshotConfig.java
+++ b/src/main/java/com/iota/iri/conf/SnapshotConfig.java
@@ -60,10 +60,6 @@ public interface SnapshotConfig extends Config {
*/
String getLocalSnapshotsBasePath();
- /**
- * @return {@value Descriptions#NUMBER_OF_KEYS_IN_A_MILESTONE}
- */
- int getNumberOfKeysInMilestone();
/**
* @return {@value Descriptions#PREVIOUS_EPOCH_SPENT_ADDRESSES_FILE}
@@ -94,8 +90,6 @@ interface Descriptions {
String SNAPSHOT_SIGNATURE_FILE = "Path to the file that contains a signature for the snapshot file.";
String MILESTONE_START_INDEX = "The start index of the milestones. This index is encoded in each milestone " +
"transaction by the coordinator.";
- String NUMBER_OF_KEYS_IN_A_MILESTONE = "The depth of the Merkle tree which in turn determines the number of" +
- "leaves (private keys) that the coordinator can use to sign a message.";
String PREVIOUS_EPOCH_SPENT_ADDRESSES_FILE = "The file that contains the list of all used addresses " +
"from previous epochs";
String SPENT_ADDRESSES_DB_PATH = "The folder where the spent addresses DB saves its data.";
diff --git a/src/main/java/com/iota/iri/conf/TestnetConfig.java b/src/main/java/com/iota/iri/conf/TestnetConfig.java
index 29e83a84d5..a35731f7f8 100644
--- a/src/main/java/com/iota/iri/conf/TestnetConfig.java
+++ b/src/main/java/com/iota/iri/conf/TestnetConfig.java
@@ -3,21 +3,28 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.iota.iri.crypto.SpongeFactory;
+import com.iota.iri.model.Hash;
+import com.iota.iri.model.HashFactory;
import java.util.Objects;
public class TestnetConfig extends BaseIotaConfig {
- protected String coordinator = Defaults.COORDINATOR_ADDRESS;
+ protected Hash coordinator = Defaults.COORDINATOR_ADDRESS;
+ protected int numberOfKeysInMilestone = Defaults.KEYS_IN_MILESTONE;
+ protected int maxMilestoneIndex = Defaults.MAX_MILESTONE_INDEX;
+ protected int coordinatorSecurityLevel = Defaults.COORDINATOR_SECURITY_LEVEL;
+
protected boolean dontValidateTestnetMilestoneSig = Defaults.DONT_VALIDATE_MILESTONE_SIG;
protected String snapshotFile = Defaults.SNAPSHOT_FILE;
protected String snapshotSignatureFile = Defaults.SNAPSHOT_SIG;
protected long snapshotTime = Defaults.SNAPSHOT_TIME;
protected int mwm = Defaults.MWM;
protected int milestoneStartIndex = Defaults.MILESTONE_START_INDEX;
- protected int numberOfKeysInMilestone = Defaults.KEYS_IN_MILESTONE;
protected int transactionPacketSize = Defaults.PACKET_SIZE;
protected int requestHashSize = Defaults.REQUEST_HASH_SIZE;
+ protected SpongeFactory.Mode coordinatorSignatureMode = Defaults.COORDINATOR_SIGNATURE_MODE;
public TestnetConfig() {
super();
@@ -32,14 +39,14 @@ public boolean isTestnet() {
}
@Override
- public String getCoordinator() {
+ public Hash getCoordinator() {
return coordinator;
}
@JsonProperty
@Parameter(names = "--testnet-coordinator", description = MilestoneConfig.Descriptions.COORDINATOR)
protected void setCoordinator(String coordinator) {
- this.coordinator = coordinator;
+ this.coordinator = HashFactory.ADDRESS.create(coordinator);
}
@Override
@@ -53,6 +60,45 @@ protected void setDontValidateTestnetMilestoneSig(boolean dontValidateTestnetMil
this.dontValidateTestnetMilestoneSig = dontValidateTestnetMilestoneSig;
}
+ @Override
+ public int getNumberOfKeysInMilestone() {
+ return numberOfKeysInMilestone;
+ }
+
+ @JsonProperty("NUMBER_OF_KEYS_IN_A_MILESTONE")
+ @Parameter(names = "--milestone-keys", description = MilestoneConfig.Descriptions.NUMBER_OF_KEYS_IN_A_MILESTONE)
+ protected void setNumberOfKeysInMilestone(int numberOfKeysInMilestone) {
+ this.numberOfKeysInMilestone = numberOfKeysInMilestone;
+ this.maxMilestoneIndex = 1 << numberOfKeysInMilestone;
+ }
+
+ @Override
+ public int getMaxMilestoneIndex() {
+ return maxMilestoneIndex;
+ }
+
+ @Override
+ public int getCoordinatorSecurityLevel() {
+ return coordinatorSecurityLevel;
+ }
+
+ @JsonProperty("COORDINATOR_SECURITY_LEVEL")
+ @Parameter(names = "--testnet-coordinator-security-level", description = MilestoneConfig.Descriptions.COORDINATOR_SECURITY_LEVEL)
+ protected void setCoordinatorSecurityLevel(int coordinatorSecurityLevel) {
+ this.coordinatorSecurityLevel = coordinatorSecurityLevel;
+ }
+
+ @Override
+ public SpongeFactory.Mode getCoordinatorSignatureMode() {
+ return coordinatorSignatureMode;
+ }
+
+ @JsonProperty("COORDINATOR_SIGNATURE_MODE")
+ @Parameter(names = "--testnet-coordinator-signature-mode", description = MilestoneConfig.Descriptions.COORDINATOR_SIGNATURE_MODE)
+ protected void setCoordinatorSignatureMode(SpongeFactory.Mode coordinatorSignatureMode) {
+ this.coordinatorSignatureMode = coordinatorSignatureMode;
+ }
+
@Override
public String getSnapshotFile() {
return snapshotFile;
@@ -108,17 +154,6 @@ protected void setMilestoneStartIndex(int milestoneStartIndex) {
this.milestoneStartIndex = milestoneStartIndex;
}
- @Override
- public int getNumberOfKeysInMilestone() {
- return numberOfKeysInMilestone;
- }
-
- @JsonProperty("NUMBER_OF_KEYS_IN_A_MILESTONE")
- @Parameter(names = "--milestone-keys", description = SnapshotConfig.Descriptions.NUMBER_OF_KEYS_IN_A_MILESTONE)
- protected void setNumberOfKeysInMilestone(int numberOfKeysInMilestone) {
- this.numberOfKeysInMilestone = numberOfKeysInMilestone;
- }
-
@Override
public int getTransactionPacketSize() {
return transactionPacketSize;
@@ -160,8 +195,14 @@ public void setDbLogPath(String dbLogPath) {
}
public interface Defaults {
- String COORDINATOR_ADDRESS = "EQQFCZBIHRHWPXKMTOLMYUYPCN9XLMJPYZVFJSAY9FQHCCLWTOLLUGKKMXYFDBOOYFBLBI9WUEILGECYM";
+ Hash COORDINATOR_ADDRESS = HashFactory.ADDRESS.create(
+ "EQQFCZBIHRHWPXKMTOLMYUYPCN9XLMJPYZVFJSAY9FQHCCLWTOLLUGKKMXYFDBOOYFBLBI9WUEILGECYM");
boolean DONT_VALIDATE_MILESTONE_SIG = false;
+ int COORDINATOR_SECURITY_LEVEL = 1;
+ SpongeFactory.Mode COORDINATOR_SIGNATURE_MODE = SpongeFactory.Mode.CURLP27;
+ int KEYS_IN_MILESTONE = 22;
+ int MAX_MILESTONE_INDEX = 1 << KEYS_IN_MILESTONE;
+
String LOCAL_SNAPSHOTS_BASE_PATH = "testnet";
String SNAPSHOT_FILE = "/snapshotTestnet.txt";
int REQUEST_HASH_SIZE = 49;
@@ -169,9 +210,9 @@ public interface Defaults {
int SNAPSHOT_TIME = 1522306500;
int MWM = 9;
int MILESTONE_START_INDEX = 434525;
- int KEYS_IN_MILESTONE = 22;
int PACKET_SIZE = 1653;
String DB_PATH = "testnetdb";
String DB_LOG_PATH = "testnetdb.log";
+
}
}
diff --git a/src/main/java/com/iota/iri/service/API.java b/src/main/java/com/iota/iri/service/API.java
index fe031d928e..4a7d4b4350 100644
--- a/src/main/java/com/iota/iri/service/API.java
+++ b/src/main/java/com/iota/iri/service/API.java
@@ -907,7 +907,7 @@ private AbstractResponse getNodeInfoStatement() throws Exception{
instance.tipsViewModel.size(),
instance.transactionRequester.numberOfTransactionsToRequest(),
features,
- instance.configuration.getCoordinator());
+ instance.configuration.getCoordinator().toString());
}
/**
diff --git a/src/main/java/com/iota/iri/service/milestone/MilestoneService.java b/src/main/java/com/iota/iri/service/milestone/MilestoneService.java
index b334740a8d..e9a0a98c23 100644
--- a/src/main/java/com/iota/iri/service/milestone/MilestoneService.java
+++ b/src/main/java/com/iota/iri/service/milestone/MilestoneService.java
@@ -2,7 +2,6 @@
import com.iota.iri.controllers.MilestoneViewModel;
import com.iota.iri.controllers.TransactionViewModel;
-import com.iota.iri.crypto.SpongeFactory;
import com.iota.iri.model.Hash;
import java.util.Optional;
@@ -34,13 +33,11 @@ public interface MilestoneService {
*
* @param transactionViewModel transaction that shall be analyzed
* @param milestoneIndex milestone index of the transaction (see {@link #getMilestoneIndex(TransactionViewModel)})
- * @param mode mode that gets used for the signature verification
- * @param securityLevel security level that gets used for the signature verification
* @return validity status of the transaction regarding its role as a milestone
* @throws MilestoneException if anything unexpected goes wrong while validating the milestone transaction
*/
- MilestoneValidity validateMilestone(TransactionViewModel transactionViewModel, int milestoneIndex,
- SpongeFactory.Mode mode, int securityLevel) throws MilestoneException;
+ MilestoneValidity validateMilestone(TransactionViewModel transactionViewModel, int milestoneIndex)
+ throws MilestoneException;
/**
* Updates the milestone index of all transactions that belong to a milestone.
diff --git a/src/main/java/com/iota/iri/service/milestone/impl/LatestMilestoneTrackerImpl.java b/src/main/java/com/iota/iri/service/milestone/impl/LatestMilestoneTrackerImpl.java
index bf82a87149..9fe203a3ea 100644
--- a/src/main/java/com/iota/iri/service/milestone/impl/LatestMilestoneTrackerImpl.java
+++ b/src/main/java/com/iota/iri/service/milestone/impl/LatestMilestoneTrackerImpl.java
@@ -4,7 +4,6 @@
import com.iota.iri.controllers.AddressViewModel;
import com.iota.iri.controllers.MilestoneViewModel;
import com.iota.iri.controllers.TransactionViewModel;
-import com.iota.iri.crypto.SpongeFactory;
import com.iota.iri.model.Hash;
import com.iota.iri.model.HashFactory;
import com.iota.iri.service.milestone.LatestMilestoneTracker;
@@ -149,7 +148,7 @@ public LatestMilestoneTrackerImpl init(Tangle tangle, SnapshotProvider snapshotP
this.milestoneSolidifier = milestoneSolidifier;
this.messageQ = messageQ;
- coordinatorAddress = HashFactory.ADDRESS.create(config.getCoordinator());
+ coordinatorAddress = config.getCoordinator();
bootstrapLatestMilestoneValue();
@@ -210,7 +209,7 @@ public boolean processMilestoneCandidate(TransactionViewModel transaction) throw
return true;
}
- switch (milestoneService.validateMilestone(transaction, milestoneIndex, SpongeFactory.Mode.CURLP27, 1)) {
+ switch (milestoneService.validateMilestone(transaction, milestoneIndex)) {
case VALID:
if (milestoneIndex > latestMilestoneIndex) {
setLatestMilestone(transaction.getHash(), milestoneIndex);
diff --git a/src/main/java/com/iota/iri/service/milestone/impl/MilestoneServiceImpl.java b/src/main/java/com/iota/iri/service/milestone/impl/MilestoneServiceImpl.java
index 5a88ff8c50..5e81a9c55c 100644
--- a/src/main/java/com/iota/iri/service/milestone/impl/MilestoneServiceImpl.java
+++ b/src/main/java/com/iota/iri/service/milestone/impl/MilestoneServiceImpl.java
@@ -2,6 +2,7 @@
import com.iota.iri.BundleValidator;
import com.iota.iri.conf.ConsensusConfig;
+import com.iota.iri.conf.MilestoneConfig;
import com.iota.iri.controllers.MilestoneViewModel;
import com.iota.iri.controllers.TransactionViewModel;
import com.iota.iri.crypto.Curl;
@@ -26,12 +27,13 @@
import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
import static com.iota.iri.controllers.TransactionViewModel.OBSOLETE_TAG_TRINARY_OFFSET;
-import static com.iota.iri.service.milestone.MilestoneValidity.INCOMPLETE;
-import static com.iota.iri.service.milestone.MilestoneValidity.INVALID;
-import static com.iota.iri.service.milestone.MilestoneValidity.VALID;
+import static com.iota.iri.service.milestone.MilestoneValidity.*;
/**
* Creates a service instance that allows us to perform milestone specific operations.
@@ -65,9 +67,10 @@ public class MilestoneServiceImpl implements MilestoneService {
private MessageQ messageQ;
/**
- * Holds the config with important milestone specific settings.
+ * Configurations for milestone
*/
- private ConsensusConfig config;
+ private MilestoneConfig config;
+
private BundleValidator bundleValidator;
@@ -82,7 +85,7 @@ public class MilestoneServiceImpl implements MilestoneService {
* allows us to still instantiate, initialize and assign in one line - see Example:
*
* {@code milestoneService = new MilestoneServiceImpl().init(...);}
- *
+ *te
* @param tangle Tangle object which acts as a database interface
* @param snapshotProvider snapshot provider which gives us access to the relevant snapshots
* @param messageQ ZeroMQ interface that allows us to emit messages for external recipients
@@ -90,7 +93,7 @@ public class MilestoneServiceImpl implements MilestoneService {
* @return the initialized instance itself to allow chaining
*/
public MilestoneServiceImpl init(Tangle tangle, SnapshotProvider snapshotProvider, SnapshotService snapshotService,
- BundleValidator bundleValidator, MessageQ messageQ, ConsensusConfig config) {
+ BundleValidator bundleValidator, MessageQ messageQ, MilestoneConfig config) {
this.tangle = tangle;
this.snapshotProvider = snapshotProvider;
@@ -163,10 +166,10 @@ public void resetCorruptedMilestone(int index) throws MilestoneException {
}
@Override
- public MilestoneValidity validateMilestone(TransactionViewModel transactionViewModel, int milestoneIndex,
- SpongeFactory.Mode mode, int securityLevel) throws MilestoneException {
+ public MilestoneValidity validateMilestone(TransactionViewModel transactionViewModel, int milestoneIndex)
+ throws MilestoneException {
- if (milestoneIndex < 0 || milestoneIndex >= 0x200000) {
+ if (milestoneIndex < 0 || milestoneIndex >= config.getMaxMilestoneIndex()) {
return INVALID;
}
@@ -187,32 +190,34 @@ public MilestoneValidity validateMilestone(TransactionViewModel transactionViewM
if (tail.getHash().equals(transactionViewModel.getHash())) {
//the signed transaction - which references the confirmed transactions and contains
// the Merkle tree siblings.
- final TransactionViewModel siblingsTx = bundleTransactionViewModels.get(securityLevel);
+ int coordinatorSecurityLevel = config.getCoordinatorSecurityLevel();
+ final TransactionViewModel siblingsTx =
+ bundleTransactionViewModels.get(coordinatorSecurityLevel);
- if (isMilestoneBundleStructureValid(bundleTransactionViewModels, securityLevel)) {
+ if (isMilestoneBundleStructureValid(bundleTransactionViewModels, coordinatorSecurityLevel)) {
//milestones sign the normalized hash of the sibling transaction.
byte[] signedHash = ISS.normalizedBundle(siblingsTx.getHash().trits());
//validate leaf signature
- ByteBuffer bb = ByteBuffer.allocate(Curl.HASH_LENGTH * securityLevel);
+ ByteBuffer bb = ByteBuffer.allocate(Curl.HASH_LENGTH * coordinatorSecurityLevel);
byte[] digest = new byte[Curl.HASH_LENGTH];
- for (int i = 0; i < securityLevel; i++) {
- ISSInPlace.digest(mode, signedHash, ISS.NUMBER_OF_FRAGMENT_CHUNKS * i,
+ SpongeFactory.Mode coordinatorSignatureMode = config.getCoordinatorSignatureMode();
+ for (int i = 0; i < coordinatorSecurityLevel; i++) {
+ ISSInPlace.digest(coordinatorSignatureMode, signedHash,
+ ISS.NUMBER_OF_FRAGMENT_CHUNKS * i,
bundleTransactionViewModels.get(i).getSignature(), 0, digest);
bb.put(digest);
}
byte[] digests = bb.array();
- byte[] address = ISS.address(mode, digests);
+ byte[] address = ISS.address(coordinatorSignatureMode, digests);
//validate Merkle path
- byte[] merkleRoot = ISS.getMerkleRoot(mode, address,
+ byte[] merkleRoot = ISS.getMerkleRoot(coordinatorSignatureMode, address,
siblingsTx.trits(), 0, milestoneIndex, config.getNumberOfKeysInMilestone());
- if ((config.isTestnet() && config.isDontValidateTestnetMilestoneSig()) ||
- (HashFactory.ADDRESS.create(merkleRoot)).equals(
- HashFactory.ADDRESS.create(config.getCoordinator()))) {
-
+ boolean skipValidation = config.isTestnet() && config.isDontValidateTestnetMilestoneSig();
+ if (skipValidation || config.getCoordinator().equals(HashFactory.ADDRESS.create(merkleRoot))) {
MilestoneViewModel newMilestoneViewModel = new MilestoneViewModel(milestoneIndex,
transactionViewModel.getHash());
newMilestoneViewModel.store(tangle);
diff --git a/src/main/java/com/iota/iri/service/snapshot/impl/SnapshotProviderImpl.java b/src/main/java/com/iota/iri/service/snapshot/impl/SnapshotProviderImpl.java
index 37fbda8ec0..9114f8333b 100644
--- a/src/main/java/com/iota/iri/service/snapshot/impl/SnapshotProviderImpl.java
+++ b/src/main/java/com/iota/iri/service/snapshot/impl/SnapshotProviderImpl.java
@@ -48,7 +48,7 @@ public class SnapshotProviderImpl implements SnapshotProvider {
/**
* Snapshot index that is used to verify the builtin snapshot signature.
*/
- private static final int SNAPSHOT_INDEX = 10;
+ private static final int SNAPSHOT_INDEX = 12;
/**
* Logger for this class allowing us to dump debug and status messages.
diff --git a/src/main/java/com/iota/iri/service/spentaddresses/impl/SpentAddressesServiceImpl.java b/src/main/java/com/iota/iri/service/spentaddresses/impl/SpentAddressesServiceImpl.java
index ad95531959..cb3d7025c7 100644
--- a/src/main/java/com/iota/iri/service/spentaddresses/impl/SpentAddressesServiceImpl.java
+++ b/src/main/java/com/iota/iri/service/spentaddresses/impl/SpentAddressesServiceImpl.java
@@ -182,7 +182,7 @@ private boolean wasAddressSpentFrom(Hash addressHash, Collection checkedAd
}
private Set getInitialUnspentAddresses() {
- return Stream.of(Hash.NULL_HASH, HashFactory.ADDRESS.create(config.getCoordinator()))
+ return Stream.of(Hash.NULL_HASH, config.getCoordinator())
.collect(Collectors.toSet());
}
}
diff --git a/src/main/resources/snapshotMainnet.sig b/src/main/resources/snapshotMainnet.sig
index 957669bea3..05c16f08f8 100644
--- a/src/main/resources/snapshotMainnet.sig
+++ b/src/main/resources/snapshotMainnet.sig
@@ -1,4 +1,5 @@
-ACVYYBPNFADBFDXCXNDTFEQVMOGKRSWZFI9CVGWS9OBWIZNML9GRYBTNTR9ONC9GNSSEXNIMEBW9OVZMOBPGMVJHPWREHBXAOTONWGCZAPNHOMSVXDQPCDJDDBTRTPYJUORMFODAVSXU9CVDELFYSUFOEQZZRZMWGEWYY9PYTPBIEGSKWWCZSFKIMXMIYLQQYFGTKBKXMORAEWHFWYCQIYZDTQZGTN9MNDMXIHXOCKRCSRVTRSQNR9NGPFPFWNFMXWCNCQ9WLRDMKXQNOEEOPUQUUPPVJRYDGKQNEFYKMDQQXUHERSDCNTMCMFIYDICOCCEPY9QPRDRKGCWE9YVEMDLZOVBUIQWRCGGBGPJ9T9ZXKRBGKVQRGVEALACSKVQZOYVJQT9CQSITSDCRAOKLVHRDHHFTSCADEFCXXMVV9VLDYTPUBJMMQBXVEBCCNEUUJJXAUEROUYJTOKVZL9XMFIPPYZ9NIWAGBXDJTVRKGKEOZRZPQBDLCDIXOXQIKKTEMQIFWEDEFYNUAGFLHJN9P9VWHTNGLXFVUIZFSDKPTRYDRCVCQ9EEXADBNSWPFVBHLYC9LEMFZ9K9KIDHFGFMXUHS9WBMGPUWWPXKJHWDYWRH9URCUMCKYQFL9ZNCGFQQWMYRSGGQMHEPDZNBYVWEASDGXEOUEVCNXNNGXBRXDEJNKRWGBOLVNWDWXIMHSLKARROBOTM9EWCKTTSVBEAOEARAE9N9KUGBQH9SKYJDWDDVHEGMQHPBGGVEGARX9VOADYPMH9INQIWBG9LGHRCXNHXIZZGKOMZIMBZIORKMOVF9GPKMDINDCFUND9AAKYZ9OAMHJDCBQESWOWYYJNFPWU9SG9UEFITZQCKFONKWFFFOCUNT99VVGESOH9DQRDH9VMOIODRRBEGTUVASJA9PAUCLCCVOVGGUEAIPMGOVZEXUCGAEMLSXSILZEDSTRWCGADUMRKOSJAIKHVRTULFIMVFDEFAVEZJMDOQSDFYQYH9NBPJCBK9LVEUMPDBRMLZEITMADMUNHKBONLNLVLBDVXKPVOCTKNPOLQDLLILBXKLRPOICAWNKVYSUDEDSOCXZQADWYVMLTATOLY99USAQRKHM9EUHYFEXYWXTYF9SCOWXSEPUTKPJYVP9LY9XNBDAIHZQCW9VNOVIUJMXCHOREHAXZWIJEYBDWW9LAYRIBVYRUG9KELPGTBLKRBXKT9ZECHBSCFQFYMPJVZUVJCXYETDRQERZAQRFCEEIGFQIWZBMFBHOPPDEOAAGEUYHCITAFIRWJADNLGMOLNFIJUUCFHHCZEKENKVJELKC9BIIKACATPHXOUWTPPUXNPGEIJUF9BTCLHKVTZQNSZ9TYQDJVEKWTGTSOULGSTTQZMGIYQII9KKDIZXXKYHWDELWGRSFFCFKPZSQJXHBCEYVBKPDFILRMTQOTYZENJTEDYGKWOZXPFMZFRFZDEWMQSJDZCMC9ZXHLZBVDAGLEJREFMEIHOICPTMKPWGSIJUWIODLVJIWFSDIXHLSVPYBSUNOZPCEAFXCULQCJLSFZMJCFORKKKDYOT9HLGUZKIMXMDBZNDDOXVNCNERYVADJ9IMVKNIBRNTR9DXC999LQKUOPYFG9HMWEDZQTQRX9CJGCTFFLYOODHMSTI9SWWU9ADVMCWKGHKVXPIZBTQPMQG9ZLEIDXSPMJQVZZNUJJCBZSWPTRRYCBHCUVCIAVETLVXFTKMTLBQDULRN9YLNUI9NZUJQZU9DYQHWCSEYLGLCHJFEJQUREZJDSZJGTNMLHOVZNUFEFENSJZDNBMNWXCTTOPQWDDGYYJZZPGJSENTLYJUDNNSRVUTQESDUDDIVVEFOOJQIHM9OENAKBCSKBMMJJOEUOCG9ROH9ARYPKIQJINAX9JJJFRXOVHXNNOCUJEHSUDZVBCKE9OIDKJXEQZPSUFZFTOTKMYLBIJK9SGRXZZ9TQXHSJUUADPBB9YXTP9NVBYHKFBJDDZLXMLKHERSLQZWQ9WRFTWQKBWMMFKKLAIAUJLTKFWESGGKHFIBAF9NSMHZKQEGFZCAUNX9YAAOTXXLXEDNWKMZPEYFTNAZRINCDIHGEYWGJFRGKBILOOWOEPBKCPDYWXMBALBBVJKIHZDYWGNORUNULPDQMWFJRS9HDFJXRHOOUGICRPUQXJUZEIFUDFIEPLVUOU9RH
-HRNXZJTYVGBXKAZHCNBTUWLQRHWRXCIOTGZIDDMWQIPSANMCKY9SCY9TUEH9EUSTSNEJEA9OQLQSGQSYFEIVDFCWQNWSZEZLMJSZWHMZEXBUMKLQRWPYWYOTOEWIELPZD9ZCTTSBZWKQBAODZYJRBYCUAAKAZYFFERIHHKAA9FMARMZHHXDMXVKJJKDYNZQUDAYYZVSEUIFHNCAN9OEPOWBQQJB9TPKYUSFGCWLOXACGCSDIQKXYJ9NOUSQEVPGQZLYZSZMOGNXAWCVBSABZFVDNZPFWBZXXBHOSKLFQKHNPWAFKDZFNOQILXEGEHVKQOUKDQTCWOPZMVKIEEQEGGOSRFLOMOYYGXUVRXEZCUU9VVMBWMRGHSDIUDFZHVRPREGSMHJPSDJAGHYZECJCHOIWQ9MCYRBBQYVWFFOPZGFXLWDKSCJHPVM9JUBQRMXTND9NQTHB9WXPNCGXFAYJRRCJWQMJMGMOOPIRGEYJC9FWQIXBGNBTEMVCZFGUOXLNINDFOYKALEGMDTVDYTWY9MEYESHRPZM9MBLLCZDZNFXLLAKMEMIO9ALGYY9F9CRNRXPJQIQZKSTFQDQLSLPWQTGWGSTUICDSWKNKVQVCCBUFQTLGTNNDTWAMVNIIG9AGPFEVZQCTCENGTBSYKSEOJAHGJKIUVGOTLUPMYEYCEIRTVRFIBWWQDBWRZZUDQ9RHUAODOBZVFXFGDTZMXSJO9RONIFSFUNJMWMDBNHDCBIJYP9ENGWKWWPVKQ9CWBJUVQIUZRWA9MGMYFWTVCHPJVDCHRQLQBJSJLG9BKOIGVONXMZPTWSIVUOYRGPYTG9B9ZFSTROVKGIWRHJYEJSTTRFUWZFZHYAINKVAHGPKXEWQLSTUXAXOCCSRRUECJZYVUEOGFDGCLDFIQU9WOFPHHHRQLJACAPOJDZAR9AFUPECIGODARS9XRMRYIAVAVKCYRWGOEWXVJKQCXRFXHCATWDUSRNOKHLEPZLCBBVKMXUOLMILAGRZJNCRJXUUMQGKE9VDTBUDC9COORKLWVXYVXVEMFEVDALFNUTBBDFGLZCMIFLLDIIWWRTNQCIUOUHRMTBUGFJKNAIIVMUWEPWHBIFZWRWZJA9CVCHGDIQTDDMOGYVVKELCJZCVGXPMODLEOZGXVTUIIHHMHRDSTPUOOQPNBQXRVKAUKW9VQGYTTFFMCULOYLYZOTIGJXDDXQHOAGMTVIZQEJEVVFYHPYWIYRJBXVXPDVJNOEXOZESVCGGIVDGNAXKPDGLRMSXCBNPETPDSWLKEVZLGPWHPIF9DWRWZLKPGKHD9SWPVWKCAAABJLZNLZEATOQZ9KCJHNPLVHGZIMDKSPIXURPNAWFCQFMBXCC9JLPLYXUNLLXNDCSVXMJFJVAYIBPKCVROFAMMPMFZSIIQUGOGDTETEMRQ9MQYRCVHGDFIQTKILRWUKARMUYYJA9KKBM9XBCOPOUJDVXBGISDCWC9OMOUGVSKWASXLARXMPCPDBJZAHBLQHTNGVGPQOVY9PQITPEVNXUGNAOYUUQBDKFIZMBEPNUBLICSANTJJEG9UKAENDIOGRGY99JCZKE9DGOPNMCUIXWNQZPRNXLMRWXOQDAHSAZXIMZKBWYJBBKZRH9TDUGIDCUBLLKTKYTZYGWBPWF9AHNASIGZWGYVDYOTGGWAPBTXYDNYMCHVDRZHQPARRWEEXPMDJYVVHZWSMGTIXBTTPEPSLBVCAZJEWRAWVJOXMJLIDIMYPRRFABPMQFH9OAABSDOIWIWHTTVJRBXMLGXJTZKCQERLDTNXFBHSUYJE9LKHDDNNPDTXRBHXQVNUVSLEFESQTLYPLFASLGQEOUOMSC9PTOUUUMCXQSHYMTRVLJ9SJWBYBRWNDQIZSPBSBSSFPJSRASRUMRPVQYXKMCSVMDLPSEVRFKMVULHFHIFDNDRENZRXOAVWSLLDNDOKPVDUKJOYLSLBTPNHHGGWXOYHU9XDTMMYLZCAXOQKJEHSDYRFXBHOLUFFGVILSCJWIUAVIRWDNWPKSEWZQMEGDKT9EDVQWAZJXMZWVGLPVBQO9QG9AYBTMWSPRUJGFUDU9DBLWXEXYHXRTFX9HYQKDAPAKMPVQWIACEK9BQUQGVVEJHYQKTSNVYAGHVMTONKOMRNQYUQVIMNQNITUABKTRTIITAXPSJOQAXNYNUEAXBCP
-9KQZDDUNVFAHLUQPYLZWLGSQYEMRTDYAJAFC9IDEUEAZAKADOLPROQDXGZUIF9KICEMRQWUYOFVWHOXEVTWZLLXAWAMPOXPPLNSALXYFWKGWHT9WSKTAQFOFEYBWGXAXYAQPOSSENUTWTPHHNVVVKOJXNCZTGRXEDL9HOPWLAQXDUWOLRTQTCCKCDPPWXJ9CVJVQXGBCSPFCOTQHPVUZTSEQVLXGSQTFRPZBTCIISQODN9MHFCEYYMSNCROSMPRCXMMYHPJYE9JRPDCDZRUPFWFFEFKQRTLAQBMXEMMUNXUAEAXFXMFCDXSYHFAHLZTRC9LAJSJANWGA9DSMPXXZUWCWWXMCBYROBPNMF9MXIWKIGMDRTABVR9XCBJBOOFRLFBJGTTNTG9LHEQFTELJPQPVS9FTZGSBX9BVAQWTHUDLQAEEFCEYFCGNYKOQOVCOQUDXOKVDJKQUYJ9VUKWDMPSRFJ9DEIQFMGTETVGEHYRGQZTECUHBELXGQJAUMHGDOKCSNPRNMVPRKSFTJKZGYKXVWAZ9DCY9NWSZPNAJXABBMLUTMTTCUCIY9YG9VSAKVPUOBBSUIFTBXFGTGJQBXLFLNIZCBLTETYHLWKGPBUPGVEPP9QMWIACHXWQT9XIAUELNIBFQKMLA9RODPLZHLI9JELWHFZOVEPUKXHNMERJFTCPARAFU9BFVTAS9VIYHKEQNGAWZXVLWSILMC9GLJTEBJ9OFNT9VOUCIGJNNNGXZQ9MZ9HYBSYCNSJTVDQEVZUDBLDDXPMUHCTV9EGMC9DXVJEFUDBZTLZPNRRXIWSRLBZOPCMGYZVPMLSWGRJMSAJMX9OAJCDIPWGVFTOK9HNLWCLCKEUQIHVRNXUFDIRZBYDZFAVUYPIOLKL9LFIGABGLVMSEEGMWIUJPLBSTLKYLUIHLIAZMTDARCRYLONHEAIUMZS9IRTZPVMVQSIBJB9DYZNCQIMTFHMOWFKJSTRKAZ9GMREDPSZXNCAITTCLOYWQLGZHMOUHESLCKIAZDN999CGEOFYZ9UAWDTPPLQVSDKPHZDKOLOJFMSODFVSASRGOZXSQSVDCMDYNLXKJZKUKQVJPDRVSMOZWOLTWOIQJGUQVRIVAU9RWPRVXGWEDPLEOTSPAY9QEEHGWGTFCLJKPGBJLFKBLNJZQFNDUVVIYRPYOIFGSYJSXUPBLHITDKWOEPOICHVUQIXEHWGLLGADTOJIAASFYZZQHCLSZCDLXMISVLQVDZGYYKFBTCZWKXTMBHNVCWFWKRVELIPQK9OUTTZPYCZNDYG9BZLRICEMNUAHWHXKVMSDAUDPKFZKUNUCJJXAOERBIETGL9NGERCOITPCWGXEBHYOB9JQBXAMPH9UHNURCRQRFBGDGHJGQHNPPJLJVFDKBLULFTTUQ9JGUHCDJRATVQQHOOTNWYFGTFCPAEFDRKKKWIQNADZW9CPRGGCDQXWVXJHYVRTNDGNQSZCNNSQOXMUFMUTCUHMRXWXKITCHRNDQASEKND9PUGNZVHEX9RRT9HVJUFTCZWATKOEFNRTAFMYTZRAWHLAWWVKWGVEID9ZIAHCEDOGEBWUOUWPSJMJCXLTGSEPZSUKTIAPTVRDEDITXMBITHDZFBJYYYBFWKSUMKZ9HVUTTZZZXNVSSTFKMWYMCQPHMUDTAVMGPWINRHHIVWISOLSTPRDUFYAIT9WS9ZGRYGOIRUBEQVYD9UELULUPZFUXQYOBQWODGAMVTINHTMXBWEUOHOSVNQ9WDFIEVHEVUGBPOPRDXDCHUXHBIZYBOLGJHRVVRULCWZOHUUVJTU9WDZDEMKL9XNHKNNAIIRUUOEMLDEMICQBHFEMSKOTTLRBELBQBZNPUYGWCEMWVAQDASAVQQDPTJIAQCEND9IUDIPLVOVLTSMLVGWATEEACXQJSGOIEPUIXQQJDJEYKPPSLMHIZEUZUVWBDHVZIDNUQAVLEBKYGFCSAQNXTEQYEMYXWQGECBTBIKKKPLDVNPGLPOMU9SIED9KVNDNHJXGXQHGAYWISQSXPGUVKAHLECA9SBFDYAMCYYWNTOSQQGQMXJBMFDK9JNBZKWXJFMPIOUDILNTRBKHPGB99NQTBVTDKFXZMFNZQJJUJAAPMKZDNBJWDZYHGJKHIYGTQUCLVNXJKPQILUFXUJDVMCBOFZLNF9ETQWMBETFYHBMJYZH
-TKDHAZZPP9TZULXAQDXPKNPYAAJGPYRAALSKRMBRYUOUUOPG9ZVGNFJGZQUVMNLDMZD9AREESWEDRRKBWOJFYKCNHDAVJX9ULIMZAYKMNWVJWQHENQRKWZRLFWXXVIAO9IV9GGTMWYYTGZKBHMUXKUSXJKEXOWJMQEYOYWIRHEHA9ISSW9QFSFD9VACZZHAWSAWJYLAZAMTIXGTANLXUJNVKFIKZIHEUMLAIJQXSYAUNLSUPZSX9MLA9PGIYUPJPYYMONQNKLLROMLLDFUO9KEPRGKOKPYZPZVQBT9RJONPHFWZWUXIGPUPMJRSPQEZOCLPTVS9YHMNZUWGA9CD9UGUPKQUZWERLCOOOWHSHBP9ZQFXUVNBPFCZMV9HXGDCTAMJRQNNTJMJQRDSMFKEKQGMJDHTWYGTQAVEJVHXKVIEPLHEZSOUGOZNEBVNKIPUEBBXWYWYGGBMTZKTYYYFWV9LCZNHGZSQXSZSPOY