glueby 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572e6f36cf1b1df86b93fcd264ce1a537769588a43cbe8bac5ad3d6d9df21f44
-  data.tar.gz: 4516f08781b324f76846057cfe4722552bc413e7f9518d68b038c7bc16f03f79
+  metadata.gz: 8d128fa095b1dacb936a8a9ff3306b750d3cf258133f6fa469ccaf9d4d830c08
+  data.tar.gz: 0a0496a04b1a6b86d3f2790555ac832094cb2a809ea10262f0641520dc7cb96b
 SHA512:
-  metadata.gz: b04613b40d622b24e14fb45440ea974905daeea6726c4a44c9e458eabe9ea552e1b8a5ad581a7ea19ab8824216f001b95c49101fdefaf2bc424a39c2fdf23d07
-  data.tar.gz: 1e6a50bf51dd39249c5b2746e27831ca2b63da7bb02090ba2f04b978bfa172dc0372885774986cbbf94f07ccca11d82194b1d104c467d232e0916adab50c2308
+  metadata.gz: '07178bc49443f227073442e2d5e767e2350a1b363f72b1041b6f2feb2a6a7a413399617c97017acf73537d49e57f10d0aecb7439a8524a7c80691ccaf0620ce6'
+  data.tar.gz: 86d4f463995f258d3ab3496206eabc97af77f16554705f61db69c339efc146d876375cda34bf8a17425954bf51ad6c1699eb19f37676e54401c57e5026bec597

data/README.md

@@ -183,7 +183,7 @@ In the second Fee Provider mode, the Fee Provider module pays a fee instead of t
 1. Set like below
 
 ```ruby
-Glurby.configure do |config|
+Glueby.configure do |config|
   # Use FeeProvider to supply inputs for fees on each transaction that is created on Glueby.
   config.fee_provider_bears!
   config.fee_provider_config = {

data/glueby.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'tapyrus', '>= 0.2.9'
-  spec.add_development_dependency 'activerecord'
+  spec.add_runtime_dependency 'activerecord'
   spec.add_development_dependency 'sqlite3'
 end

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

@@ -4,6 +4,7 @@ class CreateKey < ActiveRecord::Migration<%= migration_version %>
       t.string     :private_key
       t.string     :public_key
       t.string     :script_pubkey
+      t.string     :label, index: true
       t.integer    :purpose
       t.belongs_to :wallet
       t.timestamps

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

@@ -5,6 +5,7 @@ class CreateUtxo < ActiveRecord::Migration<%= migration_version %>
       t.integer    :index
       t.bigint     :value
       t.string     :script_pubkey
+      t.string     :label, index: true
       t.integer    :status
       t.belongs_to :key, null: true
       t.timestamps

data/lib/glueby/contract/token.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'active_record'
 
 module Glueby
   module Contract

data/lib/glueby/internal/wallet.rb

@@ -74,8 +74,8 @@ module Glueby
         wallet_adapter.balance(id, only_finalized)
       end
 
-      def list_unspent(only_finalized = true)
-        wallet_adapter.list_unspent(id, only_finalized)
+      def list_unspent(only_finalized = true, label = nil)
+        wallet_adapter.list_unspent(id, only_finalized, label)
       end
 
       def delete
@@ -105,8 +105,8 @@ module Glueby
         tx
       end
 
-      def receive_address
-        wallet_adapter.receive_address(id)
+      def receive_address(label = nil)
+        wallet_adapter.receive_address(id, label)
       end
 
       def change_address
@@ -117,8 +117,8 @@ module Glueby
         wallet_adapter.create_pubkey(id)
       end
 
-      def collect_uncolored_outputs(amount)
-        utxos = list_unspent
+      def collect_uncolored_outputs(amount, label = nil)
+        utxos = list_unspent(true, label)
 
         utxos.inject([0, []]) do |sum, output|
           next sum if output[:color_id]
@@ -132,8 +132,8 @@ module Glueby
         raise Glueby::Contract::Errors::InsufficientFunds
       end
 
-      def get_addresses
-        wallet_adapter.get_addresses(id)
+      def get_addresses(label = nil)
+        wallet_adapter.get_addresses(id, label)
       end
 
       private

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

@@ -65,11 +65,13 @@ module Glueby
           raise NotImplementedError, "You must implement #{self.class}##{__method__}"
         end
 
-        # Returns all the UTXOs that the wallet has.
+        # Returns the UTXOs that the wallet has.
+        # If label is specified, return UTXOs filtered with label
         #
         # @param [String] wallet_id - The wallet id that is offered by `create_wallet()` method.
         # @param [Boolean] only_finalized - The UTXOs includes only finalized UTXO value if it
         #                                   is true. Default is true.
+        # @param [String] label - Label for filtering UTXOs
         # @return [Array of UTXO]
         #
         # ## The UTXO structure
@@ -78,7 +80,7 @@ module Glueby
         # - vout: [Integer] Output index
         # - amount: [Integer] Amount of the UTXO as tapyrus unit
         # - finalized: [Boolean] Whether the UTXO is finalized
-        def list_unspent(wallet_id, only_finalized = true)
+        def list_unspent(wallet_id, only_finalized = true, label = nil)
           raise NotImplementedError, "You must implement #{self.class}##{__method__}"
         end
 
@@ -107,8 +109,9 @@ module Glueby
         # Returns an address to receive coin.
         #
         # @param [String] wallet_id - The wallet id that is offered by `create_wallet()` method.
+        # @param [String] label The label associated with this address.
         # @return [String] P2PKH address
-        def receive_address(wallet_id)
+        def receive_address(wallet_id, label = nil)
           raise NotImplementedError, "You must implement #{self.class}##{__method__}"
         end
 
@@ -136,8 +139,9 @@ module Glueby
         # This method is expected to return the list of addresses that wallet has.
         #
         # @param [String] wallet_id - The wallet id that is offered by `create_wallet()` method.
+        # @param [String] label The label to filter the addresses.
         # @return [Array<String>] array of P2PKH address
-        def get_addresses(wallet_id)
+        def get_addresses(wallet_id, label = nil)
           raise NotImplementedError, "You must implement #{self.class}##{__method__}"
         end
       end

data/lib/glueby/internal/wallet/active_record/utxo.rb

@@ -36,6 +36,7 @@ module Glueby
 
               utxo = Utxo.find_or_initialize_by(txid: tx.txid, index: index)
               utxo.update!(
+                label: key.label,
                 script_pubkey: output.script_pubkey.to_hex,
                 value: output.value,
                 status: status,

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

@@ -86,10 +86,11 @@ module Glueby
           utxos.sum(&:value)
         end
 
-        def list_unspent(wallet_id, only_finalized = true)
+        def list_unspent(wallet_id, only_finalized = true, label = nil)
           wallet = AR::Wallet.find_by(wallet_id: wallet_id)
           utxos = wallet.utxos
           utxos = utxos.where(status: :finalized) if only_finalized
+          utxos = utxos.where(label: label) if label
           utxos.map do |utxo|
             {
               txid: utxo.txid,
@@ -115,9 +116,9 @@ module Glueby
           end
         end
 
-        def receive_address(wallet_id)
+        def receive_address(wallet_id, label = nil)
           wallet = AR::Wallet.find_by(wallet_id: wallet_id)
-          key = wallet.keys.create(purpose: :receive)
+          key = wallet.keys.create(purpose: :receive, label: label || '')
           key.address
         end
 
@@ -133,9 +134,11 @@ module Glueby
           Tapyrus::Key.new(pubkey: key.public_key)
         end
 
-        def get_addresses(wallet_id)
+        def get_addresses(wallet_id, label = nil)
           wallet = AR::Wallet.find_by(wallet_id: wallet_id)
-          wallet.keys.map(&:address)
+          keys = wallet.keys
+          keys = keys.where(label: label) if label
+          keys.map(&:address)
         end
       end
     end

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

@@ -83,11 +83,13 @@ module Glueby
           end
         end
 
-        def list_unspent(wallet_id, only_finalized = true)
+        def list_unspent(wallet_id, only_finalized = true, label = nil)
           perform_as(wallet_id) do |client|
             min_conf = only_finalized ? 1 : 0
             res = client.listunspent(min_conf)
 
+            res = res.filter { |i| i['label'] == label } if label
+ 
             res.map do |i|
               script = Tapyrus::Script.parse_from_payload(i['scriptPubKey'].htb)
               color_id = if script.cp2pkh? || script.cp2sh?
@@ -122,9 +124,9 @@ module Glueby
           end
         end
 
-        def receive_address(wallet_id)
+        def receive_address(wallet_id, label = nil)
           perform_as(wallet_id) do |client|
-            client.getnewaddress('', ADDRESS_TYPE)
+            client.getnewaddress(label || '', ADDRESS_TYPE)
           end
         end
 

data/lib/glueby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glueby
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - azuchi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapyrus
@@ -31,7 +31,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: