stellar_base-rails 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d46d85f2dc7b2aae1b07e4a4a8e14438492daed928984280164d555e14dd867
-  data.tar.gz: 75f22ebee9475714b891fa8bfc3c76bfe224d5236b81ac82a0be403117f4d8b3
+  metadata.gz: f22e8f6b9721b27567e7d2e62fd51c8e2c6b629b070d96e29206604731bdf246
+  data.tar.gz: e000fba74f9233ca242dd4c30b9c140257e8b7f349525a61dace689372a077f4
 SHA512:
-  metadata.gz: 00af460fe3e90e786c68e8854b877eb8b74ded926238f00feccbde764c8c8cd05ec26083b079e922227342cddfd6f8f6ea32f866a989567292cd1b110fcf75a8
-  data.tar.gz: 63701fb3cbb3bc43c7c92f4b20d6efda1c0cc6b13fcaa8173fadeaecca0105273de7745776ab55e8d7dac4aa49a0ede6b71d40373e56feee2b7c212aa4524a28
+  metadata.gz: f9113f82ff8dc5152c0a32c26ffec2b483f1e2ad4cdd3bcd05328d0ac7d8863cb76c9e164c75b25982b4acdad0880068db2a684400db38a2f029663e66c2cf14
+  data.tar.gz: 27b0f46b04509a9d526f9e5399059b64cbb1d4d735dffa3c9c8007b8d1316da137c37f10229b9946d5d9f43c7845f70851efab31e01741486c9654a9b3e13838

data/app/services/stellar_base/deposit_requests/find_or_create_deposit.rb

@@ -0,0 +1,28 @@
+module StellarBase
+  module DepositRequests
+    class FindOrCreateDeposit
+
+      extend LightService::Action
+
+      expects :deposit_request, :tx_id, :amount
+      promises :deposit
+
+      executed do |c|
+        c.deposit = Deposit.find_or_create_by(
+          deposit_request_id: c.deposit_request.id,
+          tx_id: c.tx_id,
+        ) do |deposit|
+          deposit.amount = c.amount
+        end
+
+        stellar_tx_id = c.deposit.stellar_tx_id
+
+        if stellar_tx_id.present?
+          c.skip_remaining! "Deposit previously made: stellar_tx_id " \
+            "#{stellar_tx_id}, skipping"
+        end
+      end
+
+    end
+  end
+end

data/app/services/stellar_base/deposit_requests/trigger.rb

@@ -17,8 +17,7 @@ module StellarBase
         [
           FindConfig,
           FindDepositRequest,
-          FindDeposit,
-          CreateDeposit,
+          FindOrCreateDeposit,
           InitStellarClient,
           InitStellarIssuerAccount,
           InitStellarRecipientAccount,
@@ -26,7 +25,7 @@ module StellarBase
           InitStellarAsset,
           InitStellarAmount,
           SendAsset,
-          UpdateDeposit, # save the stellar operation id on it
+          UpdateDeposit,
         ]
       end
 

data/lib/stellar_base/version.rb

@@ -1,3 +1,3 @@
 module StellarBase
-  VERSION = "0.9.5".freeze
+  VERSION = "0.9.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar_base-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Ace Subido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -394,12 +394,11 @@ files:
 - app/services/stellar_base/bridge_callbacks/process.rb
 - app/services/stellar_base/bridge_callbacks/verify_mac_payload.rb
 - app/services/stellar_base/configured_class_runner.rb
-- app/services/stellar_base/deposit_requests/create_deposit.rb
 - app/services/stellar_base/deposit_requests/determine_how.rb
 - app/services/stellar_base/deposit_requests/find_config.rb
-- app/services/stellar_base/deposit_requests/find_deposit.rb
 - app/services/stellar_base/deposit_requests/find_deposit_request.rb
 - app/services/stellar_base/deposit_requests/find_depositable_asset.rb
+- app/services/stellar_base/deposit_requests/find_or_create_deposit.rb
 - app/services/stellar_base/deposit_requests/init_stellar_amount.rb
 - app/services/stellar_base/deposit_requests/init_stellar_asset.rb
 - app/services/stellar_base/deposit_requests/init_stellar_distribution_account.rb
@@ -464,7 +463,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mountable Stellar API Endpoints for Rails

data/app/services/stellar_base/deposit_requests/create_deposit.rb

@@ -1,19 +0,0 @@
-module StellarBase
-  module DepositRequests
-    class CreateDeposit
-
-      extend LightService::Action
-      expects :tx_id, :amount, :deposit_request
-      promises :deposit
-
-      executed do |c|
-        c.deposit = Deposit.create!(
-          tx_id: c.tx_id,
-          amount: c.amount,
-          deposit_request_id: c.deposit_request.id,
-        )
-      end
-
-    end
-  end
-end

data/app/services/stellar_base/deposit_requests/find_deposit.rb

@@ -1,23 +0,0 @@
-module StellarBase
-  module DepositRequests
-    class FindDeposit
-
-      extend LightService::Action
-
-      expects :deposit_request, :tx_id
-      promises :deposit
-
-      executed do |c|
-        c.deposit = Deposit.find_by(
-          deposit_request_id: c.deposit_request.id,
-          tx_id: c.tx_id,
-        )
-
-        if c.deposit.present?
-          c.skip_remaining!("Deposit trigger previously made, skipping")
-        end
-      end
-
-    end
-  end
-end