istox 0.1.118 → 0.1.119.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6780e67873de895958f545a604e4f07d7c6156bd4500f1b0cdf26a2775c81de7
-  data.tar.gz: 3426b0f8747328d4aa0c459336ec8dc883f3f71390dffcd9a02acae61b16c7be
+  metadata.gz: 6c7c060b93bd6ba62c8e7ff847a70eede8b1f0b1a1c36c8a257d7d87bb6bb6f9
+  data.tar.gz: adff8860c2353f3e1661d08ff862b3ff073212999d292eb6223c3a22b249b9d2
 SHA512:
-  metadata.gz: 286711adcd8fa252fc18f1004b9d93f7b0341f6fac1f55e2a23e8130813d248e710ae51f118089710a0dc180d24cd587900df1bf918f0f398819c201c5b4191d
-  data.tar.gz: 448e197b8bce37fc7191da99cdcdbb06cb953aeaf5d118392b655b9df6b427ebdf986f905b09c863a4aaba0ab8485753940e494b54ef493cda5877a9d91f3812
+  metadata.gz: 6cc8c47eb70effb080b17c0bc6a5da962374fb7a666138a9d9a0e164e663d245b99a289268887b653487b193085848442de49320555be44534030d1556ae891b
+  data.tar.gz: 0b4e36e282273f5dc580312383e3ec491202e453da319dc0af4f314d12227c9997d74cef8cddf0e4cc7f8988f65ce286436292c825a2c33857e9dc4efb46b4c5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.115)
+    istox (0.1.119)
       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)
+    google-protobuf (3.11.2-universal-darwin)
     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)
+    grpc (1.26.0-universal-darwin)
       google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.26.0)

data/lib/istox/helpers/order_book_prorate.rb

@@ -1,8 +1,29 @@
 module Istox
   class OrderBookProrate
     class << self
-      def allocation(token_price:, min_investment:, bid_block:,
-                     invest_step:, hard_cap:, investments:)
+      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
 
         # sort by id asc
         interests = investments.sort do |a, b|
@@ -26,7 +47,8 @@ module Istox
                                                                                  hard_cap), 0)
                            result = result.to_d - result.to_d.modulo(invest_step.to_s.to_d)
 
-                           result = min_investment.to_d if result < min_investment.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
                          else
@@ -35,6 +57,8 @@ module Istox
 
             {
               id: interest[:id],
+              is_vip: interest[:is_vip],
+              granted_amount: interest[:granted_amount],
               investment: investment.to_s
             }
           end
@@ -48,9 +72,14 @@ 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
+              next unless interest[:investment].to_d > min_investment.to_d || interest[:is_vip]
 
-              deductable = ::Istox::FMath.sub(interest[:investment], min_investment)
+              # allow to deduct to zero if is vip
+              deductable = if interest[:is_vip]
+                             interest[:investment]
+                           else
+                             ::Istox::FMath.sub(interest[:investment], min_investment)
+                           end
 
               if deductable.to_d > total_deducting.to_d
                 interest[:investment] = ::Istox::FMath.sub(interest[:investment], total_deducting)
@@ -62,14 +91,41 @@ module Istox
             end
           end
 
-          final_interests = interests
+          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
 
         else
-          final_interests = interests.each_with_index.map do |interest, i|
-            {
+          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 = {
               id: interest[:id],
-              investment: i < max_allowed_investor ? ::BigDecimal.new(interest[:fiat_amount].to_s).to_s : ::BigDecimal.new('0').to_s
+              investment: ::BigDecimal.new(final_amount.to_s).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/helpers/publisher.rb

@@ -59,14 +59,14 @@ module Istox
           raise "Exchange type #{exchange_config.type} is not valid/supported."
         end
 
-        publish_confirm = options[:publish_confirm].nil? ? true : options[:publish_confirm]
+        # publish_confirm = options[:publish_confirm].nil? ? true : options[:publish_confirm]
 
-        if publish_confirm
-          log.info 'Waiting for RABBITMQ publisher acknowledgement'
+        # if publish_confirm
+        #   log.info 'Waiting for RABBITMQ publisher acknowledgement'
 
-          success = channel.wait_for_confirms
-          raise 'RABBITMQ publish acknowlegement failed' unless success
-        end
+        #   success = channel.wait_for_confirms
+        #   raise 'RABBITMQ publish acknowlegement failed' unless success
+        # end
 
         log.info 'Publish RABBITMQ message success'
       end
@@ -80,7 +80,7 @@ module Istox
 
         @channel = ::Istox::BunnyBoot.channel
 
-        @channel.confirm_select
+        # @channel.confirm_select
 
         @channel
       end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.118'.freeze
+  VERSION = '0.1.119-1'.freeze
 end

metadata

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