refactoring, added transactions from new proposals, tests, added RxJava3

Author: edwardstock

RELEASE.md

@@ -1,5 +1,11 @@
 # Release notes
 
+## 1.0.0
+ - **BREAKING CHANGES**
+ - Now communication with node api works with RxJava3
+ - Base API response now in root of json, so BcResult<T> is just NodeResult and each response object inherits this class
+
+
 ## 0.13.1
  - Ability to reset transaction data and payload in external transaction builder
 

build.gradle

@@ -32,7 +32,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
     }
 }
 
@@ -57,14 +57,14 @@ apply plugin: 'com.jfrog.bintray'
 
 
 group = 'network.minter.android'
-version = '0.13.1'
+version = '1.0.0'
 
 ext {
     minterMinSdk = 16
     minterMaxSdk = 29
     minterBuildTools = "29.0.3"
     minterLibSupport = "28.0.0"
-    minterCoreVers = "0.7.1"
+    minterCoreVers = "1.0.0"
 
 
     buildArtifactName = project.name
@@ -187,25 +187,28 @@ dependencies {
 
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-    // network
-    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'
+    // network and rxjava
+    implementation 'com.squareup.okhttp3:okhttp:4.8.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.8.1'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'io.reactivex.rxjava3:rxjava:3.0.5'
+    implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
 
-    implementation 'org.parceler:parceler-api:1.1.12'
-    annotationProcessor 'org.parceler:parceler:1.1.12'
+    implementation 'org.parceler:parceler-api:1.1.13'
+    annotationProcessor 'org.parceler:parceler:1.1.13'
 
     // stuff
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.google.guava:guava:26.0-android'
+    implementation 'com.annimon:stream:1.2.1'
 
     // testing
     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.8.1'
+    androidTestImplementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     androidTestImplementation 'com.google.code.gson:gson:2.8.6'
 }
 

proguard-rules.pro

@@ -3,7 +3,7 @@
 -keep public class network.minter.blockchain.** { *; }
 -keep public enum network.minter.blockchain.** { *; }
 -keepclassmembers enum * { *; }
--keep public class network.minter.blockchain.MinterBlockChainApi { *; }
+-keep public class network.minter.blockchain.MinterBlockChainSDK { *; }
 
 
 # Parceler library

src/main/java/network/minter/blockchain/MinterBlockChainApi.java renamed to src/main/java/network/minter/blockchain/MinterBlockChainSDK.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>
  *
@@ -32,13 +32,14 @@
 
 import javax.annotation.Nonnull;
 
-import network.minter.blockchain.repo.BlockChainAccountRepository;
-import network.minter.blockchain.repo.BlockChainBlockRepository;
-import network.minter.blockchain.repo.BlockChainCandidateRepository;
-import network.minter.blockchain.repo.BlockChainCoinRepository;
-import network.minter.blockchain.repo.BlockChainEventRepository;
-import network.minter.blockchain.repo.BlockChainStatusRepository;
-import network.minter.blockchain.repo.BlockChainTransactionRepository;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import network.minter.blockchain.repo.NodeAddressRepository;
+import network.minter.blockchain.repo.NodeBlockRepository;
+import network.minter.blockchain.repo.NodeCoinRepository;
+import network.minter.blockchain.repo.NodeEventRepository;
+import network.minter.blockchain.repo.NodeStatusRepository;
+import network.minter.blockchain.repo.NodeTransactionRepository;
+import network.minter.blockchain.repo.NodeValidatorRepository;
 import network.minter.core.crypto.BytesData;
 import network.minter.core.crypto.MinterAddress;
 import network.minter.core.crypto.MinterHash;
@@ -49,35 +50,57 @@
 import network.minter.core.internal.api.converters.MinterAddressJsonConverter;
 import network.minter.core.internal.api.converters.MinterHashJsonConverter;
 import network.minter.core.internal.api.converters.MinterPublicKeyJsonConverter;
+import network.minter.core.internal.common.Acceptor;
 import network.minter.core.internal.log.Mint;
 import network.minter.core.internal.log.TimberLogger;
+import okhttp3.Request;
+import okhttp3.Response;
 import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
 
 /**
  * minter-android-blockchain. 2018
  * @author Eduard Maximovich <edward.vstock@gmail.com>
  */
-public class MinterBlockChainApi {
+public class MinterBlockChainSDK {
     private final static String BASE_NODE_URL = BuildConfig.BASE_NODE_URL;
-    private static MinterBlockChainApi INSTANCE;
+    private static MinterBlockChainSDK INSTANCE;
     private final ApiService.Builder mApiService;
-    private BlockChainAccountRepository mAccountRepository;
-    private BlockChainCoinRepository mCoinRepository;
-    private BlockChainTransactionRepository mTransactionRepository;
-    private BlockChainBlockRepository mBlockRepository;
-    private BlockChainCandidateRepository mBlockChainCandidateRepository;
-    private BlockChainStatusRepository mStatusRepository;
-    private BlockChainEventRepository mEventRepository;
-
-    private MinterBlockChainApi() {
+    private NodeAddressRepository mAccountRepository;
+    private NodeCoinRepository mCoinRepository;
+    private NodeTransactionRepository mTransactionRepository;
+    private NodeBlockRepository mBlockRepository;
+    private NodeValidatorRepository mCandidateRepository;
+    private NodeStatusRepository mStatusRepository;
+    private NodeEventRepository mEventRepository;
+
+    private MinterBlockChainSDK() {
         this(BASE_NODE_URL);
     }
 
-    private MinterBlockChainApi(@Nonnull String baseNodeApiUrl) {
+    private MinterBlockChainSDK(@Nonnull String baseNodeApiUrl) {
         mApiService = new ApiService.Builder(baseNodeApiUrl, getGsonBuilder());
+        mApiService.setRetrofitClientConfig(new Acceptor<Retrofit.Builder>() {
+            @Override
+            public void accept(Retrofit.Builder builder) {
+                builder.addCallAdapterFactory(RxJava3CallAdapterFactory.createWithScheduler(Schedulers.io()));
+            }
+        });
         mApiService.addHeader("Content-Type", "application/json");
         mApiService.addHeader("X-Minter-Client-Name", "MinterAndroid");
         mApiService.addHeader("X-Minter-Client-Version", BuildConfig.VERSION_NAME);
+        mApiService.addHttpInterceptor(chain -> {
+            Request request = chain.request();
+            Response response = chain.proceed(request);
+            if (response.body() != null && response.body().contentType() != null && response.body().contentType().toString().toLowerCase().equals("application/json")) {
+                Response.Builder b = response.newBuilder();
+                b.code(200);
+
+                return b.build();
+            }
+            return response;
+        });
     }
 
     public static void initialize() {
@@ -91,11 +114,11 @@ public static void initialize() {
      * @param logger
      * @return
      */
-    public static MinterBlockChainApi createInstance(String baseNodeApiUrl, boolean debug, Mint.Leaf logger) {
+    public static MinterBlockChainSDK createInstance(String baseNodeApiUrl, boolean debug, Mint.Leaf logger) {
         if (debug) {
             Mint.brew(logger);
         }
-        MinterBlockChainApi api = new MinterBlockChainApi(baseNodeApiUrl);
+        MinterBlockChainSDK api = new MinterBlockChainSDK(baseNodeApiUrl);
         api.mApiService.setDebug(debug);
         if (debug) {
             api.mApiService.setDebugRequestLevel(HttpLoggingInterceptor.Level.BODY);
@@ -112,7 +135,7 @@ public static void initialize(String baseNodeApiUrl, boolean debug, Mint.Leaf lo
         if (debug) {
             Mint.brew(logger);
         }
-        INSTANCE = new MinterBlockChainApi(baseNodeApiUrl);
+        INSTANCE = new MinterBlockChainSDK(baseNodeApiUrl);
         INSTANCE.mApiService.setDebug(debug);
         if (debug) {
             INSTANCE.mApiService.setDebugRequestLevel(HttpLoggingInterceptor.Level.BODY);
@@ -127,7 +150,7 @@ public static void initialize(String baseNodeApiUrl) {
         initialize(baseNodeApiUrl, false, new TimberLogger());
     }
 
-    public static MinterBlockChainApi getInstance() {
+    public static MinterBlockChainSDK getInstance() {
         if (INSTANCE == null) {
             throw new IllegalStateException("You forget to call MinterBlockchainApi.initialize");
         }
@@ -149,57 +172,57 @@ public GsonBuilder getGsonBuilder() {
         return out;
     }
 
-    public BlockChainEventRepository event() {
+    public NodeEventRepository event() {
         if (mEventRepository == null) {
-            mEventRepository = new BlockChainEventRepository(mApiService);
+            mEventRepository = new NodeEventRepository(mApiService);
         }
 
         return mEventRepository;
     }
 
-    public BlockChainStatusRepository status() {
+    public NodeStatusRepository status() {
         if (mStatusRepository == null) {
-            mStatusRepository = new BlockChainStatusRepository(mApiService);
+            mStatusRepository = new NodeStatusRepository(mApiService);
         }
 
         return mStatusRepository;
     }
 
-    public BlockChainCandidateRepository candidate() {
-        if (mBlockChainCandidateRepository == null) {
-            mBlockChainCandidateRepository = new BlockChainCandidateRepository(mApiService);
+    public NodeValidatorRepository validator() {
+        if (mCandidateRepository == null) {
+            mCandidateRepository = new NodeValidatorRepository(mApiService);
         }
 
-        return mBlockChainCandidateRepository;
+        return mCandidateRepository;
     }
 
-    public BlockChainBlockRepository block() {
+    public NodeBlockRepository block() {
         if (mBlockRepository == null) {
-            mBlockRepository = new BlockChainBlockRepository(mApiService);
+            mBlockRepository = new NodeBlockRepository(mApiService);
         }
 
         return mBlockRepository;
     }
 
-    public BlockChainAccountRepository account() {
+    public NodeAddressRepository account() {
         if (mAccountRepository == null) {
-            mAccountRepository = new BlockChainAccountRepository(mApiService);
+            mAccountRepository = new NodeAddressRepository(mApiService);
         }
 
         return mAccountRepository;
     }
 
-    public BlockChainTransactionRepository transactions() {
+    public NodeTransactionRepository transactions() {
         if (mTransactionRepository == null) {
-            mTransactionRepository = new BlockChainTransactionRepository(mApiService);
+            mTransactionRepository = new NodeTransactionRepository(mApiService);
         }
 
         return mTransactionRepository;
     }
 
-    public BlockChainCoinRepository coin() {
+    public NodeCoinRepository coin() {
         if (mCoinRepository == null) {
-            mCoinRepository = new BlockChainCoinRepository(mApiService);
+            mCoinRepository = new NodeCoinRepository(mApiService);
         }
 
         return mCoinRepository;

src/main/java/network/minter/blockchain/api/BlockChainEventEndpoint.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>
  *
@@ -26,34 +26,50 @@
 
 package network.minter.blockchain.api;
 
-import network.minter.blockchain.models.BCResult;
-import network.minter.blockchain.models.Balance;
-import network.minter.blockchain.models.TransactionSendResult;
-import retrofit2.Call;
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Observable;
+import network.minter.blockchain.models.AddressInfo;
+import network.minter.blockchain.models.AddressInfoList;
 import retrofit2.http.GET;
+import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 /**
  * minter-android-blockchain. 2018
  * @author Eduard Maximovich <edward.vstock@gmail.com>
  */
-public interface BlockChainAccountEndpoint {
+public interface NodeAddressEndpoint {
 
     /**
      * Returns current balance of an account
      * @param address Address of an account
      * @return
      */
-    @GET("/address")
-    Call<BCResult<Balance>> getBalance(@Query("address") String address);
+    @GET("/address/{address}")
+    Observable<AddressInfo> getAddressInfo(@Path("address") String address);
 
     /**
-     * Broadcasts transaction onto Minter network
-     * @param data
+     * Returns current balance of an account
+     * @param address Address of an account
      * @return
      */
-    @GET("/send_transaction")
-    Call<BCResult<TransactionSendResult>> sendTransaction(@Query("tx") String signedTxHash);
+    @GET("/address/{address}")
+    Observable<AddressInfo> getAddressInfo(
+            @Path("address") String address,
+            @Query("height") String blockNumber,
+            @Query("delegated") String includeDelegatedStakes
+    );
+
+    @GET("/addresses")
+    Observable<AddressInfoList> getAddressesInfo(@Query("addresses") List<String> addresses);
+
+    @GET("/addresses")
+    Observable<AddressInfoList> getAddressesInfo(
+            @Query("addresses") List<String> addresses,
+            @Query("height") String blockNumber,
+            @Query("delegated") String includeDelegatedStakes
+    );
 
 
 }