sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2025-01-27 15:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve quick transaction test

Browse source
This commit is contained in:
Craig Raw 2025-01-20 09:16:29 +02:00
parent 64a3f1c00b
commit 7b9affb3de
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/sparrowwallet/drongo/protocol/Transaction.java
View file

@ -14,7 +14,7 @@ import static com.sparrowwallet.drongo.Utils.uint32ToByteStreamLE;
import static com.sparrowwallet.drongo.Utils.uint64ToByteStreamLE; import static com.sparrowwallet.drongo.Utils.uint64ToByteStreamLE;
public class Transaction extends ChildMessage { public class Transaction extends ChildMessage {
public static final int MAX_BLOCK_SIZE = 1000 * 1000; public static final int MAX_BLOCK_SIZE_VBYTES = 1000 * 1000;
public static final long MAX_BITCOIN = 21 * 1000 * 1000L; public static final long MAX_BITCOIN = 21 * 1000 * 1000L;
public static final long SATOSHIS_PER_BITCOIN = 100 * 1000 * 1000L; public static final long SATOSHIS_PER_BITCOIN = 100 * 1000 * 1000L;
public static final long MAX_BLOCK_LOCKTIME = 500000000L; public static final long MAX_BLOCK_LOCKTIME = 500000000L;
@ -395,7 +395,7 @@ public class Transaction extends ChildMessage {
public void verify() throws VerificationException { public void verify() throws VerificationException {
if (inputs.size() == 0 || outputs.size() == 0) if (inputs.size() == 0 || outputs.size() == 0)
throw new VerificationException.EmptyInputsOrOutputs(); throw new VerificationException.EmptyInputsOrOutputs();
if (this.getMessageSize() > MAX_BLOCK_SIZE) if (this.getMessageSize() > (MAX_BLOCK_SIZE_VBYTES * WITNESS_SCALE_FACTOR))
throw new VerificationException.LargerThanMaxBlockSize(); throw new VerificationException.LargerThanMaxBlockSize();
HashSet<TransactionOutPoint> outpoints = new HashSet<>(); HashSet<TransactionOutPoint> outpoints = new HashSet<>();
@ -437,11 +437,18 @@ public class Transaction extends ChildMessage {
public static boolean isTransaction(byte[] bytes) { public static boolean isTransaction(byte[] bytes) {
//Incomplete quick test //Incomplete quick test
if(bytes.length == 0) { if(bytes.length <= 5 || bytes.length > (MAX_BLOCK_SIZE_VBYTES * WITNESS_SCALE_FACTOR)) {
return false; return false;
} }
long version = Utils.readUint32(bytes, 0); long version = Utils.readUint32(bytes, 0);
return version > 0 && version < 5; if(version <= 0) {
return false;
}
boolean segwit = (bytes[4] == 0);
if(segwit && bytes[5] == 0) {
return false;
}
return true;
} }
public Sha256Hash hashForLegacySignature(int inputIndex, Script redeemScript, SigHash sigHash) { public Sha256Hash hashForLegacySignature(int inputIndex, Script redeemScript, SigHash sigHash) {