glueby 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374ec643c65f210f1ecc1f35951ead50b86beaf9298a404a3cd21d0c3b0f1872
-  data.tar.gz: 3b4c3a5780e06ca072b4b8b08839210a927a67af42a00ad9557926820ffefada
+  metadata.gz: 71dfd0cca2e922f07b29b4839be2f7cff8c71f587ff043bb05eee6d8cac3435e
+  data.tar.gz: f3b4b8864d75be7eccad66c402bb56693949ade3c7dfa1b21e3f5abc5c6391b5
 SHA512:
-  metadata.gz: b101685ebba2023302b266abe49603842d05af674e71e5b6c993539a01587c313033ef927f015de619c28f7e60986e51379cf32aac25a69b80dc903881ae51b3
-  data.tar.gz: 2e437e7403b573d7018727766da166d64cac78147d95bb355f46284d1cb65a2ba36115d578c7fa29c6d6e488e2fdd9914f504e06c3fe346f962cbb1938700145
+  metadata.gz: 831aaf50ea027c47450ad167721b441a6253b9c439d1608179f7c0bf9244eaa5cc8bc5a1fc916b31411616389e4750ecdda9cda0497479b6810e8fba134a0fd8
+  data.tar.gz: 4f078178c9874c00e1ce36e11c13b7813972880ecfc3f7c8ee686040012b6e8ce0038376f2ec808027a99c3beb377e7a5e7493c2f78577533ed11403cd2928e9

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

@@ -11,6 +11,9 @@ module Glueby
 
         belongs_to :prev, class_name: 'Glueby::Contract::AR::Timestamp', optional: true
 
+        validates :prev, uniqueness: true, allow_nil: true
+        validate :validate_prev
+
         class << self
           def digest_content(content, digest)
             case digest&.downcase
@@ -130,17 +133,7 @@ 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
+            validate_prev!
 
             builder.set_prev_timestamp_info(
               timestamp_utxo: prev.utxo,
@@ -177,6 +170,37 @@ module Glueby
         def update_trackable?
           trackable? && prev_id
         end
+
+        def validate_prev
+          validate_prev!
+          true
+        rescue Errors::PrevTimestampNotFound,
+               Errors::PrevTimestampIsNotTrackable,
+               Errors::UnnecessaryPrevTimestamp
+          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
+        end
       end
     end
   end

data/lib/glueby/contract/errors.rb

@@ -17,6 +17,7 @@ module Glueby
       class UnsupportedDigestType < ArgumentError; end
       class PrevTimestampNotFound < ArgumentError; end
       class PrevTimestampIsNotTrackable < ArgumentError; end
+      class UnnecessaryPrevTimestamp < 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.1"
+  VERSION = "0.10.2"
 end

metadata

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