glueby 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53718ece4b629ff6474c139b047e08c4803739cb992b61aa4f49c10ca96bc90f
-  data.tar.gz: 774199828793ab8c00c3b5d3a501ffa5e265395e7e036407d7ef0edd7f798998
+  metadata.gz: 0350a6b7d6a1bc1302c0374313c72ecb5283a5388c394a57c6bf7da8f789a815
+  data.tar.gz: 991b08a0950fedc906916fb1b984440721601781417e0c504051192dbf548dec
 SHA512:
-  metadata.gz: 89cb7a6e1a9573bd840811bf75da2d83f9a77eaf1d265e0ba617093e788eeb785f23d80ea67e934714f2773565d26065a4a3daa56bc8d544cc13d2bbd66f3049
-  data.tar.gz: d1616df8862ede1f1046119f321b22faf8dd7f6193d4a14ca7a38388d60c6f9e5ac97408480b4c38c2d817036424aeba9f2c50574c655b7ac7f9f3e0522a0cac
+  metadata.gz: 46a31cd67ccd59ffa7aee4231ae4f5946957e1403e2ef8b8cd7eeb313bbf607a198523b3ebf72c824dc2957666b40d7537b0784f82a7fb23de633ca3932aa789
+  data.tar.gz: 15176048dd26fef955e04c9fc56259d58499880b0d4aae8ece4c286a78dfa8c567e5c62f78e19ca11b74d1b7f1b6408a3190f38fe979c6ab6f4246474fd415e1

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

@@ -9,7 +9,9 @@ module Glueby
 
         attr_reader :tx
 
-        belongs_to :prev, class_name: 'Glueby::Contract::AR::Timestamp'
+        belongs_to :prev, class_name: 'Glueby::Contract::AR::Timestamp', optional: true
+
+        validate :validate_prev
 
         class << self
           def digest_content(content, digest)
@@ -74,9 +76,12 @@ module Glueby
         # @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: nil)
           save_with_broadcast!(fee_estimator: fee_estimator, utxo_provider: utxo_provider)
-        rescue Errors::FailedToBroadcast, Errors::PrevTimestampNotFound, Errors::PrevTimestampIsNotTrackable => e
+        rescue Errors::FailedToBroadcast => e
           logger.error("failed to broadcast (id=#{id}, reason=#{e.message})")
           false
+        rescue Errors::ArgumentError => e
+          logger.info("failed to broadcast by argument error (id=#{id}, reason=#{e.message})")
+          false
         end
 
         # Broadcast and save timestamp, and it raises errors
@@ -86,7 +91,9 @@ module Glueby
         # @raise [Glueby::Contract::Errors::FailedToBroadcast] If the broadcasting is failure
         # @raise [Glueby::Contract::Errors::PrevTimestampNotFound] If it is not available that the timestamp record which correspond with the prev_id attribute
         # @raise [Glueby::Contract::Errors::PrevTimestampIsNotTrackable] If the timestamp record by prev_id is not trackable
+        # @raise [Glueby::Contract::Errors::PrevTimestampAlreadyUpdated] If the previous timestamp was already updated
         def save_with_broadcast!(fee_estimator: Glueby::Contract::FixedFeeEstimator.new, utxo_provider: nil)
+          validate_prev!
           utxo_provider = Glueby::UtxoProvider.new if !utxo_provider && Glueby.configuration.use_utxo_provider?
 
           funding_tx, tx, p2c_address, payment_base = create_txs(fee_estimator, utxo_provider)
@@ -101,7 +108,7 @@ module Glueby
             wallet.internal_wallet.broadcast(tx) do |tx|
               assign_attributes(txid: tx.txid, status: :unconfirmed, p2c_address: p2c_address, payment_base: payment_base)
               @tx = tx
-              save!
+              save!(validate: false) # The validation is already executed at head of #save_with_broadcast!
 
               if update_trackable?
                 prev.latest = false
@@ -111,8 +118,7 @@ module Glueby
           end
           logger.info("timestamp tx was broadcasted (id=#{id}, txid=#{tx.txid})")
           true
-        rescue ActiveRecord::RecordInvalid,
-               Tapyrus::RPC::Error,
+        rescue Tapyrus::RPC::Error,
                Internal::Wallet::Errors::WalletAlreadyLoaded,
                Internal::Wallet::Errors::WalletNotFound,
                Errors::InsufficientFunds => e
@@ -130,18 +136,6 @@ module Glueby
           builder = builder_class.new(wallet, fee_estimator)
 
           if builder.instance_of?(Contract::Timestamp::TxBuilder::UpdatingTrackable)
-            unless prev
-              message = "The previous timestamp(id: #{prev_id}) not found."
-              errors.add(:prev_id, message)
-              raise Errors::PrevTimestampNotFound, message
-            end
-
-            unless prev.trackable?
-              message = "The previous timestamp(id: #{prev_id}) type must be trackable"
-              errors.add(:prev_id, message)
-              raise Errors::PrevTimestampIsNotTrackable, message
-            end
-
             builder.set_prev_timestamp_info(
               timestamp_utxo: prev.utxo,
               payment_base: prev.payment_base,
@@ -177,6 +171,41 @@ module Glueby
         def update_trackable?
           trackable? && prev_id
         end
+
+        def validate_prev
+          validate_prev!
+          true
+        rescue Errors::ArgumentError
+          false
+        end
+
+        def validate_prev!
+          if simple? && prev_id
+            message = "The previous timestamp(id: #{prev_id}) must be nil in simple timestamp"
+            errors.add(:prev_id, message)
+            raise Errors::UnnecessaryPrevTimestamp, message
+          end
+
+          return unless update_trackable?
+
+          unless prev
+            message = "The previous timestamp(id: #{prev_id}) not found."
+            errors.add(:prev_id, message)
+            raise Errors::PrevTimestampNotFound, message
+          end
+
+          unless prev.trackable?
+            message = "The previous timestamp(id: #{prev_id}) type must be trackable"
+            errors.add(:prev_id, message)
+            raise Errors::PrevTimestampIsNotTrackable, message
+          end
+
+          if new_record? && self.class.where(prev_id: prev_id).exists?
+            message = "The previous timestamp(id: #{prev_id}) was already updated"
+            errors.add(:prev_id, message)
+            raise Errors::PrevTimestampAlreadyUpdated, message
+          end
+        end
       end
     end
   end

data/lib/glueby/contract/errors.rb

@@ -17,6 +17,8 @@ module Glueby
       class UnsupportedDigestType < ArgumentError; end
       class PrevTimestampNotFound < ArgumentError; end
       class PrevTimestampIsNotTrackable < ArgumentError; end
+      class UnnecessaryPrevTimestamp < ArgumentError; end
+      class PrevTimestampAlreadyUpdated < ArgumentError; end
     end
   end
 end

data/lib/glueby/internal/wallet/active_record/wallet.rb

@@ -20,7 +20,7 @@ module Glueby
             tx.inputs.each.with_index do |input, index|
               script_pubkey = script_for_input(input, prevtxs)
               next unless script_pubkey
-              key = Key.key_for_script(script_pubkey)
+              key = keys.key_for_script(script_pubkey)
               next unless key
               sign_tx_for_p2pkh(tx, index, key, script_pubkey, sighashtype)
             end

data/lib/glueby/version.rb

@@ -1,3 +1,3 @@
 module Glueby
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glueby
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - azuchi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapyrus