lightning-onion 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ab9c2e28c21df3eaba32de0c6f94e42fd20706c
-  data.tar.gz: e959dd65032a7f2da7691bce6fb88b2fb204b3ba
+  metadata.gz: c676e3e173135c4fb63cc8cf9d42936342f0a144
+  data.tar.gz: b2600dd7b5ee1215d1037aca1ee05734946dd57f
 SHA512:
-  metadata.gz: a1d3b593b58cb084effcadf2ba13e005aad49883cd1f51913fedb9cc9a5e6513878378511b76374007f7e63db62932908b1d7c9c3bddfc78db79a2e94314bb23
-  data.tar.gz: 30f204b6fffe908f3a9d8cc233d30285610a374f50f3e55ce82e7c021788d5a59618ac4049ad41177890a3ce968ec33f4a52ed91107c7d2e8f4dedf870764ac9
+  metadata.gz: d23269a725290926473ddaa35f816a006f29ba1048a724e634f81efe39d8e856f3c998b967e7284cf165db2a8b4aa1849a60568c5a6c7b0f286341bc36b0b265
+  data.tar.gz: ef568c4316a57737a824c9f95a7aa797d8d87c338f4899e045244b08bbb9627c8f5137e19839708fe90cca1530e2ccd7147ad95844899a5126bb511e96fb2bce

data/lib/lightning/onion/packet.rb

@@ -3,19 +3,22 @@
 module Lightning
   module Onion
     class Packet
+      include Lightning::Onion::Sphinx
+
       attr_accessor :version, :public_key, :routing_info, :hmac
+
       def initialize(version, public_key, routing_info, hmac)
         @version = version
         @public_key = public_key
         @routing_info = routing_info
-        raise "invalid size #{routing_info.size}" unless routing_info.size == 1300 * 2
+        raise "invalid size #{routing_info.size}" unless routing_info.size == MAX_HOPS * HOP_LENGTH * 2
         @hmac = hmac
       end
 
       def self.parse(payload)
         version, public_key, rest = payload.unpack('aH66a*')
-        routing_info = rest[0...20 * 65].bth
-        hmac = rest[20 * 65..-1].bth
+        routing_info = rest[0...MAX_HOPS * HOP_LENGTH].bth
+        hmac = rest[MAX_HOPS * HOP_LENGTH..-1].bth
         new(version, public_key, routing_info, hmac)
       end
 

data/lib/lightning/onion/sphinx.rb

@@ -4,14 +4,16 @@ module Lightning
   module Onion
     module Sphinx
       VERSION = "\x00"
+      PUBKEY_LENGTH = 33
       PAYLOAD_LENGTH = 33
       MAC_LENGTH = 32
       MAX_HOPS = 20
       HOP_LENGTH = PAYLOAD_LENGTH + MAC_LENGTH
       MAX_ERROR_PAYLOAD_LENGTH = 256
       ERROR_PACKET_LENGTH = MAC_LENGTH + MAX_ERROR_PAYLOAD_LENGTH + 2 + 2
+      PACKET_LENGTH = VERSION.bytesize + PUBKEY_LENGTH + MAX_HOPS * HOP_LENGTH + MAC_LENGTH
 
-      LAST_PACKET = Lightning::Onion::Packet.new(VERSION, "\x00" * 33, '00' * MAX_HOPS * HOP_LENGTH, '00' * MAC_LENGTH)
+      LAST_PACKET = Lightning::Onion::Packet.new(VERSION, "\x00" * PUBKEY_LENGTH, '00' * MAX_HOPS * HOP_LENGTH, '00' * MAC_LENGTH)
 
       def self.make_packet(session_key, public_keys, payloads, associated_data)
         ephemereal_public_keys, shared_secrets = compute_keys_and_secrets(session_key, public_keys)

data/lib/lightning/onion/version.rb

@@ -2,6 +2,6 @@
 
 module Lightning
   module Onion
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightning-onion
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algebrick