Merge branch 'dev'

Author: edwardstock

README.md

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

RELEASE.md

@@ -1,5 +1,11 @@
 # Release notes
 
+## 0.5.1
+ - Added gas price methods, see BlockChainBlockRepository
+ - Opened gas price field and setter for transaction, it uses in new api
+ - Added ability to create non-singleton instances, for using in cases when need to connect to multiple nodes
+
+
 ## 0.5.0
  - BREAKING:
     - New api methods, some fields are removed/partly moved to another place due blockchain api has been changed.

build.gradle

@@ -58,7 +58,7 @@ apply plugin: 'com.jfrog.bintray'
 
 
 group = 'network.minter.android'
-version = '0.5.0'
+version = '0.5.1'
 
 ext {
     minterMinSdk = 16
@@ -72,7 +72,7 @@ ext {
     buildArtifactVersion = version
     buildArtifactGroup = group
 
-    pomName = "Minter Core"
+    pomName = "Minter Blockhain"
     pomUrl = "https://github.com/MinterTeam/minter-android-blockchain"
     pomScm = {
         connection = "scm:git:git://github.com/MinterTeam/minter-android-blockchain.git"

src/main/java/network/minter/blockchain/MinterBlockChainApi.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>
  *
@@ -84,6 +84,26 @@ public static void initialize() {
         initialize(BASE_NODE_URL, false, new TimberLogger());
     }
 
+    /**
+     * Use this if no need to use singleton, for example, for accessing multiple instances simultaneously
+     * @param baseNodeApiUrl
+     * @param debug
+     * @param logger
+     * @return
+     */
+    public static MinterBlockChainApi createInstance(String baseNodeApiUrl, boolean debug, Mint.Leaf logger) {
+        if (debug) {
+            Mint.brew(logger);
+        }
+        MinterBlockChainApi api = new MinterBlockChainApi(baseNodeApiUrl);
+        api.mApiService.setDebug(debug);
+        if (debug) {
+            api.mApiService.setDebugRequestLevel(HttpLoggingInterceptor.Level.BODY);
+        }
+
+        return api;
+    }
+
     public static void initialize(String baseNodeApiUrl, boolean debug, Mint.Leaf logger) {
         if (INSTANCE != null) {
             return;

src/main/java/network/minter/blockchain/api/BlockChainBlockEndpoint.java

@@ -1,5 +1,33 @@
+/*
+ * 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>
+ *
+ * The MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package network.minter.blockchain.api;
 
+import java.math.BigInteger;
+
 import network.minter.blockchain.models.BCResult;
 import network.minter.blockchain.models.BlockInfo;
 import retrofit2.Call;
@@ -14,4 +42,13 @@ public interface BlockChainBlockEndpoint {
 
     @GET("/block")
     Call<BCResult<BlockInfo>> getByHeight(@Query("height") long height);
+
+    @GET("/max_gas")
+    Call<BCResult<BigInteger>> getMaxGas();
+
+    @GET("/max_gas")
+    Call<BCResult<BigInteger>> getMaxGasByHeight(@Query("height") long height);
+
+    @GET("/min_gas_price")
+    Call<BCResult<BigInteger>> getMinGas();
 }

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

@@ -73,6 +73,8 @@ public enum ResultCode {
         CoinSupplyOverflow(112),
         @SerializedName("113")
         TxFromSenderAlreadyInMempool(113),
+        @SerializedName("114")
+        TooLowGasPrice(114),
 
         // coin creation
         @SerializedName("201")

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

@@ -442,6 +442,17 @@ public Builder setGasCoin(String coin) {
             return this;
         }
 
+        /**
+         * Set transaction gas, it useful for highly loaded network, by default, value is 1
+         * @param gasPrice
+         * @return
+         * @see
+         */
+        public Builder setGasPrice(BigInteger gasPrice) {
+            mTx.mGasPrice = gasPrice;
+            return this;
+        }
+
         /**
          * Set arbitrary user-defined bytes
          * @param data max size: 1024 bytes

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

@@ -1,5 +1,33 @@
+/*
+ * 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>
+ *
+ * The MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package network.minter.blockchain.repo;
 
+import java.math.BigInteger;
+
 import javax.annotation.Nonnull;
 
 import network.minter.blockchain.api.BlockChainBlockEndpoint;
@@ -27,6 +55,31 @@ public Call<BCResult<BlockInfo>> getByHeight(long height) {
         return getInstantService().getByHeight(height);
     }
 
+    /**
+     * Get current minimum gas price to send transaction
+     * @return
+     */
+    public Call<BCResult<BigInteger>> getMinGasPrice() {
+        return getInstantService().getMinGas();
+    }
+
+    /**
+     * Get current maximum gas price to send transaction
+     * @return
+     */
+    public Call<BCResult<BigInteger>> getMaxGasPrice() {
+        return getInstantService().getMaxGas();
+    }
+
+    /**
+     * Get block maximum gas price
+     * @param blockHeight
+     * @return
+     */
+    public Call<BCResult<BigInteger>> getMaxGasPrice(long blockHeight) {
+        return getInstantService().getMaxGasByHeight(blockHeight);
+    }
+
     @Nonnull
     @Override
     protected Class<BlockChainBlockEndpoint> getServiceClass() {

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

@@ -1,8 +1,35 @@
+/*
+ * 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>
+ *
+ * The MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package network.minter.blockchain.repos;
 
 import org.junit.Test;
 
 import java.io.IOException;
+import java.math.BigInteger;
 
 import network.minter.blockchain.MinterBlockChainApi;
 import network.minter.blockchain.models.BCResult;
@@ -31,4 +58,43 @@ public void testGetBlockInfo() throws IOException {
 
         assertNotNull(response.body().result);
     }
+
+    @Test
+    public void testGetMinGas() throws IOException {
+        MinterBlockChainApi api = MinterBlockChainApi.createInstance("http://159.89.107.246:8841", true, null);
+
+        BlockChainBlockRepository repository = api.block();
+        Response<BCResult<BigInteger>> response = repository.getMinGasPrice().execute();
+
+        assertTrue(response.isSuccessful());
+        assertTrue(response.body().isOk());
+
+        assertNotNull(response.body().result);
+    }
+
+    @Test
+    public void testGetMaxGas() throws IOException {
+        MinterBlockChainApi api = MinterBlockChainApi.createInstance("http://159.89.107.246:8841", true, null);
+
+        BlockChainBlockRepository repository = api.block();
+        Response<BCResult<BigInteger>> response = repository.getMaxGasPrice().execute();
+
+        assertTrue(response.isSuccessful());
+        assertTrue(response.body().isOk());
+
+        assertNotNull(response.body().result);
+    }
+
+    @Test
+    public void testGetMaxGasByHeight() throws IOException {
+        MinterBlockChainApi api = MinterBlockChainApi.createInstance("http://159.89.107.246:8841", true, null);
+
+        BlockChainBlockRepository repository = api.block();
+        Response<BCResult<BigInteger>> response = repository.getMaxGasPrice(10).execute();
+
+        assertTrue(response.isSuccessful());
+        assertTrue(response.body().isOk());
+
+        assertNotNull(response.body().result);
+    }
 }