radiator 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7dc50f2559e5378d12b9511cf95ea18c8fa182b
-  data.tar.gz: d484fcd9e21336f1202552589d3c8b58311d48b2
+  metadata.gz: 2fc2844ca29378c9c7ec0e1bca017599a67a8790
+  data.tar.gz: 2637ed93438b046db2a0bb23ad8ff76d6a7dc468
 SHA512:
-  metadata.gz: e54dc905d85d797f9079194f9ae4f7f8c09623238f0bfbd9ea7bd73ad8666f5b981e9221027cb5cea268f6b0e870e433227271a2d42b98a5d01659ad27004a83
-  data.tar.gz: 2869c113566019bbd2c2ef67db6ab745abaf0e33fef3526a30a041b05ad524d1ec44ac6e2edf4a45d45662b7c8832c038e30fa90b0f501d254ecd46bb5b464e5
+  metadata.gz: c320fd85c60540483de9fc407af4561a3612b8b4eb0d08ee31ae71800532a093d2bbc2123716dd1aa7f00d940555d4c22d6db5caccf76ec2d7df692f373cd68d
+  data.tar.gz: fcb25d0fcff488149b5f880caedd459b898ff6dafcd828e4efb2455b9790692deb275f3461f018dbb2feabaa6c4017070ce458cfd4df83eae8dfe1da1aa442ab

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    radiator (0.3.7)
+    radiator (0.3.8)
       awesome_print (~> 1.7, >= 1.7.0)
       bitcoin-ruby (~> 0.0, >= 0.0.11)
       ffi (~> 1.9, >= 1.9.18)
       hashie (~> 3.5, >= 3.5.5)
       json (~> 2.0, >= 2.0.2)
       logging (~> 2.2, >= 2.2.0)
-      net-http-persistent (>= 2.5.2)
+      net-http-persistent (~> 2.5, >= 2.5.2)
 
 GEM
   remote: https://rubygems.org/
@@ -17,7 +17,6 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
     bitcoin-ruby (0.0.12)
-    connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.1.5)
@@ -35,10 +34,9 @@ GEM
     minitest-proveit (1.0.0)
       minitest (> 5, < 7)
     multi_json (1.12.2)
-    net-http-persistent (3.0.0)
-      connection_pool (~> 2.2)
+    net-http-persistent (2.9.4)
     public_suffix (3.0.0)
-    rake (12.1.0)
+    rake (12.2.1)
     safe_yaml (1.0.4)
     simplecov (0.15.1)
       docile (~> 1.1.0)

data/Rakefile

@@ -2,6 +2,7 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'yard'
 require 'radiator'
+require 'awesome_print'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
@@ -25,9 +26,35 @@ task :dump_vcr do |t|
   exec 'rm -v test/fixtures/vcr_cassettes/*.yml'
 end
 
+desc 'Tests the ability to broadcast live data.  This task broadcasts a claim_reward_balance of 0.0000001 VESTS.'
+task :test_live_broadcast, [:account, :wif, :chain] do |t, args|
+  account_name = args[:account] || 'social'
+  posting_wif = args[:wif] || '5JrvPrQeBBvCRdjv29iDvkwn3EQYZ9jqfAHzrCyUvfbEbRkrYFC'
+  chain = args[:chain] || 'steem'
+  options = {chain: chain, wif: posting_wif}
+  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'
+  }
+  
+  response = tx.process(true)
+  ap response
+  
+  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]
+  end
+end
+
 desc 'Tests the ability to stream live data.'
 task :test_live_stream, :chain do |t, args|
-  chain = (args[:chain] || 'steem').to_sym
+  chain = args[:chain] || 'steem'
   last_block_number = 0
   options = {chain: chain}
   api = Radiator::Api.new(options)

data/lib/radiator/api.rb

@@ -400,14 +400,13 @@ module Radiator
         tries += 1
         
         begin
-          if @recover_transactions_on_error && api_name == :network_broadcast_api
+          if tries > 1 && @recover_transactions_on_error && api_name == :network_broadcast_api
             signatures, exp = extract_signatures(options)
             
-            if tries > 1 && !!signatures && signatures.any?
-              offset = [(exp - timestamp).abs, 300].min
+            if !!signatures && signatures.any?
+              offset = [(exp - timestamp).abs, 30].min
               
               if !!(response = recover_transaction(signatures, current_rpc_id, timestamp - offset))
-                warning 'Found recovered transaction after retry.', method_name, true
                 response = Hashie::Mash.new(response)
               end
             end
@@ -440,7 +439,7 @@ module Radiator
               when '504' then warning 'Code 504: Gateway Timeout, retrying ...', method_name, true
               else
                 warning "Unknown code #{response.code}, retrying ...", method_name, true
-                ap response
+                warning response
               end
             end
           end
@@ -469,7 +468,7 @@ module Radiator
           warning "ApiError (#{e.message}), retrying ...", method_name, true
         # rescue => e
         #   warning "Unknown exception from request, retrying ...", method_name, true
-        #   ap e if defined? ap
+        #   warning e
         end
         
         if !!response
@@ -550,6 +549,10 @@ module Radiator
     end
     
     def recover_transaction(signatures, expected_rpc_id, after)
+      debug "Looking for signatures: #{signatures.map{|s| s[0..5]}} since: #{after}"
+      
+      count = 0
+      start = Time.now.utc
       block_range = api.get_dynamic_global_properties do |properties|
         high = properties.head_block_number
         low = high - 100
@@ -562,6 +565,7 @@ module Radiator
       # but we also give up once the block time is before the `after` argument.
       
       api.get_blocks(block_range) do |block, block_num|
+        count += 1
         raise ApiError, "Race condition detected on remote node at: #{block_num}" if block.nil?
         
         timestamp = Time.parse(block.timestamp + 'Z')
@@ -570,8 +574,11 @@ module Radiator
         block.transactions.each_with_index do |tx, index|
           next unless ((tx['signatures'] || []) & signatures).any?
           
+          debug "Found transaction #{count} block(s) ago; took #{(Time.now.utc - start)} seconds to scan."
+          
           return {
             id: expected_rpc_id,
+            recovered_by: http_id,
             result: {
               id: block.transaction_ids[index],
               block_num: block_num,
@@ -582,6 +589,8 @@ module Radiator
         end
       end
       
+      debug "Could not find transaction in #{count} block(s); took #{(Time.now.utc - start)} seconds to scan."
+      
       return nil
     end
     
@@ -608,7 +617,7 @@ module Radiator
     end
     
     def flappy?
-      !!@backoff_at && Time.now - @backoff_at < 300
+      !!@backoff_at && Time.now.utc - @backoff_at < 300
     end
     
     def drop_current_failover_url(prefix)
@@ -623,7 +632,7 @@ module Radiator
    
     def handle_error(response, request_options, method_name, tries)
       parser = ErrorParser.new(response)
-      signatures, exp = extract_signatures(request_options)
+      _signatures, exp = extract_signatures(request_options)
       
       if (!!exp && exp < Time.now.utc) || tries > 2
         # Whatever the error was, it is already expired or tried too much.  No
@@ -636,6 +645,34 @@ module Radiator
         return nil
       end
       
+      if !!parser.trx_id
+        # Turns out, the ErrorParser found a transaction id.  It might come in
+        # handy, so let's append this to the result along with the error.
+        
+        response[:result] = {
+          id: parser.trx_id,
+          block_num: -1,
+          trx_num: -1,
+          expired: false
+        }
+        
+        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
+              end
+            end
+          rescue
+            debug "Couldn't find block for trx_id: #{parser.trx_id}, giving up."
+          end
+        end
+      end
+      
       Hashie::Mash.new(response)
     end
     
@@ -661,13 +698,13 @@ module Radiator
     def backoff
       shutdown
       bump_failover if flappy? || !healthy?(@url)
-      @backoff_at ||= Time.now
+      @backoff_at ||= Time.now.utc
       @backoff_sleep ||= 0.01
       
       @backoff_sleep *= 2
       sleep @backoff_sleep
       
-      if !!@backoff_at && Time.now - @backoff_at > 300
+      if !!@backoff_at && Time.now.utc - @backoff_at > 300
         @backoff_at = nil 
         @backoff_sleep = nil
       end

data/lib/radiator/chain_config.rb

@@ -1,6 +1,6 @@
 module Radiator
   module ChainConfig
-    EXPIRE_IN_SECS = 15
+    EXPIRE_IN_SECS = 600
     EXPIRE_IN_SECS_PROPOSAL = 24 * 60 * 60
     
     NETWORKS_STEEM_CHAIN_ID = '0000000000000000000000000000000000000000000000000000000000000000'

data/lib/radiator/error_parser.rb

@@ -4,18 +4,21 @@ module Radiator
     
     attr_reader :response, :error_code, :error_message,
       :api_name, :api_method, :api_params,
-      :expiry, :can_retry, :can_reprepare, :debug
+      :expiry, :can_retry, :can_reprepare, :trx_id, :debug
       
     alias expiry? expiry
     alias can_retry? can_retry
     alias can_reprepare? can_reprepare
     
-    REPREPARE = [
+    REPREPARE_WHITELIST = [
       'is_canonical( c ): signature is not canonical',
-      'now < trx.expiration: ',
-      '(skip & skip_transaction_dupe_check) || trx_idx.indices().get<by_trx_id>().find(trx_id) == trx_idx.indices().get<by_trx_id>().end(): Duplicate transaction check failed'
+      'now < trx.expiration: '
     ]
     
+    DUPECHECK = '(skip & skip_transaction_dupe_check) || trx_idx.indices().get<by_trx_id>().find(trx_id) == trx_idx.indices().get<by_trx_id>().end(): Duplicate transaction check failed'
+      
+    REPREPARE_BLACKLIST = [DUPECHECK]
+    
     def initialize(response)
       @response = response
       
@@ -28,6 +31,7 @@ module Radiator
       @expiry = nil
       @can_retry = nil
       @can_reprepare = nil
+      @trx_id = nil
       @debug = nil
       
       parse_error_response
@@ -48,12 +52,16 @@ module Radiator
         @api_name = data_call_method['call.params']
       end
       
+      # See if we can recover a transaction id out of this hot mess.
+      data_trx_ix = stack_datum.find { |data| !!data['trx_ix'] }
+      @trx_id = data_trx_ix['trx_ix'] if !!data_trx_ix
+      
       case @error_code
       when 10
         @expiry = false
         @can_retry = false
         @can_reprepare = if @api_name == 'network_broadcast_api'
-          (stack_formats & REPREPARE).any?
+          (stack_formats & REPREPARE_WHITELIST).any?
         else
           false
         end

data/lib/radiator/stream.rb

@@ -286,7 +286,7 @@ module Radiator
         rescue StreamError; raise
         # rescue => e
         #   warning "Unknown streaming error: #{e.inspect}, retrying ...  "
-        #   ap e
+        #   warning e
         #   redo
         end; end
       end
@@ -408,8 +408,7 @@ module Radiator
       throwable = secondary[:throw]
       
       warning message
-      
-      ap error if !!error
+      warning error if !!error
       backoff_api.send :backoff if !!backoff_api
       throw throwable if !!throwable
     end

data/lib/radiator/transaction.rb

@@ -44,6 +44,9 @@ module Radiator
         @private_key = Bitcoin::Key.from_base58 wif
       end
       
+      @expiration ||= nil
+      @immutable_expiration = !!@expiration
+      
       options = options.merge(url: @url, chain: @chain)
       @api = Api.new(options)
       @network_broadcast_api = NetworkBroadcastApi.new(options)
@@ -78,7 +81,7 @@ module Radiator
             parser = ErrorParser.new(response)
             
             if parser.can_reprepare?
-              debug "Repreparing transaction ..."
+              debug "Error code: #{parser}, repreparing transaction ..."
               prepare
               redo 
             end
@@ -105,7 +108,7 @@ module Radiator
     end
   private
     def payload
-      {
+      @payload ||= {
         expiration: @expiration.strftime('%Y-%m-%dT%H:%M:%S'),
         ref_block_num: @ref_block_num,
         ref_block_prefix: @ref_block_prefix,
@@ -118,55 +121,57 @@ module Radiator
     def prepare
       raise TransactionError, "No wif or private key." unless !!@wif || !!@private_key
       
-      @api.get_dynamic_global_properties do |properties, error|
-        if !!error
-          raise TransactionError, "Unable to prepare transaction.", error
+      @payload = nil
+      
+      while @expiration.nil? && @ref_block_num.nil? && @ref_block_prefix.nil?
+        @api.get_dynamic_global_properties do |properties, error|
+          if !!error
+            raise TransactionError, "Unable to prepare transaction.", error
+          end
+          
+          @properties = properties
         end
-        
-        @properties = properties
-        
-        case @chain
-        when :steem, :test
-          # You can actually go back as far as the TaPoS buffer will allow, which
-          # is something like 50,000 blocks.
           
-          block_number = @properties.last_irreversible_block_num
+        # You can actually go back as far as the TaPoS buffer will allow, which
+        # is something like 50,000 blocks.
         
-          @api.get_block(block_number) do |block, error|
-            if !!error
-              raise TransactionError, "Unable to prepare transaction.", error
-            end
+        block_number = @properties.last_irreversible_block_num
+      
+        @api.get_block(block_number) do |block, error|
+          if !!error
+            raise TransactionError, "Unable to prepare transaction.", error
+          end
+          
+          if !!block && !!block.previous
+            @ref_block_num = (block_number - 1) & 0xFFFF
+            @ref_block_prefix = unhexlify(block.previous[8..-1]).unpack('V*')[0]
+          
+            # The expiration allows for transactions to expire if they are not
+            # included into a block by that time.  Always update it to the current
+            # time + EXPIRE_IN_SECS.
+            #
+            # Note, as of #1215, expiration exactly 'now' will be rejected:
+            # https://github.com/steemit/steem/blob/57451b80d2cf480dcce9b399e48e56aa7af1d818/libraries/chain/database.cpp#L2870
+            # https://github.com/steemit/steem/issues/1215
+            
+            block_time = Time.parse(@properties.time + 'Z')
+            @expiration ||= block_time + EXPIRE_IN_SECS
+          else
+            # Suspect this happens when there are microforks, but it should be
+            # rare, especially since we're asking for the last irreversible
+            # block.
             
             if block.nil?
-              raise TransactionError, "Unable to prepare transaction, block missing."
+              warning "Block missing while trying to prepare transaction, retrying ..."
+            else
+              debug block if ENV['LOG'] == 'DEBUG'
+              
+              warning "Block structure while trying to prepare transaction, retrying ..."
             end
             
-            if block.block_id.nil?
-              raise TransactionError, "Unable to prepare transaction, block.block_id missing."
-            end
-
-            @ref_block_num = block_number & 0xFFFF
-            @ref_block_prefix = unhexlify(block.block_id[8..-1]).unpack('V*')[0]
+            @expiration = nil unless @immutable_expiration
           end
-        when :golos
-          # No support for block_id in get_block on golos (yet), so just use the
-          # head block number.
-          
-          @ref_block_num = @properties.head_block_number & 0xFFFF
-          @ref_block_prefix = unhexlify(@properties.head_block_id[8..-1]).unpack('V*')[0]
-        else
-          raise TransactionError, "Unable to prepare transaction, unsupported chain: #{@chain}"
         end
-        
-        # The expiration allows for transactions to expire if they are not
-        # included into a block by that time.  Always update it to the current
-        # time + EXPIRE_IN_SECS.
-        #
-        # Note, as of #1215, expiration exactly 'now' will be rejected:
-        # https://github.com/steemit/steem/blob/57451b80d2cf480dcce9b399e48e56aa7af1d818/libraries/chain/database.cpp#L2870
-        # https://github.com/steemit/steem/issues/1215
-        
-        @expiration = Time.parse(@properties.time + 'Z') + EXPIRE_IN_SECS
       end
       
       self
@@ -198,7 +203,7 @@ module Radiator
       digest_hex = digest.freeze
 
       loop do
-        @expiration += 1
+        @expiration += 1 unless @immutable_expiration
         sig = ec.sign_compact(digest_hex, @private_key.priv, public_key_hex)
         
         next if public_key_hex != ec.recover_compact(digest_hex, sig)

data/lib/radiator/utils.rb

@@ -22,35 +22,44 @@ module Radiator
       [signatures, expirations.min]
     end
     
-    def send_log(level, message, prefix = nil)
-      log_message = if !!prefix
-        "#{prefix} :: #{message}"
-      else
-        message
-      end
-      
-      if !!@logger
-        @logger.send level, log_message
+    def send_log(level, obj, prefix = nil)
+      log_message = case obj
+      when String
+        log_message = if !!prefix
+          "#{prefix} :: #{obj}"
+        else
+          obj
+        end
+        
+        if !!@logger
+          @logger.send level, log_message
+        else
+          puts "#{level}: #{log_message}"
+        end
       else
-        puts "#{level}: #{log_message}"
+        if !!prefix
+          @logger.ap log_level: level, prefix => obj
+        else
+          @logger.ap obj, level
+        end
       end
       
       nil
     end
     
-    def error(message, prefix = nil)
-      send_log(:error, message, prefix)
+    def error(obj, prefix = nil)
+      send_log(:error, obj, prefix)
     end
     
-    def warning(message, prefix = nil, log_debug_node = false)
+    def warning(obj, prefix = nil, log_debug_node = false)
       debug("Current node: #{@url}", prefix) if !!log_debug_node && @url
         
-      send_log(:warn, message, prefix)
+      send_log(:warn, obj, prefix)
     end
     
-    def debug(message, prefix = nil)
+    def debug(obj, prefix = nil)
       if ENV['LOG'] == 'DEBUG'
-        send_log(:debug, message, prefix)
+        send_log(:debug, obj, prefix)
       end
     end
     

data/lib/radiator/version.rb

@@ -1,3 +1,3 @@
 module Radiator
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 end

data/radiator.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
   spec.add_development_dependency 'yard', '~> 0.9.9'
   
-  spec.add_dependency('net-http-persistent', '>= 2.5.2')
+  spec.add_dependency('net-http-persistent', '~> 2.5', '>= 2.5.2')
   spec.add_dependency('json', '~> 2.0', '>= 2.0.2')
   spec.add_dependency('logging', '~> 2.2', '>= 2.2.0')
   spec.add_dependency('hashie', '~> 3.5', '>= 3.5.5')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radiator
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,6 +176,9 @@ dependencies:
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.2
@@ -183,6 +186,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.2