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

Address, LegacyAddress, SegwitAddress, AddressParser: move to o.b.base

Browse source 
* Move related tests too
* Update imports in referencing classes
This commit is contained in:
Sean Gilligan 2023-02-16 12:59:49 -08:00 • committed by Andreas Schildbach
parent 49f17929ac
commit d354bc13ce
64 changed files with 121 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/java/org/bitcoinj/core/Address.java → core/src/main/java/org/bitcoinj/base/Address.java
View file

@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.bitcoinj.core;
package org.bitcoinj.base;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.NetworkParameters;
import javax.annotation.Nullable;
import java.util.Arrays;

6
core/src/main/java/org/bitcoinj/core/AddressParser.java → core/src/main/java/org/bitcoinj/base/AddressParser.java
View file

@ -14,14 +14,10 @@
* limitations under the License.
*/
package org.bitcoinj.core;
package org.bitcoinj.base;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.exceptions.AddressFormatException;
// TODO: Move this class to o.b.base
/**
* Interface for parsing and validating address strings.
*/

11
core/src/main/java/org/bitcoinj/core/LegacyAddress.java → core/src/main/java/org/bitcoinj/base/LegacyAddress.java
View file

@ -16,14 +16,15 @@
* limitations under the License.
*/
package org.bitcoinj.core;
package org.bitcoinj.base;
import com.google.common.primitives.UnsignedBytes;
import org.bitcoinj.base.Base58;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.AddressMessage;
import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.PeerAddress;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

9
core/src/main/java/org/bitcoinj/core/SegwitAddress.java → core/src/main/java/org/bitcoinj/base/SegwitAddress.java
View file

@ -14,14 +14,13 @@
* limitations under the License.
*/
package org.bitcoinj.core;
package org.bitcoinj.base;
import com.google.common.primitives.UnsignedBytes;
import org.bitcoinj.base.Bech32;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.NetworkParameters;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

1
core/src/main/java/org/bitcoinj/core/Block.java
View file

@ -19,6 +19,7 @@ package org.bitcoinj.core;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.base.utils.ByteUtils;

4
core/src/main/java/org/bitcoinj/core/DefaultAddressParser.java
View file

@ -16,10 +16,14 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.AddressParser;
import org.bitcoinj.base.Base58;
import org.bitcoinj.base.Bech32;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.utils.StreamUtils;
import org.bitcoinj.params.Networks;

3
core/src/main/java/org/bitcoinj/core/ECKey.java
View file

@ -24,8 +24,11 @@ import com.google.common.primitives.UnsignedBytes;
import org.bitcoin.NativeSecp256k1;
import org.bitcoin.NativeSecp256k1Util;
import org.bitcoin.Secp256k1Context;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.base.utils.ByteUtils;
import org.bitcoinj.crypto.EncryptableItem;

2
core/src/main/java/org/bitcoinj/core/GetAddrMessage.java
View file

@ -16,6 +16,8 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
/**
* <p>Represents the "getaddr" P2P protocol message, which requests network {@link AddressMessage}s from a peer. Not to
* be confused with {@link Address} which is sort of like an account number.</p>

2
core/src/main/java/org/bitcoinj/core/NetworkParameters.java
View file

@ -17,8 +17,10 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.params.BitcoinNetworkParams;

1
core/src/main/java/org/bitcoinj/core/Transaction.java
View file

@ -20,6 +20,7 @@ package org.bitcoinj.core;
import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
import com.google.common.math.IntMath;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.base.utils.ByteUtils;

1
core/src/main/java/org/bitcoinj/core/TransactionOutput.java
View file

@ -17,6 +17,7 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Sha256Hash;

3
core/src/main/java/org/bitcoinj/params/Networks.java
View file

@ -17,6 +17,7 @@
package org.bitcoinj.params;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.core.NetworkParameters;
import java.util.Arrays;
@ -30,7 +31,7 @@ import java.util.Set;
* Utility class that holds all the registered {@link NetworkParameters} types used for address auto discovery.
* By default only {@link MainNetParams} and {@link TestNet3Params} are used. If you want to use {@link RegTestParams}
* or {@link UnitTestParams} use {@code register} and then {@code unregister} the {@code TestNet3Params} as they don't
* have their own Base58 version/type code (although for {@link org.bitcoinj.core.SegwitAddress} the human readable
* have their own Base58 version/type code (although for {@link SegwitAddress} the human readable
* parts for RegTest and TestNet are different.)
*/
public class Networks {

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

@ -21,7 +21,7 @@ import com.google.common.base.MoreObjects;
import com.google.protobuf.ByteString;
import com.google.protobuf.InvalidProtocolBufferException;
import org.bitcoin.protocols.payments.Protos;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Transaction;

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

@ -20,7 +20,7 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.protobuf.InvalidProtocolBufferException;
import org.bitcoin.protocols.payments.Protos;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Transaction;

7
core/src/main/java/org/bitcoinj/script/Script.java
View file

@ -19,17 +19,16 @@
package org.bitcoinj.script;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.utils.ByteUtils;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.ProtocolException;
import org.bitcoinj.core.SegwitAddress;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.core.SignatureDecodeException;
import org.bitcoinj.core.Transaction;

6
core/src/main/java/org/bitcoinj/script/ScriptBuilder.java
View file

@ -18,10 +18,10 @@
package org.bitcoinj.script;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.core.SegwitAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.Utils;

4
core/src/main/java/org/bitcoinj/script/ScriptPattern.java
View file

@ -18,8 +18,8 @@
package org.bitcoinj.script;
import org.bitcoinj.base.utils.ByteUtils;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.core.SegwitAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.base.Sha256Hash;
import java.util.Arrays;

2
core/src/main/java/org/bitcoinj/store/MemoryFullPrunedBlockStore.java
View file

@ -18,7 +18,7 @@ package org.bitcoinj.store;
import com.google.common.base.Preconditions;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.base.Sha256Hash;

3
core/src/main/java/org/bitcoinj/testing/FakeTxBuilder.java
View file

@ -19,11 +19,10 @@ package org.bitcoinj.testing;
import com.google.common.annotations.VisibleForTesting;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.Block;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.core.MessageSerializer;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.ProtocolException;

2
core/src/main/java/org/bitcoinj/uri/BitcoinURI.java
View file

@ -20,7 +20,7 @@ import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.NetworkParameters;

4
core/src/main/java/org/bitcoinj/utils/MessageVerifyUtils.java
View file

@ -2,9 +2,9 @@ package org.bitcoinj.utils;
import com.google.common.primitives.Bytes;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.SegwitAddress;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.core.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -19,10 +19,10 @@ package org.bitcoinj.wallet;
import com.google.protobuf.ByteString;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.BloomFilter;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.crypto.ChildNumber;
import org.bitcoinj.crypto.DeterministicKey;

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

@ -19,7 +19,7 @@ package org.bitcoinj.wallet;
import com.google.common.base.MoreObjects;
import org.bitcoin.protocols.payments.Protos.PaymentDetails;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.Context;
import org.bitcoinj.core.ECKey;

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

@ -29,9 +29,9 @@ import org.bitcoinj.base.Network;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.utils.StreamUtils;
import org.bitcoinj.core.AbstractBlockChain;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Base58;
import org.bitcoinj.core.AddressParser;
import org.bitcoinj.base.AddressParser;
import org.bitcoinj.core.BlockChain;
import org.bitcoinj.core.BloomFilter;
import org.bitcoinj.base.Coin;
@ -40,7 +40,7 @@ import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.FilteredBlock;
import org.bitcoinj.core.InsufficientMoneyException;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.core.Message;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Peer;
@ -133,7 +133,6 @@ import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

7
core/src/test/java/org/bitcoinj/core/AddressComparatorSortTest.java → core/src/test/java/org/bitcoinj/base/AddressComparatorSortTest.java
View file

@ -14,9 +14,14 @@
* limitations under the License.
*/
package org.bitcoinj.core;
package org.bitcoinj.base;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.AddressParser;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.base.utils.StreamUtils;
import org.bitcoinj.core.DefaultAddressParser;
import org.junit.Test;
import java.util.ArrayList;

4
core/src/test/java/org/bitcoinj/core/AddressTest.java → core/src/test/java/org/bitcoinj/base/AddressTest.java
View file

@ -14,10 +14,12 @@
* limitations under the License.
*/
package org.bitcoinj.core;
package org.bitcoinj.base;
import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Warning;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.params.MainNetParams;
import org.bitcoinj.params.TestNet3Params;
import org.junit.Test;

13
core/src/test/java/org/bitcoinj/core/LegacyAddressTest.java → core/src/test/java/org/bitcoinj/base/LegacyAddressTest.java
View file

@ -15,14 +15,21 @@
* limitations under the License.
*/
package org.bitcoinj.core;
package org.bitcoinj.base;
import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Warning;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.AddressParser;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.utils.ByteUtils;
import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.DumpedPrivateKey;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.params.MainNetParams;
import org.bitcoinj.params.Networks;
import org.bitcoinj.params.TestNet3Params;
@ -195,10 +202,10 @@ public class LegacyAddressTest {
public void p2shAddress() {
// Test that we can construct P2SH addresses
LegacyAddress mainNetP2SHAddress = LegacyAddress.fromBase58(BitcoinNetwork.MAINNET, "35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU");
assertEquals(mainNetP2SHAddress.getVersion(), MAINNET.p2shHeader);
assertEquals(mainNetP2SHAddress.getVersion(), MAINNET.getP2SHHeader());
assertEquals(ScriptType.P2SH, mainNetP2SHAddress.getOutputScriptType());
LegacyAddress testNetP2SHAddress = LegacyAddress.fromBase58(BitcoinNetwork.TESTNET, "2MuVSxtfivPKJe93EC1Tb9UhJtGhsoWEHCe");
assertEquals(testNetP2SHAddress.getVersion(), TESTNET.p2shHeader);
assertEquals(testNetP2SHAddress.getVersion(), TESTNET.getP2SHHeader());
assertEquals(ScriptType.P2SH, testNetP2SHAddress.getOutputScriptType());
// Test that we can determine what network a P2SH address belongs to

7
core/src/test/java/org/bitcoinj/core/SegwitAddressTest.java → core/src/test/java/org/bitcoinj/base/SegwitAddressTest.java
View file

@ -14,15 +14,18 @@
* limitations under the License.
*/
package org.bitcoinj.core;
package org.bitcoinj.base;
import com.google.common.base.MoreObjects;
import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Warning;
import org.bitcoinj.base.AddressParser;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Network;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.utils.ByteUtils;
import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.params.MainNetParams;
import org.bitcoinj.params.TestNet3Params;
import org.bitcoinj.script.Script;

1
core/src/test/java/org/bitcoinj/core/AbstractFullPrunedBlockChainTest.java
View file

@ -18,6 +18,7 @@
package org.bitcoinj.core;
import com.google.common.collect.Lists;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.params.MainNetParams;

1
core/src/test/java/org/bitcoinj/core/Base58EncodeCheckedTest.java
View file

@ -18,6 +18,7 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Base58;
import org.bitcoinj.base.LegacyAddress;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

1
core/src/test/java/org/bitcoinj/core/BlockChainTest.java
View file

@ -17,6 +17,7 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Sha256Hash;

1
core/src/test/java/org/bitcoinj/core/BloomFilterTest.java
View file

@ -17,6 +17,7 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.params.MainNetParams;

1
core/src/test/java/org/bitcoinj/core/ChainSplitTest.java
View file

@ -17,6 +17,7 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.ScriptType;

3
core/src/test/java/org/bitcoinj/core/ECKeyTest.java
View file

@ -19,8 +19,11 @@ package org.bitcoinj.core;
import com.google.common.collect.Lists;
import com.google.common.primitives.Bytes;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.base.utils.ByteUtils;
import org.bitcoinj.core.ECKey.ECDSASignature;

1
core/src/test/java/org/bitcoinj/core/TransactionInputTest.java
View file

@ -17,6 +17,7 @@
package org.bitcoinj.core;
import com.google.common.collect.Lists;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Sha256Hash;

2
core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java
View file

@ -16,8 +16,10 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.script.Script;
import org.bitcoinj.script.ScriptBuilder;

1
core/src/test/java/org/bitcoinj/core/TransactionTest.java
View file

@ -17,6 +17,7 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.ScriptType;

1
core/src/test/java/org/bitcoinj/core/TxConfidenceTableTest.java
View file

@ -16,6 +16,7 @@
package org.bitcoinj.core;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Sha256Hash;

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

@ -22,7 +22,7 @@ import org.bitcoin.protocols.payments.Protos.PaymentACK;
import org.bitcoin.protocols.payments.Protos.PaymentRequest;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.NetworkParameters;

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

@ -21,7 +21,7 @@ import com.google.protobuf.ByteString;
import org.bitcoin.protocols.payments.Protos;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.NetworkParameters;

6
core/src/test/java/org/bitcoinj/script/ScriptTest.java
View file

@ -24,15 +24,15 @@ import com.google.common.collect.Lists;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.utils.ByteUtils;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.DumpedPrivateKey;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.core.MessageSerializer;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.ProtocolException;
import org.bitcoinj.core.SegwitAddress;
import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.Transaction.SigHash;

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

@ -20,7 +20,7 @@ package org.bitcoinj.store;
import com.google.common.base.Stopwatch;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.Block;
import org.bitcoinj.core.Context;
import org.bitcoinj.core.ECKey;

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

@ -22,7 +22,7 @@ import com.google.protobuf.ByteString;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.utils.ByteUtils;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.Block;
import org.bitcoinj.core.BlockChain;
import org.bitcoinj.core.BlockTest;

2
core/src/test/java/org/bitcoinj/testing/TestWithWallet.java
View file

@ -18,7 +18,7 @@ package org.bitcoinj.testing;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.AbstractBlockChain;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.Block;
import org.bitcoinj.core.BlockChain;
import org.bitcoinj.base.Coin;

4
core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java
View file

@ -17,9 +17,9 @@
package org.bitcoinj.uri;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.params.Networks;
import org.bitcoinj.testing.MockAltNetworkParams;

2
core/src/test/java/org/bitcoinj/utils/MessageVerifyUtilsTest.java
View file

@ -1,6 +1,6 @@
package org.bitcoinj.utils;
import org.bitcoinj.core.AddressParser;
import org.bitcoinj.base.AddressParser;
import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.params.MainNetParams;

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

@ -20,10 +20,10 @@ package org.bitcoinj.wallet;
import com.google.common.collect.Lists;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.BloomFilter;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.core.Utils;

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

@ -17,7 +17,7 @@
package org.bitcoinj.wallet;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.BloomFilter;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.NetworkParameters;

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

@ -22,13 +22,13 @@ import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.utils.ByteUtils;
import org.bitcoinj.core.AbstractBlockChain;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.Block;
import org.bitcoinj.core.BlockChain;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.InsufficientMoneyException;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.core.PeerAddress;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.core.StoredBlock;

0
core/src/test/resources/org/bitcoinj/core/LegacyAddressTestDataset.txt → core/src/test/resources/org/bitcoinj/base/LegacyAddressTestDataset.txt
View file

1
examples/src/main/java/org/bitcoinj/examples/DoubleSpend.java
View file

@ -16,6 +16,7 @@
package org.bitcoinj.examples;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.*;

4
examples/src/main/java/org/bitcoinj/examples/ForwardingService.java
View file

@ -19,9 +19,9 @@ package org.bitcoinj.examples;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.AddressParser;
import org.bitcoinj.base.AddressParser;
import org.bitcoinj.core.Context;
import org.bitcoinj.core.DefaultAddressParser;
import org.bitcoinj.core.InsufficientMoneyException;

2
examples/src/main/java/org/bitcoinj/examples/PrivateKeys.java
View file

@ -18,7 +18,7 @@
package org.bitcoinj.examples;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Base58;
import org.bitcoinj.core.BlockChain;
import org.bitcoinj.core.DumpedPrivateKey;

1
examples/src/main/java/org/bitcoinj/examples/SendRequest.java
View file

@ -16,6 +16,7 @@
package org.bitcoinj.examples;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.ScriptType;

2
integration-test/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTest.java
View file

@ -19,6 +19,7 @@ package org.bitcoinj.core;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.base.utils.ByteUtils;
@ -27,7 +28,6 @@ import org.bitcoinj.store.MemoryBlockStore;
import org.bitcoinj.testing.FakeTxBuilder;
import org.bitcoinj.testing.InboundMessageQueuer;
import org.bitcoinj.testing.TestWithPeerGroup;
import org.bitcoinj.wallet.KeyChainGroup;
import org.bitcoinj.wallet.Wallet;
import org.junit.After;
import org.junit.Before;

1
integration-test/src/test/java/org/bitcoinj/core/PeerGroupTest.java
View file

@ -19,6 +19,7 @@ package org.bitcoinj.core;
import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Sha256Hash;

1
integration-test/src/test/java/org/bitcoinj/core/TransactionBroadcastTest.java
View file

@ -18,6 +18,7 @@
package org.bitcoinj.core;
import com.google.common.util.concurrent.AtomicDouble;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.testing.FakeTxBuilder;

2
integration-test/src/test/java/org/bitcoinj/examples/ForwardingServiceTest.java
View file

@ -18,7 +18,7 @@ package org.bitcoinj.examples;
import org.bitcoinj.base.BitcoinNetwork;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.Context;
import org.bitcoinj.core.ECKey;
import org.junit.jupiter.api.BeforeEach;

2
integration-test/src/test/java/org/bitcoinj/testing/TestWithNetworkConnections.java
View file

@ -18,7 +18,7 @@
package org.bitcoinj.testing;
import org.bitcoinj.base.ScriptType;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.core.BlockChain;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.Context;

3
wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/BitcoinAddressValidator.java
View file

@ -16,12 +16,11 @@
package org.bitcoinj.walletfx.controls;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.exceptions.AddressFormatException;
import javafx.scene.Node;
import javafx.scene.control.TextField;
import org.bitcoinj.core.AddressParser;
import org.bitcoinj.base.AddressParser;
import org.bitcoinj.walletfx.utils.TextFieldValidator;
/**

2
wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/ClickableBitcoinAddress.java
View file

@ -39,7 +39,7 @@ import javafx.scene.input.MouseEvent;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.Pane;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.uri.BitcoinURI;
import org.bitcoinj.walletfx.overlay.OverlayController;

2
wallettemplate/src/main/java/org/bitcoinj/walletfx/utils/BitcoinUIModel.java
View file

@ -16,7 +16,7 @@
package org.bitcoinj.walletfx.utils;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.listeners.DownloadProgressTracker;
import org.bitcoinj.wallet.Wallet;

1
wallettemplate/src/main/java/wallettemplate/SendMoneyController.java
View file

@ -17,6 +17,7 @@
package wallettemplate;
import javafx.scene.layout.HBox;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.Coin;
import org.bitcoinj.core.*;
import org.bitcoinj.wallet.SendRequest;

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

@ -42,7 +42,7 @@ import com.google.common.io.Resources;
import com.google.protobuf.ByteString;
import org.bitcoinj.core.AbstractBlockChain;
import org.bitcoinj.core.Address;
import org.bitcoinj.base.Address;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.Base58;
import org.bitcoinj.core.BlockChain;
@ -53,7 +53,7 @@ import org.bitcoinj.core.DumpedPrivateKey;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.FullPrunedBlockChain;
import org.bitcoinj.core.InsufficientMoneyException;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Peer;
import org.bitcoinj.core.PeerAddress;