vhad/iota.lib.java
1
0
Fork 0
mirror of https://github.com/gosticks/iota.lib.java.git synced 2025-10-16 11:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #42 from schierlm/update-local-pow

Browse Source 
Update PearlDiver to 81 rounds
This commit is contained in:
Oliver Nitzschke 2017-09-25 17:41:53 +02:00 committed by GitHub
commit 3c10351724
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/cfb/pearldiver/PearlDiver.java
View File

@ -80,14 +80,42 @@ public class PearlDiver {
transform(midCurlStateLow, midCurlStateHigh, curlScratchpadLow, curlScratchpadHigh);
}
midCurlStateLow[0] = 0b1101101101101101101101101101101101101101101101101101101101101101L;
midCurlStateHigh[0] = 0b1011011011011011011011011011011011011011011011011011011011011011L;
midCurlStateLow[1] = 0b1111000111111000111111000111111000111111000111111000111111000111L;
midCurlStateHigh[1] = 0b1000111111000111111000111111000111111000111111000111111000111111L;
midCurlStateLow[2] = 0b0111111111111111111000000000111111111111111111000000000111111111L;
midCurlStateHigh[2] = 0b1111111111000000000111111111111111111000000000111111111111111111L;
midCurlStateLow[3] = 0b1111111111000000000000000000000000000111111111111111111111111111L;
midCurlStateHigh[3] = 0b0000000000111111111111111111111111111111111111111111111111111111L;
for (int i = 0; i < 162; i++) {
switch (transactionTrits[offset++]) {
case 0: {
midCurlStateLow[i] = 0b1111111111111111111111111111111111111111111111111111111111111111L;
midCurlStateHigh[i] = 0b1111111111111111111111111111111111111111111111111111111111111111L;
}
break;
case 1: {
midCurlStateLow[i] = 0b0000000000000000000000000000000000000000000000000000000000000000L;
midCurlStateHigh[i] = 0b1111111111111111111111111111111111111111111111111111111111111111L;
}
break;
default: {
midCurlStateLow[i] = 0b1111111111111111111111111111111111111111111111111111111111111111L;
midCurlStateHigh[i] = 0b0000000000000000000000000000000000000000000000000000000000000000L;
}
}
}
midCurlStateLow[162 + 0] = 0b1101101101101101101101101101101101101101101101101101101101101101L;
midCurlStateHigh[162 + 0] = 0b1011011011011011011011011011011011011011011011011011011011011011L;
midCurlStateLow[162 + 1] = 0b1111000111111000111111000111111000111111000111111000111111000111L;
midCurlStateHigh[162 + 1] = 0b1000111111000111111000111111000111111000111111000111111000111111L;
midCurlStateLow[162 + 2] = 0b0111111111111111111000000000111111111111111111000000000111111111L;
midCurlStateHigh[162 + 2] = 0b1111111111000000000111111111111111111000000000111111111111111111L;
midCurlStateLow[162 + 3] = 0b1111111111000000000000000000000000000111111111111111111111111111L;
midCurlStateHigh[162 + 3] = 0b0000000000111111111111111111111111111111111111111111111111111111L;
}
if (numberOfThreads <= 0) {
@ -109,14 +137,14 @@ public class PearlDiver {
System.arraycopy(midCurlStateHigh, 0, midCurlStateCopyHigh, 0, CURL_STATE_LENGTH);
for (int i = threadIndex; i-- > 0; ) {
increment(midCurlStateCopyLow, midCurlStateCopyHigh, CURL_HASH_LENGTH / 3, (CURL_HASH_LENGTH / 3) * 2);
increment(midCurlStateCopyLow, midCurlStateCopyHigh, 162 + CURL_HASH_LENGTH / 9, 162 + (CURL_HASH_LENGTH / 9) * 2);
}
final long[] curlStateLow = new long[CURL_STATE_LENGTH], curlStateHigh = new long[CURL_STATE_LENGTH];
final long[] curlScratchpadLow = new long[CURL_STATE_LENGTH], curlScratchpadHigh = new long[CURL_STATE_LENGTH];
while (state == RUNNING) {
increment(midCurlStateCopyLow, midCurlStateCopyHigh, (CURL_HASH_LENGTH / 3) * 2, CURL_HASH_LENGTH);
increment(midCurlStateCopyLow, midCurlStateCopyHigh, 162 + CURL_HASH_LENGTH / 9, 162 + (CURL_HASH_LENGTH / 9) * 2);
System.arraycopy(midCurlStateCopyLow, 0, curlStateLow, 0, CURL_STATE_LENGTH);
System.arraycopy(midCurlStateCopyHigh, 0, curlStateHigh, 0, CURL_STATE_LENGTH);
transform(curlStateLow, curlStateHigh, curlScratchpadLow, curlScratchpadHigh);
@ -172,7 +200,7 @@ public class PearlDiver {
private static void transform(final long[] curlStateLow, final long[] curlStateHigh, final long[] curlScratchpadLow, final long[] curlScratchpadHigh) {
int curlScratchpadIndex = 0;
for (int round = 27; round-- > 0; ) {
for (int round = 81; round-- > 0; ) {
System.arraycopy(curlStateLow, 0, curlScratchpadLow, 0, CURL_STATE_LENGTH);
System.arraycopy(curlStateHigh, 0, curlScratchpadHigh, 0, CURL_STATE_LENGTH);

5
src/main/java/jota/IotaAPICore.java
View File

@ -202,6 +202,11 @@ public class IotaAPICore {
Transaction txn = new Transaction(trytes[i]);
txn.setTrunkTransaction(previousTransaction == null ? trunkTransaction : previousTransaction);
txn.setBranchTransaction(previousTransaction == null ? branchTransaction : trunkTransaction);
if (txn.getTag().isEmpty() || txn.getTag().matches("9*"))
txn.setTag(txn.getObsoleteTag());
txn.setAttachmentTimestamp(System.currentTimeMillis() / 1000L);
txn.setAttachmentTimestampLowerBound(0);
txn.setAttachmentTimestampUpperBound(3_812_798_742_493L);
resultTrytes[i] = localPoW.performPoW(txn.toTrytes(), minWeightMagnitude);
previousTransaction = new Transaction(resultTrytes[i]).getHash();
}