glueby 0.4.1 → 0.5.0

data/lib/glueby/version.rb

@@ -1,3 +1,3 @@
 module Glueby
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/glueby.rb

@@ -9,27 +9,18 @@ module Glueby
   autoload :AR, 'glueby/active_record'
   autoload :FeeProvider, 'glueby/fee_provider'
   autoload :Configuration, 'glueby/configuration'
+  autoload :BlockSyncer, 'glueby/block_syncer'
+  autoload :UtxoProvider, 'glueby/utxo_provider'
+
+  if defined? ::Rails::Railtie
+    require 'glueby/railtie'
+  end
 
   # Add prefix to activerecord table names
   def self.table_name_prefix
     'glueby_'
   end
 
-  begin
-    class Railtie < ::Rails::Railtie
-      rake_tasks do
-        load "tasks/glueby/contract.rake"
-        load "tasks/glueby/contract/timestamp.rake"
-        load "tasks/glueby/contract/wallet_adapter.rake"
-        load "tasks/glueby/contract/block_syncer.rake"
-        load "tasks/glueby/fee_provider.rake"
-      end
-    end
-  rescue
-    # Rake task is unavailable
-    puts "Rake task is unavailable"
-  end
-
   # Returns the global [Configuration](RSpec/Core/Configuration) object.
   def self.configuration
     @configuration ||= Glueby::Configuration.new

data/lib/tasks/glueby/block_syncer.rake

@@ -0,0 +1,29 @@
+namespace :glueby do
+  namespace :contract do
+    namespace :block_syncer do
+      desc '[Deprecated use glueby:block_syncer:start instead] sync block into database'
+      task :start, [] => [:environment] do |_, _|
+        puts '[Deprecated] glueby:contract:block_syncer:start is deprecated. Use \'glueby:block_syncer:start\''
+        Rake::Task['glueby:block_syncer:start'].execute
+      end
+    end
+  end
+end
+
+
+namespace :glueby do
+  namespace :block_syncer do
+    desc 'sync block into database'
+    task :start, [] => [:environment] do |_, _|
+      latest_block_num = Glueby::Internal::RPC.client.getblockcount
+      synced_block = Glueby::AR::SystemInformation.synced_block_height
+      (synced_block.int_value + 1..latest_block_num).each do |height|
+        ::ActiveRecord::Base.transaction do
+          Glueby::BlockSyncer.new(height).run
+          synced_block.update(info_value: height.to_s)
+        end
+        puts "success in synchronization (block height=#{height})"
+      end
+    end
+  end
+end

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

@@ -8,35 +8,25 @@ 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
-              ::ActiveRecord::Base.transaction do
-                wallet = Glueby::Wallet.load(t.wallet_id)
-                tx = create_tx(wallet, t.prefix, t.content_hash, Glueby::Contract::FixedFeeEstimator.new)
-                t.update(txid: tx.txid, status: :unconfirmed)
-
-                wallet.internal_wallet.broadcast(tx)
-                puts "broadcasted (id=#{t.id}, txid=#{tx.txid})"
+              wallet = Glueby::Wallet.load(t.wallet_id)
+              funding_tx, tx = create_txs(wallet, t.prefix, t.content_hash, Glueby::Contract::FixedFeeEstimator.new, utxo_provider)
+              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
-            rescue => e
-              puts "failed to broadcast (id=#{t.id}, reason=#{e.message})"
-            end
-          end
-        end
-
-        def confirm
-          timestamps = Glueby::Contract::AR::Timestamp.where(status: :unconfirmed)
-          timestamps.each do |t|
-            begin
               ::ActiveRecord::Base.transaction do
-                tx = get_transaction(t)
-                if tx['confirmations'] &&  tx['confirmations'] > 0
-                  t.update(status: :confirmed)
-                  puts "confirmed (id=#{t.id}, txid=#{tx['txid']})"
+                wallet.internal_wallet.broadcast(tx) do |tx|
+                  t.update(txid: tx.txid, status: :unconfirmed)
                 end
+                puts "timestamp tx was broadcasted (id=#{t.id}, txid=#{tx.txid})"
               end
             rescue => e
-              puts "failed to confirm (id=#{t.id}, reason=#{e.message})"
+              puts "failed to broadcast (id=#{t.id}, reason=#{e.message})"
             end
           end
         end
@@ -52,11 +42,6 @@ namespace :glueby do
       task :create, [] => [:environment] do |_, _|
         Glueby::Contract::Task::Timestamp.create
       end
-
-      desc 'confirm glueby timestamp tx'
-      task :confirm, [] => [:environment] do |_, _|
-        Glueby::Contract::Task::Timestamp.confirm
-      end
     end
   end
 end

data/lib/tasks/glueby/fee_provider.rake

@@ -9,5 +9,10 @@ namespace :glueby do
     task :status, [] => [:environment] do |_, _|
       Glueby::FeeProvider::Tasks.new.status
     end
+
+    desc 'Show the address of the Glueby::FeeProvider'
+    task :address, [] => [:environment] do |_, _|
+      Glueby::FeeProvider::Tasks.new.print_address
+    end
   end
 end

data/lib/tasks/glueby/utxo_provider.rake

@@ -0,0 +1,18 @@
+namespace :glueby do
+  namespace :utxo_provider do
+    desc 'Manage the UTXO pool in Glueby::UtxoProvider. Creates outputs for paying utxo if the outputs is less than configured pool size by :utxo_pool_size'
+    task :manage_utxo_pool, [] => [:environment] do |_, _|
+      Glueby::UtxoProvider::Tasks.new.manage_utxo_pool
+    end
+
+    desc 'Show the status of the UTXO pool in Glueby::UtxoProvider'
+    task :status, [] => [:environment] do |_, _|
+      Glueby::UtxoProvider::Tasks.new.status
+    end
+
+    desc 'Show the address of the Glueby::UtxoProvider'
+    task :address, [] => [:environment] do |_, _|
+      Glueby::UtxoProvider::Tasks.new.print_address
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glueby
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - azuchi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapyrus
@@ -28,16 +28,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3
 description: A Ruby library of smart contracts that can be used on Tapyrus.
 email:
 - azuchi@chaintope.com
@@ -87,6 +101,7 @@ files:
 - lib/glueby.rb
 - lib/glueby/active_record.rb
 - lib/glueby/active_record/system_information.rb
+- lib/glueby/block_syncer.rb
 - lib/glueby/configuration.rb
 - lib/glueby/contract.rb
 - lib/glueby/contract/active_record.rb
@@ -96,6 +111,7 @@ files:
 - lib/glueby/contract/fee_estimator.rb
 - lib/glueby/contract/payment.rb
 - lib/glueby/contract/timestamp.rb
+- lib/glueby/contract/timestamp/syncer.rb
 - lib/glueby/contract/token.rb
 - lib/glueby/contract/tx_builder.rb
 - lib/glueby/fee_provider.rb
@@ -111,15 +127,19 @@ files:
 - lib/glueby/internal/wallet/active_record/utxo.rb
 - lib/glueby/internal/wallet/active_record/wallet.rb
 - lib/glueby/internal/wallet/active_record_wallet_adapter.rb
+- lib/glueby/internal/wallet/active_record_wallet_adapter/syncer.rb
 - lib/glueby/internal/wallet/errors.rb
 - lib/glueby/internal/wallet/tapyrus_core_wallet_adapter.rb
+- lib/glueby/railtie.rb
+- lib/glueby/utxo_provider.rb
+- lib/glueby/utxo_provider/tasks.rb
 - lib/glueby/version.rb
 - lib/glueby/wallet.rb
+- lib/tasks/glueby/block_syncer.rake
 - lib/tasks/glueby/contract.rake
-- lib/tasks/glueby/contract/block_syncer.rake
 - lib/tasks/glueby/contract/timestamp.rake
-- lib/tasks/glueby/contract/wallet_adapter.rake
 - lib/tasks/glueby/fee_provider.rake
+- lib/tasks/glueby/utxo_provider.rake
 homepage: https://github.com/chaintope/glueby
 licenses:
 - MIT

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

@@ -1,36 +0,0 @@
-module Glueby
-  module Contract
-    module Task
-      module BlockSyncer
-
-        def sync_block
-          latest_block_num = Glueby::Internal::RPC.client.getblockcount
-          synced_block = Glueby::AR::SystemInformation.synced_block_height
-          (synced_block.int_value + 1..latest_block_num).each do |i|
-            ::ActiveRecord::Base.transaction do
-              block_hash = Glueby::Internal::RPC.client.getblockhash(i)
-              import_block(block_hash)
-              synced_block.update(info_value: i.to_s)
-              puts "success in synchronization (block height=#{i.to_s})"
-            end
-          end
-        end 
-
-      end
-    end
-  end
-end
-
-namespace :glueby do
-  namespace :contract do
-    namespace :block_syncer do
-      include Glueby::Contract::Task::BlockSyncer
-
-      desc 'sync block into database'
-      task :start, [] => [:environment] do |_, _|
-        Glueby::Contract::Task::BlockSyncer.sync_block
-      end
-
-    end
-  end
-end

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

@@ -1,42 +0,0 @@
-module Glueby
-  module Contract
-    module Task
-      module WalletAdapter
-        def import_block(block_hash)
-          block = Glueby::Internal::RPC.client.getblock(block_hash, 0)
-          block = Tapyrus::Block.parse_from_payload(block.htb)
-          block.transactions.each { |tx| import_tx(tx.txid) }
-        end
-
-        def import_tx(txid)
-          tx = Glueby::Internal::RPC.client.getrawtransaction(txid)
-          tx = Tapyrus::Tx.parse_from_payload(tx.htb)
-          Glueby::Internal::Wallet::AR::Utxo.destroy_for_inputs(tx)
-          Glueby::Internal::Wallet::AR::Utxo.create_or_update_for_outputs(tx)
-        end
-      end
-    end
-  end
-end
-
-namespace :glueby do
-  namespace :contract do
-    namespace :wallet_adapter do
-      include Glueby::Contract::Task::WalletAdapter
-
-      desc 'import block into database'
-      task :import_block, [:block_hash] => [:environment] do |_, args|
-        block_hash = args[:block_hash]
-
-        ::ActiveRecord::Base.transaction { import_block(block_hash) }
-      end
-
-      desc 'import transaction into database'
-      task :import_tx, [:txid] => [:environment] do |_, args|
-        txid = args[:txid]
-
-        ::ActiveRecord::Base.transaction { import_tx(txid) }
-      end
-    end
-  end
-end