universa 3.14.2.4 → 3.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b80876f80d3a1d753ae95564492344a3949ed918cb74e4d76e039e5d9aa5bf
-  data.tar.gz: 7a091a3cd7d7e107619d8ae47a9b39a8b5c3c0a81646d6feb863f3c8722e1d1b
+  metadata.gz: 73b364bddb0a494976ebf2cd0ebf2931cf69abfa9cb8d58479b8775c3e24b3f6
+  data.tar.gz: 9c4891a5a8d1a6eba04f61708edad2d449519aa6520c78cd0b19857f6e3736f6
 SHA512:
-  metadata.gz: 3686641fdef17fa73cde3891352cea13ac73c7ef965e5fa63e4c087bfc100a9b266d71d0f70a446a9220e47dc88abfedeee52895de170087b33a820044393e16
-  data.tar.gz: 7fa8bf49efbdd6f4339d54e0e2bca6c15db375f7052cad7474fc312e0d506eb0012cf76d6e3adf2d3084ecc40160637e75041ea0b55870d208f7cee655f28977
+  metadata.gz: 87a5e9e6b7711b7c5315cfacd98faf3bef3e45aaf6261e4daf1a6bc76befd8f0a39d3d65aa65ee146f297f9b94fa20eb5b7974bc372de0e745694e8873a9456e
+  data.tar.gz: e85a4b6306857ec5aef891302f645ba7973a3c963bad8b460cd25c04ebb2f9aa9de78093e848c9e57f79aa59e5a491a76f67d82a65c830f0cf1abca0d5d370f5

data/README.md

@@ -5,6 +5,15 @@ Java library using Universa UMI protocol and Universa client services.
 
 ## News
 
+- fixed complex reference types integration
+- upgraded to new UMI (universa core is updated)
+- unikeys cli tool now show information about public keys too
+- unikeys extracts public keys and export as files or unversa text objects
+  them as both univera binaries or universa text objects
+- support to pack universa text objects, see [kb on universa text objects](https://kb.universablockchain.com/text_format_for_universa_objects/311).
+
+## Old 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

data/bin/umi/bin/umi

@@ -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.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"
+declare -r app_classpath="$lib_dir/com.icodici.umi-0.8.79.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.14.5.jar:$lib_dir/org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar:$lib_dir/net.sf.jopt-simple.jopt-simple-4.9.jar:$lib_dir/org.yaml.snakeyaml-1.18.jar:$lib_dir/com.icodici.nanohttpd-2.1.0-20210921.jar:$lib_dir/com.icodici.common_tools-3.14.5.jar:$lib_dir/com.icodici.crypto-3.14.5.jar:$lib_dir/net.java.dev.jna.jna-4.5.1.jar:$lib_dir/net.java.dev.jna.jna-platform-4.5.0.jar:$lib_dir/com.eclipsesource.minimal-json.minimal-json-0.9.4.jar:$lib_dir/org.checkerframework.checker-qual-2.3.2.jar:$lib_dir/org.bouncycastle.bcprov-jdk15on-1.62.jar:$lib_dir/com.squareup.jnagmp.jnagmp-2.0.0.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.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_CLASSPATH=%APP_LIB_DIR%\com.icodici.umi-0.8.79.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.14.5.jar;%APP_LIB_DIR%\org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar;%APP_LIB_DIR%\net.sf.jopt-simple.jopt-simple-4.9.jar;%APP_LIB_DIR%\org.yaml.snakeyaml-1.18.jar;%APP_LIB_DIR%\com.icodici.nanohttpd-2.1.0-20210921.jar;%APP_LIB_DIR%\com.icodici.common_tools-3.14.5.jar;%APP_LIB_DIR%\com.icodici.crypto-3.14.5.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-4.5.1.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-platform-4.5.0.jar;%APP_LIB_DIR%\com.eclipsesource.minimal-json.minimal-json-0.9.4.jar;%APP_LIB_DIR%\org.checkerframework.checker-qual-2.3.2.jar;%APP_LIB_DIR%\org.bouncycastle.bcprov-jdk15on-1.62.jar;%APP_LIB_DIR%\com.squareup.jnagmp.jnagmp-2.0.0.jar"
 set "APP_MAIN_CLASS=com.icodici.farcallscala.Main"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

data/lib/universa/client.rb

@@ -10,7 +10,6 @@ module Universa
     remote_class "com.icodici.universa.node2.network.Client"
   end
 
-
   # The universa network client. Discover and connects to the universa network, provides consensus operations
   # and all other whole-network related functions.
   class Client
@@ -42,9 +41,9 @@ module Universa
     # @raise if network topology could not be checked/obtained.
     def initialize topology: "mainnet", private_key: PrivateKey.new(2048), cache_dir: nil
       @client = UmiClient.new topology, cache_dir, private_key
-      @private_key = PrivateKey
+      @private_key = private_key
       @size = @client.size
-      @connections = (0...@size).map {nil}
+      @connections = (0...@size).map { nil }
     end
 
     # Get the node connection by its index (0...size).
@@ -64,7 +63,7 @@ module Universa
     # @param [Numeric] number of connections to get
     # @return [Array(Connection)] array of connections to random (non repeating) nodes
     def random_connections number
-      (0...size).to_a.sample(number).map {|n| self[n]}
+      (0...size).to_a.sample(number).map { |n| self[n] }
     end
 
     # Perform fast consensus state check with a given trust level, determining whether the item is approved or not.
@@ -90,33 +89,43 @@ module Universa
                 end
       @client.isApprovedByNetwork(hash_id, trust.to_f, 60000)
     end
-      # Perform fast consensus state check with a given trust level, as the fraction of the whole network size.
-      # It checks the network nodes randomly until get enough positive or negative states. The lover the required
-      # trust level is, the faster the answer will be found.
-      #
-      # @param [Contract | HashId] obj contract to check
-      # @param [Object] trust level, should be between 0.1 (10% of network) and 0.9 (90% of the network)
-      # @return [ContractState] of some final node check It does not calculates average time (yet)
-      def get_state obj, trust: 0.3
-      raise ArgumentError, "trusst must be in 0.1..0.9 range" if trust < 0.1 || trust > 0.9
+
+    # Perform fast consensus state check with a given trust level, as the fraction of the whole network size.
+    # It checks the network nodes randomly until get enough positive or negative states. The lover the required
+    # trust level is, the faster the answer will be found.
+    #
+    # @param [Contract | HashId] obj contract to check
+    # @param [Object] trust level, should be between 0.1 (10% of network) and 0.9 (90% of the network)
+    # @return [ContractState] of some final node check It does not calculates average time (yet)
+    # @raise Error if any of the queried nodes will cause an error.
+    def get_state obj, trust: 0.3
+      raise ArgumentError, "trust must be in 0.1..0.9 range" if trust < 0.1 || trust > 0.9
       result = Concurrent::IVar.new
+      found_error = nil
       negative_votes = Concurrent::AtomicFixnum.new((size * 0.1).round + 1)
       positive_votes = Concurrent::AtomicFixnum.new((size * trust).round)
 
       # consensus-finding conveyor: we chek connections in batches in parallel until get
       # some consensus. We do not wait until all of them will answer
-      (0...size).to_a.shuffle.each {|index|
+      (0...size).to_a.shuffle.each { |index|
         Thread.start {
           if result.incomplete?
-            if (state = self[index].get_state(obj)).approved?
-              result.try_set(state) if positive_votes.decrement < 0
-            else
-              result.try_set(state) if negative_votes.decrement < 0
+            begin
+              if (state = self[index].get_state(obj)).approved?
+                result.try_set(state) if positive_votes.decrement < 0
+              else
+                result.try_set(state) if negative_votes.decrement < 0
+              end
+            rescue
+              found_error = $!
+              result.try_set(nil)
             end
           end
         }
       }
-      result.value
+      r = result.value
+      found_error != nil and raise found_error
+      r
     end
 
     # Register a single contract (on private network or if you have white key allowing free operations)
@@ -139,7 +148,7 @@ module Universa
   # The connection to a single Universa node.
   class Connection
 
-    # Do not create it direcly, use {Client#random_connection}, {Client#random_connections} or {Client#[]} instead
+    # Do not create it directly, use {Client#random_connection}, {Client#random_connections} or {Client#[]} instead
     def initialize umi_client
       @client = umi_client
     end
@@ -216,7 +225,7 @@ module Universa
 
   end
 
-  # The state of some contract reported by thee network. It is a convenience wrapper around Universa
+  # The state of some contract reported by the network. It is a convenience wrapper around Universa
   # ItemState structure.
   class ContractState
     def initialize(universa_contract_state)

data/lib/universa/keytool/keytool.rb

@@ -183,7 +183,8 @@ class KeyTool
         @rounds < 100000 and error "To few rounds, use at least 100000"
       }
 
-      opts.on("-p FILE", "--public FILE", "extract public key") { |name|
+      opts.on("-p FILE", "--public FILE", "extract public key. If output file is not specified,",
+              "prints as universa text object to the standard output") { |name|
         task {
           key = load_key(name, true)
           if @output_file

data/lib/universa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 3.14.2.4
+  version: 3.14.5
 platform: ruby
 authors:
 - sergeych
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -144,11 +144,11 @@ 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.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.72.jar
-- bin/umi/lib/com.icodici.universa_core-3.14.2.jar
+- bin/umi/lib/com.icodici.common_tools-3.14.5.jar
+- bin/umi/lib/com.icodici.crypto-3.14.5.jar
+- bin/umi/lib/com.icodici.nanohttpd-2.1.0-20210921.jar
+- bin/umi/lib/com.icodici.umi-0.8.79.jar
+- bin/umi/lib/com.icodici.universa_core-3.14.5.jar
 - bin/umi/lib/com.squareup.jnagmp.jnagmp-2.0.0.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
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Expose Universa Java API to ruby