peatio-thought 2.6.7 → 2.6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 497ca16ccc4eda7ac0fb035c68ef543a378364f6b142f2f85dccb57803e1ea88
-  data.tar.gz: a1d194a397cee8e577e9665f17b4a8dae3238e0cecbb39925a3d1857524a4e55
+  metadata.gz: 3863bcba08ebff661b9bcd89a85b17dc3af9ed90ea3dafe80ae8fa57edf97e4f
+  data.tar.gz: 0a7f7d64cdd64c8aae0b9dc296685305335b12f763f04af5c6fa248cdc3c7ec7
 SHA512:
-  metadata.gz: 4b3ff921351521a5dcbf80e4892d6d2a66879be411a7d940f0ff60443f7a0f8cff7bc17e2f4f4d3c33996d1f85c78d412ea9a4c143259a55f7070be2c85a7603
-  data.tar.gz: 91dc0dd40f9e4d24be962e0cff36a6a716d6b0005fdc1edb0b2df8626faa38fce4094fce9874876c56ccef998a18a37d3220346cb33c7aed2724f3989241e965
+  metadata.gz: b1a1f9a61d6ef4e994a9ee80d571382e8988f3777f527d7132e2ba4152a1a4a47ab80d935cf120b5e107e99d1ea9ce938c9b6c3e3fc6e103c6fb243f0ca2f9d5
+  data.tar.gz: 589c25150d4d1673855f196570a6f3cb761fa4aade4d30bcb57a7873e91f1e1ec975edc34349d563b34abf64930501616229f9a1735f215a70fa99f2ced5d5cb

data/Gemfile.lock

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

data/lib/peatio/thought/blockchain.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Peatio
   module Thought
@@ -19,13 +20,15 @@ module Peatio
       def fetch_block!(block_number)
         block_hash = client.json_rpc(:getblockhash, [block_number])
 
-        client.json_rpc(:getblock, [block_hash, 2])
+        block_txs = 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))
           end
           txs_array.append(*txs)
-        end.yield_self { |txs_array| Peatio::Block.new(block_number, txs_array) }
+        end
+
+        Peatio::Block.new(block_number, txs_array)
     rescue Client::Error => e
       raise Peatio::Blockchain::ClientError, e
     end
@@ -42,50 +45,42 @@ module Peatio
                                      .flatten(1)
                                      .find {|addr| addr[0] == address }
 
-      if address_with_balance.blank?
-        raise Peatio::Blockchain::UnavailableAddressBalanceError, address
-      end
-
-      address_with_balance[1].to_d
-    rescue Client::Error => e
-      raise Peatio::Blockchain::ClientError, e
-    end
-
-private
-
-      def filter_vout(tx_hash)
-        tx_hash.fetch("vout").select do |entry|
-          entry.fetch("value").to_d.positive? && entry["scriptPubKey"].has_key?("addresses")
-        end
-
-        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
-        end
-      end
-
-      def client
-        @client ||= Client.new(settings_fetch(:server))
-      end
-
-    def settings_fetch(key)
-      @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
-    end
-  end
- end
-end
-end
+                                     raise Peatio::Blockchain::UnavailableAddressBalanceError, address if address_with_balance.blank?
+
+                                       address_with_balance[1].to_d
+                                     rescue Client::Error => e
+                                       raise Peatio::Blockchain::ClientError, e
+                                     end
+
+                                     private
+
+                                     def filter_vout(tx_hash)
+                                       tx_hash.fetch("vout").select do |entry|
+                                         entry.fetch("value").to_d.positive? && entry["scriptPubKey"].has_key?("addresses")
+                                       end
+                                     end
+
+                                     def build_transaction(tx_hash)
+                                       filter_vout(tx_hash).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
+                                       end
+                                     end
+
+                                     def client
+                                       @client ||= Client.new(settings_fetch(:server))
+                                     end
+
+                                     def settings_fetch(key)
+                                       @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
+                                     end
+                                   end
+                                 end
+                               end

data/lib/peatio/thought/client.rb

@@ -1,61 +1,56 @@
 # frozen_string_literal: true
 
-require "memoist"
-require "faraday"
-require "better-faraday"
+require 'memoist'
+require 'faraday'
+require 'better-faraday'
 
 module Peatio
   module Thought
     class Client
-      Error = Class.new(StandardError)
-      ConnectionError = Class.new(Error)
+	Error = Class.new(StandardError)
 
-      class ResponseError < Error
-        def initialize(code, msg)
-          @code = code
-          @msg = msg
-        end
+    class ConnectionError < Error; end
 
-        def message
-          "#{@msg} (#{@code})"
-        end
+    class ResponseError < Error
+      def initialize(code, msg)
+        super "#{msg} (#{code})"
       end
-  
+    end
 
-      extend Memoist
+    extend Memoist
 
-      def initialize(endpoint)
-        @json_rpc_endpoint = URI.parse(endpoint)
-      end
+    def initialize(endpoint, idle_timeout: 5)
+      @json_rpc_endpoint = URI.parse(endpoint)
+      @idle_timeout = idle_timeout
+    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
+    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
 
     private
 
-      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
+    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)
         end
       end
     end
   end
 end
+end

data/lib/peatio/thought/hooks.rb

@@ -28,8 +28,8 @@ module Peatio
         end
 
         def register
-          Peatio::Blockchain.registry[:thought] = Thought::Blockchain.new
-          Peatio::Wallet.registry[:thoughtd] = Thought::Wallet.new
+          Peatio::Blockchain.registry[:thought] = Thought::Blockchain
+          Peatio::Wallet.registry[:thoughtd] = Thought::Wallet
         end
       end
 

data/lib/peatio/thought/version.rb

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

data/lib/peatio/thought/wallet.rb

@@ -16,17 +16,17 @@ module Peatio
 
         @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
 
-        @wallet = @settings.fetch(:wallet) do
+        @wallet = @settings.fetch(:wallet) {
           raise Peatio::Wallet::MissingSettingError, :wallet
-        end.slice(:uri, :address)
+        }.slice(:uri, :address)
 
-        @currency = @settings.fetch(:currency) do
+        @currency = @settings.fetch(:currency) {
           raise Peatio::Wallet::MissingSettingError, :currency
-        end.slice(:id, :base_factor, :options)
+        }.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
@@ -61,4 +61,3 @@ module Peatio
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-thought
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.7.1
 platform: ruby
 authors:
 - Andrew@Thought
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Peatio Thought Blockchain Plugin