bitsy-bitcoin 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57d2955e23dabcf1cb91b4cd3ba839512852d795
-  data.tar.gz: b3a10f6821852d2faae60f8f7afce54e051dbe97
+  metadata.gz: 6dc9926eed4195fdde26c052f88bd3847dd612c6
+  data.tar.gz: c2501edd14c431e09ccc0d052dd56bf0193ab283
 SHA512:
-  metadata.gz: 876e9b21251ae829b51a0a40c873e3871a7541b593b6708b0a415d69c39fb79b10c3792efa200fd3d90c248a1aa05f57f1d19142f3909421293a2d6f48ca5007
-  data.tar.gz: 8c87da8bc7857a4f31ee7258a4880a052d683ea9654ccc372699b54402dadd5e45dd59224885d8710b7d18739a779ebd16b296ed9eecbe97bb675cb1b93956f0
+  metadata.gz: 78e4d71e5000101667f18299f2fba3dc23e9cbc242b8cb4582a18fb32e65391fb81fc230266c9f3e65f74576f95e17872bf3c47b97bbed8e6710bcce7e53251e
+  data.tar.gz: 25b02015f4e2b296618d5e653f4015a19cbfa2c1c0964c65c6f3cadea15ae26b003ced797228f4adc77bd8ad78e46edb635f6aff76a8af328d7db160e93d8983

data/app/controllers/bitsy/v1/blockchain_notifications_controller.rb

@@ -4,7 +4,9 @@ module Bitsy
 
       def index
         bn = BlockchainNotification.new(blockchain_notification_params)
-        if bn.save
+        if bn.test
+          render text: "*ok*", status: 200
+        elsif bn.save
           BlockchainNotificationJob.perform_async(bn.id)
           render text: "*ok*", status: 200
         else
@@ -21,6 +23,7 @@ module Bitsy
           :input_address,
           :confirmations,
           :secret,
+          :test,
         )
       end
 

data/app/jobs/bitsy/check_payments_job.rb

@@ -0,0 +1,12 @@
+module Bitsy
+  class CheckPaymentsJob
+
+    include Sidekiq::Worker
+    sidekiq_options retry: false
+
+    def perform
+      CheckForPayments.execute
+    end
+
+  end
+end

data/app/models/bitsy/blockchain_notification.rb

@@ -1,6 +1,8 @@
 module Bitsy
   class BlockchainNotification < ActiveRecord::Base
 
+    attr_reader :test
+
     validates(
       :value,
       :transaction_hash,
@@ -11,5 +13,9 @@ module Bitsy
 
     validates(:secret, inclusion: {in: Bitsy.config.blockchain_secrets})
 
+    def test=(b)
+      @test = ["true", true].include?(b)
+    end
+
   end
 end

data/app/models/bitsy/payment_depot.rb

@@ -2,11 +2,13 @@ require 'securerandom'
 
 module Bitsy
   class PaymentDepot < ActiveRecord::Base
+
     has_many :transactions, class_name: 'PaymentTransaction'
 
     alias_attribute :balance, :balance_cache
     after_initialize :set_uuid
     scope :with_balance, -> { where('balance_cache > 0.0') }
+    scope :checked_at_is_past, -> { where(arel_table[:checked_at].lt(Time.now)) }
     validates(
       :initial_tax_rate,
       inclusion: {
@@ -24,6 +26,13 @@ module Bitsy
       self.min_payment * (1 - self.initial_tax_rate)
     end
 
+    def reset_checked_at!
+      self.update_attributes(
+        check_count: self.check_count + 1,
+        checked_at: (self.check_count**2).seconds.from_now,
+      )
+    end
+
     def balance_tax_amount
       ForwardTaxCalculator.calculate(self.balance,
                                      self.min_payment,

data/app/services/bitsy/check_for_payments.rb

@@ -0,0 +1,14 @@
+module Bitsy
+  class CheckForPayments
+
+    include LightService::Organizer
+
+    def self.execute
+      reduce(
+        GetLatestBlock,
+        CheckPaymentDepotTransactions,
+      )
+    end
+
+  end
+end

data/app/services/bitsy/check_payment_depot_transaction.rb

@@ -0,0 +1,19 @@
+module Bitsy
+  class CheckPaymentDepotTransaction
+
+    include LightService::Action
+    expects :latest_block, :payment_depot
+
+    executed do |ctx|
+      blockchain_address = Blockchain.get_address(ctx.payment_depot.address)
+      blockchain_address.txs.each do |tx|
+        ProcessBlockchainBlockexplorerTransaction.execute(
+          payment_depot: ctx.payment_depot,
+          latest_block: ctx.latest_block,
+          blockchain_transaction: tx,
+        )
+      end
+    end
+
+  end
+end

data/app/services/bitsy/check_payment_depot_transactions.rb

@@ -0,0 +1,17 @@
+module Bitsy
+  class CheckPaymentDepotTransactions
+
+    include LightService::Action
+    expects :latest_block, :payment_depots
+
+    executed do |ctx|
+      ctx.payment_depots.each do |payment_depot|
+        CheckPaymentDepotTransaction.execute(
+          payment_depot: payment_depot,
+          latest_block: ctx.latest_block,
+        )
+      end
+    end
+
+  end
+end

data/app/services/bitsy/get_latest_block.rb

@@ -0,0 +1,12 @@
+module Bitsy
+  class GetLatestBlock
+
+    include LightService::Action
+    promises :latest_block
+
+    executed do |ctx|
+      ctx.latest_block = Blockchain.get_latest_block
+    end
+
+  end
+end

data/app/services/bitsy/process_blockchain_blockexplorer_transaction.rb

@@ -0,0 +1,33 @@
+module Bitsy
+  class ProcessBlockchainBlockexplorerTransaction
+
+    include LightService::Action
+    expects :payment_depot, :latest_block, :blockchain_transaction
+
+    executed do |ctx|
+      tx = ctx.blockchain_transaction
+      next ctx if PaymentTransaction.exists?(transaction_id: tx.hash)
+      payment_depot = ctx.payment_depot
+      output = tx.outputs.find { |o| o.address == payment_depot.address }
+      PaymentTransaction.create!(
+        payment_depot_id: payment_depot.id,
+        amount: output.value / 100_000_000.0,
+        receiving_address: output.address,
+        payment_type: "receive",
+        confirmations: confirmations_of(tx, ctx.latest_block.height),
+        transaction_id: tx.hash,
+      )
+    end
+
+    private
+
+    def self.confirmations_of(tx, block_height)
+      if tx.block_height
+        block_height + 1 - tx.block_height
+      else
+        0
+      end
+    end
+
+  end
+end

data/db/migrate/20141209131150_add_check_count_and_checked_at_to_payment_depot.rb

@@ -0,0 +1,6 @@
+class AddCheckCountAndCheckedAtToPaymentDepot < ActiveRecord::Migration
+  def change
+    add_column :bitsy_payment_depots, :check_count, :integer, null: false, default: 0
+    add_column :bitsy_payment_depots, :checked_at, :datetime
+  end
+end

data/lib/bitsy/config.rb

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

data/lib/bitsy/version.rb

@@ -1,3 +1,3 @@
 module Bitsy
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

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

@@ -25,4 +25,5 @@ module Clockwork
 
   every(10.minutes, 'Bitsy::TransactionsSyncJob')
   every(15.minutes, 'Bitsy::ForwardJob')
+  every(5.seconds, 'Bitsy::CheckPaymentsJob')
 end

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

@@ -22,6 +22,11 @@ Bitsy.configure do |c|
   # WHen debug is true, no money will be forwarded. This is for testing
   # purposes.
   c.debug = false
+
+  # Bitsy will check the transactions of the payment depot manually if it hasn't
+  # been paid for yet. It will check 40 times, in approximately check count ** 2
+  # power intervals. Ex: check_count = 3, then it will check again in 9 seconds.
+  c.check_limit = 40
 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.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -282,6 +282,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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'
 description: A mountable Rails engine to create a payment server that can handle the
   money in your Bitcoin ecosystem
 email:
@@ -301,6 +315,7 @@ files:
 - app/controllers/bitsy/v1/truncations_controller.rb
 - app/helpers/bitsy/application_helper.rb
 - app/jobs/bitsy/blockchain_notification_job.rb
+- app/jobs/bitsy/check_payments_job.rb
 - app/jobs/bitsy/forward_job.rb
 - app/jobs/bitsy/transactions_sync_job.rb
 - app/models/bitsy/blockchain_notification.rb
@@ -312,15 +327,19 @@ files:
 - 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/check_for_payments.rb
+- app/services/bitsy/check_payment_depot_transaction.rb
+- app/services/bitsy/check_payment_depot_transactions.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/get_latest_block.rb
 - app/services/bitsy/instantiate_blockchain_wallet.rb
 - app/services/bitsy/log_send_many.rb
+- app/services/bitsy/process_blockchain_blockexplorer_transaction.rb
 - app/services/bitsy/process_blockchain_notification.rb
 - app/services/bitsy/send_payments.rb
-- app/services/bitsy/updating/get_latest_block.rb
 - app/services/bitsy/updating/select_transactions.rb
 - app/services/bitsy/updating/sync_transactions.rb
 - app/services/bitsy/updating/update_transaction.rb
@@ -338,6 +357,7 @@ files:
 - db/migrate/20141109072242_change_payment_depot_balance_cache_default.rb
 - db/migrate/20141115001846_add_total_received_amount_cache_to_payment_depots.rb
 - db/migrate/20141129064958_change_total_received_amount_cache_to_decimal.rb
+- db/migrate/20141209131150_add_check_count_and_checked_at_to_payment_depot.rb
 - lib/bitsy-bitcoin.rb
 - lib/bitsy.rb
 - lib/bitsy/config.rb

data/app/services/bitsy/updating/get_latest_block.rb

@@ -1,14 +0,0 @@
-module Bitsy
-  module Updating
-    class GetLatestBlock
-
-      include LightService::Action
-      promises :latest_block
-
-      executed do |ctx|
-        ctx.latest_block = Blockchain.get_latest_block
-      end
-
-    end
-  end
-end