katapaty 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1f67e4fc0286be7da99524e14b516103b233b88671b1e54a3f339fe7a7fee9e
-  data.tar.gz: dfbb06845fcb3e88d7de9589cbe9ffc9d66c1da47081a9008c1fefc4e77826d4
+  metadata.gz: c343bb08ed79a5ec9358724bdfb29d8c6050467179f36479cb0c5b94429d92d9
+  data.tar.gz: 2a7048fdd064e699d904b89a2e793c3181d068d8f75d185f8fec5ce2a26908bc
 SHA512:
-  metadata.gz: 7888cbbab491758e55df7ce155660d23102fb53140687a72bee16c4749627bdc36f902112cfb9d553e67779611816b51a0574303679c2c8c8f4930ddafe691eb
-  data.tar.gz: 3fbf54e6bf1ccd946fd7bb742ea64c28e10846e7ed596f0d9531b65b6cd0b0a6dbd04e046b6d02b94bacd97475d2ebd38d3d3c93fd1e03fdd8abb9189294abba
+  metadata.gz: 4659f173babc0f1a74ae257c99ee27dac48af777fd9c23e95eaba3f5472a7dab8fd98282d793253ecc4c28f8f144f3b53d5614169ae3cd03ea0f0e9b6e2d1d7a
+  data.tar.gz: 901c1caf9c4906f0610f91d241f535d4dc50544ac6575190e04604db05cc591a0aeda78f9e730856ddf0015b5935630905e82b750b26ddc7338b34db7635f22c

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

@@ -1,24 +1,40 @@
 #
 # Counterblock APIs
 #
+#
 module Katapaty
   class Block
     class << self
 
-      def request(method_name, payload={})
-        client = RestClient::Resource.new Katapaty.configuration.counterblock_url
-        request = { method: method_name, params: payload, jsonrpc: '2.0', id: '0' }.to_json
-        response = JSON.parse client.post(request,
-                      accept: 'json',
-                      content_type: 'json' )
+      def request(method_name, params={})
+        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,
+          accept: 'json',
+          content_type: 'json'
+        )
         raise JsonResponseError.new response if response.has_key? 'code'
         raise ResponseError.new response['error'] if response.has_key? 'error'
         response['result']
       end
 
       def method_missing(name, *args)
-        args = args.nil? ? {} : args.first
-        request(name, args)
+        params = args.nil? ? {} : args.first
+        request(name, params)
+      end
+
+      def proxy_to_cp(method:, params: {})
+        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,
+          accept: 'json',
+          content_type: 'json'
+        )
+        raise JsonResponseError.new response if response.has_key? 'code'
+        raise ResponseError.new response['error'] if response.has_key? 'error'
+        response['result']
       end
     end
   end

data/lib/katapaty/configuration.rb

@@ -8,16 +8,25 @@ module Katapaty
       :block_password,
       :block_host,
       :block_port,
-      :ssl
+      :ssl,
+      :timeout
+
+    DEFAULT_TIMEOUT_IN_SECONDS = 60
 
     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
-      "#{protocol}://#{@block_username}:#{@block_password}@#{@block_host}:#{@block_port}/api/"
+      authen = ''
+      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

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.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katapaty
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - longhoang.wkm
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-23 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: []