rubixchain · gklps · Dec 8, 2021 · Dec 9, 2021 · Dec 9, 2021 · Dec 10, 2021
diff --git a/.idea/artifacts/java_rubix_core_jar.xml b/.idea/artifacts/java_rubix_core_jar.xml
diff --git a/.idea/libraries/IPFS.xml b/.idea/libraries/IPFS.xml
diff --git a/.idea/libraries/did_6_3.xml b/.idea/libraries/did_6_3.xml
diff --git a/.idea/libraries/rubix_9_9.xml b/.idea/libraries/rubix_9_9.xml
diff --git a/java-rubix-core.iml b/java-rubix-core.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="IPFS" level="project" />
-    <orderEntry type="library" exported="" name="java-cid-v1.1.0" level="project" />
+    <orderEntry type="library" name="rubix-9.9" level="project" />
+    <orderEntry type="library" name="did-6.3" level="project" />
   </component>
 </module>
diff --git a/out/artifacts/java_rubix_core_jar/java-rubix-core.jar b/out/artifacts/java_rubix_core_jar/java-rubix-core.jar
diff --git a/out/production/RubiX/com/rubix/AuthenticateNode/Authenticate.class b/out/production/RubiX/com/rubix/AuthenticateNode/Authenticate.class
diff --git a/out/production/RubiX/com/rubix/AuthenticateNode/SecretShare.class b/out/production/RubiX/com/rubix/AuthenticateNode/SecretShare.class
diff --git a/out/production/RubiX/com/rubix/AuthenticateNode/SplitShares.class b/out/production/RubiX/com/rubix/AuthenticateNode/SplitShares.class
diff --git a/out/production/RubiX/com/rubix/Consensus/InitiatorConsensus.class b/out/production/RubiX/com/rubix/Consensus/InitiatorConsensus.class
diff --git a/out/production/RubiX/com/rubix/Consensus/InitiatorProcedure.class b/out/production/RubiX/com/rubix/Consensus/InitiatorProcedure.class
diff --git a/out/production/RubiX/com/rubix/Consensus/QuorumConsensus.class b/out/production/RubiX/com/rubix/Consensus/QuorumConsensus.class
diff --git a/out/production/RubiX/com/rubix/Constants/ConsensusConstants.class b/out/production/RubiX/com/rubix/Constants/ConsensusConstants.class
diff --git a/out/production/RubiX/com/rubix/Constants/IPFSConstants.class b/out/production/RubiX/com/rubix/Constants/IPFSConstants.class
diff --git a/out/production/RubiX/com/rubix/Resources/Functions.class b/out/production/RubiX/com/rubix/Resources/Functions.class
diff --git a/out/production/RubiX/com/rubix/Resources/IPFSNetwork.class b/out/production/RubiX/com/rubix/Resources/IPFSNetwork.class
diff --git a/out/production/RubiX/com/rubix/SplitandStore/Recombine.class b/out/production/RubiX/com/rubix/SplitandStore/Recombine.class
diff --git a/out/production/RubiX/com/rubix/SplitandStore/SeperateShares.class b/out/production/RubiX/com/rubix/SplitandStore/SeperateShares.class
diff --git a/out/production/RubiX/com/rubix/SplitandStore/Split.class b/out/production/RubiX/com/rubix/SplitandStore/Split.class
diff --git a/out/production/java-rubix-core/com/rubix/AuthenticateNode/Authenticate.class b/out/production/java-rubix-core/com/rubix/AuthenticateNode/Authenticate.class
diff --git a/out/production/java-rubix-core/com/rubix/Consensus/InitiatorConsensus.class b/out/production/java-rubix-core/com/rubix/Consensus/InitiatorConsensus.class
diff --git a/out/production/java-rubix-core/com/rubix/Consensus/InitiatorProcedure.class b/out/production/java-rubix-core/com/rubix/Consensus/InitiatorProcedure.class
diff --git a/out/production/java-rubix-core/com/rubix/Consensus/QuorumConsensus.class b/out/production/java-rubix-core/com/rubix/Consensus/QuorumConsensus.class
diff --git a/out/production/java-rubix-core/com/rubix/Resources.zip b/out/production/java-rubix-core/com/rubix/Resources.zip
diff --git a/out/production/java-rubix-core/com/rubix/Resources/APIHandler.class b/out/production/java-rubix-core/com/rubix/Resources/APIHandler.class
diff --git a/out/production/java-rubix-core/com/rubix/Resources/Functions.class b/out/production/java-rubix-core/com/rubix/Resources/Functions.class
diff --git a/out/production/java-rubix-core/com/rubix/Resources/IPFSNetwork.class b/out/production/java-rubix-core/com/rubix/Resources/IPFSNetwork.class
diff --git a/out/production/java-rubix-core/com/rubix/TokenTransfer/ProofCredits.class b/out/production/java-rubix-core/com/rubix/TokenTransfer/ProofCredits.class
diff --git a/out/production/java-rubix-core/com/rubix/TokenTransfer/TokenReceiver.class b/out/production/java-rubix-core/com/rubix/TokenTransfer/TokenReceiver.class
diff --git a/out/production/java-rubix-core/com/rubix/TokenTransfer/TokenSender.class b/out/production/java-rubix-core/com/rubix/TokenTransfer/TokenSender.class
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.rubix.core</groupId>
+  <artifactId>rubixDataJar</artifactId>
+  <version>d0.3.01</version>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <plugins>
+   			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration> 
+            </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+  	<dependency>
+  		<groupId>com.did.core</groupId>
+  		<artifactId>did</artifactId>
+  		<scope>provided</scope>
+  	</dependency>
+  </dependencies>
+  <dependencyManagement>
+  	<dependencies>
+  		<dependency>
+  			<groupId>com.did.core</groupId>
+  			<artifactId>did</artifactId>
+  			<version>8.7</version>
+  		</dependency>
+  	</dependencies>
+  </dependencyManagement>
+</project>
diff --git a/src/com/rubix/AuthenticateNode/Authenticate.java b/src/com/rubix/AuthenticateNode/Authenticate.java
@@ -42,38 +42,12 @@ public class Authenticate {
 
     public static boolean verifySignature(String detailString) throws IOException, JSONException {
         PropertyConfigurator.configure(LOGGER_PATH + "log4jWallet.properties");
-
         verifyCount++;
         IPFS ipfs = new IPFS("/ip4/127.0.0.1/tcp/" + IPFS_PORT);
         JSONObject details = new JSONObject(detailString);
         String decentralizedID = details.getString("did");
         String hash = details.getString("hash");
-
-        String quorumSign;
-        String tokenSign;
-        String TIDSign;
-        JSONObject signs = new JSONObject();
-
-        if (details.optJSONObject(quorumSign) != null) {
-
-            JSONObject signatureObject = details.getJSONObject("signatures");
-            quorumSign = signatureObject.getString("QuorumSign");
-            tokenSign = signatureObject.getString("TokenSign");
-            TIDSign = signatureObject.getString("TIDSign");
-
-            signs.put(tokenSign, false);
-            signs.put(quorumSign, false);
-            signs.put(TIDSign, false);
-
-        } else {
-            // make all three params in JSONObject signs as true
-            signs.put(quorumSign, false);
-            signs.put(tokenSign, true);
-            signs.put(TIDSign, true);
-
-            quorumSign = details.getString("signature");
-        }
-
+        String signature = details.getString("signature");
         syncDataTable(decentralizedID, null);
         String walletIdIpfsHash = getValues(DATA_PATH + "DataTable.json", "walletHash", "didHash", decentralizedID);
         nodeData(decentralizedID, walletIdIpfsHash, ipfs);