sibit 0.28.0 → 0.29.1

data/lib/sibit/json.rb

@@ -3,13 +3,13 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'cgi'
 require 'json'
+require 'loog'
 require 'uri'
-require 'cgi'
-require_relative 'version'
 require_relative 'error'
-require 'loog'
 require_relative 'http'
+require_relative 'version'
 
 # Json SDK.
 #
@@ -19,77 +19,74 @@ require_relative 'http'
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2019-2025 Yegor Bugayenko
 # License:: MIT
-class Sibit
-  # JSON processing.
-  class Json
-    # Constructor.
-    def initialize(log: Loog::NULL, http: Sibit::Http.new)
-      @http = http
-      @log = log
-    end
+class Sibit::Json
+  # Constructor.
+  def initialize(log: Loog::NULL, http: Sibit::Http.new)
+    @http = http
+    @log = log
+  end
 
-    # Send GET request to the HTTP and return JSON response.
-    # This method will also log the process and will validate the
-    # response for correctness.
-    def get(address, headers: {}, accept: [200])
-      start = Time.now
-      uri = URI(address.to_s)
-      res = @http.client(uri).get(
-        "#{uri.path.empty? ? '/' : uri.path}#{"?#{uri.query}" if uri.query}",
-        {
-          'Accept' => 'application/json',
-          'User-Agent' => user_agent,
-          'Accept-Charset' => 'UTF-8',
-          'Accept-Encoding' => ''
-        }.merge(headers)
-      )
-      unless accept.include?(res.code.to_i)
-        raise Sibit::Error, "Failed to retrieve #{uri} (#{res.code}): #{res.body}"
-      end
-      @log.info("GET #{uri}: #{res.code}/#{length(res.body.length)} in #{age(start)}")
-      JSON.parse(res.body)
-    rescue JSON::ParserError => e
-      raise Sibit::Error, "Can't parse JSON: #{e.message}"
+  # Send GET request to the HTTP and return JSON response.
+  # This method will also log the process and will validate the
+  # response for correctness.
+  def get(address, headers: {}, accept: [200])
+    start = Time.now
+    uri = URI(address.to_s)
+    res = @http.client(uri).get(
+      "#{uri.path.empty? ? '/' : uri.path}#{"?#{uri.query}" if uri.query}",
+      {
+        'Accept' => 'application/json',
+        'User-Agent' => user_agent,
+        'Accept-Charset' => 'UTF-8',
+        'Accept-Encoding' => ''
+      }.merge(headers)
+    )
+    unless accept.include?(res.code.to_i)
+      raise Sibit::Error, "Failed to retrieve #{uri} (#{res.code}): #{res.body}"
     end
+    @log.info("GET #{uri}: #{res.code}/#{length(res.body.length)} in #{age(start)}")
+    JSON.parse(res.body)
+  rescue JSON::ParserError => e
+    raise Sibit::Error, "Can't parse JSON: #{e.message}"
+  end
 
-    def post(address, body, headers: {})
-      start = Time.now
-      uri = URI(address.to_s)
-      res = @http.client(uri).post(
-        "#{uri.path}?#{uri.query}",
-        "tx=#{CGI.escape(body)}",
-        {
-          'Accept' => 'text/plain',
-          'User-Agent' => user_agent,
-          'Accept-Charset' => 'UTF-8',
-          'Accept-Encoding' => '',
-          'Content-Type' => 'application/x-www-form-urlencoded'
-        }.merge(headers)
-      )
-      unless res.code == '200'
-        raise Sibit::Error, "Failed to post tx to #{uri}: #{res.code}\n#{res.body}"
-      end
-      @log.info("POST #{uri}: #{res.code} in #{age(start)}")
+  def post(address, body, headers: {})
+    start = Time.now
+    uri = URI(address.to_s)
+    res = @http.client(uri).post(
+      "#{uri.path}?#{uri.query}",
+      "tx=#{CGI.escape(body)}",
+      {
+        'Accept' => 'text/plain',
+        'User-Agent' => user_agent,
+        'Accept-Charset' => 'UTF-8',
+        'Accept-Encoding' => '',
+        'Content-Type' => 'application/x-www-form-urlencoded'
+      }.merge(headers)
+    )
+    unless res.code == '200'
+      raise Sibit::Error, "Failed to post tx to #{uri}: #{res.code}\n#{res.body}"
     end
+    @log.info("POST #{uri}: #{res.code} in #{age(start)}")
+  end
 
-    private
+  private
 
-    def age(start)
-      "#{((Time.now - start) * 1000).round}ms"
-    end
+  def age(start)
+    "#{((Time.now - start) * 1000).round}ms"
+  end
 
-    def length(bytes)
-      if bytes > 1024 * 1024
-        "#{bytes / (1024 * 1024)}mb"
-      elsif bytes > 1024
-        "#{bytes / 1024}kb"
-      else
-        "#{bytes}b"
-      end
+  def length(bytes)
+    if bytes > 1024 * 1024
+      "#{bytes / (1024 * 1024)}mb"
+    elsif bytes > 1024
+      "#{bytes / 1024}kb"
+    else
+      "#{bytes}b"
     end
+  end
 
-    def user_agent
-      "Anonymous/#{Sibit::VERSION}"
-    end
+  def user_agent
+    "Anonymous/#{Sibit::VERSION}"
   end
 end

data/lib/sibit/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.28.0'
+  VERSION = '0.29.1'
 end

data/lib/sibit.rb

@@ -4,13 +4,14 @@
 # SPDX-License-Identifier: MIT
 
 require 'loog'
-require_relative 'sibit/version'
-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'
+require_relative 'sibit/blockchain'
+require_relative 'sibit/version'
+
 # Sibit main class.
 #
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -47,14 +48,14 @@ class Sibit
 
   # Generates new Bitcoin private key and returns in Hash160 format.
   def generate
-    key = Bitcoin::Key.generate.priv
+    key = Key.generate.priv
     @log.info("Bitcoin private key generated: #{key[0..8]}...")
     key
   end
 
   # Creates Bitcoin address using the private key in Hash160 format.
   def create(pvt)
-    Bitcoin::Key.new(pvt).addr
+    Key.new(pvt).addr
   end
 
   # Gets the balance of the address, in satoshi.
@@ -99,9 +100,9 @@ class Sibit
   # +change+: the address where the change has to be sent to
   def pay(amount, fee, sources, target, change, skip_utxo: [])
     p = price('USD')
-    sources = sources.map { |k| [Bitcoin::Key.new(k).addr, k] }.to_h
+    sources = sources.map { |k| [Key.new(k).addr, k] }.to_h
     satoshi = satoshi(amount)
-    builder = Bitcoin::TxBuilder.new
+    builder = TxBuilder.new
     unspent = 0
     size = 100
     utxos = @api.utxos(sources.keys)
@@ -117,8 +118,10 @@ class Sibit
         i.prev_out(utxo[:hash])
         i.prev_out_index(utxo[:index])
         i.prev_out_script = script_hex(utxo[:script])
-        address = Bitcoin::Script.new(script_hex(utxo[:script])).address
-        i.signature_key(key(sources[address]))
+        address = Script.new(script_hex(utxo[:script])).address
+        k = sources[address]
+        raise Error, "UTXO arrived to #{address} is incorrect" unless k
+        i.signature_key(key(k))
       end
       size += 180
       @log.info(
@@ -137,7 +140,7 @@ class Sibit
     tx = builder.tx(
       input_value: unspent,
       leave_fee: true,
-      extra_fee: [f, Bitcoin::MIN_TX_FEE].max,
+      extra_fee: [f, MIN_TX_FEE].max,
       change_address: change
     )
     left = unspent - tx.outputs.sum(&:value)
@@ -146,7 +149,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(Bitcoin::MIN_TX_FEE, p)}
+  Min tx fee: #{num(MIN_TX_FEE, p)}
   Fee requested: #{num(f, p)} as \"#{fee}\"
   Fee actually paid: #{num(left, p)}
   Tx size: #{size} bytes
@@ -178,17 +181,14 @@ class Sibit
     raise Error, "The max number must be above zero: #{max}" if max < 1
     block = start
     count = 0
-    wrong = []
     json = {}
     loop do
       json = @api.block(block)
       if json[:orphan]
         steps = 4
         @log.info("Orphan block found at #{block}, moving #{steps} steps back...")
-        wrong << block
         steps.times do
           block = json[:previous]
-          wrong << block
           @log.info("Moved back to #{block}")
           json = @api.block(block)
         end
@@ -225,7 +225,7 @@ in block #{block} (by #{json[:provider]})")
         @log.info("The block #{json[:hash]} is definitely the end of Blockchain, we stop.")
         break
       end
-      if count > max
+      if count >= max
         @log.info("Too many blocks (#{count}) in one go, let's get back to it next time")
         break
       end
@@ -263,9 +263,9 @@ in block #{block} (by #{json[:provider]})")
     return fee.to_i if fee.is_a?(Integer)
     raise Error, 'Fee should either be a String or Integer' unless fee.is_a?(String)
     mul = 1
-    if fee.start_with?('+', '-')
-      mul = -1 if fee.start_with?('-')
-      fee = fee[1..-1]
+    if fee.end_with?('+', '-')
+      mul = -1 if fee.end_with?('-')
+      fee = fee[0..-2]
     end
     sat = fees[fee.to_sym]
     raise Error, "Can't understand the fee: #{fee.inspect}" if sat.nil?
@@ -274,7 +274,7 @@ in block #{block} (by #{json[:provider]})")
 
   # Make key from private key string in Hash160.
   def key(hash160)
-    Bitcoin::Key.new(hash160)
+    Key.new(hash160)
   end
 
   # Convert script to hex string if needed.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.1
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -128,6 +128,7 @@ files:
 - bin/sibit
 - cucumber.yml
 - features/cli.feature
+- features/dry.feature
 - features/gem_package.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb