diff --git a/settings.gradle b/settings.gradle index 0c35b70..b36009e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ -rootProject.name = 'fullerene' +rootProject.name = 'graphenej' include 'application' diff --git a/src/main/java/com/luminiasoft/bitshares/AccountOptions.java b/src/main/java/de/bitsharesmunich/graphenej/AccountOptions.java similarity index 97% rename from src/main/java/com/luminiasoft/bitshares/AccountOptions.java rename to src/main/java/de/bitsharesmunich/graphenej/AccountOptions.java index 972a133..9311c30 100644 --- a/src/main/java/com/luminiasoft/bitshares/AccountOptions.java +++ b/src/main/java/de/bitsharesmunich/graphenej/AccountOptions.java @@ -1,10 +1,10 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.common.primitives.Bytes; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.luminiasoft.bitshares.interfaces.GrapheneSerializable; +import de.bitsharesmunich.graphenej.interfaces.GrapheneSerializable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/luminiasoft/bitshares/AccountUpdateOperation.java b/src/main/java/de/bitsharesmunich/graphenej/AccountUpdateOperation.java similarity index 98% rename from src/main/java/com/luminiasoft/bitshares/AccountUpdateOperation.java rename to src/main/java/de/bitsharesmunich/graphenej/AccountUpdateOperation.java index 447b3d0..5416f87 100644 --- a/src/main/java/com/luminiasoft/bitshares/AccountUpdateOperation.java +++ b/src/main/java/de/bitsharesmunich/graphenej/AccountUpdateOperation.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.common.primitives.Bytes; import com.google.common.primitives.UnsignedLong; diff --git a/src/main/java/com/luminiasoft/bitshares/AccountUpdateTransactionBuilder.java b/src/main/java/de/bitsharesmunich/graphenej/AccountUpdateTransactionBuilder.java similarity index 94% rename from src/main/java/com/luminiasoft/bitshares/AccountUpdateTransactionBuilder.java rename to src/main/java/de/bitsharesmunich/graphenej/AccountUpdateTransactionBuilder.java index 435f8a3..2fb6d56 100644 --- a/src/main/java/com/luminiasoft/bitshares/AccountUpdateTransactionBuilder.java +++ b/src/main/java/de/bitsharesmunich/graphenej/AccountUpdateTransactionBuilder.java @@ -1,6 +1,6 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.errors.MalformedTransactionException; +import de.bitsharesmunich.graphenej.errors.MalformedTransactionException; import org.bitcoinj.core.ECKey; import java.util.ArrayList; diff --git a/src/main/java/com/luminiasoft/bitshares/Address.java b/src/main/java/de/bitsharesmunich/graphenej/Address.java similarity index 91% rename from src/main/java/com/luminiasoft/bitshares/Address.java rename to src/main/java/de/bitsharesmunich/graphenej/Address.java index d363500..b2c9ed0 100644 --- a/src/main/java/com/luminiasoft/bitshares/Address.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Address.java @@ -1,14 +1,12 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.common.primitives.Bytes; -import com.luminiasoft.bitshares.errors.MalformedAddressException; +import de.bitsharesmunich.graphenej.errors.MalformedAddressException; import org.bitcoinj.core.Base58; import org.bitcoinj.core.ECKey; import org.spongycastle.crypto.digests.RIPEMD160Digest; -import org.spongycastle.math.ec.ECPoint; import java.util.Arrays; -import java.util.IllegalFormatException; /** * Class used to encapsulate address-related operations. diff --git a/src/main/java/com/luminiasoft/bitshares/Asset.java b/src/main/java/de/bitsharesmunich/graphenej/Asset.java similarity index 79% rename from src/main/java/com/luminiasoft/bitshares/Asset.java rename to src/main/java/de/bitsharesmunich/graphenej/Asset.java index e6a1103..27faf17 100644 --- a/src/main/java/com/luminiasoft/bitshares/Asset.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Asset.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; /** * Created by nelson on 11/9/16. diff --git a/src/main/java/com/luminiasoft/bitshares/AssetAmount.java b/src/main/java/de/bitsharesmunich/graphenej/AssetAmount.java similarity index 94% rename from src/main/java/com/luminiasoft/bitshares/AssetAmount.java rename to src/main/java/de/bitsharesmunich/graphenej/AssetAmount.java index 344c957..c4b49e4 100644 --- a/src/main/java/com/luminiasoft/bitshares/AssetAmount.java +++ b/src/main/java/de/bitsharesmunich/graphenej/AssetAmount.java @@ -1,16 +1,16 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.common.primitives.UnsignedLong; import com.google.gson.*; -import com.luminiasoft.bitshares.interfaces.ByteSerializable; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.interfaces.ByteSerializable; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; import java.lang.reflect.Type; /** * Created by nelson on 11/7/16. */ -public class AssetAmount implements ByteSerializable, JsonSerializable{ +public class AssetAmount implements ByteSerializable, JsonSerializable { /** * Constants used in the JSON serialization procedure. */ diff --git a/src/main/java/com/luminiasoft/bitshares/Authority.java b/src/main/java/de/bitsharesmunich/graphenej/Authority.java similarity index 96% rename from src/main/java/com/luminiasoft/bitshares/Authority.java rename to src/main/java/de/bitsharesmunich/graphenej/Authority.java index a3637af..8c70e7b 100644 --- a/src/main/java/com/luminiasoft/bitshares/Authority.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Authority.java @@ -1,11 +1,11 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.common.primitives.Bytes; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.luminiasoft.bitshares.errors.MalformedAddressException; -import com.luminiasoft.bitshares.interfaces.GrapheneSerializable; +import de.bitsharesmunich.graphenej.errors.MalformedAddressException; +import de.bitsharesmunich.graphenej.interfaces.GrapheneSerializable; import java.util.*; diff --git a/src/main/java/com/luminiasoft/bitshares/BIP39.java b/src/main/java/de/bitsharesmunich/graphenej/BIP39.java similarity index 98% rename from src/main/java/com/luminiasoft/bitshares/BIP39.java rename to src/main/java/de/bitsharesmunich/graphenej/BIP39.java index 2b10c83..ecb532d 100644 --- a/src/main/java/com/luminiasoft/bitshares/BIP39.java +++ b/src/main/java/de/bitsharesmunich/graphenej/BIP39.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import java.util.Arrays; import org.bitcoinj.core.Base58; diff --git a/src/main/java/com/luminiasoft/bitshares/BaseOperation.java b/src/main/java/de/bitsharesmunich/graphenej/BaseOperation.java similarity index 67% rename from src/main/java/com/luminiasoft/bitshares/BaseOperation.java rename to src/main/java/de/bitsharesmunich/graphenej/BaseOperation.java index 89616f2..fdbe9c7 100644 --- a/src/main/java/com/luminiasoft/bitshares/BaseOperation.java +++ b/src/main/java/de/bitsharesmunich/graphenej/BaseOperation.java @@ -1,12 +1,12 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.interfaces.ByteSerializable; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.interfaces.ByteSerializable; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; /** * Created by nelson on 11/5/16. */ -public abstract class BaseOperation implements ByteSerializable, JsonSerializable{ +public abstract class BaseOperation implements ByteSerializable, JsonSerializable { protected OperationType type; diff --git a/src/main/java/com/luminiasoft/bitshares/BlockData.java b/src/main/java/de/bitsharesmunich/graphenej/BlockData.java similarity index 95% rename from src/main/java/com/luminiasoft/bitshares/BlockData.java rename to src/main/java/de/bitsharesmunich/graphenej/BlockData.java index 6a2a340..5ef1b08 100644 --- a/src/main/java/com/luminiasoft/bitshares/BlockData.java +++ b/src/main/java/de/bitsharesmunich/graphenej/BlockData.java @@ -1,10 +1,6 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.interfaces.ByteSerializable; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.TimeZone; +import de.bitsharesmunich.graphenej.interfaces.ByteSerializable; /** * This class encapsulates all block-related information needed in order to build a valid transaction. diff --git a/src/main/java/com/luminiasoft/bitshares/BrainKey.java b/src/main/java/de/bitsharesmunich/graphenej/BrainKey.java similarity index 94% rename from src/main/java/com/luminiasoft/bitshares/BrainKey.java rename to src/main/java/de/bitsharesmunich/graphenej/BrainKey.java index 79a359e..c8f966a 100644 --- a/src/main/java/com/luminiasoft/bitshares/BrainKey.java +++ b/src/main/java/de/bitsharesmunich/graphenej/BrainKey.java @@ -1,8 +1,7 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.crypto.AndroidRandomSource; -import com.luminiasoft.bitshares.crypto.SecureRandomStrengthener; -import org.bitcoinj.core.Base58; +import de.bitsharesmunich.graphenej.crypto.AndroidRandomSource; +import de.bitsharesmunich.graphenej.crypto.SecureRandomStrengthener; import org.bitcoinj.core.DumpedPrivateKey; import org.bitcoinj.core.ECKey; import org.bitcoinj.core.NetworkParameters; @@ -11,7 +10,6 @@ import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import java.security.spec.ECPoint; import java.util.ArrayList; /** diff --git a/src/main/java/com/luminiasoft/bitshares/Chains.java b/src/main/java/de/bitsharesmunich/graphenej/Chains.java similarity index 93% rename from src/main/java/com/luminiasoft/bitshares/Chains.java rename to src/main/java/de/bitsharesmunich/graphenej/Chains.java index 31cc615..775bbf2 100644 --- a/src/main/java/com/luminiasoft/bitshares/Chains.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Chains.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; /** * Created by nelson on 11/8/16. diff --git a/src/main/java/com/luminiasoft/bitshares/Extensions.java b/src/main/java/de/bitsharesmunich/graphenej/Extensions.java similarity index 83% rename from src/main/java/com/luminiasoft/bitshares/Extensions.java rename to src/main/java/de/bitsharesmunich/graphenej/Extensions.java index 18c9a6d..1848855 100644 --- a/src/main/java/com/luminiasoft/bitshares/Extensions.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Extensions.java @@ -1,9 +1,9 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.gson.JsonArray; import com.google.gson.JsonElement; -import com.luminiasoft.bitshares.interfaces.ByteSerializable; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.interfaces.ByteSerializable; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; import java.util.ArrayList; diff --git a/src/main/java/com/luminiasoft/bitshares/FileBin.java b/src/main/java/de/bitsharesmunich/graphenej/FileBin.java similarity index 91% rename from src/main/java/com/luminiasoft/bitshares/FileBin.java rename to src/main/java/de/bitsharesmunich/graphenej/FileBin.java index 85310f9..281a574 100644 --- a/src/main/java/com/luminiasoft/bitshares/FileBin.java +++ b/src/main/java/de/bitsharesmunich/graphenej/FileBin.java @@ -1,24 +1,16 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.luminiasoft.bitshares.crypto.AndroidRandomSource; -import com.luminiasoft.bitshares.crypto.SecureRandomStrengthener; +import de.bitsharesmunich.graphenej.crypto.SecureRandomStrengthener; import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import java.util.Arrays; + import org.bitcoinj.core.ECKey; -import org.spongycastle.crypto.DataLengthException; -import org.spongycastle.crypto.InvalidCipherTextException; -import org.spongycastle.crypto.engines.AESFastEngine; -import org.spongycastle.crypto.modes.CBCBlockCipher; -import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher; -import org.spongycastle.crypto.params.KeyParameter; -import org.spongycastle.crypto.params.ParametersWithIV; /** * Class to manage the Bin Files diff --git a/src/main/java/com/luminiasoft/bitshares/GrapheneObject.java b/src/main/java/de/bitsharesmunich/graphenej/GrapheneObject.java similarity index 95% rename from src/main/java/com/luminiasoft/bitshares/GrapheneObject.java rename to src/main/java/de/bitsharesmunich/graphenej/GrapheneObject.java index ede0e47..a30355b 100644 --- a/src/main/java/com/luminiasoft/bitshares/GrapheneObject.java +++ b/src/main/java/de/bitsharesmunich/graphenej/GrapheneObject.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; diff --git a/src/main/java/com/luminiasoft/bitshares/Invoice.java b/src/main/java/de/bitsharesmunich/graphenej/Invoice.java similarity index 94% rename from src/main/java/com/luminiasoft/bitshares/Invoice.java rename to src/main/java/de/bitsharesmunich/graphenej/Invoice.java index 5f513d4..7109fa3 100644 --- a/src/main/java/com/luminiasoft/bitshares/Invoice.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Invoice.java @@ -1,8 +1,8 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; import org.bitcoinj.core.Base58; /** diff --git a/src/main/java/com/luminiasoft/bitshares/Main.java b/src/main/java/de/bitsharesmunich/graphenej/Main.java similarity index 55% rename from src/main/java/com/luminiasoft/bitshares/Main.java rename to src/main/java/de/bitsharesmunich/graphenej/Main.java index 40c8ddc..46b176c 100644 --- a/src/main/java/com/luminiasoft/bitshares/Main.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Main.java @@ -1,31 +1,18 @@ -package com.luminiasoft.bitshares; - -import org.bitcoinj.core.ECKey; - -import java.io.IOException; +package de.bitsharesmunich.graphenej; public class Main { // Brain key from Nelson's app referencing the bilthon-83 account - public static final String BILTHON_83_BRAIN_KEY = "PUMPER ISOTOME SERE STAINER CLINGER MOONLIT CHAETA UPBRIM AEDILIC BERTHER NIT SHAP SAID SHADING JUNCOUS CHOUGH"; + public static final String BILTHON_83_BRAIN_KEY = System.getenv("BILTHON_83_BRAIN_KEY"); - public static final String BILTHON_5_BRAIN_KEY = "UNMATE AURIGAL NAVET WAVICLE REWOVE ABBOTCY COWHERB OUTKICK STOPPER JUSSORY BEAMLET WIRY"; + public static final String BILTHON_5_BRAIN_KEY = System.getenv("BILTHON_5_BRAIN_KEY"); - public static final String BILTHON_7_BRAIN_KEY = "VENIN QUOTHA OBESELY TORIC OSMATIC SPOKEN DIACOPE CUBICA TABULA REDDING APONIA TARTAR"; + public static final String BILTHON_7_BRAIN_KEY = System.getenv("BILTHON_7_BRAIN_KEY"); - //public static final String BILTHON_83_BRAIN_KEY = "TWIXT SERMO TRILLI AUDIO PARDED PLUMET BIWA REHUNG MAUDLE VALVULA OUTBURN FEWNESS ALIENER UNTRACE PRICH TROKER"; - //public static final String BILTHON_83_BRAIN_KEY = "SIVER TIKKER FOGO HOMINAL PRAYER LUTEIN SMALLY ACARID MEROPIA TRANCE BOGONG IDDAT HICKORY SOUTANE MOOD DOWSER"; public static final String BIP39_KEY = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"; - // WIF from Nelson's app referencing the bilthon-83 account -// public static final String WIF = "5J96pne45qWM1WpektoeazN6k9Mt93jQ7LyueRxFfEMTiy6yxjM"; - // Brain key from an empty account created by the cli_wallet -// public static final String BILTHON_83_BRAIN_KEY = "TWIXT SERMO TRILLI AUDIO PARDED PLUMET BIWA REHUNG MAUDLE VALVULA OUTBURN FEWNESS ALIENER UNTRACE PRICH TROKER"; - // WIF from an empty account created by the cli_wallet public static final String WIF = "5KMzB2GqGhnh7ufhgddmz1eKPHS72uTLeL9hHjSvPb1UywWknF5"; - public static final String EXTERNAL_SIGNATURE = "1f36c41acb774fcbc9c231b5895ec9701d6872729098d8ea56d78dda72a6b54252694db85d7591de5751b7aea06871da15d63a1028758421607ffc143e53ef3306"; - // Static block information used for transaction serialization tests public static int REF_BLOCK_NUM = 56204; public static int REF_BLOCK_PREFIX = 1614747814; @@ -33,6 +20,7 @@ public class Main { public static void main(String[] args) { Test test = new Test(); + // test.testTransactionSerialization(); // ECKey.ECDSASignature signature = test.testSigning(); @@ -57,7 +45,7 @@ public class Main { // test.testGetAccountByName(); // test.testGetRequiredFees(); // test.testRandomNumberGeneration(); - //test.testBrainKeyOperations(false); +// test.testBrainKeyOperations(false); // test.testBip39Opertion(); // test.testAccountNamebyAddress(); // test.testAccountNameById(); @@ -68,7 +56,7 @@ public class Main { // test.testAccountUpdateOperationBroadcast(); // test.testCreateBinFile(); // test.testImportBinFile(); - //test.testLookupAccounts(); - test.testDecodeMemo(); +// test.testLookupAccounts(); +// test.testDecodeMemo(); } } diff --git a/src/main/java/com/luminiasoft/bitshares/OperationType.java b/src/main/java/de/bitsharesmunich/graphenej/OperationType.java similarity index 97% rename from src/main/java/com/luminiasoft/bitshares/OperationType.java rename to src/main/java/de/bitsharesmunich/graphenej/OperationType.java index ae26a48..2f54488 100644 --- a/src/main/java/com/luminiasoft/bitshares/OperationType.java +++ b/src/main/java/de/bitsharesmunich/graphenej/OperationType.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; /** * Created by nelson on 11/6/16. diff --git a/src/main/java/com/luminiasoft/bitshares/Optional.java b/src/main/java/de/bitsharesmunich/graphenej/Optional.java similarity index 86% rename from src/main/java/com/luminiasoft/bitshares/Optional.java rename to src/main/java/de/bitsharesmunich/graphenej/Optional.java index f7cc88f..889b418 100644 --- a/src/main/java/com/luminiasoft/bitshares/Optional.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Optional.java @@ -1,7 +1,7 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.gson.JsonElement; -import com.luminiasoft.bitshares.interfaces.GrapheneSerializable; +import de.bitsharesmunich.graphenej.interfaces.GrapheneSerializable; /** * Used whenever we have an optional field. diff --git a/src/main/java/com/luminiasoft/bitshares/PublicKey.java b/src/main/java/de/bitsharesmunich/graphenej/PublicKey.java similarity index 82% rename from src/main/java/com/luminiasoft/bitshares/PublicKey.java rename to src/main/java/de/bitsharesmunich/graphenej/PublicKey.java index de71c16..163ec3b 100644 --- a/src/main/java/com/luminiasoft/bitshares/PublicKey.java +++ b/src/main/java/de/bitsharesmunich/graphenej/PublicKey.java @@ -1,6 +1,6 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.interfaces.ByteSerializable; +import de.bitsharesmunich.graphenej.interfaces.ByteSerializable; import org.bitcoinj.core.ECKey; /** diff --git a/src/main/java/com/luminiasoft/bitshares/RPC.java b/src/main/java/de/bitsharesmunich/graphenej/RPC.java similarity index 96% rename from src/main/java/com/luminiasoft/bitshares/RPC.java rename to src/main/java/de/bitsharesmunich/graphenej/RPC.java index f7db64b..2d10295 100644 --- a/src/main/java/com/luminiasoft/bitshares/RPC.java +++ b/src/main/java/de/bitsharesmunich/graphenej/RPC.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; /** * Created by nelson on 11/16/16. diff --git a/src/main/java/com/luminiasoft/bitshares/Test.java b/src/main/java/de/bitsharesmunich/graphenej/Test.java similarity index 97% rename from src/main/java/com/luminiasoft/bitshares/Test.java rename to src/main/java/de/bitsharesmunich/graphenej/Test.java index 86a5d20..5dc51ba 100644 --- a/src/main/java/com/luminiasoft/bitshares/Test.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Test.java @@ -1,20 +1,23 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.objects.Memo; +import de.bitsharesmunich.graphenej.models.ApiCall; +import de.bitsharesmunich.graphenej.models.BaseResponse; +import de.bitsharesmunich.graphenej.objects.Memo; import com.google.common.primitives.UnsignedLong; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.reflect.TypeToken; -import com.luminiasoft.bitshares.errors.MalformedAddressException; -import com.luminiasoft.bitshares.errors.MalformedTransactionException; -import com.luminiasoft.bitshares.interfaces.WitnessResponseListener; -import com.luminiasoft.bitshares.models.*; -import com.luminiasoft.bitshares.objects.MemoBuilder; -import com.luminiasoft.bitshares.test.NaiveSSLContext; -import com.luminiasoft.bitshares.ws.*; +import de.bitsharesmunich.graphenej.errors.MalformedAddressException; +import de.bitsharesmunich.graphenej.errors.MalformedTransactionException; +import de.bitsharesmunich.graphenej.interfaces.WitnessResponseListener; +import de.bitsharesmunich.graphenej.objects.MemoBuilder; +import de.bitsharesmunich.graphenej.test.NaiveSSLContext; import com.neovisionaries.ws.client.*; +import de.bitsharesmunich.graphenej.models.AccountProperties; +import de.bitsharesmunich.graphenej.models.WitnessResponse; +import de.bitsharesmunich.graphenej.api.*; import org.bitcoinj.core.*; import org.spongycastle.crypto.digests.RIPEMD160Digest; @@ -31,10 +34,10 @@ import java.util.logging.Logger; */ public class Test { - public static final String WITNESS_URL = "ws://api.devling.xyz:8088"; - public static final String OPENLEDGER_WITNESS_URL = "wss://bitshares.openledger.info/ws"; + public static final String WITNESS_URL = "api://api.devling.xyz:8088"; + public static final String OPENLEDGER_WITNESS_URL = "wss://bitshares.openledger.info/api"; public static final String BLOCK_PAY_DE = "wss://de.blockpay.ch:8089"; -// public static final String WITNESS_URL = "wss://fr.blockpay.ch:8089"; + public static final String BLOCK_PAY_FR = "wss://fr.blockpay.ch:8089"; private Transaction transaction; diff --git a/src/main/java/com/luminiasoft/bitshares/Transaction.java b/src/main/java/de/bitsharesmunich/graphenej/Transaction.java similarity index 97% rename from src/main/java/com/luminiasoft/bitshares/Transaction.java rename to src/main/java/de/bitsharesmunich/graphenej/Transaction.java index 29a4620..244247c 100644 --- a/src/main/java/com/luminiasoft/bitshares/Transaction.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Transaction.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.common.primitives.Bytes; import com.google.gson.GsonBuilder; @@ -7,9 +7,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.luminiasoft.bitshares.errors.MalformedTransactionException; -import com.luminiasoft.bitshares.interfaces.ByteSerializable; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.interfaces.ByteSerializable; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; import org.bitcoinj.core.DumpedPrivateKey; import org.bitcoinj.core.ECKey; diff --git a/src/main/java/com/luminiasoft/bitshares/TransactionBuilder.java b/src/main/java/de/bitsharesmunich/graphenej/TransactionBuilder.java similarity index 82% rename from src/main/java/com/luminiasoft/bitshares/TransactionBuilder.java rename to src/main/java/de/bitsharesmunich/graphenej/TransactionBuilder.java index 068a23c..fecf99e 100644 --- a/src/main/java/com/luminiasoft/bitshares/TransactionBuilder.java +++ b/src/main/java/de/bitsharesmunich/graphenej/TransactionBuilder.java @@ -1,6 +1,6 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.errors.MalformedTransactionException; +import de.bitsharesmunich.graphenej.errors.MalformedTransactionException; import org.bitcoinj.core.ECKey; diff --git a/src/main/java/com/luminiasoft/bitshares/TransferOperation.java b/src/main/java/de/bitsharesmunich/graphenej/TransferOperation.java similarity index 98% rename from src/main/java/com/luminiasoft/bitshares/TransferOperation.java rename to src/main/java/de/bitsharesmunich/graphenej/TransferOperation.java index daf9ce7..f0d8d5b 100644 --- a/src/main/java/com/luminiasoft/bitshares/TransferOperation.java +++ b/src/main/java/de/bitsharesmunich/graphenej/TransferOperation.java @@ -1,11 +1,10 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.objects.Memo; +import de.bitsharesmunich.graphenej.objects.Memo; import com.google.common.primitives.Bytes; import com.google.gson.*; import java.lang.reflect.Type; -import org.bitcoinj.core.ECKey; /** * Class used to encapsulate the TransferOperation operation related functionalities. diff --git a/src/main/java/com/luminiasoft/bitshares/TransferTransactionBuilder.java b/src/main/java/de/bitsharesmunich/graphenej/TransferTransactionBuilder.java similarity index 95% rename from src/main/java/com/luminiasoft/bitshares/TransferTransactionBuilder.java rename to src/main/java/de/bitsharesmunich/graphenej/TransferTransactionBuilder.java index ca6e5eb..88ba4c4 100644 --- a/src/main/java/com/luminiasoft/bitshares/TransferTransactionBuilder.java +++ b/src/main/java/de/bitsharesmunich/graphenej/TransferTransactionBuilder.java @@ -1,7 +1,7 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.objects.Memo; -import com.luminiasoft.bitshares.errors.MalformedTransactionException; +import de.bitsharesmunich.graphenej.objects.Memo; +import de.bitsharesmunich.graphenej.errors.MalformedTransactionException; import org.bitcoinj.core.ECKey; import java.util.ArrayList; diff --git a/src/main/java/com/luminiasoft/bitshares/UserAccount.java b/src/main/java/de/bitsharesmunich/graphenej/UserAccount.java similarity index 94% rename from src/main/java/com/luminiasoft/bitshares/UserAccount.java rename to src/main/java/de/bitsharesmunich/graphenej/UserAccount.java index 8ed3743..3689de4 100644 --- a/src/main/java/com/luminiasoft/bitshares/UserAccount.java +++ b/src/main/java/de/bitsharesmunich/graphenej/UserAccount.java @@ -1,8 +1,8 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import com.google.gson.*; -import com.luminiasoft.bitshares.interfaces.ByteSerializable; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.interfaces.ByteSerializable; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; import java.io.ByteArrayOutputStream; import java.io.DataOutput; diff --git a/src/main/java/com/luminiasoft/bitshares/Util.java b/src/main/java/de/bitsharesmunich/graphenej/Util.java similarity index 99% rename from src/main/java/com/luminiasoft/bitshares/Util.java rename to src/main/java/de/bitsharesmunich/graphenej/Util.java index d6b45f7..1df7493 100644 --- a/src/main/java/com/luminiasoft/bitshares/Util.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Util.java @@ -1,7 +1,6 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import org.tukaani.xz.FinishableOutputStream; -import com.google.common.primitives.Bytes; import org.tukaani.xz.LZMA2Options; import org.tukaani.xz.LZMAInputStream; import org.tukaani.xz.LZMAOutputStream; diff --git a/src/main/java/com/luminiasoft/bitshares/Varint.java b/src/main/java/de/bitsharesmunich/graphenej/Varint.java similarity index 99% rename from src/main/java/com/luminiasoft/bitshares/Varint.java rename to src/main/java/de/bitsharesmunich/graphenej/Varint.java index 1b37689..c06e05a 100644 --- a/src/main/java/com/luminiasoft/bitshares/Varint.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Varint.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; import java.io.DataInput; diff --git a/src/main/java/com/luminiasoft/bitshares/Vote.java b/src/main/java/de/bitsharesmunich/graphenej/Vote.java similarity index 87% rename from src/main/java/com/luminiasoft/bitshares/Vote.java rename to src/main/java/de/bitsharesmunich/graphenej/Vote.java index d8f674f..7c50a90 100644 --- a/src/main/java/com/luminiasoft/bitshares/Vote.java +++ b/src/main/java/de/bitsharesmunich/graphenej/Vote.java @@ -1,6 +1,6 @@ -package com.luminiasoft.bitshares; +package de.bitsharesmunich.graphenej; -import com.luminiasoft.bitshares.interfaces.ByteSerializable; +import de.bitsharesmunich.graphenej.interfaces.ByteSerializable; /** * Created by nelson on 12/5/16. diff --git a/src/main/java/com/luminiasoft/bitshares/ws/GetAccountByName.java b/src/main/java/de/bitsharesmunich/graphenej/api/GetAccountByName.java similarity index 85% rename from src/main/java/com/luminiasoft/bitshares/ws/GetAccountByName.java rename to src/main/java/de/bitsharesmunich/graphenej/api/GetAccountByName.java index fc84df6..3dc1780 100644 --- a/src/main/java/com/luminiasoft/bitshares/ws/GetAccountByName.java +++ b/src/main/java/de/bitsharesmunich/graphenej/api/GetAccountByName.java @@ -1,13 +1,13 @@ -package com.luminiasoft.bitshares.ws; +package de.bitsharesmunich.graphenej.api; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.luminiasoft.bitshares.RPC; -import com.luminiasoft.bitshares.interfaces.WitnessResponseListener; -import com.luminiasoft.bitshares.models.AccountProperties; -import com.luminiasoft.bitshares.models.ApiCall; -import com.luminiasoft.bitshares.models.BaseResponse; -import com.luminiasoft.bitshares.models.WitnessResponse; +import de.bitsharesmunich.graphenej.RPC; +import de.bitsharesmunich.graphenej.interfaces.WitnessResponseListener; +import de.bitsharesmunich.graphenej.models.AccountProperties; +import de.bitsharesmunich.graphenej.models.ApiCall; +import de.bitsharesmunich.graphenej.models.BaseResponse; +import de.bitsharesmunich.graphenej.models.WitnessResponse; import com.neovisionaries.ws.client.WebSocket; import com.neovisionaries.ws.client.WebSocketAdapter; import com.neovisionaries.ws.client.WebSocketException; diff --git a/src/main/java/com/luminiasoft/bitshares/ws/GetAccountNameById.java b/src/main/java/de/bitsharesmunich/graphenej/api/GetAccountNameById.java similarity index 87% rename from src/main/java/com/luminiasoft/bitshares/ws/GetAccountNameById.java rename to src/main/java/de/bitsharesmunich/graphenej/api/GetAccountNameById.java index d2994a6..e7f465a 100644 --- a/src/main/java/com/luminiasoft/bitshares/ws/GetAccountNameById.java +++ b/src/main/java/de/bitsharesmunich/graphenej/api/GetAccountNameById.java @@ -1,20 +1,21 @@ -package com.luminiasoft.bitshares.ws; +package de.bitsharesmunich.graphenej.api; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.luminiasoft.bitshares.RPC; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; -import com.luminiasoft.bitshares.interfaces.WitnessResponseListener; -import com.luminiasoft.bitshares.models.AccountProperties; -import com.luminiasoft.bitshares.models.ApiCall; -import com.luminiasoft.bitshares.models.BaseResponse; -import com.luminiasoft.bitshares.models.WitnessResponse; +import de.bitsharesmunich.graphenej.RPC; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.interfaces.WitnessResponseListener; +import de.bitsharesmunich.graphenej.models.AccountProperties; +import de.bitsharesmunich.graphenej.models.BaseResponse; import com.neovisionaries.ws.client.WebSocket; import com.neovisionaries.ws.client.WebSocketAdapter; import com.neovisionaries.ws.client.WebSocketException; import com.neovisionaries.ws.client.WebSocketFrame; +import de.bitsharesmunich.graphenej.models.ApiCall; +import de.bitsharesmunich.graphenej.models.WitnessResponse; + import java.io.Serializable; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/src/main/java/com/luminiasoft/bitshares/ws/GetAccountsByAddress.java b/src/main/java/de/bitsharesmunich/graphenej/api/GetAccountsByAddress.java similarity index 86% rename from src/main/java/com/luminiasoft/bitshares/ws/GetAccountsByAddress.java rename to src/main/java/de/bitsharesmunich/graphenej/api/GetAccountsByAddress.java index 0b0be52..b3c716c 100644 --- a/src/main/java/com/luminiasoft/bitshares/ws/GetAccountsByAddress.java +++ b/src/main/java/de/bitsharesmunich/graphenej/api/GetAccountsByAddress.java @@ -1,17 +1,16 @@ -package com.luminiasoft.bitshares.ws; +package de.bitsharesmunich.graphenej.api; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -import com.luminiasoft.bitshares.Address; -import com.luminiasoft.bitshares.RPC; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; -import com.luminiasoft.bitshares.interfaces.WitnessResponseListener; -import com.luminiasoft.bitshares.models.AccountProperties; -import com.luminiasoft.bitshares.models.ApiCall; -import com.luminiasoft.bitshares.models.BaseResponse; -import com.luminiasoft.bitshares.models.WitnessResponse; +import de.bitsharesmunich.graphenej.Address; +import de.bitsharesmunich.graphenej.RPC; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.interfaces.WitnessResponseListener; +import de.bitsharesmunich.graphenej.models.ApiCall; +import de.bitsharesmunich.graphenej.models.BaseResponse; +import de.bitsharesmunich.graphenej.models.WitnessResponse; import com.neovisionaries.ws.client.WebSocket; import com.neovisionaries.ws.client.WebSocketAdapter; import com.neovisionaries.ws.client.WebSocketException; diff --git a/src/main/java/com/luminiasoft/bitshares/ws/GetRelativeAccountHistory.java b/src/main/java/de/bitsharesmunich/graphenej/api/GetRelativeAccountHistory.java similarity index 91% rename from src/main/java/com/luminiasoft/bitshares/ws/GetRelativeAccountHistory.java rename to src/main/java/de/bitsharesmunich/graphenej/api/GetRelativeAccountHistory.java index d32806e..c2f0cb6 100644 --- a/src/main/java/com/luminiasoft/bitshares/ws/GetRelativeAccountHistory.java +++ b/src/main/java/de/bitsharesmunich/graphenej/api/GetRelativeAccountHistory.java @@ -1,17 +1,17 @@ -package com.luminiasoft.bitshares.ws; +package de.bitsharesmunich.graphenej.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import com.luminiasoft.bitshares.AssetAmount; -import com.luminiasoft.bitshares.RPC; -import com.luminiasoft.bitshares.TransferOperation; -import com.luminiasoft.bitshares.UserAccount; -import com.luminiasoft.bitshares.interfaces.WitnessResponseListener; -import com.luminiasoft.bitshares.models.ApiCall; -import com.luminiasoft.bitshares.models.BaseResponse; -import com.luminiasoft.bitshares.models.HistoricalTransfer; -import com.luminiasoft.bitshares.models.WitnessResponse; +import de.bitsharesmunich.graphenej.AssetAmount; +import de.bitsharesmunich.graphenej.RPC; +import de.bitsharesmunich.graphenej.TransferOperation; +import de.bitsharesmunich.graphenej.UserAccount; +import de.bitsharesmunich.graphenej.interfaces.WitnessResponseListener; +import de.bitsharesmunich.graphenej.models.ApiCall; +import de.bitsharesmunich.graphenej.models.BaseResponse; +import de.bitsharesmunich.graphenej.models.HistoricalTransfer; +import de.bitsharesmunich.graphenej.models.WitnessResponse; import com.neovisionaries.ws.client.WebSocket; import com.neovisionaries.ws.client.WebSocketAdapter; import com.neovisionaries.ws.client.WebSocketException; diff --git a/src/main/java/com/luminiasoft/bitshares/ws/GetRequiredFees.java b/src/main/java/de/bitsharesmunich/graphenej/api/GetRequiredFees.java similarity index 84% rename from src/main/java/com/luminiasoft/bitshares/ws/GetRequiredFees.java rename to src/main/java/de/bitsharesmunich/graphenej/api/GetRequiredFees.java index c4920f5..dfc9118 100644 --- a/src/main/java/com/luminiasoft/bitshares/ws/GetRequiredFees.java +++ b/src/main/java/de/bitsharesmunich/graphenej/api/GetRequiredFees.java @@ -1,20 +1,20 @@ -package com.luminiasoft.bitshares.ws; +package de.bitsharesmunich.graphenej.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import com.luminiasoft.bitshares.Asset; -import com.luminiasoft.bitshares.AssetAmount; -import com.luminiasoft.bitshares.BaseOperation; -import com.luminiasoft.bitshares.RPC; -import com.luminiasoft.bitshares.interfaces.WitnessResponseListener; -import com.luminiasoft.bitshares.models.ApiCall; -import com.luminiasoft.bitshares.models.BaseResponse; -import com.luminiasoft.bitshares.models.WitnessResponse; +import de.bitsharesmunich.graphenej.AssetAmount; +import de.bitsharesmunich.graphenej.RPC; +import de.bitsharesmunich.graphenej.interfaces.WitnessResponseListener; +import de.bitsharesmunich.graphenej.models.ApiCall; +import de.bitsharesmunich.graphenej.models.BaseResponse; +import de.bitsharesmunich.graphenej.models.WitnessResponse; import com.neovisionaries.ws.client.WebSocket; import com.neovisionaries.ws.client.WebSocketAdapter; import com.neovisionaries.ws.client.WebSocketException; import com.neovisionaries.ws.client.WebSocketFrame; +import de.bitsharesmunich.graphenej.Asset; +import de.bitsharesmunich.graphenej.BaseOperation; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/src/main/java/com/luminiasoft/bitshares/ws/LookupAccounts.java b/src/main/java/de/bitsharesmunich/graphenej/api/LookupAccounts.java similarity index 88% rename from src/main/java/com/luminiasoft/bitshares/ws/LookupAccounts.java rename to src/main/java/de/bitsharesmunich/graphenej/api/LookupAccounts.java index e6e44d7..37274bd 100644 --- a/src/main/java/com/luminiasoft/bitshares/ws/LookupAccounts.java +++ b/src/main/java/de/bitsharesmunich/graphenej/api/LookupAccounts.java @@ -1,13 +1,13 @@ -package com.luminiasoft.bitshares.ws; +package de.bitsharesmunich.graphenej.api; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import com.luminiasoft.bitshares.RPC; -import com.luminiasoft.bitshares.UserAccount; -import com.luminiasoft.bitshares.interfaces.WitnessResponseListener; -import com.luminiasoft.bitshares.models.ApiCall; -import com.luminiasoft.bitshares.models.BaseResponse; -import com.luminiasoft.bitshares.models.WitnessResponse; +import de.bitsharesmunich.graphenej.RPC; +import de.bitsharesmunich.graphenej.UserAccount; +import de.bitsharesmunich.graphenej.interfaces.WitnessResponseListener; +import de.bitsharesmunich.graphenej.models.ApiCall; +import de.bitsharesmunich.graphenej.models.BaseResponse; +import de.bitsharesmunich.graphenej.models.WitnessResponse; import com.neovisionaries.ws.client.WebSocket; import com.neovisionaries.ws.client.WebSocketAdapter; import com.neovisionaries.ws.client.WebSocketException; diff --git a/src/main/java/com/luminiasoft/bitshares/ws/TransactionBroadcastSequence.java b/src/main/java/de/bitsharesmunich/graphenej/api/TransactionBroadcastSequence.java similarity index 95% rename from src/main/java/com/luminiasoft/bitshares/ws/TransactionBroadcastSequence.java rename to src/main/java/de/bitsharesmunich/graphenej/api/TransactionBroadcastSequence.java index 386693b..c92137a 100644 --- a/src/main/java/com/luminiasoft/bitshares/ws/TransactionBroadcastSequence.java +++ b/src/main/java/de/bitsharesmunich/graphenej/api/TransactionBroadcastSequence.java @@ -1,23 +1,22 @@ -package com.luminiasoft.bitshares.ws; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; -import com.luminiasoft.bitshares.*; -import com.luminiasoft.bitshares.interfaces.WitnessResponseListener; -import com.luminiasoft.bitshares.models.ApiCall; -import com.luminiasoft.bitshares.models.BaseResponse; -import com.luminiasoft.bitshares.models.DynamicGlobalProperties; -import com.luminiasoft.bitshares.models.WitnessResponse; -import com.neovisionaries.ws.client.WebSocket; -import com.neovisionaries.ws.client.WebSocketAdapter; -import com.neovisionaries.ws.client.WebSocketException; -import com.neovisionaries.ws.client.WebSocketFrame; +package de.bitsharesmunich.graphenej.api; import java.io.Serializable; import java.lang.reflect.Type; import java.text.SimpleDateFormat; import java.util.*; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import de.bitsharesmunich.graphenej.*; +import de.bitsharesmunich.graphenej.interfaces.WitnessResponseListener; +import de.bitsharesmunich.graphenej.models.ApiCall; +import de.bitsharesmunich.graphenej.models.BaseResponse; +import de.bitsharesmunich.graphenej.models.DynamicGlobalProperties; +import de.bitsharesmunich.graphenej.models.WitnessResponse; +import com.neovisionaries.ws.client.WebSocket; +import com.neovisionaries.ws.client.WebSocketAdapter; +import com.neovisionaries.ws.client.WebSocketException; +import com.neovisionaries.ws.client.WebSocketFrame; /** * Class that will handle the transaction publication procedure. diff --git a/src/main/java/com/luminiasoft/bitshares/brainkeydict.txt b/src/main/java/de/bitsharesmunich/graphenej/brainkeydict.txt similarity index 100% rename from src/main/java/com/luminiasoft/bitshares/brainkeydict.txt rename to src/main/java/de/bitsharesmunich/graphenej/brainkeydict.txt diff --git a/src/main/java/com/luminiasoft/bitshares/crypto/AndroidRandomSource.java b/src/main/java/de/bitsharesmunich/graphenej/crypto/AndroidRandomSource.java similarity index 98% rename from src/main/java/com/luminiasoft/bitshares/crypto/AndroidRandomSource.java rename to src/main/java/de/bitsharesmunich/graphenej/crypto/AndroidRandomSource.java index 700af6d..0e3863b 100644 --- a/src/main/java/com/luminiasoft/bitshares/crypto/AndroidRandomSource.java +++ b/src/main/java/de/bitsharesmunich/graphenej/crypto/AndroidRandomSource.java @@ -32,7 +32,7 @@ * fitness for a particular purpose and non-infringement. */ -package com.luminiasoft.bitshares.crypto; +package de.bitsharesmunich.graphenej.crypto; import java.io.DataInputStream; import java.io.File; diff --git a/src/main/java/com/luminiasoft/bitshares/crypto/EntropySource.java b/src/main/java/de/bitsharesmunich/graphenej/crypto/EntropySource.java similarity index 92% rename from src/main/java/com/luminiasoft/bitshares/crypto/EntropySource.java rename to src/main/java/de/bitsharesmunich/graphenej/crypto/EntropySource.java index bb16c03..6c07b43 100644 --- a/src/main/java/com/luminiasoft/bitshares/crypto/EntropySource.java +++ b/src/main/java/de/bitsharesmunich/graphenej/crypto/EntropySource.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.crypto; +package de.bitsharesmunich.graphenej.crypto; import java.nio.ByteBuffer; diff --git a/src/main/java/com/luminiasoft/bitshares/crypto/RandomSource.java b/src/main/java/de/bitsharesmunich/graphenej/crypto/RandomSource.java similarity index 94% rename from src/main/java/com/luminiasoft/bitshares/crypto/RandomSource.java rename to src/main/java/de/bitsharesmunich/graphenej/crypto/RandomSource.java index 91e38d6..aaf4940 100644 --- a/src/main/java/com/luminiasoft/bitshares/crypto/RandomSource.java +++ b/src/main/java/de/bitsharesmunich/graphenej/crypto/RandomSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.luminiasoft.bitshares.crypto; +package de.bitsharesmunich.graphenej.crypto; public interface RandomSource { /** diff --git a/src/main/java/com/luminiasoft/bitshares/crypto/SecureRandomStrengthener.java b/src/main/java/de/bitsharesmunich/graphenej/crypto/SecureRandomStrengthener.java similarity index 99% rename from src/main/java/com/luminiasoft/bitshares/crypto/SecureRandomStrengthener.java rename to src/main/java/de/bitsharesmunich/graphenej/crypto/SecureRandomStrengthener.java index 54ddff2..093cffd 100644 --- a/src/main/java/com/luminiasoft/bitshares/crypto/SecureRandomStrengthener.java +++ b/src/main/java/de/bitsharesmunich/graphenej/crypto/SecureRandomStrengthener.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.crypto; +package de.bitsharesmunich.graphenej.crypto; import java.nio.ByteBuffer; import java.security.DigestException; diff --git a/src/main/java/com/luminiasoft/bitshares/errors/MalformedAddressException.java b/src/main/java/de/bitsharesmunich/graphenej/errors/MalformedAddressException.java similarity index 80% rename from src/main/java/com/luminiasoft/bitshares/errors/MalformedAddressException.java rename to src/main/java/de/bitsharesmunich/graphenej/errors/MalformedAddressException.java index a1c673d..8348d3e 100644 --- a/src/main/java/com/luminiasoft/bitshares/errors/MalformedAddressException.java +++ b/src/main/java/de/bitsharesmunich/graphenej/errors/MalformedAddressException.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.errors; +package de.bitsharesmunich.graphenej.errors; /** * Created by nelson on 12/1/16. diff --git a/src/main/java/com/luminiasoft/bitshares/errors/MalformedTransactionException.java b/src/main/java/de/bitsharesmunich/graphenej/errors/MalformedTransactionException.java similarity index 81% rename from src/main/java/com/luminiasoft/bitshares/errors/MalformedTransactionException.java rename to src/main/java/de/bitsharesmunich/graphenej/errors/MalformedTransactionException.java index 604f8c4..34e303e 100644 --- a/src/main/java/com/luminiasoft/bitshares/errors/MalformedTransactionException.java +++ b/src/main/java/de/bitsharesmunich/graphenej/errors/MalformedTransactionException.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.errors; +package de.bitsharesmunich.graphenej.errors; /** * Created by nelson on 11/14/16. diff --git a/src/main/java/com/luminiasoft/bitshares/interfaces/ByteSerializable.java b/src/main/java/de/bitsharesmunich/graphenej/interfaces/ByteSerializable.java similarity index 77% rename from src/main/java/com/luminiasoft/bitshares/interfaces/ByteSerializable.java rename to src/main/java/de/bitsharesmunich/graphenej/interfaces/ByteSerializable.java index b557013..b60c6c1 100644 --- a/src/main/java/com/luminiasoft/bitshares/interfaces/ByteSerializable.java +++ b/src/main/java/de/bitsharesmunich/graphenej/interfaces/ByteSerializable.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.interfaces; +package de.bitsharesmunich.graphenej.interfaces; /** * Interface implemented by all entities for which makes sense to have a byte-array representation. diff --git a/src/main/java/com/luminiasoft/bitshares/interfaces/GrapheneSerializable.java b/src/main/java/de/bitsharesmunich/graphenej/interfaces/GrapheneSerializable.java similarity index 78% rename from src/main/java/com/luminiasoft/bitshares/interfaces/GrapheneSerializable.java rename to src/main/java/de/bitsharesmunich/graphenej/interfaces/GrapheneSerializable.java index 68ed06f..93eb781 100644 --- a/src/main/java/com/luminiasoft/bitshares/interfaces/GrapheneSerializable.java +++ b/src/main/java/de/bitsharesmunich/graphenej/interfaces/GrapheneSerializable.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.interfaces; +package de.bitsharesmunich.graphenej.interfaces; /** * Interface used to group both ByteSerializable and JsonSerializable interfaces. diff --git a/src/main/java/com/luminiasoft/bitshares/interfaces/JsonSerializable.java b/src/main/java/de/bitsharesmunich/graphenej/interfaces/JsonSerializable.java similarity index 86% rename from src/main/java/com/luminiasoft/bitshares/interfaces/JsonSerializable.java rename to src/main/java/de/bitsharesmunich/graphenej/interfaces/JsonSerializable.java index e1f7377..5e64e4d 100644 --- a/src/main/java/com/luminiasoft/bitshares/interfaces/JsonSerializable.java +++ b/src/main/java/de/bitsharesmunich/graphenej/interfaces/JsonSerializable.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.interfaces; +package de.bitsharesmunich.graphenej.interfaces; import com.google.gson.JsonElement; diff --git a/src/main/java/com/luminiasoft/bitshares/interfaces/WitnessResponseListener.java b/src/main/java/de/bitsharesmunich/graphenej/interfaces/WitnessResponseListener.java similarity index 55% rename from src/main/java/com/luminiasoft/bitshares/interfaces/WitnessResponseListener.java rename to src/main/java/de/bitsharesmunich/graphenej/interfaces/WitnessResponseListener.java index 58560c0..0a25d0a 100644 --- a/src/main/java/com/luminiasoft/bitshares/interfaces/WitnessResponseListener.java +++ b/src/main/java/de/bitsharesmunich/graphenej/interfaces/WitnessResponseListener.java @@ -1,7 +1,7 @@ -package com.luminiasoft.bitshares.interfaces; +package de.bitsharesmunich.graphenej.interfaces; -import com.luminiasoft.bitshares.models.BaseResponse; -import com.luminiasoft.bitshares.models.WitnessResponse; +import de.bitsharesmunich.graphenej.models.BaseResponse; +import de.bitsharesmunich.graphenej.models.WitnessResponse; /** * Class used to represent any listener to network requests. diff --git a/src/main/java/com/luminiasoft/bitshares/models/AccountProperties.java b/src/main/java/de/bitsharesmunich/graphenej/models/AccountProperties.java similarity index 96% rename from src/main/java/com/luminiasoft/bitshares/models/AccountProperties.java rename to src/main/java/de/bitsharesmunich/graphenej/models/AccountProperties.java index b57f0a2..f2fd595 100644 --- a/src/main/java/com/luminiasoft/bitshares/models/AccountProperties.java +++ b/src/main/java/de/bitsharesmunich/graphenej/models/AccountProperties.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.models; +package de.bitsharesmunich.graphenej.models; /** * Created by nelson on 11/15/16. diff --git a/src/main/java/com/luminiasoft/bitshares/models/ApiCall.java b/src/main/java/de/bitsharesmunich/graphenej/models/ApiCall.java similarity index 97% rename from src/main/java/com/luminiasoft/bitshares/models/ApiCall.java rename to src/main/java/de/bitsharesmunich/graphenej/models/ApiCall.java index 6d29147..e07416e 100644 --- a/src/main/java/com/luminiasoft/bitshares/models/ApiCall.java +++ b/src/main/java/de/bitsharesmunich/graphenej/models/ApiCall.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.models; +package de.bitsharesmunich.graphenej.models; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; @@ -6,7 +6,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; import java.io.Serializable; import java.lang.reflect.Type; diff --git a/src/main/java/com/luminiasoft/bitshares/models/BaseResponse.java b/src/main/java/de/bitsharesmunich/graphenej/models/BaseResponse.java similarity index 92% rename from src/main/java/com/luminiasoft/bitshares/models/BaseResponse.java rename to src/main/java/de/bitsharesmunich/graphenej/models/BaseResponse.java index 13df8f6..3801777 100644 --- a/src/main/java/com/luminiasoft/bitshares/models/BaseResponse.java +++ b/src/main/java/de/bitsharesmunich/graphenej/models/BaseResponse.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.models; +package de.bitsharesmunich.graphenej.models; /** * Created by nelson on 11/12/16. diff --git a/src/main/java/com/luminiasoft/bitshares/models/DynamicGlobalProperties.java b/src/main/java/de/bitsharesmunich/graphenej/models/DynamicGlobalProperties.java similarity index 93% rename from src/main/java/com/luminiasoft/bitshares/models/DynamicGlobalProperties.java rename to src/main/java/de/bitsharesmunich/graphenej/models/DynamicGlobalProperties.java index c59278d..26d711c 100644 --- a/src/main/java/com/luminiasoft/bitshares/models/DynamicGlobalProperties.java +++ b/src/main/java/de/bitsharesmunich/graphenej/models/DynamicGlobalProperties.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.models; +package de.bitsharesmunich.graphenej.models; /** * Class used to deserialize the 'result' field returned by the full node after making a call diff --git a/src/main/java/com/luminiasoft/bitshares/models/HistoricalTransfer.java b/src/main/java/de/bitsharesmunich/graphenej/models/HistoricalTransfer.java similarity index 83% rename from src/main/java/com/luminiasoft/bitshares/models/HistoricalTransfer.java rename to src/main/java/de/bitsharesmunich/graphenej/models/HistoricalTransfer.java index 1e27519..8c5cfeb 100644 --- a/src/main/java/com/luminiasoft/bitshares/models/HistoricalTransfer.java +++ b/src/main/java/de/bitsharesmunich/graphenej/models/HistoricalTransfer.java @@ -1,6 +1,6 @@ -package com.luminiasoft.bitshares.models; +package de.bitsharesmunich.graphenej.models; -import com.luminiasoft.bitshares.TransferOperation; +import de.bitsharesmunich.graphenej.TransferOperation; /** * This class offers support to deserialization of transfer operations received by the API diff --git a/src/main/java/com/luminiasoft/bitshares/models/WitnessResponse.java b/src/main/java/de/bitsharesmunich/graphenej/models/WitnessResponse.java similarity index 71% rename from src/main/java/com/luminiasoft/bitshares/models/WitnessResponse.java rename to src/main/java/de/bitsharesmunich/graphenej/models/WitnessResponse.java index 0ba8b26..3e5e7da 100644 --- a/src/main/java/com/luminiasoft/bitshares/models/WitnessResponse.java +++ b/src/main/java/de/bitsharesmunich/graphenej/models/WitnessResponse.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.models; +package de.bitsharesmunich.graphenej.models; /** * Generic witness response diff --git a/src/main/java/com/luminiasoft/bitshares/objects/Memo.java b/src/main/java/de/bitsharesmunich/graphenej/objects/Memo.java similarity index 95% rename from src/main/java/com/luminiasoft/bitshares/objects/Memo.java rename to src/main/java/de/bitsharesmunich/graphenej/objects/Memo.java index 2da8f76..7cb9c08 100644 --- a/src/main/java/com/luminiasoft/bitshares/objects/Memo.java +++ b/src/main/java/de/bitsharesmunich/graphenej/objects/Memo.java @@ -1,13 +1,13 @@ -package com.luminiasoft.bitshares.objects; +package de.bitsharesmunich.graphenej.objects; import com.google.common.primitives.Bytes; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.luminiasoft.bitshares.PublicKey; -import com.luminiasoft.bitshares.Util; -import com.luminiasoft.bitshares.crypto.SecureRandomStrengthener; -import com.luminiasoft.bitshares.interfaces.ByteSerializable; -import com.luminiasoft.bitshares.interfaces.JsonSerializable; +import de.bitsharesmunich.graphenej.PublicKey; +import de.bitsharesmunich.graphenej.Util; +import de.bitsharesmunich.graphenej.crypto.SecureRandomStrengthener; +import de.bitsharesmunich.graphenej.interfaces.ByteSerializable; +import de.bitsharesmunich.graphenej.interfaces.JsonSerializable; import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/src/main/java/com/luminiasoft/bitshares/objects/MemoBuilder.java b/src/main/java/de/bitsharesmunich/graphenej/objects/MemoBuilder.java similarity index 91% rename from src/main/java/com/luminiasoft/bitshares/objects/MemoBuilder.java rename to src/main/java/de/bitsharesmunich/graphenej/objects/MemoBuilder.java index c329758..ab8426b 100644 --- a/src/main/java/com/luminiasoft/bitshares/objects/MemoBuilder.java +++ b/src/main/java/de/bitsharesmunich/graphenej/objects/MemoBuilder.java @@ -1,74 +1,74 @@ -package com.luminiasoft.bitshares.objects; - -import com.luminiasoft.bitshares.PublicKey; - -/** - * Class to build a Memo Object - * @author henry 10/12/2016 - */ -public class MemoBuilder { - - private PublicKey fromKey; - private PublicKey toKey; - private String message; - private long nonce = 0; - - /** - * Empty Constructor - */ - public MemoBuilder() { - } - - /** - * Set the key of the Source, needs to have a private Key access - * @param fromKey The Public Key of the sender - * @return The MemoBuilder - */ - public MemoBuilder setFromKey(PublicKey fromKey) { - this.fromKey = fromKey; - return this; - } - - /** - * Set the key of the destination, only need the public key. - * @param toKey The Public Key of the receiver - * @return The MemoBuilder - */ - public MemoBuilder setToKey(PublicKey toKey) { - this.toKey = toKey; - return this; - } - - /** - * Set the message to be send - * @param message The message as a String - * @return The MemoBuilder - */ - public MemoBuilder setMessage(String message) { - this.message = message; - return this; - } - - /** - * (Optional) Sets a custom nonce - * @param nonce The custom nonce - * @return The MemoBuilder - */ - public MemoBuilder setNone(Long nonce) { - this.nonce = nonce; - return this; - } - - /** - * Biulds the memo object - * @return The Memo object - */ - public Memo build() { - //Todo unencode key - if (nonce == 0) { - return Memo.encodeMessage(fromKey, toKey, message.getBytes()); - } - return Memo.encodeMessage(fromKey, toKey, message.getBytes(), nonce); - } - -} +package de.bitsharesmunich.graphenej.objects; + +import de.bitsharesmunich.graphenej.PublicKey; + +/** + * Class to build a Memo Object + * @author henry 10/12/2016 + */ +public class MemoBuilder { + + private PublicKey fromKey; + private PublicKey toKey; + private String message; + private long nonce = 0; + + /** + * Empty Constructor + */ + public MemoBuilder() { + } + + /** + * Set the key of the Source, needs to have a private Key access + * @param fromKey The Public Key of the sender + * @return The MemoBuilder + */ + public MemoBuilder setFromKey(PublicKey fromKey) { + this.fromKey = fromKey; + return this; + } + + /** + * Set the key of the destination, only need the public key. + * @param toKey The Public Key of the receiver + * @return The MemoBuilder + */ + public MemoBuilder setToKey(PublicKey toKey) { + this.toKey = toKey; + return this; + } + + /** + * Set the message to be send + * @param message The message as a String + * @return The MemoBuilder + */ + public MemoBuilder setMessage(String message) { + this.message = message; + return this; + } + + /** + * (Optional) Sets a custom nonce + * @param nonce The custom nonce + * @return The MemoBuilder + */ + public MemoBuilder setNone(Long nonce) { + this.nonce = nonce; + return this; + } + + /** + * Biulds the memo object + * @return The Memo object + */ + public Memo build() { + //Todo unencode key + if (nonce == 0) { + return Memo.encodeMessage(fromKey, toKey, message.getBytes()); + } + return Memo.encodeMessage(fromKey, toKey, message.getBytes(), nonce); + } + +} diff --git a/src/main/java/com/luminiasoft/bitshares/test/NaiveSSLContext.java b/src/main/java/de/bitsharesmunich/graphenej/test/NaiveSSLContext.java similarity index 98% rename from src/main/java/com/luminiasoft/bitshares/test/NaiveSSLContext.java rename to src/main/java/de/bitsharesmunich/graphenej/test/NaiveSSLContext.java index a54d8ab..8858aba 100644 --- a/src/main/java/com/luminiasoft/bitshares/test/NaiveSSLContext.java +++ b/src/main/java/de/bitsharesmunich/graphenej/test/NaiveSSLContext.java @@ -1,4 +1,4 @@ -package com.luminiasoft.bitshares.test; +package de.bitsharesmunich.graphenej.test; /* * Copyright (C) 2015 Neo Visionaries Inc.