From debd034c71009f6c34fb000fbd80c5c84ca806c5 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Sun, 13 Mar 2011 12:49:30 +0000 Subject: [PATCH] Add a serialVersionUID to other classes that were missing them. Thanks to Andreas for the report. BUG=4 --- src/com/google/bitcoin/core/Address.java | 2 +- src/com/google/bitcoin/core/AddressMessage.java | 1 + src/com/google/bitcoin/core/Block.java | 3 ++- src/com/google/bitcoin/core/GetBlocksMessage.java | 1 + src/com/google/bitcoin/core/GetDataMessage.java | 2 ++ src/com/google/bitcoin/core/InventoryMessage.java | 3 ++- src/com/google/bitcoin/core/Message.java | 2 ++ src/com/google/bitcoin/core/UnknownMessage.java | 1 + src/com/google/bitcoin/core/VersionMessage.java | 2 ++ src/com/google/bitcoin/core/Wallet.java | 1 - 10 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/com/google/bitcoin/core/Address.java b/src/com/google/bitcoin/core/Address.java index 32e71972..1a85d84a 100644 --- a/src/com/google/bitcoin/core/Address.java +++ b/src/com/google/bitcoin/core/Address.java @@ -54,7 +54,7 @@ public class Address { * * 
new Address(NetworkParameters.prodNet(), "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
*/ - public Address(NetworkParameters params, String address) throws AddressFormatException { + public Address(NetworkParameters params, String address) throws AddressFormatException { this.params = params; this.hash160 = strToHash160(address); } diff --git a/src/com/google/bitcoin/core/AddressMessage.java b/src/com/google/bitcoin/core/AddressMessage.java index ba88def8..65890291 100644 --- a/src/com/google/bitcoin/core/AddressMessage.java +++ b/src/com/google/bitcoin/core/AddressMessage.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; public class AddressMessage extends Message { + private static final long serialVersionUID = 8058283864924679460L; private static final long MAX_ADDRESSES = 1024; List addresses; diff --git a/src/com/google/bitcoin/core/Block.java b/src/com/google/bitcoin/core/Block.java index a244486a..ae70c7d3 100644 --- a/src/com/google/bitcoin/core/Block.java +++ b/src/com/google/bitcoin/core/Block.java @@ -33,8 +33,9 @@ import static com.google.bitcoin.core.Utils.*; * you grab it from a downloaded {@link BlockChain}. */ public class Block extends Message { - static final long ALLOWED_TIME_DRIFT = 2 * 60 * 60; // Same value as official client. + private static final long serialVersionUID = -2834162413473103042L; + static final long ALLOWED_TIME_DRIFT = 2 * 60 * 60; // Same value as official client. /** A value for difficultyTarget (nBits) that allows half of all possible hash solutions. Used in unit testing. */ static final long EASIEST_DIFFICULTY_TARGET = 0x207fFFFFL; diff --git a/src/com/google/bitcoin/core/GetBlocksMessage.java b/src/com/google/bitcoin/core/GetBlocksMessage.java index eded5c3c..24a7d211 100644 --- a/src/com/google/bitcoin/core/GetBlocksMessage.java +++ b/src/com/google/bitcoin/core/GetBlocksMessage.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.List; public class GetBlocksMessage extends Message { + private static final long serialVersionUID = 3479412877853645644L; private final List locator; private final byte[] stopHash; diff --git a/src/com/google/bitcoin/core/GetDataMessage.java b/src/com/google/bitcoin/core/GetDataMessage.java index 7b101d32..0e15c88f 100644 --- a/src/com/google/bitcoin/core/GetDataMessage.java +++ b/src/com/google/bitcoin/core/GetDataMessage.java @@ -17,6 +17,8 @@ package com.google.bitcoin.core; public class GetDataMessage extends Message { + private static final long serialVersionUID = 2754681589501709887L; + public GetDataMessage(NetworkParameters params, byte[] payloadBytes) throws ProtocolException { super(params, payloadBytes, 0); } diff --git a/src/com/google/bitcoin/core/InventoryMessage.java b/src/com/google/bitcoin/core/InventoryMessage.java index 2b9a07d2..016f7331 100644 --- a/src/com/google/bitcoin/core/InventoryMessage.java +++ b/src/com/google/bitcoin/core/InventoryMessage.java @@ -24,8 +24,9 @@ import java.util.ArrayList; import java.util.List; public class InventoryMessage extends Message { + private static final long serialVersionUID = -7050246551646107066L; private static final long MAX_INVENTORY_ITEMS = 50000; - + // For some reason the compiler complains if this is inside InventoryItem public List items; diff --git a/src/com/google/bitcoin/core/Message.java b/src/com/google/bitcoin/core/Message.java index 5341b44e..4a26cf8b 100644 --- a/src/com/google/bitcoin/core/Message.java +++ b/src/com/google/bitcoin/core/Message.java @@ -31,6 +31,8 @@ import java.util.Arrays; * This class is not useful for library users. If you want to talk to the network see the {@link Peer} class. */ public abstract class Message implements Serializable { + private static final long serialVersionUID = -3561053461717079135L; + public static final int MAX_SIZE = 0x02000000; // Useful to ensure serialize/deserialize are consistent with each other. diff --git a/src/com/google/bitcoin/core/UnknownMessage.java b/src/com/google/bitcoin/core/UnknownMessage.java index 4707aeb6..6471d63e 100644 --- a/src/com/google/bitcoin/core/UnknownMessage.java +++ b/src/com/google/bitcoin/core/UnknownMessage.java @@ -17,6 +17,7 @@ package com.google.bitcoin.core; public class UnknownMessage extends Message { + private static final long serialVersionUID = 3614705938207918775L; private String name; public UnknownMessage(NetworkParameters params, String name, byte[] payloadBytes) throws ProtocolException { diff --git a/src/com/google/bitcoin/core/VersionMessage.java b/src/com/google/bitcoin/core/VersionMessage.java index f897a8b4..63098584 100644 --- a/src/com/google/bitcoin/core/VersionMessage.java +++ b/src/com/google/bitcoin/core/VersionMessage.java @@ -23,6 +23,8 @@ import java.net.InetAddress; import java.net.UnknownHostException; public class VersionMessage extends Message { + private static final long serialVersionUID = 7313594258967483180L; + /** * The protocol version this library implements. A value of 31800 means 0.3.18.00. */ diff --git a/src/com/google/bitcoin/core/Wallet.java b/src/com/google/bitcoin/core/Wallet.java index e7611a01..a3999978 100644 --- a/src/com/google/bitcoin/core/Wallet.java +++ b/src/com/google/bitcoin/core/Wallet.java @@ -264,7 +264,6 @@ public class Wallet implements Serializable { * our coins. This should be an address we own (is in the keychain). * @return a new {@link Transaction} or null if we cannot afford this send. */ - synchronized Transaction createSend(Address address, BigInteger nanocoins, Address changeAddress) { Utils.LOG("Creating send tx to " + address.toString() + " for " + Utils.bitcoinValueToFriendlyString(nanocoins));