From 562ea4f56c0d4ecb4d8a48ea8523bf2f0087ec00 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Sun, 9 Aug 2015 15:19:31 +0100 Subject: [PATCH] Complete rename to libdohj --- pom.xml | 2 +- .../java/org/bitcoinj/core/AltcoinBlock.java | 6 ++--- src/main/java/org/bitcoinj/core/AuxPoW.java | 2 +- .../org/bitcoinj/core/ConvertAddress.java | 24 +++++++++++++++++++ .../org/bitcoinj/core/ConvertPrivateKey.java | 23 ++++++++++++++++++ .../core/AltcoinNetworkParameters.java | 2 +- .../core/AltcoinSerializer.java | 2 +- .../core/ScryptHash.java | 2 +- .../org/{altcoinj => libdohj}/core/Utils.java | 2 +- .../params/AbstractDogecoinParams.java | 6 ++--- .../params/DogecoinMainNetParams.java | 4 ++-- .../params/DogecoinTestNet3Params.java | 2 +- .../params/package-info.java | 2 +- .../java/org/bitcoinj/core/AuxPoWTest.java | 4 ++-- .../org/bitcoinj/core/DogecoinBlockTest.java | 4 ++-- .../params/AbstractDogecoinParamsTest.java | 4 +++- 16 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 src/main/java/org/bitcoinj/core/ConvertAddress.java create mode 100644 src/main/java/org/bitcoinj/core/ConvertPrivateKey.java rename src/main/java/org/{altcoinj => libdohj}/core/AltcoinNetworkParameters.java (97%) rename src/main/java/org/{altcoinj => libdohj}/core/AltcoinSerializer.java (97%) rename src/main/java/org/{altcoinj => libdohj}/core/ScryptHash.java (97%) rename src/main/java/org/{altcoinj => libdohj}/core/Utils.java (97%) rename src/main/java/org/{altcoinj => libdohj}/params/AbstractDogecoinParams.java (99%) rename src/main/java/org/{altcoinj => libdohj}/params/DogecoinMainNetParams.java (98%) rename src/main/java/org/{altcoinj => libdohj}/params/DogecoinTestNet3Params.java (99%) rename src/main/java/org/{altcoinj => libdohj}/params/package-info.java (86%) rename src/test/java/org/{altcoinj => libdohj}/params/AbstractDogecoinParamsTest.java (95%) diff --git a/pom.xml b/pom.xml index 5bd83508..a752c07d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.altcoinj + org.libdohj libdohj 0.14-SNAPSHOT jar diff --git a/src/main/java/org/bitcoinj/core/AltcoinBlock.java b/src/main/java/org/bitcoinj/core/AltcoinBlock.java index 49389ebc..a77413cd 100644 --- a/src/main/java/org/bitcoinj/core/AltcoinBlock.java +++ b/src/main/java/org/bitcoinj/core/AltcoinBlock.java @@ -17,7 +17,7 @@ package org.bitcoinj.core; -import org.altcoinj.core.AltcoinNetworkParameters; +import org.libdohj.core.AltcoinNetworkParameters; import com.google.common.base.Preconditions; import javax.annotation.Nullable; @@ -28,8 +28,8 @@ import java.math.BigInteger; import java.security.GeneralSecurityException; import java.util.List; -import org.altcoinj.core.ScryptHash; -import static org.altcoinj.core.Utils.scryptDigest; +import org.libdohj.core.ScryptHash; +import static org.libdohj.core.Utils.scryptDigest; import static org.bitcoinj.core.Utils.reverseBytes; diff --git a/src/main/java/org/bitcoinj/core/AuxPoW.java b/src/main/java/org/bitcoinj/core/AuxPoW.java index 581c7156..dde0f6f6 100644 --- a/src/main/java/org/bitcoinj/core/AuxPoW.java +++ b/src/main/java/org/bitcoinj/core/AuxPoW.java @@ -18,7 +18,7 @@ package org.bitcoinj.core; -import org.altcoinj.core.AltcoinNetworkParameters; +import org.libdohj.core.AltcoinNetworkParameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/bitcoinj/core/ConvertAddress.java b/src/main/java/org/bitcoinj/core/ConvertAddress.java new file mode 100644 index 00000000..afa2a956 --- /dev/null +++ b/src/main/java/org/bitcoinj/core/ConvertAddress.java @@ -0,0 +1,24 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.bitcoinj.core; + +import org.libdohj.params.DogecoinMainNetParams; +import org.bitcoinj.params.MainNetParams; + +/** + * + * @author jrn + */ +public class ConvertAddress { + public static void main(final String[] argv) throws AddressFormatException { + final NetworkParameters mainParams = MainNetParams.get(); + final NetworkParameters dogeParams = DogecoinMainNetParams.get(); + final Address address = Address.fromBase58(mainParams, "1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L"); + final Address newAddress = new Address(dogeParams, 30, address.getHash160()); + + System.out.println(newAddress.toBase58()); + } +} diff --git a/src/main/java/org/bitcoinj/core/ConvertPrivateKey.java b/src/main/java/org/bitcoinj/core/ConvertPrivateKey.java new file mode 100644 index 00000000..2cfa6f9b --- /dev/null +++ b/src/main/java/org/bitcoinj/core/ConvertPrivateKey.java @@ -0,0 +1,23 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.bitcoinj.core; + +import org.libdohj.params.DogecoinMainNetParams; +import org.bitcoinj.params.MainNetParams; + +/** + * + * @author jrn + */ +public class ConvertPrivateKey { + public static void main(final String[] argv) throws AddressFormatException { + final NetworkParameters mainParams = MainNetParams.get(); + final NetworkParameters dogeParams = DogecoinMainNetParams.get(); + final DumpedPrivateKey key = new DumpedPrivateKey(mainParams, "5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf"); + final DumpedPrivateKey newKey = new DumpedPrivateKey(dogeParams, key.getKey().getPrivKeyBytes(), false); + System.out.println(newKey.toString()); + } +} diff --git a/src/main/java/org/altcoinj/core/AltcoinNetworkParameters.java b/src/main/java/org/libdohj/core/AltcoinNetworkParameters.java similarity index 97% rename from src/main/java/org/altcoinj/core/AltcoinNetworkParameters.java rename to src/main/java/org/libdohj/core/AltcoinNetworkParameters.java index 3bb36fab..1539d479 100644 --- a/src/main/java/org/altcoinj/core/AltcoinNetworkParameters.java +++ b/src/main/java/org/libdohj/core/AltcoinNetworkParameters.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.altcoinj.core; +package org.libdohj.core; import org.bitcoinj.core.Block; import org.bitcoinj.core.Sha256Hash; diff --git a/src/main/java/org/altcoinj/core/AltcoinSerializer.java b/src/main/java/org/libdohj/core/AltcoinSerializer.java similarity index 97% rename from src/main/java/org/altcoinj/core/AltcoinSerializer.java rename to src/main/java/org/libdohj/core/AltcoinSerializer.java index 8d9da792..42e4a905 100644 --- a/src/main/java/org/altcoinj/core/AltcoinSerializer.java +++ b/src/main/java/org/libdohj/core/AltcoinSerializer.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.altcoinj.core; +package org.libdohj.core; import org.bitcoinj.core.AltcoinBlock; import org.bitcoinj.core.BitcoinSerializer; diff --git a/src/main/java/org/altcoinj/core/ScryptHash.java b/src/main/java/org/libdohj/core/ScryptHash.java similarity index 97% rename from src/main/java/org/altcoinj/core/ScryptHash.java rename to src/main/java/org/libdohj/core/ScryptHash.java index 0ef232c3..a2af7f4e 100644 --- a/src/main/java/org/altcoinj/core/ScryptHash.java +++ b/src/main/java/org/libdohj/core/ScryptHash.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.altcoinj.core; +package org.libdohj.core; import org.bitcoinj.core.Sha256Hash; import org.bitcoinj.core.Sha256Hash; diff --git a/src/main/java/org/altcoinj/core/Utils.java b/src/main/java/org/libdohj/core/Utils.java similarity index 97% rename from src/main/java/org/altcoinj/core/Utils.java rename to src/main/java/org/libdohj/core/Utils.java index f0fc8226..6fc78b87 100644 --- a/src/main/java/org/altcoinj/core/Utils.java +++ b/src/main/java/org/libdohj/core/Utils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.altcoinj.core; +package org.libdohj.core; import com.lambdaworks.crypto.SCrypt; import java.security.GeneralSecurityException; diff --git a/src/main/java/org/altcoinj/params/AbstractDogecoinParams.java b/src/main/java/org/libdohj/params/AbstractDogecoinParams.java similarity index 99% rename from src/main/java/org/altcoinj/params/AbstractDogecoinParams.java rename to src/main/java/org/libdohj/params/AbstractDogecoinParams.java index 6ece9da6..15b5440e 100644 --- a/src/main/java/org/altcoinj/params/AbstractDogecoinParams.java +++ b/src/main/java/org/libdohj/params/AbstractDogecoinParams.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.altcoinj.params; +package org.libdohj.params; import java.io.ByteArrayOutputStream; import java.math.BigInteger; import org.bitcoinj.core.AltcoinBlock; -import org.altcoinj.core.AltcoinNetworkParameters; +import org.libdohj.core.AltcoinNetworkParameters; import org.bitcoinj.core.Block; import org.bitcoinj.core.Coin; import static org.bitcoinj.core.Coin.COIN; @@ -35,7 +35,7 @@ import org.bitcoinj.utils.MonetaryFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.altcoinj.core.AltcoinSerializer; +import org.libdohj.core.AltcoinSerializer; import org.bitcoinj.core.Sha256Hash; import org.bitcoinj.core.StoredBlock; import org.bitcoinj.core.Transaction; diff --git a/src/main/java/org/altcoinj/params/DogecoinMainNetParams.java b/src/main/java/org/libdohj/params/DogecoinMainNetParams.java similarity index 98% rename from src/main/java/org/altcoinj/params/DogecoinMainNetParams.java rename to src/main/java/org/libdohj/params/DogecoinMainNetParams.java index 7147ac37..e9cb6e53 100644 --- a/src/main/java/org/altcoinj/params/DogecoinMainNetParams.java +++ b/src/main/java/org/libdohj/params/DogecoinMainNetParams.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.altcoinj.params; +package org.libdohj.params; -import org.altcoinj.core.ScryptHash; +import org.libdohj.core.ScryptHash; import static com.google.common.base.Preconditions.checkState; diff --git a/src/main/java/org/altcoinj/params/DogecoinTestNet3Params.java b/src/main/java/org/libdohj/params/DogecoinTestNet3Params.java similarity index 99% rename from src/main/java/org/altcoinj/params/DogecoinTestNet3Params.java rename to src/main/java/org/libdohj/params/DogecoinTestNet3Params.java index 7519d282..1593590a 100644 --- a/src/main/java/org/altcoinj/params/DogecoinTestNet3Params.java +++ b/src/main/java/org/libdohj/params/DogecoinTestNet3Params.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.altcoinj.params; +package org.libdohj.params; import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.core.Utils; diff --git a/src/main/java/org/altcoinj/params/package-info.java b/src/main/java/org/libdohj/params/package-info.java similarity index 86% rename from src/main/java/org/altcoinj/params/package-info.java rename to src/main/java/org/libdohj/params/package-info.java index 8c4126fb..7f81d071 100644 --- a/src/main/java/org/altcoinj/params/package-info.java +++ b/src/main/java/org/libdohj/params/package-info.java @@ -2,4 +2,4 @@ * Network parameters encapsulate some of the differences between different altcoin networks such as the main * network, the testnet, regtest mode, unit testing params and so on. */ -package org.altcoinj.params; +package org.libdohj.params; diff --git a/src/test/java/org/bitcoinj/core/AuxPoWTest.java b/src/test/java/org/bitcoinj/core/AuxPoWTest.java index 55936276..28366651 100644 --- a/src/test/java/org/bitcoinj/core/AuxPoWTest.java +++ b/src/test/java/org/bitcoinj/core/AuxPoWTest.java @@ -2,8 +2,8 @@ package org.bitcoinj.core; import java.util.Arrays; import java.util.Collections; -import org.altcoinj.core.AltcoinSerializer; -import org.altcoinj.params.DogecoinMainNetParams; +import org.libdohj.core.AltcoinSerializer; +import org.libdohj.params.DogecoinMainNetParams; import org.junit.Test; import static org.bitcoinj.core.Util.getBytes; diff --git a/src/test/java/org/bitcoinj/core/DogecoinBlockTest.java b/src/test/java/org/bitcoinj/core/DogecoinBlockTest.java index 6c65e353..1b155bbd 100644 --- a/src/test/java/org/bitcoinj/core/DogecoinBlockTest.java +++ b/src/test/java/org/bitcoinj/core/DogecoinBlockTest.java @@ -5,9 +5,9 @@ */ package org.bitcoinj.core; -import org.altcoinj.core.AltcoinSerializer; +import org.libdohj.core.AltcoinSerializer; import java.io.IOException; -import org.altcoinj.params.DogecoinMainNetParams; +import org.libdohj.params.DogecoinMainNetParams; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/org/altcoinj/params/AbstractDogecoinParamsTest.java b/src/test/java/org/libdohj/params/AbstractDogecoinParamsTest.java similarity index 95% rename from src/test/java/org/altcoinj/params/AbstractDogecoinParamsTest.java rename to src/test/java/org/libdohj/params/AbstractDogecoinParamsTest.java index dc030fc2..1f6510b4 100644 --- a/src/test/java/org/altcoinj/params/AbstractDogecoinParamsTest.java +++ b/src/test/java/org/libdohj/params/AbstractDogecoinParamsTest.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.altcoinj.params; +package org.libdohj.params; +import org.libdohj.params.AbstractDogecoinParams; +import org.libdohj.params.DogecoinMainNetParams; import static org.junit.Assert.assertEquals; import org.junit.Test;