istox 0.1.77.2 → 0.1.79.pre.test1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d324292bffb18d421b724dcd855d131e4a332b14f78bac836dba1ac8486472e
-  data.tar.gz: 55515508117180d4444cfcbbd57b24909dff4362f938c4de701874288baafe21
+  metadata.gz: 8b9fe0e553280bf1aeb096f7a61a8e5fae7f6fa220e0bb6eb64cce5e0be685e2
+  data.tar.gz: adcc41c73750b9b3b09919a9b8fd20e7671eccd0dda34e730bd5cf59b00bb4bb
 SHA512:
-  metadata.gz: c98f2b9fba7c8a7408202de9cdc7ae415e22f23af6da681847802107148263d9a71939a1955296660fa13ec8f767efd767992328562ebefec45c754f3a725951
-  data.tar.gz: 6437e9b8fe2265ad406e4f137c106984c26a61245bdeec2c3b18e04b972e3c4da825ee70c8213195cc0a53a39ca3384d9c22a662119e44c17e1a3212c927ff7b
+  metadata.gz: 07e4b1fb124bb17eb60c7c38e3e0c7faeec9afc1e9802da2fae721ad8cbf5fe8afea128c691b907f97799bdb8aa1805ad9c16e0d7321512972e9b7a505da1876
+  data.tar.gz: 79870c307e990da68a18f17633b49300b9348443baf5fed0ac5a32cc7c7a23c46eb0e0a85036bdcce4a6ae54a36c1d847de88b252b189944158cb6bbf3ea7f40

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.75)
+    istox (0.1.79)
       binding_of_caller
       bunny (>= 2.12.0)
       graphlient
@@ -227,4 +227,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

data/lib/istox.rb

@@ -21,12 +21,11 @@ module Istox
   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/blockchain_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"

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -1,105 +1,49 @@
 module Istox
   class BlockchainStatusHandler
     class << self
+      # 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
 
-      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)
+        return if !(%w[failed confirmed].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..."
+          return
+        end
 
-          next if resource.outcome == 'pending'
+        return if resource_handled?(receipt)
 
-          if resource.outcome == 'confirmed'
-            resource.handle_confirm(receipt.resource_action)
+        if transaction.status == 'confirmed'
+          resource.handle_confirm(receipt.resource_action)
             
-            mark_resource_handled(receipt_list)
-            publish_to_frontend(resource, true, receipt, receipt.sid, receipt_list)
-          end
-
+          mark_resource_handled(receipt)
+          publish_to_frontend(resource, true, receipt, receipt.sid)
         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
-
-          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_list = get_receipt_list(resource)
 
-          next if resource_handled?(receipt_list)
-
-          # if transaction.status == 'confirmed'
-          #   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
-          # end
-
-          if transaction.status == 'failed'
-            resource.handle_fail(receipt.resource_action)
-
-            mark_resource_handled(receipt_list)
-            publish_to_frontend(resource, false, receipt, receipt.sid, receipt_list)
-          end
+        if 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,33 +58,23 @@ module Istox
           sid,
           data: {
             success: success,
-            purpose: receipt.activity,
-            txids: get_receipts_tx_hashes(receipt_list)
+            purpose: receipt.activity
           }
         )
+      rescue => 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(', ')
-      end
-
-      def mark_resource_handled(receipt_list)
-        receipt_list.each do |receipt|
-          receipt.update(resource_handled: true)
-        end
-      end
-
-      def resource_handled?(receipt_list)
-        receipt_list.map(&:resource_handled).none? { |item| item.nil? || item == false }
+      def mark_resource_handled(receipt)
+        receipt.update(resource_handled: true)
+      rescue => 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 get_receipt_list(resource)
-        ::Istox::BlockchainReceipt.where(
-          resource_name: resource.class.name,
-          resource_id: resource.id
-        )
+      def resource_handled?(receipt)
+        return receipt.resource_handled == true
       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:)
+            self.start(sid: sid, action: action, before: before, execute: execute, is_request: true)
+        end
+
+        def self.run(sid:, action:, before:, execute:)
+            self.start(sid: sid, action: action, before: before, execute: execute)
+        end
+
+        private
+        # before is the proc that will be executed before, must return the main model blockchain receipt will bind to
+        def self.start(sid:, action:, before:, execute:, is_request: false)
+            # create blockchain receipt first
+            klass = self.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
+                result = execute.call(uuid)
+            end
+        rescue => e
+            @receipt.destroy if @receipt
+            raise e
+        end
+
+        def self.blockchain_receipt_class
+            raise "Have you forgetten to init blockchain receipt service?" if self.get_blockchain_receipt_klass == nil
+
+            blockchain_receipt_klass = self.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

data/lib/istox/logging/log_formatter.rb

@@ -14,7 +14,7 @@ module Istox
           hash[:app] = progname
         end
 
-        return JSON.pretty_generate(hash) + "\n"
+        return 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"
@@ -23,7 +23,7 @@ module Istox
       private
 
       def processed_message(msg)
-        return msg.map { |k, v| "#{k}='#{v&.inspect.to_s.strip}'" }.join(' ') if msg.is_a?(Hash)
+        return msg.map { |k, v| "#{k}='#{v&.strip}'" }.join(' ') if msg.is_a?(Hash)
 
         msg
       end

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

@@ -19,27 +19,16 @@ module Istox
 
     # outcome of the blockchain transaction, can be "pending" / "confirmed" / "failed"
     def outcome
-      blockchain_receipts = get_blockchain_receipts
+      blockchain_receipt = ::Istox::BlockchainReceipt.where(resource_id: self.id, resource_name: self.class.name).last
 
-      return "confirmed" if blockchain_receipts.empty?
+      return "confirmed" if blockchain_receipt.empty?
   
-      # return failed state if there is any failed hashes
-      return "failed" if blockchain_receipts.any?{ |r| r.status == 'failed' }
-
-      # return pending state if there is any pending hashes
-      return "pending" if blockchain_receipts.any?{ |r| r.status == 'pending' }
-
-      # return confirmed otherwise
-      return "confirmed" 
-    end
-
-    def get_blockchain_receipts
-      ::Istox::BlockchainReceipt.where(resource_id: self.id, resource_name: self.class.name).all
+      return blockchain_receipt.status
     end
 
-    def last_receipt
+    def get_blockchain_receipt
       ::Istox::BlockchainReceipt.where(resource_id: self.id, resource_name: self.class.name).last
     end
-  
+
   end
 end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = "0.1.77.2"
+  VERSION = "0.1.79-test1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.77.2
+  version: 0.1.79.pre.test1
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -287,9 +287,8 @@ 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/f_math.rb
 - lib/istox/helpers/graphql_client.rb
@@ -320,12 +319,12 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: istox backend shared gem

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