glueby 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d988a55f8acc63e5c2abb8f30ab88030a19c8e42212e372a8eeea6a2c5f3b27d
-  data.tar.gz: 9cee6ba595dd3ba576d1190350396a4c55923c58620a529ec0ff55cc4249b69b
+  metadata.gz: d0b977d0a922975117e46c6777bf07fb13ad89d03bee8d9785ddec04e311f9c4
+  data.tar.gz: 5b0472f6ca379fcffd7dac8adcb8fe508237ae8fcf184c1372ba721c4104f13f
 SHA512:
-  metadata.gz: 610751093275239e15a70726033be9a3eb4ca65e65c1b86874f09471f4391fbc764463f76da36619b7429dac7c2b70b1f6596e2e3b2eacb397f11029018fb8e1
-  data.tar.gz: c48b89c3b4a61f652b051642420f1d8b3aa08ad3d90f8807ec8803f63d64e675a924a56990f42fc3d4201d6a90c99fa8101f423bbe66143ae735efdfae758cbf
+  metadata.gz: 1e2e21b82fe9fcb5ac8433d8f5952718624d7900b09f2ecf789163c3037a26a6b1939dbeb03dcccbf0051e890947f1612fc933c75d8093a3e74d26756ea43642
+  data.tar.gz: 8c6d28c5432a9e8a7d56072bf6398453da18d69ef564225987649ce6bf91e751ff40b42dba9c23d652a3a2b755539b919ad0c98ae83da6607c35b3a78b7f0fd1

data/lib/generators/glueby/contract/block_syncer_generator.rb

@@ -0,0 +1,26 @@
+module Glueby
+  module Contract
+    class BlockSyncerGenerator < Rails::Generators::Base
+      include ::Rails::Generators::Migration
+      include Glueby::Generator::MigrateGenerator
+      extend Glueby::Generator::MigrateGenerator::ClassMethod
+
+      source_root File.expand_path('templates', __dir__)
+
+      def create_migration_file
+        migration_dir = File.expand_path("db/migrate")
+
+        if self.class.migration_exists?(migration_dir, "create_system_information")
+          ::Kernel.warn "Migration already exists: create_system_information"
+        else
+          migration_template(
+            "system_information_table.rb.erb",
+            "db/migrate/create_system_information.rb",
+            migration_version: migration_version,
+            table_options: table_options,
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+class CreateSystemInformation < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :system_informations<%= table_options %> do |t|
+      t.string  :info_key
+      t.string  :info_value
+      t.timestamps
+    end
+    add_index  :system_informations, [:info_key], unique: true
+
+    Glueby::AR::SystemInformation.create(info_key: "synced_block_number", info_value: "0")
+  end
+end

data/lib/glueby.rb

@@ -6,6 +6,7 @@ module Glueby
   autoload :Generator, 'glueby/generator'
   autoload :Wallet, 'glueby/wallet'
   autoload :Internal, 'glueby/internal'
+  autoload :AR, 'glueby/active_record'
 
   begin
     class Railtie < ::Rails::Railtie
@@ -13,6 +14,7 @@ module Glueby
         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"
       end
     end
   rescue

data/lib/glueby/active_record.rb

@@ -0,0 +1,8 @@
+
+require 'active_record'
+
+module Glueby
+  module AR
+    autoload :SystemInformation, 'glueby/active_record/system_information'
+  end
+end

data/lib/glueby/active_record/system_information.rb

@@ -0,0 +1,15 @@
+module Glueby
+  module AR
+    class SystemInformation < ::ActiveRecord::Base
+
+      def self.synced_block_height
+        SystemInformation.find_by(info_key: "synced_block_number")
+      end
+
+      def int_value
+        info_value.to_i
+      end
+
+    end
+  end
+end

data/lib/glueby/contract/payment.rb

@@ -11,6 +11,10 @@ module Glueby
     #                      or
     #            Glueby::Wallet.create
     #
+    # Use `Glueby::Internal::Wallet#receive_address` to generate the address of a receiver
+    # receiver.internal_wallet.receive_address
+    # => '1CY6TSSARn8rAFD9chCghX5B7j4PKR8S1a'
+    #
     # Balance of sender and receiver before send
     # sender.balances[""]
     # => 100_000(tapyrus)
@@ -18,7 +22,7 @@ module Glueby
     # => 0(tapyrus)
     #
     # Send
-    # Payment.transfer(sender: sender, receiver: receiver, amount: 10_000)
+    # Payment.transfer(sender: sender, receiver_address: '1CY6TSSARn8rAFD9chCghX5B7j4PKR8S1a', amount: 10_000)
     # sender.balances[""]
     # => 90_000
     # receiver.balances[""]
@@ -28,7 +32,7 @@ module Glueby
       extend Glueby::Contract::TxBuilder
 
       class << self
-        def transfer(sender:, receiver:, amount:, fee_provider: FixedFeeProvider.new)
+        def transfer(sender:, receiver_address:, amount:, fee_provider: FixedFeeProvider.new)
           raise Glueby::Contract::Errors::InvalidAmount unless amount.positive?
 
           tx = Tapyrus::Tx.new
@@ -37,7 +41,7 @@ module Glueby
           sum, outputs = sender.internal_wallet.collect_uncolored_outputs(dummy_fee + amount)
           fill_input(tx, outputs)
 
-          receiver_script = Tapyrus::Script.parse_from_addr(receiver.internal_wallet.receive_address)
+          receiver_script = Tapyrus::Script.parse_from_addr(receiver_address)
           tx.outputs << Tapyrus::TxOut.new(value: amount, script_pubkey: receiver_script)
 
           fee = fee_provider.fee(tx)

data/lib/glueby/contract/token.rb

@@ -13,13 +13,17 @@ module Glueby
     # alice = Glueby::Wallet.create
     # bob = Glueby::Wallet.create
     #
+    # Use `Glueby::Internal::Wallet#receive_address` to generate the address of bob
+    # bob.internal_wallet.receive_address
+    # => '1CY6TSSARn8rAFD9chCghX5B7j4PKR8S1a'
+    #
     # Issue
     # token = Token.issue!(issuer: alice, amount: 100)
     # token.amount(wallet: alice)
     # => 100
     #
     # Send
-    # token.transfer!(sender: alice, receiver: bob, amount: 1)
+    # token.transfer!(sender: alice, receiver_address: '1CY6TSSARn8rAFD9chCghX5B7j4PKR8S1a', amount: 1)
     # token.amount(wallet: alice)
     # => 99
     # token.amount(wallet: bob)
@@ -122,16 +126,16 @@ module Glueby
       # Send the token to other wallet
       #
       # @param sender [Glueby::Wallet] wallet to send this token
-      # @param receiver [Glueby::Wallet] wallet to receive this token
+      # @param receiver_address [String] address to receive this token
       # @param amount [Integer]
       # @return [Token] receiver token
       # @raise [InsufficientFunds] if wallet does not have enough TPC to send transaction.
       # @raise [InsufficientTokens] if wallet does not have enough token to send.
       # @raise [InvalidAmount] if amount is not positive integer.
-      def transfer!(sender:, receiver:, amount: 1)
+      def transfer!(sender:, receiver_address:, amount: 1)
         raise Glueby::Contract::Errors::InvalidAmount unless amount.positive?
 
-        tx = create_transfer_tx(color_id: color_id, sender: sender, receiver: receiver, amount: amount)
+        tx = create_transfer_tx(color_id: color_id, sender: sender, receiver_address: receiver_address, amount: amount)
         sender.internal_wallet.broadcast(tx)
       end
 

data/lib/glueby/contract/tx_builder.rb

@@ -100,14 +100,14 @@ module Glueby
         issuer.internal_wallet.sign_tx(tx, prev_txs)
       end
 
-      def create_transfer_tx(color_id:, sender:, receiver:, amount:, fee_provider: FixedFeeProvider.new)
+      def create_transfer_tx(color_id:, sender:, receiver_address:, amount:, fee_provider: FixedFeeProvider.new)
         tx = Tapyrus::Tx.new
 
         utxos = sender.internal_wallet.list_unspent
         sum_token, outputs = collect_colored_outputs(utxos, color_id, amount)
         fill_input(tx, outputs)
 
-        receiver_script = Tapyrus::Script.parse_from_addr(receiver.internal_wallet.receive_address)
+        receiver_script = Tapyrus::Script.parse_from_addr(receiver_address)
         receiver_colored_script = receiver_script.add_color(color_id)
         tx.outputs << Tapyrus::TxOut.new(value: amount, script_pubkey: receiver_colored_script)
 

data/lib/glueby/version.rb

@@ -1,3 +1,3 @@
 module Glueby
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

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

@@ -0,0 +1,36 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glueby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapyrus
@@ -72,15 +72,19 @@ files:
 - bin/console
 - bin/setup
 - glueby.gemspec
+- lib/generators/glueby/contract/block_syncer_generator.rb
 - lib/generators/glueby/contract/initializer_generator.rb
 - lib/generators/glueby/contract/templates/initializer.rb.erb
 - lib/generators/glueby/contract/templates/key_table.rb.erb
+- lib/generators/glueby/contract/templates/system_information_table.rb.erb
 - lib/generators/glueby/contract/templates/timestamp_table.rb.erb
 - lib/generators/glueby/contract/templates/utxo_table.rb.erb
 - lib/generators/glueby/contract/templates/wallet_table.rb.erb
 - lib/generators/glueby/contract/timestamp_generator.rb
 - lib/generators/glueby/contract/wallet_adapter_generator.rb
 - lib/glueby.rb
+- lib/glueby/active_record.rb
+- lib/glueby/active_record/system_information.rb
 - lib/glueby/contract.rb
 - lib/glueby/contract/active_record.rb
 - lib/glueby/contract/active_record/timestamp.rb
@@ -106,6 +110,7 @@ files:
 - lib/glueby/version.rb
 - lib/glueby/wallet.rb
 - 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
 homepage: https://github.com/chaintope/glueby