istox 0.1.42.10 → 0.1.42.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac6453b9d4446cac628e88f0e1213d2945a4725476e5645d73a09d168621b54
-  data.tar.gz: 07f62d9280d4af2cd1013b8bced82498ccfbf984e8f391516bfc074565c9700b
+  metadata.gz: 8aeea6491522e99bfd517e218c63cb60069354655b53441f9ee80949c651e73b
+  data.tar.gz: 563e2c0ee9b971e97ab59cec044d05f02e536c15754aae300cf725ca297301ae
 SHA512:
-  metadata.gz: 8e4a873328f0c7219e8523035d77984d8bce19781bc8f214edca058fc69916939c6705c5e8281f16b959cfd4d72881235c7c318c72d698456d48d7ea71798799
-  data.tar.gz: b75ec67c73a52a8733cb3f36cf51e23394f27c6fdccea4c4b3abb7d0079f6372a94470c9342ff47f194a85035cfc9428b4ee7892ffbfd13dd669d53ba70df383
+  metadata.gz: '048c3c0f5ad9be34d796402282460b13916cb5ba6e66527fe107eb0cc6d3f8452c3c826341de35b291353fd01df0044e041d085a44fe52f2f0c904e9b6ac8a16'
+  data.tar.gz: 68abbbf6661bbc2e63aa3e398bb597d05955fc3cfa9edaeaf9e6fa9d93da191ff41ecdff973878236a4d6f87a33678a09fe84846ee1cdaa0c92b214c8203e2e1

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    istox (0.1.42.8)
+    istox (0.1.42.10)
       bunny (>= 2.12.0)
-      graphql-client
+      graphlient
       gruf
       paranoia (~> 2.2)
 
@@ -71,16 +71,24 @@ GEM
       railties (>= 3.0.0)
     faker (1.7.3)
       i18n (~> 0.5)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.7.0-universal-darwin)
+    google-protobuf (3.7.0)
     googleapis-common-protos-types (1.0.3)
       google-protobuf (~> 3.0)
+    graphlient (0.3.5)
+      faraday
+      faraday_middleware
+      graphql-client
     graphql (1.9.3)
     graphql-client (0.14.0)
       activesupport (>= 3.0, < 6.0)
       graphql (~> 1.6)
-    grpc (1.19.0-universal-darwin)
+    grpc (1.19.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
     grpc-tools (1.19.0)
@@ -104,6 +112,7 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
+    multipart-post (2.0.0)
     nio4r (2.3.1)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)

data/istox.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bunny", ">= 2.12.0"
   spec.add_dependency "gruf"
   spec.add_dependency "paranoia", "~> 2.2"
-  spec.add_dependency "graphql-client"
+  spec.add_dependency "graphlient"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/istox/helpers/graphql_client.rb

@@ -1,6 +1,3 @@
-require "graphql/client"
-require "graphql/client/http"
-
 module Istox
   class GraphqlClient
       class << self
@@ -16,27 +13,22 @@ module Istox
 
             raise "Please make sure you have initialised graphql cient for host #{host_type}" if !client
 
-            result = client.query(query, variables: variables)
+            result = client.query(query, variables)
           end
 
-          def parse(host_type, query) 
-            client = @@hosts[host_type]
+          # def parse(host_type, query) 
+          #   client = @@hosts[host_type]
 
-            raise "Please make sure you have initialised graphql cient for host #{host_type}" if !client
+          #   raise "Please make sure you have initialised graphql cient for host #{host_type}" if !client
 
-            return client.parse(query)
-          end
+          #   return client.parse(query)
+          # end
       
           private
           
           def init_host(host_type, url)
-            http = GraphQL::Client::HTTP.new(url) do
-              def headers(context)
-                { "User-Agent": "My Client" }
-              end
-            end  
+            client = Graphlient::Client.new(url)
         
-            client = GraphQL::Client.new(schema: GraphQL::Client.load_schema(http), execute: http)
             @@hosts[host_type] = client
           end
 

data/lib/istox/models/concerns/blockchain_receipt_query.rb

@@ -1,6 +1,18 @@
 module Istox
   module BlockchainReceiptQuery
     extend ActiveSupport::Concern
+    
+    # BLOCK_TRANSACTIONS_QUERY = Istox::GraphqlClient.parse("chainhub", 
+    #   <<-'GRAPHQL'
+    #     query($ids: [String!]) {
+    #       blockTransactions(hashes: $ids) {
+    #         txid
+    #         state
+    #       }
+    #     }
+    #   GRAPHQL
+    # )
+    BLOCK_TRANSACTIONS_QUERY = 123
 
     #overrideable, when blockchain transaction has confirmed
     def handle_confirm(resource_action)
@@ -41,22 +53,19 @@ module Istox
     end
 
     def blocks_failed?
-      @blocks.any? { |obj| obj[:status] == 'failed' }
+      @blocks.any? { |obj| obj.status == 'failed' }
     end
 
     def blocks_pending?
-      @blocks.empty? || @blocks.any? { |obj| obj[:status] == 'pending' }
+      @blocks.empty? || @blocks.any? { |obj| obj.status == 'pending' }
     end
 
     def blocks_confirmed?
-      !@blocks.any? { |obj| obj[:status] == 'pending' } && !@blocks.any? { |obj| obj[:status] == 'failed' }
+      !@blocks.any? { |obj| obj.status == 'pending' } && !@blocks.any? { |obj| obj.status == 'failed' }
     end
 
     def get_block_transactions(txids)
-      [{
-        status: 'confirmed'
-      }]
-      #to do graphql call to get results
+      Istox::GraphqlClient.query("chainhub", BLOCK_TRANSACTIONS_QUERY, { ids: txids }).data.block_transactions
     end 
 
   end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = "0.1.42.10"
+  VERSION = "0.1.42.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.42.10
+  version: 0.1.42.11
 platform: ruby
 authors:
 - Siong Leng
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: graphql-client
+  name: graphlient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="