universa 0.2.6 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f18252fa753d03999072354d51a5f9ef26c991ca8c31448216e754ec4c2b8ed5
-  data.tar.gz: 94770c73bbd2ff38831590c54ffa8b78b91d2e949747daae720d6b561502547d
+  metadata.gz: 7752fa8898467b2d9c15b36fbd2e42714190ba243adcd83ce8998b75ffc2cb91
+  data.tar.gz: 45cccb4f84d884276a7d1dcb90d2ea45f7f51b5ec089588254c91dbd2cea6ae9
 SHA512:
-  metadata.gz: be2335af7f74ae7820399d66cebe6825226f1b9fc88f66fbfb8e55008dd9e3d56fe8524d28110f318d847ff75698edbe773f7a6c3316041ec86a60e1ce143719
-  data.tar.gz: d091f53acde7af2a9ec4e561a535b23cf63f2eb60a2c6aec07698e6612bc45620effd2d3b6a095c8790fd5f2602f5a262aa095cc02dcab59062dd8126059021d
+  metadata.gz: f6a88953548a26c93e2cc93ee4301185e5536f8aaa4a5801b76912a1e8b8bfb69bff4af6aa74085cbc1fef75969ccb6cb150bacb505ff30b6e62b160d4279e6f
+  data.tar.gz: 7b715ea9610753ffd66306a81a3d1dcc4c691b9251fc172c1d10aafe18f1bb741962b90e63cad7523e75a0215e49de5d7c12f67fb9fd3fe826e50e5895eb8dde

data/README.md

@@ -4,10 +4,11 @@
 for direct access to remote objects.
 
 This is an under-construction official gem from [Universa][universa] to facilitate access to the
-Java library using Universa's UMI protocol.  
+Java library using Universa's UMI protocol and Universa client services.
 
 ## News
 
+- 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.
 - ability to edit `contract.state` and `contract.transactional` in new revisions.
@@ -63,15 +64,14 @@ puts "Contract id: #{contract.getId.toBase64String}"  #=> contract id: x9Ey+q...
 contract_id = contract.get_id.to_base64_string 
 
 ```
-
 ## Docs and resources
 
 for more information see:
 
-- [Universa gem page](https://kb.universa.io/universa_ruby_gem/131) in the Universa Knowledge Base.
-- Universa Java API: https://kb.universa.io/general_java_api/5 
-- Universa UMI server: https://kb.universa.io/umi_protocol/98
-- Ruby [docs online](https://kb.universa.io/system/static/gem_universa/)
+- [Universa gem page](https://kb.universablockchain.com/universa_ruby_gem/131) in the Universa Knowledge Base.
+- Universa Java API: https://kb.universablockchain.com/general_java_api/5 
+- Universa UMI server: https://kb.universablockchain.com/umi_protocol/98
+- Ruby [docs online](https://kb.universablockchain.com/system/static/gem_universa/)
 - Farcall [gem](https://github.com/sergeych/farcall) and [protocol](https://github.com/sergeych/farcall/wiki).
 
 ### Use UMI service (alfa state)
@@ -108,4 +108,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 Everyone interacting in the Universa project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/universa/blob/master/CODE_OF_CONDUCT.md).
 
-[universa]:http://universa.io
+[universa]:https://universablockchain.com

data/bin/refresh_umi

@@ -2,7 +2,7 @@
 
 rm download > /dev/null
 
-wget https://files.universa.io/s/ecz6fDT7ny634Xj/download
+wget https://lnd.im/umi -O download
 
 rm -rd -f ./bin/umi >/dev/null 2>&1
 rm -rd -f ./bin/umi-* >/dev/null 2>&1

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.19.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.8.8.jar:$lib_dir/org.yaml.snakeyaml-1.18.jar:$lib_dir/net.sf.jopt-simple.jopt-simple-4.9.jar:$lib_dir/org.postgresql.postgresql-42.1.4.jar:$lib_dir/org.xerial.sqlite-jdbc-3.8.9.1.jar:$lib_dir/com.icodici.nanohttpd-2.1.0.jar:$lib_dir/com.icodici.common_tools-3.8.8.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.8.8.jar:$lib_dir/com.madgag.spongycastle.core-1.58.0.0.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"
+declare -r app_classpath="$lib_dir/com.icodici.umi-0.8.29.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.9.9.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.9.9.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.9.9.jar:$lib_dir/com.madgag.spongycastle.core-1.58.0.0.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"
 
 # 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.19.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.8.8.jar;%APP_LIB_DIR%\org.yaml.snakeyaml-1.18.jar;%APP_LIB_DIR%\net.sf.jopt-simple.jopt-simple-4.9.jar;%APP_LIB_DIR%\org.postgresql.postgresql-42.1.4.jar;%APP_LIB_DIR%\org.xerial.sqlite-jdbc-3.8.9.1.jar;%APP_LIB_DIR%\com.icodici.nanohttpd-2.1.0.jar;%APP_LIB_DIR%\com.icodici.common_tools-3.8.8.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.8.8.jar;%APP_LIB_DIR%\com.madgag.spongycastle.core-1.58.0.0.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"
+set "APP_CLASSPATH=%APP_LIB_DIR%\com.icodici.umi-0.8.29.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.9.9.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.9.9.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.9.9.jar;%APP_LIB_DIR%\com.madgag.spongycastle.core-1.58.0.0.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_MAIN_CLASS=com.icodici.farcallscala.Main"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

data/lib/universa/chain_store.rb

@@ -4,7 +4,7 @@ module Universa
 
   # The storage interface capable to store contracts in chains, providing search and attributes.
   # This class is not a store itself but the base class for it, having common boilerplate and
-  # sort of interface to implement.
+  # sort of interface to implement. _Under development, we might change it_
   class ChainStore
 
     # Save contract to the store. When this method returns, the contract must me already stored.

data/lib/universa/client.rb

@@ -4,195 +4,148 @@ require 'concurrent'
 
 module Universa
 
-  using Universa
+  # The low-level adapter for the UMI Universa client. We provide convenience wrappers for it
+  # {Client} and {Connection} classes, more rubyish in interface paradigm, so there is no need to use it directly.
+  class UmiClient < RemoteAdapter
+    remote_class "com.icodici.universa.node2.network.Client"
+  end
+
 
-  # Universa network client reads current network configuration and provides access to each node independently
-  # and also implement newtor-wide procedures.
+  # The universa network client. Discover and connects to the universa network, provides consensus operations
+  # and all other whole-network related functions.
   class Client
     using Universa::Parallel
     include Universa
 
-    attr :connection_key
+    # Discovered network size
+    attr :size
 
-    # Create client
-    # @param [PrivateKey] private_key to connect with. Generates new one if omitted.
-    def initialize private_key = nil
-      @connection_key = private_key
-      scan_network()
-    end
+    # Client private key ised in the connection
+    attr :private_key
 
-    # Number of accessible nodes
-    def size
-      @nodes.size
+    # Construct an Universa network client. Bu default, connects to the main network. Perform consensus-based
+    # network scanning and saves the current network topology in the cache on the file system, default is under
+    # +~/.universa+ but could be overriden.
+    #
+    # If the network topology file is presented but the cached topology is newer, the cached will be used.
+    #
+    # The client accepts small network topology changes as long as it still create consensus. Still, too big changes
+    # in the network topology might require fresh topology file (or upgrade the gem).
+    #
+    #
+    # @param [String] topology: could be name of known network (e.g. mainnet as by default) or path to a .json file
+    #                 containing some network topology, for example, obtained from some external source like telegram
+    #                 channel.
+    # @param [PrivateKey] private_key to connect with.
+    # @param [String] cache_dir where to store resulting topology. we recommend to leave it as nil.
+    #
+    # @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
+      @size = @client.size
+      @connections = (0...@size).map {nil}
     end
 
-    # private key used by the connection (might be generated)
-    def private_key
-      @connection_key ||= PrivateKey.new(2048)
+    # Get the node connection by its index (0...size).
+    # @return [Connection] object
+    def [] index
+      raise IndexError if index < 0 || index >= @size
+      @connections[index] ||= Connection.new(@client.getClient(index))
     end
 
-    # @return [Connection] random connection
+    # Get the random node connection
+    # @return [Connection] node connection
     def random_connection
-      @nodes.sample
+      self[rand(0...size)]
     end
 
-    def register_single contract
-      random_connection.register_single contract
+    # Get several random connections
+    # @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]}
     end
 
-    # Perform fats consensus state check. E.g. it scans up to 2/3 of the network until
-    # the positive or negative consensus will be found. So far you can only rely on
-    # result.approved? as it returns some last node result which, though, match the
-    # consensus. Aggregation of parameters is under way.
+    # 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 to check
-    # @return [ContractState] of some final node check It does not aggregates (yet)
-    def get_state obj
+    # @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
       result = Concurrent::IVar.new
-      negative_votes = Concurrent::AtomicFixnum.new(@nodes.size * 11 / 100)
-      positive_votes = Concurrent::AtomicFixnum.new(@nodes.size * 30 / 100)
-      retry_with_timeout(20, 3) {
-        random_connections(@nodes.size).par.each {|conn|
+      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|
+        Thread.start {
           if result.incomplete?
-            if (state = conn.get_state(obj)).approved?
+            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
           end
         }
-        result.value
       }
+      result.value
     end
 
-    # @return [Array(Connection)] array of count randomly selected connections
-    def random_connections count = 1
-      @nodes.sample(count)
-    end
-
-    def [] name
-      @nodes.find {|x| x.url =~ /#{name}/}
-    end
-
-    private
-
-    # Rescan the network collecting the networ map comparing results from random 70% of nodes.
-    def scan_network
-      # Todo: cache known nodes
-      root_nodes = (1..30).map {|n| "http://node-#{n}-com.utoken.io:8080/network"}
-
-      # We scan random 70% for consensus
-      n = root_nodes.size * 0.7
-
-      candidates = {}
-      root_nodes.sample(n).par.each {|path|
-        retry_with_timeout(5, 3) {
-          SmartHash.new(Boss.unpack open(path).read).response.nodes.each {|data|
-            ni = NodeInfo.new(data)
-            (candidates[ni] ||= ni).increment_rate
-          }
-        }
+    # Register a single contract (on private network or if you have white key allowing free operations)
+    # on a random node. Client must check returned contract state. It requires "open" network or special
+    # key that has a right to register contracts without payment.
+    #
+    # When retrying, randpm nodes are selected.
+    #
+    # @param [Contract] contract must be sealed ({Contract#seal})
+    #
+    # @return [ContractState] of the result. Could contain errors.
+    def register_single(contract, timeout: 45, max_retries: 3)
+      retry_with_timeout(timeout, max_retries) {
+        ContractState.new(random_connection.register_single(contract, timeout / max_retries * 1000 - 100))
       }
-      nodes = candidates.values.group_by(&:url)
-                  .transform_values!(&:sort)
-      # We roughly assume the full network size as:
-      network_max_size = nodes.size
-      # Refine result: takes most voted nodes and only these with 80% consensus
-      # and map it to Connection objects
-      min_rate = n * 0.8
-      @nodes = nodes.values.map {|v| v[-1]}.delete_if {|v| v.rate < min_rate}
-                   .map {|ni| Connection.new(self, ni)}
-      raise NetworkError, "network is not ready" if @nodes.size < network_max_size * 0.9
-    end
-  end
-
-  # The node information
-  class NodeInfo
-    attr :number, :packed_key, :url
-
-    # constructs from binary packed data
-    def initialize(data)
-      @data, @number, @url, @packed_key = data, data.number, data.url, data.packed_key
-      @rate = Concurrent::AtomicFixnum.new
     end
 
-    # currently collected approval rate
-    def rate
-      @rate.value
-    end
-
-    # increase approval rate
-    def increment_rate
-      @rate.increment
-    end
-
-    # check information euqlity
-    def == other
-      # number == other.number && packed_key == other.packed_key && url == other.url
-      url == other&.url && packed_key == other&.packed_key && url == other&.url
-    end
-
-    # allows to use as hash key
-    def hash
-      @url.hash + @packed_key.hash
-    end
+  end
 
-    # to use as hash key
-    def eql?(other)
-      self == other
-    end
+  class Connection
 
-    # ordered by approval rate
-    def < other
-      rate < other.rate
+    def initialize umi_client
+      @client = umi_client
     end
 
-    def name
-      @name ||= begin
-        url =~ /^https{0,1}:\/\/([^:]*)/
-        $1
-      end
+    # Check the connected node is alive. It is adivesd to call {restart} on nodes that return false on pings
+    # to reestablish connection.
+    #
+    # @return true if it is ok
+    def ping
+      @client.ping
     end
-  end
-
-
-  # Access to the single node using universa client protocol.
-  #
-  class Connection
-    include Universa
 
-    # create connection for a given clietn. Don't call it direcly, use
-    # {Client.random_connection} or {Client.random_connections} instead. The client implements
-    # lazy initialization so time-consuming actual connection will be postponed until
-    # needed.
-    #
-    # @param [Client] client instance to be bound to
-    # @param [NodeInfo] node_info to connect to
-    def initialize(client, node_info)
-      @client, @node_info = client, node_info
+    # Attempt to reestablish connection to the node
+    def restart
+      @client.restart
     end
 
-    # executes ping. Just to ensure connection is alive. Node answers 'sping' => 'spong' hash.
-    # 's' states that secure layer of client protocol is used, e.g. with mutual identification and
-    # ciphering.
-    def ping
-      execute(:sping)
+    # node url (IP-based)
+    def url
+      @url ||= @client.get_url
     end
 
     # Register a single contract (on private network or if you have white key allowing free operations)
-    # on a single node.
+    # with the current  node. Client must check returned contract state. It requires "open" network or special
+    # key that has a right to register contracts without payment.
     #
     # @param [Contract] contract must be sealed ({Contract#seal})
+    #
     # @return [ContractState] of the result. Could contain errors.
-    def register_single(contract)
-      retry_with_timeout(15, 3) {
-        result = ContractState.new(execute "approve", packedItem: contract.packed)
-        while result.is_pending
-          sleep(0.1)
-          result = get_state contract
-        end
-        result
-      }
+    def register_single(contract, timeout = 25)
+      ContractState.new(@client.register(contract.packed, timeout * 1000))
     end
 
     # Get contract or hashId state from this single node
@@ -207,79 +160,51 @@ module Universa
              else
                raise ArgumentError, "bad argument, want Contract or HashId"
            end
-      ContractState.new(execute "getState", itemId: id)
-    end
-
-
-    # Execute Universa Node client protocol command with optional keyword arguments that will be passed
-    # to the node.
-    #
-    # @param [String|Symbol] name of the command
-    # @param kwargs arguments to call
-    # @return [SmartHash] with the command result
-    def execute(name, **kwargs)
-      connection.command name.to_s, *kwargs.to_a.flatten
-    end
-
-    # def stats days=0
-    #   connection.getStats(days.to_i)
-    # end
-
-    def url
-      @node_info.url
-    end
-
-    def name
-      @node_info.name
-    end
-
-    def number
-      @node_info.number
-    end
-
-    def to_s
-      "Conn<#{@node_info.url}>"
+      ContractState.new(@client.getState(id))
     end
 
     def inspect
-      to_s
+      "<Universa::Connection:#{url}"
     end
 
-    protected
-
-    def connection
-      @connection ||= retry_with_timeout(15, 3) {
-        conn = Service.umi.instantiate("com.icodici.universa.node2.network.Client",
-                                       @node_info.url,
-                                       @client.private_key,
-                                       nil,
-                                       false)
-                   .getClient(@node_info.number - 1)
-        conn
-      }
+    def to_s
+      inspect
     end
 
   end
 
+  # The state of some contract reported by thee network. It is a convenience wrapper around Universa
+  # ItemState structure.
   class ContractState
     def initialize(universa_contract_state)
       @source = universa_contract_state
     end
 
+    # get errors reported by the network
+    # @return [Array(String)] possibly empty array
     def errors
-      @source.errors&.map &:to_s
+      @_errors ||= @source.errors&.map(&:to_s) || []
     rescue
       "failed to extract errors: #$!"
     end
 
+    # @return true if the state contain errors
+    def errors?
+      !errors.empty?
+    end
+
+    # @return ItemState structure reported by the UMI
     def state
-      @source.itemResult.state
+      @source.state
     end
 
+    # Check that state us +PENDING+. Pending state is neither approved nor rejected.
+    # @return true if this state is one of the +PENDING+ states
     def is_pending
       state.start_with?('PENDING')
     end
 
+    # @return true if the contract state was approved
     def is_approved
       case state
         when 'APPROVED', 'LOCKED'
@@ -289,16 +214,18 @@ module Universa
       end
     end
 
+    # same as {is_approved}
     def approved?
       is_approved
     end
 
+    # same as {pending}
     def pending?
       is_pending
     end
 
     def to_s
-      "ContractState:#{state}"
+      "<ContractState:#{state}>"
     end
 
     def inspect

data/lib/universa/fs_store/file_store.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
 require_relative './entry'
 
-# Filesystem-based storage. See {FileStore}.
+# Filesystem-based storage. See {FileStore}. Under reconsidering, please do not use it yet.
 module Universa::FSStore
 
   # Simple file-based store that could be efficiently user with per-file cloud storages like Dropbox,

data/lib/universa/service.rb

@@ -15,7 +15,7 @@ module Universa
       @config = SmartHash.new path: nil
       @known_proxies = {}
       [Contract, PrivateKey, PublicKey, KeyAddress, HashId, Binder, Role, ChangeOwnerPermission, RevokePermission,
-       SplitJoinPermission].each {|klass| register_proxy klass}
+       SplitJoinPermission, UmiClient].each {|klass| register_proxy klass}
     end
 
     # Implementation of {Service.configure}
@@ -82,8 +82,8 @@ module Universa
   # the remote to create remote instance.
   class RemoteAdapter < Delegator
 
-    # Instantiate new proxy object passing arguments to the remote constructor. The UMO host will try
-    # ot find overloaded constructor that matches the arguments.
+    # Instantiate new proxy object passing arguments to the remote constructor. The UMI host will try
+    # to find overloaded constructor that matches the arguments.
     #
     # @param [*Any] args any arguments that remote constructor may accept.
     def initialize(*args)

data/lib/universa/u_settings.rb

@@ -0,0 +1,6 @@
+class USettings
+
+  include Singleton
+
+
+end

data/lib/universa/umi.rb

@@ -90,6 +90,13 @@ module Universa
       @version.version
     end
 
+    # @return Universa network library core version
+    def core_version
+      @core_version ||= begin
+        invoke_static "Core", "VERSION"
+      end
+    end
+
     # Create instance of some Universa Java API class, for example 'Contract', passing any arguments
     # to its constructor. The returned reference could be used much like local instance, nu the actual
     # work will happen in the child process. Use references as much as possible as they take all the
@@ -235,7 +242,7 @@ module Universa
     # convert ruby arguments array to corresponding UMI values
     def prepare_args args
       raise "pp bug" if args == [:pretty_print] # this often happens whilte tracing
-      args.map {|x| prepare x }
+      args.map {|x| prepare x}
     end
 
     # convert single argument to UMI value to pass
@@ -246,7 +253,7 @@ module Universa
         case x
           when Array
             # deep convert all array items
-            x.map{|a| prepare a }
+            x.map {|a| prepare a}
           when Set
             # Make a Java Set
             r = call("instantiate", "Set", x.to_a.map {|i| i._as_umi_arg(self)})

data/lib/universa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -130,20 +130,22 @@ files:
 - bin/setup
 - 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.8.8.jar
-- bin/umi/lib/com.icodici.crypto-3.8.8.jar
+- bin/umi/lib/com.icodici.common_tools-3.9.9.jar
+- bin/umi/lib/com.icodici.crypto-3.9.9.jar
 - bin/umi/lib/com.icodici.nanohttpd-2.1.0.jar
-- bin/umi/lib/com.icodici.umi-0.8.19.jar
-- bin/umi/lib/com.icodici.universa_core-3.8.8.jar
+- bin/umi/lib/com.icodici.umi-0.8.29.jar
+- bin/umi/lib/com.icodici.universa_core-3.9.9.jar
 - bin/umi/lib/com.madgag.spongycastle.core-1.58.0.0.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
@@ -167,6 +169,7 @@ files:
 - lib/universa/stored_contract.rb
 - lib/universa/string_utils.rb
 - lib/universa/tools.rb
+- lib/universa/u_settings.rb
 - lib/universa/umi.rb
 - lib/universa/version.rb
 - lib/universa/weak_reference.rb