hive-ruby 1.0.0 → 1.0.1.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 280e01448f82e255836c8f0eb2e6b0dbd572a1794d5a33f627cc9e272ff7bde2
-  data.tar.gz: 39baffd88bce125cdc0ad80d0ec6e254416b0829a1aae3b2a7523feb746ea6ad
+  metadata.gz: 50723c6903e4538ef92d5a3a4cdfc146fbb9938f4f91295b2b12b249a4b212c8
+  data.tar.gz: daec42664d72059b4cad8a99b6bd9435fa3ea9e165af10b7a3705dee564dbe87
 SHA512:
-  metadata.gz: d447efa52e4a3f907760e8b5074e7f16bb4c68cc4395fd0dcd08ec66de40cb8789b24a425e6cabd353821f7fe75edd01d95b831c998782af765d3fd50e4f0d73
-  data.tar.gz: 97b44b17ee62e5d691737e46da2d04a6c4d2c6bdfb5e42cd83ca287830c64f98785fc957fa88fc5c349cd06a814bd531a5a03cbadaf4bb2f86dcda03d0676ded
+  metadata.gz: 6a4222e28deefa7c09ec7bc658b020d9c792dd951095d6919205f3e746846a1ab5bb0bcec791114bb4f520f65a5ebfc1f66132f4e0f4a94573cdea8baf49a7e6
+  data.tar.gz: 223882dca1d68224f45c4b07515776b82bb7785c9a8934ba9cc146ebd4f9599958a7a68a235e76dbc6aa3239a90060c866f1a0fdcd056e8c0ca5177abd793497

data/Rakefile

@@ -112,20 +112,20 @@ namespace :test do
               [k, v] if keys.include? k.to_sym
             end.compact.to_h
             
-            sbd_exchange_rate = witness[:sbd_exchange_rate]
-            base = sbd_exchange_rate[:base].to_f
+            hbd_exchange_rate = witness[:hbd_exchange_rate] || witness[:hbd_exchange_rate]
+            base = hbd_exchange_rate[:base].to_f
             
-            if (quote = sbd_exchange_rate[:quote].to_f) > 0
+            if (quote = hbd_exchange_rate[:quote].to_f) > 0
               rate = (base / quote).round(3)
-              witnesses[witness.owner][:sbd_exchange_rate] = rate
+              witnesses[witness.owner][:hbd_exchange_rate] = rate
             else
-              witnesses[witness.owner][:sbd_exchange_rate] = nil
+              witnesses[witness.owner][:hbd_exchange_rate] = nil
             end
             
-            last_sbd_exchange_update = witness[:last_sbd_exchange_update]
-            last_sbd_exchange_update = Time.parse(last_sbd_exchange_update + 'Z')
-            last_sbd_exchange_elapsed = '%.2f hours ago' % ((Time.now.utc - last_sbd_exchange_update) / 60)
-            witnesses[witness.owner][:last_sbd_exchange_elapsed] = last_sbd_exchange_elapsed
+            last_hbd_exchange_update = witness[:last_hbd_exchange_update] || witness[:last_hbd_exchange_update]
+            last_hbd_exchange_update = Time.parse(last_hbd_exchange_update + 'Z')
+            last_hbd_exchange_elapsed = '%.2f hours ago' % ((Time.now.utc - last_hbd_exchange_update) / 60)
+            witnesses[witness.owner][:last_hbd_exchange_elapsed] = last_hbd_exchange_elapsed
           end
         end
       end

data/hive-ruby.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json', '~> 2.1', '>= 2.1.0'
   spec.add_dependency 'logging', '~> 2.2', '>= 2.2.0'
   spec.add_dependency 'hashie', '~> 3.5', '>= 3.5.7'
-  spec.add_dependency 'bitcoin-ruby', '~> 0.0', '>= 0.0.18'
+  spec.add_dependency 'bitcoin-ruby', '~> 0.0', '0.0.20'
   spec.add_dependency 'ffi', '~> 1.9', '>= 1.9.23'
   spec.add_dependency 'bindata', '~> 2.4', '>= 2.4.4'
   spec.add_dependency 'base58', '~> 0.2', '>= 0.2.3'

data/lib/hive/api.rb

@@ -118,7 +118,9 @@ module Hive
         
         if Jsonrpc::UNLISTED_APIS.include? @api_name
           @methods ||= {}
-          @methods[@api_name] ||= Fallback::API_METHODS[@api_name]
+          @methods[@api_name] ||= []
+          @methods[@api_name] += Fallback::API_METHODS[@api_name]
+          @methods[@api_name] = @methods[@api_name].uniq
         end
         
         unless !!@methods[@api_name]

data/lib/hive/base_error.rb

@@ -19,17 +19,21 @@ module Hive
       end
       
       if error.message.include? 'Internal Error'
-        raise Hive::RemoteNodeError, error.message, build_backtrace(error)
+        raise Hive::RemoteInternalError, error.message, build_backtrace(error)
       end
       
       if error.message.include? 'Server error'
-        raise Hive::RemoteNodeError, error.message, build_backtrace(error)
+        raise Hive::RemoteServerError, error.message, build_backtrace(error)
       end
       
-      if error.message.include? 'plugin not enabled'
+      if error.message.include?('plugin not enabled') || error.message.include?('Could not find API')
         raise Hive::PluginNotEnabledError, error.message, build_backtrace(error)
       end
       
+      if error.message.include? 'Supported by hivemind'
+        raise Hive::MethodNotEnabledError, error.message, build_backtrace(error)
+      end
+      
       if error.message.include? 'argument'
         raise Hive::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
       end
@@ -210,9 +214,12 @@ module Hive
   class IncorrectRequestIdError < BaseError; end
   class IncorrectResponseIdError < BaseError; end
   class RemoteNodeError < BaseError; end
+  class RemoteInternalError < BaseError; end
+  class RemoteServerError < BaseError; end
   class UpstreamResponseError < RemoteNodeError; end
   class RemoteDatabaseLockError < UpstreamResponseError; end
   class PluginNotEnabledError < UpstreamResponseError; end
+  class MethodNotEnabledError < UpstreamResponseError; end
   class RequestTimeoutUpstreamResponseError < UpstreamResponseError; end
   class BadOrMissingUpstreamResponseError < UpstreamResponseError; end
   class TransactionIndexDisabledError < BaseError; end

data/lib/hive/broadcast.rb

@@ -137,7 +137,7 @@ module Hive
     #   * :parent_permlink (String) (automatic) Parent permlink of the content, defaults to first tag.
     #   * :parent_author (String) (optional) Parent author of the content (only used if reply).
     #   * :max_accepted_payout (String) (1000000.000 HBD) Maximum accepted payout, set to '0.000 HBD' to deline payout
-    #   * :percent_steem_dollars (Numeric) (5000) Percent HIVE Dollars is used to set 50/50 or 100% HIVE Power
+    #   * :percent_hbd (Numeric) (5000) Percent HIVE Dollars is used to set 50/50 or 100% HIVE Power
     #   * :allow_votes (Numeric) (true) Allow votes for this content.
     #   * :allow_curation_rewards (Numeric) (true) Allow curation rewards for this content.
     #   * :beneficiaries (Array<Hash>) Sets the beneficiaries of this content.
@@ -196,7 +196,7 @@ module Hive
         author: params[:author],
         permlink: params[:permlink],
         max_accepted_payout: max_accepted_payout,
-        percent_steem_dollars: params[:percent_steem_dollars] || 10000,
+        percent_hbd: params[:percent_hbd] || 10000,
         # allow_replies: allow_replies,
         allow_votes: allow_votes,
         allow_curation_rewards: allow_curation_rewards,
@@ -646,7 +646,7 @@ module Hive
     #         props: {
     #           account_creation_fee: '0.000 HIVE',
     #           maximum_block_size: 131072,
-    #           sbd_interest_rate:1000
+    #           hbd_interest_rate:1000
     #         },
     #         fee: '0.000 HIVE',
     #       }
@@ -688,10 +688,10 @@ module Hive
     #         props: {
     #           account_creation_fee: '0.000 HIVE',
     #           maximum_block_size: 131072,
-    #           sbd_interest_rate: 1000,
+    #           hbd_interest_rate: 1000,
     #           account_subsidy_budget: 50000,
     #           account_subsidy_decay: 330782,
-    #           sbd_exchange_rate: '1.000 HIVE',
+    #           hbd_exchange_rate: '1.000 HIVE',
     #           url: "https://hive.blog",
     #           new_signing_key: 'STM8LoQjQqJHvotqBo7HjnqmUbFW9oJ2theyqonzUd9DdJ7YYHsvD'
     #         }
@@ -719,10 +719,10 @@ module Hive
         props[:account_creation_fee] = hexlify normalize_amount(options.merge amount: account_creation_fee, serialize: true)
       end
       
-      if !!(sbd_exchange_rate = props[:sbd_exchange_rate] rescue nil)
-        props[:sbd_exchange_rate][:base] = normalize_amount(options.merge amount: sbd_exchange_rate[:base], serialize: true)
-        props[:sbd_exchange_rate][:quote] = normalize_amount(options.merge amount: sbd_exchange_rate[:quote], serialize: true)
-        props[:sbd_exchange_rate] = hexlify props[:sbd_exchange_rate].to_json
+      if !!(hbd_exchange_rate = props[:hbd_exchange_rate] rescue nil)
+        props[:hbd_exchange_rate][:base] = normalize_amount(options.merge amount: hbd_exchange_rate[:base], serialize: true)
+        props[:hbd_exchange_rate][:quote] = normalize_amount(options.merge amount: hbd_exchange_rate[:quote], serialize: true)
+        props[:hbd_exchange_rate] = hexlify props[:hbd_exchange_rate].to_json
       end
       
       %i(key new_signing_key).each do |key|
@@ -957,8 +957,8 @@ module Hive
     #   * :to (String)
     #   * :agent (String)
     #   * :escrow_id (String)
-    #   * :sbd_amount (String)
-    #   * :steem_amount (String)
+    #   * :hbd_amount (String)
+    #   * :hive_amount (String)
     #   * :fee (String)
     #   * :ratification_deadline (String)
     #   * :escrow_expiration (String)
@@ -980,8 +980,8 @@ module Hive
       
       check_required_fields(params, *required_fields)
       
-      params[:sbd_amount] = normalize_amount(options.merge amount: params[:sbd_amount])
-      params[:steem_amount] = normalize_amount(options.merge amount: params[:steem_amount])
+      params[:hbd_amount] = normalize_amount(options.merge amount: params[:hbd_amount])
+      params[:hive_amount] = normalize_amount(options.merge amount: params[:hive_amount])
       params[:fee] = normalize_amount(options.merge amount: params[:fee])
       
       params[:ratification_deadline] = Time.parse(params[:ratification_deadline].to_s)
@@ -1032,8 +1032,8 @@ module Hive
     #   * :who (String)
     #   * :receiver (String)
     #   * :escrow_id (String)
-    #   * :sbd_amount (String)
-    #   * :steem_amount (String)
+    #   * :hbd_amount (String)
+    #   * :hive_amount (String)
     # @option options [Boolean] :pretend Just validate, do not broadcast.
     # @see https://developers.hive.io/apidefinitions/broadcast-ops.html#broadcast_ops_escrow_release
     def self.escrow_release(options, &block)
@@ -1041,8 +1041,8 @@ module Hive
       params = options[:params]
       check_required_fields(params, *required_fields)
       
-      params[:sbd_amount] = normalize_amount(options.merge amount: params[:sbd_amount])
-      params[:steem_amount] = normalize_amount(options.merge amount: params[:steem_amount])
+      params[:hbd_amount] = normalize_amount(options.merge amount: params[:hbd_amount])
+      params[:hive_amount] = normalize_amount(options.merge amount: params[:hive_amount])
 
       ops = [[:escrow_release, params]]
       
@@ -1246,8 +1246,8 @@ module Hive
     # @option options [String] :wif Posting wif
     # @option options [Hash] :params
     #   * :account (String) Account claiming rewards.
-    #   * :reward_steem (Amount) Amount of HIVE to claim.
-    #   * :reward_sbd (Amount) Amount of HBD to claim.
+    #   * :reward_hive (Amount) Amount of HIVE to claim.
+    #   * :reward_hbd (Amount) Amount of HBD to claim.
     #   * :reward_vests (Amount) Amount of VESTS to claim.
     # @option options [Boolean] :pretend Just validate, do not broadcast.
     # @see https://developers.hive.io/apidefinitions/broadcast-ops.html#broadcast_ops_claim_reward_balance
@@ -1257,8 +1257,8 @@ module Hive
       
       check_required_fields(params, *required_fields)
       
-      params[:reward_steem] = normalize_amount(options.merge amount: params[:reward_steem])
-      params[:reward_sbd] = normalize_amount(options.merge amount: params[:reward_sbd])
+      params[:reward_hive] = normalize_amount(options.merge amount: params[:reward_hive])
+      params[:reward_hbd] = normalize_amount(options.merge amount: params[:reward_hbd])
       params[:reward_vests] = normalize_amount(options.merge amount: params[:reward_vests])
       
       ops = [[:claim_reward_balance, params]]

data/lib/hive/fallback.rb

@@ -106,7 +106,6 @@ module Hive::Fallback
       :find_limit_orders,
       :find_owner_histories,
       :find_savings_withdrawals,
-      :find_sbd_conversion_requests,
       :find_vesting_delegation_expirations,
       :find_vesting_delegations,
       :find_votes,
@@ -134,7 +133,6 @@ module Hive::Fallback
       :list_limit_orders,
       :list_owner_histories,
       :list_savings_withdrawals,
-      :list_sbd_conversion_requests,
       :list_vesting_delegation_expirations,
       :list_vesting_delegations,
       :list_votes,
@@ -242,7 +240,7 @@ module Hive::Fallback
       find_owner_histories: {owner: String},
       find_proposals: {proposal_ids: []},
       find_savings_withdrawals: {account: String},
-      find_sbd_conversion_requests: {account: String},
+      find_hbd_conversion_requests: {account: String},
       find_vesting_delegation_expirations: {account: String},
       find_vesting_delegations: {account: String},
       find_votes: {author: String, permlink: String},
@@ -272,7 +270,7 @@ module Hive::Fallback
       list_proposal_votes: {start: NilClass, limit: Integer, order: String, order_direction: String, status: String},
       list_proposals: {start: NilClass, limit: Integer, order: String, order_direction: String, status: String},
       list_savings_withdrawals: {start: NilClass, limit: Integer, order: String},
-      list_sbd_conversion_requests: {start: NilClass, limit: Integer, order: String},
+      list_hbd_conversion_requests: {start: NilClass, limit: Integer, order: String},
       list_vesting_delegation_expirations: {start: NilClass, limit: Integer, order: String},
       list_vesting_delegations: {start: NilClass, limit: Integer, order: String},
       list_votes: {start: NilClass, limit: Integer, order: String},

data/lib/hive/jsonrpc.rb

@@ -11,7 +11,7 @@ module Hive
     
     # APIs that the RPC server will (or likely will) respond to that is
     # maintained outside the view of jsonrpc.
-    UNLISTED_APIS = %i(bridge)
+    UNLISTED_APIS = %i(bridge database_api)
     
     def self.api_methods
       @api_methods ||= {}

data/lib/hive/marshal.rb

@@ -144,7 +144,7 @@ module Hive
       {
         account_creation_fee: amount,
         maximum_block_size: uint32,
-        sbd_interest_rate: uint16
+        hbd_interest_rate: uint16
       }
     end
     
@@ -161,12 +161,12 @@ module Hive
         when :account_creation_fee then Hive::Type::Amount.new(string)
         # when :account_subsidy_budget then int32
         # when :account_subsidy_decay, :maximum_block_size then uint32
-        when :sbd_exchange_rate
+        when :hbd_exchange_rate
           JSON[string].tap do |rate|
             rate["base"] = Hive::Type::Amount.new(rate["base"])
             rate["quote"] = Hive::Type::Amount.new(rate["quote"])
           end
-        # when :sbd_interest_rate then uint16
+        # when :hbd_interest_rate then uint16
         when :url, :key, :new_signing_key then string
         else; warn "Unsupported witness property: #{key}"
         end

data/lib/hive/operation/claim_reward_balance.rb

@@ -1,6 +1,6 @@
 class Hive::Operation::ClaimRewardBalance < Hive::Operation
   def_attr account: :string
-  def_attr reward_steem: :amount
-  def_attr reward_sbd: :amount
+  def_attr reward_hive: :amount
+  def_attr reward_hbd: :amount
   def_attr reward_vests: :amount
 end

data/lib/hive/operation/comment_options.rb

@@ -2,7 +2,7 @@ class Hive::Operation::CommentOptions < Hive::Operation
   def_attr author: :string
   def_attr permlink: :string
   def_attr max_accepted_payout: :amount
-  def_attr percent_steem_dollars: :uint32
+  def_attr percent_hbd: :uint32
   # def_attr allow_replies: :boolean
   def_attr allow_votes: :boolean
   def_attr allow_curation_rewards: :boolean

data/lib/hive/operation/escrow_release.rb

@@ -5,6 +5,6 @@ class Hive::Operation::EscrowRelease < Hive::Operation
   def_attr who: :string
   def_attr receiver: :string
   def_attr escrow_id: :uint32
-  def_attr sbd_amount: :amount
-  def_attr steem_amount: :amount
+  def_attr hbd_amount: :amount
+  def_attr hive_amount: :amount
 end

data/lib/hive/operation/escrow_transfer.rb

@@ -1,8 +1,8 @@
 class Hive::Operation::EscrowTransfer < Hive::Operation
   def_attr from: :string
   def_attr to: :string
-  def_attr sbd_amount: :amount
-  def_attr steem_amount: :amount
+  def_attr hbd_amount: :amount
+  def_attr hive_amount: :amount
   def_attr escrow_id: :uint32
   def_attr agent: :string
   def_attr fee: :amount

data/lib/hive/rpc/http_client.rb

@@ -18,7 +18,8 @@ module Hive
       # @private
       TIMEOUT_ERRORS = [Net::OpenTimeout, JSON::ParserError, Net::ReadTimeout,
         Errno::EBADF, IOError, Errno::ENETDOWN, Hive::RemoteDatabaseLockError,
-        Hive::RequestTimeoutUpstreamResponseError, Hive::RemoteNodeError]
+        Hive::RequestTimeoutUpstreamResponseError, Hive::RemoteServerError,
+        Hive::RemoteServerError]
       
       # @private
       POST_HEADERS = {

data/lib/hive/stream.rb

@@ -173,7 +173,7 @@ module Hive
     #   stream = Hive::Stream.new
     #   stream.operations(types: :author_reward_operation, only_virtual: true) do |vop|
     #     v = vop.value
-    #     puts "#{v.author} got paid for #{v.permlink}: #{[v.sbd_payout, v.steem_payout, v.vesting_payout]}"
+    #     puts "#{v.author} got paid for #{v.permlink}: #{[v.hbd_payout, v.hive_payout, v.vesting_payout]}"
     #   end
     #
     # ... or multiple virtual operation types;

data/lib/hive/version.rb

@@ -1,4 +1,4 @@
 module Hive
-  VERSION = '1.0.0'
+  VERSION = '1.0.1.pre.1'
   AGENT_ID = "hive-ruby/#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.pre.1
 platform: ruby
 authors:
 - Anthony Martin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -317,9 +317,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -327,9 +327,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.20
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -497,9 +497,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.8
 signing_key: