mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-21 14:04:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

wallet.proto, paymentrequest.proto: move generated files to dedicated packages

Browse source 
* Modify the `java_package` setting in our two `.proto` source files
 * Move 2 existing generated-but-checked-in Protos.java files to
   dedicated packages (i.e. packages without hand-coded "artisanal" files)

This is a step towards more compatibility with ProtoBuf tooling which
sometimes likes to delete the generated files and:

 > can't distinguish between "old generated code" and "your artisan source files."

and more importantly it is a step towards fixing Gradle 8 caching issues.
This commit is contained in:
Sean Gilligan 2023-07-28 21:44:13 +02:00 • committed by Andreas Schildbach
parent a7446b65ae
commit 36dce3d9d5
29 changed files with 38 additions and 20040 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,3 +13,4 @@ bin/
out/ out/
*.chain *.chain
*.spvchain *.spvchain
core/src/main/java/org/bitcoinj/protobuf/

4722
core/src/main/java/org/bitcoin/protocols/payments/Protos.java
View file

File diff suppressed because it is too large Load diff

2
core/src/main/java/org/bitcoinj/crypto/ECKey.java
View file

@ -35,7 +35,7 @@ import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.base.VarInt; import org.bitcoinj.base.VarInt;
import org.bitcoinj.crypto.internal.CryptoUtils; import org.bitcoinj.crypto.internal.CryptoUtils;
import org.bitcoinj.crypto.utils.MessageVerifyUtils; import org.bitcoinj.crypto.utils.MessageVerifyUtils;
import org.bitcoinj.wallet.Protos; import org.bitcoinj.protobuf.wallet.Protos;
import org.bitcoinj.wallet.Wallet; import org.bitcoinj.wallet.Wallet;
import org.bouncycastle.asn1.ASN1InputStream; import org.bouncycastle.asn1.ASN1InputStream;
import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1Integer;

2
core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java
View file

@ -16,7 +16,7 @@
package org.bitcoinj.crypto; package org.bitcoinj.crypto;
import org.bitcoinj.wallet.Protos; import org.bitcoinj.protobuf.wallet.Protos;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.time.Instant; import java.time.Instant;

2
core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java
View file

@ -16,7 +16,7 @@
package org.bitcoinj.crypto; package org.bitcoinj.crypto;
import org.bitcoinj.wallet.Protos.Wallet.EncryptionType; import org.bitcoinj.protobuf.wallet.Protos.Wallet.EncryptionType;
/** /**
* <p>A KeyCrypter can be used to encrypt and decrypt a message. The sequence of events to encrypt and then decrypt * <p>A KeyCrypter can be used to encrypt and decrypt a message. The sequence of events to encrypt and then decrypt

6
core/src/main/java/org/bitcoinj/crypto/KeyCrypterScrypt.java
View file

@ -20,9 +20,9 @@ package org.bitcoinj.crypto;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import org.bitcoinj.base.internal.Stopwatch; import org.bitcoinj.base.internal.Stopwatch;
import org.bitcoinj.base.internal.TimeUtils; import org.bitcoinj.base.internal.TimeUtils;
import org.bitcoinj.wallet.Protos; import org.bitcoinj.protobuf.wallet.Protos;
import org.bitcoinj.wallet.Protos.ScryptParameters; import org.bitcoinj.protobuf.wallet.Protos.ScryptParameters;
import org.bitcoinj.wallet.Protos.Wallet.EncryptionType; import org.bitcoinj.protobuf.wallet.Protos.Wallet.EncryptionType;
import org.bouncycastle.crypto.BufferedBlockCipher; import org.bouncycastle.crypto.BufferedBlockCipher;
import org.bouncycastle.crypto.InvalidCipherTextException; import org.bouncycastle.crypto.InvalidCipherTextException;
import org.bouncycastle.crypto.engines.AESEngine; import org.bouncycastle.crypto.engines.AESEngine;

2
core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java
View file

@ -20,7 +20,7 @@ package org.bitcoinj.protocols.payments;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
import org.bitcoin.protocols.payments.Protos; import org.bitcoinj.protobuf.payments.Protos;
import org.bitcoinj.base.Address; import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin; import org.bitcoinj.base.Coin;
import org.bitcoinj.base.internal.TimeUtils; import org.bitcoinj.base.internal.TimeUtils;

2
core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java
View file

@ -18,7 +18,7 @@ package org.bitcoinj.protocols.payments;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
import org.bitcoin.protocols.payments.Protos; import org.bitcoinj.protobuf.payments.Protos;
import org.bitcoinj.base.Address; import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin; import org.bitcoinj.base.Coin;
import org.bitcoinj.base.internal.TimeUtils; import org.bitcoinj.base.internal.TimeUtils;

1
core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java
View file

@ -31,6 +31,7 @@ import org.bitcoinj.crypto.KeyCrypterScrypt;
import org.bitcoinj.utils.ListenerRegistration; import org.bitcoinj.utils.ListenerRegistration;
import org.bitcoinj.utils.Threading; import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.listeners.KeyChainEventListener; import org.bitcoinj.wallet.listeners.KeyChainEventListener;
import org.bitcoinj.protobuf.wallet.Protos;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.time.Instant; import java.time.Instant;

1
core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java
View file

@ -44,6 +44,7 @@ import org.bitcoinj.script.Script;
import org.bitcoinj.utils.ListenerRegistration; import org.bitcoinj.utils.ListenerRegistration;
import org.bitcoinj.utils.Threading; import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.listeners.KeyChainEventListener; import org.bitcoinj.wallet.listeners.KeyChainEventListener;
import org.bitcoinj.protobuf.wallet.Protos;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

1
core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java
View file

@ -37,6 +37,7 @@ import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import org.bitcoinj.base.internal.ByteUtils; import org.bitcoinj.base.internal.ByteUtils;
import org.bitcoinj.protobuf.wallet.Protos;
import static org.bitcoinj.base.internal.Preconditions.checkArgument; import static org.bitcoinj.base.internal.Preconditions.checkArgument;
import static org.bitcoinj.base.internal.Preconditions.checkState; import static org.bitcoinj.base.internal.Preconditions.checkState;

1
core/src/main/java/org/bitcoinj/wallet/KeyChain.java
View file

@ -19,6 +19,7 @@ package org.bitcoinj.wallet;
import org.bitcoinj.core.BloomFilter; import org.bitcoinj.core.BloomFilter;
import org.bitcoinj.crypto.ECKey; import org.bitcoinj.crypto.ECKey;
import org.bitcoinj.wallet.listeners.KeyChainEventListener; import org.bitcoinj.wallet.listeners.KeyChainEventListener;
import org.bitcoinj.protobuf.wallet.Protos;
import java.time.Instant; import java.time.Instant;
import java.util.List; import java.util.List;

1
core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
View file

@ -39,6 +39,7 @@ import org.bitcoinj.utils.ListenerRegistration;
import org.bitcoinj.utils.Threading; import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.listeners.CurrentKeyChangeEventListener; import org.bitcoinj.wallet.listeners.CurrentKeyChangeEventListener;
import org.bitcoinj.wallet.listeners.KeyChainEventListener; import org.bitcoinj.wallet.listeners.KeyChainEventListener;
import org.bitcoinj.protobuf.wallet.Protos;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

15292
core/src/main/java/org/bitcoinj/wallet/Protos.java
View file

File diff suppressed because it is too large Load diff

2
core/src/main/java/org/bitcoinj/wallet/SendRequest.java
View file

@ -18,7 +18,7 @@
package org.bitcoinj.wallet; package org.bitcoinj.wallet;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import org.bitcoin.protocols.payments.Protos.PaymentDetails; import org.bitcoinj.protobuf.payments.Protos.PaymentDetails;
import org.bitcoinj.base.Address; import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin; import org.bitcoinj.base.Coin;
import org.bitcoinj.crypto.AesKey; import org.bitcoinj.crypto.AesKey;

3
core/src/main/java/org/bitcoinj/wallet/Wallet.java
View file

@ -89,7 +89,8 @@ import org.bitcoinj.base.internal.FutureUtils;
import org.bitcoinj.utils.ListenableCompletableFuture; import org.bitcoinj.utils.ListenableCompletableFuture;
import org.bitcoinj.utils.ListenerRegistration; import org.bitcoinj.utils.ListenerRegistration;
import org.bitcoinj.utils.Threading; import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.Protos.Wallet.EncryptionType; import org.bitcoinj.protobuf.wallet.Protos;
import org.bitcoinj.protobuf.wallet.Protos.Wallet.EncryptionType;
import org.bitcoinj.wallet.WalletTransaction.Pool; import org.bitcoinj.wallet.WalletTransaction.Pool;
import org.bitcoinj.wallet.listeners.CurrentKeyChangeEventListener; import org.bitcoinj.wallet.listeners.CurrentKeyChangeEventListener;
import org.bitcoinj.wallet.listeners.KeyChainEventListener; import org.bitcoinj.wallet.listeners.KeyChainEventListener;

5
core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java
View file

@ -43,7 +43,8 @@ import org.bitcoinj.script.Script;
import org.bitcoinj.script.ScriptException; import org.bitcoinj.script.ScriptException;
import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.utils.ExchangeRate;
import org.bitcoinj.base.utils.Fiat; import org.bitcoinj.base.utils.Fiat;
import org.bitcoinj.wallet.Protos.Wallet.EncryptionType; import org.bitcoinj.protobuf.wallet.Protos;
import org.bitcoinj.protobuf.wallet.Protos.Wallet.EncryptionType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -730,7 +731,7 @@ public class WalletProtobufSerializer {
txMap.put(txProto.getHash(), tx); txMap.put(txProto.getHash(), tx);
} }
private WalletTransaction connectTransactionOutputs(final org.bitcoinj.wallet.Protos.Transaction txProto) throws UnreadableWalletException { private WalletTransaction connectTransactionOutputs(final Protos.Transaction txProto) throws UnreadableWalletException {
Transaction tx = txMap.get(txProto.getHash()); Transaction tx = txMap.get(txProto.getHash());
final WalletTransaction.Pool pool; final WalletTransaction.Pool pool;
switch (txProto.getPool()) { switch (txProto.getPool()) {

2
core/src/main/proto/paymentrequest.proto
View file

@ -34,7 +34,7 @@ syntax = "proto2";
package payments; package payments;
option java_package = "org.bitcoin.protocols.payments"; option java_package = "org.bitcoinj.protobuf.payments";
option java_outer_classname = "Protos"; option java_outer_classname = "Protos";
// Generalized form of "send payment to this/these bitcoin addresses" // Generalized form of "send payment to this/these bitcoin addresses"

2
core/src/main/proto/wallet.proto
View file

@ -27,7 +27,7 @@ syntax = "proto2";
package wallet; package wallet;
option java_package = "org.bitcoinj.wallet"; option java_package = "org.bitcoinj.protobuf.wallet";
option java_outer_classname = "Protos"; option java_outer_classname = "Protos";
message PeerAddress { message PeerAddress {

8
core/src/test/java/org/bitcoinj/protocols/payments/PaymentProtocolTest.java
View file

@ -16,10 +16,10 @@
package org.bitcoinj.protocols.payments; package org.bitcoinj.protocols.payments;
import org.bitcoin.protocols.payments.Protos; import org.bitcoinj.protobuf.payments.Protos;
import org.bitcoin.protocols.payments.Protos.Payment; import org.bitcoinj.protobuf.payments.Protos.Payment;
import org.bitcoin.protocols.payments.Protos.PaymentACK; import org.bitcoinj.protobuf.payments.Protos.PaymentACK;
import org.bitcoin.protocols.payments.Protos.PaymentRequest; import org.bitcoinj.protobuf.payments.Protos.PaymentRequest;
import org.bitcoinj.base.BitcoinNetwork; import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType; import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Address; import org.bitcoinj.base.Address;

2
core/src/test/java/org/bitcoinj/protocols/payments/PaymentSessionTest.java
View file

@ -18,7 +18,7 @@
package org.bitcoinj.protocols.payments; package org.bitcoinj.protocols.payments;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import org.bitcoin.protocols.payments.Protos; import org.bitcoinj.protobuf.payments.Protos;
import org.bitcoinj.base.BitcoinNetwork; import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType; import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Address; import org.bitcoinj.base.Address;

2
core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java
View file

@ -49,7 +49,7 @@ import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.DeterministicKeyChain; import org.bitcoinj.wallet.DeterministicKeyChain;
import org.bitcoinj.wallet.KeyChain; import org.bitcoinj.wallet.KeyChain;
import org.bitcoinj.wallet.KeyChainGroup; import org.bitcoinj.wallet.KeyChainGroup;
import org.bitcoinj.wallet.Protos; import org.bitcoinj.protobuf.wallet.Protos;
import org.bitcoinj.wallet.UnreadableWalletException; import org.bitcoinj.wallet.UnreadableWalletException;
import org.bitcoinj.wallet.Wallet; import org.bitcoinj.wallet.Wallet;
import org.bitcoinj.wallet.WalletExtension; import org.bitcoinj.wallet.WalletExtension;

1
core/src/test/java/org/bitcoinj/wallet/BasicKeyChainTest.java
View file

@ -25,6 +25,7 @@ import org.bitcoinj.crypto.KeyCrypterException;
import org.bitcoinj.crypto.KeyCrypterScrypt; import org.bitcoinj.crypto.KeyCrypterScrypt;
import org.bitcoinj.utils.Threading; import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.listeners.AbstractKeyChainEventListener; import org.bitcoinj.wallet.listeners.AbstractKeyChainEventListener;
import org.bitcoinj.protobuf.wallet.Protos;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

1
core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java
View file

@ -35,6 +35,7 @@ import org.bitcoinj.crypto.HDPath;
import org.bitcoinj.utils.BriefLogFormatter; import org.bitcoinj.utils.BriefLogFormatter;
import org.bitcoinj.utils.Threading; import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.listeners.AbstractKeyChainEventListener; import org.bitcoinj.wallet.listeners.AbstractKeyChainEventListener;
import org.bitcoinj.protobuf.wallet.Protos;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

1
core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java
View file

@ -34,6 +34,7 @@ import org.bitcoinj.utils.BriefLogFormatter;
import org.bitcoinj.utils.Threading; import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.KeyChain.KeyPurpose; import org.bitcoinj.wallet.KeyChain.KeyPurpose;
import org.bitcoinj.wallet.listeners.KeyChainEventListener; import org.bitcoinj.wallet.listeners.KeyChainEventListener;
import org.bitcoinj.protobuf.wallet.Protos;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

3
core/src/test/java/org/bitcoinj/wallet/WalletTest.java
View file

@ -70,7 +70,8 @@ import org.bitcoinj.utils.ExchangeRate;
import org.bitcoinj.base.utils.Fiat; import org.bitcoinj.base.utils.Fiat;
import org.bitcoinj.utils.Threading; import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.KeyChain.KeyPurpose; import org.bitcoinj.wallet.KeyChain.KeyPurpose;
import org.bitcoinj.wallet.Protos.Wallet.EncryptionType; import org.bitcoinj.protobuf.wallet.Protos;
import org.bitcoinj.protobuf.wallet.Protos.Wallet.EncryptionType;
import org.bitcoinj.wallet.Wallet.BalanceType; import org.bitcoinj.wallet.Wallet.BalanceType;
import org.bitcoinj.wallet.WalletTransaction.Pool; import org.bitcoinj.wallet.WalletTransaction.Pool;
import org.easymock.EasyMock; import org.easymock.EasyMock;

2
tools/src/main/java/org/bitcoinj/tools/PaymentProtocolTool.java
View file

@ -23,7 +23,7 @@ import org.bitcoinj.protocols.payments.PaymentProtocolException;
import org.bitcoinj.protocols.payments.PaymentSession; import org.bitcoinj.protocols.payments.PaymentSession;
import org.bitcoinj.uri.BitcoinURI; import org.bitcoinj.uri.BitcoinURI;
import org.bitcoinj.uri.BitcoinURIParseException; import org.bitcoinj.uri.BitcoinURIParseException;
import org.bitcoin.protocols.payments.Protos; import org.bitcoinj.protobuf.payments.Protos;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

2
wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java
View file

@ -22,7 +22,7 @@ import javafx.scene.control.*;
import javafx.scene.layout.*; import javafx.scene.layout.*;
import org.bitcoinj.crypto.AesKey; import org.bitcoinj.crypto.AesKey;
import org.bitcoinj.crypto.*; import org.bitcoinj.crypto.*;
import org.bitcoinj.wallet.*; import org.bitcoinj.protobuf.wallet.Protos;
import org.bitcoinj.walletfx.application.WalletApplication; import org.bitcoinj.walletfx.application.WalletApplication;
import org.bitcoinj.walletfx.overlay.OverlayController; import org.bitcoinj.walletfx.overlay.OverlayController;
import org.bitcoinj.walletfx.overlay.OverlayableStackPaneController; import org.bitcoinj.walletfx.overlay.OverlayableStackPaneController;

6
wallettool/src/main/java/org/bitcoinj/wallettool/WalletTool.java
View file

@ -65,7 +65,7 @@ import org.bitcoinj.core.TransactionBroadcast;
import org.bitcoinj.core.VerificationException; import org.bitcoinj.core.VerificationException;
import org.bitcoinj.core.listeners.DownloadProgressTracker; import org.bitcoinj.core.listeners.DownloadProgressTracker;
import org.bitcoinj.wallet.KeyChainGroupStructure; import org.bitcoinj.wallet.KeyChainGroupStructure;
import org.bitcoinj.wallet.Protos; import org.bitcoinj.protobuf.wallet.Protos;
import org.bitcoinj.wallet.SendRequest; import org.bitcoinj.wallet.SendRequest;
import org.bitcoinj.wallet.UnreadableWalletException; import org.bitcoinj.wallet.UnreadableWalletException;
import org.bitcoinj.wallet.Wallet; import org.bitcoinj.wallet.Wallet;
@ -243,7 +243,7 @@ public class WalletTool implements Callable<Integer> {
private static AbstractBlockChain chain; private static AbstractBlockChain chain;
private static PeerGroup peerGroup; private static PeerGroup peerGroup;
private static Wallet wallet; private static Wallet wallet;
private static org.bitcoin.protocols.payments.Protos.PaymentRequest paymentRequest; private static org.bitcoinj.protobuf.payments.Protos.PaymentRequest paymentRequest;
public static class Condition { public static class Condition {
public enum Type { public enum Type {
@ -822,7 +822,7 @@ public class WalletTool implements Callable<Integer> {
System.exit(1); System.exit(1);
} }
try { try {
paymentRequest = org.bitcoin.protocols.payments.Protos.PaymentRequest.newBuilder().mergeFrom(stream).build(); paymentRequest = org.bitcoinj.protobuf.payments.Protos.PaymentRequest.newBuilder().mergeFrom(stream).build();
} catch(IOException e) { } catch(IOException e) {
System.err.println("Failed to parse payment request from file " + e.getMessage()); System.err.println("Failed to parse payment request from file " + e.getMessage());
System.exit(1); System.exit(1);