Swap find functions - find on startBlock with optimisation

packages/bitcoin-swap-provider/lib/BitcoinSwapProvider.js

@@ -10,9 +10,6 @@ import networks from '@liquality/bitcoin-networks'
 import { version } from '../package.json'
 
 export default class BitcoinSwapProvider extends Provider {
-  // TODO: have a generate InitSwap and generate RecipSwap
-  // InitSwap should use checkSequenceVerify instead of checkLockTimeVerify
-
   constructor (chain = { network: networks.bitcoin }, mode = 'p2wsh') {
     super()
     this._network = chain.network
@@ -201,31 +198,36 @@ export default class BitcoinSwapProvider extends Provider {
     return this.doesTransactionMatchSwapParams(initiationTransaction, value, recipientAddress, refundAddress, secretHash, expiration)
   }
 
-  async findSwapTransaction (recipientAddress, refundAddress, secretHash, expiration, predicate) {
-    let blockNumber = await this.getMethod('getBlockHeight')() // TODO: Are mempool TXs possible?
+  async findSwapTransaction (recipientAddress, refundAddress, secretHash, expiration, startBlock, predicate) {
+    let blockNumber = startBlock || await this.getMethod('getBlockHeight')() // TODO: Are mempool TXs possible?
     let swapTransaction = null
+    let arrivedAtTip = false
     while (!swapTransaction) {
       let block
       try {
         block = await this.getMethod('getBlockByNumber')(blockNumber, true)
-      } catch (e) { }
+      } catch (e) {
+        arrivedAtTip = true
+      }
       if (block) {
         swapTransaction = block.transactions.find(predicate)
         blockNumber++
       }
-      await sleep(5000)
+      if (arrivedAtTip) {
+        await sleep(5000)
+      }
     }
     return swapTransaction
   }
 
-  async findInitiateSwapTransaction (value, recipientAddress, refundAddress, secretHash, expiration) {
-    return this.findSwapTransaction(recipientAddress, refundAddress, secretHash, expiration,
+  async findInitiateSwapTransaction (value, recipientAddress, refundAddress, secretHash, expiration, startBlock) {
+    return this.findSwapTransaction(recipientAddress, refundAddress, secretHash, expiration, startBlock,
       tx => this.doesTransactionMatchSwapParams(tx, value, recipientAddress, refundAddress, secretHash, expiration)
     )
   }
 
-  async findClaimSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration) {
-    const claimSwapTransaction = await this.findSwapTransaction(recipientAddress, refundAddress, secretHash, expiration,
+  async findClaimSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock) {
+    const claimSwapTransaction = await this.findSwapTransaction(recipientAddress, refundAddress, secretHash, expiration, startBlock,
       tx => tx._raw.vout.find(vout => vout.scriptPubKey.addresses && vout.scriptPubKey.addresses.includes(recipientAddress))
     )
 
@@ -235,8 +237,8 @@ export default class BitcoinSwapProvider extends Provider {
     }
   }
 
-  async findRefundSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration) {
-    const refundSwapTransaction = await this.findSwapTransaction(recipientAddress, refundAddress, secretHash, expiration,
+  async findRefundSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock) {
+    const refundSwapTransaction = await this.findSwapTransaction(recipientAddress, refundAddress, secretHash, expiration, startBlock,
       tx => tx._raw.vout.find(vout => vout.scriptPubKey.addresses && vout.scriptPubKey.addresses.includes(refundAddress))
     )
     return refundSwapTransaction

packages/client/lib/Swap.js

@@ -36,6 +36,25 @@ export default class Swap {
     return this.client.getMethod('findClaimSwapTransaction')(initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock)
   }
 
+  /**
+   * Refund the swap
+   * @param {!string} initiationTxHash - The transaction hash of the swap initiation.
+   * @param {!string} recipientAddress - Recepient address for the swap in hex.
+   * @param {!string} refundAddress - Refund address for the swap in hex.
+   * @param {!string} secretHash - Secret hash for the swap in hex.
+   * @param {!number} expiration - Expiration time for the swap.
+   * @param {number} [startBlock] - The block number to start finding from (Optional)
+   * @return {Promise<string, TypeError>} Resolves with refund swap transaction hash.
+   *  Rejects with InvalidProviderResponseError if provider's response is invalid.
+   */
+  async findRefundSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock = null) {
+    if (!(/^[A-Fa-f0-9]+$/.test(initiationTxHash))) {
+      throw new TypeError('Initiation transaction hash should be a valid hex string')
+    }
+
+    return this.client.getMethod('findRefundSwapTransaction')(initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock)
+  }
+
   /**
    * Generate a secret.
    * @param {!string} message - Message to be used for generating secret.
@@ -164,23 +183,4 @@ export default class Swap {
 
     return this.client.getMethod('refundSwap')(initiationTxHash, recipientAddress, refundAddress, secretHash, expiration)
   }
-
-  /**
-   * Refund the swap
-   * @param {!string} initiationTxHash - The transaction hash of the swap initiation.
-   * @param {!string} recipientAddress - Recepient address for the swap in hex.
-   * @param {!string} refundAddress - Refund address for the swap in hex.
-   * @param {!string} secretHash - Secret hash for the swap in hex.
-   * @param {!number} expiration - Expiration time for the swap.
-   * @param {!number} startBlock - The minimum block to start the search from
-   * @return {Promise<string, TypeError>} Resolves with refund swap transaction hash.
-   *  Rejects with InvalidProviderResponseError if provider's response is invalid.
-   */
-  async findRefundSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock) {
-    if (!(/^[A-Fa-f0-9]+$/.test(initiationTxHash))) {
-      throw new TypeError('Initiation transaction hash should be a valid hex string')
-    }
-
-    return this.client.getMethod('findRefundSwapTransaction')(initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock)
-  }
 }

packages/ethereum-swap-provider/lib/EthereumSwapProvider.js

@@ -115,9 +115,28 @@ export default class EthereumSwapProvider extends Provider {
     return transactionMatchesSwapParams && initiationTransactionReceipt.status === '1'
   }
 
+  async findSwapTransaction (value, recipientAddress, refundAddress, secretHash, expiration, startBlock, predicate) {
+    let blockNumber = startBlock || await this.getMethod('getBlockHeight')()
+    let swapTransaction = false
+
+    while (!swapTransaction) {
+      const block = await this.getMethod('getBlockByNumber')(blockNumber, true)
+
+      if (block) {
+        swapTransaction = block.transactions.find(predicate)
+        blockNumber++
+      }
+
+      await sleep(5000)
+    }
+
+    return swapTransaction
+  }
+
   async findInitiateSwapTransaction (value, recipientAddress, refundAddress, secretHash, expiration, startBlock) {
     let blockNumber = startBlock || await this.getMethod('getBlockHeight')()
     let initiateSwapTransaction = false
+    let arrivedAtTip = false
 
     while (!initiateSwapTransaction) {
       const block = await this.getMethod('getBlockByNumber')(blockNumber, true)
@@ -135,9 +154,11 @@ export default class EthereumSwapProvider extends Provider {
         )
 
         blockNumber++
+      } else {
+        arrivedAtTip = true
       }
 
-      await sleep(5000)
+      if (arrivedAtTip) { await sleep(5000) }
     }
 
     return initiateSwapTransaction
@@ -146,6 +167,7 @@ export default class EthereumSwapProvider extends Provider {
   async findClaimSwapTransaction (initiationTxHash, recipientAddress, refundAddress, secretHash, expiration, startBlock) {
     let blockNumber = startBlock || await this.getMethod('getBlockHeight')()
     let claimSwapTransaction = false
+    let arrivedAtTip = false
     while (!claimSwapTransaction) {
       const initiationTransaction = await this.getMethod('getTransactionReceipt')(initiationTxHash)
       const block = await this.getMethod('getBlockByNumber')(blockNumber, true)
@@ -161,9 +183,11 @@ export default class EthereumSwapProvider extends Provider {
         }
 
         blockNumber++
+      } else {
+        arrivedAtTip = true
       }
 
-      await sleep(5000)
+      if (arrivedAtTip) { await sleep(5000) }
     }
     claimSwapTransaction.secret = await this.getSwapSecret(claimSwapTransaction.hash)
 
@@ -179,6 +203,7 @@ export default class EthereumSwapProvider extends Provider {
     let blockNumber = startBlock || await this.getMethod('getBlockHeight')()
     const initiationTransaction = await this.getMethod('getTransactionReceipt')(initiationTxHash)
     let refundSwapTransaction = false
+    let arrivedAtTip = false
 
     while (!refundSwapTransaction) {
       const block = await this.getMethod('getBlockByNumber')(blockNumber, true)
@@ -190,8 +215,11 @@ export default class EthereumSwapProvider extends Provider {
         )
 
         blockNumber++
+      } else {
+        arrivedAtTip = true
       }
-      await sleep(5000)
+
+      if (arrivedAtTip) { await sleep(5000) }
     }
     return refundSwapTransaction
   }