sibit 0.25.1 → 0.26.0

data/lib/sibit.rb

@@ -1,33 +1,20 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
+# SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
 
-require 'bitcoin'
+require 'loog'
 require_relative 'sibit/version'
-require_relative 'sibit/log'
 require_relative 'sibit/blockchain'
+require_relative 'sibit/bitcoin/base58'
+require_relative 'sibit/bitcoin/key'
+require_relative 'sibit/bitcoin/script'
+require_relative 'sibit/bitcoin/tx'
+require_relative 'sibit/bitcoin/txbuilder'
 # Sibit main class.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2025 Yegor Bugayenko
 # License:: MIT
 class Sibit
   # Constructor.
@@ -46,9 +33,9 @@ class Sibit
   #
   # The +api+ argument can be an object or an array of objects. If an array
   # is provided, we will make an attempt to try them one by one, until
-  # one of them succeedes.
-  def initialize(log: $stdout, api: Sibit::Blockchain.new(log: Sibit::Log.new(log)))
-    @log = Sibit::Log.new(log)
+  # one of them succeeds.
+  def initialize(log: Loog::NULL, api: Sibit::Blockchain.new(log: log))
+    @log = log
     @api = api
   end
 
@@ -58,18 +45,16 @@ class Sibit
     @api.price(currency)
   end
 
-  # Generates new Bitcon private key and returns in Hash160 format.
+  # Generates new Bitcoin private key and returns in Hash160 format.
   def generate
     key = Bitcoin::Key.generate.priv
     @log.info("Bitcoin private key generated: #{key[0..8]}...")
     key
   end
 
-  # Creates Bitcon address using the private key in Hash160 format.
+  # Creates Bitcoin address using the private key in Hash160 format.
   def create(pvt)
-    key = Bitcoin::Key.new
-    key.priv = pvt
-    key.addr
+    Bitcoin::Key.new(pvt).addr
   end
 
   # Gets the balance of the address, in satoshi.
@@ -116,7 +101,7 @@ class Sibit
   def pay(amount, fee, sources, target, change, skip_utxo: [])
     p = price('USD')
     satoshi = satoshi(amount)
-    builder = Bitcoin::Builder::TxBuilder.new
+    builder = Bitcoin::TxBuilder.new
     unspent = 0
     size = 100
     utxos = @api.utxos(sources.keys)
@@ -131,8 +116,8 @@ class Sibit
       builder.input do |i|
         i.prev_out(utxo[:hash])
         i.prev_out_index(utxo[:index])
-        i.prev_out_script = utxo[:script]
-        address = Bitcoin::Script.new(utxo[:script]).get_address
+        i.prev_out_script = script_hex(utxo[:script])
+        address = Bitcoin::Script.new(script_hex(utxo[:script])).address
         i.signature_key(key(sources[address]))
       end
       size += 180
@@ -152,16 +137,16 @@ class Sibit
     tx = builder.tx(
       input_value: unspent,
       leave_fee: true,
-      extra_fee: [f, Bitcoin.network[:min_tx_fee]].max,
+      extra_fee: [f, Bitcoin::MIN_TX_FEE].max,
       change_address: change
     )
-    left = unspent - tx.outputs.map(&:value).inject(&:+)
+    left = unspent - tx.outputs.sum(&:value)
     @log.info("A new Bitcoin transaction #{tx.hash} prepared:
-  #{tx.in.count} input#{tx.in.count > 1 ? 's' : ''}:
-    #{tx.inputs.map { |i| " in: #{i.prev_out.bth}:#{i.prev_out_index}" }.join("\n    ")}
-  #{tx.out.count} output#{tx.out.count > 1 ? 's' : ''}:
-    #{tx.outputs.map { |o| "out: #{o.script.bth} / #{num(o.value, p)}" }.join("\n    ")}
-  Min tx fee: #{num(Bitcoin.network[:min_tx_fee], p)}
+  #{tx.in.count} input#{'s' if tx.in.count > 1}:
+    #{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(Bitcoin::MIN_TX_FEE, p)}
   Fee requested: #{num(f, p)} as \"#{fee}\"
   Fee actually paid: #{num(left, p)}
   Tx size: #{size} bytes
@@ -291,4 +276,10 @@ in block #{block} (by #{json[:provider]})")
   def key(hash160)
     Bitcoin::Key.new(hash160)
   end
+
+  # Convert script to hex string if needed.
+  def script_hex(script)
+    return script if script.is_a?(String) && script.match?(/\A[0-9a-f]+\z/i)
+    script.unpack1('H*')
+  end
 end

data/logo.svg

@@ -16,4 +16,4 @@
             </text>
         </g>
     </g>
-</svg>
+</svg>

data/sibit.gemspec

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
+# SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
 
 require 'English'
 
@@ -34,22 +17,23 @@ Gem::Specification.new do |s|
   s.version = Sibit::VERSION
   s.license = 'MIT'
   s.summary = 'Simple Bitcoin Client'
-  s.description = "This is a simple Bitcoin client, to use from command line \
-or from your Ruby app. You don't need to run any Bitcoin software, \
-no need to install anything, etc. All you need is just a command line \
-and Ruby 2.5+."
+  s.description =
+    'This is a simple Bitcoin client, to use from command line ' \
+    'or from your Ruby app. You don\'t need to run any Bitcoin software, ' \
+    'no need to install anything, etc. All you need is just a command line ' \
+    'and Ruby 2.5+.'
   s.authors = ['Yegor Bugayenko']
   s.email = 'yegor256@gmail.com'
-  s.homepage = 'http://github.com/yegor256/sibit'
-  s.files = `git ls-files`.split($RS)
+  s.homepage = 'https://github.com/yegor256/sibit'
+  s.files = `git ls-files | grep -v -E '^(test/|\\.|renovate)'`.split($RS)
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'backtrace', '~> 0.3'
-  s.add_runtime_dependency 'bitcoin-ruby', '0.0.20'
-  s.add_runtime_dependency 'iri', '~> 0.5'
-  s.add_runtime_dependency 'json', '~> 2'
-  s.add_runtime_dependency 'openssl', '~>2.0'
-  s.add_runtime_dependency 'retriable_proxy', '~> 1.0'
-  s.add_runtime_dependency 'slop', '~> 4.6'
+  s.add_dependency 'backtrace', '~> 0.3'
+  s.add_dependency 'iri', '~> 0.5'
+  s.add_dependency 'json', '~> 2'
+  s.add_dependency 'loog', '~> 0.6'
+  s.add_dependency 'openssl', '>= 2.0'
+  s.add_dependency 'retriable_proxy', '~> 1.0'
+  s.add_dependency 'slop', '~> 4.6'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.26.0
 platform: ruby
 authors:
 - Yegor Bugayenko
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -25,59 +24,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: bitcoin-ruby
+  name: iri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: iri
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: loog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -116,23 +115,15 @@ executables:
 - sibit
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE.txt
+- README.md
 files:
-- ".0pdd.yml"
-- ".gitattributes"
-- ".github/workflows/codecov.yml"
-- ".github/workflows/pdd.yml"
-- ".github/workflows/rake.yml"
-- ".github/workflows/xcop.yml"
-- ".gitignore"
-- ".pdd"
-- ".rubocop.yml"
-- ".rultor.yml"
-- ".simplecov"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
+- LICENSES/MIT.txt
 - README.md
+- REUSE.toml
 - Rakefile
 - bin/sibit
 - cucumber.yml
@@ -142,6 +133,11 @@ files:
 - features/support/env.rb
 - lib/sibit.rb
 - lib/sibit/bestof.rb
+- lib/sibit/bitcoin/base58.rb
+- lib/sibit/bitcoin/key.rb
+- lib/sibit/bitcoin/script.rb
+- lib/sibit/bitcoin/tx.rb
+- lib/sibit/bitcoin/txbuilder.rb
 - lib/sibit/bitcoinchain.rb
 - lib/sibit/blockchain.rb
 - lib/sibit/blockchair.rb
@@ -154,29 +150,13 @@ files:
 - lib/sibit/firstof.rb
 - lib/sibit/http.rb
 - lib/sibit/json.rb
-- lib/sibit/log.rb
 - lib/sibit/version.rb
 - logo.svg
-- renovate.json
 - sibit.gemspec
-- test/test__helper.rb
-- test/test_bestof.rb
-- test/test_bitcoinchain.rb
-- test/test_blockchain.rb
-- test/test_blockchair.rb
-- test/test_btc.rb
-- test/test_cex.rb
-- test/test_cryptoapis.rb
-- test/test_fake.rb
-- test/test_firstof.rb
-- test/test_json.rb
-- test/test_live.rb
-- test/test_sibit.rb
-homepage: http://github.com/yegor256/sibit
+homepage: https://github.com/yegor256/sibit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -192,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple Bitcoin Client
 test_files: []

data/.0pdd.yml

@@ -1,9 +0,0 @@
-errors:
-  - yegor256@gmail.com
-# alerts:
-#   github:
-#     - yegor256
-
-tags:
-  - pdd
-  - bug

data/.gitattributes

@@ -1,7 +0,0 @@
-# Check out all text files in UNIX format, with LF as end of line
-# Don't change this file. If you have any ideas about it, please
-# submit a separate issue about it and we'll discuss.
-
-* text=auto eol=lf
-*.rb ident
-*.xml ident

data/.github/workflows/codecov.yml

@@ -1,21 +0,0 @@
----
-name: codecov
-on:
-  push:
-    branches:
-      - master
-jobs:
-  codecov:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-      - run: bundle update
-      - run: bundle exec rake
-      - uses: codecov/codecov-action@v4.0.0-beta.3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: coverage/.resultset.json
-          fail_ci_if_error: true

data/.github/workflows/pdd.yml

@@ -1,15 +0,0 @@
----
-name: pdd
-"on":
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-jobs:
-  pdd:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: g4s8/pdd-action@master

data/.github/workflows/rake.yml

@@ -1,24 +0,0 @@
----
-name: rake
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-jobs:
-  test:
-    name: test
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
-        ruby: [2.7, 3.1]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - run: bundle update
-      - run: bundle exec rake

data/.github/workflows/xcop.yml

@@ -1,17 +0,0 @@
----
-name: xcop
-"on":
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-jobs:
-  xcop:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: g4s8/xcop-action@master
-        with:
-          files: '**/*.xml'

data/.gitignore

@@ -1,8 +0,0 @@
-coverage/
-Gemfile.lock
-.idea/
-*.gem
-.bundle/
-.DS_Store
-rdoc/
-tmp/

data/.pdd

@@ -1,7 +0,0 @@
---source=.
---verbose
---exclude target/**/*
---exclude coverage/**/*
---rule min-words:20
---rule min-estimate:15
---rule max-estimate:90

data/.rubocop.yml

@@ -1,38 +0,0 @@
-AllCops:
-  NewCops: enable
-  Exclude:
-    - 'assets/**/*'
-  DisplayCopNames: true
-  TargetRubyVersion: 2.5
-  SuggestExtensions: false
-
-Gemspec/RequireMFA:
-  Enabled: false
-Style/ClassAndModuleChildren:
-  Enabled: false
-Layout/LineLength:
-  Max: 100
-Layout/EndOfLine:
-  EnforcedStyle: lf
-Metrics/CyclomaticComplexity:
-  Max: 20
-Metrics/MethodLength:
-  Enabled: false
-Layout/MultilineMethodCallIndentation:
-  Enabled: false
-Metrics/ParameterLists:
-  Max: 6
-Metrics/ClassLength:
-  Max: 250
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  Max: 100
-Metrics/PerceivedComplexity:
-  Max: 20
-Style/MultilineTernaryOperator:
-  Enabled: false
-Layout/EmptyLineAfterGuardClause:
-  Enabled: false
-Lint/OrAssignmentToConstant:
-  Enabled: false

data/.rultor.yml

@@ -1,21 +0,0 @@
-docker:
-  image: yegor256/rultor-image:1.22.0
-assets:
-  rubygems.yml: yegor256/home#assets/rubygems.yml
-install: |
-  rvm default 2.7.6 && source /usr/local/rvm/scripts/rvm
-  gem install pdd
-  pdd -f /dev/null
-  bundle install --no-color "--gemfile=$(pwd)/Gemfile"
-release:
-  script: |-
-    bundle exec rake clean test rubocop copyright
-    sed -i "s/0\.0\.0/${tag}/g" lib/sibit/version.rb
-    git add lib/sibit/version.rb
-    git commit -m "version set to ${tag}"
-    gem build sibit.gemspec
-    chmod 0600 ../rubygems.yml
-    gem push *.gem --config-file ../rubygems.yml
-merge:
-  script: |-
-    bundle exec rake clean test rubocop copyright

data/.simplecov

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2019-2023 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-if Gem.win_platform?
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter
-  ]
-  SimpleCov.start do
-    add_filter '/test/'
-    add_filter '/features/'
-  end
-else
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
-    [SimpleCov::Formatter::HTMLFormatter]
-  )
-  SimpleCov.start do
-    add_filter '/test/'
-    add_filter '/features/'
-    minimum_coverage 60
-  end
-end

data/lib/sibit/log.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2019-2023 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# The log.
-#
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
-# License:: MIT
-class Sibit
-  # Log.
-  class Log
-    # Constructor.
-    #
-    # You may provide the log you want to see the messages in. If you don't
-    # provide anything, the console will be used. The object you provide
-    # has to respond to the method +info+ or +puts+ in order to receive logging
-    # messages.
-    def initialize(log = $stdout)
-      @log = log
-    end
-
-    def info(msg)
-      if @log.respond_to?(:info)
-        @log.info(msg)
-      elsif @log.respond_to?(:puts)
-        @log.puts(msg)
-      end
-    end
-  end
-end

data/renovate.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ]
-}