sibit 0.28.0 → 0.29.0

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.0'
 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)
@@ -178,17 +179,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 +223,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 +261,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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Yegor Bugayenko