istox 0.1.44 → 0.1.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d284e11ec21a267732521aa16f60cefc5d7d1efa69cf3b96bed1cc7ced004014
-  data.tar.gz: 236be580fa06fc556dab64853fd8e48dc1b05c988b75d00a535c2be3a077fd37
+  metadata.gz: 559c9df3e5df4437bfd5d374aedf3967cdaa8beb01157db1facf3d722bfb3f0e
+  data.tar.gz: ae3165eed01d37392f02eb2c4bd0b6c5d55dd4fe17253a39db04a0785519124d
 SHA512:
-  metadata.gz: 6ad5ad56023548b15ee8172ec7c03982f60d15c74ecc71c616e04a7ed6d46e642306d1761c6f8be2ea099c7be82d3f9d4ffd3b8ad65f9cac4560ffd757177423
-  data.tar.gz: 417cf3903c36b166abce744be293dff76ad32c18293fc508e7c0bf42003e5d3b8f2050706387912d1ff68bfa174a7e9e5e851abf0f5af7c142734992747dd3f5
+  metadata.gz: c7243f21712865a80d720479b611a124084cba968985dc755e2189110dfc3308d85a2a07a946cf30049bf2947b6862da8a618d903818e0e04d9f44c579602922
+  data.tar.gz: 5e0ca0625bd42bcb4bbafe5fe7a77a7520bbc179deceaf9afc840cbdc978686eaaa8d3237949c1c3458afe8223437094c8af07e6f3e69e5f3f12ee89b32e5677

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.43.9)
+    istox (0.1.44)
       bunny (>= 2.12.0)
       graphlient
       gruf

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -18,50 +18,41 @@ module Istox
         transactions.each do |transaction|
           receipt = ::Istox::BlockchainReceipt.where(txhash: transaction.id).first
 
-          find_resource(transaction) do |receipt, resource_name, resource_id, resource_action, sid|
-            resource = begin
-                        class_eval("::#{resource_name}").find(resource_id)
-                      rescue => e
-                        puts e.inspect
-                        next
-                      end
-            receipt_list = get_receipt_list(resource, resource_name)
-
-            next if !allowed_statuses?(transaction)
-            next if receipt_handled?(receipt_list)
-
-            if confirmed?(transaction)
-              next if resource.outcome == 'pending'
-
-              if resource.outcome == 'confirmed'
-                resource.handle_confirm(resource_action)
-                publish_to_frontend(resource, true, receipt, sid, receipt_list) do
-                  update_receipts(receipt_list)
-                end
-              end
-            end
+          next if !(%w[failed confirmed pending].include?(transaction.status))
+          receipt.update!(status: transaction.status)
+          
+          resource = begin
+            class_eval("::#{receipt.resource_name}").find(receipt.resource_id)
+          rescue => e
+            puts e.inspect
+            next
+          end
+
+          next if resource_handled?(resource)
+
+          if transaction.status == 'confirmed'
+            next if resource.outcome == 'pending'
 
-            if failed?(transaction)
-              resource.handle_fail(resource_action)
-              publish_to_frontend(resource, false, receipt, sid, receipt_list) { update_receipts(receipt_list) }
+            if resource.outcome == 'confirmed'
+              resource.handle_confirm(resource_action)
+              
+              mark_resource_handled(resource)
+              publish_to_frontend(resource, true, receipt, sid, receipt_list)
             end
           end
-        end
-      end
 
-      private
+          if transaction.status == 'failed'
+            resource.handle_fail(resource_action)
 
-      def allowed_statuses?(transaction)
-        return %w[failed confirmed].include?(transaction.status)
-      end
+            mark_resource_handled(resource)
+            publish_to_frontend(resource, false, receipt, sid, receipt_list)
+          end
 
-      def get_receipt_list(resource, resource_name)
-        ::Istox::BlockchainReceipt.where(
-          resource_name: resource_name,
-          resource_id: resource.id
-        )
+        end
       end
 
+      private
+
       def publish_to_frontend(model, success, receipt, sid, receipt_list)
         yield if block_given?
 
@@ -85,34 +76,29 @@ module Istox
         )
       end
 
-      def failed?(transaction)
-        transaction.status == 'failed' || transaction.status == 'reverted'
-      end
+      def get_receipts_tx_hashes(receipt_list)
+        tx_hashes = receipt_list.map(&:txhash).compact
 
-      def confirmed?(transaction)
-        transaction.status == 'confirmed'
+        tx_hashes.join(', ')
       end
 
-      def update_receipts(receipt_list)
+      def mark_resource_handled(resource)
+        receipt_list = get_receipt_list(resource)
         receipt_list.each do |receipt|
           receipt.update(resource_handled: true)
         end
       end
 
-      def find_resource(transaction)
-        receipt = ::Istox::BlockchainReceipt.find_by_txhash(transaction.id)
-        
-        yield(receipt, receipt.resource_name, receipt.resource_id, receipt.resource_action, receipt.sid)
-      end
-
-      def get_receipts_tx_hashes(receipt_list)
-        tx_hashes = receipt_list.map(&:txhash).compact
-
-        tx_hashes.join(', ')
+      def resource_handled?(resource)
+        receipt_list = get_receipt_list(resource)
+        receipt_list.map(&:resource_handled).none? { |item| item.nil? || item == false }
       end
 
-      def receipt_handled?(receipt_list)
-        receipt_list.map(&:resource_handled).none? { |item| item.nil? || item == false }
+      def get_receipt_list(resource)
+        ::Istox::BlockchainReceipt.where(
+          resource_name: resource.class.name,
+          resource_id: resource.id
+        )
       end
 
     end

data/lib/istox/migrations/create_blockchain_receipts.rb

@@ -18,6 +18,7 @@ module Istox
                 t.datetime :deleted_at, index: true
                 t.timestamps
                 t.string :sid
+                t.string :status, :default => "pending"
                 t.integer :lock_version
             end
         end

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

@@ -1,33 +1,6 @@
 module Istox
   module BlockchainReceiptQuery
     extend ActiveSupport::Concern
-
-    class_methods do
-      def with_receipts(arr = nil)
-        if !arr
-          arr = self.all
-        end
-  
-        hashes = arr.map do |model|
-          blockchain_receipts = model.get_blockchain_receipts
-          
-          return blockchain_receipts.map do |blockchain_receipt|
-            blockchain_receipt.txhash
-          end
-        end.flatten
-  
-        data = self.block_transactions(hashes)
-        
-        arr.map do |model|
-          model.set_transactions_store(data)
-          model
-        end
-      end
-
-      def block_transactions(txhashes)
-        Istox::Interfaces::Chainhub::Transaction.get_block_transactions(txhashes)
-      end 
-    end
   
     #overrideable, when blockchain transaction has confirmed
     def handle_confirm(resource_action)
@@ -46,63 +19,23 @@ module Istox
 
     # outcome of the blockchain transaction, can be "pending" / "confirmed" / "failed"
     def outcome
-      @blockchain_receipts = get_blockchain_receipts
+      blockchain_receipts = get_blockchain_receipts
 
-      return "confirmed" if @blockchain_receipts.empty?
-      
-      txhashes = @blockchain_receipts.map do |blockchain_receipt|
-        blockchain_receipt.txhash
-      end
-
-      # return pending state if there is any unknown hashes
-      return "pending" if txhashes.any?{ |e| e.blank? }
-
-      # if transactions store already exists, we should retrieve the state from
-      prepare_block_transactions(txhashes)
-      @blocks = []
+      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_receipts.map do |blockchain_receipt|
-        transaction = @transactions_store.find { |t| t.txhash == blockchain_receipt.txhash}
-        
-        if transaction
-          @blocks.push(transaction)
-        else
-          @blocks.push(OpenStruct.new({ txhash: blockchain_receipt.txhash, status: 'pending' }))
-        end
-      end
-      
-    
+      # return pending state if there is any pending hashes
+      return "pending" if blockchain_receipts.any?{ |r| r.status == 'pending' }
 
-      return "failed" if blocks_failed?
-      return "pending" if blocks_pending?
-      return "confirmed" if blocks_confirmed?
+      # return confirmed otherwise
+      return "confirmed" 
     end
 
     def get_blockchain_receipts
       ::Istox::BlockchainReceipt.where(resource_id: self.id, resource_name: self.class.name).all
     end
-
-    def set_transactions_store(store)
-      @transactions_store = store
-    end
-
-    def prepare_block_transactions(txhashes)
-      @transactions_store ||= Istox::Interfaces::Chainhub::Transaction.get_block_transactions(txhashes)
-    end 
-
-    private
-
-    def blocks_failed?
-      @blocks.any? { |obj| obj.state == 'failed' }
-    end
-
-    def blocks_pending?
-      @blocks.empty? || @blocks.any? { |obj| obj.state == 'pending' }
-    end
-
-    def blocks_confirmed?
-      !@blocks.any? { |obj| obj.state == 'pending' } && !@blocks.any? { |obj| obj.state == 'failed' }
-    end
-    
+  
   end
 end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = "0.1.44"
+  VERSION = "0.1.45"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.44
+  version: 0.1.45
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny