GetOrders function implementation added

GetOrders and Orderbook request limit parameter added

Author: Tameki

app/src/main/java/com/fridaytech/zrxkit/sample/MainViewModel.kt

@@ -89,7 +89,7 @@ class MainViewModel: ViewModel() {
             listOf(ZrxKit.assetItemForAddress(tokenAddress) to ZrxKit.assetItemForAddress(wethAddress)),
             listOf(feeRecipient),
             zrxKitNetworkType.exchangeAddress,
-            RelayerConfig("http://relayer.ropsten.fridayte.ch", "", "v2")
+            RelayerConfig("https://relayer.ropsten.fridayte.ch", "", "v2")
         )
     )
 

zrxkit/src/main/java/com/fridaytech/zrxkit/relayer/IRelayerManager.kt

@@ -2,6 +2,7 @@ package com.fridaytech.zrxkit.relayer
 
 import com.fridaytech.zrxkit.model.SignedOrder
 import com.fridaytech.zrxkit.relayer.model.AssetPair
+import com.fridaytech.zrxkit.relayer.model.OrderBook
 import com.fridaytech.zrxkit.relayer.model.Relayer
 import com.fridaytech.zrxkit.relayer.remote.OrderBookResponse
 import io.reactivex.Flowable
@@ -11,9 +12,18 @@ interface IRelayerManager {
 
     fun getAssetPairs(relayerId: Int): Flowable<List<AssetPair>>
 
-    fun getOrderbook(relayerId: Int, base: String, quote: String): Flowable<OrderBookResponse>
+    fun getOrderbook(
+        relayerId: Int,
+        base: String,
+        quote: String,
+        limit: Int = 100
+    ): Flowable<OrderBookResponse>
 
     fun postOrder(relayerId: Int, order: SignedOrder): Flowable<Unit>
 
-    fun getOrders(relayerId: Int, makerAddress: String, makerAsset: String, takerAsset: String): Flowable<OrderBookResponse>
+    fun getOrders(
+        relayerId: Int,
+        makerAddress: String? = null,
+        limit: Int = 100
+    ): Flowable<OrderBook>
 }

zrxkit/src/main/java/com/fridaytech/zrxkit/relayer/RelayerManager.kt

@@ -3,10 +3,12 @@ package com.fridaytech.zrxkit.relayer
 import com.fridaytech.zrxkit.ZrxKit
 import com.fridaytech.zrxkit.model.SignedOrder
 import com.fridaytech.zrxkit.relayer.model.AssetPair
+import com.fridaytech.zrxkit.relayer.model.OrderBook
 import com.fridaytech.zrxkit.relayer.model.Relayer
 import com.fridaytech.zrxkit.relayer.remote.OrderBookResponse
 import com.fridaytech.zrxkit.relayer.remote.RelayerApiClient
 import io.reactivex.Flowable
+import java.util.*
 
 class RelayerManager(
     override val availableRelayers: List<Relayer>,
@@ -17,18 +19,19 @@ class RelayerManager(
     override fun getAssetPairs(relayerId: Int): Flowable<List<AssetPair>> =
         relayerClients[relayerId].getAssets(networkId = networkType.id)
 
-    override fun getOrderbook(relayerId: Int, base: String, quote: String): Flowable<OrderBookResponse> =
-        relayerClients[relayerId].getOrderbook(base, quote, networkId = networkType.id)
+    override fun getOrderbook(relayerId: Int, base: String, quote: String, limit: Int): Flowable<OrderBookResponse> =
+        relayerClients[relayerId].getOrderbook(base, quote, limit, networkId = networkType.id)
 
     override fun postOrder(relayerId: Int, order: SignedOrder): Flowable<Unit> =
         relayerClients[relayerId].postOrder(order, networkId = networkType.id)
 
     override fun getOrders(
         relayerId: Int,
-        makerAddress: String,
-        makerAsset: String,
-        takerAsset: String
-    ): Flowable<OrderBookResponse> {
-        TODO("Get orders not implemented")
-    }
+        makerAddress: String?,
+        limit: Int
+    ): Flowable<OrderBook> = relayerClients[relayerId].getOrders(
+        makerAddress?.toLowerCase(Locale.US),
+        limit,
+        networkId = networkType.id
+    )
 }

zrxkit/src/main/java/com/fridaytech/zrxkit/relayer/remote/RelayerApiClient.kt

@@ -43,11 +43,20 @@ class RelayerApiClient(relayerConfig: RelayerConfig) {
         client.getFeeRecipients("$prefix/fee_recipients", networkId)
             .map { it.records }.toFlowable()
 
-    fun getOrderbook(base: String, quote: String, networkId: Int = 3): Flowable<OrderBookResponse> =
+    fun getOrderbook(base: String, quote: String, limit: Int = 100, networkId: Int = 3): Flowable<OrderBookResponse> =
         client.getOrderBook(
             "$prefix/orderbook",
             base,
             quote,
+            limit,
+            networkId
+        ).toFlowable()
+
+    fun getOrders(makerAddress: String?, limit: Int = 100, networkId: Int = 3): Flowable<OrderBook> =
+        client.getOrders(
+            "$prefix/orders",
+            makerAddress,
+            limit,
             networkId
         ).toFlowable()
 
@@ -56,7 +65,7 @@ class RelayerApiClient(relayerConfig: RelayerConfig) {
             "$prefix/asset_pairs",
             limit,
             networkId
-        ).toFlowable().map { it.records }
+        ).map { it.records }.toFlowable()
 
     fun postOrder(order: SignedOrder, networkId: Int = 3): Flowable<Unit> = client.postOrder(
         "$prefix/order",
@@ -65,11 +74,20 @@ class RelayerApiClient(relayerConfig: RelayerConfig) {
     ).toFlowable()
 
     private interface RelayerNetworkClient {
+        @GET
+        fun getOrders(
+            @Url url: String,
+            @Query("makerAddress") makerAddress: String?,
+            @Query("perPage") limit: Int?,
+            @Query("networkId") int: Int
+        ): Single<OrderBook>
+
         @GET
         fun getOrderBook(
             @Url url: String,
             @Query("baseAssetData") baseAsset: String,
             @Query("quoteAssetData") quoteAsset: String,
+            @Query("perPage") limit: Int,
             @Query("networkId") int: Int
         ): Single<OrderBookResponse>