From 12f3d2dbcadb6973845b599a58e36a834c5bae4b Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Wed, 22 Jul 2015 14:21:34 +0200
Subject: [PATCH] Remove Java serialization from the ECKey hierarchy. It was
 broken for some time anyway (LazyECPoint).

---
 core/src/main/java/org/bitcoinj/core/ECKey.java             | 6 ++----
 .../src/main/java/org/bitcoinj/crypto/DeterministicKey.java | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/core/ECKey.java b/core/src/main/java/org/bitcoinj/core/ECKey.java
index 349dd66d..57bc0f27 100644
--- a/core/src/main/java/org/bitcoinj/core/ECKey.java
+++ b/core/src/main/java/org/bitcoinj/core/ECKey.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2011 Google Inc.
  * Copyright 2014 Andreas Schildbach
  *
@@ -48,7 +48,6 @@ import org.spongycastle.util.encoders.Base64;
 import javax.annotation.Nullable;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.Serializable;
 import java.math.BigInteger;
 import java.nio.charset.Charset;
 import java.security.SecureRandom;
@@ -89,7 +88,7 @@ import static com.google.common.base.Preconditions.*;
  * this class so round-tripping preserves state. Unless you're working with old software or doing unusual things, you
  * can usually ignore the compressed/uncompressed distinction.</p>
  */
-public class ECKey implements EncryptableItem, Serializable {
+public class ECKey implements EncryptableItem {
     private static final Logger log = LoggerFactory.getLogger(ECKey.class);
 
     /** Sorts oldest keys first, newest last. */
@@ -127,7 +126,6 @@ public class ECKey implements EncryptableItem, Serializable {
     public static final BigInteger HALF_CURVE_ORDER;
 
     private static final SecureRandom secureRandom;
-    private static final long serialVersionUID = -728224901792295832L;
 
     static {
         // Init proper random number generator, as some old Android installations have bugs that make it unsecure.
diff --git a/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java b/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
index 92d19476..442acb66 100644
--- a/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
+++ b/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2013 Matija Mazi.
  * Copyright 2014 Andreas Schildbach
  *
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.bitcoinj.crypto;
 
 import org.bitcoinj.core.*;
@@ -51,8 +52,6 @@ public class DeterministicKey extends ECKey {
         }
     };
 
-    private static final long serialVersionUID = 1L;
-
     private final DeterministicKey parent;
     private final ImmutableList<ChildNumber> childNumberPath;
     private final int depth;