istox 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08ae3c962e156368285e8e07ea655d428b93310ab4137a370dd6ab95f7ac00cc'
-  data.tar.gz: 6f6c813fee420de9cd06e0175069e8f8f2e3b2d70eebe8e792962f3cac419190
+  metadata.gz: d6f34f20c9ecc7dc41e7e9ec9c979b82d1789be3ca9eeef71f7178cbe2294c7a
+  data.tar.gz: 9591b79548b047b03b7ab144f1fb01f42d963b03286d72ece0e017a1a8fd0bbd
 SHA512:
-  metadata.gz: 534957ad873114132ca7fb35d79570f72c6020785d8bb7b71d7935fd98e6d2cb42d82166270dacdc6cf0f44dc8b649af80ec9724e2f022ce3646b0cbdf950a35
-  data.tar.gz: 945b8a9e2bf22dfccd62c2a0c7a3d38cf0c682c095d8ef28ddcfa66f74388e7891e31389b986c0351537cf061cb4c54c8ae789957d3f1492a349b65170b1071f
+  metadata.gz: df98c2b30e72736c4507f0175c9049815aa1ac3481f1b1a638d7f5a0332befcd04f109cb25d1341bfd5a6bd72b039356b90c8a31b32e404dfd6e0987ab924f81
+  data.tar.gz: 94d6069c5be4d86398cb97e7b47257f6de1585df342242a7d8bd84af807687b4bfb972cfe64a58f9888e94b41213508e363b8dc9b94044588dabc39a36d1d125

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.3.3)
+    istox (0.3.8)
       amazing_print
       awesome_print
       aws-sdk-sns (~> 1)
@@ -90,7 +90,7 @@ GEM
     bullet (5.7.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11.0)
-    bunny (2.19.0)
+    bunny (2.20.3)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
     byebug (11.1.3)
@@ -139,21 +139,21 @@ GEM
     ffi (1.15.5)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.19.4-x86_64-darwin)
-    googleapis-common-protos-types (1.3.0)
+    google-protobuf (3.21.5-x86_64-darwin)
+    googleapis-common-protos-types (1.3.2)
       google-protobuf (~> 3.14)
-    graphlient (0.5.0)
+    graphlient (0.6.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.13.6)
-    graphql-client (0.17.0)
+    graphql (2.0.17)
+    graphql-client (0.18.0)
       activesupport (>= 3.0)
-      graphql (~> 1.10)
-    grpc (1.43.1-universal-darwin)
-      google-protobuf (~> 3.18)
+      graphql
+    grpc (1.48.0-x86_64-darwin)
+      google-protobuf (~> 3.19)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.43.1)
+    grpc-tools (1.48.0)
     hashie (3.5.7)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -178,15 +178,15 @@ GEM
     mini_portile2 (2.5.3)
     minitest (5.14.4)
     multi_json (1.14.1)
-    multipart-post (2.1.1)
+    multipart-post (2.3.0)
     nio4r (2.5.7)
     nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    oj (3.13.11)
+    oj (3.14.2)
     ougai (2.0.0)
       oj (~> 3.10)
-    paranoia (2.6.0)
+    paranoia (2.6.1)
       activerecord (>= 5.1, < 7.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -225,10 +225,10 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (10.5.0)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbtree (0.4.5)
+    rbtree (0.4.6)
     redis (4.3.1)
     redis-actionpack (5.3.0)
       actionpack (>= 5, < 8)
@@ -237,8 +237,8 @@ GEM
     redis-activesupport (5.3.0)
       activesupport (>= 3, < 8)
       redis-store (>= 1.3, < 2)
-    redis-namespace (1.8.1)
-      redis (>= 3.0.4)
+    redis-namespace (1.10.0)
+      redis (>= 4)
     redis-rack (2.1.4)
       rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
@@ -246,8 +246,8 @@ GEM
       redis-actionpack (>= 5.0, < 6)
       redis-activesupport (>= 5.0, < 6)
       redis-store (>= 1.2, < 2)
-    redis-store (1.9.1)
-      redis (>= 4, < 5)
+    redis-store (1.9.2)
+      redis (>= 4, < 6)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -270,8 +270,8 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     ruby2_keywords (0.0.5)
-    set (1.0.2)
-    slop (4.9.1)
+    set (1.0.3)
+    slop (4.10.1)
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)

data/lib/istox/helpers/order_book_prorate.rb

@@ -1,7 +1,7 @@
 module Istox
   class OrderBookProrate
     class << self
-      def allocation(token_price:, min_investment:, bid_block:, # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity
+      def allocation(token_price:, min_investment:, bid_block:,
                      invest_step:, hard_cap:, investments:, whitelists: [], include_refund_amount: false,
                      rollover_investments: [])
 
@@ -77,6 +77,8 @@ module Istox
         # only need to handle when oversubscribe
         if total_interests.to_d > hard_cap.to_s.to_d
 
+          puts total_interests.inspect
+
           # prorate the interests
           interests = interests.each_with_index.map do |interest|
             investment = if interest[:fiat_amount].to_d.positive? && !interest[:to_be_set_zero]
@@ -100,7 +102,8 @@ module Istox
               is_vip: interest[:is_vip],
               granted_amount: interest[:granted_amount],
               has_earlier_interest: interest[:has_earlier_interest],
-              investment: investment.to_s
+              investment: investment.to_s,
+              temp_refunded_amount: ::Istox::FMath.sub(interest[:fiat_amount], investment)
             }
           end
 
@@ -130,6 +133,21 @@ module Istox
                 total_deducting = ::Istox::FMath.sub(total_deducting, deductable)
               end
             end
+          elsif new_total_interests.to_d < hard_cap.to_s.to_d
+            remaining_amount = ::Istox::FMath.sub(hard_cap, new_total_interests)
+
+            interests.each do |interest|
+              next unless interest[:temp_refunded_amount].to_d > invest_step.to_s.to_d
+
+              can_be_add_amount = invest_step.to_s.to_d
+
+              interest[:investment] = ::Istox::FMath.add(interest[:investment], can_be_add_amount)
+              interest[:temp_refunded_amount] = ::Istox::FMath.sub(interest[:temp_refunded_amount], can_be_add_amount)
+
+              remaining_amount = ::Istox::FMath.sub(remaining_amount, can_be_add_amount)
+
+              break if remaining_amount.to_s.to_d < invest_step.to_s.to_d
+            end
           end
 
           final_interests = interests.map do |interest|
@@ -137,6 +155,7 @@ module Istox
                                                                                                             interest[:granted_amount].to_d.positive?
             interest.delete(:is_vip)
             interest.delete(:granted_amount)
+            interest.delete(:temp_refunded_amount)
             interest.delete(:has_earlier_interest)
 
             if include_refund_amount

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.3.8'.freeze
+  VERSION = '0.3.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print