Merge pull request #207 from HelixNetwork/dev

1.0.2
HelixNetwork · Oct 10, 2019 · a148f48 · a148f48
2 parents 27ff9a8 + 569a379
commit a148f48
Show file tree

Hide file tree

Showing 38 changed files with 391 additions and 283 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ effective.pom
 .settings/
 enforcer.pom
 out
+
 # db
 db
 mainnet.log
@@ -44,6 +45,7 @@ spent-addresses-log
 *.snapshot.state
 *.snapshot.meta.bkp
 *.snapshot.state.bkp
+snapshot/*
 
 # modules
 XI
@@ -61,6 +63,7 @@ modules/*
 # keys
 *.key
 *.pem
+Validator.*
 
 # os
 .DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.0.2
+-  Added roundIndex to transaction meta data
+-  Set round indices of a round's txs in MilestoneTracker
+-  Removed obsolete `isPoWDisabled` setting
+-  Removed obsolete spammer-class
+-  Changed default dir of local snapshots from mainnet to snapshot
+-  Only debug log most recent applied round
+-  Fixed #184: `NULL_HASH` not used as empty round's snapshot hash anymore
+-  Temporarily added parameter `NUM_OF_ACTIVE_VALIDATORS`
+-  Temporarily added parameter `CONFIRMATION_THRESHOLD`
+-  Set `roundIndex` of all round's txs - not only milestones 
+-  Update `getConfirmedTransactions`
+-  Added `confirmations` to tx meta data. Each time a valid milestone refers to a transaction this counter is incremented.
+-  New implementation of `getConfirmationStates`, which now compares relative confirmations to a specifiable confirmation threshold.
+-  Add `validator-path` parameter
+
 ## 1.0.1
 -   Added dev instrumentation
 -   Added hardware specs

diff --git a/README.md b/README.md
@@ -5,7 +5,8 @@
 # Pendulum
 
 Pendulum is a quorum based [Tangle](https://github.com/iotaledger/iri/) implementation designed towards reliable timekeeping and high-throughput messaging.
--   **Latest release:** 1.0.1 release
+
+-   **Latest release:** 1.0.2 pre-release
 -   **License:** GPLv3
 
 Special thanks to all of the [IOTA Contributors](https://github.com/iotaledger/iri/graphs/contributors)!

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,9 @@
     <groupId>net.pendulum</groupId>
     <artifactId>pendulum</artifactId>
 
-    <version>1.0.1</version>
+
+    <version>1.0.2</version>
+
 
     <name>Pendulum</name>
     <description>Pendulum Protocol</description>

diff --git a/src/main/java/net/helix/pendulum/BundleValidator.java b/src/main/java/net/helix/pendulum/BundleValidator.java
@@ -66,13 +66,11 @@ public static List<List<TransactionViewModel>> validate(Tangle tangle, Snapshot
 
         TransactionViewModel tail = TransactionViewModel.fromHash(tangle, tailHash);
         if (tail.getCurrentIndex() != 0 || tail.getValidity() == -1) {
-            //System.out.println("Empty List");
             return Collections.EMPTY_LIST;
         }
 
         List<List<TransactionViewModel>> transactions = new LinkedList<>();
         final Map<Hash, TransactionViewModel> bundleTransactions = loadTransactionsFromTangle(tangle, tail);
-        // System.out.println("bundle size: " + bundleTransactions.size());
 
         //we don't really iterate, we just pick the tail tx. See the if on the next line
         for (TransactionViewModel transactionViewModel : bundleTransactions.values()) {
@@ -106,7 +104,6 @@ public static List<List<TransactionViewModel>> validate(Tangle tangle, Snapshot
                                     || bundleValue > TransactionViewModel.SUPPLY)
                     ) {
                         instanceTransactionViewModels.get(0).setValidity(tangle, initialSnapshot, -1);
-                        //System.out.println("Semantics Error!");
                         break;
                     }
 
@@ -123,8 +120,6 @@ public static List<List<TransactionViewModel>> validate(Tangle tangle, Snapshot
                                 }
                                 sha3Instance.squeeze(bundleHashBytes, 0, bundleHashBytes.length);
                                 //verify bundle hash is correct
-                                //System.out.println("Bundle Hash: "  + instanceTransactionViewModels.get(0).getBundleHash());
-                                //System.out.println("recalculated Bundle Hash: " + Hex.toHexString(bundleHashBytes));
                                 if (Arrays.equals(instanceTransactionViewModels.get(0).getBundleHash().bytes(), bundleHashBytes))  {
                                     //normalizing the bundle in preparation for signature verification
                                     normalizedBundle = Winternitz.normalizedBundle(bundleHashBytes);
@@ -151,7 +146,6 @@ public static List<List<TransactionViewModel>> validate(Tangle tangle, Snapshot
                                             //signature verification
                                             if (! Arrays.equals(transactionViewModel.getAddressHash().bytes(), addressBytes)) {
                                                 instanceTransactionViewModels.get(0).setValidity(tangle, initialSnapshot, -1);
-                                                //System.out.println("Signature Error!");
                                                 break MAIN_LOOP;
                                             }
                                         } else {
@@ -165,7 +159,6 @@ public static List<List<TransactionViewModel>> validate(Tangle tangle, Snapshot
                                 //bundle hash verification failed
                                 else {
                                     instanceTransactionViewModels.get(0).setValidity(tangle, initialSnapshot, -1);
-                                    //System.out.println("Bundle Hash Error!");
                                 }
                             }
                             //bundle validity status is known
@@ -176,7 +169,6 @@ public static List<List<TransactionViewModel>> validate(Tangle tangle, Snapshot
                         //total bundle value does not sum to 0
                         else {
                             instanceTransactionViewModels.get(0).setValidity(tangle, initialSnapshot, -1);
-                            //System.out.println("Bundle Sum Error!");
                         }
                         //break from main loop
                         break;

diff --git a/src/main/java/net/helix/pendulum/Main.java b/src/main/java/net/helix/pendulum/Main.java
@@ -8,10 +8,9 @@
 import net.helix.pendulum.conf.PendulumConfig;
 import net.helix.pendulum.service.API;
 import net.helix.pendulum.service.ApiArgs;
-import net.helix.pendulum.service.Spammer;
 import net.helix.pendulum.service.milestone.impl.MilestonePublisher;
 import net.helix.pendulum.service.restserver.resteasy.RestEasy;
-import net.helix.pendulum.service.validatomanager.impl.ValidatorPublisher;
+import net.helix.pendulum.service.validatormanager.impl.ValidatorPublisher;
 import net.helix.pendulum.utils.PendulumIOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
@@ -40,13 +39,15 @@
  *     </ul>
  * </p>
  *
- * @see <a href="https://docs.hlx.ai/protocol">Online documentation on hlx</a>
+ * @see <a href="https://dev.hlx.ai">Online documentation on pendulum</a>
  */
 public class Main {
 
     public static final String MAINNET_NAME = "Pendulum";
     public static final String TESTNET_NAME = "Pendulum Testnet";
-    public static final String VERSION = "1.0.1";
+
+    public static final String VERSION = "1.0.2";
+
 
     /**
      * The entry point of Pendulum.
@@ -99,10 +100,9 @@ private static class MainLauncher {
         public static XI XI;
         public static MilestonePublisher milestonePublisher;
         public static ValidatorPublisher validatorPublisher;
-        public static Spammer spammer;
 
         /**
-         * Starts hlx. Setup is as follows:
+         * Starts Pendulum. Setup is as follows:
          * <ul>
          *     <li>Load the configuration.</li>
          *     <li>Create {@link Pendulum}, {@link XI} and {@link API}.</li>
@@ -135,7 +135,7 @@ public static void main(String [] args) throws Exception {
                 log.error("Exception during Pendulum node initialisation: ", e);
                 throw e;
             }
-            if (config.getValidator() != null || new File(config.getValidatorKeyfile()).isFile() ) {
+            if (config.isValidatorEnabled()) {
                 milestonePublisher = new MilestonePublisher(config, api, pendulum.candidateTracker);
                 milestonePublisher.startScheduledExecutorService();
             }
@@ -158,7 +158,7 @@ private static void shutdownHook() {
             Runtime.getRuntime().addShutdownHook(new Thread(() -> {
                 log.info("Shutting down Pendulum node, please hold tight...");
                 try {
-                    if (pendulum.configuration.getValidator() != null ||  new File(pendulum.configuration.getValidatorKeyfile()).isFile()) {
+                    if (pendulum.configuration.isValidatorEnabled()) {
                         milestonePublisher.shutdown();
                     }
                     /*if (pendulum.configuration.getValidatorManagerEnabled()) {

diff --git a/src/main/java/net/helix/pendulum/Pendulum.java b/src/main/java/net/helix/pendulum/Pendulum.java
@@ -36,9 +36,9 @@
 import net.helix.pendulum.service.tipselection.impl.WalkerAlpha;
 import net.helix.pendulum.service.transactionpruning.TransactionPruningException;
 import net.helix.pendulum.service.transactionpruning.async.AsyncTransactionPruner;
-import net.helix.pendulum.service.validatomanager.impl.CandidateSolidifierImpl;
-import net.helix.pendulum.service.validatomanager.impl.CandidateTrackerImpl;
-import net.helix.pendulum.service.validatomanager.impl.ValidatorManagerServiceImpl;
+import net.helix.pendulum.service.validatormanager.impl.CandidateSolidifierImpl;
+import net.helix.pendulum.service.validatormanager.impl.CandidateTrackerImpl;
+import net.helix.pendulum.service.validatormanager.impl.ValidatorManagerServiceImpl;
 import net.helix.pendulum.storage.Indexable;
 import net.helix.pendulum.storage.Persistable;
 import net.helix.pendulum.storage.PersistenceProvider;

diff --git a/src/main/java/net/helix/pendulum/TransactionValidator.java b/src/main/java/net/helix/pendulum/TransactionValidator.java
@@ -257,7 +257,6 @@ public boolean checkSolidity(Hash hash, boolean milestone) throws Exception {
      * @throws Exception if anything goes wrong while trying to solidify the transaction
      */
     public boolean checkSolidity(Hash hash, boolean milestone, int maxProcessedTransactions) throws Exception {
-        //System.out.println("Check Solidity");
         if(fromHash(tangle, hash).isSolid()) {
             return true;
         }
@@ -275,7 +274,6 @@ public boolean checkSolidity(Hash hash, boolean milestone, int maxProcessedTrans
                 }
 
                 final TransactionViewModel transaction = fromHash(tangle, hashPointer);
-                //System.out.println(hashPointer.toString() + ", solid: " + transaction.isSolid() + ", has solid entry point: " + snapshotProvider.getInitialSnapshot().hasSolidEntryPoint(hashPointer));
                 if(!transaction.isSolid() && !snapshotProvider.getInitialSnapshot().hasSolidEntryPoint(hashPointer)) {
                     if (transaction.getType() == PREFILLED_SLOT) {
                         solid = false;
@@ -407,21 +405,17 @@ public void updateStatus(TransactionViewModel transactionViewModel) throws Excep
         transactionRequester.clearTransactionRequest(transactionViewModel.getHash());
         if(transactionViewModel.getApprovers(tangle).size() == 0) {
             tipsViewModel.addTipHash(transactionViewModel.getHash());
-            //System.out.println("Add Tip: " + transactionViewModel.getHash().hexString());
         } else {
             TransactionViewModel milestoneTx;
             if ((milestoneTx = transactionViewModel.isMilestoneBundle(tangle)) != null){
                 Set<Hash> parents = RoundViewModel.getMilestoneTrunk(tangle, transactionViewModel, milestoneTx);
                 parents.addAll(RoundViewModel.getMilestoneBranch(tangle, transactionViewModel, milestoneTx, config.getValidatorSecurity()));
                 for (Hash parent : parents){
                     tipsViewModel.removeTipHash(parent);
-                    //System.out.println("Remove Tip: " + parent.hexString());
                 }
             } else {
                 tipsViewModel.removeTipHash(transactionViewModel.getTrunkTransactionHash());
                 tipsViewModel.removeTipHash(transactionViewModel.getBranchTransactionHash());
-                //System.out.println("Remove Tip: " + transactionViewModel.getTrunkTransactionHash().hexString());
-                //System.out.println("Remove Tip: " + transactionViewModel.getBranchTransactionHash().hexString());
             }
         }
 
@@ -454,7 +448,6 @@ private boolean quietQuickSetSolid(TransactionViewModel transactionViewModel) {
      * @throws Exception
      */
     private boolean quickSetSolid(final TransactionViewModel transactionViewModel) throws Exception {
-        //System.out.println("Quick Set Solid");
         if(!transactionViewModel.isSolid()) {
             boolean solid = true;
             TransactionViewModel milestoneTx;

diff --git a/src/main/java/net/helix/pendulum/conf/APIConfig.java b/src/main/java/net/helix/pendulum/conf/APIConfig.java
@@ -52,11 +52,6 @@ public interface APIConfig extends Config {
      */
     String getRemoteAuth();
 
-    /**
-     * @return {@value Descriptions#IS_POW_DISABLED}
-     */
-    boolean isPoWDisabled();
-
     /**
      * @return {@value Descriptions#RESOURCE_PATH}
      */
@@ -73,7 +68,6 @@ interface Descriptions {
         String MAX_GET_TRANSACTION_STRINGS = "The maximal number of transaction strings that may be returned by the \"getTransactionStrings\" API call. If the number of transactions found exceeds this number an error will be returned.";
         String MAX_BODY_LENGTH = "The maximal number of characters the body of an API call may hold. If a request body length exceeds this number an error will be returned.";
         String REMOTE = "Open the API interface to any host. Equivalent to \"--api-host 0.0.0.0\"";
-        String IS_POW_DISABLED = "If pow is disabled the node will not require a valid nonce.";
         String RESOURCE_PATH = "Resource path";
     }
 }