istox 0.1.42.14 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcf8eb41f347c697c127cf7358205c1225930c393fc6f905aa4d97eb70a43d68
-  data.tar.gz: bed057deb70c062102838f9dddb0a30093e7cd2dff894acd596ba0adfabffbef
+  metadata.gz: 88f804800fe5806da1be32b8f6b8510d4935937f81d0f37a7cdf2e70fdbb77e3
+  data.tar.gz: 13b4692c747648fb8ff21426b4c322fc50cdaf8b417039d6ddaaf8a5fadedcd3
 SHA512:
-  metadata.gz: 33ff5011ea803997929839cf0c6bf82979808a720b2a81c7852c075f82034d7edf81aaacb05f1f218c49abd06123b0e8e6bb7f5e7975b784966fa1ba740ac43c
-  data.tar.gz: 43982766b83677208e27da959763c0aed40040c617d27ce683225266b1ab8ae40cca4c9ed6afa43ff9341546f2768891321d51bbfc03e79ab84f2f847e3145b5
+  metadata.gz: 5d63ab6ab5288527e9aef9ecfff3fd02848fd9eaa254f235e1189eb4a80b42309189f97e4ab23c613126c4c2b8397160eaa268366b7a8f9c564fc059ca5fa661
+  data.tar.gz: 82b14b0b6fd2f4fb1998e8e40785b62c660083b81b8a58edb85e45fc8cc043eb7b0f1419dfba6af7566c8593c52e53736e7f889f73f7809289793c4d31c5b41c

data/Gemfile.lock

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

data/README.md

@@ -1,39 +1,7 @@
-# Istox
+to publish new version
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/istox`. To experiment with that code, run `bin/console` for an interactive prompt.
+1. Change version number in version.rb
 
-TODO: Delete this and the text above, and describe your gem
+2. gem build istox
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'istox'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install istox
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/istox. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-## Code of Conduct
-
-Everyone interacting in the Istox project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/istox/blob/master/CODE_OF_CONDUCT.md).
+3. gem publish istox-<VERSION>.gem

data/lib/istox.rb

@@ -10,6 +10,7 @@ module Istox
     end
   end
 
+  require "istox/interfaces/chainhub/transaction"
   require "istox/helpers/publisher"
   require "istox/helpers/bunny_boot"
   require "istox/helpers/order_book"
@@ -19,5 +20,6 @@ module Istox
   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"
 end

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -4,9 +4,19 @@ module Istox
       def txn_status_changed(transactions)
         transactions.each do |transaction|
   
-          if ::Istox::BlockchainReceipt.find_by_txid(transaction[:id]).nil?
+          receipt = ::Istox::BlockchainReceipt.where(txhash: transaction[:hash], txid: transaction[:id]).first
+
+          if receipt.nil?
+            receipt = ::Istox::BlockchainReceipt.where(txhash: nil, txid: transaction[:id]).first
+          end
+
+          if receipt.nil?
             puts 'Transaction not found, skipping...'
             next
+          else 
+            if receipt.txhash.blank?
+              receipt.update!(txhash: transaction[:hash])
+            end
           end
 
           find_resource(transaction) do |receipt, resource_name, resource_id, resource_action, sid|
@@ -23,6 +33,7 @@ module Istox
 
             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

data/lib/istox/helpers/blockchain_receipt_service.rb

@@ -1,26 +1,37 @@
 module Istox
     class BlockchainReceiptService
-    def create!(blockchain_receipt_klass, txids, model, sid, action)
+    
+        def self.init(blockchain_receipt_klass)
+            @@blockchain_receipt_klass = blockchain_receipt_klass
+        end
 
-        klass = class_eval("::#{blockchain_receipt_klass.name}")
-        unless klass <= ::Istox::BlockchainReceipt
-           raise RuntimeError, "#{blockchain_receipt_klass.name} does not inherit istox blockchain receipt"
+        def self.get_blockchain_receipt_klass
+            @@blockchain_receipt_klass
         end
 
-        # delete the previous existing blockchain receipts
-        klass.where(resource_name: model.class.name,
-                                resource_id: model.id).destroy_all
+        def create!(tx_message, model, sid, action)
+            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
 
-        [txids].flatten.each do |txid|
-        blockchain_receipt = klass.new(
-            sid: sid,
-            txid: txid,
-            resource_name: model.class.name,
-            resource_id: model.id,
-            resource_action: action
-        )
-        blockchain_receipt.save!
+            # 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|
+                blockchain_receipt = klass.new(
+                    sid: sid,
+                    txid: tx_message.uuid,
+                    resource_name: model.class.name,
+                    resource_id: model.id,
+                    resource_action: action
+                )
+                blockchain_receipt.save!
+            end
         end
     end
-    end
 end

data/lib/istox/migrations/create_blockchain_receipts.rb

@@ -10,6 +10,7 @@ module Istox
         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

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

@@ -1,6 +1,33 @@
 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)
@@ -23,23 +50,41 @@ module Istox
 
       return "confirmed" if @blockchain_receipts.empty?
       
-      txids = @blockchain_receipts.map do |blockchain_receipt|
-        blockchain_receipt.txid
-      end.compact
+      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
+      @transaction_store ||= get_block_transactions(txhashes)
+      @blocks = []
 
-      @blocks = get_block_transactions(txids)
+      @blockchain_receipts.map do |blockchain_receipt|
+        transaction = @transaction_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 "failed" if blocks_failed?
       return "pending" if blocks_pending?
       return "confirmed" if blocks_confirmed?
     end
 
-    private
-
     def get_blockchain_receipts
       ::Istox::BlockchainReceipt.where(resource_id: self.id, resource_name: self.class.name).all
     end
 
+    private
+
     def blocks_failed?
       @blocks.any? { |obj| obj.state == 'failed' }
     end
@@ -52,17 +97,12 @@ module Istox
       !@blocks.any? { |obj| obj.state == 'pending' } && !@blocks.any? { |obj| obj.state == 'failed' }
     end
 
-    def get_block_transactions(txids)
-      query = <<-'GRAPHQL'
-        query($ids: [String!]!) {
-          blockTransactions(hashes: $ids) {
-            txid
-            state
-          }
-        }
-      GRAPHQL
-
-      Istox::GraphqlClient.query("chainhub", query, { ids: txids }).data.block_transactions
+    def set_transactions_store(store)
+      @transactions_store = store
+    end
+    
+    def get_block_transactions(txhashes)
+      Istox::Interfaces::Chainhub::Transaction.get_block_transactions(txhashes)
     end 
 
   end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = "0.1.42.14"
+  VERSION = "0.1.43"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.42.14
+  version: 0.1.43
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-22 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny