stellar_base-rails 1.1.2 → 2.0.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a319a99fc2f060ee9f0daad71147adee9690ccb924eed9188fbd96dbfecb4fa
-  data.tar.gz: a8028f862188d0211e071825534cd7e7ff7d3437dc7bbb011679ea66c4133ca5
+  metadata.gz: e77799d69798a3dcad04f791128556561d0ad1c08f5711a2379d1bbcccbc5d64
+  data.tar.gz: 9f3f1524dcbc5fe322d41bb753ad035f26383abeeca017c477d10baa64e049b3
 SHA512:
-  metadata.gz: 9458ac072fb4656e2a4f28a761a93a4a4116f89afbed22143803b59c205aec589ac71ccad4869671f17005751c1cb707787fa71cbc67cc12e88ea95514868e06
-  data.tar.gz: b9d982cfbbaf1fb061c0d47b4eb48126c397d55e7148776c380161efad8f9004078a1e365c187476577c7eac4c39612c8812370b6564283db33b6fd9431ecc23
+  metadata.gz: f9c6fc4d4f505bd85c2eaf42e2611ceeba8468e771391afcc28a37172d9e90f54c75eeef60419903999f520305ce965c271fb7facc7c130caea537d643d04148
+  data.tar.gz: 64274b0663f9a83197375bc81ab405545c0ad8e0ecb46423e69d72e49c45c6e4b1a1db507864ccf586e86ed0005a3b20cc04976053b3cd0c0cc57bb36999dfc8

data/app/models/stellar_base/stellar_operation.rb

@@ -1,49 +1,14 @@
 module StellarBase
-  class StellarOperation
+  class StellarOperation < ApplicationRecord
 
-    include Virtus.model
+    include Storext.model
+    store :data, coder: JSON
 
-    attribute :raw, Object
-    attribute :id, String, default: :default_id, lazy: true
-    attribute :paging_token, String, default: :default_paging_token, lazy: true
-    attribute :source_account, String, default: :default_source_account, lazy: true
-    attribute :type, String, default: :default_type, lazy: true
-    attribute :type_i, Integer, default: :default_type_i, lazy: true
-    attribute :created_at, DateTime, default: :default_created_at, lazy: true
-    attribute :transaction_hash, String, default: :default_transaction_hash, lazy: true
-    attribute :asset_type, String, default: :default_asset_type, lazy: true
-    attribute :asset_code, String, default: :default_asset_code, lazy: true
-    attribute :asset_issuer, String, default: :default_asset_issuer, lazy: true
-    attribute :from, String, default: :default_from, lazy: true
-    attribute :to, String, default: :default_to, lazy: true
-    attribute :amount, BigDecimal, default: :default_amount, lazy: true
-    attribute :starting_balance, BigDecimal, default: :default_starting_balance, lazy: true
-    attribute :funder, String, default: :default_funder, lazy: true
-    attribute :account, String, default: :default_account, lazy: true
+    belongs_to(:stellar_transaction, {
+      class_name: "StellarBase::StellarTransaction",
+      primary_key: :transaction_id,
+      foreign_key: :transaction_hash,
+    })
 
-    private
-
-    %i[
-      id
-      paging_token
-      source_account
-      type
-      type_i
-      created_at
-      transaction_hash
-      starting_balance
-      funder
-      account
-      asset_type
-      asset_code
-      asset_issuer
-      from
-      to
-      amount
-    ].each do |attr|
-      define_method :"default_#{attr}" do
-        raw.to_hash[attr.to_s]
-      end
-    end
   end
 end

data/app/models/stellar_base/stellar_payment.rb

@@ -0,0 +1,14 @@
+module StellarBase
+  class StellarPayment < StellarOperation
+
+    store_attributes :data do
+      amount BigDecimal
+      asset_code String
+      asset_issuer Boolean
+      asset_type String
+      from String
+      to String
+    end
+
+  end
+end

data/app/models/stellar_base/stellar_transaction.rb

@@ -1,50 +1,11 @@
 module StellarBase
-  class StellarTransaction
+  class StellarTransaction < ApplicationRecord
 
-    include Virtus.model
-
-    attribute :raw, Object
-    attribute :id, String, default: :default_id, lazy: true
-    attribute :paging_token, String, default: :default_paging_token, lazy: true
-    attribute :ledger, Integer, default: :default_ledger, lazy: true
-    attribute :created_at, DateTime, default: :default_created_at, lazy: true
-    attribute :source_account, String, default: :default_source_account, lazy: true
-    attribute :source_account_sequence, String, default: :default_source_account_sequence, lazy: true
-    attribute :fee_paid, Integer, default: :default_fee_paid, lazy: true
-    attribute :operation_count, Integer, default: :default_operation_count, lazy: true
-    attribute :envelope_xdr, String, default: :default_envelope_xdr, lazy: true
-    attribute :result_xdr, String, default: :default_result_xdr, lazy: true
-    attribute :result_meta_xdr, String, default: :default_result_meta_xdr, lazy: true
-    attribute :fee_meta_xdr, String, default: :default_fee_meta_xdr, lazy: true
-    attribute :memo_type, String, default: :default_memo_type, lazy: true
-    attribute :memo, String, default: :default_memo, lazy: true
-    attribute :signatures, Array, default: :default_signatures, lazy: true
-    attribute :valid_after, DateTime, default: :default_valid_after, lazy: true
-
-    private
-
-    %i[
-      id
-      paging_token
-      ledger
-      created_at
-      source_account
-      source_account_sequence
-      fee_paid
-      operation_count
-      envelope_xdr
-      result_xdr
-      result_meta_xdr
-      fee_meta_xdr
-      memo_type
-      memo
-      signatures
-      valid_after
-    ].each do |attr|
-      define_method :"default_#{attr}" do
-        raw.to_hash[attr.to_s]
-      end
-    end
+    has_many(:stellar_operations, {
+      class_name: "StellarBase::StellarOperation",
+      primary_key: :transaction_id,
+      foreign_key: :transaction_hash,
+    })
 
   end
 end

data/app/services/stellar_base/account_subscriptions/execute_account_subscription_callback.rb

@@ -0,0 +1,19 @@
+module StellarBase
+  module AccountSubscriptions
+    class ExecuteAccountSubscriptionCallback
+
+      extend LightService::Action
+      expects(*%i[
+        account_subscription
+        stellar_operation
+        on_account_event
+      ])
+
+      executed do |c|
+        next c if c.on_account_event.nil?
+        c.on_account_event.(c.account_subscription.address, c.stellar_operation)
+      end
+
+    end
+  end
+end

data/app/services/stellar_base/account_subscriptions/find_or_create_operation.rb

@@ -0,0 +1,42 @@
+module StellarBase
+  module AccountSubscriptions
+    class FindOrCreateOperation
+
+      extend LightService::Action
+      expects :remote_operation
+      promises :stellar_operation
+
+      SUPPORTED_TYPES = %w(payment).freeze
+
+      executed do |c|
+        remote_operation = c.remote_operation
+
+        c.stellar_operation = StellarOperation.
+          find_by(operation_id: remote_operation["id"])
+
+        next c if c.stellar_operation.present?
+
+        if SUPPORTED_TYPES.include?(remote_operation["type"])
+          klass = StellarBase.
+            const_get("stellar_#{remote_operation["type"]}".classify)
+          c.stellar_operation = klass.create!(
+            operation_id: remote_operation["id"],
+            transaction_hash: remote_operation["transaction_hash"],
+            asset_code: remote_operation["asset_code"],
+            asset_issuer: remote_operation["asset_issuer"],
+            from: remote_operation["from"],
+            to: remote_operation["to"],
+            amount: remote_operation["amount"],
+          )
+        else
+          c.stellar_operation = StellarOperation.create!(
+            operation_id: remote_operation["id"],
+            transaction_hash: remote_operation["transaction_hash"],
+          )
+        end
+
+      end
+
+    end
+  end
+end

data/app/services/stellar_base/account_subscriptions/find_or_create_transaction.rb

@@ -0,0 +1,26 @@
+module StellarBase
+  module AccountSubscriptions
+    class FindOrCreateTransaction
+
+      extend LightService::Action
+      expects :remote_transaction
+      promises :stellar_transaction
+
+      executed do |c|
+        remote_transaction = c.remote_transaction
+
+        c.stellar_transaction = StellarTransaction.
+          find_by(transaction_id: remote_transaction["id"])
+
+        next c if c.stellar_transaction.present?
+
+        c.stellar_transaction = StellarTransaction.create!(
+          transaction_id: remote_transaction["id"],
+          memo: remote_transaction["memo"],
+          memo_type: remote_transaction["memo_type"],
+        )
+      end
+
+    end
+  end
+end

data/app/services/stellar_base/account_subscriptions/{get_operations.rb → get_remote_operations.rb}

@@ -1,6 +1,6 @@
 module StellarBase
   module AccountSubscriptions
-    class GetOperations
+    class GetRemoteOperations
 
       extend LightService::Action
       expects(
@@ -9,19 +9,18 @@ module StellarBase
         :stellar_sdk_client,
         :operation_limit,
       )
-      promises :operations
+      promises :remote_operations
 
       executed do |c|
         address = c.account_subscription.address
 
-        c.operations = c.stellar_sdk_client
+        c.remote_operations = c.stellar_sdk_client
           .horizon
           .account(account_id: address)
           .operations(order: "asc", cursor: c.cursor, limit: c.operation_limit)
-          .records
-          .map { |op| StellarOperation.new(raw: op) }
+          .records.map(&:to_hash)
 
-        if c.operations.empty?
+        if c.remote_operations.empty?
           c.fail_and_return! "No operations found for #{address}"
         end
       rescue Faraday::ClientError => e

data/app/services/stellar_base/account_subscriptions/get_remote_transaction.rb

@@ -0,0 +1,17 @@
+module StellarBase
+  module AccountSubscriptions
+    class GetRemoteTransaction
+
+      extend LightService::Action
+      expects :stellar_sdk_client, :remote_operation
+      promises :remote_transaction
+
+      executed do |c|
+        hash = c.remote_operation["transaction_hash"]
+        c.remote_transaction = c.stellar_sdk_client.horizon.
+          transaction(hash: hash).to_hash
+      end
+
+    end
+  end
+end

data/app/services/stellar_base/account_subscriptions/process_withdrawal.rb

@@ -0,0 +1,14 @@
+module StellarBase
+  module AccountSubscriptions
+    class ProcessWithdrawal
+
+      extend LightService::Action
+      expects :stellar_operation
+
+      executed do |c|
+        WithdrawalRequests::Process.(c.stellar_operation)
+      end
+
+    end
+  end
+end

data/app/services/stellar_base/account_subscriptions/save_cursor.rb

@@ -3,10 +3,11 @@ module StellarBase
     class SaveCursor
 
       extend LightService::Action
-      expects :account_subscription, :operations
+      expects :account_subscription, :remote_operations
 
       executed do |c|
-        c.account_subscription.update!(cursor: c.operations.last.id)
+        last_operation = c.remote_operations.last
+        c.account_subscription.update!(cursor: last_operation["id"])
       end
 
     end

data/app/services/stellar_base/subscribe_account.rb

@@ -23,10 +23,13 @@ module StellarBase
       [
         InitStellarClient,
         AccountSubscriptions::GetCursor,
-        AccountSubscriptions::GetOperations,
-        iterate(:operations, [
-          AccountSubscriptions::GetTx,
-          AccountSubscriptions::ExecuteCallback,
+        AccountSubscriptions::GetRemoteOperations,
+        iterate(:remote_operations, [
+          AccountSubscriptions::GetRemoteTransaction,
+          AccountSubscriptions::FindOrCreateTransaction,
+          AccountSubscriptions::FindOrCreateOperation,
+          AccountSubscriptions::ExecuteAccountSubscriptionCallback,
+          AccountSubscriptions::ProcessWithdrawal,
         ]),
         AccountSubscriptions::SaveCursor,
       ]

data/app/services/stellar_base/withdrawal_requests/call_on_withdraw.rb

@@ -3,14 +3,15 @@ module StellarBase
     class CallOnWithdraw
 
       extend LightService::Action
-      expects :withdrawal_request, :bridge_callback, :on_withdraw
+      expects :withdrawal_request, :stellar_operation, :on_withdraw
 
       ON_WITHDRAW_ERROR = "`on_withdraw` must be a string of an object " \
         "that responds to `.call` or the object itself"
 
       executed do |c|
+        next c if c.on_withdraw.nil?
         callback = callback_from(c.on_withdraw)
-        callback.(c.withdrawal_request, c.bridge_callback)
+        callback.(c.withdrawal_request, c.stellar_operation)
       end
 
       def self.callback_from(on_withdraw)

data/app/services/stellar_base/withdrawal_requests/find_withdrawal_request.rb

@@ -3,33 +3,44 @@ module StellarBase
     class FindWithdrawalRequest
 
       extend LightService::Action
-      expects :bridge_callback
+      expects :stellar_operation
       promises :withdrawal_request
 
-      MATCH_WITHDRAWAL_REQUEST_TO_BRIDGE_CALLBACK_MAP = {
-        asset_code: :asset_code,
-        issuer: :asset_issuer,
+      MATCH_WITHDRAWAL_REQUEST_TO_STELLAR_TX_MAP = {
         memo_type: :memo_type,
         memo: :memo,
       }.freeze
 
+      MATCH_WITHDRAWAL_REQUEST_TO_STELLAR_OP_MAP = {
+        asset_code: :asset_code,
+        issuer: :asset_issuer,
+      }.freeze
+
       executed do |c|
-        bridge_callback = c.bridge_callback
-        c.withdrawal_request = withdrawal_request = WithdrawalRequest.
-          find_by(memo: bridge_callback.memo)
+        stellar_operation = c.stellar_operation
+        stellar_transaction = stellar_operation.stellar_transaction
+
+        c.withdrawal_request = withdrawal_request =
+          WithdrawalRequest.find_by(memo: stellar_transaction.memo)
 
         if withdrawal_request.nil?
           c.skip_remaining!
           next c
         end
 
-        map = MATCH_WITHDRAWAL_REQUEST_TO_BRIDGE_CALLBACK_MAP
-        mismatch = map.any? do |withdrawal_request_attr, bridge_callback_attr|
+        tx_map = MATCH_WITHDRAWAL_REQUEST_TO_STELLAR_TX_MAP
+        mismatch_tx = tx_map.any? do |withdrawal_request_attr, stellar_tx_attr|
+          withdrawal_request.send(withdrawal_request_attr) !=
+            stellar_transaction.send(stellar_tx_attr)
+        end
+
+        op_map = MATCH_WITHDRAWAL_REQUEST_TO_STELLAR_OP_MAP
+        mismatch_op = op_map.any? do |withdrawal_request_attr, stellar_op_attr|
           withdrawal_request.send(withdrawal_request_attr) !=
-            bridge_callback.send(bridge_callback_attr)
+            stellar_operation.send(stellar_op_attr)
         end
 
-        if mismatch
+        if [mismatch_tx, mismatch_op].any?
           c.skip_remaining!
           next c
         end

data/app/services/stellar_base/withdrawal_requests/process.rb

@@ -5,11 +5,11 @@ module StellarBase
       extend LightService::Organizer
 
       def self.call(
-        bridge_callback,
+        operation,
         on_withdraw: StellarBase.configuration.on_withdraw
       )
         with(
-          bridge_callback: bridge_callback,
+          stellar_operation: operation,
           on_withdraw: on_withdraw,
         ).reduce(actions)
       end

data/db/migrate/20181217090323_create_stellar_transactions_and_operations.rb

@@ -0,0 +1,21 @@
+class CreateStellarTransactionsAndOperations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :stellar_base_stellar_operations do |t|
+      t.string :operation_id, null: false
+      t.string :transaction_hash, null: false
+      t.string :type
+      t.text :data
+      t.index :operation_id, unique: true
+      t.timestamps
+    end
+
+    create_table :stellar_base_stellar_transactions do |t|
+      t.string :transaction_id, null: false
+      t.string :memo
+      t.string :memo_type
+      t.index :memo
+      t.index :transaction_id, unique: true
+      t.timestamps
+    end
+  end
+end

data/lib/stellar_base/factories/stellar_operations.rb

@@ -2,20 +2,24 @@ FactoryBot.define do
   factory(:stellar_base_stellar_operation, {
     class: "StellarBase::StellarOperation"
   }) do
-    id "id"
-    paging_token "1234"
-    source_account "G-TEST"
-    type "payment"
-    type_i { 1 }
-    created_at { Time.zone.now }
+    operation_id "id"
     transaction_hash "tx1234"
-    asset_type "native"
+    association(:stellar_transaction, {
+      factory: :stellar_base_stellar_transaction,
+    })
+  end
+
+  factory(:stellar_base_stellar_payment, {
+    class: "StellarBase::StellarPayment",
+    parent: :stellar_base_stellar_operation,
+  }) do
     asset_code nil
     asset_issuer nil
     from "G-SOURCE"
     to "G-RECIPIENT"
     amount 10.0
-
-    skip_create
+    association(:stellar_transaction, {
+      factory: :stellar_base_stellar_transaction,
+    })
   end
 end

data/lib/stellar_base/factories/stellar_transactions.rb

@@ -1,27 +1,7 @@
 FactoryBot.define do
   factory :stellar_base_stellar_transaction, class: "StellarBase::StellarTransaction" do
-    id { "1234" }
-    paging_token { "1234" }
-    ledger { 120 }
-    created_at { DateTime.parse("2018-10-04T09:36:18Z") }
-    source_account { "G-SOURCE" }
-    source_account_sequence { "1" }
-    fee_paid { 1000 }
-    operation_count { 10 }
-    envelope_xdr { "AAA" }
-    result_xdr { "BBB" }
-    result_meta_xdr { "CCC" }
-    fee_meta_xdr { "DDD" }
-    memo_type { "none" }
-    signatures do
-      [
-        "SIG1===",
-        "SIG2===",
-        "SIG3===",
-        "SIG4===",
-      ]
-    end
-
-    skip_create
+    transaction_id { "1234" }
+    memo_type { "text" }
+    memo { "VBA" }
   end
 end

data/lib/stellar_base/version.rb

@@ -1,3 +1,3 @@
 module StellarBase
-  VERSION = "1.1.2".freeze
+  VERSION = "2.0.0-alpha.1".freeze
 end

data/lib/stellar_base.rb

@@ -13,6 +13,7 @@ require "representable"
 require "toml-rb"
 require "sidekiq"
 require "sidekiq-unique-jobs"
+require "storext"
 
 require "stellar_base/engine"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar_base-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0.pre.alpha.1
 platform: ruby
 authors:
 - Ace Subido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
+- !ruby/object:Gem::Dependency
+  name: storext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: toml-rb
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +318,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -433,6 +461,7 @@ files:
 - app/models/stellar_base/deposit.rb
 - app/models/stellar_base/deposit_request.rb
 - app/models/stellar_base/stellar_operation.rb
+- app/models/stellar_base/stellar_payment.rb
 - app/models/stellar_base/stellar_toml.rb
 - app/models/stellar_base/stellar_transaction.rb
 - app/models/stellar_base/withdrawal_request.rb
@@ -440,10 +469,13 @@ files:
 - app/representers/stellar_base/balance_representer.rb
 - app/representers/stellar_base/deposit_request_representer.rb
 - app/representers/stellar_base/withdrawal_request_representer.rb
-- app/services/stellar_base/account_subscriptions/execute_callback.rb
+- app/services/stellar_base/account_subscriptions/execute_account_subscription_callback.rb
+- app/services/stellar_base/account_subscriptions/find_or_create_operation.rb
+- app/services/stellar_base/account_subscriptions/find_or_create_transaction.rb
 - app/services/stellar_base/account_subscriptions/get_cursor.rb
-- app/services/stellar_base/account_subscriptions/get_operations.rb
-- app/services/stellar_base/account_subscriptions/get_tx.rb
+- app/services/stellar_base/account_subscriptions/get_remote_operations.rb
+- app/services/stellar_base/account_subscriptions/get_remote_transaction.rb
+- app/services/stellar_base/account_subscriptions/process_withdrawal.rb
 - app/services/stellar_base/account_subscriptions/save_cursor.rb
 - app/services/stellar_base/bridge_callbacks/check.rb
 - app/services/stellar_base/bridge_callbacks/compare.rb
@@ -495,6 +527,7 @@ files:
 - db/migrate/20181001070647_create_stellar_base_deposits.rb
 - db/migrate/20181003072138_create_stellar_base_account_subscriptions.rb
 - db/migrate/20181210043919_add_unique_index_to_deposits.rb
+- db/migrate/20181217090323_create_stellar_transactions_and_operations.rb
 - lib/stellar_base-rails.rb
 - lib/stellar_base.rb
 - lib/stellar_base/engine.rb
@@ -525,9 +558,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7

data/app/services/stellar_base/account_subscriptions/execute_callback.rb

@@ -1,18 +0,0 @@
-module StellarBase
-  module AccountSubscriptions
-    class ExecuteCallback
-
-      extend LightService::Action
-      expects :account_subscription, :tx, :operation, :on_account_event
-
-      executed do |c|
-        c.on_account_event.(
-          c.account_subscription.address,
-          c.tx,
-          c.operation,
-        )
-      end
-
-    end
-  end
-end

data/app/services/stellar_base/account_subscriptions/get_tx.rb

@@ -1,17 +0,0 @@
-module StellarBase
-  module AccountSubscriptions
-    class GetTx
-
-      extend LightService::Action
-      expects :stellar_sdk_client, :operation
-      promises :tx
-
-      executed do |c|
-        hash = c.operation.transaction_hash
-        tx_json = c.stellar_sdk_client.horizon.transaction(hash: hash)
-        c.tx = StellarTransaction.new(raw: tx_json)
-      end
-
-    end
-  end
-end