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

PaymentProtocol: fix seconds vs milliseconds confusion. Thanks to Adam Mackler for the bug report.

Browse Source
This commit is contained in:
Mike Hearn 2014-08-03 21:06:15 +02:00
parent eff9ac2ecc
commit e03f184a1f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/google/bitcoin/protocols/payments/PaymentProtocol.java
View File

@ -17,10 +17,7 @@
package com.google.bitcoin.protocols.payments; package com.google.bitcoin.protocols.payments;
import com.google.bitcoin.core.Address; import com.google.bitcoin.core.*;
import com.google.bitcoin.core.Coin;
import com.google.bitcoin.core.NetworkParameters;
import com.google.bitcoin.core.Transaction;
import com.google.bitcoin.crypto.X509Utils; import com.google.bitcoin.crypto.X509Utils;
import com.google.bitcoin.script.ScriptBuilder; import com.google.bitcoin.script.ScriptBuilder;
import com.google.common.base.Objects; import com.google.common.base.Objects;
@ -98,7 +95,7 @@ public class PaymentProtocol {
paymentDetails.setPaymentUrl(paymentUrl); paymentDetails.setPaymentUrl(paymentUrl);
if (merchantData != null) if (merchantData != null)
paymentDetails.setMerchantData(ByteString.copyFrom(merchantData)); paymentDetails.setMerchantData(ByteString.copyFrom(merchantData));
paymentDetails.setTime(System.currentTimeMillis()); paymentDetails.setTime(Utils.currentTimeSeconds());
final Protos.PaymentRequest.Builder paymentRequest = Protos.PaymentRequest.newBuilder(); final Protos.PaymentRequest.Builder paymentRequest = Protos.PaymentRequest.newBuilder();
paymentRequest.setSerializedPaymentDetails(paymentDetails.build().toByteString()); paymentRequest.setSerializedPaymentDetails(paymentDetails.build().toByteString());