steem-ruby 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c0d2e4cfae2885bc24acaa7d2a5f046e73a1505
-  data.tar.gz: ddfdd7c5505ada6ea5e67584e51f6b5241e74bb6
+  metadata.gz: 0d2df68c704478da2f78e2cdee3a423523950f27
+  data.tar.gz: f8e6912e7b808be2bb7c065dfb177d0ef6a98a53
 SHA512:
-  metadata.gz: ec9da3a5222a1ef5bf503ab496eeb12b88609ff1b76d0fd888ca10a355fa3bf0c1bea497a75327a5922a7b002d7b8f19d38eb9b047b431d5fa532eea740c3fa3
-  data.tar.gz: 3a3aac4b912eeb02c92c97b9e74be3c747595b0acfffd75318258d4b89b99b1569776ff9aa4d7393aa0176b45b2170f5723195aafc87729ae7e22f9cb733d944
+  metadata.gz: 8b93714f563a05179fdbcf1c45af4e2279047343b86d1e932bb5ea306a8c7a508f8769b8a22a9415f4344effd591d0f5f86bcfc02a004bf34478fdd140a599ec
+  data.tar.gz: 12bf547182d8a9abae9d0182cb21f509e176c46f283b3683cebc7b57fc9efb6b3cdabf94538ba1b86550824e5483526257b13d45476d63bf7402bff5b393902e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steem-ruby (0.9.0)
+    steem-ruby (0.9.1)
       bitcoin-ruby (~> 0.0, >= 0.0.18)
       ffi (~> 1.9, >= 1.9.23)
       hashie (~> 3.5, >= 3.5.7)
@@ -18,8 +18,8 @@ GEM
     coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    docile (1.3.0)
-    ffi (1.9.23)
+    docile (1.3.1)
+    ffi (1.9.25)
     hashdiff (0.3.7)
     hashie (3.5.7)
     json (2.1.0)
@@ -28,8 +28,8 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.9.0)
-    minitest (5.10.3)
-    minitest-line (0.6.4)
+    minitest (5.11.3)
+    minitest-line (0.6.5)
       minitest (~> 5.0)
     minitest-proveit (1.0.0)
       minitest (> 5, < 7)
@@ -46,11 +46,11 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     vcr (4.0.0)
-    webmock (3.3.0)
+    webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.9.12)
+    yard (0.9.14)
 
 PLATFORMS
   ruby

data/README.md

@@ -13,7 +13,7 @@ Full documentation: http://www.rubydoc.info/gems/steem-ruby
 
 The `steem-ruby` gem was written from the ground up by `@inertia`, who is also the author of [`radiator`](https://github.com/inertia186/radiator).
 
-> "I intend to continue work on `radiator` indefinitely. But in `radiator-0.5`, I intend to refactor `radiator` so that is uses `steem-ruby` as its core. This means that some features of `radiator` like Serialization will become redundant. I think it's still useful for radiator to do its own serialzation because it reduces the number of API requests." - @inertia
+> "I intend to continue work on `radiator` indefinitely. But in `radiator-0.5`, I intend to refactor `radiator` so that is uses `steem-ruby` as its core. This means that some features of `radiator` like Serialization will become redundant. I think it's still useful for radiator to do its own serialization because it reduces the number of API requests." - @inertia
 
 | `radiator` | `steem-ruby` |
 |-|-|
@@ -90,7 +90,7 @@ end
 In addition to signing with multiple `wif` private keys, it is possible to also export a partially signed transaction to have signing completed by someone else.
 
 ```ruby
-builder = TransactionBuilder.new(wif: wif1)
+builder = Steem::TransactionBuilder.new(wif: wif1)
 
 builder.put(vote: {
   voter: voter,
@@ -110,8 +110,8 @@ Then send the contents of `trx.json` to the other signing party so they can priv
 
 ```ruby
 trx = open('trx.json').read
-builder = TransactionBuilder.new(wif: wif2, trx: trx)
-api = Steem::NetworkBroadcastApi.new
+builder = Steem::TransactionBuilder.new(wif: wif2, trx: trx)
+api = Steem::CondenserApi.new
 trx = builder.transaction
 api.broadcast_transaction_synchronous(trx: trx)
 ```

data/lib/steem/api.rb

@@ -39,7 +39,7 @@ module Steem
     attr_accessor :chain, :methods
     
     # Use this for debugging naive thread handler.
-    # DEFAULT_RPC_CLIENT_CLASS = RPC::BaseClient
+    # DEFAULT_RPC_CLIENT_CLASS = RPC::HttpClient
     DEFAULT_RPC_CLIENT_CLASS = RPC::ThreadSafeHttpClient
     
     def self.api_name=(api_name)

data/lib/steem/base_error.rb

@@ -15,131 +15,148 @@ module Steem
     
     def self.build_error(error, context)
       if error.message == 'Unable to acquire database lock'
-        raise Steem::RemoteDatabaseLockError, error.message, JSON.pretty_generate(error)
+        raise Steem::RemoteDatabaseLockError, error.message, build_backtrace(error)
       end
       
       if error.message.include? 'Internal Error'
-        raise Steem::RemoteNodeError.new, error.message, JSON.pretty_generate(error)
+        raise Steem::RemoteNodeError.new, error.message, build_backtrace(error)
       end
       
       if error.message.include? 'plugin not enabled'
-        raise Steem::PluginNotEnabledError, error.message, JSON.pretty_generate(error)
+        raise Steem::PluginNotEnabledError, error.message, build_backtrace(error)
       end
       
       if error.message.include? 'argument'
-        raise Steem::ArgumentError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.start_with? 'Bad Cast:'
-        raise Steem::ArgumentError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'prefix_len'
-        raise Steem::ArgumentError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'Parse Error'
-        raise Steem::ArgumentError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'unknown key'
-        raise Steem::ArgumentError, "#{context}: #{error.message} (or content has been deleted)", JSON.pretty_generate(error)
+        raise Steem::ArgumentError, "#{context}: #{error.message} (or content has been deleted)", build_backtrace(error)
       end
       
       if error.message.include? 'Comment is not in account\'s comments'
-        raise Steem::ArgumentError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'Could not find comment'
-        raise Steem::ArgumentError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'unable to convert ISO-formatted string to fc::time_point_sec'
-        raise Steem::ArgumentError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'Input data have to treated as object.'
-        raise Steem::ArgumentError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
+      end
+      
+      if error.message.include? 'base.amount > share_type(0)'
+        raise Steem::ArgumentError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'blk->transactions.size() > itr->trx_in_block'
-        raise Steem::VirtualOperationsNotAllowedError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::VirtualOperationsNotAllowedError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'A transaction must have at least one operation'
-        raise Steem::EmptyTransactionError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::EmptyTransactionError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'transaction expiration exception'
-        raise Steem::TransactionExpiredError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::TransactionExpiredError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'Duplicate transaction check failed'
-        raise Steem::DuplicateTransactionError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::DuplicateTransactionError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'signature is not canonical'
-        raise Steem::NonCanonicalSignatureError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::NonCanonicalSignatureError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'attempting to push a block that is too old'
-        raise Steem::BlockTooOldError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::BlockTooOldError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'irrelevant signature'
-        raise Steem::IrrelevantSignatureError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::IrrelevantSignatureError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'missing required posting authority'
-        raise Steem::MissingPostingAuthorityError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::MissingPostingAuthorityError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'missing required active authority'
-        raise Steem::MissingActiveAuthorityError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::MissingActiveAuthorityError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'missing required owner authority'
-        raise Steem::MissingOwnerAuthorityError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::MissingOwnerAuthorityError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'missing required other authority'
-        raise Steem::MissingOtherAuthorityError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::MissingOtherAuthorityError, "#{context}: #{error.message}", build_backtrace(error)
+      end
+      
+      if error.message.include? 'Bad or missing upstream response'
+        raise Steem::BadOrMissingUpstreamResponseError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'operator has disabled operation indexing by transaction_id'
-        raise Steem::TransactionIndexDisabledError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::TransactionIndexDisabledError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'is_valid_account_name'
-        raise Steem::InvalidAccountError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::InvalidAccountError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'Invalid operation name'
-        raise Steem::UnknownOperationError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::UnknownOperationError, "#{context}: #{error.message}", build_backtrace(error)
+      end
+      
+      if error.message =~ /Invalid object name: .+_operation/
+        raise Steem::UnknownOperationError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'Author not found'
-        raise Steem::AuthorNotFoundError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::AuthorNotFoundError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? ' != fc::time_point_sec::maximum()'
-        raise Steem::ReachedMaximumTimeError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::ReachedMaximumTimeError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'Cannot transfer a negative amount (aka: stealing)'
-        raise Steem::TheftError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::TheftError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'Must transfer a nonzero amount'
-        raise Steem::NonZeroRequiredError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::NonZeroRequiredError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       if error.message.include? 'is_asset_type'
-        raise Steem::UnexpectedAssetError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+        raise Steem::UnexpectedAssetError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
       puts JSON.pretty_generate(error) if ENV['DEBUG']
-      raise UnknownError, "#{context}: #{error.message}", JSON.pretty_generate(error)
+      raise UnknownError, "#{context}: #{error.message}", build_backtrace(error)
+    end
+  private
+    def self.build_backtrace(error)
+      backtrace = Thread.current.backtrace.reject{ |line| line =~ /base_error/ }
+      JSON.pretty_generate(error) + "\n" + backtrace.join("\n")
     end
   end
   
@@ -169,6 +186,7 @@ module Steem
   class MissingOtherAuthorityError < MissingAuthorityError; end
   class IncorrectRequestIdError < BaseError; end
   class IncorrectResponseIdError < BaseError; end
+  class BadOrMissingUpstreamResponseError < BaseError; end
   class TransactionIndexDisabledError < BaseError; end
   class NotAppBaseError < BaseError; end
   class UnknownApiError < BaseError; end

data/lib/steem/broadcast.rb

@@ -32,7 +32,7 @@ module Steem
   class Broadcast
     extend Retriable
     
-    DEFAULT_MAX_ACCEPTED_PAYOUT = Type::Amount.new(["1000000000", 3, "@@000000013"])
+    DEFAULT_MAX_ACCEPTED_PAYOUT = Type::Amount.new(amount: '1000000000', precision: 3, nai: '@@000000013')
     
     # This operation is used to cast a vote on a post/comment.
     # 
@@ -174,9 +174,9 @@ module Steem
       }]]
       
       max_accepted_payout = if params.keys.include? :max_accepted_payout
-        Type::Amount.to_nia(params[:max_accepted_payout])
+        normalize_amount(options.merge amount: params[:max_accepted_payout])
       else
-        DEFAULT_MAX_ACCEPTED_PAYOUT.to_nia
+        normalize_amount(options.merge amount: DEFAULT_MAX_ACCEPTED_PAYOUT)
       end
       
       allow_votes = if params.keys.include? :allow_votes
@@ -274,7 +274,7 @@ module Steem
       params = options[:params]
       check_required_fields(params, *required_fields)
       
-      params[:amount] = Type::Amount.to_nia(params[:amount])
+      params[:amount] = normalize_amount(options.merge amount: params[:amount])
       
       ops = [[:transfer, params]]
       
@@ -310,7 +310,7 @@ module Steem
       params = options[:params]
       check_required_fields(params, *required_fields)
       
-      params[:amount] = Type::Amount.to_nia(params[:amount])
+      params[:amount] = normalize_amount(options.merge amount: params[:amount])
       
       ops = [[:transfer_to_vesting, params]]
       
@@ -336,7 +336,7 @@ module Steem
       params = options[:params]
       check_required_fields(params, *required_fields)
       
-      params[:vesting_shares] = Type::Amount.to_nia(params[:vesting_shares])
+      params[:vesting_shares] = normalize_amount(options.merge amount: params[:vesting_shares])
       
       ops = [[:withdraw_vesting, params]]
       
@@ -363,8 +363,8 @@ module Steem
       params = options[:params]
       check_required_fields(params, *required_fields)
       
-      params[:amount_to_sell] = Type::Amount.to_nia(params[:amount_to_sell])
-      params[:min_to_receive] = Type::Amount.to_nia(params[:min_to_receive])
+      params[:amount_to_sell] = normalize_amount(options.merge amount: params[:amount_to_sell])
+      params[:min_to_receive] = normalize_amount(options.merge amount: params[:min_to_receive])
       
       if !!params[:expiration]
         params[:expiration] = Time.parse(params[:expiration].to_s)
@@ -414,8 +414,8 @@ module Steem
       exchange_rate = params[:exchange_rate] rescue nil || {}
       base = exchange_rate[:base]
       quote = exchange_rate[:quote]
-      params[:exchange_rate][:base] = Type::Amount.to_nia(base)
-      params[:exchange_rate][:quote] = Type::Amount.to_nia(quote)
+      params[:exchange_rate][:base] = normalize_amount(options.merge amount: base)
+      params[:exchange_rate][:quote] = normalize_amount(options.merge amount: quote)
       
       ops = [[:feed_publish, params]]
       
@@ -438,7 +438,7 @@ module Steem
       params = options[:params]
       check_required_fields(params, *required_fields)
       
-      params[:amount] = Type::Amount.to_nia(params[:amount])
+      params[:amount] = normalize_amount(options.merge amount: params[:amount])
       
       ops = [[:convert, params]]
       
@@ -502,7 +502,7 @@ module Steem
       
       check_required_fields(params, *required_fields)
       
-      params[:fee] = Type::Amount.to_nia(params[:fee])
+      params[:fee] = normalize_amount(options.merge amount: params[:fee])
       
       ops = [[:account_create, params]]
       
@@ -603,8 +603,8 @@ module Steem
       check_required_fields(params, *required_fields)
       
       account_creation_fee = params[:props][:account_creation_fee] rescue nil
-      params[:props][:account_creation_fee] = Type::Amount.to_nia(account_creation_fee)
-      params[:fee] = Type::Amount.to_nia(params[:fee])
+      params[:props][:account_creation_fee] = normalize_amount(options.merge amount: account_creation_fee)
+      params[:fee] = normalize_amount(options.merge amount: params[:fee])
       
       ops = [[:witness_update, params]]
       
@@ -844,9 +844,9 @@ module Steem
       
       check_required_fields(params, *required_fields)
       
-      params[:sbd_amount] = Type::Amount.to_nia(params[:sbd_amount])
-      params[:steem_amount] = Type::Amount.to_nia(params[:steem_amount])
-      params[:fee] = Type::Amount.to_nia(params[:fee])
+      params[:sbd_amount] = normalize_amount(options.merge amount: params[:sbd_amount])
+      params[:steem_amount] = normalize_amount(options.merge amount: params[:steem_amount])
+      params[:fee] = normalize_amount(options.merge amount: params[:fee])
       
       params[:ratification_deadline] = Time.parse(params[:ratification_deadline].to_s)
       params[:ratification_deadline] = params[:ratification_deadline].strftime('%Y-%m-%dT%H:%M:%S')
@@ -905,8 +905,8 @@ module Steem
       params = options[:params]
       check_required_fields(params, *required_fields)
       
-      params[:sbd_amount] = Type::Amount.to_nia(params[:sbd_amount])
-      params[:steem_amount] = Type::Amount.to_nia(params[:steem_amount])
+      params[:sbd_amount] = normalize_amount(options.merge amount: params[:sbd_amount])
+      params[:steem_amount] = normalize_amount(options.merge amount: params[:steem_amount])
 
       ops = [[:escrow_release, params]]
       
@@ -954,7 +954,7 @@ module Steem
       check_required_fields(params, *required_fields)
       
       params[:memo] ||= ''
-      params[:amount] = Type::Amount.to_nia(params[:amount])
+      params[:amount] = normalize_amount(options.merge amount: params[:amount])
 
       ops = [[:transfer_to_savings, params]]
       
@@ -977,7 +977,7 @@ module Steem
       check_required_fields(params, *required_fields)
       
       params[:memo] ||= ''
-      params[:amount] = Type::Amount.to_nia(params[:amount])
+      params[:amount] = normalize_amount(options.merge amount: params[:amount])
 
       ops = [[:transfer_from_savings, params]]
       
@@ -1039,7 +1039,7 @@ module Steem
       params = options[:params]
       check_required_fields(params, *required_fields)
       
-      params[:vesting_shares] = Type::Amount.to_nia(params[:vesting_shares])
+      params[:vesting_shares] = normalize_amount(options.merge amount: params[:vesting_shares])
       ops = [[:delegate_vesting_shares, params]]
       
       process(options.merge(ops: ops), &block)
@@ -1075,8 +1075,8 @@ module Steem
       
       check_required_fields(params, *required_fields)
       
-      params[:fee] = Type::Amount.to_nia(params[:fee])
-      params[:delegation] = Type::Amount.to_nia(params[:delegation])
+      params[:fee] = normalize_amount(options.merge amount: params[:fee])
+      params[:delegation] = normalize_amount(options.merge amount: params[:delegation])
       params[:extensions] ||= []
       
       ops = [[:account_create_with_delegation, params]]
@@ -1097,9 +1097,17 @@ module Steem
         trx = tx.transaction
         
         response = if !!options[:pretend]
-          database_api(options).verify_authority(trx: trx)
+          if !!options[:app_base]
+            database_api(options).verify_authority(trx: trx)
+          else
+            database_api(options).verify_authority(trx)
+          end
         else
-          network_broadcast_api(options).broadcast_transaction_synchronous(trx: trx)
+          if !!options[:app_base]
+            network_broadcast_api(options).broadcast_transaction(trx: trx)
+          else
+            network_broadcast_api(options).broadcast_transaction_synchronous(trx)
+          end
         end
         
         break
@@ -1120,13 +1128,30 @@ module Steem
     end
   private
     # @private
+    def self.normalize_amount(options)
+      if !!options[:app_base]
+        Type::Amount.to_h(options[:amount])
+      else
+        Type::Amount.to_s(options[:amount])
+      end
+    end
+    
+    # @privats
     def self.database_api(options)
-      options[:database_api] ||= Steem::DatabaseApi.new(options)
+      options[:database_api] ||= if !!options[:app_base]
+        Steem::DatabaseApi.new(options)
+      else
+        Steem::CondenserApi.new(options)
+      end
     end
     
     # @private
     def self.network_broadcast_api(options)
-      options[:network_broadcast_api] ||= Steem::NetworkBroadcastApi.new(options)
+      options[:network_broadcast_api] ||= if !!options[:app_base]
+        Steem::NetworkBroadcaseApi.new(options)
+      else
+        Steem::CondenserApi.new(options)
+      end
     end
     
     # @private

data/lib/steem/mixins/retriable.rb

@@ -1,12 +1,12 @@
 module Steem
   module Retriable
     # @private
-    MAX_RETRY_COUNT = 100
+    MAX_RETRY_COUNT = 30
     
-    # @private
-    MAX_BACKOFF = 30
+    MAX_RETRY_ELAPSE = 60
     
-    MAX_RETRY_ELAPSE = 300
+    # @private
+    MAX_BACKOFF = MAX_RETRY_ELAPSE / 4
     
     RETRYABLE_EXCEPTIONS = [
       NonCanonicalSignatureError, IncorrectRequestIdError,
@@ -19,14 +19,7 @@ module Steem
     def backoff
       @backoff ||= 0.1
       @backoff *= 2
-      if @backoff > MAX_BACKOFF
-        @backoff = 0.1
-        
-        if Time.now.utc - @first_retry_at > MAX_RETRY_ELAPSE
-          @retry_count = nil
-          @first_retry_at = nil
-        end
-      end
+      @backoff = 0.1 if @backoff > MAX_BACKOFF
       
       sleep @backoff
     end
@@ -37,7 +30,11 @@ module Steem
       
       return false if @retry_count >= MAX_RETRY_COUNT
       
-      @retry_count += 1
+      @retry_count = if Time.now.utc - @first_retry_at > MAX_RETRY_ELAPSE
+        @first_retry_at = nil
+      else
+        @retry_count + 1
+      end
       
       can_retry = case e
       when *RETRYABLE_EXCEPTIONS then true

data/lib/steem/rpc/base_client.rb

@@ -118,7 +118,7 @@ module Steem
         error = response['error'].to_json if !!response['error']
               
         if req_id != res_id
-          raise IncorrectResponseIdError, "#{method}: The json-rpc id did not match.  Request was: #{req_id}, got: #{res_id.inspect}", error.nil? ? nil : error.to_json
+          raise IncorrectResponseIdError, "#{method}: The json-rpc id did not match.  Request was: #{req_id}, got: #{res_id.inspect}", BaseError.send(:build_backtrace, error)
         end
       end
       
@@ -143,7 +143,7 @@ module Steem
           raise TooManyTimeoutsError.new("Too many timeouts for: #{context}", cause)
         elsif @timeout_retry_count % 10 == 0
           msg = "#{@timeout_retry_count} retry attempts for: #{context}"
-          msg += "; cause: #{e}" if !!cause
+          msg += "; cause: #{cause}" if !!cause
           error_pipe.puts msg
         end
         

data/lib/steem/rpc/http_client.rb

@@ -30,7 +30,7 @@ module Steem
       def http
         @http ||= Net::HTTP.new(uri.host, uri.port).tap do |http|
           http.use_ssl = true if uri.to_s =~ /^https/i
-          http.keep_alive_timeout = 2 # seconds
+          http.keep_alive_timeout = 150 # seconds
           
           # WARNING This method opens a serious security hole. Never use this
           # method in production code.

data/lib/steem/transaction_builder.rb

@@ -15,7 +15,7 @@ module Steem
   #     })
   #     
   #     trx = builder.transaction
-  #     network_broadcast_api = Steem::NetworkBroadcastApi.new
+  #     network_broadcast_api = Steem::CondenserApi.new
   #     network_broadcast_api.broadcast_transaction_synchronous(trx: trx)
   #
   #
@@ -26,13 +26,25 @@ module Steem
     include ChainConfig
     include Utils
     
-    attr_accessor :database_api, :block_api, :expiration, :operations
+    attr_accessor :app_base, :database_api, :block_api, :expiration, :operations
     attr_writer :wif
     attr_reader :signed
     
+    alias app_base? app_base
+    
     def initialize(options = {})
-      @database_api = options[:database_api] || Steem::DatabaseApi.new(options)
-      @block_api = options[:block_api] || Steem::BlockApi.new(options)
+      @app_base = !!options[:app_base] # default false
+      @database_api = options[:database_api]
+      @block_api = options[:block_api]
+      
+      if app_base?
+        @database_api ||= Steem::DatabaseApi.new(options)
+        @block_api ||= Steem::BlockApi.new(options)
+      else
+        @database_api ||= Steem::CondenserApi.new(options)
+        @block_api ||= Steem::CondenserApi.new(options)
+      end
+      
       @wif = [options[:wif]].flatten
       @signed = false
       
@@ -114,9 +126,18 @@ module Steem
         catch :prepare_header do; begin
           @database_api.get_dynamic_global_properties do |properties|
             block_number = properties.last_irreversible_block_num
+            block_header_args = if app_base?
+              {block_num: block_number}
+            else
+              block_number
+            end
           
-            @block_api.get_block_header(block_num: block_number) do |result|
-              header = result.header
+            @block_api.get_block_header(block_header_args) do |result|
+              header = if app_base?
+                result.header
+              else
+                result
+              end
               
               @ref_block_num = (block_number - 1) & 0xFFFF
               @ref_block_prefix = unhexlify(header.previous[8..-1]).unpack('V*')[0]
@@ -138,7 +159,7 @@ module Steem
     
     # Sets operations all at once, then prepares.
     def operations=(operations)
-      @operations = operations
+      @operations = operations.map{ |op| normalize_operation(op) }
       prepare
       @operations
     end
@@ -167,34 +188,8 @@ module Steem
     # @return {TransactionBuilder}
     def put(type, op = nil)
       @expiration = nil
-      
-      ## Saving this for later.  This block, or something like it, might replace
-      ## API broadcast operation structure.
-      # case type
-      # when Symbol, String
-      #   type_value = "#{type}_operation"
-      #   @operations << {type: type_value, value: op}
-      # when Hash
-      #   type_value = "#{type.keys.first}_operation"
-      #   @operations << {type: type_value, value: type.values.first}
-      # when Array
-      #   type_value = "#{type[0]}_operation"
-      #   @operations << {type: type_value, value: type[1]}
-      # else
-      #   # don't know what to do with it, skipped
-      # end
-      
-      case type
-      when Symbol then @operations << [type, op]
-      when String then @operations << [type.to_sym, op]
-      when Hash then @operations << [type.keys.first.to_sym, type.values.first]
-      when Array then @operations << type
-      else
-        # don't know what to do with it, skipped
-      end
-      
+      @operations << normalize_operation(type, op)
       prepare
-      
       self
     end
     
@@ -240,8 +235,20 @@ module Steem
       
       unless @signed
         catch :serialize do; begin
-          @database_api.get_transaction_hex(trx: trx) do |result|
-            hex = @chain_id + result.hex[0..-4] # Why do we have to chop the last two bytes?
+          transaction_hex_args = if app_base?
+            {trx: trx}
+          else
+            trx
+          end
+          
+          @database_api.get_transaction_hex(transaction_hex_args) do |result|
+            hex = if app_base?
+              result.hex
+            else
+              result
+            end
+            
+            hex = @chain_id + hex[0..-4] # Why do we have to chop the last two bytes?
             digest = unhexlify(hex)
             digest_hex = Digest::SHA256.digest(digest)
             private_keys = @wif.map{ |wif| Bitcoin::Key.from_base58 wif }
@@ -283,8 +290,18 @@ module Steem
     
     # @return [Array] All public keys that could possibly sign for a given transaction.
     def potential_signatures
-      @database_api.get_potential_signatures(trx: transaction) do |result|
-        result[:keys]
+      potential_signatures_args = if app_base?
+        {trx: transaction}
+      else
+        transaction
+      end
+      
+      @database_api.get_potential_signatures(potential_signatures_args) do |result|
+        if app_base?
+          result[:keys]
+        else
+          result
+        end
       end
     end
     
@@ -294,15 +311,35 @@ module Steem
     #
     # @return [Array] The minimal subset of public keys that should add signatures to the transaction.
     def required_signatures
-      @database_api.get_required_signatures(trx: transaction) do |result|
-        result[:keys]
+      required_signatures_args = if app_base?
+        {trx: transaction}
+      else
+        [transaction, []]
+      end
+      
+      @database_api.get_required_signatures(*required_signatures_args) do |result|
+        if app_base?
+          result[:keys]
+        else
+          result
+        end
       end
     end
     
     # @return [Boolean] True if the transaction has all of the required signatures.
     def valid?
-      @database_api.verify_authority(trx: transaction) do |result|
-        result.valid
+      verify_authority_args = if app_base?
+        {trx: transaction}
+      else
+        transaction
+      end
+      
+      @database_api.verify_authority(verify_authority_args) do |result|
+        if app_base?
+          result.valid
+        else
+          result
+        end
       end
     end
   private
@@ -318,5 +355,32 @@ module Steem
         ((sig[33] & 0x80 ) != 0)
       )
     end
+    
+    def normalize_operation(type, op = nil)
+      if app_base?
+        case type
+        when Symbol, String
+          type_value = "#{type}_operation"
+          {type: type_value, value: op}
+        when Hash
+          type_value = "#{type.keys.first}_operation"
+          {type: type_value, value: type.values.first}
+        when Array
+          type_value = "#{type[0]}_operation"
+          {type: type_value, value: type[1]}
+        else
+          raise Steem::ArgumentError, "Don't know what to do with operation type #{type.class}: #{type} (#{op})"
+        end
+      else
+        case type
+        when Symbol then [type, op]
+        when String then [type.to_sym, op]
+        when Hash then [type.keys.first.to_sym, type.values.first]
+        when Array then type
+        else
+          raise Steem::ArgumentError, "Don't know what to do with operation type #{type.class}: #{type} (#{op})"
+        end
+      end
+    end
   end
 end

data/lib/steem/type/amount.rb

@@ -3,8 +3,10 @@ module Steem
     
     # See: https://github.com/xeroc/piston-lib/blob/34a7525cee119ec9b24a99577ede2d54466fca0e/steembase/operations.py
     class Amount < BaseType
-      def self.to_nia(amount)
-        new(amount).to_nia
+      attr_reader :amount, :precision, :nai, :asset
+      
+      def self.to_h(amount)
+        new(amount).to_h
       end
       
       def self.to_s(amount)
@@ -16,15 +18,33 @@ module Steem
         
         case value
         when Array
-          a, p, t = value
-          @asset = case t
+          @amount, @precision, @nai = value
+          @asset = case @nai
           when '@@000000013' then 'SBD'
           when '@@000000021' then 'STEEM'
           when '@@000000037' then 'VESTS'
-          else; raise TypeError, "Asset #{@asset} unknown."
+          else; raise TypeError, "Asset #{@nai} unknown."
+          end
+          
+          @amount = "%.#{@precision}f" % (@amount.to_f / 10 ** @precision)
+        when Hash
+          @amount, @precision, @nai = value.map do |k, v|
+            v if %i(amount precision nai).include? k.to_sym
+          end.compact
+          
+          @asset = case @nai
+          when '@@000000013' then 'SBD'
+          when '@@000000021' then 'STEEM'
+          when '@@000000037' then 'VESTS'
+          else; raise TypeError, "Asset #{@nai} unknown."
           end
-          @precision = p
-          @amount = "%.#{p}f" % (a.to_f / 10 ** p)
+          
+          @amount = "%.#{@precision}f" % (@amount.to_f / 10 ** @precision)
+        when Amount
+          @precision = value.precision
+          @nai = value.nai
+          @asset = value.asset
+          @amount = value.amount
         else
           @amount, @asset = value.strip.split(' ') rescue ['', '']
           @precision = case @asset
@@ -45,7 +65,7 @@ module Steem
         asset
       end
       
-      def to_nia
+      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']
@@ -53,6 +73,26 @@ module Steem
         end
       end
       
+      def to_h
+        case @asset
+        when 'STEEM' then {
+          amount: (@amount.to_f * 1000).to_i.to_s,
+          precision: 3,
+          nai: '@@000000021'
+        }
+        when 'VESTS' then {
+          amount: (@amount.to_f * 1000000).to_i.to_s,
+          precision: 6,
+          nai: '@@000000037'
+        }
+        when 'SBD' then {
+          amount: (@amount.to_f * 1000).to_i.to_s,
+          precision: 3,
+          nai: '@@000000013'
+        }
+        end
+      end
+      
       def to_s
         "#{@amount} #{@asset}"
       end

data/lib/steem/version.rb

@@ -1,4 +1,4 @@
 module Steem
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
   AGENT_ID = "steem-ruby/#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steem-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler