lightning-onion 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c6806de17849e69c6989e9ee721d72f5b65970c
-  data.tar.gz: cda740daf5f7ed956b53c0c9dce39469ac717b71
+SHA256:
+  metadata.gz: 9cc1140de863ddf69d940e23377106aef0c9403b7186a6c659cae59703b15713
+  data.tar.gz: 75b3378abe3ee65e02df8866cea2d21752e06eb187e8352e40b86fda52729210
 SHA512:
-  metadata.gz: fe55f5943e8f57bb3a14119978ea98ff1dcc377e4fc94ea2d8bcd4faa5660fae1b26b0a7044e8a2c2e61bdc45000e469a1c27593d772f1b00838b417cc7ae169
-  data.tar.gz: 3e0e1834d0f26fef6b0e8403e2d3627c2aef2e57b98aaad74db73b3de8acc00b98f12c2d7f5c50324818acb1c83978717a2379d36a10c8c88295ac1a393d14b7
+  metadata.gz: b8f8043b6420760cb4a211a5c4342c30bb07647d090109b5d432eefd7e2fc9b324872019c0d045d029bbf5baeabe98dd8ab950f5849a35f265a053e69b11da99
+  data.tar.gz: d244305278a85f1f7e0a920345c8b7924f1446b326cd303fbb8c6544f227b0203fe9618a21150fbc393e413b6bf395c43d93ad459e9889aa6f5e804720401a0b

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.1

data/lib/lightning/onion/failure_messages/amount_below_minimum.rb

@@ -5,12 +5,12 @@ module Lightning
     module FailureMessages
       module AmountBelowMinimum
         def to_payload
-          [type_code, htlc_msat, channel_update.htb.bytesize].pack('nq>n') + channel_update.htb
+          [TYPES[:amount_below_minimum], htlc_msat, channel_update.htb.bytesize].pack('nq>n') + channel_update.htb
         end
 
         def self.load(payload)
-          type_code, htlc_msat, len, rest = payload.unpack('nq>nH*')
-          new(type_code, htlc_msat, rest[0..len * 2])
+          htlc_msat, len, rest = payload.unpack('q>nH*')
+          new(htlc_msat, rest[0..len * 2])
         end
       end
     end

data/lib/lightning/onion/failure_messages/channel_disabled.rb

@@ -5,12 +5,12 @@ module Lightning
     module FailureMessages
       module ChannelDisabled
         def to_payload
-          [type_code].pack('n') + flags + [channel_update.htb.bytesize].pack('n') + channel_update.htb
+          [TYPES[:channel_disabled], flags, channel_update.htb.bytesize].pack('nH4n') + channel_update.htb
         end
 
         def self.load(payload)
-          type_code, flags, len, rest = payload.unpack('na4nH*')
-          new(type_code, flags, rest[0..len * 2])
+          flags, len, rest = payload.unpack('H4nH*')
+          new(flags, rest[0..len * 2])
         end
       end
     end

data/lib/lightning/onion/failure_messages/expiry_too_far.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module ExpiryTooFar
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:expiry_too_far]].pack('n')
         end
 
         def self.load(payload)
-          new(*payload.unpack('n'))
+          ExpiryTooFar
         end
       end
     end

data/lib/lightning/onion/failure_messages/expiry_too_soon.rb

@@ -5,12 +5,12 @@ module Lightning
     module FailureMessages
       module ExpiryTooSoon
         def to_payload
-          [type_code, channel_update.htb.bytesize].pack('nn') + channel_update.htb
+          [TYPES[:expiry_too_soon], channel_update.htb.bytesize].pack('n2') + channel_update.htb
         end
 
         def self.load(payload)
-          type_code, len, rest = payload.unpack('nnH*')
-          new(type_code, rest[0..len * 2])
+          len, rest = payload.unpack('nH*')
+          new(rest[0..len * 2])
         end
       end
     end

data/lib/lightning/onion/failure_messages/fee_insufficient.rb

@@ -5,12 +5,12 @@ module Lightning
     module FailureMessages
       module FeeInsufficient
         def to_payload
-          [type_code, htlc_msat, channel_update.htb.bytesize].pack('nq>n') + channel_update.htb
+          [TYPES[:fee_insufficient], htlc_msat, channel_update.htb.bytesize].pack('nq>n') + channel_update.htb
         end
 
         def self.load(payload)
-          type_code, htlc_msat, len, rest = payload.unpack('nq>nH*')
-          new(type_code, htlc_msat, rest[0..len * 2])
+          htlc_msat, len, rest = payload.unpack('q>nH*')
+          new(htlc_msat, rest[0..len * 2])
         end
       end
     end

data/lib/lightning/onion/failure_messages/final_expiry_too_soon.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module FinalExpiryTooSoon
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:final_expiry_too_soon]].pack('n')
         end
 
-        def self.load(payload)
-          new(*payload.unpack('n'))
+        def self.load(_)
+          FinalExpiryTooSoon
         end
       end
     end

data/lib/lightning/onion/failure_messages/final_incorrect_cltv_expiry.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module FinalIncorrectCltvExpiry
         def to_payload
-          [type_code, cltv_expiry].pack('nq>')
+          [TYPES[:final_incorrect_cltv_expiry], cltv_expiry].pack('nq>')
         end
 
         def self.load(payload)
-          new(*payload.unpack('nq>'))
+          new(*payload.unpack('q>'))
         end
       end
     end

data/lib/lightning/onion/failure_messages/final_incorrect_htlc_amount.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module FinalIncorrectHtlcAmount
         def to_payload
-          [type_code, incoming_htlc_amt].pack('nq>')
+          [TYPES[:final_incorrect_htlc_amount], incoming_htlc_amt].pack('nq>')
         end
 
         def self.load(payload)
-          new(*payload.unpack('nq>'))
+          new(*payload.unpack('q>'))
         end
       end
     end

data/lib/lightning/onion/failure_messages/incorrect_cltv_expiry.rb

@@ -5,12 +5,12 @@ module Lightning
     module FailureMessages
       module IncorrectCltvExpiry
         def to_payload
-          [type_code, cltv_expiry, channel_update.htb.bytesize].pack('nq>n') + channel_update.htb
+          [TYPES[:incorrect_cltv_expiry], cltv_expiry, channel_update.htb.bytesize].pack('nq>n') + channel_update.htb
         end
 
         def self.load(payload)
-          type_code, cltv_expiry, len, rest = payload.unpack('nq>nH*')
-          new(type_code, cltv_expiry, rest[0..len * 2])
+          cltv_expiry, len, rest = payload.unpack('q>nH*')
+          new(cltv_expiry, rest[0..len * 2])
         end
       end
     end

data/lib/lightning/onion/failure_messages/incorrect_payment_amount.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module IncorrectPaymentAmount
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:incorrect_payment_amount]].pack('n')
         end
 
-        def self.load(payload)
-          new(*payload.unpack('n'))
+        def self.load(_)
+          IncorrectPaymentAmount
         end
       end
     end

data/lib/lightning/onion/failure_messages/invalid_onion_hmac.rb

@@ -5,12 +5,12 @@ module Lightning
     module FailureMessages
       module InvalidOnionHmac
         def to_payload
-          [type_code, sha256_of_onion.htb.bytesize].pack('nn') + sha256_of_onion.htb
+          [TYPES[:invalid_onion_hmac], sha256_of_onion.htb.bytesize].pack('n2') + sha256_of_onion.htb
         end
 
         def self.load(payload)
-          type_code, len, rest = payload.unpack('nnH*')
-          new(type_code, rest[0..len * 2])
+          len, rest = payload.unpack('nH*')
+          new(rest[0..len * 2])
         end
       end
     end

data/lib/lightning/onion/failure_messages/invalid_onion_key.rb

@@ -5,12 +5,12 @@ module Lightning
     module FailureMessages
       module InvalidOnionKey
         def to_payload
-          [type_code, sha256_of_onion.htb.bytesize].pack('nn') + sha256_of_onion.htb
+          [TYPES[:invalid_onion_key], sha256_of_onion.htb.bytesize].pack('n2') + sha256_of_onion.htb
         end
 
         def self.load(payload)
-          type_code, len, rest = payload.unpack('nnH*')
-          new(type_code, rest[0..len * 2])
+          len, rest = payload.unpack('nH*')
+          new(rest[0..len * 2])
         end
       end
     end

data/lib/lightning/onion/failure_messages/invalid_onion_version.rb

@@ -5,12 +5,12 @@ module Lightning
     module FailureMessages
       module InvalidOnionVersion
         def to_payload
-          [type_code, sha256_of_onion.htb.bytesize].pack('nn') + sha256_of_onion.htb
+          [TYPES[:invalid_onion_version], sha256_of_onion.htb.bytesize].pack('n2') + sha256_of_onion.htb
         end
 
         def self.load(payload)
-          type_code, len, rest = payload.unpack('nnH*')
-          new(type_code, rest[0..len * 2])
+          len, rest = payload.unpack('nH*')
+          new(rest[0..len * 2])
         end
       end
     end

data/lib/lightning/onion/failure_messages/invalid_realm.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module InvalidRealm
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:invalid_realm]].pack('n')
         end
 
-        def self.load(payload)
-          new(*payload.unpack('n'))
+        def self.load(_)
+          InvalidRealm
         end
       end
     end

data/lib/lightning/onion/failure_messages/permanent_channel_failure.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module PermanentChannelFailure
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:permanent_channel_failure]].pack('n')
         end
 
-        def self.load(payload)
-          new(*payload.unpack('n'))
+        def self.load(_)
+          PermanentChannelFailure
         end
       end
     end

data/lib/lightning/onion/failure_messages/permanent_node_failure.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module PermanentNodeFailure
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:permanent_node_failure]].pack('n')
         end
 
         def self.load(payload)
-          new(*payload.unpack('n'))
+          PermanentNodeFailure
         end
       end
     end

data/lib/lightning/onion/failure_messages/required_channel_feature_missing.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module RequiredChannelFeatureMissing
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:required_channel_feature_missing]].pack('n')
         end
 
         def self.load(payload)
-          new(*payload.unpack('n'))
+          RequiredChannelFeatureMissing
         end
       end
     end

data/lib/lightning/onion/failure_messages/required_node_feature_missing.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module RequiredNodeFeatureMissing
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:required_node_feature_missing]].pack('n')
         end
 
         def self.load(payload)
-          new(*payload.unpack('n'))
+          RequiredNodeFeatureMissing
         end
       end
     end

data/lib/lightning/onion/failure_messages/temporary_channel_failure.rb

@@ -5,12 +5,12 @@ module Lightning
     module FailureMessages
       module TemporaryChannelFailure
         def to_payload
-          [type_code, channel_update.bytesize].pack('nn') + channel_update.htb
+          [TYPES[:temporary_channel_failure], channel_update.bytesize].pack('n2') + channel_update.htb
         end
 
         def self.load(payload)
-          type_code, len, rest = payload.unpack('nnH*')
-          new(type_code, rest[0..len * 2])
+          len, rest = payload.unpack('nH*')
+          new(rest[0..len * 2])
         end
       end
     end

data/lib/lightning/onion/failure_messages/temporary_node_failure.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module TemporaryNodeFailure
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:temporary_node_failure]].pack('n')
         end
 
         def self.load(payload)
-          new(*payload.unpack('n'))
+          TemporaryNodeFailure
         end
       end
     end

data/lib/lightning/onion/failure_messages/unknown_next_peer.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module UnknownNextPeer
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:unknown_next_peer]].pack('n')
         end
 
         def self.load(payload)
-          new(*payload.unpack('n'))
+          UnknownNextPeer
         end
       end
     end

data/lib/lightning/onion/failure_messages/unknown_payment_hash.rb

@@ -5,11 +5,11 @@ module Lightning
     module FailureMessages
       module UnknownPaymentHash
         def to_payload
-          [type_code].pack('n')
+          [TYPES[:unknown_payment_hash]].pack('n')
         end
 
-        def self.load(payload)
-          new(*payload.unpack('n'))
+        def self.load(_)
+          UnknownPaymentHash
         end
       end
     end

data/lib/lightning/onion/failure_messages.rb

@@ -41,87 +41,54 @@ module Lightning
       }.freeze
 
       FailureMessage = Algebrick.type do
-        InvalidRealm = type do
-          fields! type_code: Numeric
-        end
-        TemporaryNodeFailure = type do
-          fields! type_code: Numeric
-        end
-        PermanentNodeFailure = type do
-          fields! type_code: Numeric
-        end
-        RequiredNodeFeatureMissing = type do
-          fields! type_code: Numeric
-        end
+        InvalidRealm = atom
+        TemporaryNodeFailure = atom
+        PermanentNodeFailure = atom
+        RequiredNodeFeatureMissing = atom
         InvalidOnionVersion = type do
-          fields! type_code: Numeric,
-                  sha256_of_onion: String
+          fields! sha256_of_onion: String
         end
         InvalidOnionHmac = type do
-          fields! type_code: Numeric,
-                  sha256_of_onion: String
+          fields! sha256_of_onion: String
         end
         InvalidOnionKey = type do
-          fields! type_code: Numeric,
-                  sha256_of_onion: String
+          fields! sha256_of_onion: String
         end
         TemporaryChannelFailure = type do
-          fields! type_code: Numeric,
-                  channel_update: String
-        end
-        PermanentChannelFailure = type do
-          fields! type_code: Numeric
-        end
-        RequiredChannelFeatureMissing = type do
-          fields! type_code: Numeric
-        end
-        UnknownNextPeer = type do
-          fields! type_code: Numeric
+          fields! channel_update: String
         end
+        PermanentChannelFailure = atom
+        RequiredChannelFeatureMissing = atom
+        UnknownNextPeer = atom
         AmountBelowMinimum = type do
-          fields! type_code: Numeric,
-                  htlc_msat: Numeric,
+          fields! htlc_msat: Numeric,
                   channel_update: String
         end
         FeeInsufficient = type do
-          fields! type_code: Numeric,
-                  htlc_msat: Numeric,
+          fields! htlc_msat: Numeric,
                   channel_update: String
         end
         IncorrectCltvExpiry = type do
-          fields! type_code: Numeric,
-                  cltv_expiry: Numeric,
+          fields! cltv_expiry: Numeric,
                   channel_update: String
         end
         ExpiryTooSoon = type do
-          fields! type_code: Numeric,
-                  channel_update: String
-        end
-        UnknownPaymentHash = type do
-          fields! type_code: Numeric
-        end
-        IncorrectPaymentAmount = type do
-          fields! type_code: Numeric
-        end
-        FinalExpiryTooSoon = type do
-          fields! type_code: Numeric
+          fields! channel_update: String
         end
+        UnknownPaymentHash = atom
+        IncorrectPaymentAmount = atom
+        FinalExpiryTooSoon = atom
         FinalIncorrectCltvExpiry = type do
-          fields! type_code: Numeric,
-                  cltv_expiry: Numeric
+          fields! cltv_expiry: Numeric
         end
         FinalIncorrectHtlcAmount = type do
-          fields! type_code: Numeric,
-                  incoming_htlc_amt: Numeric
+          fields! incoming_htlc_amt: Numeric
         end
         ChannelDisabled = type do
-          fields! type_code: Numeric,
-                  flags: String,
+          fields! flags: String,
                   channel_update: String
         end
-        ExpiryTooFar = type do
-          fields! type_code: Numeric
-        end
+        ExpiryTooFar = atom
         variants  InvalidRealm,
                   TemporaryNodeFailure,
                   PermanentNodeFailure,
@@ -147,11 +114,11 @@ module Lightning
       end
 
       def self.load(payload)
-        type, = payload.unpack('na*')
+        type, rest = payload.unpack('na*')
         message_class = FailureMessage.variants.find do |t|
           TYPES[t.name.split('::').last.snake.to_sym] == type
         end
-        message_class.load(payload)
+        message_class.load(rest)
       end
 
       require 'lightning/onion/failure_messages/invalid_realm'

data/lib/lightning/onion/sphinx.rb

@@ -38,6 +38,7 @@ module Lightning
 
       # @return payload 33bytes payload of the outermost layer of onions,which including realm
       # @return packet
+      # @return Shared Secret
       def self.parse(private_key, raw_packet)
         packet = Lightning::Onion::Packet.parse(raw_packet)
         shared_secret = compute_shared_secret(packet.public_key, private_key)

data/lib/lightning/onion/version.rb

@@ -2,6 +2,6 @@
 
 module Lightning
   module Onion
-    VERSION = '0.2.6'
+    VERSION = '0.2.8'
   end
 end

data/lib/lightning/onion.rb

@@ -4,7 +4,7 @@ require 'lightning/onion/version'
 
 require 'algebrick'
 require 'bitcoin'
-require 'rbnacl'
+require 'rbnacl/libsodium'
 
 require 'lightning/utils/string'
 

data/lightning-onion.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'algebrick'
   spec.add_runtime_dependency 'bitcoinrb'
-  spec.add_runtime_dependency 'rbnacl'
+  spec.add_runtime_dependency 'rbnacl-libsodium'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightning-onion
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algebrick
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rbnacl
+  name: rbnacl-libsodium
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Onion routing for the Lightning Network.