upgrade to v0.4.1

Author: vuapo-eth

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.qubiclite</groupId>
     <artifactId>qlite.lib.java</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.4.1</version>
     <packaging>pom</packaging>
     <name>QLite</name>
     <description>The Qubic Lite library provides a framework to interact with the Qubic Lite protocol by creating, reading and processing qubics.</description>

qlite/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.qubiclite</groupId>
         <artifactId>qlite.lib.java</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <version>0.4.1</version>
     </parent>
 
     <name>QLite : Library</name>

qlite/src/main/java/constants/GeneralConstants.java

@@ -2,7 +2,7 @@
 
 public class GeneralConstants {
 
-    public static final String VERSION = "ql-0.4-SNAPSHOT";
+    public static final String VERSION = "ql-0.4.1";
 
     public static final int QLVM_MAX_VALUE_LENGTH = 5000;
 

qlite/src/main/java/oracle/Assembly.java

@@ -1,6 +1,7 @@
 package oracle;
 
 import jota.model.Transaction;
+import oracle.statements.StatementType;
 import oracle.statements.result.ResultStatement;
 import oracle.statements.StatementIAMIndex;
 import qubic.QubicReader;
@@ -21,6 +22,8 @@ public class Assembly {
     private final ConsensusBuilder consensusBuilder = new ConsensusBuilder(this);
     private int[] ratings;
 
+    private int firstEpochIndex = -1; // epoch at which the oracle started monitoring the qubic epochs. necessary to decide when to use InterQubicResultFetcher for own assembly
+
     public Assembly(QubicReader qubicReader) {
         this.qubicReader = qubicReader;
     }
@@ -43,6 +46,8 @@ public void addOracles(List<String> oracleIDs) {
      * TODO optimize fetching by putting all findTransaction() requests into a single API call
      * */
     public void fetchStatements(List<OracleReader> selection, StatementIAMIndex index) {
+        if(firstEpochIndex < 0 && index.getStatementType() == StatementType.RESULT_STATEMENT)
+            firstEpochIndex = index.getEpoch();
 
         String[] addresses = buildStatementAddresses(selection, index);
 
@@ -126,6 +131,10 @@ public List<OracleReader> selectRandomOracleReaders(int amount) {
         return selection;
     }
 
+    public boolean hasMonitoredEpoch(int epochIndex) {
+        return firstEpochIndex >= 0 && firstEpochIndex <= epochIndex;
+    }
+
     /**
      * @return amount of oracles in the assembly
      * */

qlite/src/main/java/oracle/ConsensusBuilder.java

@@ -47,10 +47,10 @@ public QuorumBasedResult buildConsensus(List<OracleReader> selection, int epochI
         if(epochIndex < 0 || epochIndex > assembly.getQubicReader().lastCompletedEpoch())
             return new QuorumBasedResult(0, selection.size(),null);
 
-        // TODO decide whether this is okay when using probabilistic quorum
         // return result from history if already determined -> increases efficiency
         if(alreadyDeterminedQuorumBasedResults.keySet().contains(epochIndex))
             return alreadyDeterminedQuorumBasedResults.get(epochIndex);
+
         // empty assembly
         if(selection.size() == 0)
             return new QuorumBasedResult(0, 0, null);
@@ -63,6 +63,11 @@ public QuorumBasedResult buildConsensus(List<OracleReader> selection, int epochI
 
         return quorumBasedResult;
     }
+
+    public boolean hasAlreadyDeterminedQuorumBasedResult(int epochIndex) {
+        return alreadyDeterminedQuorumBasedResults.containsKey(epochIndex);
+    }
+
     public QuorumBasedResult buildIAMConsensus(IAMIndex index) {
         List<IAMReader> selection = new LinkedList<>();
         for(OracleReader or : assembly.selectRandomOracleReaders(GeneralConstants.QUORUM_MAX_ORACLE_SELECTION_SIZE))
@@ -90,7 +95,7 @@ private static Map<String, Double> accumulateIAMVotings(List<IAMReader> voters,
     private static void addOraclesVoteToVoting(OracleReader oracleReader, int epochIndex, Map<String, Double> voting) {
         oracleReader.getHashStatementReader().read(epochIndex);
         ResultStatement resultStatement = oracleReader.getResultStatementReader().read(epochIndex);
-        System.out.println(oracleReader.getID() + " " + (resultStatement != null ? resultStatement.isHashStatementValid() : "_") + " " + epochIndex);
+
         if(resultStatement != null && resultStatement.isHashStatementValid())
             addVote(voting, resultStatement.getContent());
     }

qlite/src/main/java/oracle/OracleManager.java

@@ -30,8 +30,9 @@ public void run() {
         }.start();
     }
 
+
     /**
-     * Runs the oracle life cycle synchronously as opposted to start().
+     * Runs the oracle life cycle synchronously as opposed to start().
      * */
     public void startSynchronous() {
 

qlite/src/main/java/oracle/OracleWriter.java

@@ -31,7 +31,6 @@ public class OracleWriter {
     private final HastStatementWriter hashStatementWriter;
     private final ResultStatementWriter resultStatementWriter;
 
-    private int firstEpochIndex = -1; // epoch at which the oracle started monitoring the qubic epochs. necessary to decide when to use InterQubicResultFetcher for own assembly
     private String name = "ql-node";
     private final LinkedList<OracleListener> oracleListeners = new LinkedList<>();
 
@@ -66,8 +65,6 @@ public OracleWriter(QubicReader qubicReader, IAMWriter writer) {
      * @param epochIndex index of the current epoch
      * */
     public void doHashStatement(int epochIndex) {
-        if(firstEpochIndex < 0)
-            firstEpochIndex = epochIndex;
 
         if(epochIndex > 0)
             fetchStatements(new ResultStatementIAMIndex(epochIndex-1));

qlite/src/main/java/qlvm/InterQubicResultFetcher.java

@@ -49,8 +49,10 @@ public static QuorumBasedResult fetchResult(QubicReader qubicReader, int epochIn
 
     private static QuorumBasedResult findConsensus(Assembly assembly, int epochIndex) {
         List<OracleReader> selection = assembly.selectRandomOracleReaders(GeneralConstants.QUORUM_MAX_ORACLE_SELECTION_SIZE);
-        assembly.fetchStatements(selection, new HashStatementIAMIndex(epochIndex));
-        assembly.fetchStatements(selection, new ResultStatementIAMIndex(epochIndex));
+        if(!assembly.getConsensusBuilder().hasAlreadyDeterminedQuorumBasedResult(epochIndex)) {
+            assembly.fetchStatements(selection, new HashStatementIAMIndex(epochIndex));
+            assembly.fetchStatements(selection, new ResultStatementIAMIndex(epochIndex));
+        }
         return assembly.getConsensusBuilder().buildConsensus(selection, epochIndex);
     }
 

qlite/src/main/java/qlvm/functions/qubic/FunctionQubicFetch.java

@@ -1,11 +1,13 @@
 package qlvm.functions.qubic;
 
+import oracle.OracleWriter;
 import qlvm.InterQubicResultFetcher;
 import oracle.QuorumBasedResult;
 import qlvm.QLVM;
 import qlvm.exceptions.runtime.QLRunTimeException;
 import qlvm.exceptions.runtime.UnknownFunctionException;
 import qlvm.functions.Function;
+import qubic.QubicWriter;
 
 public class FunctionQubicFetch extends Function {
 
@@ -25,8 +27,10 @@ public String call(QLVM qlvm, String[] par) {
 
         QuorumBasedResult qbr;
 
-        if(qubicRoot.equals(qlvm.getOracleWriter().getQubicReader().getID()))
-            qbr = qlvm.getOracleWriter().getAssembly().getConsensusBuilder().buildConsensus(epochIndex);
+        OracleWriter oracleWriter = qlvm.getOracleWriter();
+
+        if(qubicRoot.equals(oracleWriter.getQubicReader().getID()) && oracleWriter.getAssembly().hasMonitoredEpoch(epochIndex))
+            qbr = oracleWriter.getAssembly().getConsensusBuilder().buildConsensus(epochIndex);
         else
             qbr = InterQubicResultFetcher.fetchResult(qubicRoot, epochIndex);