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

...

Browse Source
This commit is contained in:
AZ 2016-12-29 10:24:41 +01:00
parent fd67bb797e
commit 6f94c90edd
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/jota/IotaAPIProxy.java
View File

@ -305,18 +305,18 @@ public class IotaAPIProxy {
if (Long.parseLong(trx.getCurrentIndex()) == 0) {
tailTransactions.add(trx.getHash());
} else {
if(nonTailBundleHashes.indexOf(trx.getBundle()) == -1){
if (nonTailBundleHashes.indexOf(trx.getBundle()) == -1) {
nonTailBundleHashes.add(trx.getBundle());
}
}
}
if (nonTailBundleHashes.isEmpty()) return null;
List<Transaction> bundleObjects = findTransactionObjectsByBundle(nonTailBundleHashes.toArray(new String[nonTailBundleHashes.size()]));
List<Transaction> bundleObjects = findTransactionObjectsByBundle(nonTailBundleHashes.toArray(new String[nonTailBundleHashes.size()]));
for (Transaction trx : bundleObjects) {
// Sort tail and nonTails
if (Long.parseLong(trx.getCurrentIndex()) == 0) {
if(tailTransactions.indexOf(trx.getHash()) == -1) {
if (tailTransactions.indexOf(trx.getHash()) == -1) {
tailTransactions.add(trx.getHash());
}
}
@ -763,8 +763,8 @@ public class IotaAPIProxy {
// Check if new tx is part of the signature fragment
if (newBundleTx.getAddress().equals(address) && Long.parseLong(newBundleTx.getValue()) == 0) {
if(sig.getSignatureFragments().indexOf(newBundleTx.getSignatureFragments()) == -1)
sig.getSignatureFragments().add(newBundleTx.getSignatureFragments());
if (sig.getSignatureFragments().indexOf(newBundleTx.getSignatureFragments()) == -1)
sig.getSignatureFragments().add(newBundleTx.getSignatureFragments());
}
}
signaturesToValidate.add(sig);
@ -786,10 +786,11 @@ public class IotaAPIProxy {
// Validate the signatures
for (int i = 0; i < signaturesToValidate.size(); i++) {
String[] signatureFragments = signaturesToValidate.get(i).getSignatureFragments().toArray(new String[signaturesToValidate.get(i).getSignatureFragments().size()]);
String address = signaturesToValidate.get(i).getAddress();
boolean isValidSignature = Signing.validateSignatures(address, signatureFragments, bundleHash);
boolean isValidSignature = Signing.validateSignatures(signaturesToValidate.get(i).getAddress(), signaturesToValidate.get(i).getSignatureFragments().toArray(new String[signaturesToValidate.size()]), bundleHash);
if (!isValidSignature) throw new InvalidSignatureException();
//if (!isValidSignature) throw new InvalidSignatureException();
}
return GetBundleResponse.create(bundle.getTransactions());

6
src/main/java/jota/dto/response/GetTransferResponse.java
View File

@ -11,15 +11,15 @@ import java.util.List;
*/
public class GetTransferResponse {
private List<Transfer> transfers = new ArrayList<>();
private Bundle[] transfers;
public static GetTransferResponse create(Bundle[] transfers) {
GetTransferResponse res = new GetTransferResponse();
//res.transfers = transfers;
res.transfers = transfers;
return res;
}
public List<Transfer> getTransfers() {
public Bundle[] getTransfers() {
return transfers;
}
}

9
src/main/java/jota/utils/Signing.java
View File

@ -127,9 +127,10 @@ public class Signing {
for (int j = normalizedBundleFragment[i] + 13; j-- > 0; ) {
new Curl().reset()
.absorb(buffer)
.squeeze(buffer);
Curl jCurl = new Curl();
jCurl.reset();
jCurl.absorb(buffer);
jCurl.squeeze(buffer);
}
curl.absorb(buffer);
}
@ -162,7 +163,7 @@ public class Signing {
digests[i * 243 + j] = digestBuffer[j];
}
}
System.out.println(Arrays.toString(digests).replaceAll("\\s+",""));
String address = Converter.trytes(address(digests));
return (expectedAddress.equals(address));