stellar_spectrum 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ef61e24fd04852881c091a6155671ad2f53448d3fa699b3146fa19ce82b8f3a
-  data.tar.gz: d89c169967f8b853331174587aacb4b7ea8c1d0016122e12890764a404787cd6
+  metadata.gz: 15c1e0a0f9aa47c73f9c75d915fa48156c53368f618874fcca352c2fc3724288
+  data.tar.gz: e53e539e65c3e3821c7f23635a255b5e3d9f2c5f6e415dd6f00f96bc1ae58bda
 SHA512:
-  metadata.gz: a4f15d359e6c46e11f3a94b33f45c409fc9aaab50019c83d3d16dbbdf45cd08dab8c9a003c91ed47e9c8665d7431c375f04207425a22837d4bd7ab49e6778ac6
-  data.tar.gz: 00cf1675dd97d7c8574fdc43776e8f9d720c33efdd083b07577b54477f5dfbd658ea5a3c371299e88e10fbca61373c07db9942ccb37dc4aa03c0b44493f09652
+  metadata.gz: 268a94fefd0608dd5bc0ad71574816b6298713f76e22a9dd648f57fcafca344fe9b9e2cb9c804b448e2f937a8c6d9b4d821b900caceafe545252dff227a227d1
+  data.tar.gz: e098fd73295d499bbe323b30aa9949582abe49901aa9edef2bee8da62f28bb44a2a2de64accda3ea6a17232cd60aed048d01650be40d6b1697d7aca85883c543

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.1.3] - 2018-12-13
+### Fixed
+- Check if the sequence number in horizon has bumped up before unlocking
+
 ## [1.1.2] - 2018-12-13
 ### Fixed
 - Do not blow up if `Faraday::ClientError#response` is nil

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stellar_spectrum (1.1.2)
+    stellar_spectrum (1.1.3)
       activesupport
       gem_config
       light-service

data/lib/stellar_spectrum.rb

@@ -8,6 +8,7 @@ require "active_support/core_ext/hash/except"
 require "active_support/core_ext/object/blank"
 require 'active_support/core_ext/integer/inflections'
 require "stellar_spectrum/services/get_available_channels"
+require "stellar_spectrum/services/get_channel_account_info"
 require "stellar_spectrum/services/get_channel_accounts"
 require "stellar_spectrum/services/get_key_for_address"
 require "stellar_spectrum/services/get_locked_accounts"
@@ -18,9 +19,12 @@ require "stellar_spectrum/services/init_stellar_client"
 require "stellar_spectrum/services/lock_channel"
 require "stellar_spectrum/services/pick_channel"
 require "stellar_spectrum/services/send_payment"
+require "stellar_spectrum/services/sending_payment/attempt_release_lock"
 require "stellar_spectrum/services/sending_payment/retry"
 require "stellar_spectrum/services/sending_payment/send_asset"
-require "stellar_spectrum/services/unlock"
+require "stellar_spectrum/services/unlocking/attempt_release"
+require "stellar_spectrum/services/unlocking/check_sequence_number"
+require "stellar_spectrum/services/unlocking/unlock"
 
 module StellarSpectrum
 

data/lib/stellar_spectrum/services/get_channel_account_info.rb

@@ -0,0 +1,23 @@
+module StellarSpectrum
+  class GetChannelAccountInfo
+
+    extend LightService::Action
+    expects :locked_accounts, :channel_account
+    promises :channel_account_info, :unlock_response
+
+    executed do |c|
+      c.channel_account_info = c.locked_accounts[c.channel_account.address]
+
+      c.unlock_response = nil
+      next c if c.channel_account_info.present?
+
+      c.unlock_response = true
+
+      message = "#{c.channel_account.address} has been unlocked by some " \
+        "other mechanism like ttl expiration or by something else, " \
+        "so this is a success"
+      c.skip_remaining!(message)
+    end
+
+  end
+end

data/lib/stellar_spectrum/services/send_payment.rb

@@ -50,7 +50,7 @@ module StellarSpectrum
         LockChannel,
         reduce_if(->(c) {!c.successfully_locked}, SendingPayment::Retry),
         SendingPayment::SendAsset,
-        Unlock,
+        SendingPayment::AttemptReleaseLock,
       ]
     end
 

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

@@ -0,0 +1,19 @@
+module StellarSpectrum
+  module SendingPayment
+    class AttemptReleaseLock
+
+      extend LightService::Action
+      expects :stellar_client, :redis, :channel_account, :channel_accounts
+
+      executed do |c|
+        Unlocking::AttemptRelease.(
+          stellar_client: c.stellar_client,
+          redis: c.redis,
+          channel_account: c.channel_account,
+          channel_accounts: c.channel_accounts,
+        )
+      end
+
+    end
+  end
+end

data/lib/stellar_spectrum/services/unlocking/attempt_release.rb

@@ -0,0 +1,42 @@
+module StellarSpectrum
+  module Unlocking
+    class AttemptRelease
+
+      WAIT_TIME_IN_SECONDS = 5
+
+      extend LightService::Organizer
+      def self.call(redis:, channel_accounts:, channel_account:, stellar_client:)
+        result = with(
+          stellar_client: stellar_client,
+          redis: redis,
+          channel_account: channel_account,
+          channel_accounts: channel_accounts,
+        ).reduce(actions)
+
+        if result.failure?
+          puts "Failed to unlock, retry..."
+          sleep WAIT_TIME_IN_SECONDS
+          result = self.(
+            stellar_client: stellar_client,
+            redis: redis,
+            channel_account: channel_account,
+            channel_accounts: channel_accounts,
+          )
+        end
+
+        result
+      end
+
+      def self.actions
+        [
+          GetLockedAccounts,
+          GetChannelAccountInfo,
+          GetSequenceNumber,
+          CheckSequenceNumber,
+          Unlock,
+        ]
+      end
+
+    end
+  end
+end

data/lib/stellar_spectrum/services/unlocking/check_sequence_number.rb

@@ -0,0 +1,25 @@
+module StellarSpectrum
+  module Unlocking
+    class CheckSequenceNumber
+
+      extend LightService::Action
+      expects :current_sequence_number, :channel_account, :channel_account_info
+
+      executed do |c|
+        address_sequence_number = c.channel_account_info[:sequence_number].to_i
+        current_sequence_number = c.current_sequence_number
+
+        next c if current_sequence_number >= address_sequence_number
+
+        address = c.channel_account.address
+
+        message = "Not releasing #{address}: sequence number locked at " \
+          "#{address_sequence_number} is > current sequence number " \
+          "#{current_sequence_number}"
+
+        c.fail_and_return! message
+      end
+
+    end
+  end
+end

data/lib/stellar_spectrum/services/unlocking/unlock.rb

@@ -0,0 +1,17 @@
+module StellarSpectrum
+  module Unlocking
+    class Unlock
+
+      extend LightService::Action
+      expects :redis, :channel_account
+      promises :unlock_response
+
+      executed do |c|
+        address_key = GetKeyForAddress.execute(c.channel_account.address)
+        puts "Will unlock #{address_key}"
+        c.unlock_response = c.redis.del(address_key)
+      end
+
+    end
+  end
+end

data/lib/stellar_spectrum/version.rb

@@ -1,3 +1,3 @@
 module StellarSpectrum
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stellar_spectrum
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Ramon Tayag
@@ -176,6 +176,7 @@ files:
 - lib/stellar_spectrum.rb
 - lib/stellar_spectrum/client.rb
 - 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_key_for_address.rb
 - lib/stellar_spectrum/services/get_locked_accounts.rb
@@ -186,9 +187,12 @@ files:
 - lib/stellar_spectrum/services/lock_channel.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
 - lib/stellar_spectrum/services/sending_payment/retry.rb
 - lib/stellar_spectrum/services/sending_payment/send_asset.rb
-- lib/stellar_spectrum/services/unlock.rb
+- lib/stellar_spectrum/services/unlocking/attempt_release.rb
+- lib/stellar_spectrum/services/unlocking/check_sequence_number.rb
+- lib/stellar_spectrum/services/unlocking/unlock.rb
 - lib/stellar_spectrum/version.rb
 - stellar_spectrum.gemspec
 homepage: https://github.com/bloom-solutions/stellar_spectrum-ruby

data/lib/stellar_spectrum/services/unlock.rb

@@ -1,14 +0,0 @@
-module StellarSpectrum
-  class Unlock
-
-    extend LightService::Action
-    expects :redis, :channel_account
-    promises :unlock_response
-
-    executed do |c|
-      address_key = GetKeyForAddress.execute(c.channel_account.address)
-      c.unlock_response = c.redis.del(address_key)
-    end
-
-  end
-end