Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-13 02:35:52 +00:00
Code Issues Projects Releases Wiki Activity

WalletProtobufSerializer: Fix protobuf deserialization of transaction version.

Browse Source
This commit is contained in:
Andreas Schildbach 2017-02-05 17:49:00 +01:00
parent 380abd0d52
commit be09b62062
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/bitcoinj/core/Transaction.java
View File

@ -1136,13 +1136,15 @@ public class Transaction extends ChildMessage {
this.lockTime = lockTime; this.lockTime = lockTime;
} }
/**
* @return the version
*/
public long getVersion() { public long getVersion() {
return version; return version;
} }
public void setVersion(int version) {
this.version = version;
unCache();
}
/** Returns an unmodifiable view of all inputs. */ /** Returns an unmodifiable view of all inputs. */
public List<TransactionInput> getInputs() { public List<TransactionInput> getInputs() {
return Collections.unmodifiableList(inputs); return Collections.unmodifiableList(inputs);

3
core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java
View File

@ -627,6 +627,9 @@ public class WalletProtobufSerializer {
private void readTransaction(Protos.Transaction txProto, NetworkParameters params) throws UnreadableWalletException { private void readTransaction(Protos.Transaction txProto, NetworkParameters params) throws UnreadableWalletException {
Transaction tx = new Transaction(params); Transaction tx = new Transaction(params);
tx.setVersion(txProto.getVersion());
if (txProto.hasUpdatedAt()) { if (txProto.hasUpdatedAt()) {
tx.setUpdateTime(new Date(txProto.getUpdatedAt())); tx.setUpdateTime(new Date(txProto.getUpdatedAt()));
} }

14
core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java
View File

@ -38,6 +38,8 @@ import org.bitcoinj.wallet.UnreadableWalletException;
import org.bitcoinj.wallet.Wallet; import org.bitcoinj.wallet.Wallet;
import org.bitcoinj.wallet.WalletExtension; import org.bitcoinj.wallet.WalletExtension;
import org.bitcoinj.wallet.WalletProtobufSerializer; import org.bitcoinj.wallet.WalletProtobufSerializer;
import org.bitcoinj.wallet.WalletTransaction;
import org.bitcoinj.wallet.WalletTransaction.Pool;
import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener; import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -358,6 +360,18 @@ public class WalletProtobufSerializerTest {
assertEquals(myAddress, wallet1.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS)); assertEquals(myAddress, wallet1.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS));
} }
@Test
public void roundtripVersionTwoTransaction() throws Exception {
Transaction tx = new Transaction(PARAMS, Utils.HEX.decode(
"0200000001d7902864af9310420c6e606b814c8f89f7902d40c130594e85df2e757a7cc301070000006b483045022100ca1757afa1af85c2bb014382d9ce411e1628d2b3d478df9d5d3e9e93cb25dcdd02206c5d272b31a23baf64e82793ee5c816e2bbef251e733a638b630ff2331fc83ba0121026ac2316508287761befbd0f7495ea794b396dbc5b556bf276639f56c0bd08911feffffff0274730700000000001976a91456da2d038a098c42390c77ef163e1cc23aedf24088ac91062300000000001976a9148ebf3467b9a8d7ae7b290da719e61142793392c188ac22e00600"));
assertEquals(tx.getVersion(), 2);
assertEquals(tx.getHashAsString(), "0321b1413ed9048199815bd6bc2650cab1a9e8d543f109a42c769b1f18df4174");
myWallet.addWalletTransaction(new WalletTransaction(Pool.UNSPENT, tx));
Wallet wallet1 = roundTrip(myWallet);
Transaction tx2 = wallet1.getTransaction(tx.getHash());
assertEquals(checkNotNull(tx2).getVersion(), 2);
}
@Test @Test
public void coinbaseTxns() throws Exception { public void coinbaseTxns() throws Exception {
// Covers issue 420 where the outpoint index of a coinbase tx input was being mis-serialized. // Covers issue 420 where the outpoint index of a coinbase tx input was being mis-serialized.