glueby 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b053cde5755947020d018939a4efa0a042e830232aff3e4d2a4a4a9b53caa54
-  data.tar.gz: 5fcfb3f983b687f6942901d7f56c9f70a5123b97e0f5eb313d3a011632824f76
+  metadata.gz: bd80045038551e7ffc41a613fb67401f3675c79098222e335359209070ff280a
+  data.tar.gz: f966a44bb7de60429e91d39681f63c6b827dbcb8806700cbfe6b5e961f013b2d
 SHA512:
-  metadata.gz: 440cd7203e5d411dc0aca3571e2eaa14b2c2ef85ca97d9ed60c7b9099d206dc9d4fbaa4dfb65190ddcc9fc71bbb57555abc42cde5cf2d3319fa4c8c18f3b70cf
-  data.tar.gz: 4dac9b8cb1a8a6670e8ee0458f467c66c91994b103e8d9513bbbfb926c27f9b0541de4bdfe12085edb58b1ac9f761775abf88f3dcb93ab43f9ba17ad0c96f840
+  metadata.gz: 4e443a845c4d65eeba06c83d40617497b984f8a0c158e54debb1ac82d762af53ebba8073e8fc18855f93816370dc8969657bec8d8e95d5990df3fe50c9c7471a
+  data.tar.gz: 2c5f2670b48f6a1149052b239d89c626c323e21f222bd2deb201074b96d54ac935080624cb92a2399414aed03de44258a41da5b0fc4ecc5221d854ef201c06de

data/lib/glueby/contract/timestamp.rb

@@ -19,9 +19,8 @@ module Glueby
         module_function
 
         # @param [Glueby::Wallet] wallet
-        # @param [Array] data The data to be used for generating pay-to-contract address
-        # @return [Array(String, String)]
-        #    Return (pay-to-contract address, public key used for generating address)
+        # @param [Array] contents The data to be used for generating pay-to-contract address
+        # @return [pay-to-contract address, public key used for generating address]
         def create_pay_to_contract_address(wallet, contents: nil)
           pubkey = wallet.internal_wallet.create_pubkey.pubkey
           # Calculate P + H(P || contents)G

data/lib/glueby/utxo_provider.rb

@@ -44,7 +44,7 @@ module Glueby
 
       fee = fee_estimator.fee(dummy_tx(txb.build))
       # The outputs need to be shuffled so that no utxos are spent twice as possible.
-      sum, outputs = wallet.collect_uncolored_outputs(fee + value, nil, true, true)
+      sum, outputs = collect_uncolored_outputs(wallet, fee + value)
 
       outputs.each do |utxo|
         txb.add_utxo({
@@ -73,6 +73,20 @@ module Glueby
       end
     end
 
+    def collect_uncolored_outputs(wallet, amount)
+      utxos = wallet.list_unspent.select { |o| !o[:color_id] && o[:amount] == @default_value }
+      utxos.shuffle!
+
+      utxos.inject([0, []]) do |sum, output|
+        new_sum = sum[0] + output[:amount]
+        new_outputs = sum[1] << output
+        return [new_sum, new_outputs] if new_sum >= amount
+
+        [new_sum, new_outputs]
+      end
+      raise Glueby::Contract::Errors::InsufficientFunds
+    end
+
     def validate_config!
       if UtxoProvider.config
         utxo_pool_size = UtxoProvider.config[:utxo_pool_size]

data/lib/glueby/version.rb

@@ -1,3 +1,3 @@
 module Glueby
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glueby
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - azuchi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tapyrus
@@ -147,7 +147,7 @@ metadata:
   homepage_uri: https://github.com/chaintope/glueby
   source_code_uri: https://github.com/chaintope/glueby
   changelog_uri: https://github.com/chaintope/glueby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Ruby library of smart contracts that can be used on Tapyrus.
 test_files: []