istox 0.1.119.pre.1 → 0.1.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c7c060b93bd6ba62c8e7ff847a70eede8b1f0b1a1c36c8a257d7d87bb6bb6f9
-  data.tar.gz: adff8860c2353f3e1661d08ff862b3ff073212999d292eb6223c3a22b249b9d2
+  metadata.gz: d369f69df949441ab14c3fac0c794b92d17d5fe3a6c5a54859fddecf530eb6c8
+  data.tar.gz: 0c588144bc9be77609880360723f28e7db90764d46eb12063ad57c0d8c497649
 SHA512:
-  metadata.gz: 6cc8c47eb70effb080b17c0bc6a5da962374fb7a666138a9d9a0e164e663d245b99a289268887b653487b193085848442de49320555be44534030d1556ae891b
-  data.tar.gz: 0b4e36e282273f5dc580312383e3ec491202e453da319dc0af4f314d12227c9997d74cef8cddf0e4cc7f8988f65ce286436292c825a2c33857e9dc4efb46b4c5
+  metadata.gz: f152ebf349268814c9a1dcd73fd9a59475b22d2f55d014afd3e5917c99ac59eb5346129c205ed9d2aecc315cd7ae897caf58a1dd4fa7bf81fbb1e565effda6e4
+  data.tar.gz: 57d185c7104b0a6b7eebc2155c226e8ff3fcc786f19ce99c236b8417db76a9f77e8dd4b846a084b89676313f963661f30f560960c552d9efb75999b3e074c6a8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.119)
+    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|
@@ -47,8 +26,7 @@ module Istox
                                                                                  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
 
                            result
                          else
@@ -57,8 +35,6 @@ module Istox
 
             {
               id: interest[:id],
-              is_vip: interest[:is_vip],
-              granted_amount: interest[:granted_amount],
               investment: investment.to_s
             }
           end
@@ -72,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)
@@ -91,41 +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]
-                             ::Istox::FMath.add(interest[:fiat_amount], interest[:granted_amount])
-                           else
-                             max_allowed_investor.positive? ? interest[:fiat_amount] : '0'
-                           end
-
-            max_allowed_investor -= 1
-            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.119-1'.freeze
+  VERSION = '0.1.119'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.119.pre.1
+  version: 0.1.119
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-01-14 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: