From 81ddd50ffb1989afc95b351017bf08598c836f87 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 23 Feb 2019 22:52:01 +0100 Subject: [PATCH] build.gradle: Make protobuf-gradle-plugin use protoc from the repository. This updates the protoc version to 3.6.1, fixing many warnings in the generated sources. --- .travis.yml | 3 +- core/build.gradle | 3 + .../org/bitcoin/crawler/PeerSeedProtos.java | 195 +++- .../org/bitcoin/paymentchannel/Protos.java | 729 +++++++++--- .../bitcoin/protocols/payments/Protos.java | 392 +++++-- .../protocols/channels/ClientState.java | 132 ++- .../protocols/channels/ServerState.java | 132 ++- .../main/java/org/bitcoinj/wallet/Protos.java | 1012 +++++++++++++---- 8 files changed, 2074 insertions(+), 524 deletions(-) diff --git a/.travis.yml b/.travis.yml index be4fa608..7f4c33cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,7 @@ language: java jdk: - openjdk8 - openjdk11 -install: - - sudo apt-get install -y protobuf-compiler +install: true script: # excluding wallet-template because of the unreliable JavaFX dependency - gradle clean build -x :wallettemplate:compileJava diff --git a/core/build.gradle b/core/build.gradle index c2b98ced..ba93d6f2 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -29,6 +29,9 @@ compileJava.options.encoding = 'UTF-8' compileTestJava.options.encoding = 'UTF-8' protobuf { + protoc { + artifact = 'com.google.protobuf:protoc:3.6.1' + } generatedFilesBaseDir = new File(projectDir, '/src') // workaround for '$projectDir/src' } diff --git a/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java b/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java index 4124add6..8788a2a4 100644 --- a/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java +++ b/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java @@ -57,6 +57,7 @@ public final class PeerSeedProtos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:org.bitcoin.crawler.PeerSeedData) PeerSeedDataOrBuilder { + private static final long serialVersionUID = 0L; // Use PeerSeedData.newBuilder() to construct. private PeerSeedData(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -77,6 +78,9 @@ public final class PeerSeedProtos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -88,13 +92,6 @@ public final class PeerSeedProtos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000001; @@ -111,6 +108,13 @@ public final class PeerSeedProtos { services_ = input.readUInt32(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -128,6 +132,7 @@ public final class PeerSeedProtos { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable @@ -209,6 +214,7 @@ public final class PeerSeedProtos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -230,6 +236,7 @@ public final class PeerSeedProtos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -244,6 +251,7 @@ public final class PeerSeedProtos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -265,7 +273,6 @@ public final class PeerSeedProtos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -302,7 +309,7 @@ public final class PeerSeedProtos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasIpAddress()) { hash = (37 * hash) + IP_ADDRESS_FIELD_NUMBER; hash = (53 * hash) + getIpAddress().hashCode(); @@ -320,6 +327,17 @@ public final class PeerSeedProtos { return hash; } + public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -379,6 +397,7 @@ public final class PeerSeedProtos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -386,6 +405,7 @@ public final class PeerSeedProtos { public static Builder newBuilder(org.bitcoin.crawler.PeerSeedProtos.PeerSeedData prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -409,6 +429,7 @@ public final class PeerSeedProtos { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable @@ -431,6 +452,7 @@ public final class PeerSeedProtos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); ipAddress_ = ""; @@ -442,15 +464,18 @@ public final class PeerSeedProtos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor; } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData getDefaultInstanceForType() { return org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData build() { org.bitcoin.crawler.PeerSeedProtos.PeerSeedData result = buildPartial(); if (!result.isInitialized()) { @@ -459,6 +484,7 @@ public final class PeerSeedProtos { return result; } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData buildPartial() { org.bitcoin.crawler.PeerSeedProtos.PeerSeedData result = new org.bitcoin.crawler.PeerSeedProtos.PeerSeedData(this); int from_bitField0_ = bitField0_; @@ -480,32 +506,39 @@ public final class PeerSeedProtos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.crawler.PeerSeedProtos.PeerSeedData) { return mergeFrom((org.bitcoin.crawler.PeerSeedProtos.PeerSeedData)other); @@ -533,6 +566,7 @@ public final class PeerSeedProtos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasIpAddress()) { return false; @@ -546,6 +580,7 @@ public final class PeerSeedProtos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -704,11 +739,13 @@ public final class PeerSeedProtos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -730,11 +767,12 @@ public final class PeerSeedProtos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PeerSeedData parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PeerSeedData(input, extensionRegistry); + return new PeerSeedData(input, extensionRegistry); } }; @@ -747,6 +785,7 @@ public final class PeerSeedProtos { return PARSER; } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -819,6 +858,7 @@ public final class PeerSeedProtos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:org.bitcoin.crawler.PeerSeeds) PeerSeedsOrBuilder { + private static final long serialVersionUID = 0L; // Use PeerSeeds.newBuilder() to construct. private PeerSeeds(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -839,6 +879,9 @@ public final class PeerSeedProtos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -850,13 +893,6 @@ public final class PeerSeedProtos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { seed_ = new java.util.ArrayList(); @@ -877,6 +913,13 @@ public final class PeerSeedProtos { net_ = bs; break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -897,6 +940,7 @@ public final class PeerSeedProtos { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable @@ -1006,6 +1050,7 @@ public final class PeerSeedProtos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1029,6 +1074,7 @@ public final class PeerSeedProtos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < seed_.size(); i++) { @@ -1043,6 +1089,7 @@ public final class PeerSeedProtos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1064,7 +1111,6 @@ public final class PeerSeedProtos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -1098,7 +1144,7 @@ public final class PeerSeedProtos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (getSeedCount() > 0) { hash = (37 * hash) + SEED_FIELD_NUMBER; hash = (53 * hash) + getSeedList().hashCode(); @@ -1117,6 +1163,17 @@ public final class PeerSeedProtos { return hash; } + public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1176,6 +1233,7 @@ public final class PeerSeedProtos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1183,6 +1241,7 @@ public final class PeerSeedProtos { public static Builder newBuilder(org.bitcoin.crawler.PeerSeedProtos.PeerSeeds prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1206,6 +1265,7 @@ public final class PeerSeedProtos { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable @@ -1229,6 +1289,7 @@ public final class PeerSeedProtos { getSeedFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (seedBuilder_ == null) { @@ -1244,15 +1305,18 @@ public final class PeerSeedProtos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor; } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds getDefaultInstanceForType() { return org.bitcoin.crawler.PeerSeedProtos.PeerSeeds.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds build() { org.bitcoin.crawler.PeerSeedProtos.PeerSeeds result = buildPartial(); if (!result.isInitialized()) { @@ -1261,6 +1325,7 @@ public final class PeerSeedProtos { return result; } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds buildPartial() { org.bitcoin.crawler.PeerSeedProtos.PeerSeeds result = new org.bitcoin.crawler.PeerSeedProtos.PeerSeeds(this); int from_bitField0_ = bitField0_; @@ -1287,32 +1352,39 @@ public final class PeerSeedProtos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.crawler.PeerSeedProtos.PeerSeeds) { return mergeFrom((org.bitcoin.crawler.PeerSeedProtos.PeerSeeds)other); @@ -1363,6 +1435,7 @@ public final class PeerSeedProtos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasTimestamp()) { return false; @@ -1378,6 +1451,7 @@ public final class PeerSeedProtos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1760,11 +1834,13 @@ public final class PeerSeedProtos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1786,11 +1862,12 @@ public final class PeerSeedProtos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PeerSeeds parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PeerSeeds(input, extensionRegistry); + return new PeerSeeds(input, extensionRegistry); } }; @@ -1803,6 +1880,7 @@ public final class PeerSeedProtos { return PARSER; } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1847,6 +1925,7 @@ public final class PeerSeedProtos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:org.bitcoin.crawler.SignedPeerSeeds) SignedPeerSeedsOrBuilder { + private static final long serialVersionUID = 0L; // Use SignedPeerSeeds.newBuilder() to construct. private SignedPeerSeeds(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -1867,6 +1946,9 @@ public final class PeerSeedProtos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1878,13 +1960,6 @@ public final class PeerSeedProtos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; peerSeeds_ = input.readBytes(); @@ -1900,6 +1975,13 @@ public final class PeerSeedProtos { pubkey_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -1917,6 +1999,7 @@ public final class PeerSeedProtos { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable @@ -1971,6 +2054,7 @@ public final class PeerSeedProtos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1992,6 +2076,7 @@ public final class PeerSeedProtos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -2006,6 +2091,7 @@ public final class PeerSeedProtos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -2028,7 +2114,6 @@ public final class PeerSeedProtos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -2065,7 +2150,7 @@ public final class PeerSeedProtos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasPeerSeeds()) { hash = (37 * hash) + PEER_SEEDS_FIELD_NUMBER; hash = (53 * hash) + getPeerSeeds().hashCode(); @@ -2083,6 +2168,17 @@ public final class PeerSeedProtos { return hash; } + public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2142,6 +2238,7 @@ public final class PeerSeedProtos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -2149,6 +2246,7 @@ public final class PeerSeedProtos { public static Builder newBuilder(org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -2172,6 +2270,7 @@ public final class PeerSeedProtos { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable @@ -2194,6 +2293,7 @@ public final class PeerSeedProtos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); peerSeeds_ = com.google.protobuf.ByteString.EMPTY; @@ -2205,15 +2305,18 @@ public final class PeerSeedProtos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor; } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds getDefaultInstanceForType() { return org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds build() { org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds result = buildPartial(); if (!result.isInitialized()) { @@ -2222,6 +2325,7 @@ public final class PeerSeedProtos { return result; } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds buildPartial() { org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds result = new org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds(this); int from_bitField0_ = bitField0_; @@ -2243,32 +2347,39 @@ public final class PeerSeedProtos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds) { return mergeFrom((org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds)other); @@ -2294,6 +2405,7 @@ public final class PeerSeedProtos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasPeerSeeds()) { return false; @@ -2307,6 +2419,7 @@ public final class PeerSeedProtos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2430,11 +2543,13 @@ public final class PeerSeedProtos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2456,11 +2571,12 @@ public final class PeerSeedProtos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public SignedPeerSeeds parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SignedPeerSeeds(input, extensionRegistry); + return new SignedPeerSeeds(input, extensionRegistry); } }; @@ -2473,6 +2589,7 @@ public final class PeerSeedProtos { return PARSER; } + @java.lang.Override public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/core/src/main/java/org/bitcoin/paymentchannel/Protos.java b/core/src/main/java/org/bitcoin/paymentchannel/Protos.java index c2b5afcc..cd79f9c2 100644 --- a/core/src/main/java/org/bitcoin/paymentchannel/Protos.java +++ b/core/src/main/java/org/bitcoin/paymentchannel/Protos.java @@ -194,6 +194,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.TwoWayChannelMessage) TwoWayChannelMessageOrBuilder { + private static final long serialVersionUID = 0L; // Use TwoWayChannelMessage.newBuilder() to construct. private TwoWayChannelMessage(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -212,6 +213,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -223,15 +227,9 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType value = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); @@ -371,6 +369,13 @@ public final class Protos { bitField0_ |= 0x00000100; break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -388,6 +393,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_fieldAccessorTable @@ -659,6 +665,7 @@ public final class Protos { * required .paymentchannels.TwoWayChannelMessage.MessageType type = 1; */ public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType getType() { + @SuppressWarnings("deprecation") org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType result = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.valueOf(type_); return result == null ? org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.CLIENT_VERSION : result; } @@ -886,6 +893,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -947,6 +955,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -985,6 +994,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1039,7 +1049,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -1115,7 +1124,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasType()) { hash = (37 * hash) + TYPE_FIELD_NUMBER; hash = (53 * hash) + type_; @@ -1165,6 +1174,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1224,6 +1244,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1231,6 +1252,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1260,6 +1282,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_fieldAccessorTable @@ -1292,6 +1315,7 @@ public final class Protos { getErrorFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); type_ = 1; @@ -1359,15 +1383,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage build() { org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage result = buildPartial(); if (!result.isInitialized()) { @@ -1376,6 +1403,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage buildPartial() { org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage result = new org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage(this); int from_bitField0_ = bitField0_; @@ -1469,32 +1497,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage) { return mergeFrom((org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage)other); @@ -1544,6 +1579,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasType()) { return false; @@ -1591,6 +1627,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1633,6 +1670,7 @@ public final class Protos { * required .paymentchannels.TwoWayChannelMessage.MessageType type = 1; */ public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType getType() { + @SuppressWarnings("deprecation") org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType result = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.valueOf(type_); return result == null ? org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.CLIENT_VERSION : result; } @@ -2885,11 +2923,13 @@ public final class Protos { } return errorBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2911,11 +2951,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public TwoWayChannelMessage parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new TwoWayChannelMessage(input, extensionRegistry); + return new TwoWayChannelMessage(input, extensionRegistry); } }; @@ -2928,6 +2969,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -3010,6 +3052,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.ClientVersion) ClientVersionOrBuilder { + private static final long serialVersionUID = 0L; // Use ClientVersion.newBuilder() to construct. private ClientVersion(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -3031,6 +3074,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -3042,13 +3088,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { bitField0_ |= 0x00000001; major_ = input.readInt32(); @@ -3069,6 +3108,13 @@ public final class Protos { timeWindowSecs_ = input.readUInt64(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -3086,6 +3132,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_fieldAccessorTable @@ -3179,6 +3226,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -3192,6 +3240,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -3209,6 +3258,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -3235,7 +3285,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -3277,7 +3326,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasMajor()) { hash = (37 * hash) + MAJOR_FIELD_NUMBER; hash = (53 * hash) + getMajor(); @@ -3300,6 +3349,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3359,6 +3419,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -3366,6 +3427,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ClientVersion prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -3394,6 +3456,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_fieldAccessorTable @@ -3416,6 +3479,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); major_ = 0; @@ -3429,15 +3493,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ClientVersion getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ClientVersion build() { org.bitcoin.paymentchannel.Protos.ClientVersion result = buildPartial(); if (!result.isInitialized()) { @@ -3446,6 +3513,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ClientVersion buildPartial() { org.bitcoin.paymentchannel.Protos.ClientVersion result = new org.bitcoin.paymentchannel.Protos.ClientVersion(this); int from_bitField0_ = bitField0_; @@ -3471,32 +3539,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.ClientVersion) { return mergeFrom((org.bitcoin.paymentchannel.Protos.ClientVersion)other); @@ -3525,6 +3600,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasMajor()) { return false; @@ -3532,6 +3608,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -3729,11 +3806,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -3755,11 +3834,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ClientVersion parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ClientVersion(input, extensionRegistry); + return new ClientVersion(input, extensionRegistry); } }; @@ -3772,6 +3852,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ClientVersion getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -3817,6 +3898,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.ServerVersion) ServerVersionOrBuilder { + private static final long serialVersionUID = 0L; // Use ServerVersion.newBuilder() to construct. private ServerVersion(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -3836,6 +3918,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -3847,13 +3932,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { bitField0_ |= 0x00000001; major_ = input.readInt32(); @@ -3864,6 +3942,13 @@ public final class Protos { minor_ = input.readInt32(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -3881,6 +3966,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_fieldAccessorTable @@ -3920,6 +4006,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -3933,6 +4020,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -3944,6 +4032,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -3962,7 +4051,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -3994,7 +4082,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasMajor()) { hash = (37 * hash) + MAJOR_FIELD_NUMBER; hash = (53 * hash) + getMajor(); @@ -4008,6 +4096,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4067,6 +4166,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -4074,6 +4174,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ServerVersion prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -4107,6 +4208,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_fieldAccessorTable @@ -4129,6 +4231,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); major_ = 0; @@ -4138,15 +4241,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ServerVersion getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ServerVersion build() { org.bitcoin.paymentchannel.Protos.ServerVersion result = buildPartial(); if (!result.isInitialized()) { @@ -4155,6 +4261,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ServerVersion buildPartial() { org.bitcoin.paymentchannel.Protos.ServerVersion result = new org.bitcoin.paymentchannel.Protos.ServerVersion(this); int from_bitField0_ = bitField0_; @@ -4172,32 +4279,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.ServerVersion) { return mergeFrom((org.bitcoin.paymentchannel.Protos.ServerVersion)other); @@ -4220,6 +4334,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasMajor()) { return false; @@ -4227,6 +4342,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4309,11 +4425,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -4335,11 +4453,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ServerVersion parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ServerVersion(input, extensionRegistry); + return new ServerVersion(input, extensionRegistry); } }; @@ -4352,6 +4471,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ServerVersion getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -4473,6 +4593,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.Initiate) InitiateOrBuilder { + private static final long serialVersionUID = 0L; // Use Initiate.newBuilder() to construct. private Initiate(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -4494,6 +4615,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -4505,13 +4629,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; multisigKey_ = input.readBytes(); @@ -4532,6 +4649,13 @@ public final class Protos { minPayment_ = input.readUInt64(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -4549,6 +4673,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_fieldAccessorTable @@ -4682,6 +4807,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -4707,6 +4833,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -4724,6 +4851,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -4750,7 +4878,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -4792,7 +4919,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasMultisigKey()) { hash = (37 * hash) + MULTISIG_KEY_FIELD_NUMBER; hash = (53 * hash) + getMultisigKey().hashCode(); @@ -4817,6 +4944,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4876,6 +5014,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -4883,6 +5022,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.Initiate prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -4910,6 +5050,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_fieldAccessorTable @@ -4932,6 +5073,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); multisigKey_ = com.google.protobuf.ByteString.EMPTY; @@ -4945,15 +5087,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Initiate getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Initiate build() { org.bitcoin.paymentchannel.Protos.Initiate result = buildPartial(); if (!result.isInitialized()) { @@ -4962,6 +5107,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Initiate buildPartial() { org.bitcoin.paymentchannel.Protos.Initiate result = new org.bitcoin.paymentchannel.Protos.Initiate(this); int from_bitField0_ = bitField0_; @@ -4987,32 +5133,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.Initiate) { return mergeFrom((org.bitcoin.paymentchannel.Protos.Initiate)other); @@ -5041,6 +5194,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasMultisigKey()) { return false; @@ -5057,6 +5211,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -5334,11 +5489,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -5360,11 +5517,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Initiate parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Initiate(input, extensionRegistry); + return new Initiate(input, extensionRegistry); } }; @@ -5377,6 +5535,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Initiate getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -5448,6 +5607,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.ProvideRefund) ProvideRefundOrBuilder { + private static final long serialVersionUID = 0L; // Use ProvideRefund.newBuilder() to construct. private ProvideRefund(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -5467,6 +5627,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -5478,13 +5641,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; multisigKey_ = input.readBytes(); @@ -5495,6 +5651,13 @@ public final class Protos { tx_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -5512,6 +5675,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_fieldAccessorTable @@ -5583,6 +5747,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -5600,6 +5765,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -5611,6 +5777,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -5629,7 +5796,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -5661,7 +5827,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasMultisigKey()) { hash = (37 * hash) + MULTISIG_KEY_FIELD_NUMBER; hash = (53 * hash) + getMultisigKey().hashCode(); @@ -5675,6 +5841,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -5734,6 +5911,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -5741,6 +5919,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ProvideRefund prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -5768,6 +5947,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_fieldAccessorTable @@ -5790,6 +5970,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); multisigKey_ = com.google.protobuf.ByteString.EMPTY; @@ -5799,15 +5980,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ProvideRefund getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ProvideRefund build() { org.bitcoin.paymentchannel.Protos.ProvideRefund result = buildPartial(); if (!result.isInitialized()) { @@ -5816,6 +6000,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ProvideRefund buildPartial() { org.bitcoin.paymentchannel.Protos.ProvideRefund result = new org.bitcoin.paymentchannel.Protos.ProvideRefund(this); int from_bitField0_ = bitField0_; @@ -5833,32 +6018,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.ProvideRefund) { return mergeFrom((org.bitcoin.paymentchannel.Protos.ProvideRefund)other); @@ -5881,6 +6073,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasMultisigKey()) { return false; @@ -5891,6 +6084,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -6043,11 +6237,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -6069,11 +6265,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ProvideRefund parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ProvideRefund(input, extensionRegistry); + return new ProvideRefund(input, extensionRegistry); } }; @@ -6086,6 +6283,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ProvideRefund getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -6120,6 +6318,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.ReturnRefund) ReturnRefundOrBuilder { + private static final long serialVersionUID = 0L; // Use ReturnRefund.newBuilder() to construct. private ReturnRefund(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -6138,6 +6337,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -6149,18 +6351,18 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; signature_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -6178,6 +6380,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_fieldAccessorTable @@ -6202,6 +6405,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -6215,6 +6419,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -6223,6 +6428,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -6237,7 +6443,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -6264,7 +6469,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasSignature()) { hash = (37 * hash) + SIGNATURE_FIELD_NUMBER; hash = (53 * hash) + getSignature().hashCode(); @@ -6274,6 +6479,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -6333,6 +6549,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -6340,6 +6557,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ReturnRefund prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -6371,6 +6589,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_fieldAccessorTable @@ -6393,6 +6612,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); signature_ = com.google.protobuf.ByteString.EMPTY; @@ -6400,15 +6620,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ReturnRefund getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ReturnRefund build() { org.bitcoin.paymentchannel.Protos.ReturnRefund result = buildPartial(); if (!result.isInitialized()) { @@ -6417,6 +6640,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ReturnRefund buildPartial() { org.bitcoin.paymentchannel.Protos.ReturnRefund result = new org.bitcoin.paymentchannel.Protos.ReturnRefund(this); int from_bitField0_ = bitField0_; @@ -6430,32 +6654,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.ReturnRefund) { return mergeFrom((org.bitcoin.paymentchannel.Protos.ReturnRefund)other); @@ -6475,6 +6706,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasSignature()) { return false; @@ -6482,6 +6714,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -6535,11 +6768,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -6561,11 +6796,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ReturnRefund parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReturnRefund(input, extensionRegistry); + return new ReturnRefund(input, extensionRegistry); } }; @@ -6578,6 +6814,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ReturnRefund getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -6695,6 +6932,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.ProvideContract) ProvideContractOrBuilder { + private static final long serialVersionUID = 0L; // Use ProvideContract.newBuilder() to construct. private ProvideContract(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -6714,6 +6952,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -6725,13 +6966,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; tx_ = input.readBytes(); @@ -6755,6 +6989,13 @@ public final class Protos { clientKey_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -6772,6 +7013,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_fieldAccessorTable @@ -6897,6 +7139,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -6918,6 +7161,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -6932,6 +7176,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -6954,7 +7199,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -6991,7 +7235,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasTx()) { hash = (37 * hash) + TX_FIELD_NUMBER; hash = (53 * hash) + getTx().hashCode(); @@ -7009,6 +7253,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -7068,6 +7323,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -7075,6 +7331,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ProvideContract prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -7102,6 +7359,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_fieldAccessorTable @@ -7125,6 +7383,7 @@ public final class Protos { getInitialPaymentFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); tx_ = com.google.protobuf.ByteString.EMPTY; @@ -7140,15 +7399,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ProvideContract getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ProvideContract build() { org.bitcoin.paymentchannel.Protos.ProvideContract result = buildPartial(); if (!result.isInitialized()) { @@ -7157,6 +7419,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ProvideContract buildPartial() { org.bitcoin.paymentchannel.Protos.ProvideContract result = new org.bitcoin.paymentchannel.Protos.ProvideContract(this); int from_bitField0_ = bitField0_; @@ -7182,32 +7445,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.ProvideContract) { return mergeFrom((org.bitcoin.paymentchannel.Protos.ProvideContract)other); @@ -7233,6 +7503,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasTx()) { return false; @@ -7246,6 +7517,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -7603,11 +7875,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -7629,11 +7903,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public ProvideContract parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ProvideContract(input, extensionRegistry); + return new ProvideContract(input, extensionRegistry); } }; @@ -7646,6 +7921,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.ProvideContract getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -7738,6 +8014,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.UpdatePayment) UpdatePaymentOrBuilder { + private static final long serialVersionUID = 0L; // Use UpdatePayment.newBuilder() to construct. private UpdatePayment(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -7758,6 +8035,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -7769,13 +8049,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { bitField0_ |= 0x00000001; clientChangeValue_ = input.readUInt64(); @@ -7791,6 +8064,13 @@ public final class Protos { info_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -7808,6 +8088,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_fieldAccessorTable @@ -7894,6 +8175,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -7911,6 +8193,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -7925,6 +8208,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -7947,7 +8231,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -7984,7 +8267,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasClientChangeValue()) { hash = (37 * hash) + CLIENT_CHANGE_VALUE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( @@ -8003,6 +8286,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -8062,6 +8356,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -8069,6 +8364,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.UpdatePayment prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -8108,6 +8404,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_fieldAccessorTable @@ -8130,6 +8427,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); clientChangeValue_ = 0L; @@ -8141,15 +8439,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.UpdatePayment getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.UpdatePayment build() { org.bitcoin.paymentchannel.Protos.UpdatePayment result = buildPartial(); if (!result.isInitialized()) { @@ -8158,6 +8459,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.UpdatePayment buildPartial() { org.bitcoin.paymentchannel.Protos.UpdatePayment result = new org.bitcoin.paymentchannel.Protos.UpdatePayment(this); int from_bitField0_ = bitField0_; @@ -8179,32 +8481,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.UpdatePayment) { return mergeFrom((org.bitcoin.paymentchannel.Protos.UpdatePayment)other); @@ -8230,6 +8539,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasClientChangeValue()) { return false; @@ -8240,6 +8550,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -8424,11 +8735,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -8450,11 +8763,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public UpdatePayment parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UpdatePayment(input, extensionRegistry); + return new UpdatePayment(input, extensionRegistry); } }; @@ -8467,6 +8781,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.UpdatePayment getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -8505,6 +8820,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.PaymentAck) PaymentAckOrBuilder { + private static final long serialVersionUID = 0L; // Use PaymentAck.newBuilder() to construct. private PaymentAck(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -8523,6 +8839,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -8534,18 +8853,18 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; info_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -8563,6 +8882,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_fieldAccessorTable @@ -8595,6 +8915,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -8604,6 +8925,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -8612,6 +8934,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -8626,7 +8949,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -8653,7 +8975,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasInfo()) { hash = (37 * hash) + INFO_FIELD_NUMBER; hash = (53 * hash) + getInfo().hashCode(); @@ -8663,6 +8985,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -8722,6 +9055,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -8729,6 +9063,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.PaymentAck prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -8756,6 +9091,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_fieldAccessorTable @@ -8778,6 +9114,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); info_ = com.google.protobuf.ByteString.EMPTY; @@ -8785,15 +9122,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.PaymentAck getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.PaymentAck build() { org.bitcoin.paymentchannel.Protos.PaymentAck result = buildPartial(); if (!result.isInitialized()) { @@ -8802,6 +9142,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.PaymentAck buildPartial() { org.bitcoin.paymentchannel.Protos.PaymentAck result = new org.bitcoin.paymentchannel.Protos.PaymentAck(this); int from_bitField0_ = bitField0_; @@ -8815,32 +9156,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.PaymentAck) { return mergeFrom((org.bitcoin.paymentchannel.Protos.PaymentAck)other); @@ -8860,10 +9208,12 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -8933,11 +9283,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -8959,11 +9311,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PaymentAck parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PaymentAck(input, extensionRegistry); + return new PaymentAck(input, extensionRegistry); } }; @@ -8976,6 +9329,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.PaymentAck getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -9012,6 +9366,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.Settlement) SettlementOrBuilder { + private static final long serialVersionUID = 0L; // Use Settlement.newBuilder() to construct. private Settlement(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -9030,6 +9385,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -9041,18 +9399,18 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 26: { bitField0_ |= 0x00000001; tx_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -9070,6 +9428,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_fieldAccessorTable @@ -9104,6 +9463,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -9117,6 +9477,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -9125,6 +9486,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -9139,7 +9501,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -9166,7 +9527,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasTx()) { hash = (37 * hash) + TX_FIELD_NUMBER; hash = (53 * hash) + getTx().hashCode(); @@ -9176,6 +9537,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -9235,6 +9607,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -9242,6 +9615,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.Settlement prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -9265,6 +9639,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_fieldAccessorTable @@ -9287,6 +9662,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); tx_ = com.google.protobuf.ByteString.EMPTY; @@ -9294,15 +9670,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Settlement getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Settlement build() { org.bitcoin.paymentchannel.Protos.Settlement result = buildPartial(); if (!result.isInitialized()) { @@ -9311,6 +9690,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Settlement buildPartial() { org.bitcoin.paymentchannel.Protos.Settlement result = new org.bitcoin.paymentchannel.Protos.Settlement(this); int from_bitField0_ = bitField0_; @@ -9324,32 +9704,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.Settlement) { return mergeFrom((org.bitcoin.paymentchannel.Protos.Settlement)other); @@ -9369,6 +9756,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasTx()) { return false; @@ -9376,6 +9764,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -9449,11 +9838,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -9475,11 +9866,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Settlement parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Settlement(input, extensionRegistry); + return new Settlement(input, extensionRegistry); } }; @@ -9492,6 +9884,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Settlement getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -9567,6 +9960,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.Error) ErrorOrBuilder { + private static final long serialVersionUID = 0L; // Use Error.newBuilder() to construct. private Error(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -9587,6 +9981,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -9598,15 +9995,9 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.bitcoin.paymentchannel.Protos.Error.ErrorCode value = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); @@ -9627,6 +10018,13 @@ public final class Protos { expectedValue_ = input.readUInt64(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -9644,6 +10042,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_fieldAccessorTable @@ -9866,6 +10265,7 @@ public final class Protos { * optional .paymentchannels.Error.ErrorCode code = 1 [default = OTHER]; */ public org.bitcoin.paymentchannel.Protos.Error.ErrorCode getCode() { + @SuppressWarnings("deprecation") org.bitcoin.paymentchannel.Protos.Error.ErrorCode result = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.valueOf(code_); return result == null ? org.bitcoin.paymentchannel.Protos.Error.ErrorCode.OTHER : result; } @@ -9948,6 +10348,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -9957,6 +10358,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -9971,6 +10373,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -9992,7 +10395,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -10028,7 +10430,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasCode()) { hash = (37 * hash) + CODE_FIELD_NUMBER; hash = (53 * hash) + code_; @@ -10047,6 +10449,17 @@ public final class Protos { return hash; } + public static org.bitcoin.paymentchannel.Protos.Error parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.paymentchannel.Protos.Error parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.paymentchannel.Protos.Error parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -10106,6 +10519,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -10113,6 +10527,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.Error prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -10142,6 +10557,7 @@ public final class Protos { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_fieldAccessorTable @@ -10164,6 +10580,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); code_ = 8; @@ -10175,15 +10592,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_descriptor; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Error getDefaultInstanceForType() { return org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Error build() { org.bitcoin.paymentchannel.Protos.Error result = buildPartial(); if (!result.isInitialized()) { @@ -10192,6 +10612,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Error buildPartial() { org.bitcoin.paymentchannel.Protos.Error result = new org.bitcoin.paymentchannel.Protos.Error(this); int from_bitField0_ = bitField0_; @@ -10213,32 +10634,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.paymentchannel.Protos.Error) { return mergeFrom((org.bitcoin.paymentchannel.Protos.Error)other); @@ -10266,10 +10694,12 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -10300,6 +10730,7 @@ public final class Protos { * optional .paymentchannels.Error.ErrorCode code = 1 [default = OTHER]; */ public org.bitcoin.paymentchannel.Protos.Error.ErrorCode getCode() { + @SuppressWarnings("deprecation") org.bitcoin.paymentchannel.Protos.Error.ErrorCode result = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.valueOf(code_); return result == null ? org.bitcoin.paymentchannel.Protos.Error.ErrorCode.OTHER : result; } @@ -10472,11 +10903,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -10498,11 +10931,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Error parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Error(input, extensionRegistry); + return new Error(input, extensionRegistry); } }; @@ -10515,6 +10949,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.paymentchannel.Protos.Error getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -10594,7 +11029,7 @@ public final class Protos { "n\022+\n\010initiate\030\004 \001(\0132\031.paymentchannels.In" + "itiate\0226\n\016provide_refund\030\005 \001(\0132\036.payment" + "channels.ProvideRefund\0224\n\rreturn_refund\030" + - "\006 \001(\0132\035.paymentchannels.ReturnRefund\022:\n\020", + "\006 \001(\0132\035.paymentchannels.ReturnRefund\022:\n\020" + "provide_contract\030\007 \001(\0132 .paymentchannels" + ".ProvideContract\0226\n\016update_payment\030\010 \001(\013" + "2\036.paymentchannels.UpdatePayment\0220\n\013paym" + @@ -10604,7 +11039,7 @@ public final class Protos { "nels.Error\"\315\001\n\013MessageType\022\022\n\016CLIENT_VER" + "SION\020\001\022\022\n\016SERVER_VERSION\020\002\022\014\n\010INITIATE\020\003" + "\022\022\n\016PROVIDE_REFUND\020\004\022\021\n\rRETURN_REFUND\020\005\022" + - "\024\n\020PROVIDE_CONTRACT\020\006\022\020\n\014CHANNEL_OPEN\020\007\022", + "\024\n\020PROVIDE_CONTRACT\020\006\022\020\n\014CHANNEL_OPEN\020\007\022" + "\022\n\016UPDATE_PAYMENT\020\010\022\017\n\013PAYMENT_ACK\020\013\022\t\n\005" + "CLOSE\020\t\022\t\n\005ERROR\020\n\"y\n\rClientVersion\022\r\n\005m" + "ajor\030\001 \002(\005\022\020\n\005minor\030\002 \001(\005:\0010\022&\n\036previous" + @@ -10614,7 +11049,7 @@ public final class Protos { "ate\022\024\n\014multisig_key\030\001 \002(\014\022!\n\031min_accepte" + "d_channel_size\030\002 \002(\004\022\030\n\020expire_time_secs" + "\030\003 \002(\004\022\023\n\013min_payment\030\004 \002(\004\"1\n\rProvideRe" + - "fund\022\024\n\014multisig_key\030\001 \002(\014\022\n\n\002tx\030\002 \002(\014\"!", + "fund\022\024\n\014multisig_key\030\001 \002(\014\022\n\n\002tx\030\002 \002(\014\"!" + "\n\014ReturnRefund\022\021\n\tsignature\030\001 \002(\014\"j\n\017Pro" + "videContract\022\n\n\002tx\030\001 \002(\014\0227\n\017initial_paym" + "ent\030\002 \002(\0132\036.paymentchannels.UpdatePaymen" + @@ -10624,7 +11059,7 @@ public final class Protos { "fo\030\001 \001(\014\"\030\n\nSettlement\022\n\n\002tx\030\003 \002(\014\"\251\002\n\005E" + "rror\0225\n\004code\030\001 \001(\0162 .paymentchannels.Err" + "or.ErrorCode:\005OTHER\022\023\n\013explanation\030\002 \001(\t" + - "\022\026\n\016expected_value\030\003 \001(\004\"\273\001\n\tErrorCode\022\013", + "\022\026\n\016expected_value\030\003 \001(\004\"\273\001\n\tErrorCode\022\013" + "\n\007TIMEOUT\020\001\022\020\n\014SYNTAX_ERROR\020\002\022\031\n\025NO_ACCE" + "PTABLE_VERSION\020\003\022\023\n\017BAD_TRANSACTION\020\004\022\034\n" + "\030TIME_WINDOW_UNACCEPTABLE\020\005\022\033\n\027CHANNEL_V" + diff --git a/core/src/main/java/org/bitcoin/protocols/payments/Protos.java b/core/src/main/java/org/bitcoin/protocols/payments/Protos.java index 7db4cb8c..7cb25808 100644 --- a/core/src/main/java/org/bitcoin/protocols/payments/Protos.java +++ b/core/src/main/java/org/bitcoin/protocols/payments/Protos.java @@ -63,6 +63,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:payments.Output) OutputOrBuilder { + private static final long serialVersionUID = 0L; // Use Output.newBuilder() to construct. private Output(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -82,6 +83,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -93,13 +97,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { bitField0_ |= 0x00000001; amount_ = input.readUInt64(); @@ -110,6 +107,13 @@ public final class Protos { script_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -127,6 +131,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_fieldAccessorTable @@ -182,6 +187,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -195,6 +201,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -206,6 +213,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -224,7 +232,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -256,7 +263,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasAmount()) { hash = (37 * hash) + AMOUNT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( @@ -271,6 +278,17 @@ public final class Protos { return hash; } + public static org.bitcoin.protocols.payments.Protos.Output parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.protocols.payments.Protos.Output parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.protocols.payments.Protos.Output parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -330,6 +348,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -337,6 +356,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.Output prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -364,6 +384,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_fieldAccessorTable @@ -386,6 +407,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); amount_ = 0L; @@ -395,15 +417,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_descriptor; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.Output getDefaultInstanceForType() { return org.bitcoin.protocols.payments.Protos.Output.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.Output build() { org.bitcoin.protocols.payments.Protos.Output result = buildPartial(); if (!result.isInitialized()) { @@ -412,6 +437,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.Output buildPartial() { org.bitcoin.protocols.payments.Protos.Output result = new org.bitcoin.protocols.payments.Protos.Output(this); int from_bitField0_ = bitField0_; @@ -429,32 +455,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.protocols.payments.Protos.Output) { return mergeFrom((org.bitcoin.protocols.payments.Protos.Output)other); @@ -477,6 +510,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasScript()) { return false; @@ -484,6 +518,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -601,11 +636,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -627,11 +664,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Output parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Output(input, extensionRegistry); + return new Output(input, extensionRegistry); } }; @@ -644,6 +682,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.Output getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -834,6 +873,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:payments.PaymentDetails) PaymentDetailsOrBuilder { + private static final long serialVersionUID = 0L; // Use PaymentDetails.newBuilder() to construct. private PaymentDetails(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -858,6 +898,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -869,13 +912,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000001; @@ -918,6 +954,13 @@ public final class Protos { merchantData_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -938,6 +981,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_fieldAccessorTable @@ -1233,6 +1277,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1252,6 +1297,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1278,6 +1324,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1313,7 +1360,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -1367,7 +1413,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasNetwork()) { hash = (37 * hash) + NETWORK_FIELD_NUMBER; hash = (53 * hash) + getNetwork().hashCode(); @@ -1403,6 +1449,17 @@ public final class Protos { return hash; } + public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1462,6 +1519,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1469,6 +1527,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.PaymentDetails prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1492,6 +1551,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_fieldAccessorTable @@ -1515,6 +1575,7 @@ public final class Protos { getOutputsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); network_ = "main"; @@ -1538,15 +1599,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_descriptor; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentDetails getDefaultInstanceForType() { return org.bitcoin.protocols.payments.Protos.PaymentDetails.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentDetails build() { org.bitcoin.protocols.payments.Protos.PaymentDetails result = buildPartial(); if (!result.isInitialized()) { @@ -1555,6 +1619,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentDetails buildPartial() { org.bitcoin.protocols.payments.Protos.PaymentDetails result = new org.bitcoin.protocols.payments.Protos.PaymentDetails(this); int from_bitField0_ = bitField0_; @@ -1597,32 +1662,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.protocols.payments.Protos.PaymentDetails) { return mergeFrom((org.bitcoin.protocols.payments.Protos.PaymentDetails)other); @@ -1689,6 +1761,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasTime()) { return false; @@ -1701,6 +1774,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2478,11 +2552,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2504,11 +2580,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PaymentDetails parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PaymentDetails(input, extensionRegistry); + return new PaymentDetails(input, extensionRegistry); } }; @@ -2521,6 +2598,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentDetails getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2624,6 +2702,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:payments.PaymentRequest) PaymentRequestOrBuilder { + private static final long serialVersionUID = 0L; // Use PaymentRequest.newBuilder() to construct. private PaymentRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -2646,6 +2725,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -2657,13 +2739,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { bitField0_ |= 0x00000001; paymentDetailsVersion_ = input.readUInt32(); @@ -2690,6 +2765,13 @@ public final class Protos { signature_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2707,6 +2789,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_fieldAccessorTable @@ -2854,6 +2937,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -2867,6 +2951,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -2887,6 +2972,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -2916,7 +3002,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -2963,7 +3048,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasPaymentDetailsVersion()) { hash = (37 * hash) + PAYMENT_DETAILS_VERSION_FIELD_NUMBER; hash = (53 * hash) + getPaymentDetailsVersion(); @@ -2989,6 +3074,17 @@ public final class Protos { return hash; } + public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3048,6 +3144,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -3055,6 +3152,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.PaymentRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -3078,6 +3176,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_fieldAccessorTable @@ -3100,6 +3199,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); paymentDetailsVersion_ = 1; @@ -3115,15 +3215,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_descriptor; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentRequest getDefaultInstanceForType() { return org.bitcoin.protocols.payments.Protos.PaymentRequest.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentRequest build() { org.bitcoin.protocols.payments.Protos.PaymentRequest result = buildPartial(); if (!result.isInitialized()) { @@ -3132,6 +3235,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentRequest buildPartial() { org.bitcoin.protocols.payments.Protos.PaymentRequest result = new org.bitcoin.protocols.payments.Protos.PaymentRequest(this); int from_bitField0_ = bitField0_; @@ -3161,32 +3265,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.protocols.payments.Protos.PaymentRequest) { return mergeFrom((org.bitcoin.protocols.payments.Protos.PaymentRequest)other); @@ -3220,6 +3331,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasSerializedPaymentDetails()) { return false; @@ -3227,6 +3339,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -3530,11 +3643,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -3556,11 +3671,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PaymentRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PaymentRequest(input, extensionRegistry); + return new PaymentRequest(input, extensionRegistry); } }; @@ -3573,6 +3689,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -3615,6 +3732,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:payments.X509Certificates) X509CertificatesOrBuilder { + private static final long serialVersionUID = 0L; // Use X509Certificates.newBuilder() to construct. private X509Certificates(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -3633,6 +3751,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -3644,13 +3765,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { certificate_ = new java.util.ArrayList(); @@ -3659,6 +3773,13 @@ public final class Protos { certificate_.add(input.readBytes()); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -3679,6 +3800,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_fieldAccessorTable @@ -3721,6 +3843,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -3730,6 +3853,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < certificate_.size(); i++) { @@ -3738,6 +3862,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -3757,7 +3882,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -3781,7 +3905,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (getCertificateCount() > 0) { hash = (37 * hash) + CERTIFICATE_FIELD_NUMBER; hash = (53 * hash) + getCertificateList().hashCode(); @@ -3791,6 +3915,17 @@ public final class Protos { return hash; } + public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3850,6 +3985,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -3857,6 +3993,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.X509Certificates prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -3880,6 +4017,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_fieldAccessorTable @@ -3902,6 +4040,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); certificate_ = java.util.Collections.emptyList(); @@ -3909,15 +4048,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_descriptor; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.X509Certificates getDefaultInstanceForType() { return org.bitcoin.protocols.payments.Protos.X509Certificates.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.X509Certificates build() { org.bitcoin.protocols.payments.Protos.X509Certificates result = buildPartial(); if (!result.isInitialized()) { @@ -3926,6 +4068,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.X509Certificates buildPartial() { org.bitcoin.protocols.payments.Protos.X509Certificates result = new org.bitcoin.protocols.payments.Protos.X509Certificates(this); int from_bitField0_ = bitField0_; @@ -3938,32 +4081,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.protocols.payments.Protos.X509Certificates) { return mergeFrom((org.bitcoin.protocols.payments.Protos.X509Certificates)other); @@ -3990,10 +4140,12 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4112,11 +4264,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -4138,11 +4292,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public X509Certificates parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new X509Certificates(input, extensionRegistry); + return new X509Certificates(input, extensionRegistry); } }; @@ -4155,6 +4310,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.X509Certificates getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -4284,6 +4440,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:payments.Payment) PaymentOrBuilder { + private static final long serialVersionUID = 0L; // Use Payment.newBuilder() to construct. private Payment(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -4305,6 +4462,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -4316,13 +4476,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; merchantData_ = input.readBytes(); @@ -4351,6 +4504,13 @@ public final class Protos { memo_ = bs; break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -4374,6 +4534,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_fieldAccessorTable @@ -4549,6 +4710,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -4564,6 +4726,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -4581,6 +4744,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -4611,7 +4775,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -4647,7 +4810,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasMerchantData()) { hash = (37 * hash) + MERCHANT_DATA_FIELD_NUMBER; hash = (53 * hash) + getMerchantData().hashCode(); @@ -4669,6 +4832,17 @@ public final class Protos { return hash; } + public static org.bitcoin.protocols.payments.Protos.Payment parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.protocols.payments.Protos.Payment parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.protocols.payments.Protos.Payment parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4728,6 +4902,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -4735,6 +4910,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.Payment prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -4758,6 +4934,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_fieldAccessorTable @@ -4781,6 +4958,7 @@ public final class Protos { getRefundToFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); merchantData_ = com.google.protobuf.ByteString.EMPTY; @@ -4798,15 +4976,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_descriptor; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.Payment getDefaultInstanceForType() { return org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.Payment build() { org.bitcoin.protocols.payments.Protos.Payment result = buildPartial(); if (!result.isInitialized()) { @@ -4815,6 +4996,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.Payment buildPartial() { org.bitcoin.protocols.payments.Protos.Payment result = new org.bitcoin.protocols.payments.Protos.Payment(this); int from_bitField0_ = bitField0_; @@ -4846,32 +5028,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.protocols.payments.Protos.Payment) { return mergeFrom((org.bitcoin.protocols.payments.Protos.Payment)other); @@ -4932,6 +5121,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { for (int i = 0; i < getRefundToCount(); i++) { if (!getRefundTo(i).isInitialized()) { @@ -4941,6 +5131,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -5522,11 +5713,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -5548,11 +5741,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Payment parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Payment(input, extensionRegistry); + return new Payment(input, extensionRegistry); } }; @@ -5565,6 +5759,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.Payment getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -5633,6 +5828,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:payments.PaymentACK) PaymentACKOrBuilder { + private static final long serialVersionUID = 0L; // Use PaymentACK.newBuilder() to construct. private PaymentACK(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -5651,6 +5847,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -5662,13 +5861,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { org.bitcoin.protocols.payments.Protos.Payment.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -5688,6 +5880,13 @@ public final class Protos { memo_ = bs; break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -5705,6 +5904,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_fieldAccessorTable @@ -5801,6 +6001,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -5818,6 +6019,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -5829,6 +6031,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -5846,7 +6049,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -5878,7 +6080,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasPayment()) { hash = (37 * hash) + PAYMENT_FIELD_NUMBER; hash = (53 * hash) + getPayment().hashCode(); @@ -5892,6 +6094,17 @@ public final class Protos { return hash; } + public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -5951,6 +6164,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -5958,6 +6172,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.PaymentACK prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -5981,6 +6196,7 @@ public final class Protos { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_fieldAccessorTable @@ -6004,6 +6220,7 @@ public final class Protos { getPaymentFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (paymentBuilder_ == null) { @@ -6017,15 +6234,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_descriptor; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentACK getDefaultInstanceForType() { return org.bitcoin.protocols.payments.Protos.PaymentACK.getDefaultInstance(); } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentACK build() { org.bitcoin.protocols.payments.Protos.PaymentACK result = buildPartial(); if (!result.isInitialized()) { @@ -6034,6 +6254,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentACK buildPartial() { org.bitcoin.protocols.payments.Protos.PaymentACK result = new org.bitcoin.protocols.payments.Protos.PaymentACK(this); int from_bitField0_ = bitField0_; @@ -6055,32 +6276,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoin.protocols.payments.Protos.PaymentACK) { return mergeFrom((org.bitcoin.protocols.payments.Protos.PaymentACK)other); @@ -6105,6 +6333,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasPayment()) { return false; @@ -6115,6 +6344,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -6387,11 +6617,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -6413,11 +6645,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PaymentACK parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PaymentACK(input, extensionRegistry); + return new PaymentACK(input, extensionRegistry); } }; @@ -6430,6 +6663,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoin.protocols.payments.Protos.PaymentACK getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -6484,7 +6718,7 @@ public final class Protos { "\001(\014\"\225\001\n\016PaymentRequest\022\"\n\027payment_detail" + "s_version\030\001 \001(\r:\0011\022\026\n\010pki_type\030\002 \001(\t:\004no" + "ne\022\020\n\010pki_data\030\003 \001(\014\022\"\n\032serialized_payme" + - "nt_details\030\004 \002(\014\022\021\n\tsignature\030\005 \001(\014\"\'\n\020X", + "nt_details\030\004 \002(\014\022\021\n\tsignature\030\005 \001(\014\"\'\n\020X" + "509Certificates\022\023\n\013certificate\030\001 \003(\014\"i\n\007" + "Payment\022\025\n\rmerchant_data\030\001 \001(\014\022\024\n\014transa" + "ctions\030\002 \003(\014\022#\n\trefund_to\030\003 \003(\0132\020.paymen" + 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 622b647d..82634427 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java @@ -53,6 +53,7 @@ public final class ClientState { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.StoredClientPaymentChannels) StoredClientPaymentChannelsOrBuilder { + private static final long serialVersionUID = 0L; // Use StoredClientPaymentChannels.newBuilder() to construct. private StoredClientPaymentChannels(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -71,6 +72,9 @@ public final class ClientState { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -82,13 +86,6 @@ public final class ClientState { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { channels_ = new java.util.ArrayList(); @@ -98,6 +95,13 @@ public final class ClientState { input.readMessage(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.PARSER, extensionRegistry)); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -118,6 +122,7 @@ public final class ClientState { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable @@ -161,6 +166,7 @@ public final class ClientState { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -176,6 +182,7 @@ public final class ClientState { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < channels_.size(); i++) { @@ -184,6 +191,7 @@ public final class ClientState { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -198,7 +206,6 @@ public final class ClientState { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -222,7 +229,7 @@ public final class ClientState { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (getChannelsCount() > 0) { hash = (37 * hash) + CHANNELS_FIELD_NUMBER; hash = (53 * hash) + getChannelsList().hashCode(); @@ -232,6 +239,17 @@ public final class ClientState { return hash; } + public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -291,6 +309,7 @@ public final class ClientState { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -298,6 +317,7 @@ public final class ClientState { public static Builder newBuilder(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -325,6 +345,7 @@ public final class ClientState { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable @@ -348,6 +369,7 @@ public final class ClientState { getChannelsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (channelsBuilder_ == null) { @@ -359,15 +381,18 @@ public final class ClientState { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor; } + @java.lang.Override public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels getDefaultInstanceForType() { return org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.getDefaultInstance(); } + @java.lang.Override public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels build() { org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels result = buildPartial(); if (!result.isInitialized()) { @@ -376,6 +401,7 @@ public final class ClientState { return result; } + @java.lang.Override public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels buildPartial() { org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels result = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels(this); int from_bitField0_ = bitField0_; @@ -392,32 +418,39 @@ public final class ClientState { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels) { return mergeFrom((org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels)other); @@ -460,6 +493,7 @@ public final class ClientState { return this; } + @java.lang.Override public final boolean isInitialized() { for (int i = 0; i < getChannelsCount(); i++) { if (!getChannels(i).isInitialized()) { @@ -469,6 +503,7 @@ public final class ClientState { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -727,11 +762,13 @@ public final class ClientState { } return channelsBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -753,11 +790,12 @@ public final class ClientState { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public StoredClientPaymentChannels parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StoredClientPaymentChannels(input, extensionRegistry); + return new StoredClientPaymentChannels(input, extensionRegistry); } }; @@ -770,6 +808,7 @@ public final class ClientState { return PARSER; } + @java.lang.Override public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -935,6 +974,7 @@ public final class ClientState { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.StoredClientPaymentChannel) StoredClientPaymentChannelOrBuilder { + private static final long serialVersionUID = 0L; // Use StoredClientPaymentChannel.newBuilder() to construct. private StoredClientPaymentChannel(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -963,6 +1003,9 @@ public final class ClientState { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -974,13 +1017,6 @@ public final class ClientState { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; id_ = input.readBytes(); @@ -1036,6 +1072,13 @@ public final class ClientState { serverKey_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -1053,6 +1096,7 @@ public final class ClientState { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable @@ -1271,6 +1315,7 @@ public final class ClientState { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1308,6 +1353,7 @@ public final class ClientState { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1346,6 +1392,7 @@ public final class ClientState { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1400,7 +1447,6 @@ public final class ClientState { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -1477,7 +1523,7 @@ public final class ClientState { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasId()) { hash = (37 * hash) + ID_FIELD_NUMBER; hash = (53 * hash) + getId().hashCode(); @@ -1530,6 +1576,17 @@ public final class ClientState { return hash; } + public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1589,6 +1646,7 @@ public final class ClientState { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1596,6 +1654,7 @@ public final class ClientState { public static Builder newBuilder(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1624,6 +1683,7 @@ public final class ClientState { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable @@ -1646,6 +1706,7 @@ public final class ClientState { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); id_ = com.google.protobuf.ByteString.EMPTY; @@ -1673,15 +1734,18 @@ public final class ClientState { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor; } + @java.lang.Override public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getDefaultInstanceForType() { return org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance(); } + @java.lang.Override public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel build() { org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel result = buildPartial(); if (!result.isInitialized()) { @@ -1690,6 +1754,7 @@ public final class ClientState { return result; } + @java.lang.Override public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel buildPartial() { org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel result = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel(this); int from_bitField0_ = bitField0_; @@ -1743,32 +1808,39 @@ public final class ClientState { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel) { return mergeFrom((org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel)other); @@ -1818,6 +1890,7 @@ public final class ClientState { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasId()) { return false; @@ -1843,6 +1916,7 @@ public final class ClientState { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2322,11 +2396,13 @@ public final class ClientState { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2348,11 +2424,12 @@ public final class ClientState { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public StoredClientPaymentChannel parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StoredClientPaymentChannel(input, extensionRegistry); + return new StoredClientPaymentChannel(input, extensionRegistry); } }; @@ -2365,6 +2442,7 @@ public final class ClientState { return PARSER; } + @java.lang.Override public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2399,7 +2477,7 @@ public final class ClientState { " \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(\014\022\027\n\014majorVe" + - "rsion\030\t \001(\r:\0011\022\022\n\nexpiryTime\030\n \001(\004\022\021\n\tse", + "rsion\030\t \001(\r:\0011\022\022\n\nexpiryTime\030\n \001(\004\022\021\n\tse" + "rverKey\030\013 \001(\014B.\n\037org.bitcoinj.protocols." + "channelsB\013ClientState" }; diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java index 4b806cf7..476a981d 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java @@ -53,6 +53,7 @@ public final class ServerState { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.StoredServerPaymentChannels) StoredServerPaymentChannelsOrBuilder { + private static final long serialVersionUID = 0L; // Use StoredServerPaymentChannels.newBuilder() to construct. private StoredServerPaymentChannels(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -71,6 +72,9 @@ public final class ServerState { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -82,13 +86,6 @@ public final class ServerState { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { channels_ = new java.util.ArrayList(); @@ -98,6 +95,13 @@ public final class ServerState { input.readMessage(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.PARSER, extensionRegistry)); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -118,6 +122,7 @@ public final class ServerState { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable @@ -161,6 +166,7 @@ public final class ServerState { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -176,6 +182,7 @@ public final class ServerState { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < channels_.size(); i++) { @@ -184,6 +191,7 @@ public final class ServerState { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -198,7 +206,6 @@ public final class ServerState { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -222,7 +229,7 @@ public final class ServerState { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (getChannelsCount() > 0) { hash = (37 * hash) + CHANNELS_FIELD_NUMBER; hash = (53 * hash) + getChannelsList().hashCode(); @@ -232,6 +239,17 @@ public final class ServerState { return hash; } + public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -291,6 +309,7 @@ public final class ServerState { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -298,6 +317,7 @@ public final class ServerState { public static Builder newBuilder(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -325,6 +345,7 @@ public final class ServerState { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable @@ -348,6 +369,7 @@ public final class ServerState { getChannelsFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); if (channelsBuilder_ == null) { @@ -359,15 +381,18 @@ public final class ServerState { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor; } + @java.lang.Override public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels getDefaultInstanceForType() { return org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.getDefaultInstance(); } + @java.lang.Override public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels build() { org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels result = buildPartial(); if (!result.isInitialized()) { @@ -376,6 +401,7 @@ public final class ServerState { return result; } + @java.lang.Override public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels buildPartial() { org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels result = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels(this); int from_bitField0_ = bitField0_; @@ -392,32 +418,39 @@ public final class ServerState { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels) { return mergeFrom((org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels)other); @@ -460,6 +493,7 @@ public final class ServerState { return this; } + @java.lang.Override public final boolean isInitialized() { for (int i = 0; i < getChannelsCount(); i++) { if (!getChannels(i).isInitialized()) { @@ -469,6 +503,7 @@ public final class ServerState { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -727,11 +762,13 @@ public final class ServerState { } return channelsBuilder_; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -753,11 +790,12 @@ public final class ServerState { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public StoredServerPaymentChannels parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StoredServerPaymentChannels(input, extensionRegistry); + return new StoredServerPaymentChannels(input, extensionRegistry); } }; @@ -770,6 +808,7 @@ public final class ServerState { return PARSER; } + @java.lang.Override public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -871,6 +910,7 @@ public final class ServerState { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:paymentchannels.StoredServerPaymentChannel) StoredServerPaymentChannelOrBuilder { + private static final long serialVersionUID = 0L; // Use StoredServerPaymentChannel.newBuilder() to construct. private StoredServerPaymentChannel(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -896,6 +936,9 @@ public final class ServerState { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -907,13 +950,6 @@ public final class ServerState { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { bitField0_ |= 0x00000001; bestValueToMe_ = input.readUInt64(); @@ -954,6 +990,13 @@ public final class ServerState { clientKey_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -971,6 +1014,7 @@ public final class ServerState { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable @@ -1108,6 +1152,7 @@ public final class ServerState { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1133,6 +1178,7 @@ public final class ServerState { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1162,6 +1208,7 @@ public final class ServerState { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1204,7 +1251,6 @@ public final class ServerState { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -1266,7 +1312,7 @@ public final class ServerState { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasBestValueToMe()) { hash = (37 * hash) + BESTVALUETOME_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( @@ -1306,6 +1352,17 @@ public final class ServerState { return hash; } + public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1365,6 +1422,7 @@ public final class ServerState { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1372,6 +1430,7 @@ public final class ServerState { public static Builder newBuilder(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1399,6 +1458,7 @@ public final class ServerState { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable @@ -1421,6 +1481,7 @@ public final class ServerState { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); bestValueToMe_ = 0L; @@ -1442,15 +1503,18 @@ public final class ServerState { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor; } + @java.lang.Override public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getDefaultInstanceForType() { return org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance(); } + @java.lang.Override public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel build() { org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel result = buildPartial(); if (!result.isInitialized()) { @@ -1459,6 +1523,7 @@ public final class ServerState { return result; } + @java.lang.Override public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel buildPartial() { org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel result = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel(this); int from_bitField0_ = bitField0_; @@ -1500,32 +1565,39 @@ public final class ServerState { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel) { return mergeFrom((org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel)other); @@ -1566,6 +1638,7 @@ public final class ServerState { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasBestValueToMe()) { return false; @@ -1582,6 +1655,7 @@ public final class ServerState { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1887,11 +1961,13 @@ public final class ServerState { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1913,11 +1989,12 @@ public final class ServerState { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public StoredServerPaymentChannel parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new StoredServerPaymentChannel(input, extensionRegistry); + return new StoredServerPaymentChannel(input, extensionRegistry); } }; @@ -1930,6 +2007,7 @@ public final class ServerState { return PARSER; } + @java.lang.Override public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1964,7 +2042,7 @@ public final class ServerState { "nsactionUnlockTimeSecs\030\003 \002(\004\022\033\n\023contract" + "Transaction\030\004 \002(\014\022\024\n\014clientOutput\030\005 \001(\014\022" + "\r\n\005myKey\030\006 \002(\014\022\027\n\014majorVersion\030\007 \001(\r:\0011\022" + - "\021\n\tclientKey\030\010 \001(\014B.\n\037org.bitcoinj.proto", + "\021\n\tclientKey\030\010 \001(\014B.\n\037org.bitcoinj.proto" + "cols.channelsB\013ServerState" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = diff --git a/core/src/main/java/org/bitcoinj/wallet/Protos.java b/core/src/main/java/org/bitcoinj/wallet/Protos.java index 31415bda..1829740a 100644 --- a/core/src/main/java/org/bitcoinj/wallet/Protos.java +++ b/core/src/main/java/org/bitcoinj/wallet/Protos.java @@ -52,6 +52,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:wallet.PeerAddress) PeerAddressOrBuilder { + private static final long serialVersionUID = 0L; // Use PeerAddress.newBuilder() to construct. private PeerAddress(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -72,6 +73,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -83,13 +87,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; ipAddress_ = input.readBytes(); @@ -105,6 +102,13 @@ public final class Protos { services_ = input.readUInt64(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -122,6 +126,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_fieldAccessorTable @@ -176,6 +181,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -197,6 +203,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -211,6 +218,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -233,7 +241,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -270,7 +277,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasIpAddress()) { hash = (37 * hash) + IP_ADDRESS_FIELD_NUMBER; hash = (53 * hash) + getIpAddress().hashCode(); @@ -289,6 +296,17 @@ public final class Protos { return hash; } + public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -348,6 +366,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -355,6 +374,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoinj.wallet.Protos.PeerAddress prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -378,6 +398,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_fieldAccessorTable @@ -400,6 +421,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); ipAddress_ = com.google.protobuf.ByteString.EMPTY; @@ -411,15 +433,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor; } + @java.lang.Override public org.bitcoinj.wallet.Protos.PeerAddress getDefaultInstanceForType() { return org.bitcoinj.wallet.Protos.PeerAddress.getDefaultInstance(); } + @java.lang.Override public org.bitcoinj.wallet.Protos.PeerAddress build() { org.bitcoinj.wallet.Protos.PeerAddress result = buildPartial(); if (!result.isInitialized()) { @@ -428,6 +453,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoinj.wallet.Protos.PeerAddress buildPartial() { org.bitcoinj.wallet.Protos.PeerAddress result = new org.bitcoinj.wallet.Protos.PeerAddress(this); int from_bitField0_ = bitField0_; @@ -449,32 +475,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoinj.wallet.Protos.PeerAddress) { return mergeFrom((org.bitcoinj.wallet.Protos.PeerAddress)other); @@ -500,6 +533,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasIpAddress()) { return false; @@ -513,6 +547,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -630,11 +665,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -656,11 +693,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public PeerAddress parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PeerAddress(input, extensionRegistry); + return new PeerAddress(input, extensionRegistry); } }; @@ -673,6 +711,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoinj.wallet.Protos.PeerAddress getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -724,6 +763,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:wallet.EncryptedData) EncryptedDataOrBuilder { + private static final long serialVersionUID = 0L; // Use EncryptedData.newBuilder() to construct. private EncryptedData(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -743,6 +783,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -754,13 +797,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; initialisationVector_ = input.readBytes(); @@ -771,6 +807,13 @@ public final class Protos { encryptedPrivateKey_ = input.readBytes(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -788,6 +831,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_fieldAccessorTable @@ -843,6 +887,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -860,6 +905,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -871,6 +917,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -889,7 +936,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -921,7 +967,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasInitialisationVector()) { hash = (37 * hash) + INITIALISATION_VECTOR_FIELD_NUMBER; hash = (53 * hash) + getInitialisationVector().hashCode(); @@ -935,6 +981,17 @@ public final class Protos { return hash; } + public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -994,6 +1051,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1001,6 +1059,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoinj.wallet.Protos.EncryptedData prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1024,6 +1083,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_fieldAccessorTable @@ -1046,6 +1106,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); initialisationVector_ = com.google.protobuf.ByteString.EMPTY; @@ -1055,15 +1116,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor; } + @java.lang.Override public org.bitcoinj.wallet.Protos.EncryptedData getDefaultInstanceForType() { return org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance(); } + @java.lang.Override public org.bitcoinj.wallet.Protos.EncryptedData build() { org.bitcoinj.wallet.Protos.EncryptedData result = buildPartial(); if (!result.isInitialized()) { @@ -1072,6 +1136,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoinj.wallet.Protos.EncryptedData buildPartial() { org.bitcoinj.wallet.Protos.EncryptedData result = new org.bitcoinj.wallet.Protos.EncryptedData(this); int from_bitField0_ = bitField0_; @@ -1089,32 +1154,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoinj.wallet.Protos.EncryptedData) { return mergeFrom((org.bitcoinj.wallet.Protos.EncryptedData)other); @@ -1137,6 +1209,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasInitialisationVector()) { return false; @@ -1147,6 +1220,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1267,11 +1341,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1293,11 +1369,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public EncryptedData parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EncryptedData(input, extensionRegistry); + return new EncryptedData(input, extensionRegistry); } }; @@ -1310,6 +1387,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoinj.wallet.Protos.EncryptedData getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -1455,6 +1533,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:wallet.DeterministicKey) DeterministicKeyOrBuilder { + private static final long serialVersionUID = 0L; // Use DeterministicKey.newBuilder() to construct. private DeterministicKey(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -1478,6 +1557,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -1489,13 +1571,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; chainCode_ = input.readBytes(); @@ -1542,6 +1617,13 @@ public final class Protos { sigsRequiredToSpend_ = input.readUInt32(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -1562,6 +1644,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_fieldAccessorTable @@ -1733,6 +1816,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1746,6 +1830,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1769,6 +1854,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -1808,7 +1894,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -1857,7 +1942,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasChainCode()) { hash = (37 * hash) + CHAIN_CODE_FIELD_NUMBER; hash = (53 * hash) + getChainCode().hashCode(); @@ -1888,6 +1973,17 @@ public final class Protos { return hash; } + public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1947,6 +2043,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -1954,6 +2051,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoinj.wallet.Protos.DeterministicKey prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -1982,6 +2080,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_fieldAccessorTable @@ -2004,6 +2103,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); chainCode_ = com.google.protobuf.ByteString.EMPTY; @@ -2021,15 +2121,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor; } + @java.lang.Override public org.bitcoinj.wallet.Protos.DeterministicKey getDefaultInstanceForType() { return org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance(); } + @java.lang.Override public org.bitcoinj.wallet.Protos.DeterministicKey build() { org.bitcoinj.wallet.Protos.DeterministicKey result = buildPartial(); if (!result.isInitialized()) { @@ -2038,6 +2141,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoinj.wallet.Protos.DeterministicKey buildPartial() { org.bitcoinj.wallet.Protos.DeterministicKey result = new org.bitcoinj.wallet.Protos.DeterministicKey(this); int from_bitField0_ = bitField0_; @@ -2072,32 +2176,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoinj.wallet.Protos.DeterministicKey) { return mergeFrom((org.bitcoinj.wallet.Protos.DeterministicKey)other); @@ -2139,6 +2250,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasChainCode()) { return false; @@ -2146,6 +2258,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2528,11 +2641,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -2554,11 +2669,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public DeterministicKey parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DeterministicKey(input, extensionRegistry); + return new DeterministicKey(input, extensionRegistry); } }; @@ -2571,6 +2687,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoinj.wallet.Protos.DeterministicKey getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2813,6 +2930,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:wallet.Key) KeyOrBuilder { + private static final long serialVersionUID = 0L; // Use Key.newBuilder() to construct. private Key(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -2838,6 +2956,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -2849,15 +2970,9 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.bitcoinj.wallet.Protos.Key.Type value = org.bitcoinj.wallet.Protos.Key.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); @@ -2955,6 +3070,7 @@ public final class Protos { } case 88: { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.bitcoinj.wallet.Protos.Key.OutputScriptType value = org.bitcoinj.wallet.Protos.Key.OutputScriptType.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(11, rawValue); @@ -2964,6 +3080,13 @@ public final class Protos { } break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2984,6 +3107,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_fieldAccessorTable @@ -3248,6 +3372,7 @@ public final class Protos { * required .wallet.Key.Type type = 1; */ public org.bitcoinj.wallet.Protos.Key.Type getType() { + @SuppressWarnings("deprecation") org.bitcoinj.wallet.Protos.Key.Type result = org.bitcoinj.wallet.Protos.Key.Type.valueOf(type_); return result == null ? org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL : result; } @@ -3548,11 +3673,13 @@ public final class Protos { * optional .wallet.Key.OutputScriptType output_script_type = 11; */ public org.bitcoinj.wallet.Protos.Key.OutputScriptType getOutputScriptType() { + @SuppressWarnings("deprecation") org.bitcoinj.wallet.Protos.Key.OutputScriptType result = org.bitcoinj.wallet.Protos.Key.OutputScriptType.valueOf(outputScriptType_); return result == null ? org.bitcoinj.wallet.Protos.Key.OutputScriptType.P2PKH : result; } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -3584,6 +3711,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -3627,6 +3755,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -3690,7 +3819,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -3762,7 +3890,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasType()) { hash = (37 * hash) + TYPE_FIELD_NUMBER; hash = (53 * hash) + type_; @@ -3813,6 +3941,17 @@ public final class Protos { return hash; } + public static org.bitcoinj.wallet.Protos.Key parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoinj.wallet.Protos.Key parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoinj.wallet.Protos.Key parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3872,6 +4011,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -3879,6 +4019,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoinj.wallet.Protos.Key prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -3911,6 +4052,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_fieldAccessorTable @@ -3936,6 +4078,7 @@ public final class Protos { getEncryptedDeterministicSeedFieldBuilder(); } } + @java.lang.Override public Builder clear() { super.clear(); type_ = 1; @@ -3975,15 +4118,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_descriptor; } + @java.lang.Override public org.bitcoinj.wallet.Protos.Key getDefaultInstanceForType() { return org.bitcoinj.wallet.Protos.Key.getDefaultInstance(); } + @java.lang.Override public org.bitcoinj.wallet.Protos.Key build() { org.bitcoinj.wallet.Protos.Key result = buildPartial(); if (!result.isInitialized()) { @@ -3992,6 +4138,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoinj.wallet.Protos.Key buildPartial() { org.bitcoinj.wallet.Protos.Key result = new org.bitcoinj.wallet.Protos.Key(this); int from_bitField0_ = bitField0_; @@ -4058,32 +4205,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoinj.wallet.Protos.Key) { return mergeFrom((org.bitcoinj.wallet.Protos.Key)other); @@ -4142,6 +4296,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasType()) { return false; @@ -4164,6 +4319,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4194,6 +4350,7 @@ public final class Protos { * required .wallet.Key.Type type = 1; */ public org.bitcoinj.wallet.Protos.Key.Type getType() { + @SuppressWarnings("deprecation") org.bitcoinj.wallet.Protos.Key.Type result = org.bitcoinj.wallet.Protos.Key.Type.valueOf(type_); return result == null ? org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL : result; } @@ -5075,6 +5232,7 @@ public final class Protos { * optional .wallet.Key.OutputScriptType output_script_type = 11; */ public org.bitcoinj.wallet.Protos.Key.OutputScriptType getOutputScriptType() { + @SuppressWarnings("deprecation") org.bitcoinj.wallet.Protos.Key.OutputScriptType result = org.bitcoinj.wallet.Protos.Key.OutputScriptType.valueOf(outputScriptType_); return result == null ? org.bitcoinj.wallet.Protos.Key.OutputScriptType.P2PKH : result; } @@ -5107,11 +5265,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -5133,11 +5293,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Key parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Key(input, extensionRegistry); + return new Key(input, extensionRegistry); } }; @@ -5150,6 +5311,7 @@ public final class Protos { return PARSER; } + @java.lang.Override public org.bitcoinj.wallet.Protos.Key getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -5195,6 +5357,7 @@ public final class Protos { com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:wallet.Script) ScriptOrBuilder { + private static final long serialVersionUID = 0L; // Use Script.newBuilder() to construct. private Script(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); @@ -5214,6 +5377,9 @@ public final class Protos { com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -5225,13 +5391,6 @@ public final class Protos { case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } case 10: { bitField0_ |= 0x00000001; program_ = input.readBytes(); @@ -5242,6 +5401,13 @@ public final class Protos { creationTimestamp_ = input.readInt64(); break; } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -5259,6 +5425,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_fieldAccessorTable @@ -5308,6 +5475,7 @@ public final class Protos { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -5325,6 +5493,7 @@ public final class Protos { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -5336,6 +5505,7 @@ public final class Protos { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -5354,7 +5524,6 @@ public final class Protos { return size; } - private static final long serialVersionUID = 0L; @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { @@ -5386,7 +5555,7 @@ public final class Protos { return memoizedHashCode; } int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); + hash = (19 * hash) + getDescriptor().hashCode(); if (hasProgram()) { hash = (37 * hash) + PROGRAM_FIELD_NUMBER; hash = (53 * hash) + getProgram().hashCode(); @@ -5401,6 +5570,17 @@ public final class Protos { return hash; } + public static org.bitcoinj.wallet.Protos.Script parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.bitcoinj.wallet.Protos.Script parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } public static org.bitcoinj.wallet.Protos.Script parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -5460,6 +5640,7 @@ public final class Protos { .parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -5467,6 +5648,7 @@ public final class Protos { public static Builder newBuilder(org.bitcoinj.wallet.Protos.Script prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -5490,6 +5672,7 @@ public final class Protos { return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_fieldAccessorTable @@ -5512,6 +5695,7 @@ public final class Protos { .alwaysUseFieldBuilders) { } } + @java.lang.Override public Builder clear() { super.clear(); program_ = com.google.protobuf.ByteString.EMPTY; @@ -5521,15 +5705,18 @@ public final class Protos { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_descriptor; } + @java.lang.Override public org.bitcoinj.wallet.Protos.Script getDefaultInstanceForType() { return org.bitcoinj.wallet.Protos.Script.getDefaultInstance(); } + @java.lang.Override public org.bitcoinj.wallet.Protos.Script build() { org.bitcoinj.wallet.Protos.Script result = buildPartial(); if (!result.isInitialized()) { @@ -5538,6 +5725,7 @@ public final class Protos { return result; } + @java.lang.Override public org.bitcoinj.wallet.Protos.Script buildPartial() { org.bitcoinj.wallet.Protos.Script result = new org.bitcoinj.wallet.Protos.Script(this); int from_bitField0_ = bitField0_; @@ -5555,32 +5743,39 @@ public final class Protos { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, Object value) { + int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - Object value) { + java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.bitcoinj.wallet.Protos.Script) { return mergeFrom((org.bitcoinj.wallet.Protos.Script)other); @@ -5603,6 +5798,7 @@ public final class Protos { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasProgram()) { return false; @@ -5613,6 +5809,7 @@ public final class Protos { return true; } + @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -5718,11 +5915,13 @@ public final class Protos { onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -5744,11 +5943,12 @@ public final class Protos { @java.lang.Deprecated public static final com.google.protobuf.Parser