glueby 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea6c9da8fdd46b8e2d82e7d403580d160f8eded28723f7ee33c14e002be5428f
-  data.tar.gz: d74cc716d2ce35f19eb0ed5d9eb6d46cd464fa3a19a87073dd61a1e2180ef5fe
+  metadata.gz: 017fd6425f25bc8b48e36ff46456ff42a88dedd43c9e0359c7b39bc06e1fc8df
+  data.tar.gz: e617c0e9e5d931f795a4ead6d929aac46f2b70f3da5eefbd74434814d85884b2
 SHA512:
-  metadata.gz: 6c6c75c349edfd4c5ee5fc0e752ce9c65f1ad2f5b323d38f2a51b2ab5d91de8786daf67f1bfb1fdd221a7cc10cf891b6f6551fd58afe8059593a81536027d25c
-  data.tar.gz: 38c2b4a8e2a085bf238ca37fd1a39930e2b337d0f80a9695adb45116dc8e2cc4478c3c0041c08b0def00cdf15235664bee9d4c6beb9e7a285c1320f8f1b768c2
+  metadata.gz: 5f93eee936244581432347212864661160c5c9f282009ae1bcb4d0870f344f951d93b2a06df2f680e1ab3227b0be87face08eba17c6539fc286c24b719d8f68e
+  data.tar.gz: 18df860bc145726f1cbf133f9f3df9f099c01bcba6f3f8c2817e19686c906938df455c2346dd55d21a5ebed99e30e9204ae4dd50ea0bf18043f0ee6a83caec08

data/lib/glueby/contract/active_record/timestamp.rb

@@ -2,7 +2,10 @@ module Glueby
   module Contract
     module AR
       class Timestamp < ::ActiveRecord::Base
+        include Glueby::GluebyLogger
         include Glueby::Contract::Timestamp::Util
+        include Glueby::Contract::TxBuilder
+
         enum status: { init: 0, unconfirmed: 1, confirmed: 2 }
         enum timestamp_type: { simple: 0, trackable: 1 }
 
@@ -21,6 +24,33 @@ module Glueby
         def latest
           trackable?
         end
+
+        # Broadcast and save timestamp
+        # @param [Glueby::Contract::FixedFeeEstimator] fee_estimator
+        # @return true if tapyrus transactions were broadcasted and the timestamp was updated successfully, otherwise false.
+        def save_with_broadcast(fee_estimator: Glueby::Contract::FixedFeeEstimator.new)
+          utxo_provider = Glueby::UtxoProvider.new if Glueby.configuration.use_utxo_provider?
+          wallet = Glueby::Wallet.load(wallet_id)
+          funding_tx, tx, p2c_address, payment_base = create_txs(wallet, prefix, content_hash, fee_estimator, utxo_provider, type: timestamp_type.to_sym)
+          if funding_tx
+            ::ActiveRecord::Base.transaction(joinable: false, requires_new: true) do
+              wallet.internal_wallet.broadcast(funding_tx)
+              logger.info("funding tx was broadcasted(id=#{id}, funding_tx.txid=#{funding_tx.txid})")
+            end
+          end
+          ::ActiveRecord::Base.transaction(joinable: false, requires_new: true) do
+            wallet.internal_wallet.broadcast(tx) do |tx|
+              assign_attributes(txid: tx.txid, status: :unconfirmed, p2c_address: p2c_address, payment_base: payment_base)
+              save!
+            end
+            logger.info("timestamp tx was broadcasted (id=#{id}, txid=#{tx.txid})")
+          end
+          true
+        rescue => e
+          logger.error("failed to broadcast (id=#{id}, reason=#{e.message})")
+          errors.add(:base, "failed to broadcast (id=#{id}, reason=#{e.message})")
+          false
+        end
       end
     end
   end

data/lib/glueby/version.rb

@@ -1,3 +1,3 @@
 module Glueby
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/glueby.rb

@@ -17,6 +17,16 @@ module Glueby
     require 'glueby/railtie'
   end
 
+  module GluebyLogger
+    def logger
+      if defined?(Rails)
+        Rails.logger
+      else
+        Logger.new(STDOUT)
+      end
+    end
+  end
+
   # Add prefix to activerecord table names
   def self.table_name_prefix
     'glueby_'

data/lib/tasks/glueby/contract/timestamp.rake

@@ -8,27 +8,8 @@ module Glueby
 
         def create
           timestamps = Glueby::Contract::AR::Timestamp.where(status: :init)
-          utxo_provider = Glueby::UtxoProvider.new if Glueby.configuration.use_utxo_provider?
-          timestamps.each do |t|
-            begin
-              wallet = Glueby::Wallet.load(t.wallet_id)
-              funding_tx, tx, p2c_address, payment_base = create_txs(wallet, t.prefix, t.content_hash, Glueby::Contract::FixedFeeEstimator.new, utxo_provider, type: t.timestamp_type.to_sym)
-              if funding_tx
-                ::ActiveRecord::Base.transaction do
-                  wallet.internal_wallet.broadcast(funding_tx)
-                  puts "funding tx was broadcasted(id=#{t.id}, funding_tx.txid=#{funding_tx.txid})"
-                end
-              end
-              ::ActiveRecord::Base.transaction do
-                wallet.internal_wallet.broadcast(tx) do |tx|
-                  t.update(txid: tx.txid, status: :unconfirmed, p2c_address: p2c_address, payment_base: payment_base)
-                end
-                puts "timestamp tx was broadcasted (id=#{t.id}, txid=#{tx.txid})"
-              end
-            rescue => e
-              puts "failed to broadcast (id=#{t.id}, reason=#{e.message})"
-            end
-          end
+          fee_estimator = Glueby::Contract::FixedFeeEstimator.new
+          timestamps.each { |t| t.save_with_broadcast(fee_estimator: fee_estimator) }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glueby
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - azuchi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapyrus