radiator 0.4.7 → 0.4.8.pre.1

data/lib/radiator/operation_types.rb

@@ -4,18 +4,18 @@ module Radiator
   module OperationTypes
     TYPES = {
       transfer: {
-        amount: Type::Amount
+        amount: Hive::Type::Amount
       },
       transfer_to_vesting: {
-        amount: Type::Amount
+        amount: Hive::Type::Amount
       },
       withdraw_vesting: {
-        vesting_shares: Type::Amount
+        vesting_shares: Hive::Type::Amount
       },
       limit_order_create: {
         orderid: Type::Uint32,
-        amount_to_sell: Type::Amount,
-        min_to_receive: Type::Amount,
+        amount_to_sell: Hive::Type::Amount,
+        min_to_receive: Hive::Type::Amount,
         expiration: Type::PointInTime
       },
       limit_order_cancel: {
@@ -26,10 +26,10 @@ module Radiator
       },
       convert: {
         requestid: Type::Uint32,
-        amount: Type::Amount
+        amount: Hive::Type::Amount
       },
       account_create: {
-        fee: Type::Amount,
+        fee: Hive::Type::Amount,
         owner: Type::Permission,
         active: Type::Permission,
         posting: Type::Permission,
@@ -51,7 +51,7 @@ module Radiator
         id: Type::Uint16
       },
       comment_options: {
-        max_accepted_payout: Type::Amount,
+        max_accepted_payout: Hive::Type::Amount,
         allow_replies: Type::Future
       },
       set_withdraw_vesting_route: {
@@ -59,7 +59,7 @@ module Radiator
       },
       limit_order_create2: {
         orderid: Type::Uint32,
-        amount_to_sell: Type::Amount,
+        amount_to_sell: Hive::Type::Amount,
         exchange_rate: Type::Price,
         expiration: Type::PointInTime
       },
@@ -71,10 +71,12 @@ module Radiator
         recent_owner_Permission: Type::Permission
       },
       escrow_transfer: {
-        sbd_amount: Type::Amount,
-        steem_amount: Type::Amount,
+        sbd_amount: Steem::Type::Amount,
+        hbd_amount: Hive::Type::Amount,
+        steem_amount: Steem::Type::Amount,
+        hive_amount: Hive::Type::Amount,
         escrow_id: Type::Uint32,
-        fee: Type::Amount,
+        fee: Hive::Type::Amount,
         ratification_deadline: Type::PointInTime,
         escrow_expiration: Type::PointInTime
       },
@@ -83,40 +85,46 @@ module Radiator
       },
       escrow_release: {
         escrow_id: Type::Uint32,
-        sbd_amount: Type::Amount,
-        steem_amount: Type::Amount
+        sbd_amount: Steem::Type::Amount,
+        hbd_amount: Hive::Type::Amount,
+        steem_amount: Steem::Type::Amount,
+        hive_amount: Hive::Type::Amount
       },
       escrow_approve: {
         escrow_id: Type::Uint32
       },
       transfer_to_savings: {
-        amount: Type::Amount
+        amount: Hive::Type::Amount
       },
       transfer_from_savings: {
         request_id: Type::Uint32,
-        amount: Type::Amount
+        amount: Hive::Type::Amount
       },
       cancel_transfer_from_savings: {
         request_id: Type::Uint32
       },
       reset_account: {
-        new_owner_permission: Type::Amount
+        new_owner_permission: Hive::Type::Amount
       },
       set_reset_account: {
-        reward_steem: Type::Amount,
-        reward_sbd: Type::Amount,
-        reward_vests: Type::Amount
+        reward_steem: Steem::Type::Amount,
+        reward_hive: Hive::Type::Amount,
+        reward_sbd: Steem::Type::Amount,
+        reward_hbd: Hive::Type::Amount,
+        reward_vests: Hive::Type::Amount
       },
       claim_reward_balance: {
-        reward_steem: Type::Amount,
-        reward_sbd: Type::Amount,
-        reward_vests: Type::Amount
+        reward_steem: Steem::Type::Amount,
+        reward_hive: Hive::Type::Amount,
+        reward_sbd: Steem::Type::Amount,
+        reward_hbd: Hive::Type::Amount,
+        reward_vests: Hive::Type::Amount
       },
       delegate_vesting_shares: {
-        vesting_shares: Type::Amount
+        vesting_shares: Hive::Type::Amount
       },
       claim_account: {
-        fee: Type::Amount
+        fee: Hive::Type::Amount
       },
       witness_update: {
         block_signing_key: Type::PublicKey,
@@ -127,13 +135,21 @@ module Radiator
       }
     }
     
-    def type(key, param, value)
+    def type(chain, key, param, value)
       return if value.nil?
       
       t = TYPES[key] or return value
       p = t[param] or return value
       
-      p.new(value)
+      if p == Hive::Type::Amount
+        case chain
+        when :steem then Steem::Type::Amount.new(value)
+        else
+          p.new(value)
+        end
+      else
+        p.new(value)
+      end
     end
   end
 end

data/lib/radiator/ssc/base_steem_smart_contract_rpc.rb

@@ -75,7 +75,7 @@ module Radiator
               http.keep_alive = 30
               http.idle_timeout = 10
               http.max_requests = @max_requests
-              http.retry_change_requests = true
+              http.retry_change_requests = true if defined? http.retry_change_requests
               http.reuse_ssl_sessions = @reuse_ssl_sessions
             end
           else

data/lib/radiator/stream.rb

@@ -258,7 +258,7 @@ module Radiator
         break if stop?
         
         catch :sequence do; begin
-          head_block = api.get_dynamic_global_properties do |properties, error|
+          head_block = database_api.get_dynamic_global_properties do |properties, error|
             if !!error
               standby "Node responded with: #{error.message || 'unknown error'}, retrying ...", {
                 error: error,
@@ -268,7 +268,7 @@ module Radiator
             
             break if stop?
             
-            if properties.head_block_number.nil?
+            if properties.nil? || properties.head_block_number.nil?
               # This can happen if a reverse proxy is acting up.
               standby "Bad block sequence after height: #{latest_block_number}", {
                 and: {throw: :sequence}
@@ -281,7 +281,7 @@ module Radiator
             else; raise StreamError, '"mode" has to be "head" or "irreversible"'
             end
           end
-            
+          
           if head_block == latest_block_number
             # This can happen when there's a delay in block production.
             
@@ -390,6 +390,7 @@ module Radiator
       
       @api = nil
       @block_api = nil
+      @database_api = nil if @api.nil? || @block_api.nil?
       GC.start
     end
     
@@ -435,6 +436,14 @@ module Radiator
       else; nil
       end
     end
+    
+    def database_api
+      @database_api ||= case @chain
+      when :steem then Steem::DatabaseApi.new(url: @api.send(:uri).to_s)
+      when :hive then Hive::DatabaseApi.new(url: @api.send(:uri).to_s)
+      else; api
+      end
+    end
   private
     def method_missing(m, *args, &block)
       super unless respond_to_missing?(m)
@@ -445,11 +454,11 @@ module Radiator
         break if stop?
         
         value = if (n = method_params(m)).nil?
-          key_value = api.get_dynamic_global_properties.result[m]
+          key_value = database_api.get_dynamic_global_properties.result[m]
         else
           key = n.keys.first
           if !!n[key]
-            r = api.get_dynamic_global_properties.result
+            r = database_api.get_dynamic_global_properties.result
             key_value = param = r[n[key]]
             result = nil
             loop do
@@ -466,7 +475,7 @@ module Radiator
             reset_timeout
             result
           else
-            key_value = api.get_dynamic_global_properties.result[key]
+            key_value = database_api.get_dynamic_global_properties.result[key]
           end
         end
         unless @latest_values.include? key_value

data/lib/radiator/transaction.rb

@@ -81,6 +81,11 @@ module Radiator
 
       case chain.to_s.downcase.to_sym
       when :steem then NETWORKS_STEEM_CHAIN_ID
+      when :hive
+        database_api = Hive::DatabaseApi.new(url: @url)
+        database_api.get_config do |config|
+          config['HIVE_CHAIN_ID']
+        end rescue nil || NETWORKS_HIVE_CHAIN_ID
       when :test then NETWORKS_TEST_CHAIN_ID
       end
     end
@@ -88,6 +93,7 @@ module Radiator
     def url
       case chain.to_s.downcase.to_sym
       when :steem then NETWORKS_STEEM_DEFAULT_NODE
+      when :hive then NETWORKS_HIVE_DEFAULT_NODE
       when :test then NETWORKS_TEST_DEFAULT_NODE
       end
     end
@@ -114,6 +120,26 @@ module Radiator
       else
         self
       end
+    rescue OperationError => e
+      trx_builder, network_api = case @chain.to_sym
+      when :steem then [
+        Steem::TransactionBuilder.new(wif: @wif),
+        Steem::NetworkBroadcastApi.new(url: @url)
+      ]
+      when :hive then [
+        Hive::TransactionBuilder.new(wif: @wif),
+        Hive::NetworkBroadcastApi.new(url: @url)
+      ]
+      end
+      
+      raise e if trx_builder.nil?
+      
+      @operations.each do |op|
+        type = op.delete(:type)
+        trx_builder.put({type => op})
+      end
+      
+      network_api.broadcast_transaction_synchronous(trx_builder.transaction)
     ensure
       shutdown
     end
@@ -122,7 +148,7 @@ module Radiator
       @operations = @operations.map do |op|
         case op
         when Operation then op
-        else; Operation.new(op)
+        else; Operation.new(op.merge(chain: @chain))
         end
       end
     end
@@ -251,6 +277,7 @@ module Radiator
         bytes << op.to_bytes
       end
 
+      # FIXME Should pakC(0) instead?
       bytes << 0x00 # extensions
 
       bytes

data/lib/radiator/type/amount.rb

@@ -1,58 +1,33 @@
+# @deprecated Using Radiator::Type::Amount class provided is deprecated.  Please use: Hive::Type::Amount
 module Radiator
   module Type
-    
-    # See: https://github.com/xeroc/piston-lib/blob/34a7525cee119ec9b24a99577ede2d54466fca0e/steembase/operations.py
-    class Amount < Serializer
-      attr_reader :amount, :precision, :nai, :asset
-      
-      def initialize(value)
-        super(:amount, value)
-        
-        case value
-        when ::Array
-          a, @precision, @nai = value
-          @asset = case @nai
-          when '@@000000013' then 'SBD'
-          when '@@000000021' then 'STEEM'
-          when '@@000000037' then 'VESTS'
-          else; raise TypeError, "Asset #{@asset} unknown."
-          end
-          @amount = "%.#{@precision}f" % (a.to_f / 10 ** @precision)
-        else
-          @amount, @asset = value.strip.split(' ')
-          @precision = case @asset
-          when 'STEEM' then 3
-          when 'VESTS' then 6
-          when 'SBD' then 3
-          when 'CORE' then 3
-          when 'CESTS' then 6
-          when 'TEST' then 3
-          else; raise TypeError, "Asset #{@asset} unknown."
-          end
+    class Amount < Hive::Type::Amount
+      def initialize(options = {})
+        unless defined? @@deprecated_warning_shown
+          warn "[DEPRECATED] Using Radiator::Type::Amount class provided is deprecated.  Please use: Hive::Type::Amount"
+          @@deprecated_warning_shown = true
+          
+          super(options.merge(chain: :steem))
         end
       end
-      
-      def to_bytes
-        asset = @asset.ljust(7, "\x00")
-        amount = (@amount.to_f * 10 ** @precision).round
-        
-        [amount].pack('q') +
-        [@precision].pack('c') +
-        asset
-      end
-      
-      def to_a
-        case @asset
-        when 'STEEM' then [(@amount.to_f * 1000).to_i.to_s, 3, '@@000000021']
-        when 'VESTS' then [(@amount.to_f * 1000000).to_i.to_s, 6, '@@000000037']
-        when 'SBD' then [(@amount.to_f * 1000).to_i.to_s, 3, '@@000000013']
-        else; raise TypeError, "Asset #{@asset} unknown."
-        end
-      end
-      
-      def to_s
-        "#{@amount} #{@asset}"
-      end
     end
   end
 end
+
+# Patch for legacy serializer.
+class Hive::Type::Amount
+  def to_bytes
+    asset = case @asset
+    when 'HBD' then 'SBD'
+    when 'HIVE' then 'STEEM'
+    else; @asset
+    end
+    
+    asset = asset.ljust(7, "\x00")
+    amount = (@amount.to_f * 10 ** @precision).round
+    
+    [amount].pack('q') +
+    [@precision].pack('c') +
+    asset
+  end
+end

data/lib/radiator/type/price.rb

@@ -5,8 +5,8 @@ module Radiator
       def initialize(value)
         super(:price, value)
         
-        @base = Amount.new(@value[:base])
-        @quote = Amount.new(@value[:quote])
+        @base = Hive::Type::Amount.new(@value[:base])
+        @quote = Hive::Type::Amount.new(@value[:quote])
       end
       
       def to_bytes

data/lib/radiator/version.rb

@@ -1,4 +1,4 @@
 module Radiator
-  VERSION = '0.4.7'
+  VERSION = '0.4.8.pre.1'
   AGENT_ID = "radiator/#{VERSION}"
 end

data/radiator.gemspec

@@ -9,34 +9,36 @@ Gem::Specification.new do |spec|
   spec.authors = ['Anthony Martin']
   spec.email = ['radiator@martin-studio.com']
 
-  spec.summary = %q{STEEM RPC Ruby Client}
-  spec.description = %q{Client for accessing the STEEM blockchain.}
+  spec.summary = %q{Hive/Steem RPC Ruby Client}
+  spec.description = %q{Client for accessing the Hive/Steem blockchain.}
   spec.homepage = 'https://github.com/inertia186/radiator'
   spec.license = 'CC0-1.0'
 
-  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/}) }
+  spec.files = Dir['lib/**/*', 'test/**/*', 'Gemfile', 'LICENSE', 'Rakefile', 'README.md', 'radiator.gemspec']
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.1'
-  spec.add_development_dependency 'rake', '~> 12.1', '>= 12.1.0'
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
   spec.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.3'
   spec.add_development_dependency 'minitest-line', '~> 0.6.3'
   spec.add_development_dependency 'minitest-proveit', '~> 1.0', '>= 1.0.0'
   spec.add_development_dependency 'webmock', '~> 3.6', '>= 3.6.0'
-  spec.add_development_dependency 'simplecov', '~> 0.17.0'
-  spec.add_development_dependency 'vcr', '~> 5.0', '>= 5.0.0'
+  spec.add_development_dependency 'simplecov', '~> 0.19.0'
+  spec.add_development_dependency 'vcr', '~> 6.0', '>= 6.0.0'
   spec.add_development_dependency 'yard', '~> 0.9.20'
   spec.add_development_dependency 'pry', '~> 0.11', '>= 0.11.3'
   spec.add_development_dependency 'rb-readline', '~> 0.5', '>= 0.5.5'
-  spec.add_development_dependency 'irb', '~> 1.0', '>= 1.0.0'
+  spec.add_development_dependency 'irb', '~> 1.2', '>= 1.2.1'
   
   # net-http-persistent has an open-ended dependency because radiator directly
-  # supports net-http-persistent-3.0.0 as well as net-http-persistent-2.5.2.
+  # supports net-http-persistent-4.0.0 as well as net-http-persistent-2.5.2.
   spec.add_dependency('net-http-persistent', '>= 2.5.2')
+  spec.add_dependency('steem-ruby', '~> 0.9', '>= 0.9.4')
+  spec.add_dependency('hive-ruby', '~> 1.0', '>= 1.0.1')
   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')
-  spec.add_dependency('bitcoin-ruby', '~> 0.0', '>= 0.0.11')
-  spec.add_dependency('ffi', '~> 1.9', '>= 1.9.18')
+  spec.add_dependency('hashie', '~> 3.5', '>= 3.5.7') # locked by steem-ruby
+  spec.add_dependency('bitcoin-ruby', '0.0.20') # (was 0.0.19)
+  spec.add_dependency('ffi', '~> 1.9', '>= 1.9.18') # (was 1.11.2)
   spec.add_dependency('awesome_print', '~> 1.7', '>= 1.7.0')
 end

data/test/fixtures/empty.json

@@ -0,0 +1 @@
+{"id":1,"result":[]}