peatio-goldcash 2.6.7 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db4bc932d1550620cc776437a5f175a675a66be0fa34a1aaf6740b8676b22a6
-  data.tar.gz: 42f2bc359bf19000c843381c059e5f5c70b0072ffe426b07f6b03ebd2265ec8b
+  metadata.gz: 2b49233782ebd62a00898f80b007c2f99ef10a04d2ee39c4a9a5a34efde9574b
+  data.tar.gz: dda5b4346240f310818627794a9d3b2b3211a029405aa352eb122c977cc86e12
 SHA512:
-  metadata.gz: 8741622686943516252f10fcd6b11c49835865cc78f182b3fa80645b35fc9a39fbbe1b0b39c867bc7abb2292e0b3b700226a278cd03ff3eda7d66da1fa02a78f
-  data.tar.gz: eea49aef9ff7c1acd8c02d48365fa7e2ea455b9545d6314b7ededc31fe8a3a7a7fe85e05f3293ea7efe1f6be1ece75ed7cc406a9abbe58b7c0da04158473dc22
+  metadata.gz: 30d0f806e2303a6ea6ed90682c218e75178d54ffdeab20bbf8b7dfd16a2d35af710135524df29c95b2e0e0b3355e8e85ca0a2bc51a81af669f0d466629badbc9
+  data.tar.gz: 86eac432bfac27e3345408031321c9f099d266dac65ba0b8f8b8fa55127ccbc25dac633d73c561e7258e5b00d10bfd0fd4be6193858a931e1b0787f6394ad891

data/Gemfile

@@ -4,5 +4,5 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
-# Specify your gem's dependencies in peatio-goldcash.gemspec
+# Specify your gem's dependencies in peatio-gold.gemspec
 gemspec

data/Gemfile.lock

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

data/README.md

@@ -1,6 +1,6 @@
 # Peatio::Goldcash
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/peatio/goldcash`. To experiment with that code, run `bin/console` for an interactive prompt.
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/peatio/gold`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 TODO: Delete this and the text above, and describe your gem
 

data/lib/peatio/goldcash/blockchain.rb

@@ -1,85 +1,96 @@
 # frozen_string_literal: true
 
 module Peatio
-  module Goldcash
-    # TODO: Processing of unconfirmed transactions from mempool isn't supported now.
-    class Blockchain < Peatio::Blockchain::Abstract
-      DEFAULT_FEATURES = {case_sensitive: true, cash_addr_format: false}.freeze
-
-      def initialize(custom_features={})
-        @features = DEFAULT_FEATURES.merge(custom_features).slice(*SUPPORTED_FEATURES)
-        @settings = {}
-      end
+ module Goldcash
+  # TODO: Processing of unconfirmed transactions from mempool isn't supported now.
+  class Blockchain < Peatio::Blockchain::Abstract
 
-      def configure(settings={})
-        # Clean client state during configure.
-        @client = nil
-        @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
-      end
+    DEFAULT_FEATURES = {case_sensitive: true, cash_addr_format: false}.freeze
+
+    def initialize(custom_features = {})
+      @features = DEFAULT_FEATURES.merge(custom_features).slice(*SUPPORTED_FEATURES)
+      @settings = {}
+    end
+
+    def configure(settings = {})
+      # Clean client state during configure.
+      @client = nil
+      @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
+    end
 
-      def fetch_block!(block_number)
-        block_hash = client.json_rpc(:getblockhash, [block_number])
+    def fetch_block!(block_number)
+      block_hash = client.json_rpc(:getblockhash, [block_number])
 
-        block_txs = client.json_rpc(:getblock, [block_hash])
-                          .fetch("tx").each_with_object([]) do |tx, txs_array|
+      client.json_rpc(:getblock, [block_hash])
+        .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
+        end.yield_self { |txs_array| Peatio::Block.new(block_number, txs_array) }
+    rescue Goldcash::Client::Error => e
+      raise Peatio::Blockchain::ClientError, e
+    end
 
-        Peatio::Block.new(block_number, block_txs)
-      rescue Client::Error => e
-        raise Peatio::Blockchain::ClientError, e
-      end
+    def latest_block_number
+      client.json_rpc(:getblockcount)
+    rescue Goldcash::Client::Error => e
+      raise Peatio::Blockchain::ClientError, e
+    end
 
-      def latest_block_number
-        client.json_rpc(:getblockcount)
-      rescue Client::Error => e
-        raise Peatio::Blockchain::ClientError, e
-      end
+    def transaction_sources(transaction)
+      transaction_hash = client.json_rpc(:getrawtransaction, [transaction.hash, 1])
+      transaction_hash['vin'].each_with_object([]) do |vin, source_addresses|
+        next if vin['txid'].blank?
 
-      def load_balance_of_address!(address, _currency_id)
-        address_with_balance = client.json_rpc(:listaddressgroupings)
-                                     .flatten(1)
-                                     .find {|addr| addr[0] == address }
+        vin_transaction = client.json_rpc(:getrawtransaction, [vin['txid'], 1])
+        source = vin_transaction['vout'].find { |hash| hash['n'] == vin['vout'] }
+        source_addresses << source['scriptPubKey']['addresses'][0]
+      end.compact.uniq
+    end
 
-        raise Peatio::Blockchain::UnavailableAddressBalanceError, address if address_with_balance.blank?
+    def load_balance_of_address!(address, _currency_id)
+      address_with_balance = client.json_rpc(:listaddressgroupings)
+                                   .flatten(1)
+                                   .find { |addr| addr[0] == address }
 
-        address_with_balance[1].to_d
-      rescue Client::Error => e
-        raise Peatio::Blockchain::ClientError, e
+      if address_with_balance.blank?
+        raise Peatio::Blockchain::UnavailableAddressBalanceError, address
       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
+      address_with_balance[1].to_d
+    rescue Goldcash::Client::Error => e
+      raise Peatio::Blockchain::ClientError, e
+    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"}
+    private
 
-          # 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
+    def build_transaction(tx_hash)
+      tx_hash.fetch('vout')
+        .select do |entry|
+          entry.fetch('value').to_d > 0 &&
+          entry['scriptPubKey'].has_key?('addresses')
         end
-      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 client
+      @client ||= Goldcash::Client.new(settings_fetch(:server))
+    end
 
-      def settings_fetch(key)
-        @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
-      end
+    def settings_fetch(key)
+      @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
     end
   end
-end
+end

data/lib/peatio/goldcash/client.rb

@@ -5,60 +5,52 @@ require "faraday"
 require "better-faraday"
 
 module Peatio
-  module Goldcash
-    class Client
-      Error = Class.new(StandardError)
-      ConnectionError = Class.new(Error)
+ module Goldcash
+  class Client
+    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
-
-      def initialize(endpoint)
-        @json_rpc_endpoint = URI.parse(endpoint)
-      end
-
-      def json_rpc(method, params=[])
-        response = post(method, params)
-
-        response.assert_2xx!
-        response = JSON.parse(response.body)
-
-        response["error"].tap do |e|
-          raise ResponseError.new(e["code"], e["message"]) if e
-        end
+    extend Memoist
 
-        response.fetch("result")
-      rescue Faraday::Error => e
-        raise ConnectionError, e
-      end
+    def initialize(endpoint, idle_timeout: 5)
+      @json_rpc_endpoint = URI.parse(endpoint)
+      @path = @json_rpc_endpoint.path.empty? ? "/" : @json_rpc_endpoint.path
+      @idle_timeout = idle_timeout
+    end
 
-      private
+    def json_rpc(method, params = [])
+      response = connection.post \
+        @path,
+        {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 post(method, params)
-        connection.post("/", {jsonrpc: "1.0", method: method, params: params}.to_json,
-                        "Accept" => "application/json", "Content-Type" => "application/json")
-      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/goldcash/hooks.rb

@@ -28,13 +28,13 @@ module Peatio
         end
 
         def register
-          Peatio::Blockchain.registry[:goldcashcash] = Goldcash::Blockchain
-          Peatio::Wallet.registry[:goldcashcashd] = Goldcash::Wallet
+          Peatio::Blockchain.registry[:goldcash] = Goldcash::Blockchain
+          Peatio::Wallet.registry[:goldcashd] = Goldcash::Wallet
         end
       end
 
       if defined?(Rails::Railtie)
-        require "peatio/goldcashcash/railtie"
+        require "peatio/goldcash/railtie"
       else
         check_compatibility
         register

data/lib/peatio/goldcash/version.rb

@@ -2,6 +2,6 @@
 
 module Peatio
   module Goldcash
-    VERSION = "2.6.7".freeze
+    VERSION = "2.6.8".freeze
   end
 end

data/lib/peatio/goldcash/wallet.rb

@@ -1,63 +1,61 @@
 # frozen_string_literal: true
 
 module Peatio
-  module Goldcash
-    class Wallet < Peatio::Wallet::Abstract
-      DEFAULT_FEATURES = { skip_deposit_collection: false }.freeze
-
-      def initialize(custom_features = {})
-        @features = DEFAULT_FEATURES.merge(custom_features).slice(*SUPPORTED_FEATURES)
-        @settings = {}
-      end
-
-      def configure(settings={})
-        # Clean client state during configure.
-        @client = nil
-
-        @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
-
-        @wallet = @settings.fetch(:wallet) {
-          raise Peatio::Wallet::MissingSettingError, :wallet
-        }.slice(:uri, :address)
-
-        @currency = @settings.fetch(:currency) {
-          raise Peatio::Wallet::MissingSettingError, :currency
-        }.slice(:id, :base_factor, :options)
-      end
-
-      def create_address!(_options={})
-        {address: client.json_rpc(:getnewaddress)}
-      rescue Goldcash::Client::Error => e
-        raise Peatio::Wallet::ClientError, e
-      end
-
-      def create_transaction!(transaction, options={})
-        txid = client.json_rpc(:sendtoaddress,
-                               [
-                                 transaction.to_address,
-                                 transaction.amount,
-                                 "",
-                                 "",
-                                 options[:subtract_fee].to_s == "true" # subtract fee from transaction amount.
-                               ])
-        transaction.hash = txid
-        transaction
-      rescue Goldcash::Client::Error => e
-        raise Peatio::Wallet::ClientError, e
-      end
-
-      def load_balance!
-        client.json_rpc(:getbalance).to_d
-      rescue Goldcash::Client::Error => e
-        raise Peatio::Wallet::ClientError, e
-      end
-
-      private
-
-      def client
-        uri = @wallet.fetch(:uri) { raise Peatio::Wallet::MissingSettingError, :uri }
-        @client ||= Client.new(uri)
-      end
+ module Goldcash
+  class Wallet < Peatio::Wallet::Abstract
+
+    def initialize(settings = {})
+      @settings = settings
+    end
+
+    def configure(settings = {})
+      # Clean client state during configure.
+      @client = nil
+
+      @settings.merge!(settings.slice(*SUPPORTED_SETTINGS))
+
+      @wallet = @settings.fetch(:wallet) do
+        raise Peatio::Wallet::MissingSettingError, :wallet
+      end.slice(:uri, :address)
+
+      @currency = @settings.fetch(:currency) do
+        raise Peatio::Wallet::MissingSettingError, :currency
+      end.slice(:id, :base_factor, :options)
+    end
+
+    def create_address!(_options = {})
+      { address: client.json_rpc(:getnewaddress) }
+    rescue Goldcash::Client::Error => e
+      raise Peatio::Wallet::ClientError, e
+    end
+
+    def create_transaction!(transaction, options = {})
+      txid = client.json_rpc(:sendtoaddress,
+                             [
+                               transaction.to_address,
+                               transaction.amount,
+                               '',
+                               '',
+                               options[:subtract_fee].to_s == 'true' # subtract fee from transaction amount.
+                             ])
+      transaction.hash = txid
+      transaction
+    rescue Goldcash::Client::Error => e
+      raise Peatio::Wallet::ClientError, e
+    end
+
+    def load_balance!
+      client.json_rpc(:getbalance).to_d
+
+    rescue Goldcash::Client::Error => e
+      raise Peatio::Wallet::ClientError, e
+    end
+
+    private
+
+    def client
+      uri = @wallet.fetch(:uri) { raise Peatio::Wallet::MissingSettingError, :uri }
+      @client ||= Client.new(uri, idle_timeout: 1)
     end
   end
 end

data/peatio-goldcash.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Peatio Blockchain Plugin"
   spec.description   = "Peatio Blockchain Plugin for Rubykube"
-  spec.homepage      = "https://www.alcox.biz"
+  spec.homepage      = "https://github.com/alcoxbiz/"
   spec.license       = "Proprietary"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
     spec.metadata["homepage_uri"] = spec.homepage
     spec.metadata["source_code_uri"] = "https://github.com/alcoxbiz/peatio-goldcash"
-    spec.metadata["changelog_uri"] = "https://github.com/alcoxbiz/peatio-goldcash/blob/master/CHANGELOG.md"
+    spec.metadata["changelog_uri"] = "https://github.com/alcoxbiz/peatio-goldcash/commits/master"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-goldcash
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.8
 platform: ruby
 authors:
 - D.H.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -246,13 +246,13 @@ files:
 - lib/peatio/goldcash/version.rb
 - lib/peatio/goldcash/wallet.rb
 - peatio-goldcash.gemspec
-homepage: https://www.alcox.biz
+homepage: https://github.com/alcoxbiz/
 licenses:
 - Proprietary
 metadata:
-  homepage_uri: https://www.alcox.biz
+  homepage_uri: https://github.com/alcoxbiz/
   source_code_uri: https://github.com/alcoxbiz/peatio-goldcash
-  changelog_uri: https://github.com/alcoxbiz/peatio-goldcash/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/alcoxbiz/peatio-goldcash/commits/master
 post_install_message: 
 rdoc_options: []
 require_paths: