radiator 0.4.6pre1 → 0.4.8.pre.3

data/lib/radiator/bridge.rb

@@ -0,0 +1,34 @@
+module Radiator
+  class Bridge < Api
+    def method_names
+      @method_names ||= [
+        :normalize_post,
+        :get_post_header,
+        :get_discussion,
+        :get_post,
+        :get_account_posts,
+        :get_ranked_posts,
+        :get_profile,
+        :get_trending_topics,
+        :get_relationship_between_accounts,
+        :post_notifications,
+        :account_notifications,
+        :unread_notifications,
+        :get_payout_stats,
+        :get_community,
+        :get_community_context,
+        :list_communities,
+        :list_pop_communities,
+        :list_community_roles,
+        :list_subscribers,
+        :list_all_subscriptions
+      ].freeze
+    end
+    
+    def api_name
+      :bridge
+    end
+    
+    def healthy?(_); true; end
+  end
+end

data/lib/radiator/broadcast_operations.json

@@ -195,7 +195,7 @@
       "author",
       "permlink",
       "max_accepted_payout",
-      "percent_steem_dollars",
+      "percent_hbd",
       "allow_replies",
       "allow_votes",
       "allow_curation_rewards",
@@ -278,8 +278,8 @@
       "to",
       "agent",
       "escrow_id",
-      "sbd_amount",
-      "steem_amount",
+      "hbd_amount",
+      "hive_amount",
       "fee",
       "ratification_deadline",
       "escrow_expiration",
@@ -307,8 +307,8 @@
       "who",
       "receiver",
       "escrow_id",
-      "sbd_amount",
-      "steem_amount"
+      "hbd_amount",
+      "hive_amount"
     ]
   },
   {
@@ -399,8 +399,8 @@
     "operation": "claim_reward_balance",
     "params": [
       "account",
-      "reward_steem",
-      "reward_sbd",
+      "reward_hive",
+      "reward_hbd",
       "reward_vests"
     ]
   },

data/lib/radiator/chain.rb

@@ -20,7 +20,7 @@ module Radiator
   #       body: 'body of my post',
   #       tags: ['tag'],
   #       self_upvote: 10000,
-  #       percent_steem_dollars: 0
+  #       percent_hbd: 0
   #     }
   #     
   #     steem.post!(options)

data/lib/radiator/chain_config.rb

@@ -10,6 +10,13 @@ module Radiator
     NETWORKS_STEEM_VEST_ASSET = 'VESTS'
     NETWORKS_STEEM_DEFAULT_NODE = 'https://api.steemit.com'
     
+    NETWORKS_HIVE_CHAIN_ID = 'beeab0de00000000000000000000000000000000000000000000000000000000'
+    NETWORKS_HIVE_ADDRESS_PREFIX = 'STM'
+    NETWORKS_HIVE_CORE_ASSET = 'HIVE'
+    NETWORKS_HIVE_DEBT_ASSET = 'HBD'
+    NETWORKS_HIVE_VEST_ASSET = 'VESTS'
+    NETWORKS_HIVE_DEFAULT_NODE = 'https://api.openhive.network'
+    
     NETWORKS_TEST_CHAIN_ID = '18dcf0a285365fc58b71f18b3d3fec954aa0c141c44e4e5cb4cf777b9eab274e'
     NETWORKS_TEST_ADDRESS_PREFIX = 'TST'
     NETWORKS_TEST_CORE_ASSET = 'CORE'
@@ -17,6 +24,6 @@ module Radiator
     NETWORKS_TEST_VEST_ASSET = 'CESTS'
     NETWORKS_TEST_DEFAULT_NODE = 'https://test.steem.ws'
     
-    NETWORK_CHAIN_IDS = [NETWORKS_STEEM_CHAIN_ID, NETWORKS_TEST_CHAIN_ID]
+    NETWORK_CHAIN_IDS = [NETWORKS_STEEM_CHAIN_ID, NETWORKS_HIVE_CHAIN_ID, NETWORKS_TEST_CHAIN_ID]
   end
-end
+end

data/lib/radiator/database_api.rb

@@ -2,4 +2,4 @@ module Radiator
   # @see Api
   class DatabaseApi < Api
   end
-end
+end

data/lib/radiator/error_parser.rb

@@ -69,7 +69,7 @@ module Radiator
             stack_formats = stacks.map { |s| s['format'] }
             stack_datum = stacks.map { |s| s['data'] }
             data_call_method = stack_datum.find { |data| data['call.method'] == 'call' }
-            data_name = stack_datum.find { |data| !!data['name'] }
+            # data_name = stack_datum.find { |data| !!data['name'] }
             
             # See if we can recover a transaction id out of this hot mess.
             data_trx_ix = stack_datum.find { |data| !!data['trx_ix'] }

data/lib/radiator/follow_api.rb

@@ -4,4 +4,4 @@ module Radiator
       :follow_api
     end
   end
-end
+end

data/lib/radiator/market_history_api.rb

@@ -16,4 +16,4 @@ module Radiator
       :market_history_api
     end
   end
-end
+end

data/lib/radiator/mixins/acts_as_poster.rb

@@ -20,7 +20,7 @@ module Radiator
       # @option options [String] :parent_permlink (automatic) Parent permlink of the post, defaults to first tag.
       # @option options [String] :parent_author (optional) Parent author of the post (only used if reply).
       # @option options [String] :max_accepted_payout (1000000.000 SBD) Maximum accepted payout, set to '0.000 SBD' to deline payout
-      # @option options [Integer] :percent_steem_dollars (5000) Percent STEEM Dollars is used to set 50/50 or 100% STEEM Power
+      # @option options [Integer] :percent_hbd (5000) Percent HBD is used to set 50/50 or 100% HIVE Power
       # @option options [Integer] :allow_votes (true) Allow votes for this post.
       # @option options [Integer] :allow_curation_rewards (true) Allow curation rewards for this post.
       def post(options = {})
@@ -34,7 +34,7 @@ module Radiator
         body = options[:body]
         parent_author = options[:parent_author] || ''
         max_accepted_payout = options[:max_accepted_payout] || default_max_acepted_payout
-        percent_steem_dollars = options[:percent_steem_dollars]
+        percent_hbd = options[:percent_hbd]
         allow_votes = options[:allow_votes] || true
         allow_curation_rewards = options[:allow_curation_rewards] || true
         self_vote = options[:self_vote]
@@ -60,13 +60,13 @@ module Radiator
         
         if (!!max_accepted_payout &&
             max_accepted_payout != default_max_acepted_payout
-          ) || !!percent_steem_dollars || !allow_votes || !allow_curation_rewards
+          ) || !!percent_hbd || !allow_votes || !allow_curation_rewards
           @operations << {
             type: :comment_options,
             author: account_name,
             permlink: permlink,
             max_accepted_payout: max_accepted_payout,
-            percent_steem_dollars: percent_steem_dollars,
+            percent_hbd: percent_hbd,
             allow_votes: allow_votes,
             allow_curation_rewards: allow_curation_rewards,
             extensions: []

data/lib/radiator/operation.rb

@@ -5,11 +5,12 @@ module Radiator
     include Utils
     
     def initialize(options = {})
+      chain = (options.delete(:chain) || 'hive').to_sym
       opt = options.dup
       @type = opt.delete(:type)
       
       opt.each do |k, v|
-        instance_variable_set("@#{k}", type(@type, k, v))
+        instance_variable_set("@#{k}", type(chain, @type, k, v))
       end
       
       @use_condenser_namespace = if options.keys.include? :use_condenser_namespace
@@ -61,7 +62,7 @@ module Radiator
         
         params[p] = case v
         when Radiator::Type::Beneficiaries then [[0, v.to_h]]
-        when Radiator::Type::Amount
+        when Hive::Type::Amount, Steem::Type::Amount
           if use_condenser_namespace?
             v.to_s
           else

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.
             
@@ -332,7 +332,7 @@ module Radiator
               [block_api, {block_num: n}]
             end
               
-            scoped_api.get_block(n) do |current_block, error|
+            scoped_api.get_block(block_options) do |current_block, error|
               if !!error
                 if error.message == 'Unable to acquire database lock'
                   start = n
@@ -346,7 +346,11 @@ module Radiator
                     and: {throw: :sequence}
                   }
                 end
-              elsif current_block.nil?
+              end
+              
+              current_block = current_block.block unless use_condenser_namespace?
+              
+              if current_block.nil?
                 standby "Node responded with: empty block, retrying ...", {
                   and: {throw: :sequence}
                 }
@@ -390,6 +394,7 @@ module Radiator
       
       @api = nil
       @block_api = nil
+      @database_api = nil if @api.nil? || @block_api.nil?
       GC.start
     end
     
@@ -435,6 +440,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 +458,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 +479,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