updates

Author: edwardstock

README.md

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

RELEASE.md

@@ -1,5 +1,11 @@
 # Release notes
 
+## 0.13.0
+ - Changes for signing transaction logic
+ - Fixed some api result models
+ - Updated tests
+ - Max supply now defaults to 10^15
+
 ## 0.12.2
  - Added Deeplink builder with Url-Safe base64 encoder
  - Updated tests
@@ -25,7 +31,7 @@
  - Added method to sign tx with a signature created outside `Transaction#signExternal`
 
 ## 0.10.0
- - Added check decoding from **Mc[data]**
+ - Added check decoding from **Mc...**
  - More check tests
  - Fixed check signing
 

build.gradle

@@ -31,7 +31,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
@@ -53,19 +53,18 @@ allprojects {
 apply plugin: 'com.android.library'
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
-apply plugin: 'jacoco'
 apply plugin: 'com.jfrog.bintray'
 
 
 group = 'network.minter.android'
-version = '0.12.2'
+version = '0.13.0'
 
 ext {
     minterMinSdk = 16
     minterMaxSdk = 29
     minterBuildTools = "29.0.2"
     minterLibSupport = "28.0.0"
-    minterCoreVers = "0.7.0"
+    minterCoreVers = "0.7.1"
 
 
     buildArtifactName = project.name
@@ -153,10 +152,12 @@ android {
     buildTypes {
         release {
             minifyEnabled true
+            testCoverageEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
             minifyEnabled true
+            testCoverageEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -172,7 +173,7 @@ android {
         }
         netTest {
             dimension "env"
-            buildConfigField "String", "BASE_NODE_URL", '"https://minter-node-1.testnet.minter.network:8841"'
+            buildConfigField "String", "BASE_NODE_URL", '"https://minter-node-1.testnet.minter.network"'
             buildConfigField "network.minter.blockchain.models.operational.BlockchainID", "BLOCKCHAIN_ID", "network.minter.blockchain.models.operational.BlockchainID.TestNet"
         }
     }
@@ -187,10 +188,10 @@ dependencies {
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
     // network
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.6.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.5.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
 
     implementation 'org.parceler:parceler-api:1.1.12'
     annotationProcessor 'org.parceler:parceler:1.1.12'
@@ -200,15 +201,13 @@ dependencies {
     implementation 'com.google.guava:guava:26.0-android'
 
     // testing
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.annotation:annotation:1.1.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'com.squareup.retrofit2:converter-gson:2.6.0'
+    androidTestImplementation 'com.squareup.retrofit2:converter-gson:2.8.1'
     androidTestImplementation 'com.google.code.gson:gson:2.8.6'
 }
 
-// Coverage
-apply from: 'scripts/jacoco.gradle'
 // Publishing
 apply from: 'scripts/maven_publish.gradle'

gradle.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (C) by MinterTeam. 2019
+# Copyright (C) by MinterTeam. 2020
 # @link <a href="https://github.com/MinterTeam">Org Github</a>
 # @link <a href="https://github.com/edwardstock">Maintainer Github</a>
 #
@@ -24,4 +24,12 @@
 # THE SOFTWARE.
 #
 android.enableJetifier=true
-android.useAndroidX=true
+android.useAndroidX=true
+bintray_user=edwardstock
+bintray_license_name=MIT
+bintray_license_url=https://github.com/MinterTeam/minter-android-blockchain/blob/master/LICENSE.txt
+bintray_repo=android
+bintray_user_repo=android
+bintray_user_org=minterteam
+bintray_gh_repo=MinterTeam/minter-android-blockchain
+bintray_website=https://github.com/MinterTeam/minter-android-blockchain

gradle/wrapper/gradle-wrapper.properties

@@ -24,9 +24,9 @@
 # THE SOFTWARE.
 #
 
-#Fri Mar 13 16:01:27 MSK 2020
+#Wed Feb 26 14:06:05 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

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

@@ -39,7 +39,6 @@
 import network.minter.blockchain.models.operational.Transaction;
 import network.minter.core.crypto.BytesData;
 import network.minter.core.crypto.MinterAddress;
-import network.minter.core.crypto.MinterCheck;
 import network.minter.core.crypto.MinterPublicKey;
 
 /**
@@ -75,7 +74,7 @@ public enum Type {
         @SerializedName("4")
         BuyCoin(TxConvertCoinResult.class),
         @SerializedName("5")
-        CreateCoin(TxCreateResult.class),
+        CreateCoin(TxCreateCoinResult.class),
         @SerializedName("6")
         DeclareCandidacy(TxDeclareCandidacyResult.class),
         @SerializedName("7")
@@ -141,15 +140,17 @@ public BigDecimal getAmount() {
      * Data model for creating coin transaction
      */
     @Parcel
-    public static class TxCreateResult extends TxBaseResult {
+    public static class TxCreateCoinResult extends TxBaseResult {
         public String name;
         public String symbol;
         @SerializedName("initial_amount")
         public BigInteger initialAmount;
         @SerializedName("initial_reserve")
         public BigInteger initialReserve;
         @SerializedName("constant_reserve_ratio")
-        public BigDecimal constantReserveRatio;
+        public BigDecimal crr;
+        @SerializedName("max_supply")
+        public BigInteger maxSupply;
 
         public String getName() {
             return name;
@@ -171,8 +172,8 @@ public BigDecimal getInitialReserve() {
             return Transaction.humanizeValue(initialReserve);
         }
 
-        public BigDecimal getConstantReserveRatio() {
-            return constantReserveRatio;
+        public BigDecimal getCrr() {
+            return crr;
         }
     }
 
@@ -322,18 +323,29 @@ public String getCoin() {
     @Parcel
     public static class TxRedeemCheckResult extends TxBaseResult {
         @SerializedName("raw_check")
-        public MinterCheck rawCheck;
-        public BytesData proof;
+        public String rawCheck;
+        public String proof;
 
-        public BytesData getProof() {
+        /**
+         * Base64 encoded proof data
+         * @return
+         */
+        public String getProof() {
             return proof;
         }
 
-        public MinterCheck getRawCheck() {
+        /**
+         * Base64 encoded check data
+         * @return
+         */
+        public String getRawCheck() {
             return rawCheck;
         }
     }
 
+    /**
+     * To get created multisig address, use {@link HistoryTransaction.tags['tx.created_multisig']}
+     */
     @Parcel
     public static class TxCreateMultisigResult extends TxBaseResult {
         public BigInteger threshold;
@@ -349,13 +361,6 @@ public static class TxMultisendResult extends TxBaseResult {
 
     @Parcel
     public static class TxEditCandidateResult extends TxBaseResult {
-        @SerializedName("list")
-        public List<CandidateEditResult> items;
-    }
-
-    //@TODO standard! write to Lashin to fix this
-    @Parcel
-    public static class CandidateEditResult {
         @SerializedName("reward_address")
         public MinterAddress rewardAddress;
         @SerializedName("owner_address")

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) by MinterTeam. 2019
+ * Copyright (C) by MinterTeam. 2020
  * @link <a href="https://github.com/MinterTeam">Org Github</a>
  * @link <a href="https://github.com/edwardstock">Maintainer Github</a>
  *
@@ -36,7 +36,7 @@ public enum BlockchainID {
     MainNet((byte) 0x01),
     TestNet((byte) 0x02);
 
-    private BigInteger mId;
+    private final BigInteger mId;
 
     BlockchainID(byte id) {
         mId = new BigInteger(String.valueOf(id));

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

@@ -71,6 +71,10 @@ public SignatureSingleData(BytesData signatureRSV) {
         mV = new BytesData(signatureRSV.takeRange(64, 65));
     }
 
+    public SignatureSingleData(NativeSecp256k1.RecoverableSignature signature) {
+        setSign(signature);
+    }
+
     public SignatureSingleData(char[] r, char[] s, char[] v) {
         checkArgument(r.length == 32, "R length must be 32");
         checkArgument(s.length == 32, "S length must be 32");