sibit 0.33.0 → 0.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fc905f4a84df3f625583d1d3b628d1639e830daec2fb9f729a2361bdbc79443
-  data.tar.gz: 95957394b7411ce0140b765f3806d9869854666d5a882a00aa7b2a5f70b9fc4d
+  metadata.gz: 469905d53f542975d0fe59c8b429289423762f4b36aca8b703928d54f5ba394f
+  data.tar.gz: c68a4237d70f25a11ea2e98c36d76c7b0917a6355353e6d23c22336eedd94f31
 SHA512:
-  metadata.gz: 68030b89ec041f142967f24f3d84ce481330ccb5828da88902aed944be0b26452f45fa361fb503b83feac2242ff4a284d2fa530cb6381da634258927a9ce06b4
-  data.tar.gz: 2d206f21e0129d28ef450c63afbf18b6d9c7a70a45a583d4b9554ead31fc598dab9af208bdced8744e3e92b9f56035451c6760f58df6d6152e935e18f491c93f
+  metadata.gz: f5aa717192c0417c572226c3a0f79924f61e5d70b0bc84efe53d0cc760c16515f3cd6ef63b00de57e4228dbcd82fdb60a269f35df858b0c1ff8bec81006db6bc
+  data.tar.gz: fe9f402e207051f02e31b54d0a4e41cca76efd2a0260fbc6dfb3fb69f1aa543af2a9af6045590bd653c6c26472c97fdb6d5ba3a8b5a98f4ca282e351d88f53ee

data/Gemfile

@@ -6,10 +6,8 @@
 source 'https://rubygems.org'
 gemspec
 
-# gem 'debase', '0.2.4.1', require: false
-
 gem 'aruba', '~>2.2', require: false
-gem 'cucumber', '~>10.0', require: false
+gem 'cucumber', '~>11.0', require: false
 gem 'donce', '~>0.2', require: false
 gem 'logger', '~>1.7', require: false
 gem 'minitest', '~>6.0', require: false
@@ -18,8 +16,9 @@ gem 'nokogiri', '~>1.18', require: false
 gem 'os', '~>1.1', require: false
 gem 'qbash', '~>0.0', require: false
 gem 'rake', '~>13.2', require: false
-gem 'rdoc', '~>7.0', require: false
-gem 'rubocop', '~>1.62', require: false
+gem 'rdoc', '~>8.0', require: false
+gem 'rubocop', '~>1.72', require: false
+gem 'rubocop-elegant', '~>0.5', require: false
 gem 'rubocop-minitest', '~>0.38', require: false
 gem 'rubocop-performance', '~>1.25', require: false
 gem 'rubocop-rake', '~>0.7', require: false

data/Gemfile.lock

@@ -16,133 +16,152 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.8)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
-    ansi (1.5.0)
-    aruba (2.3.3)
+    ansi (1.6.0)
+    aruba (2.4.1)
       bundler (>= 1.17)
       contracts (>= 0.16.0, < 0.18.0)
-      cucumber (>= 8.0, < 11.0)
+      cucumber (>= 8.0, < 12.0)
+      irb (~> 1.16)
       rspec-expectations (>= 3.4, < 5.0)
       thor (~> 1.0)
     ast (2.4.3)
     backtrace (0.4.1)
     base64 (0.3.0)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.2)
     builder (3.3.0)
     contracts (0.17.3)
     crack (1.0.1)
       bigdecimal
       rexml
-    cucumber (10.2.0)
+    cucumber (11.1.1)
       base64 (~> 0.2)
       builder (~> 3.2)
       cucumber-ci-environment (> 9, < 12)
-      cucumber-core (> 15, < 17)
+      cucumber-core (>= 16.2.0, < 17)
       cucumber-cucumber-expressions (> 17, < 20)
-      cucumber-html-formatter (> 21, < 23)
+      cucumber-html-formatter (> 21, < 24)
       diff-lcs (~> 1.5)
       logger (~> 1.6)
       mini_mime (~> 1.1)
       multi_test (~> 1.1)
-      sys-uname (~> 1.3)
+      sys-uname (~> 1.5)
     cucumber-ci-environment (11.0.0)
-    cucumber-core (16.1.1)
+    cucumber-core (16.2.0)
       cucumber-gherkin (> 36, < 40)
       cucumber-messages (> 31, < 33)
       cucumber-tag-expressions (> 6, < 9)
-    cucumber-cucumber-expressions (18.0.1)
+    cucumber-cucumber-expressions (19.0.1)
       bigdecimal
-    cucumber-gherkin (37.0.1)
-      cucumber-messages (>= 31, < 32)
-    cucumber-html-formatter (22.3.0)
+    cucumber-gherkin (39.1.0)
+      cucumber-messages (>= 31, < 33)
+    cucumber-html-formatter (23.1.0)
       cucumber-messages (> 23, < 33)
-    cucumber-messages (31.2.0)
+    cucumber-messages (32.3.1)
     cucumber-tag-expressions (8.1.0)
-    date (3.5.1)
     decoor (0.1.0)
     diff-lcs (1.6.2)
     docile (1.4.1)
-    donce (0.4.0)
+    donce (0.7.0)
       backtrace (~> 0.3)
       os (~> 1.1)
       qbash (~> 0.3)
-    elapsed (0.2.2)
+    drb (2.2.3)
+    elapsed (0.3.1)
       loog (~> 0.6)
       tago (~> 0.1)
     ellipsized (0.3.0)
-    erb (6.0.1)
-    ffi (1.17.3-arm64-darwin)
-    ffi (1.17.3-x86_64-linux-gnu)
+    erb (6.0.6)
+    ffi (1.17.4-arm64-darwin)
+    ffi (1.17.4-x86_64-linux-gnu)
     hashdiff (1.2.1)
-    iri (0.11.6)
-    json (2.18.0)
-    language_server-protocol (3.17.0.5)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    iri (0.11.8)
+    json (2.21.1)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
-    loog (0.6.1)
+    loog (0.8.0)
+      ellipsized
       logger (~> 1.0)
     memoist3 (1.0.0)
     mini_mime (1.1.5)
-    minitest (6.0.1)
+    minitest (6.0.6)
+      drb (~> 2.0)
       prism (~> 1.5)
-    minitest-reporters (1.7.1)
+    minitest-reporters (1.8.0)
       ansi
       builder
-      minitest (>= 5.0)
+      minitest (>= 5.0, < 7)
       ruby-progressbar
     multi_test (1.1.0)
-    nokogiri (1.19.0-arm64-darwin)
+    nokogiri (1.19.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
       racc (~> 1.4)
-    openssl (3.3.2)
+    openssl (3.3.3)
     os (1.1.4)
-    parallel (1.27.0)
-    parser (3.3.10.0)
+    parallel (2.1.0)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
-    prism (1.8.0)
-    psych (5.3.1)
-      date
-      stringio
-    public_suffix (7.0.2)
-    qbash (0.5.0)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    public_suffix (7.0.5)
+    qbash (0.8.4)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
       tago (> 0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.1)
-    rdoc (7.1.0)
+    rake (13.4.2)
+    rbs (4.0.3)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
       erb
-      psych (>= 4.0.0)
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
       tsort
-    regexp_parser (2.11.3)
-    retriable (3.1.2)
+    regexp_parser (2.12.0)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    retriable (3.8.0)
     retriable_proxy (1.0.2)
       retriable (>= 2.0, < 4.0)
     rexml (3.4.4)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
-    rubocop (1.82.1)
+    rspec-support (3.13.7)
+    rubocop (1.88.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-minitest (0.38.2)
+    rubocop-elegant (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.75)
+    rubocop-minitest (0.40.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
@@ -158,22 +177,21 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (3.1.0)
+    simplecov-cobertura (3.2.0)
       rexml
       simplecov (~> 0.19)
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    stringio (3.2.0)
-    sys-uname (1.4.1)
+    sys-uname (1.5.1)
       ffi (~> 1.1)
       memoist3 (~> 1.0.0)
-    tago (0.6.0)
+    tago (0.7.0)
     thor (1.5.0)
     tsort (0.2.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
-    webmock (3.26.1)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -182,11 +200,12 @@ PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
   arm64-darwin-24
+  arm64-darwin-25
   x86_64-linux
 
 DEPENDENCIES
   aruba (~> 2.2)
-  cucumber (~> 10.0)
+  cucumber (~> 11.0)
   donce (~> 0.2)
   logger (~> 1.7)
   minitest (~> 6.0)
@@ -195,8 +214,9 @@ DEPENDENCIES
   os (~> 1.1)
   qbash (~> 0.0)
   rake (~> 13.2)
-  rdoc (~> 7.0)
-  rubocop (~> 1.62)
+  rdoc (~> 8.0)
+  rubocop (~> 1.72)
+  rubocop-elegant (~> 0.5)
   rubocop-minitest (~> 0.38)
   rubocop-performance (~> 1.25)
   rubocop-rake (~> 0.7)

data/README.md

@@ -7,7 +7,7 @@
 [![rake](https://github.com/yegor256/sibit/actions/workflows/rake.yml/badge.svg)](https://github.com/yegor256/sibit/actions/workflows/rake.yml)
 [![PDD status](https://www.0pdd.com/svg?name=yegor256/sibit)](https://www.0pdd.com/p?name=yegor256/sibit)
 [![Gem Version](https://badge.fury.io/rb/sibit.svg)](https://badge.fury.io/rb/sibit)
-[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/takes/sibit/master/LICENSE.txt)
+[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/sibit/blob/master/LICENSE.txt)
 [![Test Coverage](https://img.shields.io/codecov/c/github/yegor256/sibit.svg)](https://codecov.io/github/yegor256/sibit?branch=master)
 [![Hits-of-Code](https://hitsofcode.com/github/yegor256/sibit)](https://hitsofcode.com/view/github/yegor256/sibit)
 
@@ -80,7 +80,7 @@ Not all [UTXOs] may be used, but only the necessary amount of them.
 
 By default, the fee is paid on top of the payment amount you are sending.
 Say, you are sending 0.5 BTC and the fee is 0.0001 BTC.
-Totally, you spend 0.5001.
+In total, you spend 0.5001 BTC.
 However, you can make Sibit deduct the fee from the payment amount.
 In this case you should provide a negative amount
   of the fee or one of `S-`, `M-`, `L-`, `XL-`.
@@ -91,6 +91,18 @@ It is recommended to run it with `--dry --verbose` options first,
 If everything looks correct, remove the `--dry` and run again,
   the transaction is pushed to the network.
 
+To require a minimum number of confirmations on every UTXO before it is
+  spent, or before it counts toward the reported balance, pass `--trust`:
+
+```bash
+sibit --trust=6 balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
+sibit --trust=6 pay 10000 S P1,P2 TARGET CHANGE
+```
+
+The default is `0`, which preserves the existing behavior.
+The same option is available from the Ruby SDK via the `trust:` keyword
+  argument on `Sibit#balance` and `Sibit#pay`.
+
 To use an HTTPS proxy for all requests:
 
 ```bash
@@ -103,6 +115,11 @@ The proxy address may include authentication credentials:
 sibit --proxy=user:password@host:port balance 1PfsYNygsuVL8fvBarJNQnHytkg4rGih1U
 ```
 
+Some providers accept an API key, read from an environment variable:
+`SIBIT_BLOCKCHAIR_KEY` for [Blockchair.com] and
+  `SIBIT_CRYPTOAPIS_KEY` for [Cryptoapis.io].
+When the variable is set, requests to that provider use the authenticated tier.
+
 All operations are performed through the [Blockchain API].
 Transactions are pushed to the Bitcoin network via [this relay].
 
@@ -135,6 +152,7 @@ At the moment we work with the following APIs:
 * [Bitcoinchain.com] - `Sibit::Bitcoinchain`
 * [Blockchair.com] - `Sibit::Blockchair`
 * [Cex.io] - `Sibit::Cex`
+* [SoChain] - `Sibit::Sochain`
 
 The first one in this list is used by default.
 If you want to use a different one,
@@ -211,6 +229,7 @@ If it's clean and you don't see any error messages, submit your pull request.
 [Cex.io]: https://cex.io/rest-api
 [Cryptoapis.io]: https://docs.cryptoapis.io/rest-apis/blockchain-as-a-service-apis/btc/index
 [Electrum]: https://electrum.org/
+[SoChain]: https://sochain.com/api
 [miner fee]: https://en.bitcoin.it/wiki/Miner_fees
 [private key]: https://en.bitcoin.it/wiki/Private_key
 [Ruby]: https://www.ruby-lang.org/en/

data/Rakefile

@@ -35,7 +35,7 @@ task :picks do
   next if OS.windows?
   %w[lib].each do |d|
     Dir["#{d}/**/*.rb"].each do |f|
-      qbash("bundle exec ruby #{Shellwords.escape(f)}", log: $stdout, env: { 'PICKS' => 'yes' })
+      qbash("bundle exec ruby #{Shellwords.escape(f)}", stdout: $stdout, env: { 'PICKS' => 'yes' })
     end
   end
 end

data/bin/sibit

@@ -10,23 +10,25 @@ require 'backtrace'
 require 'loog'
 require_relative '../lib/sibit'
 require_relative '../lib/sibit/bin'
-require_relative '../lib/sibit/http'
-require_relative '../lib/sibit/httpproxy'
 require_relative '../lib/sibit/bitcoinchain'
 require_relative '../lib/sibit/blockchain'
 require_relative '../lib/sibit/blockchair'
 require_relative '../lib/sibit/btc'
 require_relative '../lib/sibit/cex'
+require_relative '../lib/sibit/cryptoapis'
 require_relative '../lib/sibit/dry'
 require_relative '../lib/sibit/fake'
 require_relative '../lib/sibit/firstof'
+require_relative '../lib/sibit/http'
+require_relative '../lib/sibit/httpproxy'
+require_relative '../lib/sibit/sochain'
 require_relative '../lib/sibit/version'
 
 begin
   Sibit::Bin.start(ARGV)
 rescue StandardError => e
-  verbose = !ARGV.include?('--quiet') &&
-            (ARGV.include?('--verbose') || ENV.fetch('SIBIT_VERBOSE', nil))
+  wants = ARGV.include?('--verbose') || ENV.fetch('SIBIT_VERBOSE', nil)
+  verbose = !ARGV.include?('--quiet') && wants
   log = verbose ? Loog::VERBOSE : Loog::REGULAR
   if verbose
     log.error(Backtrace.new(e))

data/cross/alpine.df

@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+FROM alpine:3.21
+
+RUN apk add --no-cache ruby ruby-dev gcc make musl-dev openssl-dev bash

data/cross/centos.df

@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+FROM quay.io/centos/centos:stream9
+
+RUN dnf module enable -y ruby:3.3 && \
+    dnf install -y ruby ruby-devel gcc make openssl-devel redhat-rpm-config && \
+    dnf clean all

data/cross/debian.df

@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+FROM debian:trixie
+
+RUN apt-get update && \
+    apt-get install -y ruby ruby-dev gcc make libssl-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*

data/cross/fedora.df

@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+FROM fedora:41
+
+RUN dnf install -y ruby ruby-devel gcc make openssl-devel && \
+    dnf clean all

data/cross/opensuse.df

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+FROM opensuse/tumbleweed
+
+RUN ok=; \
+    for i in 1 2 3 4 5; do \
+      if zypper --non-interactive --gpg-auto-import-keys refresh && \
+         zypper --non-interactive install ruby ruby-devel gcc make libopenssl-devel bash; then \
+        ok=1; break; \
+      fi; \
+      echo "zypper attempt $i failed, retrying in 15s"; sleep 15; \
+    done; \
+    test -n "$ok" && \
+    zypper clean --all && \
+    gem update --system --no-document && \
+    sed -i '/format.executable/d' /etc/gemrc

data/cross/rocky.df

@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+FROM rockylinux:9
+
+RUN dnf module enable -y ruby:3.3 && \
+    dnf install -y ruby ruby-devel gcc make openssl-devel redhat-rpm-config && \
+    dnf clean all

data/cross/ubuntu.df

@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get install -y ruby ruby-dev gcc make libssl-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*

data/features/step_definitions/steps.rb

@@ -3,9 +3,9 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'English'
 require 'nokogiri'
 require 'tmpdir'
-require 'English'
 require_relative '../../lib/sibit'
 
 Before do
@@ -32,19 +32,19 @@ When(%r{^I run bin/sibit with "([^"]*)"$}) do |arg|
 end
 
 Then(/^Stdout contains "([^"]*)"$/) do |txt|
-  raise "STDOUT doesn't contain '#{txt}':\n#{@stdout}" unless @stdout.include?(txt)
+  raise(StandardError, "STDOUT doesn't contain '#{txt}':\n#{@stdout}") unless @stdout.include?(txt)
 end
 
 Then(/^Stdout is empty$/) do
-  raise "STDOUT is not empty:\n#{@stdout}" unless @stdout == ''
+  raise(StandardError, "STDOUT is not empty:\n#{@stdout}") unless @stdout == ''
 end
 
 Then(/^Exit code is zero$/) do
-  raise "Non-zero exit #{@exitstatus}:\n#{@stdout}" unless @exitstatus.zero?
+  raise(StandardError, "Non-zero exit #{@exitstatus}:\n#{@stdout}") unless @exitstatus.zero?
 end
 
 Then(/^Exit code is not zero$/) do
-  raise 'Zero exit code' if @exitstatus.zero?
+  raise(StandardError, 'Zero exit code') if @exitstatus.zero?
 end
 
 When(/^I run bash with "([^"]*)"$/) do |text|

data/features/support/env.rb

@@ -3,6 +3,6 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'simplecov'
 require 'aruba/cucumber'
+require 'simplecov'
 require_relative '../../lib/sibit'

data/lib/sibit/base58.rb

@@ -23,28 +23,25 @@ class Sibit
     end
 
     def encode
-      bytes = [@data].pack('H*')
-      leading = bytes.match(/^\x00*/)[0].length
       num = @data.to_i(16)
       result = ''
       while num.positive?
         num, remainder = num.divmod(58)
         result = ALPHABET[remainder] + result
       end
-      ('1' * leading) + result
+      ('1' * [@data].pack('H*').match(/^\x00*/)[0].length) + result
     end
 
     def decode
-      leading = @data.match(/^1*/)[0].length
       num = 0
       @data.each_char do |c|
         idx = ALPHABET.index(c)
-        raise Sibit::Error, "Invalid Base58 character '#{c}' in address '#{@data}'" if idx.nil?
+        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
+      ('00' * @data.match(/^1*/)[0].length) + hex
     end
 
     def check

data/lib/sibit/bech32.rb

@@ -19,15 +19,13 @@ class Sibit
     GENERATOR = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3].freeze
 
     def self.encode(hrp, ver, prog)
-      bytes = [prog].pack('H*').bytes
-      data = [ver] + bits(bytes, 8, 5, true)
+      data = [ver] + bits([prog].pack('H*').bytes, 8, 5, true)
       chk = checksum(hrp, data)
       "#{hrp}1#{(data + chk).map { |d| CHARSET[d] }.join}"
     end
 
     def self.checksum(hrp, data)
-      values = expanded(hrp) + data + [0, 0, 0, 0, 0, 0]
-      poly = pm(values) ^ 1
+      poly = pm(expanded(hrp) + data + [0, 0, 0, 0, 0, 0]) ^ 1
       (0..5).map { |i| (poly >> (5 * (5 - i))) & 31 }
     end
 
@@ -68,8 +66,18 @@ class Sibit
 
     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)
+      ver = data[0]
+      unless ver.between?(0, 16)
+        raise(Sibit::Error, "Unsupported witness version #{ver} in '#{@addr}'")
+      end
+      raise(Sibit::Error, "Invalid Bech32 checksum in '#{@addr}'") unless verified?(hrp, data)
+      prog = convert(data[1..-7], 5, 8)
+      if ver.zero? && [20, 32].none?(prog.length)
+        raise(Sibit::Error, "Witness v0 program in '#{@addr}' must be 20 or 32 bytes")
+      end
+      unless prog.length.between?(2, 40)
+        raise(Sibit::Error, "Witness program in '#{@addr}' must be 2 to 40 bytes")
+      end
       prog.pack('C*').unpack1('H*')
     end
 
@@ -82,18 +90,16 @@ class Sibit
 
     def parse
       pos = @addr.rindex('1')
-      raise Sibit::Error, "Invalid Bech32 address '#{@addr}': no separator" if pos.nil? || pos < 1
-      hrp = @addr[0...pos]
+      raise(Sibit::Error, "Invalid Bech32 address '#{@addr}': no separator") if pos.nil? || pos < 1
       rest = @addr[(pos + 1)..]
-      raise Sibit::Error, "Invalid Bech32 address '#{@addr}': data too short" if rest.length < 6
+      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]
+      raise(Sibit::Error, "Invalid Bech32 character in '#{@addr}'") if data.include?(nil)
+      [@addr[0...pos], data]
     end
 
     def verified?(hrp, data)
-      chk = polymod(expand(hrp) + data)
-      [1, 0x2bc830a3].include?(chk)
+      polymod(expand(hrp) + data) == (data[0].zero? ? 1 : 0x2bc830a3)
     end
 
     def expand(hrp)
@@ -110,7 +116,7 @@ class Sibit
       chk
     end
 
-    def convert(data, frombits, tobits, pad)
+    def convert(data, frombits, tobits)
       acc = 0
       bits = 0
       result = []
@@ -123,7 +129,9 @@ class Sibit
           result << ((acc >> bits) & maxv)
         end
       end
-      result << ((acc << (tobits - bits)) & maxv) if pad && bits.positive?
+      if bits >= frombits || (acc << (tobits - bits)).anybits?(maxv)
+        raise(Sibit::Error, "Non-zero padding in Bech32 address '#{@addr}'")
+      end
       result
     end
   end