istox 0.2.8 → 0.2.11.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994fc5810c55f2637b138a872add0d6cc3eb3b3b0f4720d3121ada69bffcd037
-  data.tar.gz: f90911bd0bb0673a231e76fa4f26820b0ba96039d745aa2f23d0dd09be3e9e3f
+  metadata.gz: db37b31d27d4eca7477f42c0b3ed3a9537c0b07f5b68610a0ee06aa6580f72eb
+  data.tar.gz: 8b4c48f8eaeff0fe5b772803330c86d0e9cf0a82cc782263539dc366fa2af69f
 SHA512:
-  metadata.gz: a8973bb6040837fd3937f0e85576c8e312a1485dbed490e1d9981a5e7fee3762707443f64194df33f69940072c59a627ea9442495959bbae59b80694de929971
-  data.tar.gz: bc817295ac6e4b1d82ec546f7c0537d23d2e2dc980b02c735aa05e5c97d1fd959bc9f8d1189cf03afe6509be87b0bc078b8865a8b0c9fc2bdc214203ec7f2556
+  metadata.gz: ece3d27d213be4c9f802ed74ad56686c3dd4201ea6dbe93cd844711cc88244aeccfa627e3282af22d76d1a61af2828264115e4f67c2fd6f608db17cf7d6aa7b3
+  data.tar.gz: 0e7d314764c2af3e381dc5ca0f6b114ad37ab6df77f3264609df25e17ed65ecab2677d617de908cb0d23d2ce01fb8dec92c75f5e3253a17dd87d8ee1199e443d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.2.5.3)
+    istox (0.2.10)
       amazing_print
       awesome_print
       aws-sdk-sns (~> 1)
@@ -9,7 +9,6 @@ PATH
       bunny (>= 2.12.0)
       exponential-backoff (= 0.0.4)
       graphlient
-      gruf
       hashie (~> 3.5.7)
       istox_gruf (~> 2.7.3)
       listen (~> 3.0.5)
@@ -23,43 +22,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
       arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
-      marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -92,17 +91,17 @@ GEM
     bullet (5.7.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11.0)
-    bunny (2.17.0)
+    bunny (2.18.0)
       amq-protocol (~> 2.3, >= 2.3.1)
+      sorted_set (~> 1, >= 1.0.2)
     byebug (11.1.3)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     database_cleaner (1.6.2)
     debug_inspector (1.1.0)
     diff-lcs (1.3)
-    e2mmap (0.1.0)
-    erubi (1.9.0)
+    erubi (1.10.0)
     exponential-backoff (0.0.4)
     factory_bot (4.8.2)
       activesupport (>= 3.0.0)
@@ -113,44 +112,39 @@ GEM
       i18n (~> 0.5)
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
-    faraday (1.4.1)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    ffi (1.15.0)
+    ffi (1.15.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.15.8-universal-darwin)
+    google-protobuf (3.17.3)
     googleapis-common-protos-types (1.0.6)
       google-protobuf (~> 3.14)
     graphlient (0.5.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.12.8)
+    graphql (1.12.12)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.37.0-universal-darwin)
+    grpc (1.38.0)
       google-protobuf (~> 3.15)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.37.0)
-    gruf (2.9.1)
-      activesupport (> 4)
-      concurrent-ruby (> 1)
-      e2mmap (~> 0.1)
-      grpc (~> 1.10)
-      grpc-tools (~> 1.10)
-      json (>= 2.3)
-      slop (~> 4.6)
-      thwait (~> 0.1)
+    grpc-tools (1.38.0)
     hashie (3.5.7)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -161,28 +155,26 @@ GEM
       grpc-tools (~> 1.10)
       slop (~> 4.6)
     jmespath (1.4.0)
-    json (2.5.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    loofah (2.4.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
     multi_json (1.14.1)
     multipart-post (2.1.1)
-    nio4r (2.3.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    oj (3.11.5)
+    nio4r (2.5.7)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oj (3.11.6)
     ougai (2.0.0)
       oj (~> 3.10)
     paranoia (2.4.3)
@@ -195,43 +187,45 @@ GEM
       pry (~> 0.10)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    rack (2.2.2)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (10.5.0)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rbtree (0.4.4)
     redis (4.1.3)
     redis-actionpack (5.2.0)
       actionpack (>= 5, < 7)
       redis-rack (>= 2.1.0, < 3)
       redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.2.0)
+    redis-activesupport (5.2.1)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
     redis-namespace (1.8.1)
@@ -267,28 +261,30 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     ruby2_keywords (0.0.4)
-    slop (4.8.2)
-    sprockets (3.7.2)
+    set (1.0.1)
+    slop (4.9.1)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    thwait (0.2.0)
-      e2mmap
     timecop (0.9.1)
-    tzinfo (1.2.6)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uniform_notifier (1.11.0)
     vault (0.16.0)
       aws-sigv4
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby

data/lib/istox/helpers/blockchain_service.rb

@@ -8,18 +8,18 @@ module Istox
       @@blockchain_receipt_klass
     end
 
-    def self.request(sid:, action:, before:, execute:, request_reason: nil)
-      start(sid: sid, action: action, before: before, execute: execute, is_request: true, request_reason: request_reason)
+    def self.request(sid:, action:, before:,  execute:, before_start: nil, request_reason: nil)
+      start(sid: sid, action: action, before: before, before_start: before_start, execute: execute, is_request: true, request_reason: request_reason)
     end
 
-    def self.run(sid:, action:, before:, execute:)
-      start(sid: sid, action: action, before: before, execute: execute)
+    def self.run(sid:, action:, before:, execute:, before_start: nil)
+      start(sid: sid, action: action, before: before, before_start: before_start, 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, request_reason: nil)
+      def start(sid:, action:, before:, execute:, before_start: nil, is_request: false, request_reason: nil)
         # create blockchain receipt first
         klass = blockchain_receipt_class
         uuid = ::SecureRandom.uuid
@@ -33,6 +33,8 @@ module Istox
 
         chainhub_processing = true
 
+        before_start.call(uuid) if before_start.present?
+
         ::ActiveRecord::Base.transaction do
           # execute before proc, and get the model that blockchain receipt should bind to
           model = before.call(uuid)

data/lib/istox/helpers/graphql_client.rb

@@ -27,7 +27,7 @@ module Istox
       private
 
       def init_host(host_type, url)
-        client = Graphlient::Client.new(url, http: Graphlient::Adapters::HTTP::HTTPAdapter)
+        client = Graphlient::Client.new(url, http: Graphlient::Adapters::HTTP::FaradayAdapter)
 
         @@hosts[host_type] = client
       end

data/lib/istox/helpers/order_book_prorate.rb

@@ -18,33 +18,59 @@ module Istox
 
         # process whitelist
         whitelists.each do |whitelist|
-          investment = investments.find { |investment1| investment1[:account_id] == whitelist[:account_id] }
+          whitelisted_investments = investments.select { |investment1| investment1[:account_id] == whitelist[:account_id] }
 
-          next unless investment.present?
+          next unless whitelisted_investments.length.positive?
 
-          granted_amount = [::BigDecimal.new(investment[:fiat_amount].to_s), ::BigDecimal.new(whitelist[:guaranteed_allocation].to_s)].min
+          current_guarenteed_amount = ::BigDecimal.new(whitelist[:guaranteed_allocation].to_s)
 
-          next unless granted_amount.positive?
+          whitelisted_investments.each do |whitelisted_investment|
+            granted_amount = [::BigDecimal.new(whitelisted_investment[:fiat_amount].to_s), current_guarenteed_amount].min
 
-          hard_cap = ::Istox::FMath.sub(hard_cap, granted_amount)
-          investment[:fiat_amount] = Istox::FMath.sub(investment[:fiat_amount], granted_amount)
-          investment[:is_vip] = true
-          investment[:granted_amount] = granted_amount.to_s
+            next unless granted_amount.positive?
+
+            current_guarenteed_amount = ::Istox::FMath.sub(current_guarenteed_amount, granted_amount).to_d
+
+            hard_cap = ::Istox::FMath.sub(hard_cap, granted_amount)
+            whitelisted_investment[:fiat_amount] = Istox::FMath.sub(whitelisted_investment[:fiat_amount], granted_amount)
+            whitelisted_investment[:is_vip] = true
+            whitelisted_investment[:granted_amount] = granted_amount.to_s
+          end
         end
 
         # sort by id asc
         interests = investments.sort do |a, b|
           a[:id] <=> b[:id]
         end
+
+        ## check whether each investment already had earlier investment from the same investor
+        interests = interests.map do |interest|
+          earlier_interest = interests.find do |i|
+            i[:account_id] == interest[:account_id] &&
+              i[:id] != interest[:id] && i[:id].to_i < interest[:id].to_i
+          end
+
+          interest[:has_earlier_interest] = earlier_interest.present?
+
+          interest
+        end
+
         total_interests = 0
 
         max_allowed_investor = Istox::FMath.round_down(::Istox::FMath.div(hard_cap, min_investment), 0).to_i
 
-        b = 0
+        allowed_investor_ids = []
         interests.each_with_index.map do |interest|
-          if interest[:fiat_amount].to_d.positive? && b < max_allowed_investor
+          if !allowed_investor_ids.include?(interest[:account_id]) &&
+             interest[:fiat_amount].to_d.positive? && allowed_investor_ids.length < max_allowed_investor
+            allowed_investor_ids.push(interest[:account_id])
+            interest[:to_be_set_zero] = false
             total_interests = ::Istox::FMath.add(total_interests, interest[:fiat_amount])
-            b += 1
+          elsif allowed_investor_ids.include?(interest[:account_id]) && interest[:fiat_amount].to_d.positive?
+            interest[:to_be_set_zero] = false
+            total_interests = ::Istox::FMath.add(total_interests, interest[:fiat_amount])
+          else
+            interest[:to_be_set_zero] = true
           end
         end
 
@@ -52,18 +78,18 @@ module Istox
         if total_interests.to_d > hard_cap.to_s.to_d
 
           # prorate the interests
-          i = 0
           interests = interests.each_with_index.map do |interest|
-            investment = if i < max_allowed_investor && interest[:fiat_amount].to_d.positive?
+            investment = if interest[:fiat_amount].to_d.positive? && !interest[:to_be_set_zero]
                            result = ::Istox::FMath.round_down(::Istox::FMath.mul(::Istox::FMath.div(interest[:fiat_amount], total_interests),
                                                                                  hard_cap), 0)
 
                            result = result.to_d - result.to_d.modulo(invest_step.to_s.to_d)
 
                            # only set to min investment if is not vip
-                           result = min_investment.to_d if result < min_investment.to_d && interest[:is_vip].blank?
+                           if result < min_investment.to_d && interest[:is_vip].blank? && !interest[:has_earlier_interest]
+                             result = min_investment.to_d
+                           end
 
-                           i += 1
                            result
                          else
                            ::BigDecimal.new('0').to_s
@@ -73,6 +99,7 @@ module Istox
               id: interest[:id],
               is_vip: interest[:is_vip],
               granted_amount: interest[:granted_amount],
+              has_earlier_interest: interest[:has_earlier_interest],
               investment: investment.to_s
             }
           end
@@ -86,10 +113,10 @@ module Istox
           if new_total_interests.to_d > hard_cap.to_s.to_d
             total_deducting = ::Istox::FMath.sub(new_total_interests, hard_cap)
             interests.reverse_each do |interest|
-              next unless interest[:investment].to_d > min_investment.to_d || interest[:is_vip]
+              next unless interest[:investment].to_d > min_investment.to_d || interest[:is_vip] || interest[:has_earlier_interest]
 
               # allow to deduct to zero if is vip
-              deductable = if interest[:is_vip]
+              deductable = if interest[:is_vip] || interest[:has_earlier_interest]
                              interest[:investment]
                            else
                              ::Istox::FMath.sub(interest[:investment], min_investment)
@@ -110,6 +137,7 @@ module Istox
                                                                                                             interest[:granted_amount].to_d.positive?
             interest.delete(:is_vip)
             interest.delete(:granted_amount)
+            interest.delete(:has_earlier_interest)
 
             if include_refund_amount
               original_investment = original_investments.find { |original_investment1| original_investment1[:id] == interest[:id] }
@@ -122,14 +150,12 @@ module Istox
 
           final_interests = interests.each_with_index.map do |interest|
             final_amount = if interest[:is_vip]
-                             vip_fiat_amount = max_allowed_investor.positive? ? interest[:fiat_amount] : '0'
+                             vip_fiat_amount = !interest[:to_be_set_zero] ? interest[:fiat_amount] : '0'
                              ::Istox::FMath.add(vip_fiat_amount, interest[:granted_amount])
                            else
-                             max_allowed_investor.positive? ? interest[:fiat_amount] : '0'
+                             !interest[:to_be_set_zero] ? interest[:fiat_amount] : '0'
                            end
 
-            max_allowed_investor -= 1 if interest[:fiat_amount].to_d.positive?
-
             result = {
               id: interest[:id],
               investment: ::BigDecimal.new(final_amount.to_s).to_s

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.2.11.pre.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.11.pre.2
 platform: ruby
 authors:
 - Siong Leng
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -517,7 +517,7 @@ files:
 homepage: http://www.abc.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -528,12 +528,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: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: istox backend shared gem
 test_files: []