istox 0.1.120.pre.2 → 0.1.120

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86efea88fe9b160bd80eed0b64af89e8be72b002b5164c45cb75fb7b62eece6c
-  data.tar.gz: 19d1e8f79a6cda0ceaf2aa1c163d660c530becf138ae87218e1de21f14a5647d
+  metadata.gz: a6fdaa4c5337520660c3bfedcf47d63c7773092439e23c40265227c5284f467d
+  data.tar.gz: 42f695f32b11fd48cb08110ded342b581399a16b45e07da17cc4a9adadb11727
 SHA512:
-  metadata.gz: 801854a5d2e6b2dff20ae204b774e7512a3acc8aa9a712903db1811fbc68841c236044dd0b980325143e3df56cc19cf40bf1c34e04d80a3b0008654afa2a61b9
-  data.tar.gz: 5bf57d11d786ab8b36696b8497aa9befffd14c03f6275c092edeaaab7eadcd492c9d04405ffbd67c90d55932ecc635e9beac4da3726ad1e0e761f71e04d923d1
+  metadata.gz: 0b11f506154370f933fc191361959627ab87f0935fe6c89e55b09723219c3efeae156f1c7e0a7044ac29c7f34af8f4b59ccf99425d42168c7473ea8202e64179
+  data.tar.gz: c7f12ffb9707da6a8f78d504afa410175d93ef966e020aceafd7e4e11f6db6da7636cd85520aba306116747c2971b03a9ac7d4430490fbf9e3fd00d1cfed2413

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.120.pre.1)
+    istox (0.1.115)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -95,7 +95,7 @@ GEM
     ffi (1.11.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.11.2-universal-darwin)
+    google-protobuf (3.11.2)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     graphlient (0.3.7)
@@ -106,7 +106,7 @@ GEM
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.26.0-universal-darwin)
+    grpc (1.26.0)
       google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.26.0)

data/lib/istox/helpers/order_book_prorate.rb

@@ -1,29 +1,8 @@
 module Istox
   class OrderBookProrate
     class << self
-      def allocation(token_price:, min_investment:, bid_block:, # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity
-                     invest_step:, hard_cap:, investments:, whitelists: [], include_refund_amount: false)
-
-        # make sure is hashes
-        original_investments = investments.as_json.map(&:symbolize_keys)
-        whitelists = whitelists.as_json.map(&:symbolize_keys)
-        investments = investments.as_json.map(&:symbolize_keys)
-
-        # process whitelist
-        whitelists.each do |whitelist|
-          investment = investments.find { |investment1| investment1[:account_id] == whitelist[:account_id] }
-
-          next unless investment.present?
-
-          granted_amount = [::BigDecimal.new(investment[:fiat_amount].to_s), ::BigDecimal.new(whitelist[:guaranteed_allocation].to_s)].min
-
-          next unless granted_amount.positive?
-
-          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
-        end
+      def allocation(token_price:, min_investment:, bid_block:,
+                     invest_step:, hard_cap:, investments:)
 
         # sort by id asc
         interests = investments.sort do |a, b|
@@ -33,30 +12,22 @@ module Istox
 
         max_allowed_investor = Istox::FMath.round_down(::Istox::FMath.div(hard_cap, min_investment), 0).to_i
 
-        b = 0
-        interests.each_with_index.map do |interest|
-          if interest[:fiat_amount].to_d.positive? && b < max_allowed_investor
-            total_interests = ::Istox::FMath.add(total_interests, interest[:fiat_amount])
-            b += 1
-          end
+        interests.each_with_index.map do |interest, i|
+          total_interests = ::Istox::FMath.add(total_interests, interest[:fiat_amount]) if i < max_allowed_investor
         end
 
         # only need to handle when oversubscribe
         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?
+          interests = interests.each_with_index.map do |interest, i|
+            investment = if i < max_allowed_investor
                            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?
+                           result = min_investment.to_d if result < min_investment.to_d
 
-                           i += 1
                            result
                          else
                            ::BigDecimal.new('0').to_s
@@ -64,8 +35,6 @@ module Istox
 
             {
               id: interest[:id],
-              is_vip: interest[:is_vip],
-              granted_amount: interest[:granted_amount],
               investment: investment.to_s
             }
           end
@@ -79,14 +48,9 @@ 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
 
-              # allow to deduct to zero if is vip
-              deductable = if interest[:is_vip]
-                             interest[:investment]
-                           else
-                             ::Istox::FMath.sub(interest[:investment], min_investment)
-                           end
+              deductable = ::Istox::FMath.sub(interest[:investment], min_investment)
 
               if deductable.to_d > total_deducting.to_d
                 interest[:investment] = ::Istox::FMath.sub(interest[:investment], total_deducting)
@@ -98,44 +62,14 @@ module Istox
             end
           end
 
-          final_interests = interests.map do |interest|
-            interest[:investment] = ::Istox::FMath.add(interest[:investment], interest[:granted_amount]) if interest[:granted_amount].present? &&
-                                                                                                            interest[:granted_amount].to_d.positive?
-            interest.delete(:is_vip)
-            interest.delete(:granted_amount)
-
-            if include_refund_amount
-              original_investment = original_investments.find { |original_investment1| original_investment1[:id] == interest[:id] }
-              interest[:refund_amount] = ::Istox::FMath.sub(original_investment[:fiat_amount], interest[:investment])
-            end
-            interest
-          end
+          final_interests = interests
 
         else
-
-          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'
-                             ::Istox::FMath.add(vip_fiat_amount, interest[:granted_amount])
-                           else
-                             max_allowed_investor.positive? ? interest[:fiat_amount] : '0'
-                           end
-
-            max_allowed_investor -= 1 if interest[:fiat_amount].to_d.positive?
-
-            result = {
+          final_interests = interests.each_with_index.map do |interest, i|
+            {
               id: interest[:id],
-              investment: ::BigDecimal.new(final_amount.to_s).to_s
-
+              investment: i < max_allowed_investor ? ::BigDecimal.new(interest[:fiat_amount].to_s).to_s : ::BigDecimal.new('0').to_s
             }
-
-            if include_refund_amount
-              original_investment = original_investments.find { |original_investment1| original_investment1[:id] == interest[:id] }
-              refund_amount = ::Istox::FMath.sub(original_investment[:fiat_amount], final_amount)
-              result[:refund_amount] = refund_amount
-            end
-
-            result
           end
         end
 

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.120-2'.freeze
+  VERSION = '0.1.120'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.120.pre.2
+  version: 0.1.120
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -411,9 +411,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: