Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-15 11:45:51 +00:00
Code Issues Projects Releases Wiki Activity

Script: Fix getNumberOfBytesRequiredToSpend() for P2WPKH.

Browse Source
This commit is contained in:
Andreas Schildbach 2019-02-17 11:56:25 +01:00
parent 30297af3de
commit 0317c192e5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/bitcoinj/script/Script.java
View File

@ -619,11 +619,13 @@ public class Script {
return SIG_SIZE; return SIG_SIZE;
} else if (ScriptPattern.isP2PKH(this)) { } else if (ScriptPattern.isP2PKH(this)) {
// scriptSig: <sig> <pubkey> // scriptSig: <sig> <pubkey>
int uncompressedPubKeySize = 65; int uncompressedPubKeySize = 65; // very conservative
return SIG_SIZE + (pubKey != null ? pubKey.getPubKey().length : uncompressedPubKeySize); return SIG_SIZE + (pubKey != null ? pubKey.getPubKey().length : uncompressedPubKeySize);
} else if (ScriptPattern.isP2WPKH(this)) { } else if (ScriptPattern.isP2WPKH(this)) {
// scriptSig is empty // scriptSig is empty
return 0; // witness: <sig> <pubKey>
int compressedPubKeySize = 33;
return SIG_SIZE + (pubKey != null ? pubKey.getPubKey().length : compressedPubKeySize);
} else { } else {
throw new IllegalStateException("Unsupported script type"); throw new IllegalStateException("Unsupported script type");
} }