From 7b83e330df164366408fcd2c4fa9d71ef201b3f2 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@plan99.net>
Date: Wed, 17 Dec 2014 01:21:16 +0100
Subject: [PATCH] Regen proto files

---
 .../protocols/channels/ClientState.java       | 39 +++++++++----------
 .../main/java/org/bitcoinj/wallet/Protos.java | 24 ++++++++----
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java
index 85351aa1..d5321981 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/src/storedclientpaymentchannel.proto
+// source: storedclientpaymentchannel.proto
 
 package org.bitcoinj.protocols.channels;
 
@@ -750,7 +750,7 @@ public final class ClientState {
      * <code>required bytes myKey = 4;</code>
      *
      * <pre>
-     * Deprecated, key is stored in the wallet, and found using myPublicKey;
+     * Deprecated, key is already stored in the wallet, and found using myPublicKey;
      * </pre>
      */
     boolean hasMyKey();
@@ -758,7 +758,7 @@ public final class ClientState {
      * <code>required bytes myKey = 4;</code>
      *
      * <pre>
-     * Deprecated, key is stored in the wallet, and found using myPublicKey;
+     * Deprecated, key is already stored in the wallet, and found using myPublicKey;
      * </pre>
      */
     com.google.protobuf.ByteString getMyKey();
@@ -1012,7 +1012,7 @@ public final class ClientState {
      * <code>required bytes myKey = 4;</code>
      *
      * <pre>
-     * Deprecated, key is stored in the wallet, and found using myPublicKey;
+     * Deprecated, key is already stored in the wallet, and found using myPublicKey;
      * </pre>
      */
     public boolean hasMyKey() {
@@ -1022,7 +1022,7 @@ public final class ClientState {
      * <code>required bytes myKey = 4;</code>
      *
      * <pre>
-     * Deprecated, key is stored in the wallet, and found using myPublicKey;
+     * Deprecated, key is already stored in the wallet, and found using myPublicKey;
      * </pre>
      */
     public com.google.protobuf.ByteString getMyKey() {
@@ -1646,7 +1646,7 @@ public final class ClientState {
        * <code>required bytes myKey = 4;</code>
        *
        * <pre>
-       * Deprecated, key is stored in the wallet, and found using myPublicKey;
+       * Deprecated, key is already stored in the wallet, and found using myPublicKey;
        * </pre>
        */
       public boolean hasMyKey() {
@@ -1656,7 +1656,7 @@ public final class ClientState {
        * <code>required bytes myKey = 4;</code>
        *
        * <pre>
-       * Deprecated, key is stored in the wallet, and found using myPublicKey;
+       * Deprecated, key is already stored in the wallet, and found using myPublicKey;
        * </pre>
        */
       public com.google.protobuf.ByteString getMyKey() {
@@ -1666,7 +1666,7 @@ public final class ClientState {
        * <code>required bytes myKey = 4;</code>
        *
        * <pre>
-       * Deprecated, key is stored in the wallet, and found using myPublicKey;
+       * Deprecated, key is already stored in the wallet, and found using myPublicKey;
        * </pre>
        */
       public Builder setMyKey(com.google.protobuf.ByteString value) {
@@ -1682,7 +1682,7 @@ public final class ClientState {
        * <code>required bytes myKey = 4;</code>
        *
        * <pre>
-       * Deprecated, key is stored in the wallet, and found using myPublicKey;
+       * Deprecated, key is already stored in the wallet, and found using myPublicKey;
        * </pre>
        */
       public Builder clearMyKey() {
@@ -1848,17 +1848,16 @@ public final class ClientState {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n)core/src/storedclientpaymentchannel.pr" +
-      "oto\022\017paymentchannels\"\\\n\033StoredClientPaym" +
-      "entChannels\022=\n\010channels\030\001 \003(\0132+.paymentc" +
-      "hannels.StoredClientPaymentChannel\"\311\001\n\032S" +
-      "toredClientPaymentChannel\022\n\n\002id\030\001 \002(\014\022\033\n" +
-      "\023contractTransaction\030\002 \002(\014\022\031\n\021refundTran" +
-      "saction\030\003 \002(\014\022\023\n\013myPublicKey\030\010 \002(\014\022\r\n\005my" +
-      "Key\030\004 \002(\014\022\021\n\tvalueToMe\030\005 \002(\004\022\022\n\nrefundFe" +
-      "es\030\006 \002(\004\022\034\n\024closeTransactionHash\030\007 \001(\014B." +
-      "\n\037org.bitcoinj.protocols.channelsB\013Clien",
-      "tState"
+      "\n storedclientpaymentchannel.proto\022\017paym" +
+      "entchannels\"\\\n\033StoredClientPaymentChanne" +
+      "ls\022=\n\010channels\030\001 \003(\0132+.paymentchannels.S" +
+      "toredClientPaymentChannel\"\311\001\n\032StoredClie" +
+      "ntPaymentChannel\022\n\n\002id\030\001 \002(\014\022\033\n\023contract" +
+      "Transaction\030\002 \002(\014\022\031\n\021refundTransaction\030\003" +
+      " \002(\014\022\023\n\013myPublicKey\030\010 \002(\014\022\r\n\005myKey\030\004 \002(\014" +
+      "\022\021\n\tvalueToMe\030\005 \002(\004\022\022\n\nrefundFees\030\006 \002(\004\022" +
+      "\034\n\024closeTransactionHash\030\007 \001(\014B.\n\037org.bit" +
+      "coinj.protocols.channelsB\013ClientState"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/core/src/main/java/org/bitcoinj/wallet/Protos.java b/core/src/main/java/org/bitcoinj/wallet/Protos.java
index f10b447f..b18e6749 100644
--- a/core/src/main/java/org/bitcoinj/wallet/Protos.java
+++ b/core/src/main/java/org/bitcoinj/wallet/Protos.java
@@ -14255,7 +14255,8 @@ public final class Protos {
      *
      * <pre>
      * The version number of the wallet - used to detect wallets that were produced in the future
-     * (i.e the wallet may contain some future format this protobuf/ code does not know about)
+     * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
+     * A version that's higher than the default is considered from the future.
      * </pre>
      */
     boolean hasVersion();
@@ -14264,7 +14265,8 @@ public final class Protos {
      *
      * <pre>
      * The version number of the wallet - used to detect wallets that were produced in the future
-     * (i.e the wallet may contain some future format this protobuf/ code does not know about)
+     * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
+     * A version that's higher than the default is considered from the future.
      * </pre>
      */
     int getVersion();
@@ -15013,7 +15015,8 @@ public final class Protos {
      *
      * <pre>
      * The version number of the wallet - used to detect wallets that were produced in the future
-     * (i.e the wallet may contain some future format this protobuf/ code does not know about)
+     * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
+     * A version that's higher than the default is considered from the future.
      * </pre>
      */
     public boolean hasVersion() {
@@ -15024,7 +15027,8 @@ public final class Protos {
      *
      * <pre>
      * The version number of the wallet - used to detect wallets that were produced in the future
-     * (i.e the wallet may contain some future format this protobuf/ code does not know about)
+     * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
+     * A version that's higher than the default is considered from the future.
      * </pre>
      */
     public int getVersion() {
@@ -17126,7 +17130,8 @@ public final class Protos {
        *
        * <pre>
        * The version number of the wallet - used to detect wallets that were produced in the future
-       * (i.e the wallet may contain some future format this protobuf/ code does not know about)
+       * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
+       * A version that's higher than the default is considered from the future.
        * </pre>
        */
       public boolean hasVersion() {
@@ -17137,7 +17142,8 @@ public final class Protos {
        *
        * <pre>
        * The version number of the wallet - used to detect wallets that were produced in the future
-       * (i.e the wallet may contain some future format this protobuf/ code does not know about)
+       * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
+       * A version that's higher than the default is considered from the future.
        * </pre>
        */
       public int getVersion() {
@@ -17148,7 +17154,8 @@ public final class Protos {
        *
        * <pre>
        * The version number of the wallet - used to detect wallets that were produced in the future
-       * (i.e the wallet may contain some future format this protobuf/ code does not know about)
+       * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
+       * A version that's higher than the default is considered from the future.
        * </pre>
        */
       public Builder setVersion(int value) {
@@ -17162,7 +17169,8 @@ public final class Protos {
        *
        * <pre>
        * The version number of the wallet - used to detect wallets that were produced in the future
-       * (i.e the wallet may contain some future format this protobuf/ code does not know about)
+       * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
+       * A version that's higher than the default is considered from the future.
        * </pre>
        */
       public Builder clearVersion() {