istox 0.2.6.pre.1 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b10e86074acf007a9ed865a470cf64d86e8d933cb28580cc253dbc2014a32f
-  data.tar.gz: cb8728accbc4177d887a29b93f836dcfe710924ece8c0be52db7e428e72d724c
+  metadata.gz: 55b3c9aa9a02afcb1419637b7eac9ff25b2ac69c157668826af65e13d3c37c00
+  data.tar.gz: bcdcbe386c2ca95a3a4f8e68b617a92dbc8ea37272909a1ab48fb1e95f678f2d
 SHA512:
-  metadata.gz: 3b04f52ed3c4853b4a269a8fab6dacc2aa840c884532281f44bee09dc8166c9a01d23794d0302b0258ed82ec14999dc32e67a6b18ede9adcc0ed1beb6191c576
-  data.tar.gz: 6ca120b5e33a5b5c037e72b114b208df8a010cd2aef8c0dba32a64151a88b30a2f16cc105a70a94012e249c16c1cd2f4ad3eebba9587ac6e85ef23f74f5b5484
+  metadata.gz: a9817547969c289454deab78634271d6cb44d9f3a190de1c4de8d3e3def3f0ec7a320522bc601845286412ba215550ef8ed26fc0ffbfd02bc20a48582c8673d7
+  data.tar.gz: b071f1d3a181cd90f30e235d7425050f9c8871c4a2b8f7c1c52cf95ffe5137ff1eade6e70782dd8b9e7a9f6ce7e3c4a653e1b99210571e7eaf744f66ed8d3cc4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.2.6.pre.1)
+    istox (0.2.5.3)
       amazing_print
       awesome_print
       aws-sdk-sns (~> 1)
@@ -9,6 +9,7 @@ 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)
@@ -66,7 +67,7 @@ GEM
     amazing_print (1.3.0)
     amq-protocol (2.3.2)
     arel (9.0.0)
-    awesome_print (1.8.0)
+    awesome_print (1.9.2)
     aws-eventstream (1.1.0)
     aws-partitions (1.318.0)
     aws-sdk-core (3.96.1)
@@ -100,6 +101,7 @@ 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)
@@ -111,31 +113,44 @@ GEM
       i18n (~> 0.5)
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
-    faraday (1.3.0)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     ffi (1.15.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.13.0-universal-darwin)
-    googleapis-common-protos-types (1.0.5)
-      google-protobuf (~> 3.11)
+    google-protobuf (3.15.8-universal-darwin)
+    googleapis-common-protos-types (1.0.6)
+      google-protobuf (~> 3.14)
     graphlient (0.5.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.11.5)
+    graphql (1.12.8)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.32.0-universal-darwin)
-      google-protobuf (~> 3.13)
+    grpc (1.37.0-universal-darwin)
+      google-protobuf (~> 3.15)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.32.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)
@@ -146,6 +161,7 @@ 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)
@@ -166,8 +182,8 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    oj (3.10.14)
-    ougai (1.8.5)
+    oj (3.11.5)
+    ougai (2.0.0)
       oj (~> 3.10)
     paranoia (2.4.3)
       activerecord (>= 4.0, < 6.2)
@@ -218,7 +234,7 @@ GEM
     redis-activesupport (5.2.0)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
-    redis-namespace (1.8.0)
+    redis-namespace (1.8.1)
       redis (>= 3.0.4)
     redis-rack (2.1.3)
       rack (>= 2.0.8, < 3)
@@ -250,7 +266,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     slop (4.8.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -262,6 +278,8 @@ 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/istox.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bunny', '>= 2.12.0'
   spec.add_dependency 'exponential-backoff', '0.0.4'
   spec.add_dependency 'graphlient'
+  spec.add_dependency 'gruf'
   spec.add_dependency 'hashie', '~> 3.5.7'
   spec.add_dependency 'istox_gruf', '~> 2.7.3'
   spec.add_dependency 'listen', '~> 3.0.5'

data/lib/istox/helpers/messaging.rb

@@ -23,7 +23,7 @@ module Istox
             type: 'SEND_SMS',
             data: {
               to: targets,
-              subject: subject || 'Message from iSTOX',
+              subject: subject || 'Message from ADDX',
               body: content
             }
           }
@@ -130,7 +130,8 @@ module Istox
           email_data[:copy_emails].each do |ce|
             next unless ce.present?
 
-            copy_email_data = email_data.clone
+            # uid and sid are reserved fields that should be not cloned
+            copy_email_data = email_data.clone.except(:sid).except(:uid)
 
             # if it is just email to cc
             if ce.is_a? String
@@ -160,6 +161,25 @@ module Istox
         end
         template_data_arr.concat(copy_email_data_arr)
       end
+
+      def push_notification(template_name, template_data_arr)
+        raise ArgumentError, 'Template name and template data arr cannot be empty' if template_name.blank? || template_data_arr.nil?
+
+        return log.info 'Template data is empty, skipping this request' if template_data_arr.empty?
+
+        ::Istox::Publisher.manual_publish(
+          exchange: 'message',
+          exchange_type: 'direct',
+          routing_key: 'push_notification.message',
+          message: {
+            type: 'SEND_PUSH_NOTIFICATION',
+            data: {
+              template_name: template_name,
+              template_data_arr_json: template_data_arr.to_json
+            }
+          }
+        )
+      end
     end
   end
 end

data/lib/istox/helpers/order_book_prorate.rb

@@ -2,12 +2,19 @@ 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)
+                     invest_step:, hard_cap:, investments:, whitelists: [], include_refund_amount: false,
+                     rollover_investments: [])
 
         # 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)
+        rollover_investments = rollover_investments.as_json.map(&:symbolize_keys)
+
+        ## rollover investment is guaranteed, so it should decrease the hard cap
+        rollover_investments.map do |rollover_investment|
+          hard_cap = ::Istox::FMath.sub(hard_cap, rollover_investment[:fiat_amount])
+        end
 
         # process whitelist
         whitelists.each do |whitelist|
@@ -106,7 +113,7 @@ module Istox
 
             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])
+              interest[:refund_amount] = original_investment.present? ? ::Istox::FMath.sub(original_investment[:fiat_amount], interest[:investment]) : '0'
             end
             interest
           end
@@ -139,9 +146,16 @@ module Istox
           end
         end
 
+        transform_rollover_investments = rollover_investments.map do |rollover_investment|
+          rollover_investment[:investment] = ::BigDecimal.new(rollover_investment[:fiat_amount].to_s).to_s
+          rollover_investment[:refund_amount] = ::BigDecimal.new(0).to_s if include_refund_amount
+
+          rollover_investment.select { |k, _v| %i[id investment refund_amount].include?(k) }
+        end
+
         {
           cutoff_price: token_price.to_s,
-          interests: final_interests
+          interests: final_interests.concat(transform_rollover_investments)
         }
       end
     end

data/lib/istox/helpers/redis_manager.rb

@@ -16,14 +16,6 @@ module Istox
           db: 6
         ))
       end
-
-      # for general redis cache
-      def redis
-        @redis ||= Redis::Namespace.new(:redis_cache, redis: Redis.new(
-          url: ENV['REDIS_URL'] || 'redis://127.0.0.1:16379',
-          db: 6
-        ))
-      end
     end
   end
 end

data/lib/istox/helpers/sns_publisher.rb

@@ -14,12 +14,16 @@ module Istox
 
         message = JSON.generate(message) unless message.is_a? String
 
-        sns_client.publish(topic_arn: topic_arn || ENV.fetch('SNS_CLIENT_TOPIC', ''), message: message)
+        topic = topic_arn || ENV.fetch('SNS_CLIENT_TOPIC', '')
+
+        log.info("Publishing SNS to topic: #{topic} with message: #{message}")
+
+        sns_client.publish(topic_arn: topic, message: message)
 
         log.info('Publish to SNS successfully.')
       rescue StandardError => e
-        log.fatal 'Unable to publish SNS message.'
-        log.fatal(e)
+        log.info 'Unable to publish SNS message.'
+        log.info(e)
         log.info('Failed to publish SNS, ignoring...') unless throw_exception
 
         raise e if throw_exception

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.2.6-1'.freeze
+  VERSION = '0.2.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.2.6.pre.1
+  version: 0.2.7
 platform: ruby
 authors:
 - Siong Leng
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gruf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -517,7 +531,7 @@ files:
 homepage: http://www.abc.com
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -528,12 +542,12 @@ 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.8
-signing_key:
+rubygems_version: 3.2.11
+signing_key: 
 specification_version: 4
 summary: istox backend shared gem
 test_files: []