From 0e7898d0225baf321284c26fdafc5e496538ea41 Mon Sep 17 00:00:00 2001 From: Premysl Vyhnal <44365000+pvyhnal-generalbytes@users.noreply.github.com> Date: Wed, 24 Apr 2019 16:06:32 +0200 Subject: [PATCH] more renaming - org.bitcoin to org.litecoin; move protos to a folder This is to avoid conflicts with bitcoinj --- core/findbugs.xml | 4 +- .../org/litecoin/crawler/PeerSeedProtos.java | 79 +++++---- .../org/litecoin/paymentchannel/Protos.java | 94 +++++----- .../litecoin/protocols/payments/Protos.java | 36 ++-- .../protocols/channels/ClientState.java | 26 +-- .../protocols/channels/ServerState.java | 24 +-- .../java/org/litecoinj/wallet/Protos.java | 167 +++++++++--------- .../{ => org.litecoin}/paymentchannel.proto | 2 +- .../{ => org.litecoin}/paymentrequest.proto | 2 +- .../proto/{ => org.litecoin}/peerseeds.proto | 4 +- .../storedclientpaymentchannel.proto | 0 .../storedserverpaymentchannel.proto | 0 .../proto/{ => org.litecoin}/wallet.proto | 4 +- examples/src/main/javascript/payprotocol.js | 4 +- 14 files changed, 224 insertions(+), 222 deletions(-) rename core/src/main/proto/{ => org.litecoin}/paymentchannel.proto (99%) rename core/src/main/proto/{ => org.litecoin}/paymentrequest.proto (98%) rename core/src/main/proto/{ => org.litecoin}/peerseeds.proto (88%) rename core/src/main/proto/{ => org.litecoin}/storedclientpaymentchannel.proto (100%) rename core/src/main/proto/{ => org.litecoin}/storedserverpaymentchannel.proto (100%) rename core/src/main/proto/{ => org.litecoin}/wallet.proto (99%) diff --git a/core/findbugs.xml b/core/findbugs.xml index 907a3a7c8f3..12dc5f930a8 100644 --- a/core/findbugs.xml +++ b/core/findbugs.xml @@ -16,8 +16,8 @@ - - + + diff --git a/core/src/main/java/org/litecoin/crawler/PeerSeedProtos.java b/core/src/main/java/org/litecoin/crawler/PeerSeedProtos.java index 9716e499c41..a2366b98c16 100644 --- a/core/src/main/java/org/litecoin/crawler/PeerSeedProtos.java +++ b/core/src/main/java/org/litecoin/crawler/PeerSeedProtos.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: peerseeds.proto +// source: org.litecoin/peerseeds.proto package org.litecoin.crawler; @@ -129,13 +129,13 @@ private PeerSeedData( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor; + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeedData_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeedData_fieldAccessorTable .ensureFieldAccessorsInitialized( org.litecoin.crawler.PeerSeedProtos.PeerSeedData.class, org.litecoin.crawler.PeerSeedProtos.PeerSeedData.Builder.class); } @@ -426,13 +426,13 @@ public static final class Builder extends org.litecoin.crawler.PeerSeedProtos.PeerSeedDataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor; + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeedData_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeedData_fieldAccessorTable .ensureFieldAccessorsInitialized( org.litecoin.crawler.PeerSeedProtos.PeerSeedData.class, org.litecoin.crawler.PeerSeedProtos.PeerSeedData.Builder.class); } @@ -467,7 +467,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor; + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeedData_descriptor; } @java.lang.Override @@ -937,13 +937,13 @@ private PeerSeeds( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor; + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeeds_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeeds_fieldAccessorTable .ensureFieldAccessorsInitialized( org.litecoin.crawler.PeerSeedProtos.PeerSeeds.class, org.litecoin.crawler.PeerSeedProtos.PeerSeeds.Builder.class); } @@ -1262,13 +1262,13 @@ public static final class Builder extends org.litecoin.crawler.PeerSeedProtos.PeerSeedsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor; + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeeds_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeeds_fieldAccessorTable .ensureFieldAccessorsInitialized( org.litecoin.crawler.PeerSeedProtos.PeerSeeds.class, org.litecoin.crawler.PeerSeedProtos.PeerSeeds.Builder.class); } @@ -1308,7 +1308,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor; + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_PeerSeeds_descriptor; } @java.lang.Override @@ -1996,13 +1996,13 @@ private SignedPeerSeeds( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor; + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_SignedPeerSeeds_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_SignedPeerSeeds_fieldAccessorTable .ensureFieldAccessorsInitialized( org.litecoin.crawler.PeerSeedProtos.SignedPeerSeeds.class, org.litecoin.crawler.PeerSeedProtos.SignedPeerSeeds.Builder.class); } @@ -2267,13 +2267,13 @@ public static final class Builder extends org.litecoin.crawler.PeerSeedProtos.SignedPeerSeedsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor; + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_SignedPeerSeeds_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_SignedPeerSeeds_fieldAccessorTable .ensureFieldAccessorsInitialized( org.litecoin.crawler.PeerSeedProtos.SignedPeerSeeds.class, org.litecoin.crawler.PeerSeedProtos.SignedPeerSeeds.Builder.class); } @@ -2308,7 +2308,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.litecoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor; + return org.litecoin.crawler.PeerSeedProtos.internal_static_org_litecoin_crawler_SignedPeerSeeds_descriptor; } @java.lang.Override @@ -2597,20 +2597,20 @@ public org.litecoin.crawler.PeerSeedProtos.SignedPeerSeeds getDefaultInstanceFor } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_org_bitcoin_crawler_PeerSeedData_descriptor; + internal_static_org_litecoin_crawler_PeerSeedData_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable; + internal_static_org_litecoin_crawler_PeerSeedData_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_org_bitcoin_crawler_PeerSeeds_descriptor; + internal_static_org_litecoin_crawler_PeerSeeds_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable; + internal_static_org_litecoin_crawler_PeerSeeds_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor; + internal_static_org_litecoin_crawler_SignedPeerSeeds_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable; + internal_static_org_litecoin_crawler_SignedPeerSeeds_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -2620,14 +2620,15 @@ public org.litecoin.crawler.PeerSeedProtos.SignedPeerSeeds getDefaultInstanceFor descriptor; static { java.lang.String[] descriptorData = { - "\n\017peerseeds.proto\022\023org.litecoin.crawler\"B" + - "\n\014PeerSeedData\022\022\n\nip_address\030\001 \002(\t\022\014\n\004po" + - "rt\030\002 \002(\r\022\020\n\010services\030\003 \002(\r\"\\\n\tPeerSeeds\022" + - "/\n\004seed\030\001 \003(\0132!.org.litecoin.crawler.Peer" + - "SeedData\022\021\n\ttimestamp\030\002 \002(\004\022\013\n\003net\030\003 \002(\t" + - "\"H\n\017SignedPeerSeeds\022\022\n\npeer_seeds\030\001 \002(\014\022" + - "\021\n\tsignature\030\002 \002(\014\022\016\n\006pubkey\030\003 \002(\014B%\n\023or" + - "g.bitcoin.crawlerB\016PeerSeedProtos" + "\n\034org.litecoin/peerseeds.proto\022\024org.lite" + + "coin.crawler\"B\n\014PeerSeedData\022\022\n\nip_addre" + + "ss\030\001 \002(\t\022\014\n\004port\030\002 \002(\r\022\020\n\010services\030\003 \002(\r" + + "\"]\n\tPeerSeeds\0220\n\004seed\030\001 \003(\0132\".org.liteco" + + "in.crawler.PeerSeedData\022\021\n\ttimestamp\030\002 \002" + + "(\004\022\013\n\003net\030\003 \002(\t\"H\n\017SignedPeerSeeds\022\022\n\npe" + + "er_seeds\030\001 \002(\014\022\021\n\tsignature\030\002 \002(\014\022\016\n\006pub" + + "key\030\003 \002(\014B&\n\024org.litecoin.crawlerB\016PeerS" + + "eedProtos" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -2641,23 +2642,23 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { }, assigner); - internal_static_org_bitcoin_crawler_PeerSeedData_descriptor = + internal_static_org_litecoin_crawler_PeerSeedData_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable = new + internal_static_org_litecoin_crawler_PeerSeedData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_org_bitcoin_crawler_PeerSeedData_descriptor, + internal_static_org_litecoin_crawler_PeerSeedData_descriptor, new java.lang.String[] { "IpAddress", "Port", "Services", }); - internal_static_org_bitcoin_crawler_PeerSeeds_descriptor = + internal_static_org_litecoin_crawler_PeerSeeds_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable = new + internal_static_org_litecoin_crawler_PeerSeeds_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_org_bitcoin_crawler_PeerSeeds_descriptor, + internal_static_org_litecoin_crawler_PeerSeeds_descriptor, new java.lang.String[] { "Seed", "Timestamp", "Net", }); - internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor = + internal_static_org_litecoin_crawler_SignedPeerSeeds_descriptor = getDescriptor().getMessageTypes().get(2); - internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable = new + internal_static_org_litecoin_crawler_SignedPeerSeeds_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor, + internal_static_org_litecoin_crawler_SignedPeerSeeds_descriptor, new java.lang.String[] { "PeerSeeds", "Signature", "Pubkey", }); } diff --git a/core/src/main/java/org/litecoin/paymentchannel/Protos.java b/core/src/main/java/org/litecoin/paymentchannel/Protos.java index b4accc2a17b..30b09cb96af 100644 --- a/core/src/main/java/org/litecoin/paymentchannel/Protos.java +++ b/core/src/main/java/org/litecoin/paymentchannel/Protos.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: paymentchannel.proto +// source: org.litecoin/paymentchannel.proto package org.litecoin.paymentchannel; @@ -11020,52 +11020,52 @@ public org.litecoin.paymentchannel.Protos.Error getDefaultInstanceForType() { descriptor; static { java.lang.String[] descriptorData = { - "\n\024paymentchannel.proto\022\017paymentchannels\"" + - "\260\006\n\024TwoWayChannelMessage\022?\n\004type\030\001 \002(\01621" + - ".paymentchannels.TwoWayChannelMessage.Me" + - "ssageType\0226\n\016client_version\030\002 \001(\0132\036.paym" + - "entchannels.ClientVersion\0226\n\016server_vers" + - "ion\030\003 \001(\0132\036.paymentchannels.ServerVersio" + - "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" + - "provide_contract\030\007 \001(\0132 .paymentchannels" + - ".ProvideContract\0226\n\016update_payment\030\010 \001(\013" + - "2\036.paymentchannels.UpdatePayment\0220\n\013paym" + - "ent_ack\030\013 \001(\0132\033.paymentchannels.PaymentA" + - "ck\022/\n\nsettlement\030\t \001(\0132\033.paymentchannels" + - ".Settlement\022%\n\005error\030\n \001(\0132\026.paymentchan" + - "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" + - "\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" + - "_channel_contract_hash\030\003 \001(\014\022\037\n\020time_win" + - "dow_secs\030\004 \001(\004:\00586340\"0\n\rServerVersion\022\r" + - "\n\005major\030\001 \002(\005\022\020\n\005minor\030\002 \001(\005:\0010\"r\n\010Initi" + - "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\"!" + - "\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" + - "t\022\022\n\nclient_key\030\003 \001(\014\"M\n\rUpdatePayment\022\033" + - "\n\023client_change_value\030\001 \002(\004\022\021\n\tsignature" + - "\030\002 \002(\014\022\014\n\004info\030\003 \001(\014\"\032\n\nPaymentAck\022\014\n\004in" + - "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" + - "\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" + - "ALUE_TOO_LARGE\020\006\022\031\n\025MIN_PAYMENT_TOO_LARG" + - "E\020\007\022\t\n\005OTHER\020\010B$\n\032org.litecoin.paymentcha" + - "nnelB\006Protos" + "\n!org.litecoin/paymentchannel.proto\022\017pay" + + "mentchannels\"\260\006\n\024TwoWayChannelMessage\022?\n" + + "\004type\030\001 \002(\01621.paymentchannels.TwoWayChan" + + "nelMessage.MessageType\0226\n\016client_version" + + "\030\002 \001(\0132\036.paymentchannels.ClientVersion\0226" + + "\n\016server_version\030\003 \001(\0132\036.paymentchannels" + + ".ServerVersion\022+\n\010initiate\030\004 \001(\0132\031.payme" + + "ntchannels.Initiate\0226\n\016provide_refund\030\005 " + + "\001(\0132\036.paymentchannels.ProvideRefund\0224\n\rr" + + "eturn_refund\030\006 \001(\0132\035.paymentchannels.Ret" + + "urnRefund\022:\n\020provide_contract\030\007 \001(\0132 .pa" + + "ymentchannels.ProvideContract\0226\n\016update_" + + "payment\030\010 \001(\0132\036.paymentchannels.UpdatePa" + + "yment\0220\n\013payment_ack\030\013 \001(\0132\033.paymentchan" + + "nels.PaymentAck\022/\n\nsettlement\030\t \001(\0132\033.pa" + + "ymentchannels.Settlement\022%\n\005error\030\n \001(\0132" + + "\026.paymentchannels.Error\"\315\001\n\013MessageType\022" + + "\022\n\016CLIENT_VERSION\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\rRET" + + "URN_REFUND\020\005\022\024\n\020PROVIDE_CONTRACT\020\006\022\020\n\014CH" + + "ANNEL_OPEN\020\007\022\022\n\016UPDATE_PAYMENT\020\010\022\017\n\013PAYM" + + "ENT_ACK\020\013\022\t\n\005CLOSE\020\t\022\t\n\005ERROR\020\n\"y\n\rClien" + + "tVersion\022\r\n\005major\030\001 \002(\005\022\020\n\005minor\030\002 \001(\005:\001" + + "0\022&\n\036previous_channel_contract_hash\030\003 \001(" + + "\014\022\037\n\020time_window_secs\030\004 \001(\004:\00586340\"0\n\rSe" + + "rverVersion\022\r\n\005major\030\001 \002(\005\022\020\n\005minor\030\002 \001(" + + "\005:\0010\"r\n\010Initiate\022\024\n\014multisig_key\030\001 \002(\014\022!" + + "\n\031min_accepted_channel_size\030\002 \002(\004\022\030\n\020exp" + + "ire_time_secs\030\003 \002(\004\022\023\n\013min_payment\030\004 \002(\004" + + "\"1\n\rProvideRefund\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\017ProvideContract\022\n\n\002tx\030\001 \002(\014\0227\n" + + "\017initial_payment\030\002 \002(\0132\036.paymentchannels" + + ".UpdatePayment\022\022\n\nclient_key\030\003 \001(\014\"M\n\rUp" + + "datePayment\022\033\n\023client_change_value\030\001 \002(\004" + + "\022\021\n\tsignature\030\002 \002(\014\022\014\n\004info\030\003 \001(\014\"\032\n\nPay" + + "mentAck\022\014\n\004info\030\001 \001(\014\"\030\n\nSettlement\022\n\n\002t" + + "x\030\003 \002(\014\"\251\002\n\005Error\0225\n\004code\030\001 \001(\0162 .paymen" + + "tchannels.Error.ErrorCode:\005OTHER\022\023\n\013expl" + + "anation\030\002 \001(\t\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_ACCEPTABLE_VERSION\020\003\022\023\n\017BAD_TRA" + + "NSACTION\020\004\022\034\n\030TIME_WINDOW_UNACCEPTABLE\020\005" + + "\022\033\n\027CHANNEL_VALUE_TOO_LARGE\020\006\022\031\n\025MIN_PAY" + + "MENT_TOO_LARGE\020\007\022\t\n\005OTHER\020\010B%\n\033org.litec" + + "oin.paymentchannelB\006Protos" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/core/src/main/java/org/litecoin/protocols/payments/Protos.java b/core/src/main/java/org/litecoin/protocols/payments/Protos.java index a2eec4a32ee..83686a9ba74 100644 --- a/core/src/main/java/org/litecoin/protocols/payments/Protos.java +++ b/core/src/main/java/org/litecoin/protocols/payments/Protos.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: paymentrequest.proto +// source: org.litecoin/paymentrequest.proto package org.litecoin.protocols.payments; @@ -6709,23 +6709,23 @@ public org.litecoin.protocols.payments.Protos.PaymentACK getDefaultInstanceForTy descriptor; static { java.lang.String[] descriptorData = { - "\n\024paymentrequest.proto\022\010payments\"+\n\006Outp" + - "ut\022\021\n\006amount\030\001 \001(\004:\0010\022\016\n\006script\030\002 \002(\014\"\243\001" + - "\n\016PaymentDetails\022\025\n\007network\030\001 \001(\t:\004main\022" + - "!\n\007outputs\030\002 \003(\0132\020.payments.Output\022\014\n\004ti" + - "me\030\003 \002(\004\022\017\n\007expires\030\004 \001(\004\022\014\n\004memo\030\005 \001(\t\022" + - "\023\n\013payment_url\030\006 \001(\t\022\025\n\rmerchant_data\030\007 " + - "\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" + - "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" + - "ts.Output\022\014\n\004memo\030\004 \001(\t\">\n\nPaymentACK\022\"\n" + - "\007payment\030\001 \002(\0132\021.payments.Payment\022\014\n\004mem" + - "o\030\002 \001(\tB(\n\036org.litecoin.protocols.payment" + - "sB\006Protos" + "\n!org.litecoin/paymentrequest.proto\022\010pay" + + "ments\"+\n\006Output\022\021\n\006amount\030\001 \001(\004:\0010\022\016\n\006sc" + + "ript\030\002 \002(\014\"\243\001\n\016PaymentDetails\022\025\n\007network" + + "\030\001 \001(\t:\004main\022!\n\007outputs\030\002 \003(\0132\020.payments" + + ".Output\022\014\n\004time\030\003 \002(\004\022\017\n\007expires\030\004 \001(\004\022\014" + + "\n\004memo\030\005 \001(\t\022\023\n\013payment_url\030\006 \001(\t\022\025\n\rmer" + + "chant_data\030\007 \001(\014\"\225\001\n\016PaymentRequest\022\"\n\027p" + + "ayment_details_version\030\001 \001(\r:\0011\022\026\n\010pki_t" + + "ype\030\002 \001(\t:\004none\022\020\n\010pki_data\030\003 \001(\014\022\"\n\032ser" + + "ialized_payment_details\030\004 \002(\014\022\021\n\tsignatu" + + "re\030\005 \001(\014\"\'\n\020X509Certificates\022\023\n\013certific" + + "ate\030\001 \003(\014\"i\n\007Payment\022\025\n\rmerchant_data\030\001 " + + "\001(\014\022\024\n\014transactions\030\002 \003(\014\022#\n\trefund_to\030\003" + + " \003(\0132\020.payments.Output\022\014\n\004memo\030\004 \001(\t\">\n\n" + + "PaymentACK\022\"\n\007payment\030\001 \002(\0132\021.payments.P" + + "ayment\022\014\n\004memo\030\002 \001(\tB)\n\037org.litecoin.pro" + + "tocols.paymentsB\006Protos" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/core/src/main/java/org/litecoinj/protocols/channels/ClientState.java b/core/src/main/java/org/litecoinj/protocols/channels/ClientState.java index 3de9697f416..5f007da1547 100644 --- a/core/src/main/java/org/litecoinj/protocols/channels/ClientState.java +++ b/core/src/main/java/org/litecoinj/protocols/channels/ClientState.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: storedclientpaymentchannel.proto +// source: org.litecoin/storedclientpaymentchannel.proto package org.litecoinj.protocols.channels; @@ -2468,18 +2468,18 @@ public org.litecoinj.protocols.channels.ClientState.StoredClientPaymentChannel g descriptor; static { java.lang.String[] descriptorData = { - "\n storedclientpaymentchannel.proto\022\017paym" + - "entchannels\"\\\n\033StoredClientPaymentChanne" + - "ls\022=\n\010channels\030\001 \003(\0132+.paymentchannels.S" + - "toredClientPaymentChannel\"\211\002\n\032StoredClie" + - "ntPaymentChannel\022\n\n\002id\030\001 \002(\014\022\033\n\023contract" + - "Transaction\030\002 \002(\014\022\031\n\021refundTransaction\030\003" + - " \002(\014\022\023\n\013myPublicKey\030\010 \002(\014\022\r\n\005myKey\030\004 \002(\014" + - "\022\021\n\tvalueToMe\030\005 \002(\004\022\022\n\nrefundFees\030\006 \002(\004\022" + - "\034\n\024closeTransactionHash\030\007 \001(\014\022\027\n\014majorVe" + - "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.litecoinj.protocols." + - "channelsB\013ClientState" + "\n-org.litecoin/storedclientpaymentchanne" + + "l.proto\022\017paymentchannels\"\\\n\033StoredClient" + + "PaymentChannels\022=\n\010channels\030\001 \003(\0132+.paym" + + "entchannels.StoredClientPaymentChannel\"\211" + + "\002\n\032StoredClientPaymentChannel\022\n\n\002id\030\001 \002(" + + "\014\022\033\n\023contractTransaction\030\002 \002(\014\022\031\n\021refund" + + "Transaction\030\003 \002(\014\022\023\n\013myPublicKey\030\010 \002(\014\022\r" + + "\n\005myKey\030\004 \002(\014\022\021\n\tvalueToMe\030\005 \002(\004\022\022\n\nrefu" + + "ndFees\030\006 \002(\004\022\034\n\024closeTransactionHash\030\007 \001" + + "(\014\022\027\n\014majorVersion\030\t \001(\r:\0011\022\022\n\nexpiryTim" + + "e\030\n \001(\004\022\021\n\tserverKey\030\013 \001(\014B/\n org.liteco" + + "inj.protocols.channelsB\013ClientState" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/core/src/main/java/org/litecoinj/protocols/channels/ServerState.java b/core/src/main/java/org/litecoinj/protocols/channels/ServerState.java index de65569974d..5c922817766 100644 --- a/core/src/main/java/org/litecoinj/protocols/channels/ServerState.java +++ b/core/src/main/java/org/litecoinj/protocols/channels/ServerState.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: storedserverpaymentchannel.proto +// source: org.litecoin/storedserverpaymentchannel.proto package org.litecoinj.protocols.channels; @@ -2033,17 +2033,17 @@ public org.litecoinj.protocols.channels.ServerState.StoredServerPaymentChannel g descriptor; static { java.lang.String[] descriptorData = { - "\n storedserverpaymentchannel.proto\022\017paym" + - "entchannels\"\\\n\033StoredServerPaymentChanne" + - "ls\022=\n\010channels\030\001 \003(\0132+.paymentchannels.S" + - "toredServerPaymentChannel\"\346\001\n\032StoredServ" + - "erPaymentChannel\022\025\n\rbestValueToMe\030\001 \002(\004\022" + - "\032\n\022bestValueSignature\030\002 \001(\014\022\'\n\037refundTra" + - "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.litecoinj.proto" + - "cols.channelsB\013ServerState" + "\n-org.litecoin/storedserverpaymentchanne" + + "l.proto\022\017paymentchannels\"\\\n\033StoredServer" + + "PaymentChannels\022=\n\010channels\030\001 \003(\0132+.paym" + + "entchannels.StoredServerPaymentChannel\"\346" + + "\001\n\032StoredServerPaymentChannel\022\025\n\rbestVal" + + "ueToMe\030\001 \002(\004\022\032\n\022bestValueSignature\030\002 \001(\014" + + "\022\'\n\037refundTransactionUnlockTimeSecs\030\003 \002(" + + "\004\022\033\n\023contractTransaction\030\004 \002(\014\022\024\n\014client" + + "Output\030\005 \001(\014\022\r\n\005myKey\030\006 \002(\014\022\027\n\014majorVers" + + "ion\030\007 \001(\r:\0011\022\021\n\tclientKey\030\010 \001(\014B/\n org.l" + + "itecoinj.protocols.channelsB\013ServerState" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/core/src/main/java/org/litecoinj/wallet/Protos.java b/core/src/main/java/org/litecoinj/wallet/Protos.java index 0de8d022642..c352270a93a 100644 --- a/core/src/main/java/org/litecoinj/wallet/Protos.java +++ b/core/src/main/java/org/litecoinj/wallet/Protos.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: wallet.proto +// source: org.litecoin/wallet.proto package org.litecoinj.wallet; @@ -21235,88 +21235,89 @@ public org.litecoinj.wallet.Protos.ExchangeRate getDefaultInstanceForType() { descriptor; static { java.lang.String[] descriptorData = { - "\n\014wallet.proto\022\006wallet\"A\n\013PeerAddress\022\022\n" + - "\nip_address\030\001 \002(\014\022\014\n\004port\030\002 \002(\r\022\020\n\010servi" + - "ces\030\003 \002(\004\"M\n\rEncryptedData\022\035\n\025initialisa" + - "tion_vector\030\001 \002(\014\022\035\n\025encrypted_private_k" + - "ey\030\002 \002(\014\"\231\001\n\020DeterministicKey\022\022\n\nchain_c" + - "ode\030\001 \002(\014\022\014\n\004path\030\002 \003(\r\022\026\n\016issued_subkey" + - "s\030\003 \001(\r\022\026\n\016lookahead_size\030\004 \001(\r\022\023\n\013isFol" + - "lowing\030\005 \001(\010\022\036\n\023sigsRequiredToSpend\030\006 \001(" + - "\r:\0011\"\231\004\n\003Key\022\036\n\004type\030\001 \002(\0162\020.wallet.Key." + - "Type\022\024\n\014secret_bytes\030\002 \001(\014\022-\n\016encrypted_" + - "data\030\006 \001(\0132\025.wallet.EncryptedData\022\022\n\npub" + - "lic_key\030\003 \001(\014\022\r\n\005label\030\004 \001(\t\022\032\n\022creation" + - "_timestamp\030\005 \001(\003\0223\n\021deterministic_key\030\007 " + - "\001(\0132\030.wallet.DeterministicKey\022\032\n\022determi" + - "nistic_seed\030\010 \001(\014\022;\n\034encrypted_determini" + - "stic_seed\030\t \001(\0132\025.wallet.EncryptedData\022\030" + - "\n\014account_path\030\n \003(\rB\002\020\001\0228\n\022output_scrip" + - "t_type\030\013 \001(\0162\034.wallet.Key.OutputScriptTy" + - "pe\"a\n\004Type\022\014\n\010ORIGINAL\020\001\022\030\n\024ENCRYPTED_SC" + - "RYPT_AES\020\002\022\032\n\026DETERMINISTIC_MNEMONIC\020\003\022\025" + - "\n\021DETERMINISTIC_KEY\020\004\")\n\020OutputScriptTyp" + - "e\022\t\n\005P2PKH\020\001\022\n\n\006P2WPKH\020\002\"5\n\006Script\022\017\n\007pr" + - "ogram\030\001 \002(\014\022\032\n\022creation_timestamp\030\002 \002(\003\"" + - "\035\n\rScriptWitness\022\014\n\004data\030\001 \003(\014\"\272\001\n\020Trans" + - "actionInput\022\"\n\032transaction_out_point_has" + - "h\030\001 \002(\014\022#\n\033transaction_out_point_index\030\002" + - " \002(\r\022\024\n\014script_bytes\030\003 \002(\014\022\020\n\010sequence\030\004" + - " \001(\r\022\r\n\005value\030\005 \001(\003\022&\n\007witness\030\006 \001(\0132\025.w" + - "allet.ScriptWitness\"\177\n\021TransactionOutput" + - "\022\r\n\005value\030\001 \002(\003\022\024\n\014script_bytes\030\002 \002(\014\022!\n" + - "\031spent_by_transaction_hash\030\003 \001(\014\022\"\n\032spen" + - "t_by_transaction_index\030\004 \001(\005\"\267\003\n\025Transac" + - "tionConfidence\0220\n\004type\030\001 \001(\0162\".wallet.Tr" + - "ansactionConfidence.Type\022\032\n\022appeared_at_" + - "height\030\002 \001(\005\022\036\n\026overriding_transaction\030\003" + - " \001(\014\022\r\n\005depth\030\004 \001(\005\022)\n\014broadcast_by\030\006 \003(" + - "\0132\023.wallet.PeerAddress\022\033\n\023last_broadcast" + - "ed_at\030\010 \001(\003\0224\n\006source\030\007 \001(\0162$.wallet.Tra" + - "nsactionConfidence.Source\"`\n\004Type\022\013\n\007UNK" + - "NOWN\020\000\022\014\n\010BUILDING\020\001\022\013\n\007PENDING\020\002\022\025\n\021NOT" + - "_IN_BEST_CHAIN\020\003\022\010\n\004DEAD\020\004\022\017\n\013IN_CONFLIC" + - "T\020\005\"A\n\006Source\022\022\n\016SOURCE_UNKNOWN\020\000\022\022\n\016SOU" + - "RCE_NETWORK\020\001\022\017\n\013SOURCE_SELF\020\002\"\303\005\n\013Trans" + - "action\022\017\n\007version\030\001 \002(\005\022\014\n\004hash\030\002 \002(\014\022&\n" + - "\004pool\030\003 \001(\0162\030.wallet.Transaction.Pool\022\021\n" + - "\tlock_time\030\004 \001(\r\022\022\n\nupdated_at\030\005 \001(\003\0223\n\021" + - "transaction_input\030\006 \003(\0132\030.wallet.Transac" + - "tionInput\0225\n\022transaction_output\030\007 \003(\0132\031." + - "wallet.TransactionOutput\022\022\n\nblock_hash\030\010" + - " \003(\014\022 \n\030block_relativity_offsets\030\013 \003(\005\0221" + - "\n\nconfidence\030\t \001(\0132\035.wallet.TransactionC" + - "onfidence\0225\n\007purpose\030\n \001(\0162\033.wallet.Tran" + - "saction.Purpose:\007UNKNOWN\022+\n\rexchange_rat" + - "e\030\014 \001(\0132\024.wallet.ExchangeRate\022\014\n\004memo\030\r " + - "\001(\t\"Y\n\004Pool\022\013\n\007UNSPENT\020\004\022\t\n\005SPENT\020\005\022\014\n\010I" + - "NACTIVE\020\002\022\010\n\004DEAD\020\n\022\013\n\007PENDING\020\020\022\024\n\020PEND" + - "ING_INACTIVE\020\022\"\243\001\n\007Purpose\022\013\n\007UNKNOWN\020\000\022" + - "\020\n\014USER_PAYMENT\020\001\022\020\n\014KEY_ROTATION\020\002\022\034\n\030A" + - "SSURANCE_CONTRACT_CLAIM\020\003\022\035\n\031ASSURANCE_C" + - "ONTRACT_PLEDGE\020\004\022\033\n\027ASSURANCE_CONTRACT_S" + - "TUB\020\005\022\r\n\tRAISE_FEE\020\006\"N\n\020ScryptParameters" + - "\022\014\n\004salt\030\001 \002(\014\022\020\n\001n\030\002 \001(\003:\00516384\022\014\n\001r\030\003 " + - "\001(\005:\0018\022\014\n\001p\030\004 \001(\005:\0011\"8\n\tExtension\022\n\n\002id\030" + - "\001 \002(\t\022\014\n\004data\030\002 \002(\014\022\021\n\tmandatory\030\003 \002(\010\" " + - "\n\003Tag\022\013\n\003tag\030\001 \002(\t\022\014\n\004data\030\002 \002(\014\"\261\004\n\006Wal" + - "let\022\032\n\022network_identifier\030\001 \002(\t\022\034\n\024last_" + - "seen_block_hash\030\002 \001(\014\022\036\n\026last_seen_block" + - "_height\030\014 \001(\r\022!\n\031last_seen_block_time_se" + - "cs\030\016 \001(\003\022\030\n\003key\030\003 \003(\0132\013.wallet.Key\022(\n\013tr" + - "ansaction\030\004 \003(\0132\023.wallet.Transaction\022&\n\016" + - "watched_script\030\017 \003(\0132\016.wallet.Script\022C\n\017" + - "encryption_type\030\005 \001(\0162\035.wallet.Wallet.En" + - "cryptionType:\013UNENCRYPTED\0227\n\025encryption_" + - "parameters\030\006 \001(\0132\030.wallet.ScryptParamete" + - "rs\022\022\n\007version\030\007 \001(\005:\0011\022$\n\textension\030\n \003(" + - "\0132\021.wallet.Extension\022\023\n\013description\030\013 \001(" + - "\t\022\031\n\021key_rotation_time\030\r \001(\004\022\031\n\004tags\030\020 \003" + - "(\0132\013.wallet.Tag\";\n\016EncryptionType\022\017\n\013UNE" + - "NCRYPTED\020\001\022\030\n\024ENCRYPTED_SCRYPT_AES\020\002\"R\n\014" + - "ExchangeRate\022\022\n\ncoin_value\030\001 \002(\003\022\022\n\nfiat" + - "_value\030\002 \002(\003\022\032\n\022fiat_currency_code\030\003 \002(\t" + - "B\035\n\023org.litecoinj.walletB\006Protos" + "\n\031org.litecoin/wallet.proto\022\006wallet\"A\n\013P" + + "eerAddress\022\022\n\nip_address\030\001 \002(\014\022\014\n\004port\030\002" + + " \002(\r\022\020\n\010services\030\003 \002(\004\"M\n\rEncryptedData\022" + + "\035\n\025initialisation_vector\030\001 \002(\014\022\035\n\025encryp" + + "ted_private_key\030\002 \002(\014\"\231\001\n\020DeterministicK" + + "ey\022\022\n\nchain_code\030\001 \002(\014\022\014\n\004path\030\002 \003(\r\022\026\n\016" + + "issued_subkeys\030\003 \001(\r\022\026\n\016lookahead_size\030\004" + + " \001(\r\022\023\n\013isFollowing\030\005 \001(\010\022\036\n\023sigsRequire" + + "dToSpend\030\006 \001(\r:\0011\"\231\004\n\003Key\022\036\n\004type\030\001 \002(\0162" + + "\020.wallet.Key.Type\022\024\n\014secret_bytes\030\002 \001(\014\022" + + "-\n\016encrypted_data\030\006 \001(\0132\025.wallet.Encrypt" + + "edData\022\022\n\npublic_key\030\003 \001(\014\022\r\n\005label\030\004 \001(" + + "\t\022\032\n\022creation_timestamp\030\005 \001(\003\0223\n\021determi" + + "nistic_key\030\007 \001(\0132\030.wallet.DeterministicK" + + "ey\022\032\n\022deterministic_seed\030\010 \001(\014\022;\n\034encryp" + + "ted_deterministic_seed\030\t \001(\0132\025.wallet.En" + + "cryptedData\022\030\n\014account_path\030\n \003(\rB\002\020\001\0228\n" + + "\022output_script_type\030\013 \001(\0162\034.wallet.Key.O" + + "utputScriptType\"a\n\004Type\022\014\n\010ORIGINAL\020\001\022\030\n" + + "\024ENCRYPTED_SCRYPT_AES\020\002\022\032\n\026DETERMINISTIC" + + "_MNEMONIC\020\003\022\025\n\021DETERMINISTIC_KEY\020\004\")\n\020Ou" + + "tputScriptType\022\t\n\005P2PKH\020\001\022\n\n\006P2WPKH\020\002\"5\n" + + "\006Script\022\017\n\007program\030\001 \002(\014\022\032\n\022creation_tim" + + "estamp\030\002 \002(\003\"\035\n\rScriptWitness\022\014\n\004data\030\001 " + + "\003(\014\"\272\001\n\020TransactionInput\022\"\n\032transaction_" + + "out_point_hash\030\001 \002(\014\022#\n\033transaction_out_" + + "point_index\030\002 \002(\r\022\024\n\014script_bytes\030\003 \002(\014\022" + + "\020\n\010sequence\030\004 \001(\r\022\r\n\005value\030\005 \001(\003\022&\n\007witn" + + "ess\030\006 \001(\0132\025.wallet.ScriptWitness\"\177\n\021Tran" + + "sactionOutput\022\r\n\005value\030\001 \002(\003\022\024\n\014script_b" + + "ytes\030\002 \002(\014\022!\n\031spent_by_transaction_hash\030" + + "\003 \001(\014\022\"\n\032spent_by_transaction_index\030\004 \001(" + + "\005\"\267\003\n\025TransactionConfidence\0220\n\004type\030\001 \001(" + + "\0162\".wallet.TransactionConfidence.Type\022\032\n" + + "\022appeared_at_height\030\002 \001(\005\022\036\n\026overriding_" + + "transaction\030\003 \001(\014\022\r\n\005depth\030\004 \001(\005\022)\n\014broa" + + "dcast_by\030\006 \003(\0132\023.wallet.PeerAddress\022\033\n\023l" + + "ast_broadcasted_at\030\010 \001(\003\0224\n\006source\030\007 \001(\016" + + "2$.wallet.TransactionConfidence.Source\"`" + + "\n\004Type\022\013\n\007UNKNOWN\020\000\022\014\n\010BUILDING\020\001\022\013\n\007PEN" + + "DING\020\002\022\025\n\021NOT_IN_BEST_CHAIN\020\003\022\010\n\004DEAD\020\004\022" + + "\017\n\013IN_CONFLICT\020\005\"A\n\006Source\022\022\n\016SOURCE_UNK" + + "NOWN\020\000\022\022\n\016SOURCE_NETWORK\020\001\022\017\n\013SOURCE_SEL" + + "F\020\002\"\303\005\n\013Transaction\022\017\n\007version\030\001 \002(\005\022\014\n\004" + + "hash\030\002 \002(\014\022&\n\004pool\030\003 \001(\0162\030.wallet.Transa" + + "ction.Pool\022\021\n\tlock_time\030\004 \001(\r\022\022\n\nupdated" + + "_at\030\005 \001(\003\0223\n\021transaction_input\030\006 \003(\0132\030.w" + + "allet.TransactionInput\0225\n\022transaction_ou" + + "tput\030\007 \003(\0132\031.wallet.TransactionOutput\022\022\n" + + "\nblock_hash\030\010 \003(\014\022 \n\030block_relativity_of" + + "fsets\030\013 \003(\005\0221\n\nconfidence\030\t \001(\0132\035.wallet" + + ".TransactionConfidence\0225\n\007purpose\030\n \001(\0162" + + "\033.wallet.Transaction.Purpose:\007UNKNOWN\022+\n" + + "\rexchange_rate\030\014 \001(\0132\024.wallet.ExchangeRa" + + "te\022\014\n\004memo\030\r \001(\t\"Y\n\004Pool\022\013\n\007UNSPENT\020\004\022\t\n" + + "\005SPENT\020\005\022\014\n\010INACTIVE\020\002\022\010\n\004DEAD\020\n\022\013\n\007PEND" + + "ING\020\020\022\024\n\020PENDING_INACTIVE\020\022\"\243\001\n\007Purpose\022" + + "\013\n\007UNKNOWN\020\000\022\020\n\014USER_PAYMENT\020\001\022\020\n\014KEY_RO" + + "TATION\020\002\022\034\n\030ASSURANCE_CONTRACT_CLAIM\020\003\022\035" + + "\n\031ASSURANCE_CONTRACT_PLEDGE\020\004\022\033\n\027ASSURAN" + + "CE_CONTRACT_STUB\020\005\022\r\n\tRAISE_FEE\020\006\"N\n\020Scr" + + "yptParameters\022\014\n\004salt\030\001 \002(\014\022\020\n\001n\030\002 \001(\003:\005" + + "16384\022\014\n\001r\030\003 \001(\005:\0018\022\014\n\001p\030\004 \001(\005:\0011\"8\n\tExt" + + "ension\022\n\n\002id\030\001 \002(\t\022\014\n\004data\030\002 \002(\014\022\021\n\tmand" + + "atory\030\003 \002(\010\" \n\003Tag\022\013\n\003tag\030\001 \002(\t\022\014\n\004data\030" + + "\002 \002(\014\"\261\004\n\006Wallet\022\032\n\022network_identifier\030\001" + + " \002(\t\022\034\n\024last_seen_block_hash\030\002 \001(\014\022\036\n\026la" + + "st_seen_block_height\030\014 \001(\r\022!\n\031last_seen_" + + "block_time_secs\030\016 \001(\003\022\030\n\003key\030\003 \003(\0132\013.wal" + + "let.Key\022(\n\013transaction\030\004 \003(\0132\023.wallet.Tr" + + "ansaction\022&\n\016watched_script\030\017 \003(\0132\016.wall" + + "et.Script\022C\n\017encryption_type\030\005 \001(\0162\035.wal" + + "let.Wallet.EncryptionType:\013UNENCRYPTED\0227" + + "\n\025encryption_parameters\030\006 \001(\0132\030.wallet.S" + + "cryptParameters\022\022\n\007version\030\007 \001(\005:\0011\022$\n\te" + + "xtension\030\n \003(\0132\021.wallet.Extension\022\023\n\013des" + + "cription\030\013 \001(\t\022\031\n\021key_rotation_time\030\r \001(" + + "\004\022\031\n\004tags\030\020 \003(\0132\013.wallet.Tag\";\n\016Encrypti" + + "onType\022\017\n\013UNENCRYPTED\020\001\022\030\n\024ENCRYPTED_SCR" + + "YPT_AES\020\002\"R\n\014ExchangeRate\022\022\n\ncoin_value\030" + + "\001 \002(\003\022\022\n\nfiat_value\030\002 \002(\003\022\032\n\022fiat_curren" + + "cy_code\030\003 \002(\tB\036\n\024org.litecoinj.walletB\006P" + + "rotos" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/core/src/main/proto/paymentchannel.proto b/core/src/main/proto/org.litecoin/paymentchannel.proto similarity index 99% rename from core/src/main/proto/paymentchannel.proto rename to core/src/main/proto/org.litecoin/paymentchannel.proto index ddea1a2a33d..8f3e8520ea0 100644 --- a/core/src/main/proto/paymentchannel.proto +++ b/core/src/main/proto/org.litecoin/paymentchannel.proto @@ -26,7 +26,7 @@ syntax = "proto2"; package paymentchannels; -option java_package = "org.bitcoin.paymentchannel"; +option java_package = "org.litecoin.paymentchannel"; option java_outer_classname = "Protos"; // This message is designed to be either sent raw over the network (e.g. length prefixed) or embedded inside another diff --git a/core/src/main/proto/paymentrequest.proto b/core/src/main/proto/org.litecoin/paymentrequest.proto similarity index 98% rename from core/src/main/proto/paymentrequest.proto rename to core/src/main/proto/org.litecoin/paymentrequest.proto index c980f7b86a2..f669fa6931d 100644 --- a/core/src/main/proto/paymentrequest.proto +++ b/core/src/main/proto/org.litecoin/paymentrequest.proto @@ -34,7 +34,7 @@ syntax = "proto2"; package payments; -option java_package = "org.bitcoin.protocols.payments"; +option java_package = "org.litecoin.protocols.payments"; option java_outer_classname = "Protos"; // Generalized form of "send payment to this/these bitcoin addresses" diff --git a/core/src/main/proto/peerseeds.proto b/core/src/main/proto/org.litecoin/peerseeds.proto similarity index 88% rename from core/src/main/proto/peerseeds.proto rename to core/src/main/proto/org.litecoin/peerseeds.proto index 57ccb192739..8faa38b54e8 100644 --- a/core/src/main/proto/peerseeds.proto +++ b/core/src/main/proto/org.litecoin/peerseeds.proto @@ -4,9 +4,9 @@ syntax = "proto2"; -package org.bitcoin.crawler; +package org.litecoin.crawler; -option java_package = "org.bitcoin.crawler"; +option java_package = "org.litecoin.crawler"; option java_outer_classname = "PeerSeedProtos"; message PeerSeedData { diff --git a/core/src/main/proto/storedclientpaymentchannel.proto b/core/src/main/proto/org.litecoin/storedclientpaymentchannel.proto similarity index 100% rename from core/src/main/proto/storedclientpaymentchannel.proto rename to core/src/main/proto/org.litecoin/storedclientpaymentchannel.proto diff --git a/core/src/main/proto/storedserverpaymentchannel.proto b/core/src/main/proto/org.litecoin/storedserverpaymentchannel.proto similarity index 100% rename from core/src/main/proto/storedserverpaymentchannel.proto rename to core/src/main/proto/org.litecoin/storedserverpaymentchannel.proto diff --git a/core/src/main/proto/wallet.proto b/core/src/main/proto/org.litecoin/wallet.proto similarity index 99% rename from core/src/main/proto/wallet.proto rename to core/src/main/proto/org.litecoin/wallet.proto index dac4a9eab0f..bae79ed9b7f 100644 --- a/core/src/main/proto/wallet.proto +++ b/core/src/main/proto/org.litecoin/wallet.proto @@ -360,8 +360,8 @@ message Wallet { } required string network_identifier = 1; // the network used by this wallet - // org.bitcoin.production = main, production network (Satoshi genesis block) - // org.bitcoin.test = test network (Andresen genesis block) + // org.litecoin.production = main, production network (Satoshi genesis block) + // org.litecoin.test = test network (Andresen genesis block) // The SHA256 hash of the head of the best chain seen by this wallet. optional bytes last_seen_block_hash = 2; diff --git a/examples/src/main/javascript/payprotocol.js b/examples/src/main/javascript/payprotocol.js index a021b0ed2ae..7f4e312f782 100644 --- a/examples/src/main/javascript/payprotocol.js +++ b/examples/src/main/javascript/payprotocol.js @@ -16,8 +16,8 @@ // Example app that creates a minimal BIP70 payment request with a multisig output, and then prints it to base64. -var bcj = org.bitcoinj; -var protos = org.bitcoin.protocols.payments.Protos; +var bcj = org.litecoinj; +var protos = org.litecoin.protocols.payments.Protos; var pbuf = com.google.protobuf; var details = protos.PaymentDetails.newBuilder();