istox 0.1.80 → 0.1.81.pre.test1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f353767534ea557387933b8cc9451413f78737cef852474123b288530a04707c
-  data.tar.gz: be7b7ac8a4d46659bdbcfc9b2437fa4b4d9d981fbb06d72c154ec67479094b53
+  metadata.gz: c341f88fcae9e17d3559a0fd80af645c4d313269f20f1a642c546f8250f46285
+  data.tar.gz: 06a26fa2af6d2739c486abc7022c1fba8f330d420e390982f5b6313cd972e245
 SHA512:
-  metadata.gz: f120c7f2ad80487a744c1da0c0e2d80a6fdf3f57ef3d67560f777d256e9301857073a73352ffa1d392fa2aa28beb7db7277f78965b15fa66123517e6ea00828f
-  data.tar.gz: 5882f068e496f72ce5ae8c35276e5c1510ebcd5f41aaa04e138c2bc1074ad1542138717fadedc6403dce05a4adfde07cd3b068fee73c9641456705f6e77ea6a7
+  metadata.gz: 40ce27f5355d4f69afb366f7fba54cf68526844f0ea73739ff86cd132527a18b682298b475a193fa5005e7488fa1e953015159883c09487cd1876f7b712c3de2
+  data.tar.gz: d5f9175a10aec8959b7c699cdba506ec4fb699a356b036b8aa6b3c55dd3cc7179715eb565d5775e8ea49a7e428b7daa126c391788572ca78784981c75f21ecb8

data/.rubocop.yml

@@ -0,0 +1,102 @@
+require: rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 2.5
+  Exclude:
+    - .gems/**/*
+    - bin/**/*
+    - config/**/*
+    - db/**/*
+    - log/**/*
+    - public/**/*
+    - tmp/**/*
+    - vendor/**/*
+    - spec/rails_helper.rb
+    - spec/spec_helper.rb
+    - config.ru
+    - Guardfile
+    - Rakefile
+
+Documentation:
+  Enabled: false
+
+Layout/SpaceBeforeFirstArg:
+  Exclude:
+    - app/views/api/**/**/*
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - spec/**/*
+
+Metrics/AbcSize:
+  # The ABC size is a calculated magnitude, so this number can be an Integer or
+  # a Float.
+  Max: 100
+
+Metrics/BlockLength:
+  CountComments: false  # count full line comments?
+  Max: 25
+  Exclude:
+    - config/**/*
+    - spec/**/*
+    - app/admin/**/*
+
+Metrics/BlockNesting:
+  Max: 4
+
+Metrics/ClassLength:
+  CountComments: false  # count full line comments?
+  Max: 200
+
+# Avoid complex methods.
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+Metrics/MethodLength:
+  CountComments: false  # count full line comments?
+  Max: 100
+
+Metrics/ModuleLength:
+  CountComments: false  # count full line comments?
+  Max: 200
+
+Metrics/LineLength:
+  Max: 130
+  # To make it possible to copy or click on URIs in the code, we allow lines
+  # containing a URI to be longer than Max.
+  AllowURI: true
+  URISchemes:
+    - http
+    - https
+
+Metrics/ParameterLists:
+  Max: 5
+  CountKeywordArgs: true
+
+Metrics/PerceivedComplexity:
+  Max: 12
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/ModuleFunction:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Max: 99
+
+RSpec/ExampleLength:
+  Max: 100
+
+Lint/BigDecimalNew:
+  Enabled: false
+
+
+RSpec/MessageSpies:
+  Enabled: false
+
+RSpec/AnyInstance:
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false

data/.solargraph.yml

@@ -0,0 +1,14 @@
+---
+include:
+- "**/*.rb"
+exclude:
+- spec/**/*
+- test/**/*
+- vendor/**/*
+- ".bundle/**/*"
+require: []
+domains: []
+reporters:
+- rubocop
+require_paths: []
+max_files: 5000

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.79)
+    istox (0.1.80)
       binding_of_caller
       bunny (>= 2.12.0)
       graphlient

data/lib/istox.rb

@@ -1,34 +1,35 @@
 require 'active_record'
 require 'paranoia'
-require "gruf"
-require "listen"
-require "istox/version"
+require 'gruf'
+require 'listen'
+require 'istox/version'
 
 module Istox
   # Your code goes here...
   class Test
     def self.method1
-      "abc"
+      'abc'
     end
   end
 
-  require "istox/interfaces/chainhub/transaction"
-  require "istox/helpers/publisher"
-  require "istox/helpers/bunny_boot"
-  require "istox/helpers/vault"
-  require "istox/helpers/order_book"
-  require "istox/helpers/grpc_client"
-  require "istox/helpers/graphql_client"
-  require "istox/helpers/gruf_listener_hook"
-  require "istox/helpers/message_service"
-  require "istox/helpers/blockchain_receipt_service"
-  require "istox/helpers/f_math"
-  require "istox/models/blockchain_receipt"
-  require "istox/models/concerns/blockchain_receipt_query"
-  require "istox/consumers/blockchain_status_handler"
-  require "istox/consumers/blockchain_hash_handler"
-  require "istox/migrations/create_blockchain_receipts"
-  require "istox/logging/hash_logging"
-  require "istox/logging/log_formatter"
+  require 'istox/interfaces/chainhub/transaction'
+  require 'istox/helpers/publisher'
+  require 'istox/helpers/bunny_boot'
+  require 'istox/helpers/vault'
+  require 'istox/helpers/order_book'
+  require 'istox/helpers/grpc_client'
+  require 'istox/helpers/graphql_client'
+  require 'istox/helpers/gruf_listener_hook'
+  require 'istox/helpers/message_service'
+  require 'istox/helpers/blockchain_service'
+  require 'istox/helpers/f_math'
+  require 'istox/helpers/my_open_struct'
+  require 'istox/helpers/common_helper'
+  require 'istox/models/blockchain_receipt'
+  require 'istox/models/concerns/blockchain_receipt_query'
+  require 'istox/consumers/blockchain_status_handler'
+  require 'istox/migrations/create_blockchain_receipts'
+  require 'istox/logging/hash_logging'
+  require 'istox/logging/log_formatter'
   require "istox/quant/bond"
 end

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -1,105 +1,49 @@
 module Istox
   class BlockchainStatusHandler
     class << self
-
-      def txn_data_confirmed(transactions)
-        found_txns = transactions.map do |transaction|
-          receipt = ::Istox::BlockchainReceipt.where(txid: transaction.uuid).first
-          if !receipt.blank?
-            handling_receipt = ::Istox::BlockchainReceipt.where(txhash: transaction.id, txid: transaction.uuid).first
-            raise 'Unable to find receipt' if handling_receipt.blank?
-            transaction
-          else
-            puts 'Transaction doesnt belong here, skipping...'
-            nil
-          end
-        end.compact
-
-        found_txns.each do |transaction|
-          receipt = ::Istox::BlockchainReceipt.where(txhash: transaction.id, txid: transaction.uuid).first
-
-          receipt.update!(status: "confirmed")
-
-          resource = begin
-            class_eval("::#{receipt.resource_name}").find(receipt.resource_id)
-          rescue => e
-            puts "Class not found, skipping..."
-            next
-          end
-
-          receipt_list = get_receipt_list(resource)
-
-          next if resource_handled?(receipt_list)
-
-          next if resource.outcome == 'pending'
-
-          if resource.outcome == 'confirmed'
-            resource.handle_confirm(receipt.resource_action)
-            
-            mark_resource_handled(receipt_list)
-            publish_to_frontend(resource, true, receipt, receipt.sid, receipt_list)
-          end
-
+      # format of transaction
+      # {
+      #   uuid: "XXXXXX"
+      #   status: "confirmed/failed"
+      # }
+
+      def txn_status_changed(transaction)
+        receipt = ::Istox::BlockchainReceipt.where(txid: transaction.uuid).first
+        if receipt.blank?
+          puts 'Transaction doesn\'t belong to this backend, skipping...'
+          return
         end
-      end
-
-      def txn_status_changed(transactions, payload_target)
-        # pre check all transaction does exists
-        found_txns = transactions.map do |transaction|
-          receipt = ::Istox::BlockchainReceipt.where(txid: transaction.uuid).first
-          if !receipt.blank?
-            handling_receipt = ::Istox::BlockchainReceipt.where(txhash: transaction.id, txid: transaction.uuid).first
-            raise 'Unable to find receipt' if handling_receipt.blank?
-            transaction
-          else
-            puts 'Transaction doesnt belong here, skipping...'
-            nil
-          end
-        end.compact
 
-        found_txns.each do |transaction|
-          receipt = ::Istox::BlockchainReceipt.where(txhash: transaction.id, txid: transaction.uuid).first
+        return unless %w[failed confirmed].include?(transaction.status)
 
-          next if !(%w[failed pending].include?(transaction.status))
-          receipt.update!(status: transaction.status)
-          
-          resource = begin
-            class_eval("::#{receipt.resource_name}").find(receipt.resource_id)
-          rescue => e
-            puts "Class not found, skipping..."
-            next
-          end
+        receipt.update!(status: transaction.status)
 
-          receipt_list = get_receipt_list(resource)
-
-          next if resource_handled?(receipt_list)
+        resource = begin
+          class_eval("::#{receipt.resource_name}", __FILE__, __LINE__).find(receipt.resource_id)
+                   rescue StandardError
+                     puts 'Class not found, skipping...'
+                     return
+        end
 
-          # if transaction.status == 'confirmed'
-          #   next if resource.outcome == 'pending'
+        return if resource_handled?(receipt)
 
-          #   if resource.outcome == 'confirmed'
-          #     resource.handle_confirm(receipt.resource_action)
-              
-          #     mark_resource_handled(receipt_list)
-          #     publish_to_frontend(resource, true, receipt, receipt.sid, receipt_list)
-          #   end
-          # end
+        if transaction.status == 'confirmed'
+          resource.handle_confirm(receipt.resource_action)
 
-          if transaction.status == 'failed'
-            resource.handle_fail(receipt.resource_action)
+          mark_resource_handled(receipt)
+          publish_to_frontend(resource, true, receipt, receipt.sid)
 
-            mark_resource_handled(receipt_list)
-            publish_to_frontend(resource, false, receipt, receipt.sid, receipt_list)
-          end
+        elsif transaction.status == 'failed'
+          resource.handle_fail(receipt.resource_action)
 
+          mark_resource_handled(receipt)
+          publish_to_frontend(resource, false, receipt, receipt.sid)
         end
       end
 
       private
 
-      def publish_to_frontend(model, success, receipt, sid, receipt_list)
-        yield if block_given?
-
+      def publish_to_frontend(model, success, receipt, sid)
         ::Istox::Publisher.publish(
           'amq.topic',
           model.class.name.gsub('::', '').underscore.to_s,
@@ -114,35 +58,26 @@ module Istox
           sid,
           data: {
             success: success,
-            purpose: receipt.activity,
-            txids: get_receipts_tx_hashes(receipt_list)
+            purpose: receipt.activity
           }
         )
+      rescue StandardError => e
+        Rails.logger.error "Unable to publish to frontend for receipt #{receipt.inspect},
+        but will silently ignore the error"
+        Rails.logger.error e
       end
 
-      def get_receipts_tx_hashes(receipt_list)
-        tx_hashes = receipt_list.map(&:txhash).compact
-
-        tx_hashes.join(', ')
+      def mark_resource_handled(receipt)
+        receipt.update(resource_handled: true)
+      rescue StandardError => e
+        Rails.logger.error "Unable to update resource_handled for receipt #{receipt.inspect},
+        but will silently ignore the error"
+        Rails.logger.error e
       end
 
-      def mark_resource_handled(receipt_list)
-        receipt_list.each do |receipt|
-          receipt.update(resource_handled: true)
-        end
+      def resource_handled?(receipt)
+        receipt.resource_handled == true
       end
-
-      def resource_handled?(receipt_list)
-        receipt_list.map(&:resource_handled).none? { |item| item.nil? || item == false }
-      end
-
-      def get_receipt_list(resource)
-        ::Istox::BlockchainReceipt.where(
-          resource_name: resource.class.name,
-          resource_id: resource.id
-        )
-      end
-
     end
   end
 end

data/lib/istox/helpers/blockchain_service.rb

@@ -0,0 +1,66 @@
+module Istox
+  class BlockchainService
+    def self.init(blockchain_receipt_klass)
+      @@blockchain_receipt_klass = blockchain_receipt_klass
+    end
+
+    def self.get_blockchain_receipt_klass
+      @@blockchain_receipt_klass
+    end
+
+    def self.request(sid:, action:, before:, execute:)
+      start(sid: sid, action: action, before: before, execute: execute, is_request: true)
+    end
+
+    def self.run(sid:, action:, before:, execute:)
+      start(sid: sid, action: action, before: before, execute: execute)
+    end
+    class << self
+      private
+
+      # before is the proc that will be executed before, must return the main model blockchain receipt will bind to
+      def start(sid:, action:, before:, execute:, is_request: false)
+        # create blockchain receipt first
+        klass = blockchain_receipt_class
+        uuid = :: SecureRandom.uuid
+        @receipt = klass.create!(
+          txid: uuid,
+          sid: sid,
+          is_request: is_request,
+          resource_action: action
+        )
+
+        ::ActiveRecord::Base.transaction do
+          # execute before proc, and get the model that blockchain receipt should bind to
+          model = before.call(uuid)
+
+          puts model
+
+          # delete the previous existing blockchain receipts
+          klass.where(resource_name: model.class.name, resource_id: model.id).destroy_all
+
+          # then update receipt
+          @receipt.update!(resource_id: model.id, resource_name: model.class.name)
+
+          # execute the actual call to chainhub
+          execute.call(uuid)
+        end
+      rescue StandardError => e
+        @receipt&.destroy
+        raise e
+      end
+
+      def blockchain_receipt_class
+        raise 'Have you forgetten to init blockchain receipt service?' if get_blockchain_receipt_klass.nil?
+
+        blockchain_receipt_klass = get_blockchain_receipt_klass
+        klass = class_eval("::#{blockchain_receipt_klass.name}", __FILE__, __LINE__)
+        unless klass <= ::Istox::BlockchainReceipt
+          raise "#{blockchain_receipt_klass.name} does not inherit istox blockchain receipt"
+        end
+
+        klass
+      end
+    end
+  end
+end

data/lib/istox/helpers/common_helper.rb

@@ -0,0 +1,69 @@
+module Istox
+  module CommonHelper
+    def self.to_open_struct(model)
+      return nil if model.blank?
+
+      if model.is_a?(Array)
+        model.map do |item|
+          hash = deep_to_h(item).deep_transform_keys { |key| key.to_s.underscore.to_sym }
+          process_hash(nil, hash)
+          to_recursive_ostruct(hash)
+        end
+      else
+        hash = deep_to_h(model).deep_transform_keys { |key| key.to_s.underscore.to_sym }
+        process_hash(nil, hash)
+        to_recursive_ostruct(hash)
+      end
+    end
+
+    def self.process_hash(_parent, my_hash)
+      my_hash.each do |key, value|
+        if value.is_a?(Hash)
+          process_hash(key, value)
+        elsif value.is_a?(Array)
+          my_hash[key] = value.map do |item|
+            process_hash(nil, item.to_h)
+          end
+        else
+          my_hash[key] = value
+        end
+      end
+    end
+
+    # def self.add_methods(ostruct)
+    #   hashmap = ostruct.to_h
+
+    #   hashmap&.each do |k, _v|
+    #     # add_method k.to_s do
+    #     ostruct.send(k.to_s)
+    #     # end
+    #   end
+    # end
+
+    def self.to_recursive_ostruct(hash)
+      ::Istox::MyOpenStruct.new(hash.each_with_object({}) do |(key, val), memo|
+        memo[key] = if val.is_a?(Hash)
+                      to_open_struct(val)
+                    elsif val.is_a?(Array)
+                      val.map do |item|
+                        to_open_struct(item)
+                      end
+                    else
+                      val
+                    end
+      end)
+    end
+
+    def add_method(name, &block)
+      (class << self; self; end).class_eval do
+        define_method name, &block
+      end
+    end
+
+    def self.deep_to_h(obj)
+      obj.to_h.transform_values do |v|
+        v.is_a?(OpenStruct) ? deep_to_h(v) : v
+      end
+    end
+  end
+end

data/lib/istox/helpers/f_math.rb

@@ -1,7 +1,7 @@
+# rubocop:disable Naming/UncommunicativeMethodParamName
 module Istox
   class FMath
     class << self
-
       def add(x, y)
         BigDecimal.mode(BigDecimal::ROUND_MODE, :down)
 
@@ -11,7 +11,7 @@ module Istox
         x = ::BigDecimal.new(x.to_s)
         y = ::BigDecimal.new(y.to_s)
 
-        return x.add(y, 100).truncate(18).to_s
+        x.add(y, 100).truncate(18).to_s
       end
 
       def sub(x, y)
@@ -23,7 +23,7 @@ module Istox
         x = ::BigDecimal.new(x.to_s)
         y = ::BigDecimal.new(y.to_s)
 
-        return x.sub(y, 100).truncate(18).to_s
+        x.sub(y, 100).truncate(18).to_s
       end
 
       def mul(x, y)
@@ -35,7 +35,7 @@ module Istox
         x = ::BigDecimal.new(x.to_s)
         y = ::BigDecimal.new(y.to_s)
 
-        return x.mult(y, 100).truncate(18).to_s
+        x.mult(y, 100).truncate(18).to_s
       end
 
       def div(x, y)
@@ -47,19 +47,17 @@ module Istox
         x = to_fixed(x)
         y = to_fixed(y)
 
-        return ::BigDecimal.new("1").to_s if x == y
+        return ::BigDecimal.new('1').to_s if x == y
+
+        fixed1 = ::BigDecimal.new('1e18')
 
-        fixed_1 = ::BigDecimal.new("1e18")
-        
-        if (((x.div(y, 100)).modulo(BigDecimal.new(10)) == 0) && (x.modulo(y) == 0)) 
-          return from_fixed((x.div(y, 100).mult(fixed_1, 100)))
-        end
+        return from_fixed(x.div(y, 100).mult(fixed1, 100)).to_s if x.div(y, 100).modulo(BigDecimal.new(10)).zero? && x.modulo(y).zero?
 
-        r_y = fixed_1.mult(fixed_1, 100).truncate(0).div(y, 100).truncate(0)
+        r_y = fixed1.mult(fixed1, 100).truncate(0).div(y, 100).truncate(0)
 
-        result = from_fixed(x.mult(r_y, 100).truncate(0).div(fixed_1, 100).truncate(0))
+        result = from_fixed(x.mult(r_y, 100).truncate(0).div(fixed1, 100).truncate(0))
 
-        return result.truncate(18).to_s
+        result.truncate(18).to_s
       end
 
       def round_up(x, digits)
@@ -67,24 +65,23 @@ module Istox
         x = 0 if x.blank?
         ::BigDecimal.new(x.to_s).round(digits).to_s
       end
-      
+
       def round_down(x, digits)
         BigDecimal.mode(BigDecimal::ROUND_MODE, :down)
         x = 0 if x.blank?
         ::BigDecimal.new(x.to_s).round(digits).to_s
       end
 
-      private 
+      private
 
       def to_fixed(x)
-        return ::BigDecimal.new(x.to_s).mult(::BigDecimal.new('1e18'), 100).truncate(18)
+        ::BigDecimal.new(x.to_s).mult(::BigDecimal.new('1e18'), 100).truncate(18)
       end
 
       def from_fixed(x)
-        return ::BigDecimal.new(x.to_s).div(::BigDecimal.new('1e18'), 100).truncate(18)
+        ::BigDecimal.new(x.to_s).div(::BigDecimal.new('1e18'), 100).truncate(18)
       end
-
-
     end
   end
 end
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/istox/helpers/graphql_client.rb

@@ -1,35 +1,35 @@
-require "graphlient"
+require 'graphlient'
 
 module Istox
   class GraphqlClient
-      class << self
-          def add_host(host_type, url)
-              unless defined?(@@hosts)
-                 @@hosts = {}
-              end
-              init_host(host_type, url)
-          end
-
-          def query(host_type, query, variables = {})
-            client = @@hosts[host_type]
-
-            raise "Please make sure you have initialised graphql cient for host #{host_type}" if !client
-
-            Rails.logger.info "Querying Graphql host: #{host_type}, query: #{query}, variables: #{variables.inspect}"
-            result = client.query(query, variables)
-            Rails.logger.info "Graphql result: #{result.inspect}"
-
-            return result
-          end
-
-          private
-          
-          def init_host(host_type, url)
-            client = Graphlient::Client.new(url, http: Graphlient::Adapters::HTTP::HTTPAdapter)
-        
-            @@hosts[host_type] = client
-          end
+    class << self
+      def add_host(host_type, url)
+        @@hosts = {} unless defined?(@@hosts)
+        init_host(host_type, url)
+      end
+
+      def query(host_type, query, variables = {})
+        client = @@hosts[host_type]
+
+        raise "Please make sure you have initialised graphql cient for host #{host_type}" unless client
+
+        Rails.logger.info "Querying Graphql host: #{host_type}, query: #{query}, variables: #{variables.inspect}"
+        result = client.query(query, variables)
+
+        return_values = ::Istox::CommonHelper.to_open_struct(result&.data)
+
+        Rails.logger.info "Graphql result: #{return_values.inspect}"
+
+        return_values
+      end
+
+      private
+
+      def init_host(host_type, url)
+        client = Graphlient::Client.new(url, http: Graphlient::Adapters::HTTP::HTTPAdapter)
 
+        @@hosts[host_type] = client
       end
+    end
   end
-end
+end

data/lib/istox/helpers/grpc_client.rb

@@ -1,66 +1,63 @@
 module Istox
-    class GrpcClient
-        class << self
-            def add_host(host_type, url)
-                unless defined?(@@hosts)
-                   @@hosts = {}
-                end
+  class GrpcClient
+    class << self
+      def add_host(host_type, url)
+        @@hosts = {} unless defined?(@@hosts)
 
-                @@hosts[host_type] = url
-            end
+        @@hosts[host_type] = url
+      end
 
-            def call(host_type, service, method, **keyword_args)
-                execute(host_type, service, method, **keyword_args)
-            # rescue => e
-                # reinitiate service and try again, second chance
-                # reinitiate_service(host_type, service)
-                # execute(host_type, service, method, **keyword_args)
-            end
-        
-            private
+      def call(host_type, service, method, **keyword_args)
+        execute(host_type, service, method, **keyword_args)
+        # rescue => e
+        # reinitiate service and try again, second chance
+        # reinitiate_service(host_type, service)
+        # execute(host_type, service, method, **keyword_args)
+      end
 
-            def execute(host_type, service, method, **keyword_args)
-                Rails.logger.info "Calling method in grpc method: #{method.inspect}, params: #{keyword_args.inspect}"
-                t1 = Time.now
-                
-                result = get_host(host_type, service).call(method, keyword_args)
-                Rails.logger.info "Time taken for grpc execution: #{Time.now - t1} seconds"
-                Rails.logger.info "Result: #{result.message.inspect}"
-                result
-            end
+      private
 
-            def get_host(host_type, service)
-                unless defined?(@@services)
-                   @@services = {}
-                end
+      def execute(host_type, service, method, **keyword_args)
+        Rails.logger.info "Calling method in grpc method: #{method.inspect}, params: #{keyword_args.inspect}"
+        t1 = Time.now
 
-                grpc_client = @@services[get_key(host_type, service)]
+        result = get_host(host_type, service).call(method, keyword_args)
+        Rails.logger.info "Time taken for grpc execution: #{Time.now - t1} seconds"
 
-                if grpc_client
-                    return grpc_client
-                else
-                    reinitiate_service(host_type, service)
-                    return @@services[get_key(host_type, service)]
-                end
-            end
+        return_values = ::Istox::CommonHelper.to_open_struct(result.message)
+        Rails.logger.info "Result: #{return_values}"
 
-            def reinitiate_service(host_type, service)
-                unless defined?(@@services)
-                   @@services = {}
-                end
+        return_values
+      end
 
-                host_url = @@hosts[host_type]
-                raise StandardError, 'Unable to find host, have you forgotten to add host to grpc client?' if !host_url
-                
-                Rails.logger.info 'Reinitiating to grpc host at ' + host_url
-                t1 = Time.now
-                @@services[get_key(host_type, service)] = ::Gruf::Client.new(service: service, options: { hostname: host_url })
-                Rails.logger.info "Time taken for reinitiating grpc host: #{Time.now - t1} seconds"
-            end
+      def get_host(host_type, service)
+        @@services = {} unless defined?(@@services)
 
-            def get_key(host_type, service)
-                host_type.to_s + service.to_s
-            end
+        grpc_client = @@services[get_key(host_type, service)]
+
+        if grpc_client
+          return grpc_client
+        else
+          reinitiate_service(host_type, service)
+          return @@services[get_key(host_type, service)]
         end
+      end
+
+      def reinitiate_service(host_type, service)
+        @@services = {} unless defined?(@@services)
+
+        host_url = @@hosts[host_type]
+        raise StandardError, 'Unable to find host, have you forgotten to add host to grpc client?' unless host_url
+
+        Rails.logger.info 'Reinitiating to grpc host at ' + host_url
+        t1 = Time.now
+        @@services[get_key(host_type, service)] = ::Gruf::Client.new(service: service, options: { hostname: host_url })
+        Rails.logger.info "Time taken for reinitiating grpc host: #{Time.now - t1} seconds"
+      end
+
+      def get_key(host_type, service)
+        host_type.to_s + service.to_s
+      end
     end
-end
+  end
+end

data/lib/istox/helpers/my_open_struct.rb

@@ -0,0 +1,7 @@
+module Istox
+  class MyOpenStruct < OpenStruct
+    def to_json(*_args)
+      to_h.to_json
+    end
+  end
+end

data/lib/istox/logging/hash_logging.rb

@@ -13,9 +13,8 @@ module Istox
         include ActiveSupport::TaggedLogging::Formatter
 
         def call(severity, timestamp, progname, msg)
-          tagged_message = case
-                           when msg.is_a?(Hash) then tags_text.present? ? msg.merge(tags: tags_text) : msg
-                           when tags_text.present? then { message: msg, tag: tags_text }
+          tagged_message = if msg.is_a?(Hash) then tags_text.present? ? msg.merge(tags: tags_text) : msg
+                           elsif tags_text.present? then { message: msg, tag: tags_text }
                            else msg
                            end
 

data/lib/istox/logging/log_formatter.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 module Istox
   module Logging
     class LogFormatter
-      def call(severity, time, progname, msg='')
+      def call(severity, _time, progname, msg = '')
         return '' if msg.blank?
 
         hash = {
@@ -10,11 +11,9 @@ module Istox
           message: processed_message(msg)
         }
 
-        if progname.present?
-          hash[:app] = progname
-        end
+        hash[:app] = progname if progname.present?
 
-        return hash.to_json + "\n"
+        hash.to_json + "\n"
 
         # return "timestamp='#{time}' level=#{severity} progname='#{progname}' #{processed_message(msg)}\n" if progname.present?
         # "timestamp='#{time}' level=#{severity} #{processed_message(msg)}\n"

data/lib/istox/migrations/create_blockchain_receipts.rb

@@ -1,27 +1,25 @@
 module Istox
-    class CreateBlockchainReceipts < ActiveRecord::Migration[5.0]
-        def initialize(_, _, table_name = nil)
-            @table_name = table_name
-            unless @table_name
-                @table_name = :blockchain_receipts
-            end
-        end
+  class CreateBlockchainReceipts < ActiveRecord::Migration[5.0]
+    def initialize(_, _, table_name = nil)
+      @table_name = table_name
+      @table_name ||= :blockchain_receipts
+    end
 
-        def change
-            create_table @table_name do |t|
-                t.string :txid
-                t.string :txhash
-                t.integer :resource_id
-                t.string :resource_action
-                t.string :resource_name
-                t.boolean :resource_handled
-                t.datetime :deleted_at, index: true
-                t.timestamps
-                t.string :sid
-                t.string :status, :default => "pending"
-                t.boolean :is_request, :default => false
-                t.integer :lock_version
-            end
-        end
+    def change
+      create_table @table_name do |t|
+        t.string :txid
+        t.string :txhash
+        t.integer :resource_id
+        t.string :resource_action
+        t.string :resource_name
+        t.boolean :resource_handled
+        t.datetime :deleted_at, index: true
+        t.timestamps
+        t.string :sid
+        t.string :status, default: 'pending'
+        t.boolean :is_request, default: false
+        t.integer :lock_version
+      end
     end
-end
+  end
+end

data/lib/istox/models/blockchain_receipt.rb

@@ -2,11 +2,8 @@ module Istox
   class BlockchainReceipt < ActiveRecord::Base
     acts_as_paranoid
 
-
     def activity
-      if resource_name.present? && resource_action.present?
-        I18n.t("#{resource_name}.#{resource_action}")
-      end
+      I18n.t("#{resource_name}.#{resource_action}") if resource_name.present? && resource_action.present?
     end
   end
-end
+end

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

@@ -1,45 +1,31 @@
 module Istox
   module BlockchainReceiptQuery
     extend ActiveSupport::Concern
-  
-    #overrideable, when blockchain transaction has confirmed
-    def handle_confirm(resource_action)
+
+    # overrideable, when blockchain transaction has confirmed
+    def handle_confirm(_resource_action)
       self
     end
 
-    #overrideable, when blockchain transaction has failed
-    def handle_fail(resource_action)
+    # overrideable, when blockchain transaction has failed
+    def handle_fail(_resource_action)
       self
     end
 
-    #overrideable, extra data that will be published back to frontend
+    # overrideable, extra data that will be published back to frontend
     def handle_extra
       nil
     end
 
     # outcome of the blockchain transaction, can be "pending" / "confirmed" / "failed"
     def outcome
-      blockchain_receipts = get_blockchain_receipts
-
-      return "confirmed" if blockchain_receipts.empty?
-  
-      # return failed state if there is any failed hashes
-      return "failed" if blockchain_receipts.any?{ |r| r.status == 'failed' }
+      blockchain_receipt = ::Istox::BlockchainReceipt.where(resource_id: id, resource_name: self.class.name).first
 
-      # return pending state if there is any pending hashes
-      return "pending" if blockchain_receipts.any?{ |r| r.status == 'pending' }
+      return 'confirmed' unless blockchain_receipt.present?
 
-      # return confirmed otherwise
-      return "confirmed" 
-    end
-
-    def get_blockchain_receipts
-      ::Istox::BlockchainReceipt.where(resource_id: self.id, resource_name: self.class.name).all
-    end
+      return 'confirmed' if blockchain_receipt.status.blank?
 
-    def last_receipt
-      ::Istox::BlockchainReceipt.where(resource_id: self.id, resource_name: self.class.name).last
+      blockchain_receipt.status
     end
-  
   end
 end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = "0.1.80"
+  VERSION = '0.1.81-test1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.80
+  version: 0.1.81.pre.test1
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -278,6 +278,8 @@ files:
 - ".idea/modules.xml"
 - ".idea/vcs.xml"
 - ".idea/workspace.xml"
+- ".rubocop.yml"
+- ".solargraph.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -287,15 +289,16 @@ files:
 - bin/setup
 - istox.gemspec
 - lib/istox.rb
-- lib/istox/consumers/blockchain_hash_handler.rb
 - lib/istox/consumers/blockchain_status_handler.rb
-- lib/istox/helpers/blockchain_receipt_service.rb
+- lib/istox/helpers/blockchain_service.rb
 - lib/istox/helpers/bunny_boot.rb
+- lib/istox/helpers/common_helper.rb
 - lib/istox/helpers/f_math.rb
 - lib/istox/helpers/graphql_client.rb
 - lib/istox/helpers/grpc_client.rb
 - lib/istox/helpers/gruf_listener_hook.rb
 - lib/istox/helpers/message_service.rb
+- lib/istox/helpers/my_open_struct.rb
 - lib/istox/helpers/order_book.rb
 - lib/istox/helpers/publisher.rb
 - lib/istox/helpers/vault.rb
@@ -321,9 +324,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 

data/lib/istox/consumers/blockchain_hash_handler.rb

@@ -1,19 +0,0 @@
-module Istox
-  class BlockchainHashHandler
-    class << self
-      def hash_generated(data, payload_target)
-        receipt = ::Istox::BlockchainReceipt.where(txid: data.uuid).first
-        if receipt.nil? 
-          puts 'Transaction doesnt belong here, skipping...'
-          return
-        end 
-
-        # sid cannot be nil
-        update_receipt = ::Istox::BlockchainReceipt.where(txid: data.uuid, txhash: nil).where.not(sid: nil).first
-        raise "Unable to find receipt to update" if update_receipt.blank?
-
-        update_receipt.update!(txhash: data.txnHash)
-      end
-    end
-  end
-end

data/lib/istox/helpers/blockchain_receipt_service.rb

@@ -1,71 +0,0 @@
-module Istox
-    class BlockchainReceiptService
-    
-        def self.init(blockchain_receipt_klass)
-            @@blockchain_receipt_klass = blockchain_receipt_klass
-        end
-
-        def self.get_blockchain_receipt_klass
-            @@blockchain_receipt_klass
-        end
-
-        def self.generate_uuid
-            klass = ::Istox::BlockchainReceiptService.blockchain_receipt_class
-            uuid = SecureRandom.uuid
-
-            klass.create!({
-                txid: uuid
-            })
-
-            uuid
-        end
-
-        def create!(tx_message, model, sid, action, is_request: false)
-            klass = ::Istox::BlockchainReceiptService.blockchain_receipt_class
-
-            # delete the previous existing blockchain receipts
-            klass.where(resource_name: model.class.name,
-                                    resource_id: model.id).destroy_all
-
-            (0...tx_message.txnCount).each do |i|
-                if i == 0
-                    blockchain_receipt = klass.find_by_txid(tx_message.uuid)
-
-                    raise "Unable to find blockchain receipt with uuid #{tx_message.uuid}, have you forgetten to generate uuid?" if blockchain_receipt.blank?
-
-                    blockchain_receipt.update!({
-                        sid: sid,
-                        txid: tx_message.uuid,
-                        resource_name: model.class.name,
-                        resource_id: model.id,
-                        resource_action: action,
-                        is_request: is_request
-                    })
-                else
-                    blockchain_receipt = klass.new(
-                        sid: sid,
-                        txid: tx_message.uuid,
-                        resource_name: model.class.name,
-                        resource_id: model.id,
-                        resource_action: action,
-                        is_request: is_request
-                    )
-                    blockchain_receipt.save!
-                end
-            end
-        end
-
-        def self.blockchain_receipt_class
-            raise "Have you forgetten to init blockchain receipt service?" if ::Istox::BlockchainReceiptService.get_blockchain_receipt_klass == nil
-
-            blockchain_receipt_klass = ::Istox::BlockchainReceiptService.get_blockchain_receipt_klass
-            klass = class_eval("::#{blockchain_receipt_klass.name}")
-            unless klass <= ::Istox::BlockchainReceipt
-                raise RuntimeError, "#{blockchain_receipt_klass.name} does not inherit istox blockchain receipt"
-            end
-
-            return klass
-        end
-
-    end
-end