Merge pull request #162 from liquality/eth-swap-block-scanning

Swap: add startBlock parameter to find functions
liquality · Mar 28, 2019 · 1bbae33 · 1bbae33
2 parents 7b45120 + 728ce2c
commit 1bbae33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Client.js b/src/Client.js
@@ -372,10 +372,11 @@ export default class Client {
    * @param {!string} refundAddress - Refund address
    * @param {!string} secretHash - Secret hash
    * @param {!string} expiration - Expiration time
+   * @param {number} [startBlock] - The block number to start finding from (Optional)
    * @return {Promise<string>} Resolves with a transaction identifier.
    */
-  async findInitiateSwapTransaction (value, recipientAddress, refundAddress, secretHash, expiration) {
-    return this.getMethod('findInitiateSwapTransaction')(value, recipientAddress, refundAddress, secretHash, expiration)
+  async findInitiateSwapTransaction (value, recipientAddress, refundAddress, secretHash, expiration, startBlock = null) {
+    return this.getMethod('findInitiateSwapTransaction')(value, recipientAddress, refundAddress, secretHash, expiration, startBlock)
   }
 
   /**
@@ -385,10 +386,11 @@ export default class Client {
    * @param {!string} refundAddress - Refund address
    * @param {!string} secretHash - Secret hash
    * @param {!string} expiration - Expiration time
+   * @param {number} [startBlock] - The block number to start finding from (Optional)
    * @return {Promise<string>} Resolves with a transaction identifier.
    */
-  async findClaimSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration) {
-    return this.getMethod('findClaimSwapTransaction')(initiationTxHash, recipientAddress, refundAddress, secretHash, expiration)
+  async findClaimSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock = null) {
+    return this.getMethod('findClaimSwapTransaction')(initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock)
   }
 
   /**

diff --git a/src/providers/ethereum/EthereumSwapProvider.js b/src/providers/ethereum/EthereumSwapProvider.js
@@ -103,8 +103,8 @@ export default class EthereumSwapProvider extends Provider {
     return transactionMatchesSwapParams && initiationTransactionReceipt.status === '1'
   }
 
-  async findInitiateSwapTransaction (value, recipientAddress, refundAddress, secretHash, expiration) {
-    let blockNumber = await this.getMethod('getBlockHeight')()
+  async findInitiateSwapTransaction (value, recipientAddress, refundAddress, secretHash, expiration, startBlock) {
+    let blockNumber = startBlock || await this.getMethod('getBlockHeight')()
     let initiateSwapTransaction = null
     while (!initiateSwapTransaction) {
       const block = await this.getMethod('getBlockByNumber')(blockNumber, true)
@@ -119,8 +119,8 @@ export default class EthereumSwapProvider extends Provider {
     return initiateSwapTransaction
   }
 
-  async findClaimSwapTransaction (initiationTxHash) {
-    let blockNumber = await this.getMethod('getBlockHeight')()
+  async findClaimSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock) {
+    let blockNumber = startBlock || await this.getMethod('getBlockHeight')()
     let claimSwapTransaction = null
     while (!claimSwapTransaction) {
       const initiationTransaction = await this.getMethod('getTransactionReceipt')(initiationTxHash)