• bitcoinj-sv's avatar
    Merge remote-tracking branch 'bitcoinj-sv/master' into bsv-0.14.7 · 6fa1438f
    bitcoinj-sv authored
    # Conflicts:
    #	.travis.yml
    #	core/pom.xml
    #	core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java
    #	core/src/main/java/org/bitcoinj/core/Block.java
    #	core/src/main/java/org/bitcoinj/core/NetworkParameters.java
    #	core/src/main/java/org/bitcoinj/core/Transaction.java
    #	core/src/main/java/org/bitcoinj/core/TransactionInput.java
    #	core/src/main/java/org/bitcoinj/core/Utils.java
    #	core/src/main/java/org/bitcoinj/core/VersionMessage.java
    #	core/src/main/java/org/bitcoinj/crypto/TransactionSignature.java
    #	core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java
    #	core/src/main/java/org/bitcoinj/params/MainNetParams.java
    #	core/src/main/java/org/bitcoinj/pow/AbstractRuleCheckerFactory.java
    #	core/src/main/java/org/bitcoinj/pow/factory/DAARuleCheckerFactory.java
    #	core/src/main/java/org/bitcoinj/pow/factory/EDARuleCheckerFactory.java
    #	core/src/main/java/org/bitcoinj/protocols/channels/IPaymentChannelClient.java
    #	core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java
    #	core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java
    #	core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java
    #	core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java
    #	core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java
    #	core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java
    #	core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java
    #	core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java
    #	core/src/main/java/org/bitcoinj/script/Script.java
    #	core/src/main/java/org/bitcoinj/script/ScriptOpCodes.java
    #	core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java
    #	core/src/main/java/org/bitcoinj/utils/MonetaryFormat.java
    #	core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java
    #	core/src/main/java/org/bitcoinj/wallet/SendRequest.java
    #	core/src/main/java/org/bitcoinj/wallet/Wallet.java
    #	core/src/test/java/org/bitcoinj/core/CoinTest.java
    #	core/src/test/java/org/bitcoinj/protocols/channels/ChannelConnectionTest.java
    #	core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelServerTest.java
    #	core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelStateTest.java
    #	core/src/test/java/org/bitcoinj/wallet/DefaultRiskAnalysisTest.java
    #	core/src/test/java/org/bitcoinj/wallet/WalletTest.java
    #	examples/pom.xml
    #	pom.xml
    #	tools/pom.xml
    #	wallettemplate/pom.xml
    6fa1438f
Name
Last commit
Last update
..
src Loading commit data...
findbugs.xml Loading commit data...
pom.xml Loading commit data...