radiator 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5df9b0fd593b559881d44bfd81cffa32831e9ab9
-  data.tar.gz: 0c1b4ab039cbf26d896477d45a7b817ea2978265
+  metadata.gz: 1f5f2643bbb6354a779623e8f20d7be5f5d83249
+  data.tar.gz: 327db2a8c46cd416de62ed449fac46af45333f54
 SHA512:
-  metadata.gz: ef6d2abbaea8e67b695bcfd6ab0fd845f65afc09b9ce396b48bea316f49d5f2650890f70826e4bbde2527aae02adb2e8f493473e6144a6663e550195c1ac7dd6
-  data.tar.gz: 3bcd4169779d4e88e7d23ea713ef94378b41ba0e6bb6b885e4a1ceec8f7b76007a5e1d7cf21bc86b776d2fb57c4b275aa2fe58f2472e42ef6e7d468357266954
+  metadata.gz: d0bbb1950e374f28f15f532b6839bf93c39436e489fef70c22cea2cb77e2e94bc7fd6d184d5199aa7235be07cf917a04b42aded9eca185d1c33786131af7b05c
+  data.tar.gz: 02c0666cdb6eaa058826608e630a3f4baf5ce89c3116e401d6d608a695132a6242a5c72fd0ee61d42f5a883558929132428f2e3bc70989016cdfa46f28439ad8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    radiator (0.3.0)
+    radiator (0.3.1)
       bitcoin-ruby (= 0.0.11)
       ffi (= 1.9.18)
       hashie (~> 3.5, >= 3.5.5)

data/README.md

@@ -376,7 +376,7 @@ tx.process(true)
 Radiator also supports Golos.  To use the Golos blockchain, provide a node and chain_id:
 
 ```ruby
-tx = Radiator::Transaction.new(wif: 'Your Wif Here', chain: :golos, url: 'https://node.golos.ws')
+tx = Radiator::Transaction.new(wif: 'Your Wif Here', chain: :golos, url: 'https://ws.golos.io')
 vote = {
   type: :vote,
   voter: 'xeroc',

data/lib/radiator/api.rb

@@ -131,10 +131,12 @@ module Radiator
   # @see https://steemit.github.io/steemit-docs/#accounts
   #
   class Api
-    DEFAULT_URL = 'https://steemd.steemit.com'
+    DEFAULT_STEEM_URL = 'https://steemd.steemit.com'
     
-    DEFAULT_FAILOVER_URLS = [
-      DEFAULT_URL,
+    DEFAULT_GOLOS_URL = 'https://ws.golos.io'
+    
+    DEFAULT_STEEM_FAILOVER_URLS = [
+      DEFAULT_STEEM_URL,
       'https://steemd-int.steemit.com',
       'https://steemd.steemitstage.com',
       'https://gtg.steem.house:8090',
@@ -144,11 +146,35 @@ module Radiator
       'https://rpc.steemliberator.com'
     ]
     
+    DEFAULT_GOLOS_FAILOVER_URLS = [
+      DEFAULT_GOLOS_URL
+    ]
+    
     # @private
     POST_HEADERS = {
       'Content-Type' => 'application/json'
     }
     
+    # These are known SSL versions supported by:
+    # https://github.com/ruby/openssl/blob/master/lib/openssl/ssl.rb
+    SSL_VERSIONS = [:TLSv1_2, :TLSv1_1, :TLSv1, :SSLv3, :SSLv2, :SSLv23]
+    
+    def self.default_url(chain)
+      case chain.to_sym
+      when :steem then DEFAULT_STEEM_URL
+      when :golos then DEFAULT_GOLOS_URL
+      else; raise ApiError, "Unsupported chain: #{chain}"
+      end
+    end
+    
+    def self.default_failover_urls(chain)
+      case chain.to_sym
+      when :steem then DEFAULT_STEEM_FAILOVER_URLS
+      when :golos then DEFAULT_GOLOS_FAILOVER_URLS
+      else; raise ApiError, "Unsupported chain: #{chain}"
+      end
+    end
+    
     # Cretes a new instance of Radiator::Api.
     #
     # Examples:
@@ -164,16 +190,18 @@ module Radiator
     def initialize(options = {})
       @user = options[:user]
       @password = options[:password]
-      @url = options[:url] || DEFAULT_URL
+      @chain = options[:chain] || :steem
+      @url = options[:url] || Api::default_url(@chain)
       @preferred_url = @url.dup
       @failover_urls = options[:failover_urls]
       @debug = !!options[:debug]
       @logger = options[:logger] || Radiator.logger
       @hashie_logger = options[:hashie_logger] || Logger.new(nil)
       @max_requests = options[:max_requests] || 30
+      @ssl_version = nil # default
       
       if @failover_urls.nil?
-        @failover_urls = DEFAULT_FAILOVER_URLS - [@url]
+        @failover_urls = Api::default_failover_urls(@chain) - [@url]
       end
       
       @failover_urls = [@failover_urls].flatten.compact
@@ -191,7 +219,7 @@ module Radiator
       
       Hashie.logger = @hashie_logger
       @method_names = nil
-      @api_options = options.dup
+      @api_options = options.dup.merge(chain: @chain)
     end
     
     # Get a specific block or range of blocks.
@@ -419,7 +447,8 @@ module Radiator
         rescue RangeError => e
           warning 'Range Error, retrying ...', method_name
         rescue OpenSSL::SSL::SSLError => e
-          warning "SSL Error (#{e.message}), retrying ...", method_name
+          @ssl_version = SSL_VERSIONS.sample
+          warning "SSL Error (#{e.message}), switching to #{@ssl_version} and retrying ...", method_name
         rescue SocketError => e
           warning "Socket Error (#{e.message}), retrying ...", method_name
         rescue JSON::ParserError => e
@@ -485,7 +514,13 @@ module Radiator
         http.idle_timeout = idempotent ? 10 : nil
         http.max_requests = @max_requests
         http.retry_change_requests = idempotent
-        http.reuse_ssl_sessions = !flappy?
+        
+        if flappy?
+          http.reuse_ssl_sessions = false
+          http.ssl_version = @ssl_version
+        else
+          http.reuse_ssl_sessions = true
+        end
       end
     end
     
@@ -573,7 +608,7 @@ module Radiator
       @backoff_sleep *= 2
       sleep @backoff_sleep
       
-      if Time.now - @backoff_at > 300
+      if !!@backoff_at && Time.now - @backoff_at > 300
         @backoff_at = nil 
         @backoff_sleep = nil
       end

data/lib/radiator/chain_config.rb

@@ -15,7 +15,7 @@ module Radiator
     NETWORKS_GOLOS_CORE_ASSET = 'GOLOS'
     NETWORKS_GOLOS_DEBT_ASSET = 'GBG'
     NETWORKS_GOLOS_VEST_ASSET = 'GESTS'
-    NETWORKS_GOLOS_DEFAULT_NODE = 'https://node.golos.ws'
+    NETWORKS_GOLOS_DEFAULT_NODE = 'https://ws.golos.io'
     
     NETWORKS_TEST_CHAIN_ID = '18dcf0a285365fc58b71f18b3d3fec954aa0c141c44e4e5cb4cf777b9eab274e'
     NETWORKS_TEST_ADDRESS_PREFIX = 'TST'

data/lib/radiator/stream.rb

@@ -24,8 +24,7 @@ module Radiator
     MAX_BLOCKS_PER_NODE = 100
     
     def initialize(options = {})
-      @api_options = options.dup
-      @logger = @api_options[:logger] || Radiator.logger
+      super
     end
     
     # Returns the latest operations from the blockchain.

data/lib/radiator/transaction.rb

@@ -43,7 +43,7 @@ module Radiator
         @private_key = Bitcoin::Key.from_base58 wif
       end
       
-      options = options.merge(url: @url)
+      options = options.merge(url: @url, chain: @chain)
       @api = Api.new(options)
       @network_broadcast_api = NetworkBroadcastApi.new(options)
     end

data/lib/radiator/version.rb

@@ -1,3 +1,3 @@
 module Radiator
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Anthony Martin