sibit 0.30.2 → 0.30.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7463ec26890a5bd8515ce96c92190a50edaf46f5b94aed0a1b54261f0d63ca65
-  data.tar.gz: 71be0a78c7bfcfffdebc6daa2c63a570d561b5e6e923f0d600e2791c2856cac5
+  metadata.gz: d3d770048c5c19650ec325dd100d556c798c58d27ae06c120569161dc5ede087
+  data.tar.gz: b8b19fa66905fcd77379c4ebe6892ed6e5ee7ceece7ae1cc46f8921a50bb8a0e
 SHA512:
-  metadata.gz: ae0606a033a0506be0d3f397a0ac81bf51db53e7c35671256642764e2dcca358d95cbb9517c67c0a49f0621110926760154ea1c1c885d4aa5b6a2a32792078ff
-  data.tar.gz: 21a0bf5f5e27f3c22ceb82f2432d3b3fdd8a4ae1181cbdad383d34f081024c4802b6c83c2a7f51c1205728ccede22c8e45c8498f2d74ffd04282f828b29b4c54
+  metadata.gz: eb8af223383b416274d70182ab890d8d41540687112086510827f5b95f0a3ced72bd641d57fb7afd4bb43ff6c0ece6eb453dba8d4ff91f61d7097e069370f716
+  data.tar.gz: 2ec794eb825e11f3154c28f874e1fa6e6aadbe5be70510576a6c45768f5afba653561e1ade8e32ce3f8d1e32b64ea4b610892ec2a557b1504d377961358769b8

data/lib/sibit/base58.rb

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 require 'digest'
+require_relative 'error'
 
 # Sibit main class.
 class Sibit
@@ -36,7 +37,11 @@ class Sibit
     def decode
       leading = @data.match(/^1*/)[0].length
       num = 0
-      @data.each_char { |c| num = (num * 58) + ALPHABET.index(c) }
+      @data.each_char do |c|
+        idx = ALPHABET.index(c)
+        raise Sibit::Error, "Invalid Base58 character '#{c}' in address '#{@data}'" if idx.nil?
+        num = (num * 58) + idx
+      end
       hex = num.zero? ? '' : num.to_s(16)
       hex = "0#{hex}" if hex.length.odd?
       ('00' * leading) + hex

data/lib/sibit/bech32.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative 'error'
+
+# Sibit main class.
+class Sibit
+  # Bech32 decoding for SegWit addresses.
+  #
+  # Decodes Bech32/Bech32m addresses (bc1...) to witness programs.
+  #
+  # Author:: Yegor Bugayenko (yegor256@gmail.com)
+  # Copyright:: Copyright (c) 2019-2025 Yegor Bugayenko
+  # License:: MIT
+  class Bech32
+    CHARSET = 'qpzry9x8gf2tvdw0s3jn54khce6mua7l'
+    GENERATOR = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3].freeze
+
+    def initialize(addr)
+      @addr = addr.downcase
+    end
+
+    def witness
+      hrp, data = parse
+      raise Sibit::Error, "Invalid Bech32 checksum in '#{@addr}'" unless verified?(hrp, data)
+      prog = convert(data[1..-7], 5, 8, false)
+      prog.pack('C*').unpack1('H*')
+    end
+
+    def version
+      _, data = parse
+      data[0]
+    end
+
+    private
+
+    def parse
+      pos = @addr.rindex('1')
+      raise Sibit::Error, "Invalid Bech32 address '#{@addr}': no separator" if pos.nil? || pos < 1
+      hrp = @addr[0...pos]
+      rest = @addr[(pos + 1)..]
+      raise Sibit::Error, "Invalid Bech32 address '#{@addr}': data too short" if rest.length < 6
+      data = rest.chars.map { |c| CHARSET.index(c) }
+      raise Sibit::Error, "Invalid Bech32 character in '#{@addr}'" if data.include?(nil)
+      [hrp, data]
+    end
+
+    def verified?(hrp, data)
+      chk = polymod(expand(hrp) + data)
+      [1, 0x2bc830a3].include?(chk)
+    end
+
+    def expand(hrp)
+      hrp.chars.map { |c| c.ord >> 5 } + [0] + hrp.chars.map { |c| c.ord & 31 }
+    end
+
+    def polymod(values)
+      chk = 1
+      values.each do |v|
+        top = chk >> 25
+        chk = ((chk & 0x1ffffff) << 5) ^ v
+        5.times { |i| chk ^= GENERATOR[i] if (top >> i).allbits?(1) }
+      end
+      chk
+    end
+
+    def convert(data, frombits, tobits, pad)
+      acc = 0
+      bits = 0
+      result = []
+      maxv = (1 << tobits) - 1
+      data.each do |v|
+        acc = (acc << frombits) | v
+        bits += frombits
+        while bits >= tobits
+          bits -= tobits
+          result << ((acc >> bits) & maxv)
+        end
+      end
+      result << ((acc << (tobits - bits)) & maxv) if pad && bits.positive?
+      result
+    end
+  end
+end

data/lib/sibit/tx.rb

@@ -5,13 +5,12 @@
 
 require 'digest'
 require_relative 'base58'
+require_relative 'bech32'
 require_relative 'key'
 require_relative 'script'
 
 # Sibit main class.
 class Sibit
-  MIN_TX_FEE = 10_000
-
   # Bitcoin Transaction structure.
   #
   # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -98,8 +97,8 @@ class Sibit
       end
 
       def script
-        hash160 = address_to_hash160(@address)
-        [0x76, 0xa9, 0x14].pack('C*') + [hash160].pack('H*') + [0x88, 0xac].pack('C*')
+        return segwit_script if @address.downcase.start_with?('bc1')
+        p2pkh_script
       end
 
       def script_hex
@@ -108,9 +107,17 @@ class Sibit
 
       private
 
-      def address_to_hash160(addr)
-        decoded = Base58.new(addr).decode
-        decoded[2..41]
+      def p2pkh_script
+        decoded = Base58.new(@address).decode
+        hash = decoded[2..41]
+        [0x76, 0xa9, 0x14].pack('C*') + [hash].pack('H*') + [0x88, 0xac].pack('C*')
+      end
+
+      def segwit_script
+        bech = Bech32.new(@address)
+        witness = bech.witness
+        len = witness.length / 2
+        [0x00, len].pack('C*') + [witness].pack('H*')
       end
     end
 

data/lib/sibit/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.30.2'
+  VERSION = '0.30.4' unless defined?(VERSION)
 end

data/lib/sibit.rb

@@ -18,6 +18,9 @@ require_relative 'sibit/version'
 # Copyright:: Copyright (c) 2019-2025 Yegor Bugayenko
 # License:: MIT
 class Sibit
+  # Minimium fee we must pay for transaction processing:
+  MIN_SATOSHI_PER_BYTE = 0.1
+
   # Constructor.
   #
   # You may provide the log you want to see the messages in. If you don't
@@ -143,7 +146,7 @@ class Sibit
     tx = builder.tx(
       input_value: unspent,
       leave_fee: true,
-      extra_fee: [f, MIN_TX_FEE].max,
+      extra_fee: [f, (size * MIN_SATOSHI_PER_BYTE).to_i].max,
       change_address: change
     )
     left = unspent - tx.outputs.sum(&:value)
@@ -152,7 +155,7 @@ class Sibit
     #{tx.inputs.map { |i| " in: #{i.prev_out.unpack1('H*')}:#{i.prev_out_index}" }.join("\n    ")}
   #{tx.out.count} output#{'s' if tx.out.count > 1}:
     #{tx.outputs.map { |o| "out: #{o.script_hex} / #{num(o.value, p)}" }.join("\n    ")}
-  Min tx fee: #{num(MIN_TX_FEE, p)}
+  Min fee: #{num(MIN_SATOSHI_PER_BYTE, p)} s/byte
   Fee requested: #{num(f, p)} as \"#{fee}\"
   Fee actually paid: #{num(left, p)}
   Tx size: #{size} bytes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.30.2
+  version: 0.30.4
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -162,6 +162,7 @@ files:
 - features/support/env.rb
 - lib/sibit.rb
 - lib/sibit/base58.rb
+- lib/sibit/bech32.rb
 - lib/sibit/bestof.rb
 - lib/sibit/bitcoinchain.rb
 - lib/sibit/blockchain.rb