stellar_base-rails 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe6ab9692dc15944adea8f2affafcab9609080fa16175e95a1a1cb367202b6b4
-  data.tar.gz: 59bb102aa75f2572234d6f1c014ec35352fee2028f2e8e7b792f063ed7fa6202
+  metadata.gz: 85622b9e76b031dbafdc257c00b4761fa6ab00bc765a775519fde9e95896c310
+  data.tar.gz: e63257b33b6e9a6f14b0956560ee9f51c3f18a91c8578b79cd14a2167b7b0260
 SHA512:
-  metadata.gz: a572745d496c2b637385b5a64148575e8a4834d9bac7aec469666296663dc6e2b0e9cba7377266cbf8b713c6e76952182ba10cc21cada936508e5033adaff1de
-  data.tar.gz: 850fca96dead1e7d409ca7f8001751412d7f9b37e3dedc1b12690345158fc12c4879aaa7a7767da37871407d24f0420a4d9c62962e754ef7166d1058c6c29915
+  metadata.gz: a8b2bc1d551481662b9315be992114d6611b9b04413faf0a64588808b79b8640003bfbea9ca2b408b1bd0cb92cd31b87956a85486f4c085719316b28fec53fe1
+  data.tar.gz: 32ed7adb135d89f72513a4372bd0eed1ede4d7f0b6e20d20a55b3f334f30d02b14f82ba4a47bb5a53607e167f25528a593d1803f702551f934c32f0286c79120

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

@@ -0,0 +1,35 @@
+module StellarBase
+  module DepositRequests
+    class CreateDeposit
+
+      extend LightService::Action
+
+      expects :deposit_request, :tx_id, :amount
+      promises :deposit
+
+      executed do |c|
+        deposit_request_id = c.deposit_request.id
+        tx_id = c.tx_id
+
+        deposit = Deposit.find_by(
+          deposit_request_id: deposit_request_id,
+          tx_id: tx_id,
+        )
+
+        if deposit.present?
+          c.deposit = deposit
+          message = "Deposit already created for tx #{tx_id}; " \
+            "it's possible that the asset has been sent out"
+          c.fail_and_return! message
+        end
+
+        c.deposit = Deposit.create(
+          deposit_request_id: deposit_request_id,
+          tx_id: tx_id,
+          amount: c.amount,
+        )
+      end
+
+    end
+  end
+end

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

@@ -26,7 +26,7 @@ module StellarBase
         [
           FindConfig,
           FindDepositRequest,
-          FindOrCreateDeposit,
+          CreateDeposit,
           InitAssetSendingClient,
           InitStellarIssuerAccount,
           InitStellarRecipientAccount,

data/db/migrate/20181210043919_add_unique_index_to_deposits.rb

@@ -0,0 +1,11 @@
+class AddUniqueIndexToDeposits < ActiveRecord::Migration[5.2]
+
+  def up
+    add_index :stellar_base_deposits, %i[deposit_request_id tx_id], unique: true
+  end
+
+  def down
+    add_index :stellar_base_deposits, column: %i[deposit_request_id tx_id]
+  end
+
+end

data/lib/stellar_base/version.rb

@@ -1,3 +1,3 @@
 module StellarBase
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

data/lib/stellar_base.rb

@@ -42,6 +42,7 @@ module StellarBase
     convert_config_deposit!
     set_stellar_network!
     configure_sidekiq_death_handler!
+    configure_sending_strategy!
   end
 
   def self.on_deposit_trigger(network:, deposit_address:, tx_id:, amount:)
@@ -84,6 +85,12 @@ module StellarBase
       convert_config!(withdrawable_assets)
   end
 
+  def self.configure_sending_strategy!
+    sending_strategy = self.configuration.sending_strategy
+    return if !sending_strategy.is_a?(Symbol)
+    self.configuration.sending_strategy = Array(sending_strategy)
+  end
+
   def self.convert_config!(asset_config)
     array_of_hashes = try_from_yaml_file_path(asset_config) ||
       try_from_json(asset_config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar_base-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ace Subido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -360,6 +360,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: API Endpoints for the Stellar Protocol
 email:
 - ace.subido@gmail.com
@@ -428,11 +442,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_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 +478,7 @@ files:
 - db/migrate/20180925045927_create_stellar_base_deposit_requests.rb
 - db/migrate/20181001070647_create_stellar_base_deposits.rb
 - db/migrate/20181003072138_create_stellar_base_account_subscriptions.rb
-- db/migrate/20181013072141_ensure_deposits_tx_id_uniqueness.rb
+- db/migrate/20181210043919_add_unique_index_to_deposits.rb
 - lib/stellar_base-rails.rb
 - lib/stellar_base.rb
 - lib/stellar_base/engine.rb
@@ -498,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mountable Stellar API Endpoints for Rails

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

@@ -1,28 +0,0 @@
-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/db/migrate/20181013072141_ensure_deposits_tx_id_uniqueness.rb

@@ -1,10 +0,0 @@
-class CreateStellarBaseAccountSubscriptions < ActiveRecord::Migration[5.2]
-  def change
-    create_table :stellar_base_account_subscriptions do |t|
-      t.string :address, null: false
-      t.string :cursor
-      t.index :address, unique: true
-      t.timestamps
-    end
-  end
-end