optimizations

Author: EbenezerGH

README.md

@@ -9,6 +9,8 @@ etherscan android api is an android wrapper for the [etherscan api](https://ethe
 
 There are only a few [features](https://github.com/EbenezerGH/hello_etherscan/issues) left to add, however this version is completely safe to use.
 
+##### Note: For RxJava Implementation use master branch [etherscan-coroutines](https://github.com/EbenezerGH/etherscan-android-api
+
 ## Getting Started
 
 Add JitPack to your root build.gradle at the end of repositories
@@ -27,7 +29,7 @@ Add the dependency
 
 ```
 	dependencies {
-	        implementation 'com.github.EbenezerGH:etherscan-android-api:v1.0.3'
+	        implementation 'com.github.EbenezerGH:etherscan-android-api:v1.5.0'
 	}
 ```
 
@@ -39,7 +41,7 @@ ApiKey.takeOff.setApiKey("1I7CRNU2QIU253UBPFVB5UV2C2PBDURAIYZ")
 
 Create an Instance of one of the reactive singles and access values by specifying thread and subscribing. [see [example implementation](https://github.com/EbenezerGH/etherscan-android-api/blob/master/etherscan-sample/src/main/java/jfyg/etherscan/helloetherescan/SampleActivity.kt)]
 
-Currently Available: ``[accounts, contracts, transactions, blocks, stat]``
+Currently Available: ``[accountsApi, contractsApi, transactionsApi, blocksApi, statApi]``
 
 Coming Soon: ``[eventLogs, geth, websockets, tokens]``
 

etherscan-sample/build.gradle

@@ -25,7 +25,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-
     /**
      Because RxAndroid releases are few and far between, it is recommended you also
      explicitly depend on RxJava's latest version for bug fixes and new features.
@@ -39,7 +38,7 @@ dependencies {
     // google
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     implementation project(':etherscanapi')
 }

etherscan-sample/src/main/java/jfyg/etherscan/helloetherescan/SampleActivity.kt

@@ -5,11 +5,11 @@ import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.subscribeBy
-import jfyg.data.account.Accounts
-import jfyg.data.block.Blocks
-import jfyg.data.contract.Contracts
-import jfyg.data.stat.Stats
-import jfyg.data.transaction.Transactions
+import jfyg.data.account.AccountsApi
+import jfyg.data.block.BlocksApi
+import jfyg.data.contract.ContractsApi
+import jfyg.data.stat.StatsApi
+import jfyg.data.transaction.TransactionsApi
 import kotlinx.android.synthetic.main.activity_main.*
 
 
@@ -22,11 +22,11 @@ class SampleActivity : AppCompatActivity() {
         setSupportActionBar(toolbar)
 
         //************************************************  Used To Test Singles returned from etherscanapi Module
-        val stat = Stats()
-        val account = Accounts()
-        val contract = Contracts()
-        val tx = Transactions()
-        val blocks = Blocks()
+        val stat = StatsApi()
+        val account = AccountsApi()
+        val contract = ContractsApi()
+        val tx = TransactionsApi()
+        val blocks = BlocksApi()
 
 
         fab.setOnClickListener {

etherscanapi/build.gradle

@@ -15,7 +15,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
@@ -30,7 +30,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     // kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$project.kotlin_version"
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.10'
 
     // rx
     implementation "io.reactivex.rxjava2:rxkotlin:$project.reactivex_rxjava2_rxkotlin_version"

etherscanapi/src/main/java/jfyg/data/Balance.kt

@@ -1,5 +1,5 @@
 package jfyg.data
 
-data class Balance(val account: String? = null,
+data class Balance(val account: String,
 
-                   val balance: String? = null)
+                   val balance: String)

etherscanapi/src/main/java/jfyg/data/BlockAccount.kt

@@ -1,7 +1,7 @@
 package jfyg.data
 
-data class BlockAccount(val blockNumber: String? = null,
+data class BlockAccount(val blockNumber: String,
 
-                        val timeStamp: String? = null,
+                        val timeStamp: String,
 
-                        val blockReward: String? = null)
+                        val blockReward: String)

etherscanapi/src/main/java/jfyg/data/BlockMined.kt

@@ -1,11 +1,11 @@
 package jfyg.data
 
-data class BlockMined(val blockNumber: String? = null,
+data class BlockMined(val blockNumber: String,
 
-                      val timeStamp: String? = null,
+                      val timeStamp: String,
 
-                      val blockMiner: String? = null,
+                      val blockMiner: String,
 
-                      val blockReward: String? = null,
+                      val blockReward: String,
 
                       val uncles: List<Uncle> = emptyList())

etherscanapi/src/main/java/jfyg/data/ERC20Token.kt

@@ -2,42 +2,42 @@ package jfyg.data
 
 import com.google.gson.annotations.SerializedName
 
-data class ERC20Token(val blockNumber: String? = null,
+data class ERC20Token(val blockNumber: String,
 
-                      val timeStamp: String? = null,
+                      val timeStamp: String,
 
-                      val hash: String? = null,
+                      val hash: String,
 
-                      val nonce: String? = null,
+                      val nonce: String,
 
-                      val blockHash: String? = null,
+                      val blockHash: String,
 
                       @SerializedName("from")
-                      val transactionFrom: String? = null,
+                      val transactionFrom: String,
 
-                      val contractAddress: String? = null,
+                      val contractAddress: String,
 
                       @SerializedName("to")
-                      val transactionTo: String? = null,
+                      val transactionTo: String,
 
-                      val value: String? = null,
+                      val value: String,
 
-                      val tokenName: String? = null,
+                      val tokenName: String,
 
-                      val tokenSymbol: String? = null,
+                      val tokenSymbol: String,
 
-                      val tokenDecimal: String? = null,
+                      val tokenDecimal: String,
 
-                      val transactionIndex: String? = null,
+                      val transactionIndex: String,
 
-                      val gas: String? = null,
+                      val gas: String,
 
-                      val gasPrice: String? = null,
+                      val gasPrice: String,
 
-                      val gasUsed: String? = null,
+                      val gasUsed: String,
 
-                      val cumulativeGasUsed: String? = null,
+                      val cumulativeGasUsed: String,
 
-                      val input: String? = null,
+                      val input: String,
 
-                      val confirmations: String? = null)
+                      val confirmations: String)

etherscanapi/src/main/java/jfyg/data/StatPrice.kt

@@ -3,14 +3,14 @@ package jfyg.data
 import com.google.gson.annotations.SerializedName
 
 data class StatPrice(@SerializedName("ethbtc")
-                     val ethBtc: String? = null,
+                     val ethBtc: String,
 
                      @SerializedName("ethbtc_timestamp")
-                     val ethBtcTimestamp: String? = null,
+                     val ethBtcTimestamp: String,
 
                      @SerializedName("ethusd")
-                     val ethUsd: String? = null,
+                     val ethUsd: String,
 
                      @SerializedName("ethusd_timestamp")
-                     val ethUsdTimestamp: String? = null
+                     val ethUsdTimestamp: String
 )

etherscanapi/src/main/java/jfyg/data/Tx.kt

@@ -2,41 +2,41 @@ package jfyg.data
 
 import com.google.gson.annotations.SerializedName
 
-data class Tx(val blockNumber: String? = null,
+data class Tx(val blockNumber: String,
 
-              val timeStamp: String? = null,
+              val timeStamp: String,
 
-              val hash: String? = null,
+              val hash: String,
 
-              val nonce: String? = null,
+              val nonce: String,
 
-              val blockHash: String? = null,
+              val blockHash: String,
 
-              val transactionIndex: String? = null,
+              val transactionIndex: String,
 
               @SerializedName("from")
-              val transactionFrom: String? = null,
+              val transactionFrom: String,
 
               @SerializedName("to")
-              val transactionTo: String? = null,
+              val transactionTo: String,
 
-              val value: String? = null,
+              val value: String,
 
-              val gas: String? = null,
+              val gas: String,
 
-              val gasPrice: String? = null,
+              val gasPrice: String,
 
-              val isError: String? = null,
+              val isError: String,
 
               @SerializedName("txreceipt_status")
-              val receiptStatus: String? = null,
+              val receiptStatus: String,
 
-              val input: String? = null,
+              val input: String,
 
-              val contractAddress: String? = null,
+              val contractAddress: String,
 
-              val cumulativeGasUsed: String? = null,
+              val cumulativeGasUsed: String,
 
-              val gasUsed: String? = null,
+              val gasUsed: String,
 
-              val confirmations: String? = null)
+              val confirmations: String)

etherscanapi/src/main/java/jfyg/data/TxExecutionStatus.kt

@@ -1,5 +1,6 @@
 package jfyg.data
 
-data class TxExecutionStatus(val isError: String? = null,
+data class TxExecutionStatus(val isError: String,
 
-                             val errDescription: String? = null)
+                             val errDescription: String
+)

etherscanapi/src/main/java/jfyg/data/TxReceiptStatus.kt

@@ -1,3 +1,3 @@
 package jfyg.data
 
-data class TxReceiptStatus(val status: String? = null)
+data class TxReceiptStatus(val status: String)

etherscanapi/src/main/java/jfyg/data/TxsInternal.kt

@@ -2,32 +2,32 @@ package jfyg.data
 
 import com.google.gson.annotations.SerializedName
 
-data class TxsInternal(val blockNumber: String? = null,
+data class TxsInternal(val blockNumber: String,
 
-                       val timeStamp: String? = null,
+                       val timeStamp: String,
 
-                       val hash: String? = null,
+                       val hash: String,
 
                        @SerializedName("from")
-                       val transactionFrom: String? = null,
+                       val transactionFrom: String,
 
                        @SerializedName("to")
-                       val transactionTo: String? = null,
+                       val transactionTo: String,
 
-                       val value: String? = null,
+                       val value: String,
 
-                       val contactAddress: String? = null,
+                       val contactAddress: String,
 
-                       val input: String? = null,
+                       val input: String,
 
-                       val type: String? = null,
+                       val type: String,
 
-                       val gas: String? = null,
+                       val gas: String,
 
-                       val gasUsed: String? = null,
+                       val gasUsed: String,
 
-                       val traceId: String? = null,
+                       val traceId: String,
 
-                       val isError: String? = null,
+                       val isError: String,
 
-                       val errCode: String? = null)
+                       val errCode: String)

etherscanapi/src/main/java/jfyg/data/Uncle.kt

@@ -2,9 +2,9 @@ package jfyg.data
 
 import com.google.gson.annotations.SerializedName
 
-data class Uncle(val miner: String? = null,
+data class Uncle(val miner: String,
 
-                 val unclePosition: String? = null,
+                 val unclePosition: String,
 
                  @SerializedName("blockreward")
-                 val blockReward: String? = null)
+                 val blockReward: String)

etherscanapi/src/main/java/jfyg/data/account/Accounts.kt renamed to etherscanapi/src/main/java/jfyg/data/account/AccountsApi.kt

@@ -12,7 +12,7 @@ import jfyg.utils.*
 /**
  * https://etherscan.io/apis#accounts
  */
-class Accounts : AccountsContract {
+class AccountsApi : AccountsContract {
 
     private val query = ApiQuery()
     private val genericNetworkQuery = query.accountBalance(

etherscanapi/src/main/java/jfyg/data/block/Blocks.kt renamed to etherscanapi/src/main/java/jfyg/data/block/BlocksApi.kt

@@ -10,7 +10,7 @@ import jfyg.utils.GET_BLOCK_REWARD
 /**
  * https://etherscan.io/apis#blocks
  */
-class Blocks : BlocksContract {
+class BlocksApi : BlocksContract {
     private val query = ApiQuery()
     private val genericNetworkQuery = query.blocksMined(
             BLOCK,

etherscanapi/src/main/java/jfyg/data/contract/Contracts.kt renamed to etherscanapi/src/main/java/jfyg/data/contract/ContractsApi.kt

@@ -10,7 +10,7 @@ import jfyg.utils.GET_ABI
  * Newly verified Contracts are synced to the API servers within 5 minutes or less
  * https://etherscan.io/apis#contracts
  */
-class Contracts : ContractsContract {
+class ContractsApi : ContractsContract {
 
     private val query = ApiQuery()
     private val abiQuery = query.contractABI(

etherscanapi/src/main/java/jfyg/data/stat/Stats.kt renamed to etherscanapi/src/main/java/jfyg/data/stat/StatsApi.kt

@@ -10,7 +10,7 @@ import jfyg.utils.STATS
 /**
  * https://etherscan.io/apis#stats
  */
-class Stats : StatsContract {
+class StatsApi : StatsContract {
 
     private val query = ApiQuery()
     private val supplyQuery = query.statSupply(STATS, ETH_SUPPLY)