glueby 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a8e99610f76e6d765a52a645ead25eb8cf71343ba259ed25e5ec2fbdb0d5e5
-  data.tar.gz: 0ee19c244501e854cbe59f6957e5e0c8a25bca403a9fa58d0367ad95de3f0a38
+  metadata.gz: 9490bd9983bf524a8b937c6b495ecb4260b65d8f84f590bffd4d06bcf8db3c60
+  data.tar.gz: 187ab2c69864a94245dbb94c3c79abb1cfce1317138dcc9a9f6aea10b91864d6
 SHA512:
-  metadata.gz: 47dfd21bdd71bf99379f448816a58b3cef5fd093352d0f7a53806a85db5b2509765fa4f2f4813621a36fe0edc98c7491aca162f445ab9bb0708e3b3ca68756cc
-  data.tar.gz: a8cd80a311e74759b6bf1351974888e787ddeb084a435dd6a13aadc4c1fb2a65d0be5d993ee0303e6e08d67bfecd7e09cd0763ecb92d0a19146838544479ee85
+  metadata.gz: 71285a57ead31c478d4880ae64b1ab9e29091a22027f489fc92f30005d8cbf1eecf5a5e79f0bc81bbb8b99723399e4b6c1f856c8c2e9eb21ecadef64e591c593
+  data.tar.gz: 7609a05ffd89aa3eb2dad0c75b9201a356bdcc83ff7f76522a8888b16f80071edb4d809093fb7e6e17322653aed701c1561d25c760073b75c21a00723996f632

data/lib/generators/glueby/contract/templates/timestamp_table.rb.erb

@@ -13,6 +13,7 @@ class CreateTimestamp < ActiveRecord::Migration<%= migration_version %>
       t.string   :payment_base
       t.bigint   :prev_id
       t.boolean  :latest, null: false, default: true
+      t.boolean  :hex, null: false, default: false
     end
 
     add_index :glueby_timestamps, [:prev_id], unique: true

data/lib/glueby/active_record.rb

@@ -4,5 +4,22 @@ require 'active_record'
 module Glueby
   module AR
     autoload :SystemInformation, 'glueby/active_record/system_information'
+
+    def transaction(isolation: nil)
+      options = { joinable: false, requires_new: true }
+
+      adapter_type = ActiveRecord::Base.connection.adapter_name.downcase
+
+      # SQLite3 does not support transaction isolation level READ COMMITTED.
+      if isolation == :read_committed && adapter_type == 'mysql2'
+        options[:isolation] = :read_committed
+      end
+
+      ActiveRecord::Base.transaction(**options) do
+        yield
+      end
+    end
+
+    module_function :transaction
   end
 end

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

@@ -14,11 +14,13 @@ module Glueby
         validate :validate_prev
 
         class << self
-          def digest_content(content, digest)
+          def digest_content(content, digest, hex = false)
             case digest&.downcase
             when :sha256
+              content = hex ? content.htb : content
               Tapyrus.sha256(content).bth
             when :double_sha256
+              content = hex ? content.htb : content
               Tapyrus.double_sha256(content).bth
             when :none
               content
@@ -33,17 +35,20 @@ module Glueby
         # - content
         # - prefix(optional)
         # - timestamp_type(optional)
+        # - hex(optional) [Boolean] If true, the strings set in prefix and content are treated as hex strings.
         # @raise [Glueby::ArgumentError] If the timestamp_type is not in :simple or :trackable
         def initialize(attributes = nil)
           # Set content_hash from :content attribute
-          content_hash = Timestamp.digest_content(attributes[:content], attributes[:digest] || :sha256)
+          hex = attributes[:hex] || false
+          content_hash = Timestamp.digest_content(attributes[:content], attributes[:digest] || :sha256, hex)
           super(
             wallet_id: attributes[:wallet_id],
             content_hash: content_hash,
-            prefix: attributes[:prefix] ? attributes[:prefix] : '',
+            prefix: attributes[:prefix] || '',
             status: :init,
             timestamp_type: attributes[:timestamp_type] || :simple,
-            prev_id: attributes[:prev_id]
+            prev_id: attributes[:prev_id],
+            hex: hex
           )
         rescue ::ArgumentError => e
           raise Glueby::ArgumentError, e.message
@@ -142,6 +147,8 @@ module Glueby
             )
           end
 
+          prefix = hex ? self.prefix&.htb : self.prefix
+          content_hash = hex ? self.content_hash&.htb : self.content_hash
           tx = builder.set_data(prefix, content_hash)
                       .set_inputs(utxo_provider)
                       .build

data/lib/glueby/contract/timestamp.rb

@@ -29,6 +29,7 @@ module Glueby
       # - :simple
       # - :trackable
       # @param [Integer] prev_timestamp_id The id column of glueby_timestamps that will be updated by the timestamp that will be created
+      # @param [Boolean] hex If true, prefix and content are treated as hex strings
       # @raise [Glueby::Contract::Errors::UnsupportedDigestType] if digest is unsupported
       # @raise [Glueby::Contract::Errors::InvalidTimestampType] if timestamp_type is unsupported
       def initialize(
@@ -39,7 +40,8 @@ module Glueby
         digest: :sha256,
         utxo_provider: nil,
         timestamp_type: :simple,
-        prev_timestamp_id: nil
+        prev_timestamp_id: nil,
+        hex: false
       )
         @wallet = wallet
         @content = content
@@ -51,6 +53,7 @@ module Glueby
         raise Glueby::Contract::Errors::InvalidTimestampType, "#{timestamp_type} is invalid type, supported types are :simple, and :trackable." unless [:simple, :trackable].include?(timestamp_type)
         @timestamp_type = timestamp_type
         @prev_timestamp_id = prev_timestamp_id
+        @hex = hex
       end
 
       # broadcast to Tapyrus Core
@@ -66,7 +69,8 @@ module Glueby
           content: @content,
           timestamp_type: @timestamp_type,
           digest: @digest,
-          prev_id: @prev_timestamp_id
+          prev_id: @prev_timestamp_id,
+          hex: @hex
         )
         @ar.save_with_broadcast!(fee_estimator: @fee_estimator, utxo_provider: @utxo_provider)
         @ar.txid

data/lib/glueby/contract/token.rb

@@ -79,7 +79,6 @@ module Glueby
                          else
                            raise Glueby::Contract::Errors::UnsupportedTokenType
                          end
-
           [new(color_id: color_id), txs]
         end
 
@@ -135,7 +134,7 @@ module Glueby
           script_pubkey = funding_tx.outputs.first.script_pubkey
           color_id = Tapyrus::Color::ColorIdentifier.reissuable(script_pubkey)
 
-          ActiveRecord::Base.transaction(joinable: false, requires_new: true) do
+          Glueby::AR.transaction(isolation: :read_committed) do
             # Store the script_pubkey for reissue the token.
             Glueby::Contract::AR::ReissuableToken.create!(
               color_id: color_id.to_hex,
@@ -226,7 +225,7 @@ module Glueby
                     .build
           end
 
-          ActiveRecord::Base.transaction(joinable: false, requires_new: true) do
+          Glueby::AR.transaction(isolation: :read_committed) do
             if metadata
               p2c_utxo = txb.p2c_utxos.first
               Glueby::Contract::AR::TokenMetadata.create!(
@@ -354,7 +353,10 @@ module Glueby
           txb.pay(r[:address], r[:amount].to_i, color_id)
         end
 
-        tx = sender.internal_wallet.broadcast(txb.build)
+        tx = nil
+        Glueby::AR.transaction(isolation: :read_committed) do
+          tx = sender.internal_wallet.broadcast(txb.build)
+        end
         [color_id, tx]
       end
 
@@ -373,7 +375,7 @@ module Glueby
         raise Glueby::Contract::Errors::InsufficientTokens unless balance
         raise Glueby::Contract::Errors::InsufficientTokens if balance < amount
 
-        tx = Internal::ContractBuilder
+        builder = Internal::ContractBuilder
                 .new(
                   sender_wallet: sender.internal_wallet,
                   fee_estimator: fee_estimator,
@@ -382,9 +384,11 @@ module Glueby
                 )
                 .burn(amount, color_id)
                 .change_address(sender.internal_wallet.receive_address, color_id)
-                .build
 
-        sender.internal_wallet.broadcast(tx)
+        Glueby::AR.transaction(isolation: :read_committed) do
+          tx = builder.build
+          sender.internal_wallet.broadcast(tx)
+        end
       end
 
       # Return balance of token in the specified wallet.

data/lib/glueby/internal/contract_builder.rb

@@ -130,26 +130,26 @@ module Glueby
       )
         tx, index = nil
 
-        if Glueby.configuration.use_utxo_provider? || utxo_provider
-          utxo_provider ||= UtxoProvider.new
-          script_pubkey = Tapyrus::Script.parse_from_addr(address)
-          tx, index = utxo_provider.get_utxo(script_pubkey, amount)
-        else
-          fee_estimator ||= @fee_estimator
-          txb = Tapyrus::TxBuilder.new
-          fee = fee_estimator.fee(Contract::FeeEstimator.dummy_tx(txb.build))
-          _sum, utxos = sender_wallet
-                         .collect_uncolored_outputs(fee + amount, nil, only_finalized)
-          utxos.each { |utxo| txb.add_utxo(to_tapyrusrb_utxo_hash(utxo)) }
-          tx = txb.pay(address, amount)
-                  .change_address(sender_wallet.change_address)
-                  .fee(fee)
-                  .build
-          sender_wallet.sign_tx(tx)
-          index = 0
-        end
+        Glueby::AR.transaction(isolation: :read_committed) do
+          if Glueby.configuration.use_utxo_provider? || utxo_provider
+            utxo_provider ||= UtxoProvider.new
+            script_pubkey = Tapyrus::Script.parse_from_addr(address)
+            tx, index = utxo_provider.get_utxo(script_pubkey, amount)
+          else
+            fee_estimator ||= @fee_estimator
+            txb = Tapyrus::TxBuilder.new
+            fee = fee_estimator.fee(Contract::FeeEstimator.dummy_tx(txb.build))
+            _sum, utxos = sender_wallet
+                           .collect_uncolored_outputs(fee + amount, nil, only_finalized)
+            utxos.each { |utxo| txb.add_utxo(to_tapyrusrb_utxo_hash(utxo)) }
+            tx = txb.pay(address, amount)
+                    .change_address(sender_wallet.change_address)
+                    .fee(fee)
+                    .build
+            sender_wallet.sign_tx(tx)
+            index = 0
+          end
 
-        ActiveRecord::Base.transaction(joinable: false, requires_new: true) do
           # Here needs to use the return tx from Internal::Wallet#broadcast because the txid
           # is changed if you enable FeeProvider.
           tx = sender_wallet.broadcast(tx)

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

@@ -120,7 +120,7 @@ module Glueby
         end
 
         def broadcast(wallet_id, tx, &block)
-          ::ActiveRecord::Base.transaction do
+          ::ActiveRecord::Base.transaction(joinable: false, requires_new: true) do
             AR::Utxo.destroy_for_inputs(tx)
             AR::Utxo.create_or_update_for_outputs(tx, status: :broadcasted)
             block.call(tx) if block

data/lib/glueby/version.rb

@@ -1,3 +1,3 @@
 module Glueby
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glueby
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapyrus