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

KeyChainGroup: Inline method makeP2SHOutputScript().

Browse Source
This commit is contained in:
Andreas Schildbach 2019-02-06 15:33:35 +01:00
parent 0d90157749
commit 6278dc39b1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
View File

@ -132,7 +132,9 @@ public class KeyChainGroup implements KeyBag {
if (isMarried()) { if (isMarried()) {
for (Map.Entry<KeyChain.KeyPurpose, DeterministicKey> entry : this.currentKeys.entrySet()) { for (Map.Entry<KeyChain.KeyPurpose, DeterministicKey> entry : this.currentKeys.entrySet()) {
Address address = makeP2SHOutputScript(entry.getValue(), getActiveKeyChain()).getToAddress(params); Address address = ScriptBuilder
.createP2SHOutputScript(getActiveKeyChain().getRedeemData(entry.getValue()).redeemScript)
.getToAddress(params);
currentAddresses.put(entry.getKey(), address); currentAddresses.put(entry.getKey(), address);
} }
} }
@ -624,10 +626,6 @@ public class KeyChainGroup implements KeyBag {
throw new UnsupportedOperationException(); // Unused. throw new UnsupportedOperationException(); // Unused.
} }
private Script makeP2SHOutputScript(DeterministicKey followedKey, DeterministicKeyChain chain) {
return ScriptBuilder.createP2SHOutputScript(chain.getRedeemData(followedKey).redeemScript);
}
/** Adds a listener for events that are run when keys are added, on the user thread. */ /** Adds a listener for events that are run when keys are added, on the user thread. */
public void addEventListener(KeyChainEventListener listener) { public void addEventListener(KeyChainEventListener listener) {
addEventListener(listener, Threading.USER_THREAD); addEventListener(listener, Threading.USER_THREAD);