bolt07 1.9.2 → 1.9.4

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 1.9.2
+## 1.9.4
 
 - `hopsFromChannels`, `routeFromChannels`, `routeFromHops`: Add support for
     inbound discounts

package/package.json

@@ -28,5 +28,5 @@
   "scripts": {
     "test": "npx nyc@15.1 node --experimental-test-coverage --test"
   },
-  "version": "1.9.2"
+  "version": "1.9.4"
 }

package/routing/hops_from_channels.js

@@ -92,6 +92,9 @@ module.exports = ({channels, destination}) => {
     let cltvDelta = (overridePolicy || policy).cltv_delta || defaultCltvDelta;
     const payIndex = chans.length - payNodesCount;
 
+    const nextCltvPolicy = ((nextPolicy || {}).policies || [])
+      .find(n => n.public_key === peer.public_key);
+
     // The end of a route is where the penultimate node pays the ultimate one.
     if (i < payIndex) {
       cltvDelta = peer.cltv_delta;
@@ -102,6 +105,10 @@ module.exports = ({channels, destination}) => {
       cltvDelta = endPolicies.find(n => n.public_key === payingKey).cltv_delta;
     }
 
+    if (!!nextCltvPolicy) {
+      cltvDelta = nextCltvPolicy.cltv_delta;
+    }
+
     return {
       base_fee_mtokens: (overridePolicy || policy).base_fee_mtokens,
       channel: channel.id,

package/routing/policy_fee.js

@@ -4,12 +4,14 @@ const rateDivisor = BigInt(1e6);
 /** Fee for policy
 
   {
+    inbound: {
+      [inbound_base_discount_mtokens]: <Source Base Fee Reduction String>
+      [inbound_rate_discount]: <Source Per Million Rate Reduction Number>
+    }
     mtokens: <Millitokens String>
     policy: {
       base_fee_mtokens: <Base Fee Millitokens String>
       fee_rate: <Fee Rate Number>
-      [inbound_base_discount_mtokens]: <Source Base Fee Reduction String>
-      [inbound_rate_discount]: <Source Per Million Rate Reduction Number>
     }
   }
 
@@ -21,7 +23,7 @@ const rateDivisor = BigInt(1e6);
     fee_mtokens: <Fee Millitokens String>
   }
 */
-module.exports = ({mtokens, policy}) => {
+module.exports = ({inbound, mtokens, policy}) => {
   if (mtokens === undefined) {
     throw new Error('ExpectedMillitokensForPolicyFeeCalculation');
   }
@@ -41,8 +43,8 @@ module.exports = ({mtokens, policy}) => {
   const baseFeeMtokens = BigInt(policy.base_fee_mtokens);
   const feeRate = BigInt(policy.fee_rate);
   const forwardMtokens = BigInt(mtokens);
-  const lowerBaseFee = BigInt(policy.inbound_base_discount_mtokens || none);
-  const lowerFeeRate = BigInt(policy.inbound_rate_discount || none);
+  const lowerBaseFee = BigInt(inbound.inbound_base_discount_mtokens || none);
+  const lowerFeeRate = BigInt(inbound.inbound_rate_discount || none);
 
   const fee = baseFeeMtokens + forwardMtokens * feeRate / rateDivisor;
 

package/routing/route_from_hops.js

@@ -112,7 +112,11 @@ module.exports = args => {
     let feeMtokens = BigInt(minFee);
 
     if (!!i) {
-      const forward = policyFee({policy: hops[i-1], mtokens: forwardMtokens});
+      const forward = policyFee({
+        inbound: hops[i],
+        policy: hops[i-1],
+        mtokens: forwardMtokens,
+      });
 
       feeMtokens = BigInt(forward.fee_mtokens);
     }

package/test/routing/test_policy_fee.js

@@ -6,52 +6,48 @@ const policyFee = require('./../../routing/policy_fee');
 
 const tests = [
   {
-    args: {},
+    args: {inbound: {}},
     description: 'Mtokens are required',
     error: 'ExpectedMillitokensForPolicyFeeCalculation',
   },
   {
-    args: {mtokens: '1000000'},
+    args: {inbound: {}, mtokens: '1000000'},
     description: 'A policy is required',
     error: 'ExpectedPolicyToCalculateFeeFor',
   },
   {
-    args: {mtokens: '1000000', policy: {}},
+    args: {inbound: {}, mtokens: '1000000', policy: {}},
     description: 'Base fee tokens are required',
     error: 'ExpectedBaseFeeMillitokensForPolicyFeeCalculation',
   },
   {
-    args: {mtokens: '1000000', policy: {base_fee_mtokens: '1'}},
+    args: {inbound: {}, mtokens: '1000000', policy: {base_fee_mtokens: '1'}},
     description: 'Fee rate is required',
     error: 'ExpectedFeeRateForPolicyFeeCalculation',
   },
   {
-    args: {mtokens: '1000000', policy: {base_fee_mtokens: '1', fee_rate: 1}},
+    args: {
+      inbound: {},
+      mtokens: '1000000',
+      policy: {base_fee_mtokens: '1', fee_rate: 1},
+    },
     description: 'Fee is calculated',
     expected: {fee_mtokens: '2'},
   },
   {
     args: {
+      inbound: {inbound_base_discount_mtokens: '1', inbound_rate_discount: 1},
       mtokens: '1000000',
-      policy: {
-        base_fee_mtokens: '1',
-        fee_rate: 1,
-        inbound_base_discount_mtokens: '1',
-        inbound_rate_discount: 1,
-      },
+      policy: {base_fee_mtokens: '1', fee_rate: 1},
     },
     description: 'Fee rate with discount is calculated',
     expected: {fee_mtokens: '0'},
   },
   {
     args: {
+      inbound: {inbound_base_discount_mtokens: '10', inbound_rate_discount: 1},
       mtokens: '1000000',
-      policy: {
-        base_fee_mtokens: '1',
-        fee_rate: 1,
-        inbound_base_discount_mtokens: '10',
-        inbound_rate_discount: 1,
-      },
+      policy: {base_fee_mtokens: '1', fee_rate: 1},
     },
     description: 'Fee rate with big discount is calculated',
     expected: {fee_mtokens: '0'},