mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

WalletConfig.preferredOutputScriptType: make it a method variable

Browse Source
This commit is contained in:
Oscar Guindzberg 2020-05-20 21:01:12 -03:00
parent b472e3851c
commit 00c9f401c1
No known key found for this signature in database
GPG Key ID: 209796BF2E1D4F75
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/bisq/core/btc/setup/WalletConfig.java
View File

@ -81,7 +81,6 @@ public class WalletConfig extends AbstractIdleService {
protected static final Logger log = LoggerFactory.getLogger(WalletConfig.class); protected static final Logger log = LoggerFactory.getLogger(WalletConfig.class);
protected final NetworkParameters params; protected final NetworkParameters params;
protected final Script.ScriptType preferredOutputScriptType;
protected final String filePrefix; protected final String filePrefix;
protected volatile BlockChain vChain; protected volatile BlockChain vChain;
protected volatile SPVBlockStore vStore; protected volatile SPVBlockStore vStore;
@ -119,25 +118,16 @@ public class WalletConfig extends AbstractIdleService {
* Creates a new WalletConfig, with a newly created {@link Context}. Files will be stored in the given directory. * Creates a new WalletConfig, with a newly created {@link Context}. Files will be stored in the given directory.
*/ */
public WalletConfig(NetworkParameters params, File directory, String filePrefix) { public WalletConfig(NetworkParameters params, File directory, String filePrefix) {
this(new Context(params), Script.ScriptType.P2PKH, directory, filePrefix); this(new Context(params), directory, filePrefix);
}
/**
* Creates a new WalletConfig, with a newly created {@link Context}. Files will be stored in the given directory.
*/
public WalletConfig(NetworkParameters params, Script.ScriptType preferredOutputScriptType,
File directory, String filePrefix) {
this(new Context(params), preferredOutputScriptType, directory, filePrefix);
} }
/** /**
* Creates a new WalletConfig, with the given {@link Context}. Files will be stored in the given directory. * Creates a new WalletConfig, with the given {@link Context}. Files will be stored in the given directory.
*/ */
public WalletConfig(Context context, Script.ScriptType preferredOutputScriptType, public WalletConfig(Context context,
File directory, String filePrefix) { File directory, String filePrefix) {
this.context = context; this.context = context;
this.params = checkNotNull(context.getParams()); this.params = checkNotNull(context.getParams());
this.preferredOutputScriptType = checkNotNull(preferredOutputScriptType);
this.directory = checkDir(directory); this.directory = checkDir(directory);
this.filePrefix = checkNotNull(filePrefix); this.filePrefix = checkNotNull(filePrefix);
} }
@ -495,6 +485,8 @@ public class WalletConfig extends AbstractIdleService {
} }
protected Wallet createWallet(boolean isBsqWallet) { protected Wallet createWallet(boolean isBsqWallet) {
// Change preferredOutputScriptType of btc wallet to P2WPKH to start using segwit
Script.ScriptType preferredOutputScriptType = isBsqWallet ? Script.ScriptType.P2PKH : Script.ScriptType.P2PKH;
KeyChainGroupStructure structure = new BisqKeyChainGroupStructure(isBsqWallet); KeyChainGroupStructure structure = new BisqKeyChainGroupStructure(isBsqWallet);
KeyChainGroup.Builder kcg = KeyChainGroup.builder(params, structure); KeyChainGroup.Builder kcg = KeyChainGroup.builder(params, structure);
if (restoreFromSeed != null) if (restoreFromSeed != null)