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

bugfix

Browse Source
This commit is contained in:
Andreas C. Osowski 2017-10-21 20:41:42 +02:00
parent d14c793c0a
commit 81e8a09f94
No known key found for this signature in database
GPG Key ID: E08FD8F395AADFB8
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/jota/model/Bundle.java
View File

@ -89,11 +89,17 @@ public class Bundle implements Comparable<Bundle> {
* @param customCurl The custom curl. * @param customCurl The custom curl.
*/ */
public void finalize(ICurl customCurl) { public void finalize(ICurl customCurl) {
ICurl curl;
int[] normalizedBundleValue;
int[] hash = new int[243];
int[] obsoleteTagTrits = new int[81];
String hashInTrytes;
boolean valid = true;
curl = customCurl == null ? SpongeFactory.create(SpongeFactory.Mode.KERL) : customCurl;
do {
curl.reset();
ICurl curl = customCurl == null ? SpongeFactory.create(SpongeFactory.Mode.KERL) : customCurl; for (int i = 0; i < this.getTransactions().size(); i++) {
curl.reset();
for (int i = 0; i < this.getTransactions().size(); i++) {
int[] valueTrits = Converter.trits(this.getTransactions().get(i).getValue(), 81); int[] valueTrits = Converter.trits(this.getTransactions().get(i).getValue(), 81);
@ -110,11 +116,24 @@ public class Bundle implements Comparable<Bundle> {
int[] t = Converter.trits(this.getTransactions().get(i).getAddress() + Converter.trytes(valueTrits) + this.getTransactions().get(i).getObsoleteTag() + Converter.trytes(timestampTrits) + Converter.trytes(currentIndexTrits) + Converter.trytes(lastIndexTrits)); int[] t = Converter.trits(this.getTransactions().get(i).getAddress() + Converter.trytes(valueTrits) + this.getTransactions().get(i).getObsoleteTag() + Converter.trytes(timestampTrits) + Converter.trytes(currentIndexTrits) + Converter.trytes(lastIndexTrits));
curl.absorb(t, 0, t.length); curl.absorb(t, 0, t.length);
} }
int[] hash = new int[243]; curl.squeeze(hash, 0, hash.length);
curl.squeeze(hash, 0, hash.length); hashInTrytes = Converter.trytes(hash);
String hashInTrytes = Converter.trytes(hash); normalizedBundleValue = normalizedBundle(hashInTrytes);
boolean foundValue = false;
for (int i = 0; i < normalizedBundleValue.length; i++) {
if (normalizedBundleValue[i] == 13) {
foundValue = true;
obsoleteTagTrits = Converter.trits(this.getTransactions().get(0).getObsoleteTag());
Converter.increment(obsoleteTagTrits, 81);
this.getTransactions().get(0).setObsoleteTag(Converter.trytes(obsoleteTagTrits));
}
}
valid = !foundValue;
} while (!valid);
for (int i = 0; i < this.getTransactions().size(); i++) { for (int i = 0; i < this.getTransactions().size(); i++) {
this.getTransactions().get(i).setBundle(hashInTrytes); this.getTransactions().get(i).setBundle(hashInTrytes);
@ -210,4 +229,4 @@ public class Bundle implements Comparable<Bundle> {
public int compareTo(Bundle o) { public int compareTo(Bundle o) {
return Long.compare(this.getTransactions().get(0).getAttachmentTimestamp(), o.getTransactions().get(0).getAttachmentTimestamp()); return Long.compare(this.getTransactions().get(0).getAttachmentTimestamp(), o.getTransactions().get(0).getAttachmentTimestamp());
} }
} }