add additional caching, fix claim success test

Procfile

@@ -0,0 +1 @@
+web: node server.js

chain/chain_rpc.js

@@ -7,6 +7,7 @@ const {SSS_CHAIN_RPC_HOST} = process.env;
 const {SSS_CHAIN_RPC_PASS} = process.env;
 const {SSS_CHAIN_RPC_USER} = process.env;
 
+const chainTimeoutMs = 3000;
 const [regtestRpcHost, regtestRpcPort] = regtest.rpc_host.split(':');
 const regtestRpcPass = regtest.rpc_pass;
 const regtestRpcUser = regtest.rpc_user;
@@ -52,6 +53,7 @@ module.exports = ({cmd, network, params}, cbk) => {
   const user = credentials.user[network];
 
   chainRpc.init(host, port, user, pass);
+  chainRpc.setTimeout(chainTimeoutMs);
 
   // Should the params be a single argument instead of array, array-ize it.
   const niceParams = !Array.isArray(params || []) ? [params] : params || [];

chain/conf/chain_server.json

@@ -2,14 +2,12 @@
   "// Default connection values for chain server connections": "",
 
   "regtest": {
-    "rpc_host": "127.0.0.1",
+    "rpc_host": "127.0.0.1:18335",
     "rpc_pass": "pass",
-    "rpc_port": 18335,
     "rpc_user": "user"
   },
   "testnet": {
     "rpc_host": "127.0.0.1",
-    "rpc_port": 18332,
     "rpc_user": "bitcoinrpc"
   }
 }

chain/get_blockchain_info.js

@@ -5,9 +5,13 @@ const chainRpc = require('./chain_rpc');
 const {getBestBlockHash} = require('./conf/rpc_commands');
 const {getBlockCount} = require('./conf/rpc_commands');
 
+const cacheChainInfoMs = 5000;
+const cached = {};
+
 /** Get info about the best chain
 
   {
+    [is_cache_ok]: <Is Cache Allowed Bool>
     network: <Network Name String>
   }
 
@@ -17,7 +21,17 @@ const {getBlockCount} = require('./conf/rpc_commands');
     current_height: <Block Height Number>
   }
 */
-module.exports = ({network}, cbk) => {
+module.exports = (args, cbk) => {
+  const {network} = args;
+  const now = Date.now();
+
+  if (!!args.is_cache_ok && (cached[network] || {}).expires_at > Date.now()) {
+    return cbk(null, {
+      current_hash: cached[network].current_hash,
+      current_height: cached[network].current_height,
+    });
+  }
+
   return asyncAuto({
     // Determine the current chain tip hash
     getCurrentHash: cbk => chainRpc({network, cmd: getBestBlockHash}, cbk),
@@ -30,6 +44,12 @@ module.exports = ({network}, cbk) => {
       return cbk(err);
     }
 
+    cached[network] = {
+      expires_at: Date.now() + cacheChainInfoMs,
+      current_hash: getCurrentHash,
+      current_height: getCurrentHeight,
+    };
+
     return cbk(null, {
       current_hash: getCurrentHash,
       current_height: getCurrentHeight,

chain/spawn_chain_daemon.js

@@ -21,9 +21,8 @@ const unableToStartServer = /Unable.to.start.server/;
 */
 module.exports = (args, cbk) => {
   const miningKey = Buffer.from(args.mining_public_key, 'hex');
-  const rpcHost = chainServer.regtest.rpc_host;
+  const [rpcHost, rpcPort] = chainServer.regtest.rpc_host.split(':');
   const rpcPass = chainServer.regtest.rpc_pass;
-  const rpcPort = chainServer.regtest.rpc_port;
   const rpcUser = chainServer.regtest.rpc_user;
   const tmpDir = `/tmp/${uuidv4()}`;
 

package.json

@@ -13,7 +13,7 @@
     "cors": "2.8.4",
     "express": "4.16.3",
     "helmet": "3.12.0",
-    "ln-service": "alexbosworth/ln-service",
+    "ln-service": "3.0.4",
     "morgan": "1.9.0",
     "node-bitcoin-rpc": "1.1.3",
     "pug": "2.0.3",
@@ -35,7 +35,7 @@
     "test": "test"
   },
   "engines": {
-    "node": "8.9.4",
+    "node": "8.11.1",
     "npm": "5.6.0"
   },
   "license": "MIT",

service/check_swap_status.js

@@ -42,7 +42,7 @@ const swapRate = 0.015;
 module.exports = (args, cbk) => {
   return asyncAuto({
     // Get the current chain height
-    getChainInfo: cbk => getBlockchainInfo({network}, cbk),
+    getChainInfo: cbk => getBlockchainInfo({is_cache_ok: true, network}, cbk),
 
     // Parse the encoded invoice
     invoice: cbk => {

service/complete_swap_transaction.js

@@ -33,7 +33,13 @@ const {swapScriptInTransaction} = require('./../swaps');
 module.exports = (args, cbk) => {
   return asyncAuto({
     // Check the current state of the blockchain to get a good locktime
-    getBlockchainInfo: cbk => getBlockchainInfo({network: args.network}, cbk),
+    getBlockchainInfo: cbk => {
+      return getBlockchainInfo({
+        is_cache_ok: true,
+        network: args.network,
+      },
+      cbk);
+    },
 
     // Figure out what fee is needed to sweep the funds
     getFee: cbk => getChainFeeRate({network: args.network}, cbk),

service/find_scriptpub_in_block.js

@@ -70,7 +70,7 @@ module.exports = (args, cbk) => {
 
     // Find transaction in block
     findTransaction: ['getBlock', ({getBlock}, cbk) => {
-      if (!getBlock.is_cached_result) {
+      if (args.network !== 'regtest' && !getBlock.is_cached_result) {
         cachedBlocks[args.block_hash] = getBlock;
 
         setTimeout(() => cachedBlocks[args.block_hash] = null, cacheBlockMs);

service/find_swap_transaction.js

@@ -35,7 +35,13 @@ const blockSearchRateLimit = 300;
 module.exports = (args, cbk) => {
   return asyncAuto({
     // Get the current block tip hash
-    getChainInfo: cbk => getBlockchainInfo({network: args.network}, cbk),
+    getChainInfo: cbk => {
+      return getBlockchainInfo({
+        is_cache_ok: args.network !== 'regtest',
+        network: args.network,
+      },
+      cbk);
+    },
 
     // Check the arguments
     validate: cbk => {

service/get_invoice_details.js

@@ -9,6 +9,8 @@ const {lightningDaemon} = require('./../lightning');
 const {returnResult} = require('./../async-util');
 
 const approxTxVSize = 200;
+const cachedFee = {};
+const cacheFeeMs = 60 * 1000;
 
 /** Get invoice details
 
@@ -89,11 +91,27 @@ module.exports = (args, cbk) => {
 
     // Get the current chain fees
     chainFee: ['invoice', ({invoice}, cbk) => {
+      const fee = cachedFee[invoice.network];
+
+      if (!!fee && fee.expires_at > Date.now()) {
+        return cbk(null, {
+          fee_tokens_per_vbyte: fee.fee_tokens_per_vbyte,
+          is_cached_fee: true,
+        });
+      }
+
       return getChainFeeRate({network: invoice.network}, cbk);
     }],
 
     // Make sure the chain fee is not too high
     checkChainFee: ['chainFee', 'invoice', ({chainFee, invoice}, cbk) => {
+      if (!chainFee.is_cached_fee) {
+        cachedFee[invoice.network] = {
+          expires_at: Date.now() + cacheFeeMs,
+          fee_tokens_per_vbyte: chainFee.fee_tokens_per_vbyte,
+        };
+      }
+
       const approxFee = chainFee.fee_tokens_per_vbyte * approxTxVSize;
 
       if (approxFee / invoice.tokens > args.max_invoice_fee_rate) {

service/transaction_has_scriptpub.js

@@ -61,7 +61,7 @@ module.exports = (args, cbk) => {
 
     // Parse the transaction hex
     transaction: ['getTransaction', ({getTransaction}, cbk) => {
-      if (!getTransaction.is_cached_result) {
+      if (args.network !== 'regtest' && !getTransaction.is_cached_result) {
         cachedTx[args.transaction_id] = getTransaction.transaction;
 
         setTimeout(() => cachedTx[args.transaction_id] = null, cacheTxMs);

test/claim_success.js

@@ -180,6 +180,7 @@ module.exports = (args, cbk) => {
         refund_public_key: refundPk,
         refund_public_key_hash: refundPkHash,
         timeout_block_height: maturityBlockCount + swapTimeoutBlockCount,
+        tokens: res.bobUtxo.tokens,
       },
       cbk);
     }],