Batch cancel orders function implementation added

Author: Tameki

zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/Contracts.kt

@@ -35,5 +35,7 @@ interface IZrxExchange {
 
     fun cancelOrder(order: SignedOrder): Flowable<String>
 
+    fun batchCancelOrders(order: List<SignedOrder>): Flowable<String>
+
     fun ordersInfo(orders: List<SignedOrder>): Flowable<List<OrderInfo>>
 }

…rxkit/contracts/StructFunctionEncoder.kt …/zrxkit/contracts/RawFunctionsEncoder.ktzrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/StructFunctionEncoder.kt renamed to zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/RawFunctionsEncoder.kt zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/StructFunctionEncoder.kt renamed to zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/RawFunctionsEncoder.kt

@@ -1,6 +1,6 @@
 package com.blocksdecoded.zrxkit.contracts
 
-import com.blocksdecoded.zrxkit.contracts.StructFunctionEncoder.ExchangeFunction.*
+import com.blocksdecoded.zrxkit.contracts.RawFunctionsEncoder.ExchangeFunction.*
 import com.blocksdecoded.zrxkit.model.OrderInfo
 import com.blocksdecoded.zrxkit.model.SignedOrder
 import com.blocksdecoded.zrxkit.utils.clearPrefix
@@ -16,7 +16,7 @@ import org.web3j.crypto.RawTransaction
 import org.web3j.tx.gas.ContractGasProvider
 import org.web3j.utils.Numeric
 
-internal class StructFunctionEncoder(
+internal class RawFunctionsEncoder(
     private val gasProvider: ContractGasProvider
 ) {
 
@@ -113,6 +113,17 @@ internal class StructFunctionEncoder(
             )
         )
 
+    fun getBatchCancelOrdersTransaction(nonce: BigInteger, orders: List<SignedOrder>): RawTransaction =
+        getRawTransaction(
+            BATCH_CANCEL_ORDERS,
+            nonce,
+            orders.first().exchangeAddress,
+            encodeFunction(
+                BATCH_CANCEL_ORDERS,
+                orders
+            )
+        )
+
     fun getFillOrderTransaction(nonce: BigInteger, order: SignedOrder, fillAmount: BigInteger): RawTransaction {
         val data = encodeFunction(
             FILL_ORDER,
@@ -179,6 +190,8 @@ internal class StructFunctionEncoder(
     ) {
         CANCEL_ORDER("cancelOrder($ORDER_SIGNATURE)"),
 
+        BATCH_CANCEL_ORDERS("batchCancelOrders($ORDER_SIGNATURE[])"),
+
         ORDERS_INFO(
             "getOrdersInfo($ORDER_SIGNATURE[])",
             "($ORDER_INFO_SIGNATURE[])"

zrxkit/src/main/java/com/blocksdecoded/zrxkit/contracts/ZrxExchangeWrapper.kt

@@ -22,7 +22,7 @@ internal class ZrxExchangeWrapper(
 ) : Contract(BINARY, contractAddress, Web3j.build(HttpService(providerUrl)), credentials, contractGasProvider),
     IZrxExchange {
 
-    private val functionEncoder = StructFunctionEncoder(gasProvider)
+    private val functionEncoder = RawFunctionsEncoder(gasProvider)
 
     //region Private
 
@@ -90,14 +90,6 @@ internal class ZrxExchangeWrapper(
         }
     }
 
-    override fun cancelOrder(order: SignedOrder): Flowable<String> {
-        return getNonce().flatMap {
-            val transaction = functionEncoder.getCancelOrderTransaction(it, order)
-
-            sendTransaction<String>(transaction)
-        }
-    }
-
     override fun ordersInfo(orders: List<SignedOrder>): Flowable<List<OrderInfo>> {
         val transaction = Transaction.createEthCallTransaction(
             credentials.address,
@@ -110,6 +102,22 @@ internal class ZrxExchangeWrapper(
             .map { functionEncoder.decodeOrdersInfo(it.value) }
     }
 
+    override fun cancelOrder(order: SignedOrder): Flowable<String> {
+        return getNonce().flatMap {
+            val transaction = functionEncoder.getCancelOrderTransaction(it, order)
+
+            sendTransaction<String>(transaction)
+        }
+    }
+
+    override fun batchCancelOrders(order: List<SignedOrder>): Flowable<String> {
+        return getNonce().flatMap {
+            val transaction = functionEncoder.getBatchCancelOrdersTransaction(it, order)
+
+            sendTransaction<String>(transaction)
+        }
+    }
+
     //endregion
 
     companion object {