bech32 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6e0eb4edcadc4cbeeb612e0d085bb3caed330ed1c312c1d8465baec26a4923
-  data.tar.gz: ea2abc8eae17e2b503e091c71402a6f9dbd3f2be7ecd416eed3dcc08be3fccb6
+  metadata.gz: 1e52ce0d1cc8ab59a97a220fc50e134c3c70fcc5beebd83b86631f4a3c6fc39d
+  data.tar.gz: cbf75c9c25a349c048ee2ad3503d3db8f6631babccdbfb8a7608dd7de9a60ce0
 SHA512:
-  metadata.gz: 39d972ba715a32e90cda977d9a6c9a53f5648e760c0afcaf9edd83e1a94ce882a09d0d38d2781a691def7d8595d270d1293f96ae63df22dd981dc23ddaaf6e40
-  data.tar.gz: a463c2478f923f6b8b27123e5e1af24e0f6ebee5c0593fa02243311b1ca364db7d82ceea1375d9f5078e14cc3adf3bfa6eced482ea86045fa5ec1fc726fcbe47
+  metadata.gz: 399a572833d9f651037a7e49c17917bf1e82521fac556c8cc47e14422ef96b200797124e95d51ac2ac760947fdf6b10c39485cbd1228529b72ad3b46e063f5f0
+  data.tar.gz: 6cd811fad6a9a6da5853230ff4501be650afc3a1efeb8208b098774f9bd83676e79ad7be433911774f3005b61054f43671623176bfec1a37835d5f24557e1755

data/.github/workflows/main.yml

@@ -19,15 +19,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['3.0', '3.1', '3.2']
 
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby
         # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
         # change this to (see https://github.com/ruby/setup-ruby#versioning):
-        # uses: ruby/setup-ruby@v1
-        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/README.md

@@ -1,4 +1,4 @@
-# Bech32 [![Build Status](https://travis-ci.org/azuchi/bech32rb.svg?branch=master)](https://travis-ci.org/azuchi/bech32rb) [![Gem Version](https://badge.fury.io/rb/bech32.svg)](https://badge.fury.io/rb/bech32) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) <img src="http://segwit.co/static/public/images/logo.png" width="100">
+# Bech32 [![Build Status](https://github.com/azuchi/bech32rb/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/azuchi/bech32rb/actions/workflows/main.yml) [![Gem Version](https://badge.fury.io/rb/bech32.svg)](https://badge.fury.io/rb/bech32) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) <img src="http://segwit.co/static/public/images/logo.png" width="100">
 
 The implementation of the Bech32/Bech32m encoder and decoder for Ruby.
 
@@ -50,17 +50,6 @@ hrp, data, spec = Bech32.decode('BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4')
 # spec is whether Bech32::Encoding::BECH32 or Bech32::Encoding::BECH32M
 ```
 
-Decode Bech32-encoded Segwit address into `Bech32::SegwitAddr` instance.
-
-```ruby
-addr = 'BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4'
-segwit_addr = Bech32::SegwitAddr.new(addr)
-
-# generate script pubkey
-segwit_addr.to_script_pubkey
-=> 0014751e76e8199196d454941c45d1b3a323f1433bd6
-```
-
 #### Advanced
 
 The maximum number of characters of Bech32 defined in [BIP-173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki) is limited to 90 characters.
@@ -84,7 +73,20 @@ hrp = 'bc'
 data = [0, 14, 20, 15, 7, 13, 26, 0, 25, 18, 6, 11, 13, 8, 21, 4, 20, 3, 17, 2, 29, 3, 12, 29, 3, 4, 15, 24, 20, 6, 14, 30, 22]
 
 bech = Bech32.encode(hrp, data, Bech32::Encoding::BECH32)
-=> bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4
+=> 'bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4'
+```
+
+### Segwit
+
+Decode Bech32-encoded Segwit address into `Bech32::SegwitAddr` instance.
+
+```ruby
+addr = 'BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4'
+segwit_addr = Bech32::SegwitAddr.new(addr)
+
+# generate script pubkey
+segwit_addr.to_script_pubkey
+=> '0014751e76e8199196d454941c45d1b3a323f1433bd6'
 ```
 
 Encode Segwit script into Bech32 Segwit address.
@@ -95,7 +97,43 @@ segwit_addr.script_pubkey = '0014751e76e8199196d454941c45d1b3a323f1433bd6'
 
 # generate addr
 segwit_addr.addr
-=> bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4
+=> 'bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4'
+```
+
+### Nostr
+
+Supports encoding/decoding of Nostr's [NIP-19](https://github.com/nostr-protocol/nips/blob/master/19.md) entities.
+
+```ruby
+# Decode bare entity
+bech32 = 'npub10elfcs4fr0l0r8af98jlmgdh9c8tcxjvz9qkw038js35mp4dma8qzvjptg'
+entity = Bech32::Nostr::NIP19.parse(bech32)
+entity.hrp
+=> 'npub'
+entity.data
+=> '7e7e9c42a91bfef19fa929e5fda1b72e0ebc1a4c1141673e2794234d86addf4e'
+
+# Decode tlv entity
+bech32 = 'nprofile1qqsrhuxx8l9ex335q7he0f09aej04zpazpl0ne2cgukyawd24mayt8gpp4mhxue69uhhytnc9e3k7mgpz4mhxue69uhkg6nzv9ejuumpv34kytnrdaksjlyr9p'
+entity = Bech32::Nostr::NIP19.parse(bech32)
+entity.hrp
+=> 'nprofile'
+entity.entries[0].value
+=> '3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d'
+entity.entries[1].value
+=> 'wss://r.x.com'
+
+# Encode bare entity
+entity = Bech32::Nostr::BareEntity.new('npub', '7e7e9c42a91bfef19fa929e5fda1b72e0ebc1a4c1141673e2794234d86addf4e')
+entity.encode
+=> 'npub10elfcs4fr0l0r8af98jlmgdh9c8tcxjvz9qkw038js35mp4dma8qzvjptg'
+
+# Encode tlv entity
+entry_relay = Bech32::Nostr::TLVEntry.new(Bech32::Nostr::TLVEntity::TYPE_RELAY, 'wss://relay.nostr.example')
+entry_author = Bech32::Nostr::TLVEntry.new(Bech32::Nostr::TLVEntity::TYPE_AUTHOR, '97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322')
+entity = Bech32::Nostr::TLVEntity.new(Bech32::Nostr::NIP19::HRP_EVENT, [entry_relay, entry_author])
+entity.encode
+=> 'nevent1qyvhwumn8ghj7un9d3shjtnwdaehgu3wv4uxzmtsd3jsygyhcu9ygdn2v56uz3dnx0uh865xmlwz675emfsccsxxguz6mx8rygstv78u'
 ```
 
 ### CLI

data/lib/bech32/nostr/entity.rb

@@ -0,0 +1,147 @@
+module Bech32
+  module Nostr
+    class BareEntity
+      attr_reader :hrp
+      attr_reader :data
+
+      # Initialize bare entity.
+      # @param [String] hrp human-readable part.
+      # @param [String] data Entity data(hex string).
+      def initialize(hrp, data)
+        raise ArgumentError, "HRP #{hrp} is unsupported." unless NIP19::BARE_PREFIXES.include?(hrp)
+        raise ArgumentError, "Data whose HRP is #{hrp} must be 32 bytes." unless [data].pack('H*').bytesize == 32
+        @hrp = hrp
+        @data = data
+      end
+
+      # Encode bare entity to bech32 string.
+      # @return [String] bech32 string.
+      def encode
+        Bech32.encode(hrp, Bech32.convert_bits([data].pack('H*').unpack('C*'), 8, 5), Bech32::Encoding::BECH32)
+      end
+    end
+
+    class TLVEntry
+
+      attr_reader :type
+      attr_reader :label
+      attr_reader :value
+
+      def initialize(type, value, label = nil)
+        raise ArgumentError, "Type #{type} unsupported." unless TLVEntity::TYPES.include?(type)
+
+        @type = type
+        @value = value
+        @label = label
+      end
+
+      # Convert to binary data.
+      # @return [String] binary data.
+      def to_payload
+        data = if value.is_a?(Integer)
+                 [value].pack('N')
+               else
+                 hex_string?(value) ? [value].pack('H*') : value
+               end
+        len = data.bytesize
+        [type, len].pack('CC') + data
+      end
+
+      private
+
+      # Check whether +str+ is hex string or not.
+      # @param [String] str string.
+      # @return [Boolean]
+      def hex_string?(str)
+        return false if str.bytes.any? { |b| b > 127 }
+        return false if str.length % 2 != 0
+        hex_chars = str.chars.to_a
+        hex_chars.all? { |c| c =~ /[0-9a-fA-F]/ }
+      end
+    end
+
+    class TLVEntity
+
+      TYPE_SPECIAL = 0
+      TYPE_RELAY = 1
+      TYPE_AUTHOR = 2
+      TYPE_KIND = 3
+
+      TYPES = [TYPE_SPECIAL, TYPE_RELAY, TYPE_AUTHOR, TYPE_KIND]
+
+      attr_reader :hrp
+      attr_reader :entries
+
+      # Initialize TLV entity.
+      # @param [String] hrp human-readable part.
+      # @param [Array<TLVEntry>] entries TLV entries.
+      # @return [TLVEntity]
+      def initialize(hrp, entries)
+        raise ArgumentError, "HRP #{hrp} is unsupported." unless NIP19::TLV_PREFIXES.include?(hrp)
+        entries.each do |e|
+          raise ArgumentError, "Entries must be TLVEntry. #{e.class} given." unless e.is_a?(TLVEntry)
+        end
+
+        @hrp = hrp
+        @entries = entries
+      end
+
+      # Parse TLV entity from data.
+      # @param [String] hrp human-readable part.
+      # @param [String] data Entity data(binary format).
+      # @return [TLVEntity]
+      def self.parse(hrp, data)
+        buf = StringIO.new(data)
+        entries = []
+        until buf.eof?
+          type, len = buf.read(2).unpack('CC')
+          case type
+          when TYPE_SPECIAL # special
+            case hrp
+            when NIP19::HRP_PROFILE
+              entries << TLVEntry.new(type, buf.read(len).unpack1('H*'), 'pubkey')
+            when NIP19::HRP_RELAY
+              entries << TLVEntry.new(type, buf.read(len), 'relay')
+            when NIP19::HRP_EVENT
+              entries << TLVEntry.new(type, buf.read(len).unpack1('H*'), 'id')
+            when NIP19::HRP_EVENT_COORDINATE
+              entries << TLVEntry.new(type, buf.read(len), 'identifier')
+            end
+          when TYPE_RELAY # relay
+            case hrp
+            when NIP19::HRP_PROFILE, NIP19::HRP_EVENT, NIP19::HRP_EVENT_COORDINATE
+              entries << TLVEntry.new(type, buf.read(len), 'relay')
+            else
+              raise ArgumentError, "Type: #{type} does not supported for HRP: #{hrp}"
+            end
+          when TYPE_AUTHOR # author
+            case hrp
+            when NIP19::HRP_EVENT, NIP19::HRP_EVENT_COORDINATE
+              entries << TLVEntry.new(type, buf.read(len).unpack1('H*'), 'author')
+            else
+              raise ArgumentError, "Type: #{type} does not supported for HRP: #{hrp}"
+            end
+          when TYPE_KIND # kind
+            case hrp
+            when NIP19::HRP_EVENT, NIP19::HRP_EVENT_COORDINATE
+              entries << TLVEntry.new(type, buf.read(len).unpack1('H*').to_i(16), 'kind')
+            else
+              raise ArgumentError, "Type: #{type} does not supported for HRP: #{hrp}"
+            end
+          else
+            raise ArgumentError, "Unknown TLV type: #{type}"
+          end
+        end
+
+        TLVEntity.new(hrp, entries)
+      end
+
+      # Encode tlv entity to bech32 string.
+      # @return [String] bech32 string.
+      def encode
+        data = entries.map(&:to_payload).join
+        Bech32.encode(hrp, Bech32.convert_bits(data.unpack('C*'), 8, 5), Bech32::Encoding::BECH32)
+      end
+    end
+  end
+end

data/lib/bech32/nostr/nip19.rb

@@ -0,0 +1,41 @@
+module Bech32
+  module Nostr
+    module NIP19
+
+      HRP_PUBKEY = 'npub'
+      HRP_PRIVATE_KEY = 'nsec'
+      HRP_NOTE_ID = 'note'
+      HRP_PROFILE = 'nprofile'
+      HRP_EVENT = 'nevent'
+      HRP_RELAY = 'nrelay'
+      HRP_EVENT_COORDINATE = 'naddr'
+
+      BARE_PREFIXES = [HRP_PUBKEY, HRP_PRIVATE_KEY, HRP_NOTE_ID]
+      TLV_PREFIXES = [HRP_PROFILE, HRP_EVENT, HRP_RELAY, HRP_EVENT_COORDINATE]
+      ALL_PREFIXES = BARE_PREFIXES + TLV_PREFIXES
+
+      module_function
+
+      # Decode nip19 string.
+      # @param [String] string Bech32 string.
+      # @return [BareEntity | TLVEntity]
+      def decode(string)
+        hrp, data, spec = Bech32.decode(string, string.length)
+
+        raise ArgumentError, 'Invalid nip19 string.' if hrp.nil?
+        raise ArgumentError, 'Invalid bech32 spec.' unless spec == Bech32::Encoding::BECH32
+
+        entity = Bech32.convert_bits(data, 5, 8, false).pack('C*')
+        raise ArgumentError, "Data whose HRP is #{hrp} must be 32 bytes." if BARE_PREFIXES.include?(hrp) && entity.bytesize != 32
+        if BARE_PREFIXES.include?(hrp)
+          BareEntity.new(hrp, entity.unpack1('H*'))
+        elsif TLV_PREFIXES.include?(hrp)
+          TLVEntity.parse(hrp, entity)
+        else
+          raise ArgumentError, "HRP #{hrp} is unsupported."
+        end
+      end
+
+    end
+  end
+end

data/lib/bech32/nostr.rb

@@ -0,0 +1,8 @@
+module Bech32
+  module Nostr
+    autoload :NIP19, 'bech32/nostr/nip19'
+    autoload :BareEntity, 'bech32/nostr/entity'
+    autoload :TLVEntity, 'bech32/nostr/entity'
+  end
+
+end

data/lib/bech32/segwit_addr.rb

@@ -18,7 +18,7 @@ module Bech32
     # Returns segwit script pubkey which generated from witness version and witness program.
     def to_script_pubkey
       v = ver == 0 ? ver : ver + 0x50
-      ([v, prog.length].pack("CC") + prog.map{|p|[p].pack("C")}.join).unpack('H*').first
+      ([v, prog.length] + prog).pack('C*').unpack("H*").first
     end
 
     # parse script pubkey into witness version and witness program
@@ -31,7 +31,7 @@ module Bech32
     # Returns segwit address string which generated from hrp, witness version and witness program.
     def addr
       spec = (ver == 0 ? Bech32::Encoding::BECH32 : Bech32::Encoding::BECH32M)
-      Bech32.encode(hrp, [ver] + convert_bits(prog, 8, 5), spec)
+      Bech32.encode(hrp, [ver] + Bech32.convert_bits(prog, 8, 5), spec)
     end
 
     private
@@ -41,34 +41,11 @@ module Bech32
       raise 'Invalid address.' if hrp.nil? || data[0].nil? || ![HRP_MAINNET, HRP_TESTNET, HRP_REGTEST].include?(hrp)
       @ver = data[0]
       raise 'Invalid witness version' if @ver > 16
-      @prog = convert_bits(data[1..-1], 5, 8, false)
+      @prog = Bech32.convert_bits(data[1..-1], 5, 8, false)
       raise 'Invalid witness program' if @prog.nil? || @prog.length < 2 || @prog.length > 40
       raise 'Invalid witness program with version 0' if @ver == 0 && (@prog.length != 20 && @prog.length != 32)
       raise 'Witness version and encoding spec do not match' if (@ver == 0 && spec != Bech32::Encoding::BECH32) || (@ver != 0 && spec != Bech32::Encoding::BECH32M)
     end
 
-    def convert_bits(data, from, to, padding=true)
-      acc = 0
-      bits = 0
-      ret = []
-      maxv = (1 << to) - 1
-      max_acc = (1 << (from + to - 1)) - 1
-      data.each do |v|
-        return nil if v < 0 || (v >> from) != 0
-        acc = ((acc << from) | v) & max_acc
-        bits += from
-        while bits >= to
-          bits -= to
-          ret << ((acc >> bits) & maxv)
-        end
-      end
-      if padding
-        ret << ((acc << (to - bits)) & maxv) unless bits == 0
-      elsif bits >= from || ((acc << (to - bits)) & maxv) != 0
-        return nil
-      end
-      ret
-    end
-
   end
 end

data/lib/bech32/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bech32
-  VERSION = '1.2.1'
+  VERSION = '1.4.0'
 end

data/lib/bech32.rb

@@ -6,6 +6,7 @@ module Bech32
   end
 
   autoload :SegwitAddr, 'bech32/segwit_addr'
+  autoload :Nostr, 'bech32/nostr'
 
   SEPARATOR = '1'
 
@@ -86,6 +87,35 @@ module Bech32
     hrp.each_char.map{|c|c.ord >> 5} + [0] + hrp.each_char.map{|c|c.ord & 31}
   end
 
+  # Convert a +data+ where each byte is encoding +from+ bits to a byte slice where each byte is encoding +to+ bits.
+  # @param [Array] data
+  # @param [Integer] from
+  # @param [Integer] to
+  # @param [Boolean] padding
+  # @return [Array]
+  def convert_bits(data, from, to, padding=true)
+    acc = 0
+    bits = 0
+    ret = []
+    maxv = (1 << to) - 1
+    max_acc = (1 << (from + to - 1)) - 1
+    data.each do |v|
+      return nil if v < 0 || (v >> from) != 0
+      acc = ((acc << from) | v) & max_acc
+      bits += from
+      while bits >= to
+        bits -= to
+        ret << ((acc >> bits) & maxv)
+      end
+    end
+    if padding
+      ret << ((acc << (to - bits)) & maxv) unless bits == 0
+    elsif bits >= from || ((acc << (to - bits)) & maxv) != 0
+      return nil
+    end
+    ret
+  end
+
   # Compute Bech32 checksum
   def polymod(values)
     generator = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bech32
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Shigeyuki Azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,6 +75,9 @@ files:
 - bin/setup
 - exe/bech32
 - lib/bech32.rb
+- lib/bech32/nostr.rb
+- lib/bech32/nostr/entity.rb
+- lib/bech32/nostr/nip19.rb
 - lib/bech32/segwit_addr.rb
 - lib/bech32/version.rb
 homepage: https://github.com/azuchi/bech32rb