universa 3.14.2.2 → 3.14.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6487e468be6041ca989e00499911941b71f8684fcdf171e9659c3934f26a54f8
-  data.tar.gz: 0e04d054937e42a0955a48597fc20766327b2438d036c490d4dbe12b79d86ae5
+  metadata.gz: 45b80876f80d3a1d753ae95564492344a3949ed918cb74e4d76e039e5d9aa5bf
+  data.tar.gz: 7a091a3cd7d7e107619d8ae47a9b39a8b5c3c0a81646d6feb863f3c8722e1d1b
 SHA512:
-  metadata.gz: 3106d98aa41169ff04865fcf6b21705077f0d365ac9064cb577b8a5e68af6aafc8086999f10d2da3e5641e8f0e59d839fa68011a9ff4acfb18c44c8c7197ad36
-  data.tar.gz: f5be6b114d0df7d4e625c6b8c4a4a7a2469105c10f8fe9fcba1d792e8f361a4827040956ddb1ca2bbc9fb771027d19c83d5873daf32ba4d0cf8e22eead6475b4
+  metadata.gz: 3686641fdef17fa73cde3891352cea13ac73c7ef965e5fa63e4c087bfc100a9b266d71d0f70a446a9220e47dc88abfedeee52895de170087b33a820044393e16
+  data.tar.gz: 7fa8bf49efbdd6f4339d54e0e2bca6c15db375f7052cad7474fc312e0d506eb0012cf76d6e3adf2d3084ecc40160637e75041ea0b55870d208f7cee655f28977

data/lib/universa/keytool/keytool.rb

@@ -6,8 +6,7 @@ require 'universa/tools'
 
 include Universa
 
-class MessageException < Exception;
-end
+class MessageException < Exception; end
 
 def error message
   raise MessageException, message
@@ -55,20 +54,20 @@ class KeyTool
   def session_password
     @require_password or return nil
     @session_password ||= begin
-      if @autogenerate_password
-        psw = 29.random_alnums
-        puts "Autogenerated password: #{ANSI.bold { psw }}"
-        psw
-      else
-        puts "\nPlease enter password for key to be generated"
-        psw1 = STDIN.noecho(&:gets).chomp
-        puts "Please re-enter the password"
-        psw2 = STDIN.noecho(&:gets).chomp
-        psw1 == psw2 or error "passwords do not match"
-        psw1.length < 8 and error "password is too short"
-        psw1
-      end
-    end
+                            if @autogenerate_password
+                              psw = 29.random_alnums
+                              puts "Autogenerated password: #{ANSI.bold { psw }}"
+                              psw
+                            else
+                              puts "\nPlease enter password for key to be generated"
+                              psw1 = STDIN.noecho(&:gets).chomp
+                              puts "Please re-enter the password"
+                              psw2 = STDIN.noecho(&:gets).chomp
+                              psw1 == psw2 or error "passwords do not match"
+                              psw1.length < 8 and error "password is too short"
+                              psw1
+                            end
+                          end
   end
 
   def output_file(extension = nil, overwrite_existing_name = nil)
@@ -80,7 +79,7 @@ class KeyTool
     extension && !name.end_with?(extension) ? "#{name}#{extension}" : name
   end
 
-  def load_key(name)
+  def load_key(name, allow_public = false)
     packed = open(name, 'rb') { |f| f.read } rescue error("can't read file: #{name}")
     begin
       PrivateKey.from_packed(packed)
@@ -94,8 +93,14 @@ class KeyTool
           key = PrivateKey.from_packed(packed, password: password) rescue nil
           key and break key
         end
+      elsif allow_public
+        begin
+          PublicKey.from_packed(packed)
+        rescue
+          error "can't load the private/public key (file corrupt?)"
+        end
       else
-        error "can't load the key (file corrupt?)"
+        error "can't load the private key (file corrupt?)"
       end
     end
   end
@@ -178,11 +183,24 @@ class KeyTool
         @rounds < 100000 and error "To few rounds, use at least 100000"
       }
 
+      opts.on("-p FILE", "--public FILE", "extract public key") { |name|
+        task {
+          key = load_key(name, true)
+          if @output_file
+            open(output_file(".public.unikey"), 'wb') { |f| f << key.pack() }
+          else
+            puts format_text_object(key.pack(), "public key", fileName: name)
+            # puts "not yet implemented #{key.long_address.to_s}"
+          end
+        }
+      }
+
       opts.on("-s FILE", "--show FILE", "show key information") { |name|
         task {
-          key = load_key(name)
+          key = load_key(name, true)
+          is_private = key.is_a? PrivateKey
           puts "\r----------------------------------------------------------------------------------------"
-          puts "Private key, #{key.info.getKeyLength() * 8} bits\n"
+          puts "#{is_private ? 'Private' : 'Public'} key, #{key.info.getKeyLength() * 8} bits\n"
           puts "Short address : #{ANSI.bold { key.short_address.to_s }}"
           puts "Long  address : #{ANSI.bold { key.long_address.to_s }}"
         }

data/lib/universa/text_objects.rb

@@ -0,0 +1,22 @@
+require 'digest'
+
+# Generate universa text object representation from arbitrary data, see
+# https://kb.universablockchain.com/text_format_for_universa_objects/311
+# for details.
+#
+# @param [Object] data binary string to pack as universa text object
+# @param [Object] type object type, see link above
+# @param [Hash] kwargs any additional fields
+# @return [String] string with properly framed universa object
+def format_text_object(data, type, **kwargs)
+  source = ["type: #{type}"]
+  kwargs.each { |k, v|
+    source << "#{k}: #{v}"
+  }
+  source << ""
+  source << Base64.encode64(data)
+  hash = Digest::SHA2.base64digest(source.join(''))
+  "==== Begin Universa Object: #{hash} ====\n" +
+    source.join("\n") +
+    "\n===== End Universa Object: #{hash} =====\n"
+end

data/lib/universa/version.rb

@@ -1,4 +1,4 @@
 module Universa
   # Current gem version
-  VERSION = "3.14.2.2"
+  VERSION = "3.14.2.4"
 end

data/lib/universa.rb

@@ -12,6 +12,7 @@ require 'universa/stored_contract'
 require "universa/chain_store"
 require "universa/universa_helpers"
 require "universa/fs_store/file_store"
+require "universa/text_objects"
 
 # The Universa gem
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 3.14.2.2
+  version: 3.14.2.4
 platform: ruby
 authors:
 - sergeych
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -174,6 +174,7 @@ files:
 - lib/universa/service.rb
 - lib/universa/stored_contract.rb
 - lib/universa/string_utils.rb
+- lib/universa/text_objects.rb
 - lib/universa/tools.rb
 - lib/universa/u_settings.rb
 - lib/universa/ubox.rb
@@ -204,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Expose Universa Java API to ruby