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

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

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