lighstorm 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026ad34b202b5f4367e287568b22126ba4850145b9d3e9398cdfd2f70d9e25d7
-  data.tar.gz: 63b0809d04e688ceab5c7a3ff5e9ee05588c8fece0a7b6323f96b8f0a871f9eb
+  metadata.gz: 26ecb1df57331f4013bed69eabf7722b49b5fdfa40fdca48a38e0b3f07d032c5
+  data.tar.gz: ca0632d8d04671db004ce82acb73d35b92f3527f9cb4b4f5171031bf19dfe56b
 SHA512:
-  metadata.gz: 00ba8bf8fa6f5930abb796bdb00434401a31d30db6d26397ea1cebeb587ce404b942777dd0df6eed38d8e24fec5f6574afaf3d343108379f1d359f7def4a80ba
-  data.tar.gz: 39ebcc45331f332c5aa85e824245aec7e707bed958625d123cdb655f250610a361ae56a6dc0a8657ec34dcda977bd7e0630b47e82f0edb511b5cbf3a16b584bd
+  metadata.gz: 2c8b91eaa213a149be5da9af101dc0fc5bfa4add56b709f74d776cb20a96dd1020f2f33f6cb113ec24b257e55b2a2ded19ffa97776f4bf45dc4932760a990585
+  data.tar.gz: b3437b6dfa13b39eb761acd8cc6685d4c62ec9f388615de66d55e2e9afb7eb194ef6705a85cb401a0daa7af7c258329a51d50ed5d41aa423dd807325c0bb7bfc

data/.env.example

@@ -1,6 +1,21 @@
-LIGHSTORM_LND_ADDRESS=127.0.0.1:10009
-LIGHSTORM_CERTIFICATE_PATH=/lnd/tls.cert
-LIGHSTORM_MACAROON_PATH=/lnd/data/chain/bitcoin/mainnet/admin.macaroon
 LIGHSTORM_RUN_INTEGRATION_TESTS=false
 LIGHSTORM_RUN_INTEGRATION_TESTS_SLOW=false
 LIGHSTORM_DELETE_UNUSED_TEST_DATA=false
+
+# Option A: lndconnect
+# LIGHSTORM_LND_CONNECT=lndconnect://127.0.0.1:10009?cert=MIICJz...JBEERQ&macaroon=AgEDbG...45ukJ4
+
+# Option B: File Path
+# LIGHSTORM_LND_ADDRESS=127.0.0.1:10009
+# LIGHSTORM_LND_CERTIFICATE_PATH=/lnd/tls.cert
+# LIGHSTORM_LND_MACAROON_PATH=/lnd/data/chain/bitcoin/mainnet/admin.macaroon
+
+# Option C: Base64
+# LIGHSTORM_LND_ADDRESS=127.0.0.1:10009
+# LIGHSTORM_LND_CERTIFICATE=LS0tLS1CRU...UtLS0tLQo=
+# LIGHSTORM_LND_MACAROON=AgEDbG5kAv...inv45ukJ4=
+
+# Option D: Hex
+# LIGHSTORM_LND_ADDRESS=127.0.0.1:10009
+# LIGHSTORM_LND_CERTIFICATE=2d2d2d2d2d...2d2d2d2d0a
+# LIGHSTORM_LND_MACAROON=0201036c6e...bf8e6e909e

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    lighstorm (0.0.12)
+    lighstorm (0.0.13)
       dotenv (~> 2.8, >= 2.8.1)
-      lnd-client (~> 0.0.5)
+      lnd-client (~> 0.0.6)
       zache (~> 0.12.0)
 
 GEM
@@ -22,7 +22,7 @@ GEM
       google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
     json (2.6.3)
-    lnd-client (0.0.5)
+    lnd-client (0.0.6)
       grpc (~> 1.52)
     method_source (1.0.0)
     parallel (1.22.1)
@@ -51,7 +51,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.48.0)
+    rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)

data/README.md

@@ -35,19 +35,25 @@ Although it tries to stay close to [Lightning's terminologies](https://docs.ligh
 Add to your `Gemfile`:
 
 ```ruby
-gem 'lighstorm', '~> 0.0.12'
+gem 'lighstorm', '~> 0.0.13'
 ```
 
 ```ruby
 require 'lighstorm'
 
-Lighstorm.config!(
-  lnd_address: '127.0.0.1:10009',
+# lndconnect
+Lighstorm.connect!(
+  'lndconnect://127.0.0.1:10009?cert=MIICJz...JBEERQ&macaroon=AgEDbG...45ukJ4'
+)
+
+# File Path
+Lighstorm.connect!(
+  address: '127.0.0.1:10009',
   certificate_path: '/lnd/tls.cert',
-  macaroon_path: '/lnd/data/chain/bitcoin/mainnet/admin.macaroon',
+  macaroon_path: '/lnd/data/chain/bitcoin/mainnet/admin.macaroon'
 )
 
-puts Lighstorm.version # => 0.0.12
+puts Lighstorm.version # => 0.0.13
 
 Lighstorm::Node.myself.alias # => icebaker/old-stone
 

data/adapters/transaction.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'digest'
+
+module Lighstorm
+  module Adapter
+    class Transaction
+      def self.get_transactions(grpc)
+        {
+          _source: :get_transactions,
+          _key: Digest::SHA256.hexdigest(
+            [grpc[:time_stamp], grpc[:tx_hash], grpc[:amount], grpc[:total_fees]].join('/')
+          ),
+          at: Time.at(grpc[:time_stamp]),
+          amount: { millisatoshis: grpc[:amount] * 1000 },
+          fee: { millisatoshis: grpc[:total_fees] * 1000 },
+          hash: grpc[:tx_hash],
+          label: grpc[:label]
+        }
+      end
+    end
+  end
+end

data/components/lnd.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'singleton'
-
+require 'securerandom'
 require 'lnd-client'
 
 require_relative '../ports/dsl/lighstorm/errors'
@@ -10,34 +10,36 @@ module Lighstorm
   class LND
     include Singleton
 
-    attr_writer :config, :middleware
+    attr_writer :middleware
 
     def initialize
-      @config = nil
-      @client = nil
+      @default_key = SecureRandom.hex
       @middleware = ->(_key, &block) { block.call }
     end
 
+    def connect!(*params)
+      if params.last.is_a?(Hash)
+        unless params.last.key?(:lightning)
+          params.last[:lightning] = {
+            channel_args: { 'grpc.max_receive_message_length' => 1024 * 1024 * 50 }
+          }
+        end
+      else
+        params << {
+          lightning: { channel_args: { 'grpc.max_receive_message_length' => 1024 * 1024 * 50 } }
+        }
+      end
+
+      LNDClient.add_connection!(@default_key, *params)
+    end
+
     def middleware(key, &block)
       @middleware.call(key, &block)
     end
 
     def client
-      return @client if @client
-
-      raise MissingCredentialsError, 'missing credentials' if @config.nil? && ENV.fetch(
-        'LIGHSTORM_CERTIFICATE_PATH', nil
-      ).nil?
-
-      @client = if @config
-                  create_client_from_config
-                else
-                  create_client_from_environment_variables
-                end
-
-      @client.lightning(channel_args: { 'grpc.max_receive_message_length' => 1024 * 1024 * 50 })
-
-      @client
+      try_to_connect_from_environment_variables! unless LNDClient.connections.include?(@default_key)
+      LNDClient.as(@default_key)
     end
 
     def create_client_from_config
@@ -48,12 +50,32 @@ module Lighstorm
       )
     end
 
-    def create_client_from_environment_variables
-      LNDClient.new(
-        socket_address: ENV.fetch('LIGHSTORM_LND_ADDRESS', nil),
-        certificate_path: ENV.fetch('LIGHSTORM_CERTIFICATE_PATH', nil),
-        macaroon_path: ENV.fetch('LIGHSTORM_MACAROON_PATH', nil)
-      )
+    def try_to_connect_from_environment_variables!
+      return connect!(ENV.fetch('LIGHSTORM_LND_CONNECT')) if ENV.fetch('LIGHSTORM_LND_CONNECT', nil)
+
+      params = {}
+
+      raise MissingCredentialsError, 'missing credentials [address]' unless ENV.fetch('LIGHSTORM_LND_ADDRESS', nil)
+
+      params[:address] = ENV.fetch('LIGHSTORM_LND_ADDRESS')
+
+      if ENV.fetch('LIGHSTORM_LND_CERTIFICATE', nil)
+        params[:certificate] = ENV.fetch('LIGHSTORM_LND_CERTIFICATE')
+      elsif ENV.fetch('LIGHSTORM_LND_CERTIFICATE_PATH', nil)
+        params[:certificate_path] = ENV.fetch('LIGHSTORM_LND_CERTIFICATE_PATH')
+      else
+        raise MissingCredentialsError, 'missing credentials [certificate]'
+      end
+
+      if ENV.fetch('LIGHSTORM_LND_MACAROON', nil)
+        params[:macaroon] = ENV.fetch('LIGHSTORM_LND_MACAROON')
+      elsif ENV.fetch('LIGHSTORM_LND_MACAROON_PATH', nil)
+        params[:macaroon_path] = ENV.fetch('LIGHSTORM_LND_MACAROON_PATH')
+      else
+        raise MissingCredentialsError, 'missing credentials [macaroon]'
+      end
+
+      connect!(params)
     end
   end
 end

data/controllers/activity/all.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require_relative '../invoice/all'
+require_relative '../payment/all'
+require_relative '../forward/all'
+require_relative '../transaction/all'
+require_relative '../../models/activity'
+
+module Lighstorm
+  module Controllers
+    module Activity
+      module All
+        def self.fetch(direction: nil, how: nil, limit: nil)
+          activities = []
+
+          Transaction::All.data.each do |transaction|
+            next if !how.nil? && how != 'on-chain'
+
+            activities << {
+              direction: (transaction[:amount][:millisatoshis]).positive? ? 'in' : 'out',
+              layer: 'on-chain',
+              at: transaction[:at],
+              amount: {
+                millisatoshis: if (transaction[:amount][:millisatoshis]).positive?
+                                 transaction[:amount][:millisatoshis]
+                               else
+                                 -transaction[:amount][:millisatoshis]
+                               end
+              },
+              how: 'on-chain',
+              message: nil,
+              data: { transaction: transaction }
+            }
+          end
+
+          if direction.nil? || direction == 'in'
+            Invoice::All.data(spontaneous: true).filter do |invoice|
+              !invoice[:payments].nil? && invoice[:payments].size.positive?
+            end.each do |invoice|
+              activity_how = invoice[:code].nil? ? 'spontaneously' : 'with-invoice'
+
+              next if !how.nil? && how != activity_how
+
+              # TODO: Improve performance by reducing invoice fields and removing payments?
+              invoice[:payments].each do |payment|
+                activities << {
+                  direction: 'in',
+                  layer: 'off-chain',
+                  at: payment[:at],
+                  amount: payment[:amount],
+                  how: activity_how,
+                  message: payment[:message],
+                  data: { invoice: invoice }
+                }
+              end
+            end
+
+            Forward::All.data.each do |forward|
+              next if !how.nil? && how != 'forwarding'
+
+              activities << {
+                direction: 'in',
+                layer: 'off-chain',
+                at: forward[:at],
+                amount: forward[:fee],
+                how: 'forwarding',
+                message: nil,
+                data: {}
+              }
+            end
+          end
+
+          if direction.nil? || direction == 'out'
+            Payment::All.data(
+              fetch: {
+                get_node_info: false,
+                lookup_invoice: false,
+                decode_pay_req: true,
+                get_chan_info: false
+              }
+            )[:data].each do |payment|
+              activity_how = payment[:invoice][:code].nil? ? 'spontaneously' : 'with-invoice'
+
+              next if !how.nil? && how != activity_how
+
+              # TODO: Improve performance by reducing invoice fields?
+              activities << {
+                direction: 'out',
+                layer: 'off-chain',
+                at: payment[:at],
+                amount: payment[:amount],
+                how: activity_how,
+                message: payment[:message],
+                data: { invoice: payment[:invoice] }
+              }
+            end
+          end
+
+          activities = activities.sort_by { |activity| -activity[:at].to_i }
+
+          activities = activities[0..limit - 1] unless limit.nil?
+
+          { activities: activities }
+        end
+
+        def self.transform(raw)
+          raw[:activities].map do |activity|
+            activity[:_key] = SecureRandom.hex
+            activity
+          end
+        end
+
+        def self.data(direction: nil, how: nil, limit: nil, &vcr)
+          raw = if vcr.nil?
+                  fetch(direction: direction, how: how, limit: limit)
+                else
+                  vcr.call(-> { fetch(direction: direction, how: how, limit: limit) })
+                end
+
+          transform(raw)
+        end
+
+        def self.model(data)
+          data.map { |data| Models::Activity.new(data) }
+        end
+      end
+    end
+  end
+end

data/controllers/activity.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative './activity/all'
+
+module Lighstorm
+  module Controllers
+    module Activity
+      def self.all(direction: nil, how: nil, limit: nil)
+        All.model(All.data(
+                    direction: direction,
+                    how: how,
+                    limit: limit
+                  ))
+      end
+    end
+  end
+end

data/controllers/transaction/all.rb

@@ -1,103 +1,58 @@
 # frozen_string_literal: true
 
-require_relative '../invoice/all'
-require_relative '../payment/all'
-require_relative '../forward/all'
+require_relative '../../ports/grpc'
+require_relative '../../adapters/transaction'
 require_relative '../../models/transaction'
 
 module Lighstorm
   module Controllers
     module Transaction
       module All
-        def self.fetch(direction: nil, how: nil, limit: nil)
-          transactions = []
-
-          if direction.nil? || direction == 'in'
-            Invoice::All.data(spontaneous: true).filter do |invoice|
-              !invoice[:payments].nil? && invoice[:payments].size.positive?
-            end.each do |invoice|
-              transaction_how = invoice[:code].nil? ? 'spontaneously' : 'with-invoice'
-
-              next if !how.nil? && how != transaction_how
-
-              # TODO: Improve performance by reducing invoice fields and removing payments?
-              invoice[:payments].each do |payment|
-                transactions << {
-                  direction: 'in',
-                  at: payment[:at],
-                  amount: payment[:amount],
-                  how: transaction_how,
-                  message: payment[:message],
-                  data: { invoice: invoice }
-                }
-              end
-            end
-
-            Forward::All.data.each do |forward|
-              next if !how.nil? && how != 'forwarding'
-
-              transactions << {
-                direction: 'in',
-                at: forward[:at],
-                amount: forward[:fee],
-                how: 'forwarding',
-                message: nil,
-                data: {}
-              }
-            end
-          end
+        def self.fetch(limit: nil)
+          at = Time.now
 
-          if direction.nil? || direction == 'out'
-            Payment::All.data(
-              fetch: {
-                get_node_info: false,
-                lookup_invoice: false,
-                decode_pay_req: true,
-                get_chan_info: false
-              }
-            )[:data].each do |payment|
-              transaction_how = payment[:invoice][:code].nil? ? 'spontaneously' : 'with-invoice'
+          transactions = []
 
-              next if !how.nil? && how != transaction_how
+          response = Ports::GRPC.lightning.get_transactions
 
-              # TODO: Improve performance by reducing invoice fields?
-              transactions << {
-                direction: 'out',
-                at: payment[:at],
-                amount: payment[:amount],
-                how: transaction_how,
-                message: payment[:message],
-                data: { invoice: payment[:invoice] }
-              }
-            end
+          response.transactions.each do |transaction|
+            transactions << transaction.to_h
           end
 
-          transactions = transactions.sort_by { |transaction| -transaction[:at].to_i }
+          transactions = transactions.sort_by { |raw_transaction| -raw_transaction[:time_stamp] }
 
           transactions = transactions[0..limit - 1] unless limit.nil?
 
-          { transactions: transactions }
+          { at: at, get_transactions: transactions }
         end
 
-        def self.transform(raw)
-          raw[:transactions].map do |transaction|
-            transaction[:_key] = SecureRandom.hex
-            transaction
-          end
+        def self.adapt(raw)
+          {
+            get_transactions: raw[:get_transactions].map do |raw_transaction|
+              Lighstorm::Adapter::Transaction.get_transactions(raw_transaction)
+            end
+          }
+        end
+
+        def self.transform(adapted)
+          adapted[:get_transactions]
         end
 
-        def self.data(direction: nil, how: nil, limit: nil, &vcr)
+        def self.data(limit: nil, &vcr)
           raw = if vcr.nil?
-                  fetch(direction: direction, how: how, limit: limit)
+                  fetch(limit: limit)
                 else
-                  vcr.call(-> { fetch(direction: direction, how: how, limit: limit) })
+                  vcr.call(-> { fetch(limit: limit) })
                 end
+          adapted = adapt(raw)
 
-          transform(raw)
+          transform(adapted)
         end
 
         def self.model(data)
-          data.map { |data| Models::Transaction.new(data) }
+          data.map do |transaction_data|
+            Lighstorm::Models::Transaction.new(transaction_data)
+          end
         end
       end
     end

data/docs/README.md

@@ -27,40 +27,16 @@ Lighstorm::Channel.mine.first.myself.node.alias
 Add to your `Gemfile`:
 
 ```ruby
-gem 'lighstorm', '~> 0.0.12'
+gem 'lighstorm', '~> 0.0.13'
 ```
 
 Run `bundle install`.
 
-## Credentials
-
-Set the following _Environment Variables_ or create a `.env` file:
-```bash
-LIGHSTORM_LND_ADDRESS=127.0.0.1:10009
-LIGHSTORM_CERTIFICATE_PATH=/lnd/tls.cert
-LIGHSTORM_MACAROON_PATH=/lnd/data/chain/bitcoin/mainnet/admin.macaroon
-```
-
-It will automatically load your credentials.
-
-Alternatively, you can set the credentials at runtime:
-
-```ruby
-require 'lighstorm'
-
-Lighstorm.config!(
-  lnd_address: '127.0.0.1:10009',
-  certificate_path: '/lnd/tls.cert',
-  macaroon_path: '/lnd/data/chain/bitcoin/mainnet/admin.macaroon',
-)
-
-```
-
 ## Examples
 ```ruby
 require 'lighstorm'
 
-puts Lighstorm.version # => 0.0.12
+puts Lighstorm.version # => 0.0.13
 
 Lighstorm::Invoice.create(
   description: 'Coffee', amount: { millisatoshis: 1000 }, payable: 'once'
@@ -116,6 +92,140 @@ Lighstorm::Satoshis.new(
 
 - [Getting Started with Lightning Payments in Ruby](https://mirror.xyz/icebaker.eth/4RUF8umW_KRfVWHHvC2jz0c7YJqzv3RUUvLN-Mln5IU)
 
+# Connecting
+
+## Environment Variables
+
+Choose a method and set the following _Environment Variables_, or create a `.env` file. This will automatically load your credentials.
+
+### lndconnect
+
+Read more about [lnd connect URL](https://github.com/LN-Zap/lndconnect/blob/master/lnd_connect_uri.md).
+
+```bash
+LIGHSTORM_LND_CONNECT=lndconnect://127.0.0.1:10009?cert=MIICJz...JBEERQ&macaroon=AgEDbG...45ukJ4
+```
+
+### File Path
+
+```bash
+LIGHSTORM_LND_ADDRESS=127.0.0.1:10009
+LIGHSTORM_LND_CERTIFICATE_PATH=/lnd/tls.cert
+LIGHSTORM_LND_MACAROON_PATH=/lnd/data/chain/bitcoin/mainnet/admin.macaroon
+```
+
+### Base64
+
+```bash
+LIGHSTORM_LND_ADDRESS=127.0.0.1:10009
+LIGHSTORM_LND_CERTIFICATE=LS0tLS1CRU...UtLS0tLQo=
+LIGHSTORM_LND_MACAROON=AgEDbG5kAv...inv45ukJ4=
+```
+
+### Hex
+
+```bash
+LIGHSTORM_LND_ADDRESS=127.0.0.1:10009
+LIGHSTORM_LND_CERTIFICATE=2d2d2d2d2d...2d2d2d2d0a
+LIGHSTORM_LND_MACAROON=0201036c6e...bf8e6e909e
+```
+
+## Runtime
+Alternatively, you can set the credentials at runtime:
+
+### lndconnect
+
+Read more about [lnd connect URL](https://github.com/LN-Zap/lndconnect/blob/master/lnd_connect_uri.md).
+
+```ruby
+require 'lighstorm'
+
+Lighstorm.connect!(
+  'lndconnect://127.0.0.1:10009?cert=MIICJz...JBEERQ&macaroon=AgEDbG...45ukJ4'
+)
+```
+
+### File Path
+
+```ruby
+require 'lighstorm'
+
+Lighstorm.connect!(
+  address: '127.0.0.1:10009',
+  certificate_path: '/lnd/tls.cert',
+  macaroon_path: '/lnd/data/chain/bitcoin/mainnet/admin.macaroon'
+)
+```
+
+### Base64
+
+```ruby
+require 'lighstorm'
+
+Lighstorm.connect!(
+  address: '127.0.0.1:10009',
+  certificate: 'LS0tLS1CRU...UtLS0tLQo=',
+  macaroon: 'AgEDbG5kAv...inv45ukJ4='
+)
+```
+
+### Hex
+
+```ruby
+require 'lighstorm'
+
+Lighstorm.connect!(
+  address: '127.0.0.1:10009',
+  certificate: '2d2d2d2d2d...2d2d2d2d0a',
+  macaroon: '0201036c6e...bf8e6e909e'
+)
+```
+
+### Raw
+
+```ruby
+require 'lighstorm'
+
+Lighstorm.connect!(
+  address: '127.0.0.1:10009',
+  certificate: File.read('/lnd/tls.cert'),
+  macaroon: File.read('/lnd/data/chain/bitcoin/mainnet/admin.macaroon')
+)
+```
+
+## Docker and Remote Access
+
+To connect to an LND node through a Docker container or remote host, you may need to adjust your certificate settings. Follow these steps:
+
+1. Stop your LND node.
+
+2. Remove or backup existing certificate files (`tls.cert` and `tls.key`) in the LND directory.
+
+3. Modify `lnd.conf` to include the relevant `tlsextraip` and/or `tlsextradomain` settings:
+
+Option A: Accept any IP or domain (Warning: high security risk):
+
+```conf
+tlsextraip=0.0.0.0
+```
+
+Option B: Accept only your Docker host (172.17.0.1):
+```conf
+tlsextraip=172.17.0.1
+```
+
+Option C: Accept a specific remote domain and host:
+```config
+tlsextraip=<your_remote_host_ip>
+tlsextradomain=<your_domain_name>
+```
+
+4. Save and restart your LND node. New tls.cert and tls.key files will be generated.
+
+5. Update your LND client configuration with the new certificate.
+
+Choose the option that best suits your needs and environment while considering security implications.
+
 # Data Modeling
 
 ## Graph Theory
@@ -1048,7 +1158,7 @@ gem 'lighstorm', path: '/home/user/lighstorm'
 # demo.rb
 require 'lighstorm'
 
-puts Lighstorm.version # => 0.0.12
+puts Lighstorm.version # => 0.0.13
 ```
 
 ```sh
@@ -1285,13 +1395,13 @@ gem build lighstorm.gemspec
 
 gem signin
 
-gem push lighstorm-0.0.12.gem
+gem push lighstorm-0.0.13.gem
 ```
 
 _________________
 
 <center>
-  lighstorm 0.0.12
+  lighstorm 0.0.13
   |
   <a href="https://github.com/icebaker/lighstorm" rel="noopener noreferrer" target="_blank">GitHub</a>
   |

data/docs/_coverpage.md

@@ -8,7 +8,7 @@
 - Built for maximum **reliability**.
 - Optimized for programmer **happiness**.
 
-0.0.12
+0.0.13
 
 ⚠️ _Warning: Early-stage, breaking changes are expected._
 

data/docs/index.html

@@ -18,7 +18,7 @@
   <script>
     window.$docsify = {
       coverpage: true,
-      name: 'Lighstorm 0.0.12',
+      name: 'Lighstorm 0.0.13',
       repo: 'https://github.com/icebaker/lighstorm'
     }
   </script>

data/lighstorm.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['ports/dsl']
 
   spec.add_dependency 'dotenv', '~> 2.8', '>= 2.8.1'
-  spec.add_dependency 'lnd-client', '~> 0.0.5'
+  spec.add_dependency 'lnd-client', '~> 0.0.6'
   spec.add_dependency 'zache', '~> 0.12.0'
 
   spec.metadata['rubygems_mfa_required'] = 'true'

data/models/activity.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative 'invoice'
+require_relative 'transaction'
+
+module Lighstorm
+  module Models
+    class Activity
+      attr_reader :direction, :at, :message, :layer, :how, :_key
+
+      def initialize(data)
+        @data = data
+
+        @_key = @data[:_key]
+        @at = @data[:at]
+        @direction = @data[:direction]
+        @layer = @data[:layer]
+        @how = @data[:how]
+        @message = @data[:message]
+      end
+
+      def amount
+        @amount ||= Satoshis.new(millisatoshis: @data[:amount][:millisatoshis])
+      end
+
+      def invoice
+        @invoice ||= @data[:data][:invoice].nil? ? nil : Invoice.new(@data[:data][:invoice])
+      end
+
+      def transaction
+        @transaction ||= @data[:data][:transaction].nil? ? nil : Transaction.new(@data[:data][:transaction])
+      end
+
+      def to_h
+        output = {
+          _key: _key,
+          at: at,
+          direction: direction,
+          amount: amount.to_h,
+          how: how,
+          message: message
+        }
+
+        output[:invoice] = invoice.to_h unless invoice.nil?
+        output[:transaction] = transaction.to_h unless transaction.nil?
+
+        output
+      end
+    end
+  end
+end

data/models/transaction.rb

@@ -1,43 +1,38 @@
 # frozen_string_literal: true
 
-require_relative 'invoice'
+require_relative './satoshis'
 
 module Lighstorm
   module Models
     class Transaction
-      attr_reader :direction, :at, :message, :how, :_key
+      attr_reader :_key, :at, :hash, :label
 
       def initialize(data)
         @data = data
 
         @_key = @data[:_key]
         @at = @data[:at]
-        @direction = @data[:direction]
-        @how = @data[:how]
-        @message = @data[:message]
+        @hash = @data[:hash]
+        @label = @data[:label]
       end
 
       def amount
         @amount ||= Satoshis.new(millisatoshis: @data[:amount][:millisatoshis])
       end
 
-      def invoice
-        @invoice ||= @data[:data][:invoice].nil? ? nil : Invoice.new(@data[:data][:invoice])
+      def fee
+        @fee ||= Satoshis.new(millisatoshis: @data[:fee][:millisatoshis])
       end
 
       def to_h
-        output = {
+        {
           _key: _key,
           at: at,
-          direction: direction,
+          hash: hash,
           amount: amount.to_h,
-          how: how,
-          message: message
+          fee: fee.to_h,
+          label: label
         }
-
-        output[:invoice] = invoice.to_h unless invoice.nil?
-
-        output
       end
     end
   end

data/ports/dsl/lighstorm.rb

@@ -11,7 +11,7 @@ require_relative '../../controllers/channel'
 require_relative '../../controllers/payment'
 require_relative '../../controllers/forward'
 require_relative '../../controllers/invoice'
-require_relative '../../controllers/transaction'
+require_relative '../../controllers/activity'
 
 module Lighstorm
   Node = Controllers::Node
@@ -19,12 +19,12 @@ module Lighstorm
   Payment = Controllers::Payment
   Forward = Controllers::Forward
   Invoice = Controllers::Invoice
-  Transaction = Controllers::Transaction
+  Activity = Controllers::Activity
 
   Satoshis = Models::Satoshis
 
-  def self.config!(config)
-    LND.instance.config = config
+  def self.connect!(config)
+    LND.instance.connect!(config)
   end
 
   def self.inject_middleware!(middleware_lambda)

data/static/cache.rb

@@ -3,6 +3,7 @@
 module Lighstorm
   module Static
     CACHE = {
+      lightning_get_transactions: false,
       lightning_update_channel_policy: false,
       lightning_add_invoice: false,
       router_send_payment_v2: false,

data/static/spec.rb

@@ -4,7 +4,7 @@ module Lighstorm
   module Static
     SPEC = {
       name: 'lighstorm',
-      version: '0.0.12',
+      version: '0.0.13',
       author: 'icebaker',
       summary: 'API for interacting with a Lightning Node.',
       description: 'Lighstorm is an opinionated abstraction layer on top of the lnd-client for interacting with a Lightning Node.',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lighstorm
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - icebaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: zache
   requirement: !ruby/object:Gem::Requirement
@@ -85,9 +85,12 @@ files:
 - adapters/edges/payment/purpose.rb
 - adapters/invoice.rb
 - adapters/nodes/node.rb
+- adapters/transaction.rb
 - components/cache.rb
 - components/lnd.rb
 - controllers/action.rb
+- controllers/activity.rb
+- controllers/activity/all.rb
 - controllers/channel.rb
 - controllers/channel/actions/apply_gossip.rb
 - controllers/channel/actions/update_fee.rb
@@ -130,6 +133,7 @@ files:
 - docs/vendor/prismjs/prism-tomorrow.min.css
 - helpers/time_expression.rb
 - lighstorm.gemspec
+- models/activity.rb
 - models/concerns/protectable.rb
 - models/connections/channel_node.rb
 - models/connections/channel_node/accounting.rb