glueby 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f53ca4e5784495dc9ddc7669bc021985614b3719205247c42005ec5d12a5c4
-  data.tar.gz: d5bb0540f3db7cf5ccdb96d4487ff627c4090f69e8719f746badae31689f864d
+  metadata.gz: '0196e03513c71e992b7b126c3100a6a57bff96210479f97736a7ea1893f029ec'
+  data.tar.gz: f2d3fa7ec7918394054447ccbca4dff5f039a0a8ef5d431311800dcae9fdb2e6
 SHA512:
-  metadata.gz: 037ac4f566439facb0971a34c086bb128afd4b00566b7ab0f9013d4b4c357082c88a620eb8262221a245586429387228811e940077868b254b1ec82d155de8ab
-  data.tar.gz: 9a031d6505750f550abe9948ff977cd01f4fbcad8ab9b733f0b322101cc77d9856c6d2e3f633e61c9e49b4657dc7f286db1abdd4df0511cedf96dba9c27a2d3d
+  metadata.gz: 9bdb76d2162a482823107ac0a61d81436599a3ce49d706c69366ac288c394546fa553e896c91a9af084a3f3991d698307a3cfcfc457b47625cef06e3f5b6c113
+  data.tar.gz: e1f8f4885822bc70475e99856858421e693db63b3dae96abaaac2c235d7c2fcd8ca610333a085b03a706976ffdcfffa0c4e5f9ef9f0da8e391a73ee350e93ec4

data/glueby.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'tapyrus', '>= 0.2.9'
+  spec.add_runtime_dependency 'tapyrus', '>= 0.2.13'
   spec.add_runtime_dependency 'activerecord', '~> 6.1.3'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rails', '~> 6.1.3'

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

@@ -35,16 +35,16 @@ module Glueby
           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
+            logger.info("funding tx was broadcasted(id=#{id}, funding_tx.txid=#{funding_tx.txid})")
           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
+          logger.info("timestamp tx was broadcasted (id=#{id}, txid=#{tx.txid})")
           true
         rescue => e
           logger.error("failed to broadcast (id=#{id}, reason=#{e.message})")

data/lib/glueby/contract/token.rb

@@ -91,11 +91,14 @@ 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
+            funding_tx = issuer.internal_wallet.broadcast(funding_tx)
+          end
+
           ActiveRecord::Base.transaction(joinable: false, requires_new: true) do
             # Store the script_pubkey for reissue the token.
             Glueby::Contract::AR::ReissuableToken.create!(color_id: color_id.to_hex, script_pubkey: script_pubkey.to_hex)
 
-            funding_tx = issuer.internal_wallet.broadcast(funding_tx)
             tx = create_issue_tx_for_reissuable_token(funding_tx: funding_tx, issuer: issuer, amount: amount, split: split)
             tx = issuer.internal_wallet.broadcast(tx)
             [[funding_tx, tx], color_id]

data/lib/glueby/utxo_provider/tasks.rb

@@ -30,14 +30,14 @@ module Glueby
 
         utxos.each { |utxo| txb.add_utxo(utxo) }
 
-        shortage = [utxo_provider.utxo_pool_size - current_utxo_pool_size, 0].max
+        shortage = [utxo_provider.utxo_pool_size - utxo_provider.current_utxo_pool_size, 0].max
         return if shortage == 0
 
         added_outputs = 0
         shortage.times do
           fee = utxo_provider.fee_estimator.fee(dummy_tx(txb.build))
           break if (sum - fee) < utxo_provider.default_value
-          txb.pay(address, utxo_provider.default_value)
+          txb.pay(utxo_provider.address, utxo_provider.default_value)
           sum -= utxo_provider.default_value
           added_outputs += 1
         end
@@ -45,11 +45,11 @@ module Glueby
         return if added_outputs == 0
 
         fee = utxo_provider.fee_estimator.fee(dummy_tx(txb.build))
-        tx = txb.change_address(address)
+        tx = txb.change_address(utxo_provider.address)
                 .fee(fee)
                 .build
-        tx = wallet.sign_tx(tx)
-        wallet.broadcast(tx)
+        tx = utxo_provider.wallet.sign_tx(tx)
+        utxo_provider.wallet.broadcast(tx)
       ensure
         status
       end
@@ -58,13 +58,13 @@ module Glueby
       def status
         status = :ready
 
-        if current_utxo_pool_size < utxo_provider.utxo_pool_size
-          if tpc_amount < value_to_fill_utxo_pool
+        if utxo_provider.current_utxo_pool_size < utxo_provider.utxo_pool_size
+          if utxo_provider.tpc_amount < utxo_provider.value_to_fill_utxo_pool
             status = :insufficient_amount
             message = <<~MESSAGE
             1. Please replenishment TPC which is for paying tpc to UtxoProvider. 
-              UtxoProvider needs #{value_to_fill_utxo_pool} tapyrus in UTXO pool. 
-              UtxoProvider wallet's address is '#{address}'
+              UtxoProvider needs #{utxo_provider.value_to_fill_utxo_pool} tapyrus in UTXO pool. 
+              UtxoProvider wallet's address is '#{utxo_provider.address}'
             2. Then create UTXOs for paying in UTXO pool with 'rake glueby:utxo_provider:manage_utxo_pool'
             MESSAGE
           else
@@ -72,12 +72,12 @@ module Glueby
           end
         end
 
-        status = :not_ready if current_utxo_pool_size == 0
+        status = :not_ready if utxo_provider.current_utxo_pool_size == 0
 
         puts <<~EOS
         Status: #{STATUS[status]}
-        TPC amount: #{delimit(tpc_amount)}
-        UTXO pool size: #{delimit(current_utxo_pool_size)}
+        TPC amount: #{delimit(utxo_provider.tpc_amount)}
+        UTXO pool size: #{delimit(utxo_provider.current_utxo_pool_size)}
         #{"\n" if message}#{message}
         Configuration:
           default_value = #{delimit(utxo_provider.default_value)}
@@ -87,17 +87,13 @@ module Glueby
 
       # Show the address of Utxo Provider 
       def print_address
-        puts address
+        puts utxo_provider.address
       end
 
       private
 
-      def tpc_amount
-        wallet.balance(false)
-      end
-
       def collect_outputs
-        wallet.list_unspent.inject([0, []]) do |sum, output|
+        utxo_provider.wallet.list_unspent.inject([0, []]) do |sum, output|
           next sum if output[:color_id] || output[:amount] == utxo_provider.default_value
 
           new_sum = sum[0] + output[:amount]
@@ -105,34 +101,16 @@ module Glueby
             txid: output[:txid],
             script_pubkey: output[:script_pubkey],
             value: output[:amount],
-            index: output[:vout] ,
+            index: output[:vout],
             finalized: output[:finalized]
           }
           [new_sum, new_outputs]
         end
       end
 
-      def current_utxo_pool_size
-        wallet
-          .list_unspent(false)
-          .count { |o| !o[:color_id] && o[:amount] == utxo_provider.default_value }
-      end
-
-      def value_to_fill_utxo_pool
-        utxo_provider.default_value * utxo_provider.utxo_pool_size
-      end
-
-      def wallet
-        utxo_provider.wallet
-      end
-
       def delimit(num)
         num.to_s.reverse.scan(/.{1,3}/).join('_').reverse
       end
-
-      def address
-        @address ||= wallet.get_addresses.first || wallet.receive_address
-      end
     end
   end
 end

data/lib/glueby/utxo_provider.rb

@@ -27,7 +27,7 @@ module Glueby
       @fee_estimator = (UtxoProvider.config && UtxoProvider.config[:fee_estimator]) || Glueby::Contract::FixedFeeEstimator.new
     end
 
-    attr_reader :wallet, :fee_estimator
+    attr_reader :wallet, :fee_estimator, :address
 
     # Provide a UTXO
     # @param [Tapyrus::Script] script_pubkey The script to be provided
@@ -78,6 +78,24 @@ module Glueby
         )
     end
 
+    def tpc_amount
+      wallet.balance(false)
+    end
+
+    def current_utxo_pool_size
+      wallet
+        .list_unspent(false)
+        .count { |o| !o[:color_id] && o[:amount] == default_value }
+    end
+
+    def address
+      @address ||= wallet.get_addresses.first || wallet.receive_address
+    end
+
+    def value_to_fill_utxo_pool
+      default_value * utxo_pool_size
+    end
+
     private
 
     # Create wallet for provider

data/lib/glueby/version.rb

@@ -1,3 +1,3 @@
 module Glueby
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glueby
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - azuchi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapyrus
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement