Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-11 17:55:53 +00:00
Code Issues Projects Releases Wiki Activity

Update to bitcoin 0.14.2

Browse Source
This commit is contained in:
Ross Nicoll 2016-06-05 11:31:20 +01:00
parent 89cf3c6b17
commit 6f92dc64bd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -17,7 +17,7 @@
<!-- Dummy block to make Maven Central happy: authors list is in AUTHORS --> <!-- Dummy block to make Maven Central happy: authors list is in AUTHORS -->
<developers> <developers>
<developer> <developer>
<name>The bitcoinj and libdohj teams.</name> <name>The libdohj team.</name>
<email>info@dogecoin.com</email> <email>info@dogecoin.com</email>
</developer> </developer>
</developers> </developers>
@ -90,7 +90,7 @@
<dependency> <dependency>
<groupId>org.bitcoinj</groupId> <groupId>org.bitcoinj</groupId>
<artifactId>bitcoinj-core</artifactId> <artifactId>bitcoinj-core</artifactId>
<version>0.14-SNAPSHOT</version> <version>0.14.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>

5
src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentSession.java
View File

@ -16,6 +16,7 @@ package com.dogecoin.dogecoinj.protocols.payments;
import com.dogecoin.dogecoinj.protocols.payments.PaymentProtocol.PkiVerificationData; import com.dogecoin.dogecoinj.protocols.payments.PaymentProtocol.PkiVerificationData;
import org.bitcoinj.core.*; import org.bitcoinj.core.*;
import org.bitcoinj.wallet.SendRequest;
import org.bitcoinj.crypto.TrustStoreLoader; import org.bitcoinj.crypto.TrustStoreLoader;
import org.bitcoinj.params.MainNetParams; import org.bitcoinj.params.MainNetParams;
import org.bitcoinj.uri.BitcoinURI; import org.bitcoinj.uri.BitcoinURI;
@ -293,11 +294,11 @@ public class PaymentSession {
/** /**
* Returns a {@link Wallet.SendRequest} suitable for broadcasting to the network. * Returns a {@link Wallet.SendRequest} suitable for broadcasting to the network.
*/ */
public Wallet.SendRequest getSendRequest() { public SendRequest getSendRequest() {
Transaction tx = new Transaction(params); Transaction tx = new Transaction(params);
for (Protos.Output output : paymentDetails.getOutputsList()) for (Protos.Output output : paymentDetails.getOutputsList())
tx.addOutput(new TransactionOutput(params, tx, Coin.valueOf(output.getAmount()), output.getScript().toByteArray())); 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);
} }
/** /**