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

base: extinguish unwanted references from main classpath

Browse Source 
It removes references to core and crypto modules, as well as to Guava.
This commit is contained in:
Andreas Schildbach 2023-02-25 01:00:11 +01:00
parent eef3f8f8d9
commit 362f2d5f93
6 changed files with 0 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/main/java/org/bitcoinj/base/Address.java
View File

@ -16,9 +16,6 @@
package org.bitcoinj.base;
import org.bitcoinj.crypto.ECKey;
import org.bitcoinj.core.NetworkParameters;
import java.util.Comparator;
/**
@ -27,32 +24,6 @@ import java.util.Comparator;
* Use {@link AddressParser} to construct any kind of address from its textual form.
*/
public interface Address extends Comparable<Address> {
/**
* Construct an {@link Address} that represents the public part of the given {@code ECKey}.
*
* @param params
* network this address is valid for
* @param key
* only the public part is used
* @param outputScriptType
* script type the address should use
* @return constructed address
* @deprecated Use {@link ECKey#toAddress(ScriptType, Network)}
*/
@Deprecated
static Address fromKey(final NetworkParameters params, final ECKey key, final ScriptType outputScriptType) {
return key.toAddress(outputScriptType, params.network());
}
/**
* @return network this data is valid for
* @deprecated Use {@link #network()}
*/
@Deprecated
default NetworkParameters getParameters() {
return NetworkParameters.of(network());
}
/**
* Get either the public key hash or script hash that is encoded in the address.
*

49
core/src/main/java/org/bitcoinj/base/LegacyAddress.java
View File

@ -20,8 +20,6 @@ package org.bitcoinj.base;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.internal.ByteUtils;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.crypto.ECKey;
import javax.annotation.Nonnull;
import java.util.Arrays;
@ -84,22 +82,6 @@ public class LegacyAddress implements Address {
return network;
}
/**
* Construct a {@link LegacyAddress} that represents the given pubkey hash. The resulting address will be a P2PKH type of
* address.
*
* @param params
* network this address is valid for
* @param hash160
* 20-byte pubkey hash
* @return constructed address
* @deprecated Use {@link #fromPubKeyHash(Network, byte[])}
*/
@Deprecated
public static LegacyAddress fromPubKeyHash(NetworkParameters params, byte[] hash160) throws AddressFormatException {
return fromPubKeyHash(params.network(), hash160);
}
/**
* Construct a {@link LegacyAddress} that represents the given pubkey hash. The resulting address will be a P2PKH type of
* address.
@ -112,37 +94,6 @@ public class LegacyAddress implements Address {
return new LegacyAddress(network, false, hash160);
}
/**
* Construct a {@link LegacyAddress} that represents the public part of the given {@code ECKey}. Note that an address is
* derived from a hash of the public key and is not the public key itself.
*
* @param params
* network this address is valid for
* @param key
* only the public part is used
* @return constructed address
* @deprecated Use {@code ECKey#toAddress(ScriptType, Network)}
*/
@Deprecated
public static LegacyAddress fromKey(NetworkParameters params, ECKey key) {
return (LegacyAddress) key.toAddress(ScriptType.P2PKH, params.network());
}
/**
* Construct a {@link LegacyAddress} that represents the given P2SH script hash.
*
* @param params
* network this address is valid for
* @param hash160
* P2SH script hash
* @return constructed address
* @deprecated Use {@link #fromScriptHash(Network, byte[])}
*/
@Deprecated
public static LegacyAddress fromScriptHash(NetworkParameters params, byte[] hash160) throws AddressFormatException {
return fromScriptHash(params.network(), hash160);
}
/**
* Construct a {@link LegacyAddress} that represents the given P2SH script hash.
*

53
core/src/main/java/org/bitcoinj/base/SegwitAddress.java
View File

@ -18,8 +18,6 @@ package org.bitcoinj.base;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.internal.ByteUtils;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.crypto.ECKey;
import javax.annotation.Nonnull;
import java.util.Arrays;
@ -258,22 +256,6 @@ public class SegwitAddress implements Address {
return address;
}
/**
* Construct a {@link SegwitAddress} that represents the given hash, which is either a pubkey hash or a script hash.
* The resulting address will be either a P2WPKH or a P2WSH type of address.
*
* @param params
* network this address is valid for
* @param hash
* 20-byte pubkey hash or 32-byte script hash
* @return constructed address
* @deprecated Use {@link #fromHash(Network, byte[])}
*/
@Deprecated
public static SegwitAddress fromHash(NetworkParameters params, byte[] hash) {
return fromHash(params.network(), hash);
}
/**
* Construct a {@link SegwitAddress} that represents the given hash, which is either a pubkey hash or a script hash.
* The resulting address will be either a P2WPKH or a P2WSH type of address.
@ -286,25 +268,6 @@ public class SegwitAddress implements Address {
return new SegwitAddress(network, 0, hash);
}
/**
* Construct a {@link SegwitAddress} that represents the given program, which is either a pubkey, a pubkey hash
* or a script hash – depending on the script version. The resulting address will be either a P2WPKH, a P2WSH or
* a P2TR type of address.
*
* @param params
* network this address is valid for
* @param witnessVersion
* version number between 0 and 16
* @param witnessProgram
* version dependent witness program
* @return constructed address
* @deprecated Use {@link #fromProgram(Network, int, byte[])}
*/
@Deprecated
public static SegwitAddress fromProgram(NetworkParameters params, int witnessVersion, byte[] witnessProgram) {
return fromProgram(params.network(), witnessVersion, witnessProgram);
}
/**
* Construct a {@link SegwitAddress} that represents the given program, which is either a pubkey, a pubkey hash
* or a script hash – depending on the script version. The resulting address will be either a P2WPKH, a P2WSH or
@ -319,22 +282,6 @@ public class SegwitAddress implements Address {
return new SegwitAddress(network, witnessVersion, witnessProgram);
}
/**
* Construct a {@link SegwitAddress} that represents the public part of the given {@code ECKey}. Note that an
* address is derived from a hash of the public key and is not the public key itself.
*
* @param params
* network this address is valid for
* @param key
* only the public part is used
* @return constructed address
* @deprecated Use {@code ECKey#toAddress(ScriptType, org.bitcoinj.base.Network)}
*/
@Deprecated
public static SegwitAddress fromKey(NetworkParameters params, ECKey key) {
return (SegwitAddress) key.toAddress(ScriptType.P2WPKH, params.network());
}
/**
* Get the network this address works on. Use of {@link BitcoinNetwork} is preferred to use of {@code NetworkParameters}
* when you need to know what network an address is for.

9
core/src/main/java/org/bitcoinj/base/internal/ByteUtils.java
View File

@ -16,8 +16,6 @@
package org.bitcoinj.base.internal;
import com.google.common.io.BaseEncoding;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@ -41,13 +39,6 @@ public class ByteUtils {
/** Maximum unsigned value that can be expressed by 32 bits. */
public static final long MAX_UNSIGNED_INTEGER = Integer.toUnsignedLong(-1);
/**
* Hex encoding used throughout the framework. Use with ByteUtils.formatHex(byte[]) or ByteUtils.parseHex(CharSequence).
* @deprecated Use {@link ByteUtils#hexFormat} or {@link ByteUtils#parseHex(String)} or other available
* options.
*/
@Deprecated
public static final BaseEncoding HEX = BaseEncoding.base16().lowerCase();
// 00000001, 00000010, 00000100, 00001000, ...
private static final int[] bitMask = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};

6
core/src/main/java/org/bitcoinj/base/package-info.java
View File

@ -22,12 +22,6 @@
* <li>No API dependencies on external libraries other than the core JDK and {@code slf4j-api}</li>
* </ul>
* <p>
* <b>Temporary exception:</b> In the 0.17 release, we are allowing some dependencies on other packages, e.g. to
* {@code org.bitcoinj.core.NetworkParameters} or to Guava <i>provided</i> that those references are in <b>deprecated</b> methods.
* This smooths migration by allowing users to, for example, replace {@code import org.bitcoinj.core.Address} with
* {@code import org.bitcoinj.base.Address} as first step of conversion and then remove usages of the deprecated methods
* of {@code Address} in a second step.
* <p>
* The base package makes bitcoinj more modular as it breaks circular dependencies between existing packages and provides
* a "zero-dependency" foundation for the other packages. In a future release {@code base} will be
* split into a separate JAR/module (tentatively {@code bitcoinj-base}.)

13
core/src/main/java/org/bitcoinj/core/NetworkParameters.java
View File

@ -205,19 +205,6 @@ public abstract class NetworkParameters {
return PaymentProtocol.paramsFromPmtProtocolID(pmtProtocolId);
}
/**
* Get a NetworkParameters from an Address.
* Addresses should not be used for storing NetworkParameters. In the future Address will
* be an {@code interface} that only makes a {@link Network} available.
* @param address An address
* @return network parameters
* @deprecated You should be using {@link Address#network()} instead
*/
@Deprecated
public static NetworkParameters fromAddress(Address address) {
return address.getParameters();
}
public int getSpendableCoinbaseDepth() {
return spendableCoinbaseDepth;
}