steem-ruby 0.9.3 → 0.9.4

data/lib/steem/operation/limit_order_create.rb

@@ -0,0 +1,8 @@
+class Steem::Operation::LimitOrderCreate < Steem::Operation
+  def_attr owner: :string
+  def_attr orderid: :uint32
+  def_attr amount_to_sell: :amount
+  def_attr min_to_receive: :amount
+  def_attr fill_or_kill: :boolean
+  def_attr expiration: :point_in_time
+end

data/lib/steem/operation/limit_order_create2.rb

@@ -0,0 +1,8 @@
+class Steem::Operation::LimitOrderCreate2 < Steem::Operation
+  def_attr owner: :string
+  def_attr orderid: :uint32
+  def_attr amount_to_sell: :amount
+  def_attr fill_or_kill: :boolean
+  def_attr exchange_rate: :price
+  def_attr expiration: :point_in_time
+end

data/lib/steem/operation/prove_authority.rb

@@ -0,0 +1,4 @@
+class Steem::Operation::ProveAuthority < Steem::Operation
+  def_attr challenged: :string
+  def_attr require_owner: :boolean
+end

data/lib/steem/operation/recover_account.rb

@@ -0,0 +1,6 @@
+class Steem::Operation::RecoverAccount < Steem::Operation
+  def_attr account_to_recover: :string
+  def_attr new_owner_authority: :authority
+  def_attr recent_owner_authority: :authority
+  def_attr extensions: :empty_array
+end

data/lib/steem/operation/report_over_production.rb

@@ -0,0 +1,5 @@
+class Steem::Operation::ReportOverProduction < Steem::Operation
+  def_attr reporter: :string
+  def_attr first_block: :string # FIXME signed_block_header
+  def_attr second_block: :string # FIXME signed_block_header
+end

data/lib/steem/operation/request_account_recovery.rb

@@ -0,0 +1,6 @@
+class Steem::Operation::RequestAccountRecovery < Steem::Operation
+  def_attr recovery_account: :string
+  def_attr account_to_recover: :string
+  def_attr new_owner_authority: :authority
+  def_attr extensions: :empty_array
+end

data/lib/steem/operation/reset_account.rb

@@ -0,0 +1,5 @@
+class Steem::Operation::ResetAccount < Steem::Operation
+  def_attr reset_account: :string
+  def_attr account_to_reset: :string
+  def_attr new_owner_authority: :authority
+end

data/lib/steem/operation/set_reset_account.rb

@@ -0,0 +1,5 @@
+class Steem::Operation::SetResetAccount < Steem::Operation
+  def_attr account: :string
+  def_attr current_reset_account: :string
+  def_attr reset_account: :string
+end

data/lib/steem/operation/set_withdraw_vesting_route.rb

@@ -0,0 +1,6 @@
+class Steem::Operation::SetWithdrawVestingRoute < Steem::Operation
+  def_attr from: :string
+  def_attr to: :string
+  def_attr percent: :uint16
+  def_attr auto_vest: :boolean
+end

data/lib/steem/operation/transfer.rb

@@ -0,0 +1,6 @@
+class Steem::Operation::Transfer < Steem::Operation
+  def_attr from: :string
+  def_attr to: :string
+  def_attr amount: :amount
+  def_attr memo: :string
+end

data/lib/steem/operation/transfer_from_savings.rb

@@ -0,0 +1,7 @@
+class Steem::Operation::TransferFromSavings < Steem::Operation
+  def_attr from: :string
+  def_attr request_id: :uint32
+  def_attr to: :string
+  def_attr amount: :amount
+  def_attr memo: :string
+end

data/lib/steem/operation/transfer_to_savings.rb

@@ -0,0 +1,6 @@
+class Steem::Operation::TransferToSavings < Steem::Operation
+  def_attr from: :string
+  def_attr to: :string
+  def_attr amount: :amount
+  def_attr memo: :string
+end

data/lib/steem/operation/transfer_to_vesting.rb

@@ -0,0 +1,5 @@
+class Steem::Operation::TransferToVesting < Steem::Operation
+  def_attr from: :string
+  def_attr to: :string
+  def_attr amount: :amount
+end

data/lib/steem/operation/vote.rb

@@ -0,0 +1,6 @@
+class Steem::Operation::Vote < Steem::Operation
+  def_attr voter: :string
+  def_attr author: :string
+  def_attr permlink: :string
+  def_attr weight: :int16
+end

data/lib/steem/operation/withdraw_vesting.rb

@@ -0,0 +1,4 @@
+class Steem::Operation::WithdrawVesting < Steem::Operation
+  def_attr account: :string
+  def_attr vesting_shares: :amount
+end

data/lib/steem/operation/witness_set_properties.rb

@@ -0,0 +1,5 @@
+class Steem::Operation::WitnessSetProperties < Steem::Operation
+  def_attr owner: :string
+  def_attr props: :witness_properties
+  def_attr extensions: :empty_array
+end

data/lib/steem/operation/witness_update.rb

@@ -0,0 +1,7 @@
+class Steem::Operation::WitnessUpdate < Steem::Operation
+  def_attr owner: :string
+  def_attr url: :string
+  def_attr block_signing_key: :public_key
+  def_attr props: :chain_properties
+  def_attr fee: :amount
+end

data/lib/steem/rpc/base_client.rb

@@ -161,6 +161,19 @@ module Steem
         
         sleep @backoff
       end
+      
+      # @private
+      def raise_error_response(rpc_method_name, rpc_args, response)
+        raise UnknownError, "#{rpc_method_name}: #{response}" if response.error.nil?
+        
+        error = response.error
+        
+        if error.message == 'Invalid Request'
+          raise Steem::ArgumentError, "Unexpected arguments: #{rpc_args.inspect}.  Expected: #{rpc_method_name} (#{args_keys_to_s(rpc_method_name)})"
+        end
+        
+        BaseError.build_error(error, rpc_method_name)
+      end
     end
   end
 end

data/lib/steem/rpc/http_client.rb

@@ -17,7 +17,7 @@ module Steem
       # 
       # @private
       TIMEOUT_ERRORS = [Net::OpenTimeout, JSON::ParserError, Net::ReadTimeout,
-        Errno::EBADF, IOError, Errno::ENETDOWN]
+        Errno::EBADF, IOError, Errno::ENETDOWN, Steem::RemoteDatabaseLockError]
       
       # @private
       POST_HEADERS = {
@@ -108,6 +108,22 @@ module Steem
             else; response
             end
             
+            [response].flatten.each_with_index do |r, i|
+              if defined?(r.error) && !!r.error
+                if !!r.error.message
+                  begin
+                    rpc_method_name = "#{api_name}.#{api_method}"
+                    rpc_args = [request_object].flatten[i]
+                    raise_error_response rpc_method_name, rpc_args, r
+                  rescue *TIMEOUT_ERRORS => e
+                    throw retry_timeout(:tota_cera_pila, e)
+                  end
+                else
+                  raise Steem::ArgumentError, r.error.inspect
+                end
+              end
+            end
+            
             yield_response response, &block
           when '504' # Gateway Timeout
             throw retry_timeout(:tota_cera_pila, response.body)

data/lib/steem/stream.rb

@@ -91,6 +91,14 @@ module Steem
     # @option options [Integer] :until_block_num Ends the stream at the given block number.  Default: nil.
     def transactions(options = {}, &block)
       blocks(options) do |block, block_num|
+        if block.nil?
+          warn "Batch missing block_num: #{block_num}, retrying ..."
+          
+          block = block_api.get_block(block_num: block_num) do |result|
+            result.block
+          end
+        end
+        
         block.transactions.each_with_index do |transaction, index|
           trx_id = block.transaction_ids[index]
           
@@ -332,9 +340,8 @@ module Steem
         end
         
         response = account_history_api.get_ops_in_block(*get_ops_in_block_options)
-        result = response.result
         
-        if result.nil?
+        if response.nil? || (result = response.result).nil?
           if retries < MAX_RETRY_COUNT
             warn "Retrying get_ops_in_block on block #{block_num}" unless @no_warn
             retries = retries + 1
@@ -360,7 +367,8 @@ module Steem
             retries = retries + 1
             redo
           else
-            raise TooManyRetriesError, "unable to find virtual operations for block: #{block_num}"
+            warn "unable to find virtual operations for block: #{block_num}"
+            # raise TooManyRetriesError, "unable to find virtual operations for block: #{block_num}"
           end
         end
         
@@ -374,4 +382,4 @@ module Steem
       end
     end
   end
-end
+end

data/lib/steem/transaction.rb

@@ -0,0 +1,96 @@
+module Steem
+  class Transaction
+    include JSONable
+    include Utils
+    
+    ATTRIBUTES = %i(id ref_block_num ref_block_prefix expiration operations
+      extensions signatures)
+    
+    attr_accessor *ATTRIBUTES
+    
+    def initialize(options = {})
+      if !!(hex = options.delete(:hex))
+        marshal = Marshal.new(hex: hex)
+        marshal.transaction(trx: self)
+      end
+      
+      options.each do |k, v|
+        raise Steem::ArgumentError, "Invalid option specified: #{k}" unless ATTRIBUTES.include?(k.to_sym)
+
+        send("#{k}=", v)
+      end
+      
+      self.operations ||= []
+      self.extensions ||= []
+      self.signatures ||= []
+      
+      self.expiration = case @expiration
+      when String then Time.parse(@expiration + 'Z')
+      else; @expiration
+      end
+    end
+    
+    def inspect
+      properties = ATTRIBUTES.map do |prop|
+        unless (v = instance_variable_get("@#{prop}")).nil?
+          v = if v.respond_to? :strftime
+            v.strftime('%Y-%m-%dT%H:%M:%S')
+          else
+            v
+          end
+
+          "@#{prop}=#{v}" 
+        end
+      end.compact.join(', ')
+      
+      "#<#{self.class.name} [#{properties}]>"
+    end
+    
+    def expiration
+      if @expiration.respond_to? :strftime
+        @expiration.strftime('%Y-%m-%dT%H:%M:%S')
+      else
+        @expiration
+      end
+    end
+    
+    def expired?
+      @expiration.nil? || @expiration < Time.now
+    end
+    
+    def [](key)
+      key = key.to_sym
+      send(key) if self.class.attributes.include?(key)
+    end
+
+    def []=(key, value)
+      key = key.to_sym
+      send("#{key}=", value) if self.class.attributes.include?(key)
+    end
+    
+    def ==(other_trx)
+      return true if self.equal? other_trx
+      return false unless self.class == other_trx.class
+      
+      begin
+        return false if self[:ref_block_num].to_i != other_trx[:ref_block_num].to_i
+        return false if self[:ref_block_prefix].to_i != other_trx[:ref_block_prefix].to_i
+        return false if self[:expiration].to_i != other_trx[:expiration].to_i
+        return false if self[:operations].size != other_trx[:operations].size
+        
+        op_values = self[:operations].map do |type, value|
+          [type.to_s, value.values.map{|v| v.to_s.gsub(/[^a-zA-Z0-9-]/, '')}]
+        end.flatten.sort
+        
+        other_op_values = other_trx[:operations].map do |type, value|
+          [type.to_s, value.values.map{|v| v.to_s.gsub(/[^a-zA-Z0-9-]/, '')}]
+        end.flatten.sort
+        # binding.pry unless op_values == other_op_values
+        op_values == other_op_values
+      rescue => e
+        # binding.pry
+        false
+      end
+    end
+  end
+end

data/lib/steem/transaction_builder.rb

@@ -28,10 +28,11 @@ module Steem
     
     attr_accessor :app_base, :database_api, :block_api, :expiration, :operations
     attr_writer :wif
-    attr_reader :signed, :testnet
+    attr_reader :signed, :testnet, :force_serialize
     
     alias app_base? app_base
     alias testnet? testnet
+    alias force_serialize? force_serialize
     
     def initialize(options = {})
       @app_base = !!options[:app_base] # default false
@@ -49,6 +50,7 @@ module Steem
       @wif = [options[:wif]].flatten
       @signed = false
       @testnet = !!options[:testnet]
+      @force_serialize = !!options[:force_serialize]
       
       if !!(trx = options[:trx])
         trx = case trx
@@ -56,28 +58,10 @@ module Steem
         else; trx
         end
         
-        trx_options = {
-          ref_block_num: trx['ref_block_num'],
-          ref_block_prefix: trx['ref_block_prefix'],
-          extensions: (trx['extensions']),
-          operations: trx['operations'],
-          signatures: (trx['signatures']),
-        }
-        
-        trx_options[:expiration] = case trx['expiration']
-        when String then Time.parse(trx['expiration'] + 'Z')
-        else; trx['expiration']
-        end
-        
-        options = options.merge(trx_options)
+        @trx = Transaction.new(trx)
       end
       
-      @ref_block_num = options[:ref_block_num]
-      @ref_block_prefix = options[:ref_block_prefix]
-      @operations = options[:operations] || []
-      @expiration = options[:expiration]
-      @extensions = options[:extensions] || []
-      @signatures = options[:signatures] || []
+      @trx ||= Transaction.new
       @chain = options[:chain] || :steem
       @error_pipe = options[:error_pipe] || STDERR
       @chain_id = options[:chain_id]
@@ -93,12 +77,9 @@ module Steem
     end
     
     def inspect
-      properties = %w(
-        ref_block_num ref_block_prefix expiration operations extensions
-        signatures
-      ).map do |prop|
+      properties = %w(trx).map do |prop|
         if !!(v = instance_variable_get("@#{prop}"))
-          "@#{prop}=#{v}" 
+          "@#{prop}=#{v.inspect}" 
         end
       end.compact.join(', ')
       
@@ -106,21 +87,12 @@ module Steem
     end
     
     def reset
-      @ref_block_num = nil
-      @ref_block_prefix = nil
-      @expiration = nil
-      @operations = []
-      @extensions = []
-      @signatures = []
+      @trx = Transaction.new
       @signed = false
       
       self
     end
     
-    def expired?
-      @expiration.nil? || @expiration < Time.now
-    end
-    
     # If the transaction can be prepared, this method will do so and set the
     # expiration.  Once the expiration is set, it will not re-prepare.  If you
     # call {#put}, the expiration is set {::Nil} so that it can be re-prepared.
@@ -129,7 +101,7 @@ module Steem
     #
     # @return {TransactionBuilder}
     def prepare
-      if expired?
+      if @trx.expired?
         catch :prepare_header do; begin
           @database_api.get_dynamic_global_properties do |properties|
             block_number = properties.last_irreversible_block_num
@@ -146,9 +118,9 @@ module Steem
                 result
               end
               
-              @ref_block_num = (block_number - 1) & 0xFFFF
-              @ref_block_prefix = unhexlify(header.previous[8..-1]).unpack('V*')[0]
-              @expiration ||= (Time.parse(properties.time + 'Z') + EXPIRE_IN_SECS).utc
+              @trx.ref_block_num = (block_number - 1) & 0xFFFF
+              @trx.ref_block_prefix = unhexlify(header.previous[8..-1]).unpack('V*')[0]
+              @trx.expiration ||= (Time.parse(properties.time + 'Z') + EXPIRE_IN_SECS).utc
             end
           end
         rescue => e
@@ -166,9 +138,9 @@ module Steem
     
     # Sets operations all at once, then prepares.
     def operations=(operations)
-      @operations = operations.map{ |op| normalize_operation(op) }
+      @trx.operations = operations.map{ |op| normalize_operation(op) }
       prepare
-      @operations
+      @trx.operations
     end
     
     # A quick and flexible way to append a new operation to the transaction.
@@ -194,8 +166,8 @@ module Steem
     #     builder.put(vote: vote1).put(vote: vote2)
     # @return {TransactionBuilder}
     def put(type, op = nil)
-      @expiration = nil
-      @operations << normalize_operation(type, op)
+      @trx.expiration = nil
+      @trx.operations << normalize_operation(type, op)
       prepare
       self
     end
@@ -218,9 +190,17 @@ module Steem
     #             ]],
     #               :signatures => ["1c45b65740b4b2c17c4bcf6bcc3f8d90ddab827d50532729fc3b8f163f2c465a532b0112ae4bf388ccc97b7c2e0bc570caadda78af48cf3c261037e65eefcd941e"]
     #     }
-    def transaction
-      prepare
-      sign
+    def transaction(options = {prepare: true, sign: true})
+      options[:prepare] = true unless options.has_key? :prepare
+      options[:sign] = true unless options.has_key? :sign
+      
+      prepare if !!options[:prepare]
+      
+      if !!options[:sign]
+        sign
+      else
+        @trx
+      end
     end
     
     # Appends to the `signatures` array of the transaction, built from a
@@ -229,39 +209,42 @@ module Steem
     # @return {Hash | TransactionBuilder} The fully signed transaction if a `wif` is provided or the instance of the {TransactionBuilder} if a `wif` has not yet been provided.
     def sign
       return self if @wif.empty?
-      return self if expired?
-      
-      trx = {
-        ref_block_num: @ref_block_num,
-        ref_block_prefix: @ref_block_prefix, 
-        expiration: @expiration.strftime('%Y-%m-%dT%H:%M:%S'),
-        operations: @operations,
-        extensions: @extensions,
-        signatures: @signatures
-      }
+      return self if @trx.expired?
       
       unless @signed
         catch :serialize do; begin
-          transaction_hex_args = if app_base?
-            {trx: trx}
-          else
-            trx
-          end
-          
-          @database_api.get_transaction_hex(transaction_hex_args) do |result|
+          transaction_hex.tap do |result|
             hex = if app_base?
               result.hex
             else
               result
             end
+
+            unless force_serialize?
+              derrived_trx = Transaction.new(hex: hex)
+              derrived_ops = derrived_trx.operations
+              derrived_trx.operations = derrived_ops.map do |op|
+                op_name = if app_base?
+                  op[:type].to_sym
+                else
+                  op[:type].to_s.sub(/_operation$/, '').to_sym
+                end
+                
+                normalize_operation op_name, JSON[op[:value].to_json]
+              end
+              
+              raise SerializationMismatchError unless @trx == derrived_trx
+            end
+            
+            hex = hex[0..-4] # drop empty signature array
+            @trx.id = Digest::SHA256.hexdigest(unhexlify(hex))[0..39]
             
-            hex = @chain_id + hex[0..-4] # Why do we have to chop the last two bytes?
+            hex = @chain_id + hex
             digest = unhexlify(hex)
             digest_hex = Digest::SHA256.digest(digest)
             private_keys = @wif.map{ |wif| Bitcoin::Key.from_base58 wif }
             ec = Bitcoin::OpenSSL_EC
             count = 0
-            sigs = []
             
             private_keys.each do |private_key|
               sig = nil
@@ -276,11 +259,10 @@ module Steem
                 break if canonical? sig
               end
               
-              @signatures << hexlify(sig)
+              @trx.signatures << hexlify(sig)
             end
             
             @signed = true
-            trx[:signatures] = @signatures
           end
         rescue => e
           if can_retry? e
@@ -292,7 +274,25 @@ module Steem
         end; end
       end
         
-      Hashie::Mash.new trx
+      @trx
+    end
+    
+    def transaction_hex
+      trx = transaction(prepare: true, sign: false)
+      
+      transaction_hex_args = if app_base?
+        {trx: trx}
+      else
+        trx
+      end
+      
+      @database_api.get_transaction_hex(transaction_hex_args) do |result|
+        if app_base?
+          result[:hex]
+        else
+          result
+        end
+      end
     end
     
     # @return [Array] All public keys that could possibly sign for a given transaction.