sibit 0.14.4 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3a384cb5eabf6eeb7b52a49ee9fff8be0c8ff7c848fa8d57c7bbb38ef300ad
-  data.tar.gz: 74dc8d68b3865c9ac3d1ddf363724eab2f59e7de3a03f69eadf1914503c4f5f8
+  metadata.gz: 1f5687f2fe1a1104c3beb596b08818f0a9526405df9e6022c68a47f575549c16
+  data.tar.gz: ee3f5f71d21739855368af24ac879b4e5b4577e59f605515a662893d778cc447
 SHA512:
-  metadata.gz: f572ddce51c449495092bb8ba8c0eb8752bf9852c8b01b5e57fd7d5f6550dd328f57a5a106ec0cf43402c1475cd0e05c58e4ecd02ee485adc32b372750e24f49
-  data.tar.gz: c9ed3aed73e9b7e1beda8bdaa55209b6f1b7fc52047c6f494c21b4d7704be560c42541e7db6ebd49e9dddf77db517dd4dd9fbd2c99019b93599e73e948d9a848
+  metadata.gz: df736816b94d5975dcd6c589ab48467f3907a42091c1e032f4ef7dc8f8c89c082409555d45957d93ea74b0b3cb98bd19c53c1091df66ab7288211218f1af0b57
+  data.tar.gz: bd341019c48a1738e6cc7f788827dbb625c7b0f8756267efbbed1efc19245c21b9cd75bc121596a89ce4ab8a010151c91b876daf9c21441fde0b2e72d1c1a283

data/lib/sibit/bitcoinchain.rb

@@ -84,6 +84,9 @@ class Sibit
         URI("https://api-r.bitcoinchain.com/v1/block/#{hash}")
       )[0]
       raise Sibit::Error, "The block #{hash} is not found" if head.nil?
+      txs = Sibit::Json.new(http: @http, log: @log).get(
+        URI("https://api-r.bitcoinchain.com/v1/block/txs/#{hash}")
+      )
       nxt = head['next_block']
       nxt = nil if nxt == '0000000000000000000000000000000000000000000000000000000000000000'
       {
@@ -91,15 +94,13 @@ class Sibit
         orphan: !head['is_main'],
         next: nxt,
         previous: head['prev_block'],
-        txns: Sibit::Json.new(http: @http, log: @log).get(
-          URI("https://api-r.bitcoinchain.com/v1/block/txs/#{hash}")
-        )[0]['txs'].map do |t|
+        txns: txs[0]['txs'].map do |t|
           {
             hash: t['self_hash'],
-            outputs: t['outputs'].select { |o| o['spent'] }.map do |o|
+            outputs: t['outputs'].map do |o|
               {
                 address: o['receiver'],
-                value: o['value']
+                value: o['value'] * 100_000_000
               }
             end
           }

data/lib/sibit/blockchain.rb

@@ -104,27 +104,28 @@ class Sibit
     end
 
     # This method should fetch a Blockchain block and return as a hash.
-    def block(hash)
-      json = Sibit::Json.new(http: @http, log: @log).get(
-        URI("https://blockchain.info/rawblock/#{hash}")
-      )
-      {
-        hash: json['hash'],
-        orphan: !json['main_chain'],
-        next: json['next_block'][0],
-        previous: json['prev_block'],
-        txns: json['tx'].map do |t|
-          {
-            hash: t['hash'],
-            outputs: t['out'].map do |o|
-              {
-                address: o['hash'],
-                value: o['value']
-              }
-            end
-          }
-        end
-      }
+    def block(_hash)
+      raise Sibit::Error, 'Blockchain.com API fails to return next_block'
+      # json = Sibit::Json.new(http: @http, log: @log).get(
+      #   URI("https://blockchain.info/rawblock/#{hash}")
+      # )
+      # {
+      #   hash: json['hash'],
+      #   orphan: !json['main_chain'],
+      #   next: json['next_block'][0],
+      #   previous: json['prev_block'],
+      #   txns: json['tx'].map do |t|
+      #     {
+      #       hash: t['hash'],
+      #       outputs: t['out'].map do |o|
+      #         {
+      #           address: o['addr'],
+      #           value: o['value']
+      #         }
+      #       end
+      #     }
+      #   end
+      # }
     end
   end
 end

data/lib/sibit/version.rb

@@ -26,5 +26,5 @@
 # License:: MIT
 class Sibit
   # Current version of the library.
-  VERSION = '0.14.4'
+  VERSION = '0.14.5'
 end

data/lib/sibit.rb

@@ -175,7 +175,8 @@ class Sibit
   #
   # The callback will be called with three arguments:
   # 1) Bitcoin address of the receiver, 2) transaction hash, 3) amount
-  # in satoshi.
+  # in satoshi. The callback should return non-false if the transaction
+  # found was useful.
   def scan(start, max: 4)
     block = start
     count = 0
@@ -202,8 +203,9 @@ class Sibit
           checked_outputs += 1
           hash = "#{t[:hash]}:#{i}"
           satoshi = o[:value]
-          yield(address, hash, satoshi)
-          @log.info("Bitcoin tx found at #{hash} for #{satoshi} sent to #{address}")
+          if yield(address, hash, satoshi)
+            @log.info("Bitcoin tx found at #{hash} for #{satoshi} sent to #{address}")
+          end
         end
         checked += 1
       end

data/test/test_blockchain.rb

@@ -32,7 +32,7 @@ require_relative '../lib/sibit/blockchain'
 # License:: MIT
 class TestBlockchain < Minitest::Test
   def test_fetch_block
-    # WebMock.allow_net_connect!
+    skip
     hash = '0000000000000000000f676241aabc9b62b748d26192a44bc25720c34de27d19'
     stub_request(:get, "https://blockchain.info/rawblock/#{hash}")
       .to_return(body: '{"next_block": "n", "prev_block": "p", "hash": "h",

data/test/test_live.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2019-2020 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.
+
+require 'minitest/autorun'
+require 'webmock/minitest'
+require 'json'
+require_relative '../lib/sibit'
+require_relative '../lib/sibit/blockchain'
+require_relative '../lib/sibit/btc'
+require_relative '../lib/sibit/bitcoinchain'
+
+# Live tests.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2020 Yegor Bugayenko
+# License:: MIT
+class TestLive < Minitest::Test
+  def test_fetch_block
+    skip
+    for_each do |api|
+      hash = '000000003031a0e73735690c5a1ff2a4be82553b2a12b776fbd3a215dc8f778d'
+      json = api.block(hash)
+      assert_equal(hash, json[:hash])
+      assert(json[:txns].is_a?(Array))
+      assert_equal(1, json[:txns].length)
+      assert_equal(
+        '20251a76e64e920e58291a30d4b212939aae976baca40e70818ceaa596fb9d37',
+        json[:txns][0][:hash]
+      )
+      assert(json[:txns][0][:outputs].is_a?(Array))
+      assert_equal(1, json[:txns][0][:outputs].length)
+      out = json[:txns][0][:outputs][0]
+      assert_equal('1GkQmKAmHtNfnD3LHhTkewJxKHVSta4m2a', out[:address])
+      assert_equal(5_000_000_000, out[:value])
+      assert(json[:next], 'Next block not found')
+      assert(json[:previous], 'Previous block not found')
+    end
+  end
+
+  private
+
+  def for_each
+    WebMock.allow_net_connect!
+    [Sibit::Btc.new, Sibit::Bitcoinchain.new, Sibit::Blockchain.new].each do |api|
+      begin
+        yield api
+      rescue Sibit::Error => e
+        puts e.message
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -299,6 +299,7 @@ files:
 - test/test_btc.rb
 - test/test_fake.rb
 - test/test_json.rb
+- test/test_live.rb
 - test/test_sibit.rb
 homepage: http://github.com/yegor256/sibit
 licenses:
@@ -335,4 +336,5 @@ test_files:
 - test/test_btc.rb
 - test/test_fake.rb
 - test/test_json.rb
+- test/test_live.rb
 - test/test_sibit.rb