Merge branch 'dev'

Author: edwardstock

README.md

@@ -24,7 +24,7 @@ project build.gradle
 ```groovy
 
 ext {
-    minterBlockchainSDK = "0.5.4"
+    minterBlockchainSDK = "0.5.6"
 }
 
 dependencies {

RELEASE.md

@@ -1,5 +1,11 @@
 # Release notes
 
+## 0.5.6
+ - Changed `stake` to `value` in delegate/unbound transactions
+
+## 0.5.5
+ - Fixed sending transaction: now blockchain requires 0x before transaction sign
+
 ## 0.5.4
  - Removed `transactionCount` method and moved this info to balance model `Balance.txCount`
 

build.gradle

@@ -58,7 +58,7 @@ apply plugin: 'com.jfrog.bintray'
 
 
 group = 'network.minter.android'
-version = '0.5.4'
+version = '0.5.6'
 
 ext {
     minterMinSdk = 16

src/main/java/network/minter/blockchain/MinterBlockChainApi.java

@@ -128,6 +128,9 @@ public static void initialize(String baseNodeApiUrl) {
     }
 
     public static MinterBlockChainApi getInstance() {
+        if (INSTANCE == null) {
+            throw new IllegalStateException("You forget to call MinterBlockchainApi.initialize");
+        }
         return INSTANCE;
     }
 

src/main/java/network/minter/blockchain/models/HistoryTransaction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) by MinterTeam. 2018
+ * Copyright (C) by MinterTeam. 2019
  * @link <a href="https://github.com/MinterTeam">Org Github</a>
  * @link <a href="https://github.com/edwardstock">Maintainer Github</a>
  *
@@ -301,18 +301,27 @@ public static class TxDelegateUnbondResult extends TxBaseResult {
         @SerializedName("pub_key")
         public MinterPublicKey publicKey;
         public String coin;
-        public String stake;
+        public String value;
 
         public MinterPublicKey getPublicKey() {
             return publicKey;
         }
 
-        public BigDecimal getStake() {
-            if (stake == null || stake.isEmpty()) {
-                stake = "0";
+        public BigDecimal getValue() {
+            if (value == null || value.isEmpty()) {
+                value = "0";
             }
 
-            return new BigDecimal(stake);
+            return new BigDecimal(value);
+        }
+
+        /**
+         * @return
+         * @deprecated use {@link #getValue()}
+         */
+        @Deprecated
+        public BigDecimal getStake() {
+            return getValue();
         }
 
         public String getCoin() {

src/main/java/network/minter/blockchain/models/operational/TransactionSign.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) by MinterTeam. 2018
+ * Copyright (C) by MinterTeam. 2019
  * @link <a href="https://github.com/MinterTeam">Org Github</a>
  * @link <a href="https://github.com/edwardstock">Maintainer Github</a>
  *
@@ -35,7 +35,7 @@
  */
 @Parcel
 public final class TransactionSign {
-    private String mSign;
+    String mSign;
 
     public TransactionSign(String sign) {
         mSign = sign;
@@ -48,5 +48,9 @@ public String getTxSign() {
         return mSign;
     }
 
+    public final void clear() {
+        mSign = null;
+    }
+
 
 }

src/main/java/network/minter/blockchain/models/operational/TxDeclareCandidacy.java

@@ -156,7 +156,7 @@ public TxDeclareCandidacy setCoin(String coinName) {
     }
 
     /**
-     * Get normalized stake
+     * Get normalized value
      *
      * @return big decimal value
      */
@@ -170,7 +170,7 @@ public TxDeclareCandidacy setStake(String stakeBigInteger) {
     }
 
     /**
-     * Get normalized stake in double value
+     * Get normalized value in double value
      * Be carefully! Value can be overflowed
      *
      * @return normalized double value

src/main/java/network/minter/blockchain/repo/BlockChainAccountRepository.java

@@ -82,7 +82,13 @@ public Call<BCResult<Balance>> getBalance(@Nonnull String address) {
      * @see TransactionSendResult
      */
     public Call<BCResult<TransactionSendResult>> sendTransaction(@Nonnull TransactionSign transactionSign) {
-        return getInstantService().sendTransaction(transactionSign.getTxSign());
+        //TODO: move it to sign
+        String sig = transactionSign.getTxSign();
+        if (!sig.startsWith("0x")) {
+            sig = "0x" + sig;
+        }
+        transactionSign.clear();
+        return getInstantService().sendTransaction(sig);
     }
 
     @Nonnull

src/test/java/network/minter/blockchain/repos/TransactionsRepositoryTest.java

@@ -44,6 +44,7 @@
 
 /**
  * minter-android-blockchain. 2019
+ *
  * @author Eduard Maximovich [edward.vstock@gmail.com]
  */
 public class TransactionsRepositoryTest {