istox 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b906e9dbba05e70feaf86f32baac44406b99092e766673c68b6ea264db7a9ddc
-  data.tar.gz: 1170ef8daccda9dceb671598f3ebb74e9071fc6e142ba4c0aa90c35aa21fc22f
+  metadata.gz: f2099515f9703dcadd1f99da2d05be06e062c624638ae9c3646880497c7d192d
+  data.tar.gz: 1ceba372de27ec21beb41acde07f601f138cf116d1aad19f50034af3f7cb2d18
 SHA512:
-  metadata.gz: a1f9dc10064f5527c503564078a02a7a6a219e57a03f6c152653f66e79050005cc0404bd639b8f18f870184811e3c0c2e874b45e73723e89b19c9f1fc0bfa10c
-  data.tar.gz: 6a604074785ecbcb31e10bbc37230f1ad7290aa7315c6b02b1c5ab14c4d0c8a572c441ae291c53e61ca31a87939fa12b4bfceb472f8bb08b38921d4c9aa15c66
+  metadata.gz: 9263b776b77849f00a25f08b99a2e753a5eabc03e929afeb3628b6c58d13dcf799e1c587418781b77c2c01e2bd0afd7bba9de88291569198a4d66f8354a8c8dc
+  data.tar.gz: 9d6034c961985ae0ea89c806ac44dd505074fabfe899f73765328b9ef00bc4b85a06a907d8203ea3ad9f35cac77841caf372fe518911184b1f808f68f0f6a682

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.2.5.3)
+    istox (0.2.9)
       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)
@@ -92,8 +91,9 @@ 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)
@@ -101,7 +101,6 @@ GEM
     database_cleaner (1.6.2)
     debug_inspector (1.1.0)
     diff-lcs (1.3)
-    e2mmap (0.1.0)
     erubi (1.9.0)
     exponential-backoff (0.0.4)
     factory_bot (4.8.2)
@@ -124,7 +123,7 @@ GEM
     faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    ffi (1.15.0)
+    ffi (1.15.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     google-protobuf (3.15.8-universal-darwin)
@@ -142,15 +141,6 @@ GEM
       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)
     hashie (3.5.7)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -161,7 +151,6 @@ 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)
@@ -223,9 +212,10 @@ GEM
       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)
@@ -267,7 +257,11 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     ruby2_keywords (0.0.4)
-    slop (4.8.2)
+    set (1.0.1)
+    slop (4.9.1)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -278,8 +272,6 @@ GEM
     sqlite3 (1.3.13)
     thor (0.20.3)
     thread_safe (0.3.6)
-    thwait (0.2.0)
-      e2mmap
     timecop (0.9.1)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)

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.9'.freeze
+  VERSION = '0.2.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print