Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-07-30 19:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate use of BouncyCastle/SpongyCastle Hex encoder to Guava BaseEncoding.

Browse Source
This commit is contained in:
Andreas Schildbach
2018-10-23 16:04:40 +02:00
parent 98e17db898
commit 5c768c6ae5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/bitcoinj/script/ScriptPattern.java
View File

@@ -20,7 +20,8 @@ package org.bitcoinj.script;
import org.bitcoinj.core.LegacyAddress;
import org.bitcoinj.core.SegwitAddress;
import org.bitcoinj.core.Sha256Hash;
import org.spongycastle.util.encoders.Hex;
import com.google.common.io.BaseEncoding;
import java.math.BigInteger;
import java.util.Arrays;
@@ -278,7 +279,8 @@ public class ScriptPattern {
return chunks.size() > 0 && chunks.get(0).equalsOpCode(ScriptOpCodes.OP_RETURN);
}
private static final byte[] SEGWIT_COMMITMENT_HEADER = Hex.decode("aa21a9ed");
private static final BaseEncoding HEX = BaseEncoding.base16().lowerCase();
private static final byte[] SEGWIT_COMMITMENT_HEADER = HEX.decode("aa21a9ed");
/**
* Returns whether this script matches the pattern for a segwit commitment (in an output of the coinbase

5
tools/src/main/java/org/bitcoinj/tools/WalletTool.java
View File

@@ -36,6 +36,7 @@ import org.bitcoinj.wallet.DeterministicUpgradeRequiredException;
import org.bitcoinj.wallet.DeterministicUpgradeRequiresPassword;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.io.BaseEncoding;
import com.google.common.io.Resources;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -87,7 +88,6 @@ import org.bitcoinj.wallet.listeners.WalletReorganizeEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.crypto.params.KeyParameter;
import org.spongycastle.util.encoders.Hex;
import javax.annotation.Nullable;
import java.io.*;
@@ -115,6 +115,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/
public class WalletTool {
private static final Logger log = LoggerFactory.getLogger(WalletTool.class);
private static final BaseEncoding HEX = BaseEncoding.base16().lowerCase();
private static OptionSet options;
private static OptionSpec<Date> dateFlag;
@@ -1486,7 +1487,7 @@ public class WalletTool {
}
ECKey key = null;
if (pubkey != null) {
key = wallet.findKeyFromPubKey(Hex.decode(pubkey));
key = wallet.findKeyFromPubKey(HEX.decode(pubkey));
} else {
try {
Address address = LegacyAddress.fromBase58(wallet.getParams(), addr);