bitsy-bitcoin 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5339258fc12295fa939531c099a525fe941877e
-  data.tar.gz: 0acd7760d503fec1511c5c1d71a34e183d4bdcfe
+  metadata.gz: 26107994e7453d8a676d90db622bcf7e86122d0a
+  data.tar.gz: 09e2b2d6883d04cb6781d6bc142064935a6f80a2
 SHA512:
-  metadata.gz: 08083f3b6b50e6545234c5ce0461f1cddbc9c86cbb7d9ca6bf38853d0f80276792a9a24084f0fb32110f1bd1ef807a7710ace7cf60b97d68f88d2b431ebe258e
-  data.tar.gz: 86b17e3f52e2e40ad5265916cb03215a0ad793b2a76e02919484ac5042b8c777d961247424bd69735019be2f8d1d5b969ce3c28e66aabca2f4931fd831bad594
+  metadata.gz: 0d35ac415e27a8bb4b943ed19dc2950293e9955a6b8732115b636a7bc802700bcd9379e42c50437a6ecd2b40558513e8de8fb8c689a900b43397079af4f9313f
+  data.tar.gz: 37aa5bf710b689f31aa22ab39f07e52eaf817633a80ec5c21223d9e4eb44ec38177071d21a0e299386600daf4001f463c7e73bab34295905b5f55b10f7e90a24

data/app/models/bitsy/payment_depot.rb

@@ -33,7 +33,7 @@ module Bitsy
     end
 
     def total_received_amount
-      self.transactions.credits.sum(:amount)
+      read_attribute :total_received_amount_cache
     end
 
     def total_tax_sent

data/app/models/bitsy/payment_transaction.rb

@@ -27,6 +27,8 @@ module Bitsy
     delegate :added_tax_rate, to: :payment_depot, prefix: true
     delegate :total_received_amount, to: :payment_depot, prefix: true
 
+    after_create :update_payment_depot_cache
+
     def forward_tax_fee
       ForwardTaxCalculator.calculate(self.amount,
                                      self.payment_depot_min_payment,
@@ -38,5 +40,13 @@ module Bitsy
     def owner_fee
       self.amount - self.forward_tax_fee
     end
+
+    def update_payment_depot_cache
+      if payment_type == "receive"
+        payment_depot.total_received_amount_cache += amount
+        payment_depot.save
+      end
+    end
+
   end
 end

data/app/services/bitsy/build_send_many_hash.rb

@@ -2,33 +2,45 @@ module Bitsy
   class BuildSendManyHash
 
     include LightService::Action
+    expects :payment_transactions, :amount_for_splitting, :total_amount
+    promises :send_many_hash, :computed_transaction_fee
 
     executed do |ctx|
-      payment_txs = ctx.fetch(:payment_transactions)
+      ctx.send_many_hash = send_many_hash_from(ctx)
+      total_payments = total_payments_from(ctx.send_many_hash)
+      ctx.computed_transaction_fee =
+        (ctx.total_amount * 100_000_000.0 - total_payments).round
+    end
+
+    private
+
+    def self.send_many_hash_from(ctx)
       send_many_hash = {}
 
-      payment_txs.each do |payment_tx|
-        tx_hash = for_transaction(payment_tx)
-        tx_hash.each do |address, value|
+      ctx.payment_transactions.each do |tx|
+        tx_hash = BuildSendManyHashForTransaction.execute(
+          payment_transaction: tx,
+          amount_for_splitting: ctx.amount_for_splitting,
+          total_amount: ctx.total_amount,
+        ).transaction_send_many_hash
+
+        tx_hash.each do |address, amount|
           if send_many_hash.has_key?(address)
-            send_many_hash[address] = send_many_hash[address] + value
+            send_many_hash[address] += amount
           else
-            send_many_hash[address] = value
+            send_many_hash[address] = amount
           end
         end
       end
 
-      ctx[:send_many_hash] = send_many_hash
+      send_many_hash
     end
 
-    def self.for_transaction(payment_transaction)
-      payment_depot = payment_transaction.payment_depot
-      owner_address = payment_depot.owner_address
-      tax_address = payment_depot.tax_address
-      {
-        tax_address => payment_transaction.forward_tax_fee.to_f * 100_000_000,
-        owner_address => payment_transaction.owner_fee.to_f * 100_000_000,
-      }
+    def self.total_payments_from(send_many_hash)
+      send_many_hash.inject(0) do |sum, hash|
+        sum += hash[1]
+        sum
+      end
     end
 
   end

data/app/services/bitsy/build_send_many_hash_for_transaction.rb

@@ -0,0 +1,44 @@
+module Bitsy
+  class BuildSendManyHashForTransaction
+
+    include LightService::Action
+    expects :payment_transaction, :amount_for_splitting, :total_amount
+    promises :transaction_send_many_hash
+
+    executed do |ctx|
+      tax_amount = tax_amount_from(ctx)
+      owner_amount = owner_amount_from(ctx)
+
+      payment_depot = ctx.payment_transaction.payment_depot
+
+      ctx.transaction_send_many_hash = {
+        payment_depot.tax_address => tax_amount,
+        payment_depot.owner_address => owner_amount,
+      }
+    end
+
+    private
+
+    def self.tax_amount_from(ctx)
+      fee_less_share_for_transaction_fee(
+        ctx.payment_transaction.forward_tax_fee,
+        ctx.amount_for_splitting,
+        ctx.total_amount,
+      )
+    end
+
+    def self.owner_amount_from(ctx)
+      fee_less_share_for_transaction_fee(
+        ctx.payment_transaction.owner_fee,
+        ctx.amount_for_splitting,
+        ctx.total_amount,
+      )
+    end
+
+    def self.fee_less_share_for_transaction_fee(fee, amount_for_splitting, total_amount)
+      percent_of_total = fee / total_amount
+      (percent_of_total * 100_000_000 * amount_for_splitting).to_i
+    end
+
+  end
+end

data/app/services/bitsy/build_send_many_hash_with_transaction_fee.rb

@@ -0,0 +1,13 @@
+module Bitsy
+  class BuildSendManyHashWithTransactionFee
+
+    include LightService::Organizer
+    include LightService::Action
+    expects :payment_transactions, :transaction_fee
+
+    executed do |ctx|
+      with(ctx).reduce(ComputeAmountForSplitting, BuildSendManyHash)
+    end
+
+  end
+end

data/app/services/bitsy/compute_amount_for_splitting.rb

@@ -0,0 +1,14 @@
+module Bitsy
+  class ComputeAmountForSplitting
+
+    include LightService::Action
+    expects :payment_transactions, :transaction_fee
+    promises :amount_for_splitting, :total_amount
+
+    executed do |ctx|
+      ctx.total_amount = ctx.payment_transactions.sum(:amount)
+      ctx.amount_for_splitting = ctx.total_amount - ctx.transaction_fee
+    end
+
+  end
+end

data/app/services/bitsy/forward_payments.rb

@@ -9,10 +9,12 @@ module Bitsy
 
       return unless past_threshold?(payment_transactions)
       with(
-        payment_transactions: payment_transactions
+        payment_transactions: payment_transactions,
+        transaction_fee: Bitsy.config.transaction_fee,
       ).reduce([
         InstantiateBlockchainWallet,
-        BuildSendManyHash,
+        BuildSendManyHashWithTransactionFee,
+        LogSendMany,
         SendPayments,
         AssociatesTransactions
       ])

data/app/services/bitsy/log_send_many.rb

@@ -0,0 +1,18 @@
+module Bitsy
+  class LogSendMany
+
+    include LightService::Action
+    expects :payment_transactions, :computed_transaction_fee, :send_many_hash
+
+    executed do |ctx|
+      message = ["Will forward transactions for payment transactions:"]
+      message << ctx.payment_transactions.map(&:id).join(", ")
+      message << "hash: #{ctx.send_many_hash.inspect}"
+      message = message.join("\n")
+
+      logger = Logger.new(Bitsy.config.send_many_log_path)
+      logger.info(message)
+    end
+
+  end
+end

data/app/services/bitsy/send_payments.rb

@@ -2,11 +2,20 @@ module Bitsy
   class SendPayments
 
     include LightService::Action
-    expects :send_many_hash, :wallet
+    expects :send_many_hash, :wallet, :computed_transaction_fee
     promises :forwarding_transaction_id
 
     executed do |ctx|
-      payment_response = ctx.wallet.send_many(ctx.send_many_hash)
+      if Bitsy.config.debug
+        ctx.forwarding_transaction_id = nil
+        next ctx
+      end
+
+      payment_response = ctx.wallet.send_many(
+        ctx.send_many_hash,
+        nil,
+        ctx.computed_transaction_fee,
+      )
       ctx.forwarding_transaction_id = payment_response.tx_hash
     end
 

data/config/initializers/bitsy.rb

@@ -13,6 +13,14 @@ Bitsy.configure do |c|
   # List of allowed secrets from Blockchain.info. The callback URL should look
   # like this http://app.com/bitsy/v1/blockchain_notifications?secret=mysecret
   c.blockchain_secrets = %w(secret)
+
+  # Write out the payment transactions, addresses, and other details. These
+  # transactions are the ones being forwarded.
+  c.send_many_log_path = Rails.root.join("log", "send_many.log")
+
+  # WHen debug is true, no money will be forwarded. This is for testing
+  # purposes.
+  c.debug = false
 end
 
 Sidekiq.configure_server do |config|

data/db/migrate/20141115001846_add_total_received_amount_cache_to_payment_depots.rb

@@ -0,0 +1,5 @@
+class AddTotalReceivedAmountCacheToPaymentDepots < ActiveRecord::Migration
+  def change
+    add_column :bitsy_payment_depots, :total_received_amount_cache, :float, null: false, default: 0
+  end
+end

data/lib/bitsy/config.rb

@@ -7,6 +7,8 @@ module Bitsy
       :safe_confirmation_threshold,
       :blockchain_secrets,
       :blockchain,
+      :debug,
+      :send_many_log_path
     )
 
     def initialize(file_path)

data/lib/bitsy/version.rb

@@ -1,3 +1,3 @@
 module Bitsy
-  VERSION = "0.3.2"
+  VERSION = "0.5.0"
 end

data/lib/generators/bitsy/config/templates/initializer.rb

@@ -14,6 +14,14 @@ Bitsy.configure do |c|
   # List of allowed secrets from Blockchain.info. The callback URL should look
   # like this http://app.com/bitsy/v1/blockchain_notifications?secret=mysecret
   c.blockchain_secrets = %w(secret)
+
+  # Write out the payment transactions, addresses, and other details. These
+  # transactions are the ones being forwarded.
+  c.send_many_log_path = Rails.root.join("log", "send_many.log")
+
+  # WHen debug is true, no money will be forwarded. This is for testing
+  # purposes.
+  c.debug = false
 end
 
 Sidekiq.configure_server do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitsy-bitcoin
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -310,10 +310,14 @@ files:
 - app/services/bitsy/amount_for_initial_tax_calculator.rb
 - app/services/bitsy/associates_transactions.rb
 - app/services/bitsy/build_send_many_hash.rb
+- app/services/bitsy/build_send_many_hash_for_transaction.rb
+- app/services/bitsy/build_send_many_hash_with_transaction_fee.rb
+- app/services/bitsy/compute_amount_for_splitting.rb
 - app/services/bitsy/create_payment_depot.rb
 - app/services/bitsy/forward_payments.rb
 - app/services/bitsy/forward_tax_calculator.rb
 - app/services/bitsy/instantiate_blockchain_wallet.rb
+- app/services/bitsy/log_send_many.rb
 - app/services/bitsy/process_blockchain_notification.rb
 - app/services/bitsy/send_payments.rb
 - app/services/bitsy/updating/get_latest_block.rb
@@ -332,6 +336,7 @@ files:
 - db/migrate/20141106123922_create_bitsy_blockchain_notifications.rb
 - db/migrate/20141108002656_drop_occurred_at_and_received_at_from_payment_transactions.rb
 - db/migrate/20141109072242_change_payment_depot_balance_cache_default.rb
+- db/migrate/20141115001846_add_total_received_amount_cache_to_payment_depots.rb
 - lib/bitsy-bitcoin.rb
 - lib/bitsy.rb
 - lib/bitsy/config.rb