Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
190 commits
Select commit Hold shift + click to select a range
a97b9bb
reciever checks
n1dhn Feb 18, 2022
ffb4848
cleanup token rec
n1dhn Feb 18, 2022
ff351ee
initiator checks
n1dhn Feb 21, 2022
f9e9086
transfer error code fix
n1dhn Feb 22, 2022
14882c4
comments for RBT receiver check
n1dhn Feb 22, 2022
fa2a5cb
staking communications
n1dhn Feb 24, 2022
4aa6396
staking lock
n1dhn Feb 24, 2022
99b1050
15 quorum signatures and staking signatures to tokenchain
n1dhn Feb 25, 2022
26b7728
current owner check
n1dhn Feb 25, 2022
b44a8d8
Fix signature exchange during staking
n1dhn Mar 2, 2022
7e22856
combine whole token checks
n1dhn Mar 3, 2022
11b6380
Sanity & Receiver Check Integration
n1dhn Mar 3, 2022
b64a70c
fix staking quorum picking
n1dhn Mar 3, 2022
039478d
better comments
n1dhn Mar 4, 2022
8b73b97
Fix revert
n1dhn Mar 9, 2022
c39bc17
Merge branch 'mining-pledge' of https://github.com/rubixchain/rubixco…
n1dhn Mar 9, 2022
611f74b
initHash changes
n1dhn Mar 14, 2022
03ca07d
checksum fix
KiranHRubix Mar 15, 2022
b6a11df
rec check merge
n1dhn Mar 16, 2022
1bb6adc
var conts
n1dhn Mar 16, 2022
dd4c2d2
quorum consensus staking: recode
n1dhn Mar 17, 2022
2afc5c3
stake module - initiate 1/
n1dhn Mar 18, 2022
af55319
kappa 6 test
n1dhn Mar 19, 2022
8c9ecaf
valdiating stake tokens 2/
n1dhn Mar 19, 2022
c59527d
added logs on staking 4/
n1dhn Mar 19, 2022
1770b86
arrange stake res
n1dhn Mar 19, 2022
16bc3b1
response fix staking consensus
n1dhn Mar 20, 2022
f25655c
quorum connection check
n1dhn Mar 20, 2022
06afcc1
fix thread issue
n1dhn Mar 20, 2022
e0ca337
staking logic complete comm.
n1dhn Mar 20, 2022
5d637bc
staking order fix
n1dhn Mar 21, 2022
96bd402
receiver side logic for staking
n1dhn Mar 22, 2022
3f44f44
staked token check correction
n1dhn Mar 22, 2022
fff80bc
debug stats staking signs
n1dhn Mar 22, 2022
134f518
minted token level check
n1dhn Mar 23, 2022
9cb6103
staking error messages
n1dhn Mar 23, 2022
f3f5e92
ipfs content in tokenchain block
n1dhn Mar 23, 2022
bc8725c
rec check update
n1dhn Mar 23, 2022
88fd669
fix debug statement in quorum consensus
n1dhn Mar 24, 2022
080a94f
token-authenticity merge
n1dhn Mar 24, 2022
ee1adf0
token reciever check sort
n1dhn Mar 24, 2022
01159df
revert token auth check
n1dhn Mar 24, 2022
aa5cfa3
QST duplicate check
n1dhn Mar 26, 2022
46ebaaf
fix: credit duplicate check
n1dhn Mar 26, 2022
70836a9
fixed: staking timeout
n1dhn Mar 28, 2022
601f226
wait for quorum to finish
n1dhn Mar 28, 2022
3a1e1c5
fix qsContent object
n1dhn Mar 28, 2022
ce92f9b
fix signContent
n1dhn Mar 28, 2022
5a8d304
private share image path
n1dhn Mar 28, 2022
42f9f29
fixed err messages in staking
n1dhn Mar 29, 2022
c135d52
fix socket res validation
n1dhn Mar 29, 2022
abdbd98
fix bnk
n1dhn Mar 29, 2022
d1852af
TC type error
n1dhn Mar 29, 2022
8008e52
extra checks before exiting staking
n1dhn Mar 29, 2022
939244b
hold PC for completing staking
n1dhn Mar 29, 2022
f193448
Fix .equals() instead of ==
n1dhn Mar 30, 2022
59e0bc2
extra logs
n1dhn Mar 30, 2022
b4e418d
rm while loop in PC
n1dhn Mar 30, 2022
ea6e818
sign length condition in stake consensus
n1dhn Mar 30, 2022
d0d92e1
fix rec check 1/2
n1dhn Mar 31, 2022
9da2d28
stopping staked token
n1dhn Mar 31, 2022
1fb661e
fix PC check
n1dhn Mar 31, 2022
cda112b
added PC while loop
n1dhn Mar 31, 2022
4d9ae4f
added sender detail to stake data object in TC
n1dhn Mar 31, 2022
742b650
sender data in staking data TC
n1dhn Mar 31, 2022
9f3da09
traverse through multiple tokens to find stake token
n1dhn Apr 1, 2022
6445df8
quorum response to staking fix
n1dhn Apr 1, 2022
ef723b0
rm stake token height check for now
n1dhn Apr 1, 2022
c20a0af
fix: fetching tid from genesisBlock
n1dhn Apr 1, 2022
27a553e
rm mine credit check for testing
n1dhn Apr 1, 2022
3e3bf9f
stake failed count
n1dhn Apr 1, 2022
0eede73
exiting staking
n1dhn Apr 1, 2022
28bb1a6
exit condition for staking failed
n1dhn Apr 1, 2022
1ec30c1
rm staked token in sender side
n1dhn Apr 1, 2022
e27a494
update advisory node endpoints
n1dhn Apr 4, 2022
9b88c8c
bug fixes
n1dhn Apr 4, 2022
03e9504
rm tokenAvailableToStake check
n1dhn Apr 4, 2022
63a52c5
Included Token Hash
anuk1184 Apr 5, 2022
fae1e34
rm LEVEL_VALID check
n1dhn Apr 5, 2022
e705fd6
3/5 staking
n1dhn Apr 5, 2022
701fa2f
Merge branch 'mining-pledge' of https://github.com/rubixchain/rubixco…
n1dhn Apr 5, 2022
7c92751
rm stake token length requirement
n1dhn Apr 5, 2022
63fc115
token receiver fix
n1dhn Apr 5, 2022
c30742b
genesis signature check for older tokens
n1dhn Apr 5, 2022
3bcdae7
genesis sign check only for TC with block number
n1dhn Apr 5, 2022
adf9ff6
moved genesis token check to level number
n1dhn Apr 5, 2022
d798b56
stake token height check correction
n1dhn Apr 5, 2022
4630b1c
stake token height ping mined token
n1dhn Apr 5, 2022
c0480f9
fix mine id sign
n1dhn Apr 5, 2022
35b2b99
test result merge
n1dhn Apr 5, 2022
f8fad44
test code cleanup for 3/5
n1dhn Apr 5, 2022
1a7ca43
fix: org.json.JSONException: JSONObject["QmcNLiFF6eWJssko9GY7Rm4NMyrb…
n1dhn Apr 5, 2022
09f4541
fix while check in stake consensus thread
n1dhn Apr 5, 2022
be23428
fix 2/2: while check in stake consensus
n1dhn Apr 5, 2022
1dff2f5
do while outside forloop
n1dhn Apr 5, 2022
47dc0c3
DID in stakeConsensus logs
n1dhn Apr 5, 2022
58ad1e0
quorum check token in log
n1dhn Apr 5, 2022
0ec3088
check new token from genesis obj
n1dhn Apr 5, 2022
c4b8eb9
4x level height check in staked token transfer
n1dhn Apr 6, 2022
7d31388
ping check with initHash()
n1dhn Apr 8, 2022
14bb070
/getQuorum check before getting token hash
n1dhn Apr 8, 2022
e738a59
Updated Windows Sanity Check
gklps Apr 10, 2022
24d82b7
fix quorum sign content fetch error
n1dhn Apr 11, 2022
10fc568
staking update
n1dhn Apr 12, 2022
ecbf63b
commented unwanted code
anuk1184 Apr 12, 2022
f8c44a4
receiver check update for single genesis object change
n1dhn Apr 12, 2022
0d97fef
fix mined token height dulication
n1dhn Apr 12, 2022
d1ad9b5
fix rec check for staked token
n1dhn Apr 12, 2022
1c0b84a
revert change to STAKE_FAILED variable
n1dhn Apr 12, 2022
95ac93f
exit condition fix
n1dhn Apr 12, 2022
aa107f2
issue fix - fetched Mining data based on the new format
anuk1184 Apr 13, 2022
2387866
Mined token was nt able to transfer - fixed
anuk1184 Apr 13, 2022
15075a7
Included check to verify if staked token is available
anuk1184 Apr 13, 2022
dd73170
Excluded Path in check for Version Compatibility
anuk1184 Apr 15, 2022
51da0b0
hash table for token rec
n1dhn Apr 16, 2022
d2e385e
hash table check
n1dhn Apr 16, 2022
82fe3d5
included socket time out
anuk1184 Apr 18, 2022
f83a99b
Merge branch 'mining-pledge' of https://github.com/rubixchain/rubixco…
anuk1184 Apr 18, 2022
7c6e02e
checking token content to get token number
n1dhn Apr 18, 2022
ea6265c
fetching level and number hash based on 64 char length
n1dhn Apr 18, 2022
5b9c76c
Update file check
gklps Apr 18, 2022
b47b8c7
added getVersion in functions.java
KiranHRubix Apr 18, 2022
712b680
updated selectParts line 239 Tokensender
KiranHRubix Apr 18, 2022
274c5f3
Merge branch 'mining-pledge' of https://github.com/rubixchain/rubixco…
KiranHRubix Apr 18, 2022
34dda0c
updated json array while selecting parts
KiranHRubix Apr 18, 2022
6b678d2
Revert "updated json array while selecting parts"
gklps Apr 18, 2022
5dcebf0
Revert "added getVersion in functions.java"
gklps Apr 18, 2022
3e85571
getVersionUpdate
gklps Apr 18, 2022
521b36b
hash chain functions
n1dhn Apr 19, 2022
61e6307
Updated transcation issues
gklps Apr 19, 2022
1e4ebf5
Merge branch 'mining-pledge' into mining-pledge-updateVersionCheck
gklps Apr 19, 2022
3dbd133
Merge pull request #26 from rubixchain/mining-pledge-updateVersionCheck
gklps Apr 19, 2022
1c6ea0f
hashchain iteration
n1dhn Apr 20, 2022
7b0f238
Merge branch 'mining-pledge' of https://github.com/rubixchain/rubixco…
n1dhn Apr 20, 2022
22ae9d4
updated java standards in HashChain class
KiranHRubix Apr 20, 2022
94f2b98
+ logger
n1dhn Apr 20, 2022
c6dab72
substring array size fix
n1dhn Apr 20, 2022
e226724
fix array error to match strings
n1dhn Apr 20, 2022
199a818
fix boolean error
n1dhn Apr 20, 2022
b7996b6
change match rule from 3 to 1
n1dhn Apr 21, 2022
e16a6cc
Updated for Kappa 62.1.7
gklps Apr 21, 2022
707551e
Merge branch 'mining-pledge-updateVersionCheck' of https://github.com…
gklps Apr 21, 2022
847dc65
Revert "Merge branch 'mining-pledge-updateVersionCheck' of https://gi…
gklps Apr 21, 2022
9967b50
match only one DID instead of 3 staked DIDs
n1dhn Apr 22, 2022
9aef705
update logic
n1dhn Apr 22, 2022
fb84d4a
iter hashchain rule
n1dhn Apr 28, 2022
01be836
Add files via upload
gklps Apr 28, 2022
d508d00
Merge pull request #27 from rubixchain/mining-pledge-updateVersionCheck
gklps Apr 28, 2022
cc19041
adding pom
gklps Apr 28, 2022
5845b50
Revert "adding pom"
gklps Apr 28, 2022
242c99f
Merge branch 'mining-pledge' of https://github.com/rubixchain/rubixco…
gklps Apr 28, 2022
eb941c8
Revert "Revert "adding pom""
gklps Apr 28, 2022
af48553
Revert "Merge pull request #27 from rubixchain/mining-pledge-updateVe…
gklps Apr 28, 2022
1075578
Mining Pledge to include updated PingCheck
gklps Apr 28, 2022
8d0fc28
hashchain print stm
n1dhn Apr 28, 2022
c6c4d69
length fix
n1dhn Apr 28, 2022
b5e5439
rm pom
n1dhn Apr 29, 2022
20f3002
rm yml
n1dhn Apr 29, 2022
412e48b
fix parts transfer check in staking check loop
n1dhn May 2, 2022
5f712e3
fix missing import
n1dhn May 2, 2022
2cc9ff2
hashchain iter
n1dhn May 9, 2022
d47f076
reverse hashchain
n1dhn May 10, 2022
1cfb076
fix func name
n1dhn May 10, 2022
e366a6a
fix method access
n1dhn May 10, 2022
8d78bf0
averaging puzzle
n1dhn May 10, 2022
78f42a0
dynamic match rule
n1dhn May 10, 2022
771541f
hashchain cleanup
n1dhn May 10, 2022
b362c02
Updated HashChain Consistency
gklps May 12, 2022
34cef7f
moving updateQuorum to bottom
n1dhn May 23, 2022
6d78a38
Merge branch 'mining-pledge' of https://github.com/rubixchain/rubixco…
n1dhn May 23, 2022
28ea110
API for updating owner identity
Allen-Cherian May 25, 2022
2dddf99
HashChain + Multiple pin check from sender side
gklps May 30, 2022
f8d3fae
MultiPinCheck & TknAuth
gklps Jun 2, 2022
7f9453f
Implemented SAnity Check in Mining,
anuk1184 Jun 2, 2022
d35a7b2
Included Methods to check SHA256 and check token Authenticity
anuk1184 Jun 13, 2022
4018e26
Included a method to return the token number for the given tokenHash
anuk1184 Jun 13, 2022
f5e0632
added brk stmnt
anuk1184 Jun 13, 2022
24f44b7
Fixed Dual Commit ISsue
anuk1184 Jun 13, 2022
f64c19e
Handled Null for Input stream ...
anuk1184 Jun 14, 2022
795ea29
Included Token Authenticity Check
anuk1184 Jun 14, 2022
4c6a44b
Token file missing - bug fix
anuk1184 Jun 16, 2022
73f39cb
Token Authenticity check - bug fix
anuk1184 Jun 17, 2022
e0abedf
Token Authentication and Dual commit - Bug fix
anuk1184 Jun 17, 2022
7ed0005
Tokens file writing - Bug fix
anuk1184 Jun 21, 2022
aa4d369
Included Multiple Pin check, Sender and Receiver check in Quorum list
anuk1184 Jun 21, 2022
02f9583
Token Authentication - Bug Fix
anuk1184 Jun 23, 2022
e4c781b
Mining Issue fix
anuk1184 Jun 27, 2022
0b5c972
Updated TokenReceiver to fix Exception
gklps Jun 28, 2022
4bbe6f1
Stake token checks
gklps Jun 29, 2022
0429a73
changed 6 digit Mining rule to 7 digit
anuk1184 Jul 1, 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
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,16 @@ tests/thunder-tests/thunderActivity.db
tests/thunder-tests/thunderclient.db
tests/thunder-tests/thunderCollection.db
tests/thunder-tests/thunderEnvironment.db
tests/thunder-tests/thunderActivity.json
tests/thunder-tests/thunderclient.json
tests/thunder-tests/thunderCollection.json
tests/thunder-tests/thunderEnvironment.json
tests/thunder-tests/backup/thunderActivity.db
tests/thunder-tests/backup/thunderclient.db
tests/thunder-tests/backup/thunderCollection.db
tests/thunder-tests/backup/thunderEnvironment.db
/target/
.classpath
.project
.settings/org.eclipse.jdt.core.prefs
java-rubix-core.iml
20 changes: 20 additions & 0 deletions .idea/libraries/java_cid_v1_1_0.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions java-rubix-core.iml

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified out/production/RubiX/com/rubix/Consensus/QuorumConsensus.class
Binary file not shown.
Binary file modified out/production/RubiX/com/rubix/Constants/ConsensusConstants.class
Binary file not shown.
Binary file modified out/production/RubiX/com/rubix/Constants/IPFSConstants.class
Binary file not shown.
Binary file modified out/production/RubiX/com/rubix/Resources/Functions.class
Binary file not shown.
Binary file modified out/production/RubiX/com/rubix/Resources/IPFSNetwork.class
Binary file not shown.
Binary file modified out/production/RubiX/com/rubix/SplitandStore/Recombine.class
Binary file not shown.
Binary file not shown.
Binary file modified out/production/RubiX/com/rubix/SplitandStore/Split.class
Binary file not shown.
33 changes: 4 additions & 29 deletions src/com/rubix/AuthenticateNode/Authenticate.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -88,9 +62,9 @@ public static boolean verifySignature(String detailString) throws IOException, J
JSONObject P = randomPositions("verifier", hash, 32, SenderSign);
int[] posForSign = (int[]) P.get("posForSign");
int[] originalPos = (int[]) P.get("originalPos");
for (int positionsLevelTwoTrail : posForSign)
for (int positionsLevelTwoTrail : posForSign) {
senderWalletID.append(walletID.charAt(positionsLevelTwoTrail));

}
String recombinedResult = PropImage.getpos(senderWalletID.toString(), signature);
int[] positionsLevelZero = new int[32];

Expand All @@ -100,6 +74,7 @@ public static boolean verifySignature(String detailString) throws IOException, J
StringBuilder decentralizedIDForAuth = new StringBuilder();
for (int value : positionsLevelZero)
decentralizedIDForAuth.append(senderDIDBin.charAt(value));

if (recombinedResult.equals(decentralizedIDForAuth.toString())) {
return true;
} else {
Expand Down
Loading