lightning-onion 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e96fee0d17c3fa8c0d25227c524d114420a3379
-  data.tar.gz: ace242df5e184ca510f36c08e637cff9cdbaec45
+  metadata.gz: 5ab9c2e28c21df3eaba32de0c6f94e42fd20706c
+  data.tar.gz: e959dd65032a7f2da7691bce6fb88b2fb204b3ba
 SHA512:
-  metadata.gz: 23f082d3364b7f6055196c53eebf9f4b2c27c1f745bc212013d264905709683b4780f6e8c4ba12fcf610729ced94ffd753fad525723db4a9568d44666772121c
-  data.tar.gz: f261e6f469659ee727ece29a27df3fedfab34c93eccfc053c605f3181a87f2f719a6efee6a6eec3e879da7cd87e104ad72d68c8c4bb0bb9bd26e1c223d014f71
+  metadata.gz: a1d3b593b58cb084effcadf2ba13e005aad49883cd1f51913fedb9cc9a5e6513878378511b76374007f7e63db62932908b1d7c9c3bddfc78db79a2e94314bb23
+  data.tar.gz: 30f204b6fffe908f3a9d8cc233d30285610a374f50f3e55ce82e7c021788d5a59618ac4049ad41177890a3ce968ec33f4a52ed91107c7d2e8f4dedf870764ac9

data/lib/lightning/onion/packet.rb

@@ -3,29 +3,27 @@
 module Lightning
   module Onion
     class Packet
-      attr_accessor :version, :public_key, :hops_data, :hmac
-      def initialize(version, public_key, hops_data, hmac)
+      attr_accessor :version, :public_key, :routing_info, :hmac
+      def initialize(version, public_key, routing_info, hmac)
         @version = version
         @public_key = public_key
-        @hops_data = hops_data
+        @routing_info = routing_info
+        raise "invalid size #{routing_info.size}" unless routing_info.size == 1300 * 2
         @hmac = hmac
       end
 
       def self.parse(payload)
-        version, public_key, rest = payload.unpack('H2H66a*')
-        hops_data = []
-        20.times do |i|
-          hops_data << Lightning::Onion::HopData.parse(rest[i * 65...i * 65 + 65])
-        end
-        hmac = rest[21 * 65..-1]
-        new(version, public_key, hops_data, hmac)
+        version, public_key, rest = payload.unpack('aH66a*')
+        routing_info = rest[0...20 * 65].bth
+        hmac = rest[20 * 65..-1].bth
+        new(version, public_key, routing_info, hmac)
       end
 
       def to_payload
         payload = +''
-        payload << [version.bth, public_key].pack('H2H66')
-        payload << [hops_data.map(&:to_payload).join].pack('a1300')
-        payload << hmac
+        payload << [version, public_key].pack('aH66')
+        payload << routing_info.htb
+        payload << hmac.htb
         payload
       end
     end

data/lib/lightning/onion/per_hop.rb

@@ -12,13 +12,29 @@ module Lightning
       end
 
       def self.parse(payload)
-        new(*payload.unpack('Q>2Na16'))
+        new(*payload.unpack('Q>2Na12'))
       end
+      LAST_NODE = PerHop.parse("\x00" * 32)
 
       def to_payload
-        [short_channel_id, amt_to_forward, outgoing_cltv_value, padding].pack('Q>2Na12')
+        to_a.pack('Q>2Na12')
+      end
+
+      def ==(other)
+        other.class == self.class && other.to_a == to_a
+      end
+
+      alias eql? ==
+
+      def hash
+        to_a.hash
+      end
+
+      protected
+
+      def to_a
+        [short_channel_id, amt_to_forward, outgoing_cltv_value, padding]
       end
-      LAST_NODE = PerHop.parse("\x00" * 32)
     end
   end
 end

data/lib/lightning/onion/sphinx.rb

@@ -11,8 +11,7 @@ module Lightning
       MAX_ERROR_PAYLOAD_LENGTH = 256
       ERROR_PACKET_LENGTH = MAC_LENGTH + MAX_ERROR_PAYLOAD_LENGTH + 2 + 2
 
-      ZERO_HOP = Lightning::Onion::HopData.parse("\x00" * HOP_LENGTH)
-      LAST_PACKET = Lightning::Onion::Packet.new(VERSION, "\x00" * 33, [ZERO_HOP] * MAX_HOPS, "\x00" * MAC_LENGTH)
+      LAST_PACKET = Lightning::Onion::Packet.new(VERSION, "\x00" * 33, '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)
@@ -35,6 +34,25 @@ module Lightning
         [packet, shared_secrets.zip(public_keys)]
       end
 
+      # @return payload 33bytes payload of the outermost layer of onions,which including realm
+      # @return packet
+      def self.parse(private_key, raw_packet)
+        packet = Lightning::Onion::Packet.parse(raw_packet)
+        shared_secret = compute_shared_secret(packet.public_key, private_key)
+        rho = generate_key('rho', shared_secret)
+        bin = xor(
+          (packet.routing_info + '00' * HOP_LENGTH).htb.unpack('C*'),
+          generate_cipher_stream(rho, HOP_LENGTH + MAX_HOPS * HOP_LENGTH).unpack('C*')
+        )
+        payload = bin[0...HOP_LENGTH].pack('C*')
+        hmac = bin[PAYLOAD_LENGTH...HOP_LENGTH].pack('C*')
+        next_hops_data = bin[HOP_LENGTH..-1]
+
+        next_public_key = make_blind(packet.public_key, compute_blinding_factor(packet.public_key, shared_secret))
+        routing_info = next_hops_data.pack('C*').bth
+        [Lightning::Onion::HopData.parse(payload), Lightning::Onion::Packet.new(VERSION, next_public_key, routing_info, hmac.bth), shared_secret]
+      end
+
       def self.internal_make_packet(hop_payloads, keys, shared_secrets, packet, associated_data)
         return packet if hop_payloads.empty?
         next_packet = make_next_packet(hop_payloads.last, associated_data, keys.last, shared_secrets.last, packet)
@@ -42,8 +60,9 @@ module Lightning
       end
 
       def self.make_next_packet(payload, associated_data, ephemereal_public_key, shared_secret, packet, filler = '')
-        hops_data1 = payload.htb << packet.hmac << packet.hops_data.map(&:to_payload).join[0...-HOP_LENGTH]
-        stream = generate_cipher_stream(generate_key('rho', shared_secret), MAX_HOPS * HOP_LENGTH)
+        hops_data1 = payload.htb << packet.hmac.htb << packet.routing_info.htb[0...-HOP_LENGTH]
+        rho_key = generate_key('rho', shared_secret)
+        stream = generate_cipher_stream(rho_key, MAX_HOPS * HOP_LENGTH)
         hops_data2 = xor(hops_data1.unpack('C*'), stream.unpack('C*'))
         next_hops_data =
           if filler.empty?
@@ -51,14 +70,10 @@ module Lightning
           else
             hops_data2[0...-filler.htb.unpack('C*').size] + filler.htb.unpack('C*')
           end
-        next_hmac = mac(generate_key('mu', shared_secret), next_hops_data + associated_data.htb.unpack('C*'))
-        hops_data = []
-        20.times do |i|
-          payload = next_hops_data.pack('C*')[i * HOP_LENGTH...(i + 1) * HOP_LENGTH]
-          hops_data << Lightning::Onion::HopData.parse(payload)
-        end
-
-        Lightning::Onion::Packet.new(VERSION, ephemereal_public_key, hops_data, next_hmac)
+        mu_key = generate_key('mu', shared_secret)
+        next_hmac = mac(mu_key, next_hops_data + associated_data.htb.unpack('C*'))
+        routing_info = next_hops_data.pack('C*').bth
+        Lightning::Onion::Packet.new(VERSION, ephemereal_public_key, routing_info, next_hmac.bth)
       end
 
       def self.compute_keys_and_secrets(session_key, public_keys)
@@ -157,27 +172,6 @@ module Lightning
         hmac256(key, message.pack('C*'))[0...MAC_LENGTH]
       end
 
-      def self.parse(private_key, raw_packet)
-        packet = Lightning::Onion::Packet.parse(raw_packet)
-        shared_secret = compute_shared_secret(packet.public_key, private_key)
-        rho = generate_key('rho', shared_secret)
-        bin = xor(
-          (packet.hops_data.map(&:to_payload).join + "\x00" * HOP_LENGTH).unpack('C*'),
-          generate_cipher_stream(rho, HOP_LENGTH + MAX_HOPS * HOP_LENGTH).unpack('C*')
-        )
-        payload = bin[0...PAYLOAD_LENGTH].pack('C*')
-        hmac = bin[PAYLOAD_LENGTH...HOP_LENGTH].pack('C*')
-        next_hops_data = bin[HOP_LENGTH..-1]
-
-        next_public_key = make_blind(packet.public_key, compute_blinding_factor(packet.public_key, shared_secret))
-        hops_data = []
-        20.times do |i|
-          hop_payload = next_hops_data.pack('C*')[i * HOP_LENGTH...(i + 1) * HOP_LENGTH]
-          hops_data << Lightning::Onion::HopData.parse(hop_payload)
-        end
-        [payload, Lightning::Onion::Packet.new(VERSION, next_public_key, hops_data, hmac), shared_secret]
-      end
-
       def self.make_error_packet(shared_secret, failure)
         message = failure.to_payload
         um = generate_key('um', shared_secret)

data/lib/lightning/onion/version.rb

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

metadata

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