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

Fix failed precondition in maybeLookaheadScripts

Browse Source
This commit is contained in:
Devrandom 2014-08-10 16:34:41 -07:00 committed by Mike Hearn
parent 2d3bfc07c7
commit 588e314b06
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/com/google/bitcoin/wallet/KeyChainGroup.java
View File

@ -173,8 +173,13 @@ public class KeyChainGroup {
if (chains.isEmpty()) if (chains.isEmpty())
return; return;
int numLeafKeys = chains.get(chains.size() - 1).getLeafKeys().size(); int numLeafKeys = 0;
for (DeterministicKeyChain chain : chains) {
numLeafKeys += chain.getLeafKeys().size();
}
checkState(marriedKeysScripts.size() <= numLeafKeys, "Number of scripts is greater than number of leaf keys"); checkState(marriedKeysScripts.size() <= numLeafKeys, "Number of scripts is greater than number of leaf keys");
if (marriedKeysScripts.size() == numLeafKeys) if (marriedKeysScripts.size() == numLeafKeys)
return; return;
@ -620,13 +625,14 @@ public class KeyChainGroup {
BloomFilter filter = new BloomFilter(size, falsePositiveRate, nTweak); BloomFilter filter = new BloomFilter(size, falsePositiveRate, nTweak);
if (basic.numKeys() > 0) if (basic.numKeys() > 0)
filter.merge(basic.getFilter(size, falsePositiveRate, nTweak)); filter.merge(basic.getFilter(size, falsePositiveRate, nTweak));
for (DeterministicKeyChain chain : chains) {
if (isMarried(chain)) {
for (Map.Entry<ByteString, Script> entry : marriedKeysScripts.entrySet()) { for (Map.Entry<ByteString, Script> entry : marriedKeysScripts.entrySet()) {
filter.insert(entry.getKey().toByteArray()); filter.insert(entry.getKey().toByteArray());
filter.insert(ScriptBuilder.createP2SHOutputScript(entry.getValue()).getProgram()); filter.insert(ScriptBuilder.createP2SHOutputScript(entry.getValue()).getProgram());
} }
} else {
for (DeterministicKeyChain chain : chains) {
if (!isMarried(chain)) {
filter.merge(chain.getFilter(size, falsePositiveRate, nTweak)); filter.merge(chain.getFilter(size, falsePositiveRate, nTweak));
} }
} }