istox 0.1.81.pre.test7 → 0.1.81.pre.test8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 729001e75a3aabdc46971845276748d609b0bc3a7fd7fb9443c7557ee88f5e46
-  data.tar.gz: ba491528fe2bbcb6e61fdafe5b279cc8860b80a8f5173f5d5890916a92001b19
+  metadata.gz: 6914180beb5936e43d978d38460627b21ea6ea1d5d7673fd30626cf8450e6208
+  data.tar.gz: 4685dd98e263b7fc0e0365747d80db3aee98bd729135203077eba4089e97848c
 SHA512:
-  metadata.gz: 96e334e27ad0feb1b293895eb65daa3b2ec838625cab5ca04496d8c27292a468696ee621e737b85b39536cbe20b3fdce49c69e6735b20cb1bd95cbf02293d1c7
-  data.tar.gz: 0f62ea109c1607ca23841381837fcb19d5e6365d0fff8c8a42a367dcf705b08276bfbf75693bb6077c08fadbe4b9312924056fcfd42265570a38c93975fffe22
+  metadata.gz: cd3cf29e6a37c6c2d6d89d33becdd9e425b9133f97b2c4600bf29b4ac14829759e006ae0d9e9deb385de57d296492c801683a6dd943494dc7dc0eb8a13faba15
+  data.tar.gz: d74fff382c493301cde5d299fa925483f1b38823fe2df151f53f1a9607f7c485dc38b578d6a72c9c2a0e09ac2f3baa95661edfa7c7489edd6e9bcd283c1bbca0

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -3,20 +3,25 @@ module Istox
     class << self
       # format of transaction
       # {
-      #   uuid: "XXXXXX"
-      #   status: "confirmed/failed"
+      #   type: 'CHAINHUB_RESPONSE_EVENT',
+      #   uuid:'123', //original request uuid sent from backend
+      #   success:true, //status of the whole request in true/false
+      #   message:'',  //In case of error, the message contain the error reason
+      #   txnCount:1,  //Number of blockchain transactions from the original request
+      #   txnHashes:[] //Hashes for all transactions that has been submitted and mined by the blockchain for verification purpose
       # }
 
-      def txn_status_changed(transaction)
+      def chainhub_response_event(transaction)
         receipt = ::Istox::BlockchainReceipt.where(txid: transaction.uuid).first
         if receipt.blank?
           puts 'Transaction doesn\'t belong to this backend, skipping...'
           return
         end
 
-        return unless %w[failed confirmed].include?(transaction.status)
+        status = transaction.success ? 'confirmed' : 'failed'
 
-        receipt.update!(status: transaction.status)
+        receipt.update!(status: status, message: transaction.message,
+                        txhash: transaction.txnHashes.present? ? transaction.txnHashes.join(',') : nil)
 
         resource = begin
           class_eval("::#{receipt.resource_name}", __FILE__, __LINE__).find(receipt.resource_id)
@@ -27,13 +32,13 @@ module Istox
 
         return if resource_handled?(receipt)
 
-        if transaction.status == 'confirmed'
+        if status == 'confirmed'
           resource.handle_confirm(receipt)
 
           mark_resource_handled(receipt)
           publish_to_frontend(resource, true, receipt, receipt.sid)
 
-        elsif transaction.status == 'failed'
+        elsif status == 'failed'
           resource.handle_fail(receipt)
 
           mark_resource_handled(receipt)
@@ -58,7 +63,8 @@ module Istox
           sid,
           data: {
             success: success,
-            purpose: receipt.activity
+            purpose: receipt.activity,
+            message: receipt.message
           }
         )
       rescue StandardError => e

data/lib/istox/helpers/blockchain_service.rb

@@ -22,7 +22,7 @@ module Istox
       def start(sid:, action:, before:, execute:, is_request: false)
         # create blockchain receipt first
         klass = blockchain_receipt_class
-        uuid = :: SecureRandom.uuid
+        uuid = ::SecureRandom.uuid
         @receipt = klass.create!(
           txid: uuid,
           sid: sid,

data/lib/istox/migrations/create_blockchain_receipts.rb

@@ -17,6 +17,7 @@ module Istox
         t.timestamps
         t.string :sid
         t.string :status, default: 'pending'
+        t.text :message
         t.boolean :is_request, default: false
         t.integer :lock_version
       end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.81-test7'.freeze
+  VERSION = '0.1.81-test8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.81.pre.test7
+  version: 0.1.81.pre.test8
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny