universa 3.13.2.1 → 3.14.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e864fbf25b814e9064d7d0148e22b9eab669099ad92d4cd5672e1e0127e0ddaf
-  data.tar.gz: 6c7250174e5d4917e8f360e4e2c449af618a2abb7e39fabea9b29cf19f61ecab
+  metadata.gz: 45b80876f80d3a1d753ae95564492344a3949ed918cb74e4d76e039e5d9aa5bf
+  data.tar.gz: 7a091a3cd7d7e107619d8ae47a9b39a8b5c3c0a81646d6feb863f3c8722e1d1b
 SHA512:
-  metadata.gz: 3fc5362eaeae51fb132a55062d6c91378454bbafdba70f3dbfcd7982635d7a79b4908c1f127145a27ee425b24bf819415f9cb37ae0d51d1e4cce16339cb84a65
-  data.tar.gz: 0d92f08da7fffcc0ae392d6efd7c69ac1f9553c8acffe52ddb623c8e5f4d7a48109d5f8a197eede2fcd9e46e152b0567af08db60b34c58b7057f0a1ac0328288
+  metadata.gz: 3686641fdef17fa73cde3891352cea13ac73c7ef965e5fa63e4c087bfc100a9b266d71d0f70a446a9220e47dc88abfedeee52895de170087b33a820044393e16
+  data.tar.gz: 7fa8bf49efbdd6f4339d54e0e2bca6c15db375f7052cad7474fc312e0d506eb0012cf76d6e3adf2d3084ecc40160637e75041ea0b55870d208f7cee655f28977

data/README.md

@@ -1,15 +1,11 @@
 # Universa
 
-> beta state: direct full access to Java API ready for test, started adapter of remote objects - syntax sugar 
-for direct access to remote objects.
-
-__attention__ since this release version numbers match the Universa Core library version included. 
-
 This is an under-construction official gem from [Universa][universa] to facilitate access to the
-Java library using Universa's UMI protocol and Universa client services.
+Java library using Universa UMI protocol and Universa client services.
 
 ## News
 
+- production-tested in various universa projects
 - rewritten Client and Connection to use new consensus-based, dns-free Universa network topology discovery protocol
 - added syntax sugar for TransactionPack
 - alfa version of the local FS-based contract store.
@@ -46,6 +42,26 @@ Or install it yourself as:
 
 ## Usage
 
+### Direct access to Universa objects:
+
+~~~ruby
+    include Universa
+
+    @private_key = PrivateKey.new 2048
+    c = Contract.create @private_key
+    c.get_creator.get_all_addresses.should == [@private_key.long_address.to_s]
+    c.seal()
+    c.check() and c.trace_errors()
+    c.should be_ok
+
+    c1 = Contract.from_packed(c.packed)
+    c1.hash_id.should == c.hash_id
+    c1.should == c
+    c1.expires_at.should > (Time.now + 120)
+~~~
+
+see smaples in specs (spec/contract_spec, spec/compound_spec, etc.)
+
 ### Direct access to UMI 
  
 So far, you can only get direct access the the Java API functions. To get it:

data/bin/refresh_umi

@@ -16,5 +16,5 @@ rm -rd ./bin/__MACOSX >/dev/null 2>&1
 
 rm download
 
-echo "successfully nstalled version: `bin/umi/bin/umi --version`"
+echo "successfully installed version: `bin/umi/bin/umi --version`"
 

data/bin/umi/bin/umi

@@ -267,7 +267,7 @@ loadConfigFile() {
 }
 
 # Now check to see if it's a good enough version
-# TODO - Check to see if we have a configured default java version, otherwise use 1.6
+# TODO - Check to see if we have a configured default java version, otherwise use 1.8
 java_version_check() {
   readonly java_version=$("$java_cmd" -version 2>&1 | awk -F '"' '/version/ {print $2}')
   if [[ "$java_version" == "" ]]; then
@@ -281,10 +281,10 @@ java_version_check() {
     if [[ "$major" -eq "1" ]]; then
      local major=$(echo "$java_version" | cut -d'.' -f2)
     fi
-    if [[ "$major" -lt "6" ]]; then
+    if [[ "$major" -lt "8" ]]; then
       echo
       echo The java installation you have is not up to date
-      echo $app_name requires at least version 1.6+, you have
+      echo $app_name requires at least version 1.8+, you have
       echo version $java_version
       echo
       echo Please go to http://www.java.com/getjava/ and download
@@ -344,7 +344,7 @@ declare -r lib_dir="$(realpath "${app_home}/../lib")"
 declare -a app_mainclass=(com.icodici.farcallscala.Main)
 
 declare -r script_conf_file="${app_home}/../conf/application.ini"
-declare -r app_classpath="$lib_dir/com.icodici.umi-0.8.67.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.13.2.jar:$lib_dir/org.yaml.snakeyaml-1.18.jar:$lib_dir/com.icodici.nanohttpd-2.1.0.jar:$lib_dir/com.icodici.common_tools-3.13.2.jar:$lib_dir/com.eclipsesource.minimal-json.minimal-json-0.9.4.jar:$lib_dir/net.java.dev.jna.jna-4.5.1.jar:$lib_dir/org.checkerframework.checker-qual-2.3.2.jar:$lib_dir/com.icodici.crypto-3.13.2.jar:$lib_dir/org.bouncycastle.bcprov-jdk15on-1.62.jar:$lib_dir/com.squareup.jnagmp.jnagmp-2.0.0.jar:$lib_dir/com.typesafe.play.play-json_2.12-2.6.10.jar:$lib_dir/com.typesafe.play.play-functional_2.12-2.6.10.jar:$lib_dir/org.scala-lang.scala-reflect-2.12.7.jar:$lib_dir/org.typelevel.macro-compat_2.12-1.1.1.jar:$lib_dir/joda-time.joda-time-2.9.9.jar:$lib_dir/com.fasterxml.jackson.core.jackson-core-2.8.11.jar:$lib_dir/com.fasterxml.jackson.core.jackson-annotations-2.8.11.jar:$lib_dir/com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.8.11.jar:$lib_dir/com.fasterxml.jackson.core.jackson-databind-2.8.11.1.jar:$lib_dir/com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.8.11.jar:$lib_dir/org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar:$lib_dir/net.java.dev.jna.jna-platform-4.5.0.jar:$lib_dir/net.sf.jopt-simple.jopt-simple-4.9.jar"
+declare -r app_classpath="$lib_dir/com.icodici.umi-0.8.72.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.14.2.jar:$lib_dir/org.yaml.snakeyaml-1.18.jar:$lib_dir/com.icodici.nanohttpd-2.1.0.jar:$lib_dir/com.icodici.common_tools-3.14.2.jar:$lib_dir/com.eclipsesource.minimal-json.minimal-json-0.9.4.jar:$lib_dir/net.java.dev.jna.jna-4.5.1.jar:$lib_dir/org.checkerframework.checker-qual-2.3.2.jar:$lib_dir/com.icodici.crypto-3.14.2.jar:$lib_dir/org.bouncycastle.bcprov-jdk15on-1.62.jar:$lib_dir/com.squareup.jnagmp.jnagmp-2.0.0.jar:$lib_dir/org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar:$lib_dir/net.java.dev.jna.jna-platform-4.5.0.jar:$lib_dir/net.sf.jopt-simple.jopt-simple-4.9.jar"
 
 # java_cmd is overrode in process_args when -java-home is used
 declare java_cmd=$(get_java_cmd)

data/bin/umi/bin/umi.bat

@@ -80,7 +80,7 @@ rem "-J" is stripped, "-D" is left as is, and everything is appended to JAVA_OPT
 set _JAVA_PARAMS=
 set _APP_ARGS=
 
-set "APP_CLASSPATH=%APP_LIB_DIR%\com.icodici.umi-0.8.67.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.13.2.jar;%APP_LIB_DIR%\org.yaml.snakeyaml-1.18.jar;%APP_LIB_DIR%\com.icodici.nanohttpd-2.1.0.jar;%APP_LIB_DIR%\com.icodici.common_tools-3.13.2.jar;%APP_LIB_DIR%\com.eclipsesource.minimal-json.minimal-json-0.9.4.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-4.5.1.jar;%APP_LIB_DIR%\org.checkerframework.checker-qual-2.3.2.jar;%APP_LIB_DIR%\com.icodici.crypto-3.13.2.jar;%APP_LIB_DIR%\org.bouncycastle.bcprov-jdk15on-1.62.jar;%APP_LIB_DIR%\com.squareup.jnagmp.jnagmp-2.0.0.jar;%APP_LIB_DIR%\com.typesafe.play.play-json_2.12-2.6.10.jar;%APP_LIB_DIR%\com.typesafe.play.play-functional_2.12-2.6.10.jar;%APP_LIB_DIR%\org.scala-lang.scala-reflect-2.12.7.jar;%APP_LIB_DIR%\org.typelevel.macro-compat_2.12-1.1.1.jar;%APP_LIB_DIR%\joda-time.joda-time-2.9.9.jar;%APP_LIB_DIR%\com.fasterxml.jackson.core.jackson-core-2.8.11.jar;%APP_LIB_DIR%\com.fasterxml.jackson.core.jackson-annotations-2.8.11.jar;%APP_LIB_DIR%\com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.8.11.jar;%APP_LIB_DIR%\com.fasterxml.jackson.core.jackson-databind-2.8.11.1.jar;%APP_LIB_DIR%\com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.8.11.jar;%APP_LIB_DIR%\org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-platform-4.5.0.jar;%APP_LIB_DIR%\net.sf.jopt-simple.jopt-simple-4.9.jar"
+set "APP_CLASSPATH=%APP_LIB_DIR%\com.icodici.umi-0.8.72.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.14.2.jar;%APP_LIB_DIR%\org.yaml.snakeyaml-1.18.jar;%APP_LIB_DIR%\com.icodici.nanohttpd-2.1.0.jar;%APP_LIB_DIR%\com.icodici.common_tools-3.14.2.jar;%APP_LIB_DIR%\com.eclipsesource.minimal-json.minimal-json-0.9.4.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-4.5.1.jar;%APP_LIB_DIR%\org.checkerframework.checker-qual-2.3.2.jar;%APP_LIB_DIR%\com.icodici.crypto-3.14.2.jar;%APP_LIB_DIR%\org.bouncycastle.bcprov-jdk15on-1.62.jar;%APP_LIB_DIR%\com.squareup.jnagmp.jnagmp-2.0.0.jar;%APP_LIB_DIR%\org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-platform-4.5.0.jar;%APP_LIB_DIR%\net.sf.jopt-simple.jopt-simple-4.9.jar"
 set "APP_MAIN_CLASS=com.icodici.farcallscala.Main"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

data/lib/universa/binder.rb

@@ -29,6 +29,10 @@ module Universa
       __getobj__.keySet()
     end
 
+    def binary(key)
+      __getobj__.getBinary(key)
+    end
+
     # # Internal use only. Allow processing remote commands as local calls
     def respond_to_missing?(method_name, include_private = false)
       l = method_name[-1]
@@ -57,6 +61,7 @@ module Universa
     end
 
     # Converts binder to the array of [key, value] pairs, like with regular ruby hashes
+    # @return [Array(Array(String,Object))] array of [key,value] pairs.
     def to_a
       map {|x| x}
     end
@@ -73,11 +78,6 @@ module Universa
       keys.map {|k| block.call [k, __getobj__.get(k)]}
     end
 
-    # @return [Array(Array(String,Object))] array of [key,value] pairs.
-    def to_a
-      map {|x| x}
-    end
-
     # converts to a regular ruby hash
     def to_h
       to_a.to_h

data/lib/universa/contract.rb

@@ -35,6 +35,15 @@ module Universa
     end
   end
 
+  # Safe58 allows human-friendly binary-to-characters codec. It automatically corrects recognition
+  # errors like 0 instead of 0 and 1 instead of I. The code does not use characters that look alike and
+  # uses only encglish letters and digits that also simplify select-copy-paste routine.
+  #
+  # important! arguments MUST be binary strings, so use
+  #
+  #     str.force_encoding('binary')
+  #
+  # as need, otherwise it will not work as expected.
   class Safe58 < RemoteAdapter
     remote_class "net.sergeych.utils.Safe58"
 
@@ -58,6 +67,11 @@ module Universa
     remote_class "com.icodici.universa.contract.permissions.ChangeOwnerPermission"
   end
 
+  # Adapter for Universa ChangeRolePermission
+  class ChangeRolePermission < RemoteAdapter
+    remote_class "com.icodici.universa.contract.permissions.ChangeRolePermission"
+  end
+
   # Adapter for Universa RevokePermission
   class RevokePermission < RemoteAdapter
     remote_class "com.icodici.universa.contract.permissions.RevokePermission"
@@ -91,6 +105,10 @@ module Universa
   # adapter for a role that is a list of roles
   class ListRole < RemoteAdapter
     remote_class "com.icodici.universa.contract.roles.ListRole"
+
+    class Mode
+      ANY = 'ANY'
+    end
   end
 
   # Adapter for permission to modify data
@@ -98,6 +116,10 @@ module Universa
     remote_class "com.icodici.universa.contract.permissions.ModifyDataPermission"
   end
 
+  # Adapter for Universa QuorumVoteRole
+  class QuorumVoteRole < RemoteAdapter
+    remote_class "com.icodici.universa.contract.roles.QuorumVoteRole"
+  end
 
   # Wrapper for Java API Reference class
 
@@ -240,7 +262,7 @@ module Universa
     # @return [Contract] simple contact, not sealed
     def self.create issuer_key, expires_at: (Time.now + 90 * 24 * 60 * 60), use_short_address: false
       contract = Contract.new
-      contract.set_expires_at expires_at
+      contract.set_expires_at expires_at.utc
       contract.set_issuer_keys(use_short_address ? issuer_key.short_address : issuer_key.long_address)
       contract.register_role(contract.issuer.link_as("owner"))
       contract.register_role(contract.issuer.link_as("creator"))
@@ -320,7 +342,7 @@ module Universa
     # set +expires_at+ field
     # @param [Time] time when this contract will be expired, if yet +APPROVED+.
     def expires_at=(time)
-      set_expires_at time
+      set_expires_at time.utc
     end
 
     # @return definition data
@@ -408,4 +430,8 @@ module Universa
     end
   end
 
-end
+  class ExtendedSignature < RemoteAdapter
+    remote_class "com.icodici.universa.contract.ExtendedSignature"
+  end
+
+end

data/lib/universa/dump.rb

@@ -0,0 +1,40 @@
+module Universa
+
+  # Convert binary data to a human-readable dump string, like
+  #
+  # <code>
+  # 000000 27 23 64 61 74 61 c4 2d 0f |'#data.-.|
+  # 000008 0f 1f 43 63 6f 6e 74 72 61 |..Ccontra|
+  # </code>
+  #
+  # @param data[String] data to dump
+  # @param line_bytes[Number] how many bytes to show in each line
+  # @return [String] dump as a string
+  def dump_bytes data, line_bytes=16
+    data.force_encoding Encoding::BINARY
+    offset = 0
+    res = []
+
+    while( offset < data.length )
+
+      left = "%06x" % offset
+      portion = data[offset..(offset+line_bytes)].bytes
+
+      bytes = portion.map { |x| "%02x" % x }.join(' ')
+      chars = portion.map { |c| x = c.ord; x >= 32 && x <= 'z'.ord ? x.chr : '.' }.join('')
+
+      if chars.length < line_bytes
+        pad = line_bytes - chars.length + 1
+        chars += ' ' * pad
+        bytes += '   ' * pad
+      end
+
+      res << "#{left} #{bytes} |#{chars}|"
+
+      offset += line_bytes
+    end
+    res.join("\n")
+  end
+
+  module_function :dump_bytes
+end

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/service.rb

@@ -2,7 +2,7 @@ require 'singleton'
 
 module Universa
 
-  # The service is a singleton to provide porcess-wide objects and methods. For example,
+  # The service is a singleton to provide process-wide objects and methods. For example,
   # the {UMI} interface and reference class factory are unique per-process for Universa
   # library. It uses exactly one lazy created {UMI} connection which is shared among all threads.
   # As UMI server is multithreaded by nature, is will not block ruby threads waiting for remote
@@ -26,7 +26,8 @@ module Universa
       @known_proxies = {}
       [Contract, PrivateKey, PublicKey, KeyAddress, HashId, Binder,
        Role, SimpleRole, RoleLink, ListRole, Parcel, UnsContract,
-       ChangeOwnerPermission, RevokePermission, ModifyDataPermission,  SplitJoinPermission,
+       ChangeOwnerPermission, ChangeRolePermission, RevokePermission,
+       ModifyDataPermission,  SplitJoinPermission, QuorumVoteRole,
        UmiClient, Duration, Compound, KeyInfo, PBKDF2].each {|klass| register_proxy klass}
     end
 
@@ -66,11 +67,19 @@ module Universa
         instance.configure &block
       end
 
+
       # Get the global UMI interface, creating it if need.
       # @return [UMI] ready interface
       def umi
-        instance.umi
+        @@instance_lock.synchronize {
+          instance.umi
+        }
       end
+
+      private
+
+      @@instance_lock = Monitor.new
+
     end
 
     # Register a class that will work as a proxy for UMI remote class. Such adapter class mist extend RemoteAdapter
@@ -120,7 +129,7 @@ module Universa
 
     # Updating proxied object is not allowed. Raises error.
     def __setobj__
-      raise "ObectProxy does not support changing referenced object"
+      raise "ObjectProxy does not support changing referenced object"
     end
 
     # Returns remote class name. There is no need to override it, when inheriting it use +remote_class+ helper:
@@ -131,11 +140,11 @@ module Universa
     #      #...
     #   end
     #
-    # Notice: remote_class will do allnecessary work for you.
+    # Notice: remote_class will do all necessary work for you.
     #
     # @return [String] remote class name
     def self.remote_class_name
-      @remote_class_name or raise Error, "provde remote class name"
+      @remote_class_name or raise Error, "provide remote class name"
     end
 
     # Registers remote class name to be used with this adapted. Call it early in descendant class

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/umi.rb

@@ -372,7 +372,7 @@ module Universa
   # Java classes, whose references are created on-the-fly automatically (and will be reclaimed by GC on both
   # ends soon).
   #
-  # == Instances are uniqie
+  # == Instances are unique
   #
   # What means, if some calls will return the same Java object instance, it will be returned as the same {Ref}
   # instance.

data/lib/universa/version.rb

@@ -1,4 +1,4 @@
 module Universa
   # Current gem version
-  VERSION = "3.13.2.1"
+  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
 #

data/samples/load_contract.rb

@@ -0,0 +1,10 @@
+require_relative '../lib/universa/dump'
+
+source_file = ARGV[0] || File.expand_path("~/Downloads/c.unicon")
+
+packed = open(source_file,'rb') { |f| f.read }
+
+puts Universa::dump_bytes(packed)
+
+require 'base64'
+puts Base64.encode64(packed)

data/samples/safe58_sample.rb

@@ -0,0 +1,45 @@
+# example:
+#
+# rationale:
+# We want to pass order code to user which is potentially long integer (sam, above 9 characters in decimal
+# notation), but the bank insist oreder code in the payment purpose should be 5-8 characters.
+#
+# solution:
+#
+# pack long id (we assume it will fit 5 bytes that give us >60 billions which is usually more
+# than enough) to short and easy to human-retype code using SAFE58 encoding by Universa.
+#
+# It will nirmally give us 6 letter-code which is well protected against recognition mistakes,
+# for example 0 instead of o or 1 instead of I or i. It autocorrects it and does not use like characters.
+#
+require 'universa'
+
+# sample long to encode, 12 billions+ (12`884`901`887)
+id = 0x2FFFFffff
+
+def int_to_safe58(value)
+    # pack to BE 8-byte long
+    packed = [value].pack("Q>")
+
+    # important: safe58 needs binary encoded string, but pack already gives us binary string,
+    # so we strip 3 first bytes which are are zeroes and encode the rest to safe 58:
+    Universa::Safe58.encode(packed[3..])
+end
+
+def safe58_to_int(encoded)
+    # decode 5 bytes
+    bytes = Universa::Safe58.decode(encoded)
+    # pad left with 3 zero bytes to get back 64 bit integer and unpack it:
+    "\x0\x0\x0#{bytes}".unpack("Q>")[0]
+end
+
+puts "Encoded: #{id} -> #{int_to_safe58 id}"
+
+id2 = safe58_to_int(int_to_safe58(id))
+puts "Decoded: #{int_to_safe58 id} -> #{id2}"
+
+id == id2 or raise "test failed"
+
+puts "ALL OK"
+
+

data/universa.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby-ext"
   spec.add_dependency "ansi"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 3.13.2.1
+  version: 3.14.2.4
 platform: ruby
 authors:
 - sergeych
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,29 +144,19 @@ files:
 - bin/umi/bin/umi
 - bin/umi/bin/umi.bat
 - bin/umi/lib/com.eclipsesource.minimal-json.minimal-json-0.9.4.jar
-- bin/umi/lib/com.fasterxml.jackson.core.jackson-annotations-2.8.11.jar
-- bin/umi/lib/com.fasterxml.jackson.core.jackson-core-2.8.11.jar
-- bin/umi/lib/com.fasterxml.jackson.core.jackson-databind-2.8.11.1.jar
-- bin/umi/lib/com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.8.11.jar
-- bin/umi/lib/com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.8.11.jar
-- bin/umi/lib/com.icodici.common_tools-3.13.2.jar
-- bin/umi/lib/com.icodici.crypto-3.13.2.jar
+- bin/umi/lib/com.icodici.common_tools-3.14.2.jar
+- bin/umi/lib/com.icodici.crypto-3.14.2.jar
 - bin/umi/lib/com.icodici.nanohttpd-2.1.0.jar
-- bin/umi/lib/com.icodici.umi-0.8.67.jar
-- bin/umi/lib/com.icodici.universa_core-3.13.2.jar
+- bin/umi/lib/com.icodici.umi-0.8.72.jar
+- bin/umi/lib/com.icodici.universa_core-3.14.2.jar
 - bin/umi/lib/com.squareup.jnagmp.jnagmp-2.0.0.jar
-- bin/umi/lib/com.typesafe.play.play-functional_2.12-2.6.10.jar
-- bin/umi/lib/com.typesafe.play.play-json_2.12-2.6.10.jar
-- bin/umi/lib/joda-time.joda-time-2.9.9.jar
 - bin/umi/lib/net.java.dev.jna.jna-4.5.1.jar
 - bin/umi/lib/net.java.dev.jna.jna-platform-4.5.0.jar
 - bin/umi/lib/net.sf.jopt-simple.jopt-simple-4.9.jar
 - bin/umi/lib/org.bouncycastle.bcprov-jdk15on-1.62.jar
 - bin/umi/lib/org.checkerframework.checker-qual-2.3.2.jar
 - bin/umi/lib/org.scala-lang.scala-library-2.12.7.jar
-- bin/umi/lib/org.scala-lang.scala-reflect-2.12.7.jar
 - bin/umi/lib/org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar
-- bin/umi/lib/org.typelevel.macro-compat_2.12-1.1.1.jar
 - bin/umi/lib/org.yaml.snakeyaml-1.18.jar
 - exe/unikeys
 - lib/universa.rb
@@ -174,6 +164,7 @@ files:
 - lib/universa/chain_store.rb
 - lib/universa/client.rb
 - lib/universa/contract.rb
+- lib/universa/dump.rb
 - lib/universa/errors.rb
 - lib/universa/fs_store/entry.rb
 - lib/universa/fs_store/file_store.rb
@@ -183,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
@@ -191,12 +183,14 @@ files:
 - lib/universa/version.rb
 - lib/universa/weak_reference.rb
 - sample_ping.rb
+- samples/load_contract.rb
+- samples/safe58_sample.rb
 - universa.gemspec
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,8 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Expose Universa Java API to ruby
 test_files: []