universa 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d951269ce7957e1ffe99f9d6e05f78464a85d5e6cde57d7a0f8cc6837f3fcb2
-  data.tar.gz: 16da66789f9d6b05315e9a586937da258b9b4a5101569728f526ed82872b2b3c
+  metadata.gz: 3393ecdb08b1b7fe37288be48d86b47a740cf7e923575caa45295c8cdb861247
+  data.tar.gz: 76a9a13bdf1a39c8d5e9a0e838a3faf18283d9b357cd3bca18c75f076dbcc65f
 SHA512:
-  metadata.gz: f21eaea6435adaa6a85479d828cbe44f95b4a3ce6fc406c5761450b8cd93ee64442d75e32fa0c0c11d79f9d897ce64610c38594de76c8443237a01aa24f4be9e
-  data.tar.gz: 44045b63034fa9486cba5925bf978fc0a4e95c41f413b9aa822d98b926468c064e4c8312a9914cb92219fcd88550bec1b25124af7d8a9c408442053172a7a1ec
+  metadata.gz: 44c450550570eb0e447f7824dae25129cfd59ead09cac86c19b8d3b261d226d7964b88ca3304fc19790ca7512509c5ae3575c0aed09da608133de588d1d1548c
+  data.tar.gz: 5b093f28766e602653ad3c9797f4ce6d6a63796c8cd45ab9252b4bd78e145a43aa9510c51370d210d23a97eeab7d4cd14049466f3bc3de0fd933db3b3c1a3467

data/Gemfile

@@ -3,4 +3,7 @@ source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in universa.gemspec
+#
+# gem 'farcall', :github => 'sergeych/farcall', :branch => 'master'
+
 gemspec

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.12.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.8.7.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.7.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.7.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.17.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.8.7.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.7.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.7.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"
 
 # 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.12.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.8.7.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.7.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.7.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.17.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.8.7.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.7.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.7.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_MAIN_CLASS=com.icodici.farcallscala.Main"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

data/lib/universa/binder.rb

@@ -0,0 +1,94 @@
+module Universa
+
+  # Adapter for Universa Binder class which behaves like a ruby hash.
+  class Binder < RemoteAdapter
+    remote_class "net.sergeych.tools.Binder"
+
+    # Set object for a key
+    #
+    # @param [Object] key key.to_s will be used (so use Symbols or Strings freely)
+    # @param [Object] value
+    def []=(key, value)
+      __getobj__.set(key.to_s, value)
+    end
+
+    # Get object by key.
+    # @param [Object] key key.to_s will be used (so use Symbols or Strings freely)
+    # @return [Object] or nil
+    def [](key)
+      __getobj__.get(key.to_s)
+    end
+
+    # Create hew Binder from any hash. Keys will be converted to strings.
+    def self.of hash
+      invoke_static "of", hash.transform_keys(&:to_s)
+    end
+
+    # Retrieve binder keys
+    def keys
+      __getobj__.keySet()
+    end
+
+    # # Internal use only. Allow processing remote commands as local calls
+    def respond_to_missing?(method_name, include_private = false)
+      l = method_name[-1]
+      LOCAL_METHODS.include?(method_name) || l == '!' || l == '?'
+    end
+
+    # Internal use only. Call remote method as needed. This is where all the magick comes from: it call
+    # remote get/set method
+    def method_missing(method_name, *args, &block)
+      if respond_to_missing?(method_name, true)
+        super
+      else
+        if method_name[-1] == '_'
+          __getobj__.set(method_name[0..-1], args[0])
+          args[0]
+        else
+          __getobj__.get(method_name)
+        end
+      end
+    end
+
+    LOCAL_METHODS = Set.new(%i[to_hash to_ary [] []= keys values each each_key each_with_index size map to_s])
+
+    def to_s
+      to_h.to_s
+    end
+
+    # Converts binder to the array of [key, value] pairs, like with regular ruby hashes
+    def to_a
+      map {|x| x}
+    end
+
+    # Enumerates all binder entries with a required block
+    # @yield [key,value] pairs
+    def each &block
+      keys.each {|k| block.call [k, __getobj__.get(k)]}
+    end
+
+    # @return an array of values returned by the block
+    # @yiekd [key,value] pairs.
+    def map &block
+      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
+    end
+  end
+
+end
+
+class Hash
+  def to_binder
+    Binder.of self
+  end
+end
+

data/lib/universa/client.rb

@@ -10,6 +10,9 @@ module Universa
   # and also implement newtor-wide procedures.
   class Client
     using Universa::Parallel
+    include Universa
+
+    attr :connection_key
 
     # Create client
     # @param [PrivateKey] private_key to connect with. Generates new one if omitted.
@@ -46,18 +49,20 @@ module Universa
     # @return [ContractState] of some final node check It does not aggregates (yet)
     def get_state obj
       result = Concurrent::IVar.new
-      negative_votes = Concurrent::AtomicFixnum.new(@nodes.size * 20 / 100)
+      negative_votes = Concurrent::AtomicFixnum.new(@nodes.size * 11 / 100)
       positive_votes = Concurrent::AtomicFixnum.new(@nodes.size * 30 / 100)
-      random_connections(@nodes.size * 2 / 3).par.each {|conn|
-        if result.incomplete?
-          if (state = conn.get_state(obj)).approved?
-            result.try_set(state) if positive_votes.decrement < 0
-          else
-            result.try_set(state) if negative_votes.decrement < 0
+      retry_with_timeout(20, 3) {
+        random_connections(@nodes.size).par.each {|conn|
+          if result.incomplete?
+            if (state = conn.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
-        end
+        }
+        result.value
       }
-      result.value
     end
 
     # @return [Array(Connection)] array of count randomly selected connections
@@ -144,6 +149,8 @@ module Universa
   # 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
@@ -168,12 +175,14 @@ module Universa
     # @param [Contract] contract, muts be sealed ({Contract#seal})
     # @return [ContractState] of the result. Could contain errors.
     def register_single contract
-      result = ContractState.new(execute "approve", packedItem: contract.packed)
-      while result.is_pending
-        sleep(0.1)
-        result = get_state contract
-      end
-      result
+      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
+      }
     end
 
     # Get contract or hashId state from this single node

data/lib/universa/contract.rb

@@ -19,29 +19,6 @@ module Universa
     remote_class "com.icodici.universa.contract.roles.Role"
   end
 
-  # Adapter for Universa Binder class. Provides some ruby-style helpers
-  class Binder < RemoteAdapter
-    remote_class "net.sergeych.tools.Binder"
-
-    # Set object for a key
-    #
-    # @param [Object] key key.to_s will be used (so use Symbols or Strings freely)
-    # @param [Object] value
-    def []=(key, value)
-      set(key.to_s, value)
-    end
-
-    # Get object by key.
-    # @param [Object] key key.to_s will be used (so use Symbols or Strings freely)
-    # @return [Object] or nil
-    def [](key)
-      get(key.to_s)
-    end
-
-    def self.of hash
-      invoke_static "of", hash.transform_keys(&:to_s)
-    end
-  end
 
   # Adapter for Universa +HashId+ class, helps to avoid confusion when using different
   # representations of the ID.
@@ -147,6 +124,10 @@ module Universa
       get_owner
     end
 
+    def owner= key
+      set_owner_key key
+    end
+
     # Shortcut for is_ok
     def ok?
       is_ok
@@ -172,13 +153,33 @@ module Universa
     end
 
     def state
-      @state ||= get_state_data
+      @state ||= getStateData()
     end
 
+    # Get +transactional.data+ section creating it if need
+    # @return [Binder] instance
+    def transactional
+      @transactional ||= getTransactionalData()
+    end
+
+    # def transactional?
+    #   !!getTransactional()
+    # end
+
+    # Helper for many token-like contracts containing state.data.amount
+    # @return [BigDecimal] amount or nil
     def amount
       v = state[:amount] and BigDecimal(v.to_s)
     end
 
+    # Write helper for many token-like contracts containing state.data.amount. Saves value
+    # in state.data.anomount and properly encodes it so it will be preserved on packing.
+    #
+    # @param [Object] value, should be some representation of a number (also string)
+    def amount= (value)
+      state[:amount] = value.to_s.force_encoding('utf-8')
+    end
+
     # Get packed transaction containing the serialized signed contract and all its counterparts.
     # Be sure to cal {#seal} somewhere before.
     #
@@ -195,10 +196,29 @@ module Universa
       }
     end
 
-    # def create_revocation *keys
-      # Service.umi.invoke_static 'ContractService', 'createRevocation', *keyss
-      # sel
-    # end
+    # Call it after check to get summaru of errors found.
+    #
+    # @return [String] possibly empty ''
+    def errors_string
+      getErrors.map {|e| "(#{e.object || ''}): #{e.error}"}.join(', ').strip
+    end
+
+    def can_perform_role name, *keys
+      getRole(name.to_s).isAllowedForKeys(Set.new keys.map {|x|
+        x.is_a?(PrivateKey) ? x.public_key : x
+      })
+    end
+
+    # Create a contract that revokes this one if register with the Universa network. BE CAREFUL!
+    # REVOCATION IS IRREVERSIBLE! period.
+    #
+    # @param [PrivateKey] keys enough to allow this contract revocation
+    # @return [Contract] revocation contract. Register it with the Universa network to perform revocation.
+    def create_revocation(*keys)
+      revoke = Service.umi.invoke_static 'ContractsService', 'createRevocation', *keys
+      revoke.seal
+      revoke
+    end
 
   end
 

data/lib/universa/umi.rb

@@ -239,8 +239,15 @@ module Universa
           x._as_umi_arg(self)
         else
           case x
+            when Set
+              # Make a Java Set
+              r = call("instantiate","Set", x.to_a.map{|i| i._as_umi_arg(self)})
+              # Ref will garbage collect it
+              Ref.new(self, r)
+              # but we need a ref struct only:
+              r
             when Time
-              { __type: 'unixtime', seconds: x.to_i}
+              {__type: 'unixtime', seconds: x.to_i}
             when String
               x.encoding == Encoding::BINARY ? {__type: 'binary', base64: Base64.encode64(x)} : x
             else

data/lib/universa/version.rb

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

data/lib/universa.rb

@@ -5,6 +5,7 @@ require "universa/tools"
 require "universa/umi"
 require "universa/service"
 require "universa/keys"
+require "universa/binder"
 require "universa/contract"
 require "universa/client"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -137,7 +137,7 @@ files:
 - bin/umi/lib/com.icodici.common_tools-3.8.7.jar
 - bin/umi/lib/com.icodici.crypto-3.8.7.jar
 - bin/umi/lib/com.icodici.nanohttpd-2.1.0.jar
-- bin/umi/lib/com.icodici.umi-0.8.12.jar
+- bin/umi/lib/com.icodici.umi-0.8.17.jar
 - bin/umi/lib/com.icodici.universa_core-3.8.7.jar
 - bin/umi/lib/com.madgag.spongycastle.core-1.58.0.0.jar
 - bin/umi/lib/com.squareup.jnagmp.jnagmp-2.0.0.jar
@@ -153,6 +153,7 @@ files:
 - bin/umi/lib/org.yaml.snakeyaml-1.18.jar
 - exe/universa
 - lib/universa.rb
+- lib/universa/binder.rb
 - lib/universa/client.rb
 - lib/universa/contract.rb
 - lib/universa/errors.rb