Skip to content

Kati 2.3 #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gklps wants to merge 15 commits into
base: SHA-G-2.2
Choose a base branch
from
Open

Kati 2.3 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8f50063
Fork Resolution
aparna-ullas-97 Dec 3, 2022
bcd2e04
Fork Resolution
aparna-ullas-97 Dec 4, 2022
55434bb
Merge pull request #75 from rubixchain/feature/forkReolution
aparna-ullas-97 Dec 5, 2022
03364c0
5on&
gklps Dec 5, 2022
5c600ec
5on7
gklps Dec 5, 2022
74272ef
Merge pull request #76 from rubixchain/features/5on7
gklps Dec 5, 2022
ffaf697
Fixes
gklps Dec 5, 2022
00a008c
Merge pull request #77 from rubixchain/features/5on7
gklps Dec 5, 2022
ff61e7a
fixes
gklps Dec 6, 2022
0de8c35
Merge pull request #78 from rubixchain/features/5on7
KiranHRubix Dec 6, 2022
73c213c
Fork resolve - Bug Fixes
gklps Dec 7, 2022
7243d7e
Merge pull request #80 from rubixchain/features/forkResol
aparna-ullas-97 Dec 8, 2022
3a32abd
Bug fixes
gklps Dec 9, 2022
4b9e748
Merge pull request #81 from rubixchain/features/forkResol
gklps Dec 9, 2022
a44a2fb
Merge remote-tracking branch 'origin/SHA-G-2.2' into KATI-2.3
gklps Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,34 @@ tests/thunder-tests/backup/thunderEnvironment.db
.project
.settings/org.eclipse.jdt.core.prefs
java-rubix-core.iml
pom.xml
.idea/codeStyles/codeStyleConfig.xml
.idea/codeStyles/Project.xml
.idea/compiler.xml
.idea/jarRepositories.xml
.idea/libraries/Maven__com_did_core_did_8_8.xml
.idea/libraries/Maven__com_github_ipfs_java_ipfs_api_v1_3_3.xml
.idea/libraries/Maven__com_github_ipld_java_cid_v1_1_0.xml
.idea/libraries/Maven__com_github_multiformats_java_multiaddr_v1_3_1.xml
.idea/libraries/Maven__com_github_multiformats_java_multibase_v1_1_0.xml
.idea/libraries/Maven__com_github_multiformats_java_multihash_v1_1_0.xml
.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml
.idea/libraries/Maven__javax_json_javax_json_api_1_0.xml
.idea/libraries/Maven__junit_junit_4_10.xml
.idea/libraries/Maven__log4j_log4j_1_2_17.xml
.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk18on_1_71.xml
.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15to18_1_71.xml
.idea/libraries/Maven__org_bouncycastle_bcprov_jdk18on_1_71.xml
.idea/libraries/Maven__org_bouncycastle_bcutil_jdk18on_1_71.xml
.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
.idea/libraries/Maven__org_json_json_20220924.xml
.idea/misc.xml
.idea/modules.xml
KATI.iml
.idea/misc.xml
.idea/modules.xml
KATI.iml
.idea/misc.xml
.idea/modules.xml
KATI.iml
14 changes: 7 additions & 7 deletions src/com/rubix/Consensus/InitiatorConsensus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private static synchronized void quorumSign(String quorumDID, String hash, Strin
PropertyConfigurator.configure(LOGGER_PATH + "log4jWallet.properties");
synchronized (signLock) {
try {
if (quorumSignature.length() < (minQuorum(alphaSize) + 2 * minQuorum(7))
if (quorumSignature.length() < (minQuorum(alphaSize))
&& quorumResponse[index] <= minQuorum(quorumSize)) {
JSONObject jsonObject = new JSONObject();
JSONObject quorumMemberSign = new JSONObject();
Expand Down Expand Up @@ -147,7 +147,7 @@ private static synchronized void nftQuorumSign(String quorumDID, String hash, St
PropertyConfigurator.configure(LOGGER_PATH + "log4jWallet.properties");
synchronized (nftSignLock) {
try {
if (nftQuorumSignature.length() < (minQuorum(alphaSize) + 2 * minQuorum(7))
if (nftQuorumSignature.length() < (minQuorum(alphaSize))
&& nftQuorumResponse[index] <= minQuorum(quorumSize)) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("did", quorumDID);
Expand Down Expand Up @@ -290,7 +290,7 @@ public static JSONArray start(String data, IPFS ipfs, int PORT, int index, Strin
alphaSize);
quorumWithShares.add(quorumPeersObject.getString(j));
while (quorumSignature
.length() < (minQuorum(alphaSize) + 2 * minQuorum(7))) {
.length() < (minQuorum(alphaSize))) {
}
InitiatorConsensusLogger.debug("sending Qsign of length "
+ quorumSignature.length() + "at index " + index);
Expand Down Expand Up @@ -400,7 +400,7 @@ public static JSONArray start(String data, IPFS ipfs, int PORT, int index, Strin
alphaSize);
nftQuorumWithShares.add(quorumPeersObject.getString(j));
while (nftQuorumSignature
.length() < (minQuorum(alphaSize) + 2 * minQuorum(7))) {
.length() < (minQuorum(alphaSize))) {
}
InitiatorConsensusLogger.debug("NFT :sending Qsign of length "
+ nftQuorumSignature.length() + "at index " + index);
Expand Down Expand Up @@ -429,7 +429,7 @@ public static JSONArray start(String data, IPFS ipfs, int PORT, int index, Strin

while ((nftQuorumResponse[index] < minQuorum(quorumSize)
|| nftQuorumSignature
.length() < (minQuorum(alphaSize) + 2 * minQuorum(7)))) {
.length() < (minQuorum(alphaSize)))) {
}

} else {
Expand Down Expand Up @@ -506,7 +506,7 @@ public static JSONArray start(String data, IPFS ipfs, int PORT, int index, Strin
quorumSign(didHash, hash, quorumsPrivateShareSign, quorumsPrivateKeySign, index, quorumSize, alphaSize);
quorumWithShares.add(quorumPeersObject.getString(j));
while (quorumSignature
.length() < (minQuorum(alphaSize) + 2 * minQuorum(7))) {
.length() < (minQuorum(alphaSize))) {
}
InitiatorConsensusLogger.debug("sending Qsign of length "
+ quorumSignature.length() + "at index " + index);
Expand Down Expand Up @@ -545,7 +545,7 @@ public static JSONArray start(String data, IPFS ipfs, int PORT, int index, Strin
}

while (quorumResponse[index] < minQuorum(quorumSize)
|| quorumSignature.length() < (minQuorum(alphaSize) + 2 * minQuorum(7))) {
|| quorumSignature.length() < (minQuorum(alphaSize))) {
}
repo(ipfs);
} catch (JSONException e) {
Expand Down
24 changes: 3 additions & 21 deletions src/com/rubix/Consensus/InitiatorProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class InitiatorProcedure {
public static String essential;
public static String senderSignQ;
public static JSONObject payload = new JSONObject();
public static JSONArray alphaReply, betaReply, gammaReply;
public static JSONArray alphaReply;

public static Logger InitiatorProcedureLogger = Logger.getLogger(InitiatorProcedure.class);

Expand Down Expand Up @@ -168,38 +168,20 @@ public static void consensusSetUp(
}
});

Thread betaThread = new Thread(() -> {
try {
betaReply = InitiatorConsensus.start(dataSend.toString(), ipfs, PORT + 100, 1, "beta", betaList,
alphaSize, 7, operation);
} catch (JSONException e) {
e.printStackTrace();
}
});

Thread gammaThread = new Thread(() -> {
try {
gammaReply = InitiatorConsensus.start(dataSend.toString(), ipfs, PORT + 107, 2, "gamma", gammaList,
alphaSize, 7, operation);
} catch (JSONException e) {
e.printStackTrace();
}
});

InitiatorConsensus.quorumSignature = new JSONArray();
InitiatorConsensus.finalQuorumSignsArray = new JSONArray();
alphaThread.start();
betaThread.start();
gammaThread.start();

if (operation.equals("NFT")) {
while ((InitiatorConsensus.nftQuorumSignature.length() < ((minQuorum(alphaSize) + 2 * minQuorum(7))))) {
while ((InitiatorConsensus.nftQuorumSignature.length() < ((minQuorum(alphaSize))))) {
}
InitiatorProcedureLogger.debug(
"ABG NFT Consensus completed with length for NFT :" + InitiatorConsensus.nftQuorumSignature.length()
+ " RBT " + InitiatorConsensus.quorumSignature.length());
} else {
while (InitiatorConsensus.quorumSignature.length() < (minQuorum(alphaSize) + 2 * minQuorum(7))) {
while (InitiatorConsensus.quorumSignature.length() < (minQuorum(alphaSize))) {
}
InitiatorProcedureLogger
.debug("ABG Consensus completed with length " + InitiatorConsensus.quorumSignature.length());
Expand Down
37 changes: 35 additions & 2 deletions src/com/rubix/Ping/PingReceive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ public static String receive(String userType,int port) throws JSONException {
PingReceiverLogger.info(userType + " Pong Sent "+currentVersion);

}
else
if(pingRequest.contains("Get-TokenChain-Height")) {
else if(pingRequest.contains("Get-TokenChain-Height")) {
String tokenHash;
try {
tokenHash = input.readLine();
Expand Down Expand Up @@ -125,9 +124,43 @@ public static String receive(String userType,int port) throws JSONException {
height = chainArray.length()-1;
PingReceiverLogger.info("Chain height: " + height);
}
output.println(height);
}

}
else if(pingRequest.contains("Get-TokenChain")){
String tokenHash;
try {
tokenHash = input.readLine();
} catch (SocketException e) {
PingReceiverLogger.warn("Sender Stream Null - tokenHash");
APIResponse.put("did", "");
APIResponse.put("tid", "null");
APIResponse.put("status", "Failed");
APIResponse.put("message", "Sender Stream Null - tokenHash");

output.close();
input.close();
sk.close();
ss.close();
return APIResponse.toString();

}
if (tokenHash != null && tokenHash.startsWith("Qm") && tokenHash.length() == 46) {
JSONArray tokenChain;
PingReceiverLogger.info("Token chain height requested for: " + tokenHash);
File tokenChainFile = new File(TOKENCHAIN_PATH.concat(tokenHash).concat(".json"));
if(!tokenChainFile.exists()) {
PingReceiverLogger.info("Token chain file not found");
tokenChain = new JSONArray();
}
else{
String tokenChainFileContent = readFile(TOKENCHAIN_PATH.concat(tokenHash).concat(".json"));
tokenChain = new JSONArray(tokenChainFileContent);
}
output.println(tokenChain);
}
}
else{
APIResponse.put("status", "Failed");
APIResponse.put("message", "Request Failed");
Expand Down
Loading