lighstorm 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9138a744ed51a4f15025f97f27e09ec5f3b100ef8def0a6d992895cb42f8b0c
-  data.tar.gz: 85435136bfbb78cc7c6baa74ea6a745e958d8eb3d3f08d42ef42d03a1d2230eb
+  metadata.gz: e3a0597ad2e13c24bcf64efd0e12e2b6c8ae0c7b6b012b6fab89caffd2ac06a9
+  data.tar.gz: 01fa72d76dcdb97c62a1edd5f8829d8038baba9639de245e75059bbf6309d199
 SHA512:
-  metadata.gz: e728481bdafde3c30dc23e85a8a48d0d3a5ac020410d14cbafe48b17d86661c2df86bab4f75a65099919adf09b3808ce19f410f915cb7287d2a7802884cc8f0a
-  data.tar.gz: 6efa2544e1d08c49966b322e10d8cc40f3d1de0238534665148bff8515686be8817abf039442308563d0cc6ee15d3cf71ef1486f55a946103dcdd663a735684b
+  metadata.gz: e7e7d996345446669475259095ad4843783ec21083094e3acbb883fbde421b57efec0d1ca5a495526ee6e1c536920003a3472db21eb6ee2394218bcf07fc235e
+  data.tar.gz: 8e4b80f814feff68293a6db0ecdc9346640d19e3f761d16fafa5c0f1dcfbea978208dca9c6e186834ef9b28bac0b296f37d5b3aeba5a0b05f4cac06e38bcbc4f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lighstorm (0.0.5)
+    lighstorm (0.0.7)
       dotenv (~> 2.8, >= 2.8.1)
       lnd-client (~> 0.0.5)
       zache (~> 0.12.0)
@@ -50,14 +50,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.45.1)
+    rubocop (1.46.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.26.0)

data/README.md

@@ -15,25 +15,26 @@ Lighstorm::Channel.mine.first.myself.node.alias
 - [About](#about)
 - [Usage](#usage)
   - [Documentation](https://icebaker.github.io/lighstorm)
-- [Development](#development)
-  - [Testing](#testing)
-  - [Generating Documentation](#generating-documentation)
-  - [Publish to RubyGems](#publish-to-rubygems)
+- [Development](https://icebaker.github.io/lighstorm/#/README?id=development)
 
 ## About
 
 _Lighstorm_ is an opinionated abstraction layer on top of the [lnd-client](https://github.com/icebaker/lnd-client).
 
-It brings an [object-oriented](https://en.wikipedia.org/wiki/Object-oriented_programming) approach for interacting with a [Lightning Node](https://github.com/lightningnetwork/lnd), influenced by the [Active Record Pattern](https://www.martinfowler.com/eaaCatalog/activeRecord.html) and [Active Record Models](https://guides.rubyonrails.org/active_record_basics.html) conventions.
+It brings an [_object-oriented_](https://en.wikipedia.org/wiki/Object-oriented_programming) approach for interacting with a [Lightning Node](https://github.com/lightningnetwork/lnd), influenced by the [Active Record Pattern](https://www.martinfowler.com/eaaCatalog/activeRecord.html) and [Active Record Models](https://guides.rubyonrails.org/active_record_basics.html) conventions.
 
-Although it tries to stay close to [Lightning's terminologies](https://docs.lightning.engineering/lightning-network-tools/lnd), it brings its own vocabulary and [data modeling](https://icebaker.github.io/lighstorm/#/README?id=data-modeling), optimizing for [programmer happiness](https://rubyonrails.org/doctrine).
+However, despite the fluidity of _Object Orientation_ being desired in its public interface, internally, most of its code is structured following the [_Hexagonal Architecture_](https://en.wikipedia.org/wiki/Hexagonal_architecture_(software)) and [_Functional Programming_](https://en.wikipedia.org/wiki/Functional_programming) principles.
+
+It aims to be intuitive to use while being highly **reliable**, as it deals with people's money, and easily testable since its [tests](https://icebaker.github.io/lighstorm/#/README?id=testing) are the foundation for its reliability.
+
+Although it tries to stay close to [Lightning's terminologies](https://docs.lightning.engineering/the-lightning-network/overview), it brings its own vocabulary and [data modeling](https://icebaker.github.io/lighstorm/#/README?id=data-modeling), optimizing for [programmer happiness](https://rubyonrails.org/doctrine#optimize-for-programmer-happiness).
 
 ## Usage
 
 Add to your `Gemfile`:
 
 ```ruby
-gem 'lighstorm', '~> 0.0.5'
+gem 'lighstorm', '~> 0.0.7'
 ```
 
 ```ruby
@@ -45,60 +46,21 @@ Lighstorm.config!(
   macaroon_path: '/lnd/data/chain/bitcoin/mainnet/admin.macaroon',
 )
 
-puts Lighstorm.version # => 0.0.5
+puts Lighstorm.version # => 0.0.7
+
+Lighstorm::Node.myself.alias # => icebaker/old-stone
+
+Lighstorm::Invoice.create(
+  description: 'Coffee', millisatoshis: 1_000
+)
 
 Lighstorm::Satoshis.new(
-  milisatoshis: 75_621_650
+  millisatoshis: 75_621_650
 ).satoshis # => 75_621
-
-Lighstorm::Node.myself.alias # => icebaker/old-stone
 ```
 
 Check the [full documentation](https://icebaker.github.io/lighstorm).
 
 ## Development
 
-Copy the `.env.example` file to `.env` and provide the required data.
-
-```ruby
-# Gemfile
-gem 'lighstorm', path: '/home/user/lighstorm'
-
-# demo.rb
-require 'lighstorm'
-
-puts Lighstorm.version # => 0.0.5
-```
-
-```sh
-bundle
-rubocop -A
-```
-
-### Testing
-
-Copy the `.env.example` file to `.env` and provide the required data.
-
-```
-bundle
-
-bundle exec rspec
-```
-
-### Generating Documentation
-
-```sh
-npm i docsify-cli -g
-
-docsify serve ./docs
-```
-
-### Publish to RubyGems
-
-```sh
-gem build lighstorm.gemspec
-
-gem signin
-
-gem push lighstorm-0.0.5.gem
-```
+Check the [development documentation](https://icebaker.github.io/lighstorm/#/README?id=development).

data/adapters/connections/channel_node/fee.rb

@@ -11,7 +11,7 @@ module Lighstorm
             policy: {
               fee: {
                 base: {
-                  milisatoshis: grpc[:base_fee_msat]
+                  millisatoshis: grpc[:base_fee_msat]
                 },
                 rate: {
                   parts_per_million: grpc[:fee_per_mil]

data/adapters/connections/channel_node/policy.rb

@@ -6,12 +6,12 @@ module Lighstorm
       def self.get_chan_info(grpc)
         {
           fee: {
-            base: { milisatoshis: grpc[:fee_base_msat] },
+            base: { millisatoshis: grpc[:fee_base_msat] },
             rate: { parts_per_million: grpc[:fee_rate_milli_msat] }
           },
           htlc: {
-            minimum: { milisatoshis: grpc[:min_htlc] },
-            maximum: { milisatoshis: grpc[:max_htlc_msat] },
+            minimum: { millisatoshis: grpc[:min_htlc] },
+            maximum: { millisatoshis: grpc[:max_htlc_msat] },
             # https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#cltv_expiry_delta-selection
             blocks: {
               delta: {
@@ -26,12 +26,12 @@ module Lighstorm
         result = {
           _source: :subscribe_channel_graph,
           fee: {
-            base: { milisatoshis: json['routingPolicy']['feeBaseMsat'].to_i },
+            base: { millisatoshis: json['routingPolicy']['feeBaseMsat'].to_i },
             rate: { parts_per_million: json['routingPolicy']['feeRateMilliMsat'].to_i }
           },
           htlc: {
-            minimum: { milisatoshis: json['routingPolicy']['minHtlc'].to_i },
-            maximum: { milisatoshis: json['routingPolicy']['maxHtlcMsat'].to_i },
+            minimum: { millisatoshis: json['routingPolicy']['minHtlc'].to_i },
+            maximum: { millisatoshis: json['routingPolicy']['maxHtlcMsat'].to_i },
             # https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#cltv_expiry_delta-selection
             blocks: {
               delta: {

data/adapters/connections/channel_node.rb

@@ -10,7 +10,7 @@ module Lighstorm
         data = {
           _source: :list_channels,
           state: grpc[:active] ? 'active' : 'inactive',
-          accounting: { balance: { milisatoshis: grpc[:"#{key}_balance"] * 1000 } },
+          accounting: { balance: { millisatoshis: grpc[:"#{key}_balance"] * 1000 } },
           node: Node.list_channels(grpc, key)
         }
 

data/adapters/connections/payment_channel.rb

@@ -9,8 +9,8 @@ module Lighstorm
         {
           _source: :list_payments,
           hop: index + 1,
-          amount: { milisatoshis: grpc[:amt_to_forward_msat] },
-          fee: { milisatoshis: grpc[:fee_msat] },
+          amount: { millisatoshis: grpc[:amt_to_forward_msat] },
+          fee: { millisatoshis: grpc[:fee_msat] },
           channel: {
             _key: Digest::SHA256.hexdigest(grpc[:chan_id].to_s),
             id: grpc[:chan_id].to_s,

data/adapters/edges/channel.rb

@@ -30,10 +30,10 @@ module Lighstorm
           state: grpc[:active] ? 'active' : 'inactive',
           exposure: grpc[:private] ? 'private' : 'public',
           accounting: {
-            capacity: { milisatoshis: grpc[:capacity] * 1000 },
-            sent: { milisatoshis: grpc[:total_satoshis_sent] * 1000 },
-            received: { milisatoshis: grpc[:total_satoshis_received] * 1000 },
-            unsettled: { milisatoshis: grpc[:unsettled_balance] * 1000 }
+            capacity: { millisatoshis: grpc[:capacity] * 1000 },
+            sent: { millisatoshis: grpc[:total_satoshis_sent] * 1000 },
+            received: { millisatoshis: grpc[:total_satoshis_received] * 1000 },
+            unsettled: { millisatoshis: grpc[:unsettled_balance] * 1000 }
           },
           partners: [
             ChannelNode.list_channels(grpc, :local),
@@ -49,7 +49,7 @@ module Lighstorm
           # Standard JSON don't support BigInt, so, a String is safer.
           id: grpc[:channel_id].to_s,
           accounting: {
-            capacity: { milisatoshis: grpc[:capacity] * 1000 }
+            capacity: { millisatoshis: grpc[:capacity] * 1000 }
           },
           partners: [
             ChannelNode.get_chan_info(grpc, 1),
@@ -66,7 +66,7 @@ module Lighstorm
           id: grpc[:channel_id].to_s,
           exposure: 'public',
           accounting: {
-            capacity: { milisatoshis: grpc[:capacity] * 1000 }
+            capacity: { millisatoshis: grpc[:capacity] * 1000 }
           },
           partners: [
             ChannelNode.describe_graph(grpc, 1),
@@ -81,7 +81,7 @@ module Lighstorm
           _key: _key(json['chanId'], nil),
           id: json['chanId'],
           accounting: {
-            capacity: { milisatoshis: json['capacity'].to_i * 1000 }
+            capacity: { millisatoshis: json['capacity'].to_i * 1000 }
           },
           partners: [
             ChannelNode.subscribe_channel_graph(json),

data/adapters/edges/forward.rb

@@ -10,15 +10,15 @@ module Lighstorm
           _source: :forwarding_history,
           _key: _key(grpc),
           at: Time.at(grpc[:timestamp_ns] / 1e+9),
-          fee: { milisatoshis: grpc[:fee_msat] },
+          fee: { millisatoshis: grpc[:fee_msat] },
           in: {
-            amount: { milisatoshis: grpc[:amt_in_msat] },
+            amount: { millisatoshis: grpc[:amt_in_msat] },
             channel: {
               id: grpc[:chan_id_in].to_s
             }
           },
           out: {
-            amount: { milisatoshis: grpc[:amt_out_msat] },
+            amount: { millisatoshis: grpc[:amt_out_msat] },
             channel: {
               id: grpc[:chan_id_out].to_s
             }

data/adapters/edges/payment.rb

@@ -31,7 +31,7 @@ module Lighstorm
           _key: _key(grpc),
           created_at: Time.at(grpc[:creation_time_ns] / 1e+9),
           status: grpc[:status].to_s.downcase,
-          fee: { milisatoshis: grpc[:fee_msat] },
+          fee: { millisatoshis: grpc[:fee_msat] },
           purpose: Purpose.list_payments(grpc, node_get_info),
           request: PaymentRequest.list_payments(grpc),
           hops: grpc[:htlcs].first[:route][:hops].map.with_index do |raw_hop, i|

data/adapters/invoice.rb

@@ -7,6 +7,21 @@ require_relative 'payment_request'
 module Lighstorm
   module Adapter
     class Invoice
+      def self.add_invoice(grpc)
+        {
+          _source: :add_invoice,
+          _key: Digest::SHA256.hexdigest(
+            [
+              grpc[:r_hash],
+              grpc[:add_index],
+              grpc[:payment_request],
+              grpc[:payment_addr]
+            ].join('/')
+          ),
+          request: PaymentRequest.add_invoice(grpc)
+        }
+      end
+
       def self.lookup_invoice(grpc)
         adapted = list_or_lookup(grpc)
 
@@ -29,7 +44,7 @@ module Lighstorm
         {
           _key: _key(grpc),
           created_at: Time.at(grpc[:creation_date]),
-          settle_at: Time.at(grpc[:settle_date]),
+          settle_at: grpc[:settle_date].nil? || !grpc[:settle_date].positive? ? nil : Time.at(grpc[:settle_date]),
           state: grpc[:state].to_s.downcase
         }
       end

data/adapters/payment_request.rb

@@ -7,10 +7,21 @@ require_relative '../ports/dsl/lighstorm/errors'
 module Lighstorm
   module Adapter
     class PaymentRequest
+      def self.add_invoice(grpc)
+        {
+          _source: :add_invoice,
+          code: grpc[:payment_request],
+          address: grpc[:payment_addr].unpack1('H*'),
+          secret: {
+            hash: grpc[:r_hash].unpack1('H*')
+          }
+        }
+      end
+
       def self.decode_pay_req(grpc)
         {
           _source: :decode_pay_req,
-          amount: { milisatoshis: grpc[:num_msat] },
+          amount: { millisatoshis: grpc[:num_msat] },
           description: {
             memo: grpc[:description],
             hash: grpc[:description_hash] == '' ? nil : grpc[:description_hash]
@@ -37,7 +48,7 @@ module Lighstorm
       def self.list_or_lookup_invoice(grpc)
         {
           code: grpc[:payment_request],
-          amount: { milisatoshis: grpc[:value_msat] },
+          amount: { millisatoshis: grpc[:value_msat] },
           description: {
             memo: grpc[:memo],
             hash: grpc[:description_hash] == '' ? nil : grpc[:description_hash]
@@ -56,7 +67,7 @@ module Lighstorm
         data = {
           _source: :list_payments,
           code: grpc[:payment_request],
-          amount: { milisatoshis: grpc[:value_msat] },
+          amount: { millisatoshis: grpc[:value_msat] },
           secret: {
             preimage: grpc[:payment_preimage],
             hash: grpc[:payment_hash]

data/components/cache.rb

@@ -24,15 +24,18 @@ module Lighstorm
     def for(key, ttl: nil, params: {}, &block)
       if ttl.nil?
         ttl = Lighstorm::Static::CACHE[key.sub('lightning.', '').to_sym]
-        raise MissingTTLError, "missing ttl for #{key} static/cache.rb" if ttl.nil?
+        raise MissingTTLError, "missing ttl for #{key.sub('lightning.', '')} static/cache.rb" if ttl.nil?
 
-        ttl = ttl[:ttl]
+        ttl = ttl == false ? false : ttl[:ttl]
       end
 
-      key = build_key_for(key, params)
-
-      @client.get(key, lifetime: ttl) do
+      if ttl == false
         block.call
+      else
+        key = build_key_for(key, params)
+        @client.get(key, lifetime: ttl) do
+          block.call
+        end
       end
     end
 

data/controllers/action.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Lighstorm
+  module Controllers
+    module Action
+      Output = Struct.new(:data) do
+        def response
+          data[:response]
+        end
+
+        def result
+          data[:result]
+        end
+
+        def to_h
+          {
+            response: response,
+            result: result.to_h
+          }
+        end
+      end
+    end
+  end
+end

data/controllers/channel/actions/apply_gossip.rb

@@ -25,17 +25,17 @@ module Lighstorm
         ].freeze
 
         APPLICABLE = [
-          'accounting/capacity/milisatoshis',
-          'partners/0/policy/fee/base/milisatoshis',
+          'accounting/capacity/millisatoshis',
+          'partners/0/policy/fee/base/millisatoshis',
           'partners/0/state',
-          'partners/1/policy/fee/base/milisatoshis',
+          'partners/1/policy/fee/base/millisatoshis',
           'partners/1/state',
           'partners/1/policy/fee/rate/parts_per_million',
           'partners/0/policy/fee/rate/parts_per_million',
-          'partners/0/policy/htlc/minimum/milisatoshis',
-          'partners/1/policy/htlc/minimum/milisatoshis',
-          'partners/0/policy/htlc/maximum/milisatoshis',
-          'partners/1/policy/htlc/maximum/milisatoshis',
+          'partners/0/policy/htlc/minimum/millisatoshis',
+          'partners/1/policy/htlc/minimum/millisatoshis',
+          'partners/0/policy/htlc/maximum/millisatoshis',
+          'partners/1/policy/htlc/maximum/millisatoshis',
           'partners/0/policy/htlc/blocks/delta/minimum',
           'partners/1/policy/htlc/blocks/delta/minimum'
         ].freeze
@@ -79,25 +79,25 @@ module Lighstorm
 
         def self.apply!(actual, key, change)
           case key
-          when 'accounting/capacity/milisatoshis'
+          when 'accounting/capacity/millisatoshis'
             token = SecureRandom.hex
             actual.accounting.prepare_token!(token)
             actual.accounting.capacity = {
-              value: Models::Satoshis.new(milisatoshis: change[:to]),
+              value: Models::Satoshis.new(millisatoshis: change[:to]),
               token: token
             }
-          when 'partners/0/policy/htlc/maximum/milisatoshis',
-                 'partners/1/policy/htlc/maximum/milisatoshis' then
+          when 'partners/0/policy/htlc/maximum/millisatoshis',
+                 'partners/1/policy/htlc/maximum/millisatoshis' then
             policy = actual.partners[change[:path][1]].policy
 
             token = SecureRandom.hex
             policy.htlc.prepare_token!(token)
             policy.htlc.maximum = {
-              value: Models::Satoshis.new(milisatoshis: change[:to]),
+              value: Models::Satoshis.new(millisatoshis: change[:to]),
               token: token
             }
-          when 'partners/0/policy/htlc/minimum/milisatoshis',
-                 'partners/1/policy/htlc/minimum/milisatoshis' then
+          when 'partners/0/policy/htlc/minimum/millisatoshis',
+                 'partners/1/policy/htlc/minimum/millisatoshis' then
             if actual.partners[change[:path][1]].policy.nil?
               actual.partners[change[:path][1]].policy = Lighstorm::Models::Policy.new({})
             end
@@ -107,7 +107,7 @@ module Lighstorm
             token = SecureRandom.hex
             policy.htlc.prepare_token!(token)
             policy.htlc.minimum = {
-              value: Models::Satoshis.new(milisatoshis: change[:to]),
+              value: Models::Satoshis.new(millisatoshis: change[:to]),
               token: token
             }
           when 'partners/0/policy/htlc/blocks/delta/minimum',
@@ -134,14 +134,14 @@ module Lighstorm
               value: Models::Rate.new(parts_per_million: change[:to]),
               token: token
             }
-          when 'partners/0/policy/fee/base/milisatoshis',
-                 'partners/1/policy/fee/base/milisatoshis' then
+          when 'partners/0/policy/fee/base/millisatoshis',
+                 'partners/1/policy/fee/base/millisatoshis' then
             policy = actual.partners[change[:path][1]].policy
 
             token = SecureRandom.hex
             policy.fee.prepare_token!(token)
             policy.fee.base = {
-              value: Models::Satoshis.new(milisatoshis: change[:to]),
+              value: Models::Satoshis.new(millisatoshis: change[:to]),
               token: token
             }
           when 'partners/0/state',

data/controllers/channel/actions/update_fee.rb

@@ -4,25 +4,26 @@ require_relative '../../../ports/grpc'
 require_relative '../../../models/errors'
 require_relative '../../../models/satoshis'
 require_relative '../../../models/rate'
+require_relative '../../action'
 
 module Lighstorm
   module Controllers
     module Channel
       module UpdateFee
-        def self.perform(policy, params, preview: false, fake: false)
+        def self.prepare(policy, transaction, params)
           grpc_request = {
             service: :lightning,
             method: :update_channel_policy,
             params: {
               chan_point: {
-                funding_txid_str: policy.transaction.funding.id,
-                output_index: policy.transaction.funding.index
+                funding_txid_str: transaction[:funding][:id],
+                output_index: transaction[:funding][:index]
               },
-              base_fee_msat: policy.fee.base.milisatoshis,
-              fee_rate_ppm: policy.fee.rate.parts_per_million,
-              time_lock_delta: policy.htlc.blocks.delta.minimum,
-              max_htlc_msat: policy.htlc.maximum.milisatoshis,
-              min_htlc_msat: policy.htlc.minimum.milisatoshis
+              base_fee_msat: policy[:fee][:base][:millisatoshis],
+              fee_rate_ppm: policy[:fee][:rate][:parts_per_million],
+              time_lock_delta: policy[:htlc][:blocks][:delta][:minimum],
+              max_htlc_msat: policy[:htlc][:maximum][:millisatoshis],
+              min_htlc_msat: policy[:htlc][:minimum][:millisatoshis]
             }
           }
 
@@ -34,30 +35,40 @@ module Lighstorm
             grpc_request[:params][:fee_rate_ppm] = params[:rate][:parts_per_million]
           end
 
-          if params[:base] && params[:base][:milisatoshis]
-            if (params[:base][:milisatoshis]).negative?
-              raise Errors::NegativeNotAllowedError, "fee base can't be negative: #{params[:base][:milisatoshis]}"
+          if params[:base] && params[:base][:millisatoshis]
+            if (params[:base][:millisatoshis]).negative?
+              raise Errors::NegativeNotAllowedError, "fee base can't be negative: #{params[:base][:millisatoshis]}"
             end
 
-            grpc_request[:params][:base_fee_msat] = params[:base][:milisatoshis]
+            grpc_request[:params][:base_fee_msat] = params[:base][:millisatoshis]
           end
 
+          grpc_request
+        end
+
+        def self.call(grpc_request)
+          Lighstorm::Ports::GRPC.send(grpc_request[:service]).send(
+            grpc_request[:method], grpc_request[:params]
+          ).to_h
+        end
+
+        def self.dispatch(grpc_request, &vcr)
+          vcr.nil? ? call(grpc_request) : vcr.call(-> { call(grpc_request) }, :dispatch)
+        end
+
+        def self.perform(policy, transaction, params, preview: false, &vcr)
+          grpc_request = prepare(policy.to_h, transaction.to_h, params)
+
           return grpc_request if preview
 
-          response = if fake
-                       :fake
-                     else
-                       LND.instance.middleware("lightning.#{grpc_request[:method]}") do
-                         LND.instance.client.lightning.send(grpc_request[:method], grpc_request[:params])
-                       end
-                     end
+          response = dispatch(grpc_request, &vcr)
 
-          raise UpdateChannelPolicyError.new(nil, response) unless fake || response.failed_updates.empty?
+          raise UpdateChannelPolicyError.new(nil, response) unless response[:failed_updates].empty?
 
           token = SecureRandom.hex
           policy.fee.prepare_token!(token)
           policy.fee.base = {
-            value: Models::Satoshis.new(milisatoshis: grpc_request[:params][:base_fee_msat]),
+            value: Models::Satoshis.new(millisatoshis: grpc_request[:params][:base_fee_msat]),
             token: token
           }
 
@@ -68,7 +79,7 @@ module Lighstorm
             token: token
           }
 
-          response
+          Action::Output.new({ response: response, result: policy })
         end
       end
     end

data/controllers/forward/group_by_channel.rb

@@ -36,7 +36,7 @@ module Lighstorm
             last_at: nil,
             analysis: {
               count: 0,
-              sums: { amount: { milisatoshis: 0 }, fee: { milisatoshis: 0 } }
+              sums: { amount: { millisatoshis: 0 }, fee: { millisatoshis: 0 } }
             },
             channel: nil
           }
@@ -47,8 +47,8 @@ module Lighstorm
             group[:channel] = forward[direction][:channel] if group[:channel].nil?
 
             group[:analysis][:count] += 1
-            group[:analysis][:sums][:amount][:milisatoshis] += forward[:in][:amount][:milisatoshis]
-            group[:analysis][:sums][:fee][:milisatoshis] += forward[:fee][:milisatoshis]
+            group[:analysis][:sums][:amount][:millisatoshis] += forward[:in][:amount][:millisatoshis]
+            group[:analysis][:sums][:fee][:millisatoshis] += forward[:fee][:millisatoshis]
           end
 
           group[:_key] = _key(group)