From 2c8b94d469615f2465178b511ef714c1ada7e383 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Mon, 24 May 2021 19:38:01 +0100
Subject: [PATCH] Always use the org.qortal.utils.Base58 implementation

A couple of classes were using the bitcoinj alternative, which is twice as slow. This mostly affected the API on port 12392, as byte arrays were automatically encoded as base58 strings via the Base58TypeAdapter / JAXB package-info.
---
 src/main/java/org/qortal/api/Base58TypeAdapter.java          | 2 +-
 src/main/java/org/qortal/crosschain/BitcoinyHTLC.java        | 2 +-
 src/test/java/org/qortal/test/CryptoTests.java               | 2 +-
 src/test/java/org/qortal/test/apps/DecodeOnlineAccounts.java | 2 +-
 src/test/java/org/qortal/test/minting/RewardTests.java       | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/qortal/api/Base58TypeAdapter.java b/src/main/java/org/qortal/api/Base58TypeAdapter.java
index 4b292a2a..d7561031 100644
--- a/src/main/java/org/qortal/api/Base58TypeAdapter.java
+++ b/src/main/java/org/qortal/api/Base58TypeAdapter.java
@@ -2,7 +2,7 @@ package org.qortal.api;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.bitcoinj.core.Base58;
+import org.qortal.utils.Base58;
 
 public class Base58TypeAdapter extends XmlAdapter<String, byte[]> {
 
diff --git a/src/main/java/org/qortal/crosschain/BitcoinyHTLC.java b/src/main/java/org/qortal/crosschain/BitcoinyHTLC.java
index af93091f..8ebfffa2 100644
--- a/src/main/java/org/qortal/crosschain/BitcoinyHTLC.java
+++ b/src/main/java/org/qortal/crosschain/BitcoinyHTLC.java
@@ -10,7 +10,6 @@ import java.util.Map;
 import java.util.function.Function;
 
 import org.bitcoinj.core.Address;
-import org.bitcoinj.core.Base58;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.LegacyAddress;
@@ -25,6 +24,7 @@ import org.bitcoinj.script.ScriptBuilder;
 import org.bitcoinj.script.ScriptChunk;
 import org.bitcoinj.script.ScriptOpCodes;
 import org.qortal.crypto.Crypto;
+import org.qortal.utils.Base58;
 import org.qortal.utils.BitTwiddling;
 
 import com.google.common.hash.HashCode;
diff --git a/src/test/java/org/qortal/test/CryptoTests.java b/src/test/java/org/qortal/test/CryptoTests.java
index 0e294c63..46edc698 100644
--- a/src/test/java/org/qortal/test/CryptoTests.java
+++ b/src/test/java/org/qortal/test/CryptoTests.java
@@ -6,12 +6,12 @@ import org.qortal.block.BlockChain;
 import org.qortal.crypto.BouncyCastle25519;
 import org.qortal.crypto.Crypto;
 import org.qortal.test.common.Common;
+import org.qortal.utils.Base58;
 
 import static org.junit.Assert.*;
 
 import java.security.SecureRandom;
 
-import org.bitcoinj.core.Base58;
 import org.bouncycastle.crypto.agreement.X25519Agreement;
 import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
 import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
diff --git a/src/test/java/org/qortal/test/apps/DecodeOnlineAccounts.java b/src/test/java/org/qortal/test/apps/DecodeOnlineAccounts.java
index 1781f719..9242c422 100644
--- a/src/test/java/org/qortal/test/apps/DecodeOnlineAccounts.java
+++ b/src/test/java/org/qortal/test/apps/DecodeOnlineAccounts.java
@@ -3,7 +3,6 @@ package org.qortal.test.apps;
 import java.math.BigDecimal;
 import java.security.Security;
 
-import org.bitcoinj.core.Base58;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
 import org.qortal.block.BlockChain;
@@ -17,6 +16,7 @@ import org.qortal.repository.RepositoryManager;
 import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory;
 import org.qortal.settings.Settings;
 import org.qortal.transform.block.BlockTransformer;
+import org.qortal.utils.Base58;
 import org.roaringbitmap.IntIterator;
 
 import io.druid.extendedset.intset.ConciseSet;
diff --git a/src/test/java/org/qortal/test/minting/RewardTests.java b/src/test/java/org/qortal/test/minting/RewardTests.java
index 6c03662c..7161aa00 100644
--- a/src/test/java/org/qortal/test/minting/RewardTests.java
+++ b/src/test/java/org/qortal/test/minting/RewardTests.java
@@ -7,7 +7,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.bitcoinj.core.Base58;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -25,6 +24,7 @@ import org.qortal.test.common.BlockUtils;
 import org.qortal.test.common.Common;
 import org.qortal.test.common.TestAccount;
 import org.qortal.utils.Amounts;
+import org.qortal.utils.Base58;
 
 public class RewardTests extends Common {
 
@@ -789,4 +789,4 @@ public class RewardTests extends Common {
 		return repository.getAccountRepository().getAccount(testAccount.getAddress()).getFlags();
 	}
 
-}
\ No newline at end of file
+}