From 6f92dc64bdfd60cc9f001267b65956f6bd3bcda9 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Sun, 5 Jun 2016 11:31:20 +0100 Subject: [PATCH] Update to bitcoin 0.14.2 --- pom.xml | 4 ++-- .../dogecoinj/protocols/payments/PaymentSession.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a752c07d..b2f57467 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ - The bitcoinj and libdohj teams. + The libdohj team. info@dogecoin.com @@ -90,7 +90,7 @@ org.bitcoinj bitcoinj-core - 0.14-SNAPSHOT + 0.14.2 diff --git a/src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentSession.java b/src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentSession.java index c3789624..d2addf4d 100644 --- a/src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentSession.java +++ b/src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentSession.java @@ -16,6 +16,7 @@ package com.dogecoin.dogecoinj.protocols.payments; import com.dogecoin.dogecoinj.protocols.payments.PaymentProtocol.PkiVerificationData; import org.bitcoinj.core.*; +import org.bitcoinj.wallet.SendRequest; import org.bitcoinj.crypto.TrustStoreLoader; import org.bitcoinj.params.MainNetParams; import org.bitcoinj.uri.BitcoinURI; @@ -293,11 +294,11 @@ public class PaymentSession { /** * Returns a {@link Wallet.SendRequest} suitable for broadcasting to the network. */ - public Wallet.SendRequest getSendRequest() { + public SendRequest getSendRequest() { Transaction tx = new Transaction(params); for (Protos.Output output : paymentDetails.getOutputsList()) tx.addOutput(new TransactionOutput(params, tx, Coin.valueOf(output.getAmount()), output.getScript().toByteArray())); - return Wallet.SendRequest.forTx(tx).fromPaymentDetails(paymentDetails); + return SendRequest.forTx(tx).fromPaymentDetails(paymentDetails); } /**