katapaty 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2813864309ea96d12836dd9a55b76acae33eb617521248dbb64dd2f455d8ae08
-  data.tar.gz: be52ba9fecf1233d9ad92bab7c9458c42c79a8c6e46c9d422d60809798ba8b30
+  metadata.gz: 7c57f564a612b8926401f895aa95f2849ad36387ea9ce14edf0a74e51aaa3a9e
+  data.tar.gz: 0a45df7a610a4c686a11316aaf6055bd1694d2e9767844c806be86006d131556
 SHA512:
-  metadata.gz: 92da70e987828ae1fd33b03ce47b78806b5d834ccdc33cff6e8e0fd5028c85c62b6ffb1356105417270d3325533e087ae2afaf9f0be9b2712592c6839e97f391
-  data.tar.gz: 8453718af43b96fe80af5716c6becc45f210484ecaf17ef9911478a78e04e2d01ba3e4f71848f123c5d2d35d6e8edf65be4dd4e0257d968e32a52b67c9aca33a
+  metadata.gz: 64eca40df5cab8167fdb240acdb8d9cd168a42ed7638943940348fc82993b94e85e4fd7e39893d53b9161a93018470d6e6cc4cf4078b5d763a24f9ba56663bc6
+  data.tar.gz: 57e2cc8b1880c0c3d1d60b5dbe40f9ca195b443913d0d22806ccba2f4f46c3acd2443d62e8388f13f2dae531055cb52483efa67238c4379d6802cbb610d874dd

data/README.md

@@ -47,6 +47,8 @@ Katapaty::Party.create_send(
   asset: "LONGDD",
   quantity: 50000
 )
+
+Katapaty::Block.proxy_to_cp(method: :get_running_info)
 ```
 
 Check methods here: https://counterparty.io/docs/api/#read-api-function-reference

data/lib/katapaty/block.rb

@@ -7,7 +7,7 @@ module Katapaty
     class << self
 
       def request(method_name, params={})
-        client = RestClient::Resource.new Katapaty.configuration.counterblock_url
+        client = RestClient::Resource.new(Katapaty.configuration.counterblock_url, timeout: Katapaty.configuration.timeout)
         request = { method: method_name, params: params, jsonrpc: '2.0', id: '0' }.to_json
         response = JSON.parse client.post(
           request,
@@ -25,7 +25,7 @@ module Katapaty
       end
 
       def proxy_to_cp(method:, params: {})
-        client = RestClient::Resource.new Katapaty.configuration.counterblock_url
+        client = RestClient::Resource.new(Katapaty.configuration.counterblock_url, timeout: Katapaty.configuration.timeout)
         request = { method: :proxy_to_counterpartyd, params: { method: method, params: params }, jsonrpc: '2.0', id: '0' }.to_json
         response = JSON.parse client.post(
           request,

data/lib/katapaty/configuration.rb

@@ -8,20 +8,27 @@ module Katapaty
       :block_password,
       :block_host,
       :block_port,
-      :ssl
+      :ssl,
+      :timeout
+
+    DEFAULT_TIMEOUT_IN_SECONDS = 120
 
     def counterparty_url
       return 'http://rpc:1234@public.coindaddy.io:14000/api/' unless @host
-      "#{protocol}://#{@username}:#{@password}@#{@host}:#{@port}/api/"
+      "#{protocol}://#{@username}:#{CGI.escape(@password)}@#{@host}:#{@port}/api/"
     end
 
     def counterblock_url
       return 'http://rpc:1234@public.coindaddy.io:14100/api/' unless @block_host
       authen = ''
-      authen = "#{@block_username}:#{@block_password}@" if @block_username
+      authen = "#{@block_username}:#{CGI.escape(@block_password)}@" if @block_username
       "#{protocol}://#{authen}#{@block_host}:#{@block_port}/api/"
     end
 
+    def timeout
+      @timeout || DEFAULT_TIMEOUT_IN_SECONDS
+    end
+
     private
 
     def protocol

data/lib/katapaty/party.rb

@@ -9,11 +9,20 @@ module Katapaty
         request('get_running_info')
       end
 
-      def address_token_balance(address, token_name)
-        rs = request('get_balances', {"filters": [{ "field": 'address', "op": '==', "value": address },
-                                             { "field": 'asset', "op": '==', "value": token_name }]})
-        return 0 if rs.blank?
-        rs.first['quantity'].to_i
+      def address_token_balance(address:, token:, proxy: false)
+        filters_params = {
+          "filters": [
+            { "field": 'address', "op": '==', "value": address },
+            { "field": 'asset', "op": '==', "value": token }
+          ]
+        }
+        if proxy
+          response = Katapaty::Block.proxy_to_cp(method: :get_balances, params: filters_params)
+        else
+          response = request('get_balances', filters_params)
+        end
+        return 0 if response.blank?
+        response.first['quantity'].to_i
       end
 
       def get_asset_info(assets)
@@ -45,11 +54,11 @@ module Katapaty
       end
 
       def request(method_name, payload={})
-        client = RestClient::Resource.new Katapaty.configuration.counterparty_url
+        client = RestClient::Resource.new(Katapaty.configuration.counterparty_url, timeout: Katapaty.configuration.timeout)
         request = { method: method_name.to_s, params: payload, jsonrpc: '2.0', id: '0' }.to_json
         response = JSON.parse client.post(request,
-                      accept: 'json',
-                      content_type: 'json' )
+                                          accept: 'json',
+                                          content_type: 'json' )
         raise Katapaty::JsonResponseError.new response if response.has_key? 'code'
         raise Katapaty::ResponseError.new response['error'] if response.has_key? 'error'
         response['result']

data/lib/katapaty/version.rb

@@ -1,3 +1,3 @@
 module Katapaty
-  VERSION = "1.0.3"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katapaty
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors:
 - longhoang.wkm
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - longhoang@wakumo.vn
 executables: []
@@ -178,7 +178,7 @@ homepage: https://github.com/longhoangwkm/katapaty
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A ruby gem for communicating with a Counterparty (Bitcoin / XCP) API server
 test_files: []