stellar_spectrum 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d41ff5a6de38a651fef926df476b73d8bbbc04c91e4305d5ed8d7f7fcd728e25
-  data.tar.gz: e5e435e16159687d38d399723bf1a8c96fb03f485bd28cde43aa30cff80fb708
+  metadata.gz: 9bde5c4526ef6395789a0f36643e1b172f2ee39b27d92783ae33c90f361ccccf
+  data.tar.gz: 4fabffb86d4194e6c278c91aabbd57027561101f025e91c0760d01f59ed95c23
 SHA512:
-  metadata.gz: 9ba2427f94404372c0a2a4ce4cdfa378d03164befbf4bd2bdb39abc1d6a3b8d7cb90ac701a12bad7f2143722df6785c4a11257fb3b0eafa0cf93a07682869ecf
-  data.tar.gz: e72181488d54adef9c6c2b44682071f6f35645a33a46b15aaa45e3403101fb4df2c40e1667be97d404eb989bef872b88bc58496c6292bf741d393308f69172c7
+  metadata.gz: e59d089d618d4957a4b1c1f853b329f484ccf50289b59c811af883720996fdab88a6d2856318971b5fcaecc1678d164d5e33ef349199cb2be677565ac7f59fa6
+  data.tar.gz: 4546b8bd18f5f460d761d687d93a95e8423d5105b2dff88775b0e1bf534b7d353eb16526daefa40ae166522520219225c7bc3db7658e8422872f11dbaecb8054

data/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.0] - 2019-01-18
+### Added
+- Retry calls to Stellar horizon API regardless of the type of error code it receives.
+- Log, if logger is set, when exceptions occur and payment is retried.
+
 ## [1.1.4] - 2018-12-13
 ### Fixed
 - Remove accidentally added puts :/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stellar_spectrum (1.1.4)
+    stellar_spectrum (1.2.0)
       activesupport
       gem_config
       light-service
@@ -24,7 +24,7 @@ GEM
     byebug (10.0.2)
     citrus (3.0.2)
     coderay (1.1.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     contracts (0.16.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -40,7 +40,7 @@ GEM
       faraday_middleware (~> 0.9)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.25)
+    ffi (1.10.0)
     gem_config (0.3.1)
     hashdiff (0.3.7)
     hyperclient (0.9.0)
@@ -50,7 +50,7 @@ GEM
       faraday_middleware
       net-http-digest_auth
       uri_template
-    i18n (1.2.0)
+    i18n (1.5.2)
       concurrent-ruby (~> 1.0)
     light-service (0.11.0)
       activesupport (>= 3.0)
@@ -68,7 +68,7 @@ GEM
     rake (10.5.0)
     rbnacl (6.0.0)
       ffi
-    redis (4.0.3)
+    redis (4.1.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)

data/lib/stellar_spectrum.rb

@@ -13,10 +13,12 @@ require "stellar_spectrum/services/get_channel_accounts"
 require "stellar_spectrum/services/get_key_for_address"
 require "stellar_spectrum/services/get_locked_accounts"
 require "stellar_spectrum/services/get_sequence_number"
+require "stellar_spectrum/services/get_current_sequence_number"
 require "stellar_spectrum/services/increment_tries"
 require "stellar_spectrum/services/init_redis"
 require "stellar_spectrum/services/init_stellar_client"
 require "stellar_spectrum/services/lock_channel"
+require "stellar_spectrum/services/log"
 require "stellar_spectrum/services/pick_channel"
 require "stellar_spectrum/services/send_payment"
 require "stellar_spectrum/services/sending_payment/attempt_release_lock"

data/lib/stellar_spectrum/client.rb

@@ -4,21 +4,17 @@ module StellarSpectrum
     attr_accessor :redis_url
     attr_accessor :seeds
     attr_accessor :horizon_url
-    attr_accessor :logger
 
-    LOG_TAG = "[StellarSpectrum]"
     MAX_LOCK_TIME_IN_SECONDS = 120
 
     def initialize(
       redis_url: StellarSpectrum.configuration.redis_url,
       seeds: StellarSpectrum.configuration.seeds,
-      horizon_url: StellarSpectrum.configuration.horizon_url,
-      logger: StellarSpectrum.configuration.logger
+      horizon_url: StellarSpectrum.configuration.horizon_url
     )
       self.redis_url = redis_url
       self.seeds = seeds
       self.horizon_url = horizon_url
-      self.logger = logger
     end
 
     def send_payment(
@@ -42,10 +38,6 @@ module StellarSpectrum
         force_lock: false,
       )
 
-      # if result.failure?
-        # return false
-      # end
-
       result.send_asset_response
     end
   end

data/lib/stellar_spectrum/services/get_current_sequence_number.rb

@@ -0,0 +1,13 @@
+module StellarSpectrum
+  class GetCurrentSequenceNumber
+
+    def self.execute(stellar_client:, channel_account:)
+      account_info = stellar_client.account_info(channel_account)
+      account_info.sequence.to_i
+    rescue Faraday::ClientError => e
+      Log.warn("Retrying GetCurrentSequenceNumber - #{e.inspect}")
+      execute(stellar_client: stellar_client, channel_account: channel_account)
+    end
+
+  end
+end

data/lib/stellar_spectrum/services/get_sequence_number.rb

@@ -6,8 +6,10 @@ module StellarSpectrum
     promises :current_sequence_number, :next_sequence_number
 
     executed do |c|
-      account_info = c.stellar_client.account_info(c.channel_account)
-      c.current_sequence_number = account_info.sequence.to_i
+      c.current_sequence_number = GetCurrentSequenceNumber.execute(
+        stellar_client: c.stellar_client, 
+        channel_account: c.channel_account
+      )
 
       c.next_sequence_number = c[:force_sequence_number] ||
         c.current_sequence_number + 1

data/lib/stellar_spectrum/services/log.rb

@@ -0,0 +1,21 @@
+module StellarSpectrum
+  class Log
+    
+    TAG = "[StellarSpectrum]".freeze
+    LEVELS = [:debug, :warn, :info, :error, :fatal].freeze
+
+    class << self
+      LEVELS.each do |level|
+
+        define_method level do |message|
+          logger = StellarSpectrum.configuration.logger
+          if logger
+            logger.send(level, "#{TAG}: #{message}")
+          end
+        end
+
+      end
+    end
+
+  end
+end

data/lib/stellar_spectrum/services/sending_payment/send_asset.rb

@@ -3,7 +3,6 @@ module StellarSpectrum
     class SendAsset
 
       extend LightService::Action
-      TIMEOUT_CODE = 504.freeze
 
       expects *%i[
         from
@@ -31,27 +30,22 @@ module StellarSpectrum
           sequence: c.next_sequence_number,
         )
       rescue Faraday::ClientError => e
-        fail if e.response.nil?
-
-        if e.response[:status] == TIMEOUT_CODE
-          retry_result = Retry.execute(
-            stellar_client: c.stellar_client,
-            from: c.from,
-            to: c.to,
-            amount: c.amount,
-            memo: c.memo,
-            tries: c.tries,
-            seeds: c.seeds,
-            horizon_url: c.horizon_url,
-            redis_url: c.redis_url,
-            force_transaction_source: c.channel_account,
-            force_sequence_number: c.next_sequence_number,
-            force_lock: true,
-          )
-          c.send_asset_response = retry_result[:send_asset_response]
-        else
-          fail
-        end
+        Log.warn("Retrying SendingPayment::SendAsset - #{e.inspect}")
+        retry_result = Retry.execute(
+          stellar_client: c.stellar_client,
+          from: c.from,
+          to: c.to,
+          amount: c.amount,
+          memo: c.memo,
+          tries: c.tries,
+          seeds: c.seeds,
+          horizon_url: c.horizon_url,
+          redis_url: c.redis_url,
+          force_transaction_source: c.channel_account,
+          force_sequence_number: c.next_sequence_number,
+          force_lock: true,
+        )
+        c.send_asset_response = retry_result[:send_asset_response]
       end
 
     end

data/lib/stellar_spectrum/version.rb

@@ -1,3 +1,3 @@
 module StellarSpectrum
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stellar_spectrum
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Ramon Tayag
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,6 +178,7 @@ files:
 - lib/stellar_spectrum/services/get_available_channels.rb
 - lib/stellar_spectrum/services/get_channel_account_info.rb
 - lib/stellar_spectrum/services/get_channel_accounts.rb
+- lib/stellar_spectrum/services/get_current_sequence_number.rb
 - lib/stellar_spectrum/services/get_key_for_address.rb
 - lib/stellar_spectrum/services/get_locked_accounts.rb
 - lib/stellar_spectrum/services/get_sequence_number.rb
@@ -185,6 +186,7 @@ files:
 - lib/stellar_spectrum/services/init_redis.rb
 - lib/stellar_spectrum/services/init_stellar_client.rb
 - lib/stellar_spectrum/services/lock_channel.rb
+- lib/stellar_spectrum/services/log.rb
 - lib/stellar_spectrum/services/pick_channel.rb
 - lib/stellar_spectrum/services/send_payment.rb
 - lib/stellar_spectrum/services/sending_payment/attempt_release_lock.rb