lightning-invoice 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375d36d83038fe6b7217886fdcfc6319ebec19e9d166f3f730bb8c77101f1540
-  data.tar.gz: f174bf5270d239dabffd270d7e9b432c9b38b6c5b535f17f639f6ca0a5534775
+  metadata.gz: da417a5937a2c557525216152eaa8c781a61149e9a3570bebf025d9b39f8cc05
+  data.tar.gz: 2e06f5a1c4ce90876e538cd37d630e872c5954c7f82f6df172513b97e3fd7c66
 SHA512:
-  metadata.gz: aa04a1fbf65880f4b74888a37dc7a972343acc4482eaf479d4231cc763e2615f328edd493cb78a991fbc84338d1288226a77c3af591e859384fdcd37bbc18dd8
-  data.tar.gz: dfacafa8dd99a981463d19bc261f758281a1fc3941c854b2ce372827e8e8c396ee3ee93fc32c35bbad5e255fb657bbdc6f9000b29f5905a83ff46e2949b77bcb
+  metadata.gz: 6bdfd0640908019f31e1ecbd1b30eea3ba26f5f93787b924a61a94671de9888ce547dd48e2e1684ffe498cea18b8be6e375eabcf0adbab667338660c455067a1
+  data.tar.gz: 9266c30da04a5dc4d9cdcf4b79cdc744e7c3c7f87497bde42287035127cf2e8407653bb3f9135849100dbad9a11171e389f1e302f354d43f1d2dce669ee8d9b9

data/lib/lightning/invoice.rb

@@ -15,10 +15,6 @@ module Lightning
       attr_accessor :timestamp, :signature, :payment_hash, :description, :pubkey, :description_hash, :expiry, :min_final_cltv_expiry, :fallback_address, :routing_info
 
       def initialize
-        @amount = -1
-        @timestamp = 0
-        @expiry = 3600
-        @min_final_cltv_expiry = 9
         @routing_info = []
       end
 
@@ -29,40 +25,40 @@ module Lightning
         human << multiplier if multiplier
         data = []
         data += Invoice.int_to_array(timestamp)
-        if payment_hash
+        if payment_hash && !payment_hash.empty?
           data += [1]
           data += [1, 20]
           data += Invoice.buffer_to_word(payment_hash.htb)
         end
-        if description
+        if description && !description.empty?
           data += [13]
           description_word = Invoice.buffer_to_word(description)
           data += Invoice.int_to_array(description_word.size)
           data += description_word
         end
-        if pubkey
+        if pubkey && !pubkey.empty?
           data += [19]
           data += [1, 21]
           data += Invoice.buffer_to_word(pubkey.htb)
         end
-        if description_hash
+        if description_hash && !description_hash.empty?
           data += [23]
           data += [1, 20]
           data += Invoice.buffer_to_word(description_hash.htb)
         end
-        if expiry && expiry != 3600
+        if expiry
           data += [6]
           expiry_word = Invoice.int_to_array(expiry)
           data += Invoice.int_to_array(expiry_word.size)
           data += expiry_word
         end
-        if min_final_cltv_expiry && min_final_cltv_expiry != 9
+        if min_final_cltv_expiry
           data += [24]
           min_final_cltv_expiry_word = Invoice.int_to_array(min_final_cltv_expiry)
           data += Invoice.int_to_array(min_final_cltv_expiry_word.size)
           data += min_final_cltv_expiry_word
         end
-        if fallback_address
+        if fallback_address && !fallback_address.empty?
           data += [9]
           type = fallback_address_type(fallback_address)
           case type
@@ -123,53 +119,58 @@ module Lightning
       message.timestamp = to_int(data_part[0...7])
       tags = data_part[7...data_part.size - 104]
       index = 0
-      while index < tags.size
-        type = tags[index]
-        data_length = (tags[index + 1].to_i << 5) + tags[index + 2].to_i
-        data = tags[index + 3 ... index + 3 + data_length]
-        bytes = to_bytes(data)
-        index += 3 + data_length
-        case type
-        when 1
-          message.payment_hash = bytes[0...64].pack("C*").bth
-        when 13
-          message.description = bytes.pack("C*").force_encoding('utf-8')
-        when 19
-          message.pubkey = bytes[0...66].pack("C*").bth
-        when 23
-          message.description_hash = bytes[0...64].pack("C*").bth
-        when 6
-          message.expiry = to_int(data)
-        when 24
-          message.min_final_cltv_expiry = to_int(data)
-        when 9
-          address = to_bytes(data[1..-1])
-          hex = address.pack("C*").unpack("H*").first
-          case data[0]
-          when 0
-            message.fallback_address = Bitcoin::Script.to_p2wpkh(hex).addresses.first
-          when 17
-            message.fallback_address = Bitcoin.encode_base58_address(hex, Bitcoin.chain_params.address_version)
-          when 18
-            message.fallback_address = Bitcoin.encode_base58_address(hex, Bitcoin.chain_params.p2sh_version)
+      if tags
+        while index < tags.size
+          type = tags[index]
+          data_length = (tags[index + 1].to_i << 5) + tags[index + 2].to_i
+          data = tags[index + 3 ... index + 3 + data_length]
+          bytes = to_bytes(data)
+          index += 3 + data_length
+          case type
+          when 1
+            message.payment_hash = bytes[0...64].pack("C*").bth
+          when 13
+            message.description = bytes.pack("C*").force_encoding('utf-8')
+          when 19
+            message.pubkey = bytes[0...66].pack("C*").bth
+          when 23
+            message.description_hash = bytes[0...64].pack("C*").bth
+          when 6
+            message.expiry = to_int(data)
+          when 24
+            message.min_final_cltv_expiry = to_int(data)
+          when 9
+            address = to_bytes(data[1..-1])
+            hex = address.pack("C*").unpack("H*").first
+            case data[0]
+            when 0
+              message.fallback_address = Bitcoin::Script.to_p2wpkh(hex).addresses.first
+            when 17
+              message.fallback_address = Bitcoin.encode_base58_address(hex, Bitcoin.chain_params.address_version)
+            when 18
+              message.fallback_address = Bitcoin.encode_base58_address(hex, Bitcoin.chain_params.p2sh_version)
+            else
+            end
+          when 3
+            offset = 0
+            while offset < bytes.size
+              message.routing_info << Lightning::Invoice::RoutingInfo.new(
+                bytes[offset...offset + 33].pack("C*").bth,
+                bytes[offset + 33...offset + 41].pack("C*").bth,
+                to_int(bytes[offset + 41...offset + 45]),
+                to_int(bytes[offset + 45...offset + 49]),
+                to_int(bytes[offset + 49...offset + 51])
+              )
+              offset += 51
+            end
           else
           end
-        when 3
-          offset = 0
-          while offset < bytes.size
-            message.routing_info << Lightning::Invoice::RoutingInfo.new(
-              bytes[offset...offset + 33].pack("C*").bth,
-              bytes[offset + 33...offset + 41].pack("C*").bth,
-              to_int(bytes[offset + 41...offset + 45]),
-              to_int(bytes[offset + 45...offset + 49]),
-              to_int(bytes[offset + 49...offset + 51])
-            )
-            offset += 51
-          end
-        else
         end
       end
-      message.signature = word_to_buffer(data_part[data_part.size - 104..-1], true).bth
+      sig = data_part[data_part.size - 104..-1]
+      if sig
+        message.signature = word_to_buffer(sig).bth
+      end
       message
     end
 
@@ -177,21 +178,17 @@ module Lightning
       human.scan(/^([a-zA-Z]+)(\d*)([munp]?)$/)&.first
     end
 
-    def self.word_to_buffer(data, trim)
-      buffer = convert(data, 5, 8)
-
-      if trim && (data.size * 5 % 8 != 0)
-        buffer = buffer[0...-1]
-      end
+    def self.word_to_buffer(data)
+      buffer = convert(data, 5, 8, false)
       return buffer.pack("C*")
     end
 
     def self.buffer_to_word(buffer)
-      words = convert(buffer.unpack('C*'), 8, 5)
+      words = convert(buffer.unpack('C*'), 8, 5, true)
       return words
     end
 
-    def self.convert(data, inbits, outbits)
+    def self.convert(data, inbits, outbits, padding)
       value = 0
       bits = 0
       max = (1 << outbits) - 1
@@ -207,7 +204,7 @@ module Lightning
         end
       end
 
-      if bits > 0
+      if padding && bits > 0
         result << ((value << (outbits - bits)) & max)
       end
 

data/lib/lightning/invoice/version.rb

@@ -1,5 +1,5 @@
 module Lightning
   module Invoice
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightning-invoice
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler