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

Merge pull request #2137 from oscarguindzberg/codecleanup1

Browse Source 
Code clean up
This commit is contained in:
Christoph Atteneder 2018-12-19 11:38:11 +01:00 committed by GitHub
commit c9500a8cd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/bisq/core/btc/setup/BtcDeterministicKeyChain.java
View File

@ -65,6 +65,7 @@ class BtcDeterministicKeyChain extends DeterministicKeyChain {
return new BtcDeterministicKeyChain(keyCrypter, aesKey, this);
}
@Override
protected DeterministicKeyChain makeKeyChainFromSeed(DeterministicSeed seed) {
return new BtcDeterministicKeyChain(seed);
}

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

@ -95,8 +95,6 @@ public class WalletConfig extends AbstractIdleService {
///////////////////////////////////////////////////////////////////////////////////////////
public interface BisqWalletFactory extends WalletProtobufSerializer.WalletFactory {
Wallet create(NetworkParameters params, KeyChainGroup keyChainGroup);
Wallet create(NetworkParameters params, KeyChainGroup keyChainGroup, boolean isBsqWallet);
}

3
core/src/main/java/bisq/core/btc/wallet/BisqRiskAnalysis.java
View File

@ -58,7 +58,8 @@ import static com.google.common.base.Preconditions.checkState;
// Copied from DefaultRiskAnalysis as DefaultRiskAnalysis has mostly private methods and constructor so we cannot
// override it.
// Only change to DefaultRiskAnalysis is removal of the RBF check.
// The changes to DefaultRiskAnalysis are: removal of the RBF check and accept as standard an OP_RETURN outputs
// with 0 value.
// For Bisq's use cases RBF is not considered risky. Requiring a confirmation for RBF payments from a users
// external wallet to Bisq would hurt usability. The trade transaction requires anyway a confirmation and we don't see
// a use case where a Bisq user accepts unconfirmed payment from untrusted peers and would not wait anyway for at least