1. 16 Mar, 2019 1 commit
    • 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
  2. 04 Mar, 2019 1 commit
  3. 01 Mar, 2019 19 commits
  4. 28 Feb, 2019 3 commits
  5. 23 Dec, 2018 1 commit
  6. 20 Dec, 2018 3 commits
  7. 19 Dec, 2018 1 commit
  8. 15 Dec, 2018 1 commit
  9. 04 Dec, 2018 2 commits
  10. 03 Dec, 2018 2 commits
  11. 28 Nov, 2018 2 commits
  12. 27 Nov, 2018 1 commit
  13. 25 Nov, 2018 1 commit
  14. 13 Nov, 2018 1 commit
  15. 10 Aug, 2018 1 commit