radiator 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a1109869bdcd5e344793dad14ab64e9057529ec0
-  data.tar.gz: '0608af42e9b00b20c25356f246933071d3ba4fd5'
+SHA256:
+  metadata.gz: e19fc174759ced3e7e36ca803a0c75c5e9a2d0ad4dd2500df7349aa586beb951
+  data.tar.gz: 616820b9a03134f1a88eb9dba05eac08e06aa451c4bc244005f16ba0cdb5b29d
 SHA512:
-  metadata.gz: 924b43fa78be2bdf26f6278b81a0f294909f2c7692bf322dcbe93e5e2ad58b23cf0954adf921e3125ad266ac546a131c6b6e9c162df60b6e084ef108c037c5db
-  data.tar.gz: e83db7eb0a2ef39b7c9b09cb9d1007cd1a329de81c7637c346fc0b3acde618306b17ee12fecd0f24cdb9d6ed65c4225297fad41bac3bea691827a4868fdba0c3
+  metadata.gz: 602bc8f91295d5c731cbfb1d5c077ef35e0f7d1048d7c43a1ccbffd767aab1d9bb69dd16aee84ac9abdc1819ed9dfc7297e0a92bcc5f274ec89940a427af33d2
+  data.tar.gz: 4b9ca072034850498b5807cfd5e92152921b5e6b279356da6b2e635e636255a92cef82f74218d51ea46a685468cc8cd2af6c7b4a7301663c9697b5eab47cd557

data/README.md

@@ -6,9 +6,24 @@
 [radiator](https://github.com/inertia186/radiator)
 ========
 
-#### STEEM Ruby API Client
+#### Hive/Steem Ruby API Client
 
-Radiator is an API Client for interaction with the STEEM network using Ruby.
+Radiator is an API Client for interaction with the Hive/Steem network using Ruby.
+
+#### Changes in v0.4.8
+
+* Eclipse Update
+* Now wrapping [`hive-ruby`](https://gitlab.syncad.com/hive/hive-ruby) and [`steem-ruby`](https://github.com/steemit/steem-ruby)
+
+#### Changes in v0.4.7
+
+* Added `attr_reader` for `Radiator::Type::Amount` [#28](https://github.com/inertia186/radiator/issues/28)
+* Added restful fallback for `get_transaction` during `recover_transactions_on_error`
+* Fix beneficiary serialization (thanks @eonwarped)
+
+#### Changes in v0.4.6
+
+* Added health check and persist option
 
 #### Changes in v0.4.5
 
@@ -123,7 +138,7 @@ If you don't have `bundler`, see the next section.
     
 ### Prerequisites
 
-`minimum ruby version: 2.2`
+`minimum ruby version: 2.5`
 
 #### Linux
 
@@ -190,7 +205,7 @@ end
 
 #### Side Chain Support
 
-Steem Smart Contract side-chains are supported by Radiator.  The default side-chain is Steem Engine.
+Steem Smart Contract side-chains are supported by Radiator.  The default side-chain is Hive/Steem Engine.
 
 This will fetch the latest block from the side-chain ...
 
@@ -441,7 +456,7 @@ Example of the output:
 Streaming side-chain transactions are supported:
 
 ```ruby
-# Default side-chain is Steem Engine.
+# Default side-chain is Hive Engine.
 stream = Radiator::SSC::Stream.new
 stream.transactions do |tx, trx_id|
   puts "[#{trx_id}] #{tx.to_json}"
@@ -517,10 +532,10 @@ Radiator supports failover for situations where a node has, for example, become
 
 ```ruby
 options = {
-  url: 'https://api.steemit.com',
+  url: 'https://api.hive.blog',
   failover_urls: [
-    'https://api.steemitstage.com',
-    'https://api.steem.house'
+    'https://anyx.io',
+    'https://api.hivekings.com',
   ]
 }
 
@@ -623,20 +638,20 @@ https://github.com/inertia186/radiator/issues/12
   * `rake`
 * To run tests with parallelization and local code coverage:
   * `HELL_ENABLED=true rake`
-* To run a stream test on the live STEEM blockchain with debug logging enabled:
+* To run a stream test on the live Hive/Steem blockchain with debug logging enabled:
   * `LOG=DEBUG rake test_live_stream`
 
 ---
 
 <center>
-  <img src="https://steemitimages.com/0x0/http://www.steemimg.com/images/2016/08/19/RadiatorCoolingFan-54in-Webfdcb1.png" />
+  <img src="https://i.imgur.com/9LcZKYD.png" />
 </center>
 
-See my previous Ruby How To posts in: [#radiator](https://steemit.com/created/radiator) [#ruby](https://steemit.com/created/ruby)
+See my previous Ruby How To posts in: [#radiator](https://hive.blog/created/radiator) [#ruby](https://hive.blog/created/ruby)
 
 ## Get in touch!
 
-If you're using Radiator, I'd love to hear from you.  Drop me a line and tell me what you think!  I'm @inertia on STEEM.
+If you're using Radiator, I'd love to hear from you.  Drop me a line and tell me what you think!  I'm @inertia on Hive/Steem.
   
 ## License
 

data/Rakefile

@@ -32,18 +32,35 @@ desc 'Tests the ability to broadcast live data.  This task broadcasts a claim_re
 task :test_live_broadcast, [:account, :wif, :chain] do |t, args|
   account_name = args[:account] || 'social'
   posting_wif = args[:wif] || '5JrvPrQeBBvCRdjv29iDvkwn3EQYZ9jqfAHzrCyUvfbEbRkrYFC'
-  chain = args[:chain] || 'steem'
+  chain = (args[:chain] || 'hive').to_sym
   # url = 'https://testnet.steemitdev.com/' # use testnet
   url = nil # use default
   options = {chain: chain, wif: posting_wif, url: url}
   tx = Radiator::Transaction.new(options)
-  tx.operations << {
-    type: :claim_reward_balance,
-    account: account_name,
-    reward_steem: '0.000 STEEM',
-    reward_sbd: '0.000 SBD',
-    reward_vests: '0.000001 VESTS'
-  }
+  
+  reward_core, reward_debt, reward_vest = case chain
+  when :steem then ['0.000 STEEM', '0.000 SBD', '0.000001 VESTS']
+  when :hive then ['0.000 HIVE', '0.000 HBD', '0.000001 VESTS']
+  end
+  
+  case chain
+  when :steem
+    tx.operations << {
+      type: :claim_reward_balance,
+      account: account_name,
+      reward_steem: reward_core,
+      reward_sbd: reward_debt,
+      reward_vests: reward_vest
+    }
+  when :hive
+    tx.operations << {
+      type: :claim_reward_balance,
+      account: account_name,
+      reward_hive: reward_core,
+      reward_hbd: reward_debt,
+      reward_vests: reward_vest
+    }
+  end
   
   response = tx.process(true)
   ap response
@@ -51,19 +68,28 @@ task :test_live_broadcast, [:account, :wif, :chain] do |t, args|
   if !!response.result
     result = response.result
     
-    puts "https://steemd.com/b/#{result[:block_num]}" if !!result[:block_num]
-    puts "https://steemd.com/tx/#{result[:id]}" if !!result[:id]
+    case chain
+    when :steem
+      puts "https://steemd.com/b/#{result[:block_num]}" if !!result[:block_num]
+      puts "https://steemd.com/tx/#{result[:id]}" if !!result[:id]
+    when :hive
+      puts "https://hiveblocks.com/b/#{result[:block_num]}" if !!result[:block_num]
+      puts "https://hiveblocks.com/tx/#{result[:id]}" if !!result[:id]
+    else
+      puts result
+    end
   end
 end
 
-desc 'Tests the ability to stream live data. defaults: chain = steem; persist = true.'
+desc 'Tests the ability to stream live data. defaults: chain = hive; persist = true.'
 task :test_live_stream, [:chain, :persist] do |t, args|
-  chain = args[:chain] || 'steem'
+  chain = (args[:chain] || 'hive').to_sym
   persist = (args[:persist] || 'true') == 'true'
   last_block_number = 0
   # url = 'https://testnet.steemitdev.com/'
-  url = nil # use default
-  options = {chain: chain, persist: persist, url: url}
+  url = chain == :steem ? 'https://api.steemit.com' : 'http://anyx.io'
+  # url = nil # use default
+  options = {chain: chain, persist: persist, url: url, use_condenser_namespace: false}
   total_ops = 0.0
   total_vops = 0.0
   elapsed = 0
@@ -81,18 +107,22 @@ task :test_live_stream, [:chain, :persist] do |t, args|
       op_size = o.map(&:size).reduce(0, :+)
       total_ops += op_size
       
-      api.get_ops_in_block(n, true) do |vops, error|
+      catch :try_vops do; api.get_ops_in_block(n, true) do |vops, error|
         if !!error
           puts "Error on get_ops_in_block for block #{n}"
           ap error if defined? ap
         end
         
-        puts "Problem: vops is nil!" if vops.nil?
-        
-        # Did we reach this point with an unhandled error that wasn't retried?
-        # If so, vops might be nil and we might need this error to get handled
-        # instead of checking for vops.nil?.
-        
+        if vops.nil?
+          puts "#{n}: #{b.witness}; Problem: vops is nil!  Retrying ..."
+          sleep 3 # Possibly fall behind a bit and catch up later.
+          throw :try_vops
+          
+          # Did we reach this point with an unhandled error that wasn't retried?
+          # If so, vops might be nil and we might need this error to get handled
+          # instead of checking for vops.nil?.
+        end
+      
         vop_size = vops.size
         total_vops += vop_size
         
@@ -105,7 +135,7 @@ task :test_live_stream, [:chain, :persist] do |t, args|
         elapsed += Time.now.utc - start
         count += 1
         puts "#{n}: #{b.witness}; trx: #{t_size}; op: #{op_size}, vop: #{vop_size} (cumulative vop ratio: #{('%.2f' % (vop_ratio * 100))} %; average #{((elapsed / count) * 1000).to_i}ms)"
-      end
+      end; end
     else
       # This should not happen.  If it does, there's likely a bug in Radiator.
       
@@ -128,7 +158,7 @@ end
 
 desc 'Publish the current version of the radiator gem.'
 task :push do
-  exec "gem push radiator-#{Radiator::VERSION}.gem"
+  exec "gem push pkg/radiator-#{Radiator::VERSION}.gem"
 end
 
 # We're not going to yank on a regular basis, but this is how it's done if you

data/lib/radiator.rb

@@ -1,4 +1,6 @@
 require 'radiator/version'
+require 'steem'
+require 'hive'
 require 'json'
 require 'awesome_print' if ENV['USE_AWESOME_PRINT'] == 'true'
 
@@ -29,6 +31,7 @@ module Radiator
   require 'radiator/account_history_api'
   require 'radiator/condenser_api'
   require 'radiator/block_api'
+  require 'radiator/bridge'
   require 'radiator/stream'
   require 'radiator/operation_ids'
   require 'radiator/operation_types'
@@ -44,6 +47,5 @@ module Radiator
   require 'radiator/ssc/blockchain'
   require 'radiator/ssc/stream'
   require 'radiator/ssc/contracts'
-  require 'steem' unless defined? Steem
   extend self
 end

data/lib/radiator/api.rb

@@ -138,15 +138,33 @@ module Radiator
     
     DEFAULT_STEEM_FAILOVER_URLS = [
       DEFAULT_STEEM_URL,
-      'https://appbasetest.timcliff.com',
-      'https://api.steem.house',
-      'https://steemd.minnowsupportproject.org',
-      'https://steemd.privex.io',
-      'https://rpc.steemviz.com',
+      'https://api.justyy.com',
+      'https://steem.61bts.com'
+    ]
+    
+    DEFAULT_STEEM_RESTFUL_URL = nil
+    
+    DEFAULT_HIVE_URL = 'https://api.openhive.network'
+    
+    DEFAULT_HIVE_FAILOVER_URLS = [
+      DEFAULT_HIVE_URL,
       'https://anyx.io',
-      'httpd://rpc.usesteem.com'
+      'https://api.hivekings.com',
+      'https://api.hive.blog',
+      'https://techcoderx.com',
+      'https://rpc.ecency.com',
+      'https://hive.roelandp.nl',
+      'https://api.c0ff33a.uk',
+      'https://api.deathwing.me',
+      'https://hive-api.arcange.eu',
+      'https://fin.hive.3speak.co',
+      'https://hived.privex.io',
+      'https://api.pharesim.me',
+      # 'https://rpc.ausbit.dev'
     ]
     
+    DEFAULT_HIVE_RESTFUL_URL = 'https://anyx.io/v1'
+    
     # @private
     POST_HEADERS = {
       'Content-Type' => 'application/json',
@@ -159,15 +177,65 @@ module Radiator
     def self.default_url(chain)
       case chain.to_sym
       when :steem then DEFAULT_STEEM_URL
+      when :hive then DEFAULT_HIVE_URL
       else; raise ApiError, "Unsupported chain: #{chain}"
       end
     end
     
+    def self.default_restful_url(chain)
+      case chain.to_sym
+      when :steem then DEFAULT_STEEM_RESTFUL_URL
+      when :hive then DEFAULT_HIVE_RESTFUL_URL
+      end
+    end
+    
     def self.default_failover_urls(chain)
       case chain.to_sym
-      when :steem then DEFAULT_STEEM_FAILOVER_URLS
+      when :steem, :hive
+        begin
+          _api = Radiator::Api.new(url: DEFAULT_HIVE_FAILOVER_URLS.sample, failover_urls: DEFAULT_HIVE_FAILOVER_URLS)
+          
+          default_failover_urls = _api.get_accounts(['fullnodeupdate']) do |accounts|
+            fullnodeupdate = accounts.first
+            metadata = (JSON[fullnodeupdate.json_metadata] rescue nil) || {}
+            report = metadata.fetch('report', [])
+            
+            if report.any?
+              report.map do |r|
+                if chain.to_sym == :steem && !r.fetch('hive', false)
+                  r.fetch('node')
+                elsif chain.to_sym == :hive && r.fetch('hive', false)
+                  r.fetch('node')
+                end
+              end.compact
+            end
+          end
+        rescue => e
+          puts e
+        end
       else; raise ApiError, "Unsupported chain: #{chain}"
       end
+      
+      if !!default_failover_urls
+        default_failover_urls
+      else
+        case chain.to_sym
+        when :steem then DEFAULT_STEEM_FAILOVER_URLS
+        when :hive then DEFAULT_HIVE_FAILOVER_URLS
+        else; []
+        end
+      end
+    end
+    
+    def self.network_api(chain, api_name, options = {})
+      api = case chain.to_sym
+      when :steem then Steem::Api.clone(freeze: true) rescue Api.clone
+      when :hive then Hive::Api.clone(freeze: true) rescue Api.clone
+      else; raise ApiError, "Unsupported chain: #{chain}"
+      end
+      
+      api.api_name = api_name
+      api.new(options) rescue nil
     end
     
     # Cretes a new instance of Radiator::Api.
@@ -188,8 +256,9 @@ module Radiator
     def initialize(options = {})
       @user = options[:user]
       @password = options[:password]
-      @chain = options[:chain] || :steem
+      @chain = (options[:chain] || 'hive').to_sym
       @url = options[:url] || Api::default_url(@chain)
+      @restful_url = options[:restful_url] || Api::default_restful_url(@chain)
       @preferred_url = @url.dup
       @failover_urls = options[:failover_urls]
       @debug = !!options[:debug]
@@ -263,6 +332,7 @@ module Radiator
       @block_api = nil
       @backoff_at = nil
       @jussi_supported = []
+      @network_api = Api::network_api(@chain, api_name, url: @url)
     end
     
     # Get a specific block or range of blocks.
@@ -357,6 +427,8 @@ module Radiator
     
     # @private
     def respond_to_missing?(m, include_private = false)
+      return true if @network_api.respond_to? m.to_sym
+      
       method_names.nil? ? false : method_names.include?(m.to_sym)
     end
     
@@ -412,6 +484,18 @@ module Radiator
             end
           end
           
+          @network_api ||= Api::network_api(@chain, api_name, url: @uri)
+          
+          if !!@network_api && @network_api.respond_to?(m)
+            if !!block
+              @network_api.send(m, *args) do |*r|
+                return yield(*r)
+              end
+            else
+              return @network_api.send(m, *args)
+            end
+          end
+          
           if response.nil?
             response = request(options)
             
@@ -497,6 +581,9 @@ module Radiator
         #   warning e
         end
         
+        # failover latch
+        @network_api = nil if !!@network_api
+        
         if !!response
           @persist_error_count = 0
           
@@ -618,7 +705,7 @@ module Radiator
         http.keep_alive = 30
         http.idle_timeout = idempotent ? 10 : nil
         http.max_requests = @max_requests
-        http.retry_change_requests = idempotent
+        http.retry_change_requests = idempotent if defined? http.retry_change_requests
         http.reuse_ssl_sessions = @reuse_ssl_sessions
         
         http
@@ -789,15 +876,23 @@ module Radiator
         
         if @recover_transactions_on_error
           begin
-            # Node operators often disable this operation.
-            api.get_transaction(parser.trx_id) do |tx|
-              if !!tx
-                response[:result][:block_num] = tx.block_num
-                response[:result][:trx_num] = tx.transaction_num
-                response[:recovered_by] = http_id
-                response.delete('error') # no need for this, now
+            if !!@restful_url
+              JSON[open("#{@restful_url}/account_history_api/get_transaction?id=#{parser.trx_id}").read].tap do |tx|
+                response[:result][:block_num] = tx['block_num']
+                response[:result][:trx_num] = tx['transaction_num']
+              end
+            else
+              # Node operators often disable this operation.
+              api.get_transaction(parser.trx_id) do |tx|
+                if !!tx
+                  response[:result][:block_num] = tx.block_num
+                  response[:result][:trx_num] = tx.transaction_num
+                end
               end
             end
+            
+            response[:recovered_by] = http_id
+            response.delete('error') # no need for this, now
           rescue
             debug "Couldn't find block for trx_id: #{parser.trx_id}, giving up."
           end