peatio-thought 2.6.5 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2ac431dc42834213be104d8228405d166d6fbaed44de43a7c85d12e62e8cda7
-  data.tar.gz: d4dd5773e827047facbe616dcf4bf4002a2b5952301774a28dcc388590f27ec4
+  metadata.gz: 497ca16ccc4eda7ac0fb035c68ef543a378364f6b142f2f85dccb57803e1ea88
+  data.tar.gz: a1d194a397cee8e577e9665f17b4a8dae3238e0cecbb39925a3d1857524a4e55
 SHA512:
-  metadata.gz: c24e9ee608e84c587d631f013ac747a752dc7814df856ff2b5f0838f9ca7878284f20b5113208beb3ff9daa063245409c4ccb209521dbcf3d5e960819c510318
-  data.tar.gz: 4d2f142b8cc002ca013c17194095ad80c1108e14e797edf76de3e46bad3de64bf9ef47a9acefabba558c0290d78ef93d290cdb8678ae80a740420b31f30a28ca
+  metadata.gz: 4b3ff921351521a5dcbf80e4892d6d2a66879be411a7d940f0ff60443f7a0f8cff7bc17e2f4f4d3c33996d1f85c78d412ea9a4c143259a55f7070be2c85a7603
+  data.tar.gz: 91dc0dd40f9e4d24be962e0cff36a6a716d6b0005fdc1edb0b2df8626faa38fce4094fce9874876c56ccef998a18a37d3220346cb33c7aed2724f3989241e965

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio-thought (2.6.5)
+    peatio-thought (2.6.7)
       activesupport (~> 5.2.3)
       better-faraday (~> 1.0.5)
       faraday (~> 0.17)

data/lib/peatio/thought/blockchain.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 
 module Peatio
   module Thought
@@ -20,7 +19,7 @@ module Peatio
       def fetch_block!(block_number)
         block_hash = client.json_rpc(:getblockhash, [block_number])
 
-        block_txs = client.json_rpc(:getblock, [block_hash, 2])
+        client.json_rpc(:getblock, [block_hash, 2])
                           .fetch("tx").each_with_object([]) do |tx, txs_array|
           txs = build_transaction(tx).map do |ntx|
             Peatio::Transaction.new(ntx.merge(block_number: block_number))
@@ -58,17 +57,24 @@ private
         tx_hash.fetch("vout").select do |entry|
           entry.fetch("value").to_d.positive? && entry["scriptPubKey"].has_key?("addresses")
         end
-        .each_with_object([]) do |entry, formatted_txs|
+
+        def build_transaction(tx_hash)
+        tx_hash.fetch('vout')
+          .select do |entry|
+          entry.fetch('value').to_d > 0 &&
+            entry['scriptPubKey'].has_key?('addresses')
+        end
+          .each_with_object([]) do |entry, formatted_txs|
           no_currency_tx =
             { hash: tx_hash['txid'], txout: entry['n'],
               to_address: entry['scriptPubKey']['addresses'][0],
               amount: entry.fetch('value').to_d,
               status: 'success' }
 
-            # Build transaction for each currency belonging to blockchain.
-            settings_fetch(:currencies).pluck(:id).each do |currency_id|
-              formatted_txs << no_currency_tx.merge(currency_id: currency_id)
-            end
+          # Build transaction for each currency belonging to blockchain.
+          settings_fetch(:currencies).pluck(:id).each do |currency_id|
+            formatted_txs << no_currency_tx.merge(currency_id: currency_id)
+          end
         end
       end
 
@@ -82,4 +88,4 @@ private
   end
  end
 end
-
+end

data/lib/peatio/thought/client.rb

@@ -8,49 +8,54 @@ module Peatio
   module Thought
     class Client
       Error = Class.new(StandardError)
-
-      class ConnectionError < Error; end
+      ConnectionError = Class.new(Error)
 
       class ResponseError < Error
         def initialize(code, msg)
-          super "#{msg} (#{code})"
+          @code = code
+          @msg = msg
+        end
+
+        def message
+          "#{@msg} (#{@code})"
+        end
       end
-    end
+  
 
       extend Memoist
 
-      def initialize(endpoint, idle_timeout: 5)
-      @json_rpc_endpoint = URI.parse(endpoint)
-      @idle_timeout = idle_timeout
-    end
+      def initialize(endpoint)
+        @json_rpc_endpoint = URI.parse(endpoint)
+      end
 
-    def json_rpc(method, params = [])
-      response = connection.post \
-        '/',
-        {jsonrpc: '1.0', method: method, params: params}.to_json,
-        {'Accept' => 'application/json',
-         'Content-Type' => 'application/json'}
-      response.assert_success!
-      response = JSON.parse(response.body)
-      response['error'].tap { |error| raise ResponseError.new(error['code'], error['message']) if error }
-      response.fetch('result')
-    rescue Faraday::Error => e
-      raise ConnectionError, e
-    rescue StandardError => e
-      raise Error, e
-    end
+      def json_rpc(method, params = [])
+        response = connection.post \
+          '/',
+          { jsonrpc: '1.0', method: method, params: params }.to_json,
+          { 'Accept' => 'application/json',
+            'Content-Type' => 'application/json' }
+        response.assert_2xx!
+        response = JSON.parse(response.body)
+        response['error'].tap do |e|
+          raise ResponseError.new(e['code'], e['message']) if e
+        end
+        response.fetch('result')
+      rescue Faraday::Error => e
+        raise ConnectionError, e
+      end
 
     private
 
-    def connection
-      @connection ||= Faraday.new(@json_rpc_endpoint) do |f|
-        f.adapter :net_http_persistent, pool_size: 5, idle_timeout: @idle_timeout
-      end.tap do |connection|
-        unless @json_rpc_endpoint.user.blank?
-          connection.basic_auth(@json_rpc_endpoint.user, @json_rpc_endpoint.password)
+      def connection
+        @connection ||= Faraday.new(@json_rpc_endpoint) do |f|
+                          f.adapter :net_http_persistent, pool_size: 5
+                        end.tap do |connection|
+          unless @json_rpc_endpoint.user.blank?
+            connection.basic_auth(@json_rpc_endpoint.user,
+                                  @json_rpc_endpoint.password)
+          end
         end
       end
     end
   end
 end
-end

data/lib/peatio/thought/version.rb

@@ -2,6 +2,6 @@
 
 module Peatio
   module Thought
-    VERSION = "2.6.5"
+    VERSION = "2.6.7"
   end
 end

data/lib/peatio/thought/wallet.rb

@@ -16,17 +16,17 @@ module Peatio
 
         @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
 
-        @wallet = @settings.fetch(:wallet) {
+        @wallet = @settings.fetch(:wallet) do
           raise Peatio::Wallet::MissingSettingError, :wallet
-        }.slice(:uri, :address)
+        end.slice(:uri, :address)
 
-        @currency = @settings.fetch(:currency) {
+        @currency = @settings.fetch(:currency) do
           raise Peatio::Wallet::MissingSettingError, :currency
-        }.slice(:id, :base_factor, :options)
+        end.slice(:id, :base_factor, :options)
       end
 
-      def create_address!(_options={})
-        {address: client.json_rpc(:getnewaddress)}
+      def create_address!(_options = {})
+        { address: client.json_rpc(:getnewaddress) }
       rescue Thought::Client::Error => e
         raise Peatio::Wallet::ClientError, e
       end
@@ -36,9 +36,9 @@ module Peatio
                                [
                                  transaction.to_address,
                                  transaction.amount,
-                                 "",
-                                 "",
-                                 options[:subtract_fee].to_s == "true" # subtract fee from transaction amount.
+                                 '',
+                                 '',
+                                 options[:subtract_fee].to_s == 'true' # subtract fee from transaction amount.
                                ])
         transaction.hash = txid
         transaction
@@ -54,10 +54,11 @@ module Peatio
 
       private
 
-    def client
-      uri = @wallet.fetch(:uri) { raise Peatio::Wallet::MissingSettingError, :uri }
-      @client ||= Client.new(uri, idle_timeout: 1)
+      def client
+        uri = @wallet.fetch(:uri) { raise Peatio::Wallet::MissingSettingError, :uri }
+        @client ||= Client.new(uri)
+      end
     end
   end
 end
-end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peatio-thought
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.7
 platform: ruby
 authors:
 - Andrew@Thought