universa 3.9.15.pre.p1 → 3.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c832c5c6c09d78dd63261bf9a95ea1e559aea0d415b14d23a659f6b006dc75a
-  data.tar.gz: 74f5ccc57534fcb8f9ec0102148b525e6c95f08e40a629f206571ddf9774b14a
+  metadata.gz: 6bc5b6550d105950c9c59fef72324f3af743e0b6ccc3a0891ff64a8010065bae
+  data.tar.gz: db76654eae0a780974b7f4b187f23263e8cdc9ff02bebae8f0ed780eb2d196a2
 SHA512:
-  metadata.gz: afd6b03188397c596f9632fef6209c2a9de4c8873425585a3fcd31009ffa952669934a7e0887e5be599b0c001200e710c27395c766b11636b6559b0770aa46e1
-  data.tar.gz: 4dcf3f62e9cc34912131444c0274f71a9457bae080eeddf99e102d2c23aa4efc1a84c291d06cfbffea4a75ff79bfcd52d4d0c0b9dfa4200244bfe0cf6e1fbfaa
+  metadata.gz: 0e6b607b71fdbb33cad3d2a9685f0f0e6d454ff427a482147d3211ecac5391af977d4a56ed33d31cf45da21e83b8442a13bebf32ec6e80c7faf6af36bef35eba
+  data.tar.gz: ee82130ccfc7e36de600b2a811e0252c2626b81020650b3f867a849e292cbca325d9aad5ca45dbcf0e75d5d5a2a236e1b5b697ad6e2bd6028c147a51bea39197

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.33.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.9.14.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.14.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.14.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"
+declare -r app_classpath="$lib_dir/com.icodici.umi-0.8.37.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.9.14.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.14.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.14.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.33.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.9.14.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.14.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.14.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_CLASSPATH=%APP_LIB_DIR%\com.icodici.umi-0.8.37.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.9.14.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.14.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.14.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/binder.rb

@@ -20,8 +20,8 @@ module Universa
     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)
+    def self.of *args
+      invoke_static "of", *args
     end
 
     # Retrieve binder keys

data/lib/universa/client.rb

@@ -67,14 +67,37 @@ module Universa
       (0...size).to_a.sample(number).map {|n| self[n]}
     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.
+    # Perform fast consensus state check with a given trust level, determining whether the item is approved or not.
+    # Blocks for 1 minute or until the network solution will be collected for a given trust level.
     #
-    # @param [Contract | HashId] obj contract to check
+    # @param [Contract | HashId | String | Binary] 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
+    # @return true if the contract state is approved by the network with a given trust level, false otherwise.
+    def is_approved? obj, trust: 0.3
+      hash_id = case obj
+                  when HashId
+                    obj
+                  when Contract
+                    obj.hash_id
+                  when String
+                    if obj.encoding == Encoding::ASCII_8BIT
+                      HashId.from_digest(obj)
+                    else
+                      HashId.from_string(obj)
+                    end
+                  else
+                    raise ArgumentError "wrong type of object to check approval"
+                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
       result = Concurrent::IVar.new
       negative_votes = Concurrent::AtomicFixnum.new((size * 0.1).round + 1)

data/lib/universa/contract.rb

@@ -12,6 +12,7 @@ module Universa
     remote_class "com.icodici.universa.contract.permissions.RevokePermission"
   end
 
+  # Adapter for plitjoin permission
   class SplitJoinPermission < RemoteAdapter
     remote_class "com.icodici.universa.contract.permissions.SplitJoinPermission"
   end
@@ -19,9 +20,53 @@ module Universa
   # Adapter for Universa Role
   class Role < RemoteAdapter
     remote_class "com.icodici.universa.contract.roles.Role"
+
+    class RequireMode
+      ALL_OF = "ALL_OF"
+      ANY_OF = "ANY_OF"
+    end
+  end
+
+  # Adaoter for link role
+  class RoleLink < RemoteAdapter
+    remote_class "com.icodici.universa.contract.roles.RoleLink"
+  end
+
+  # adapter for a simple (key owner) role
+  class SimpleRole < RemoteAdapter
+    remote_class "com.icodici.universa.contract.roles.SimpleRole"
+  end
+
+  # adapter for a role that is a list of roles
+  class ListRole < RemoteAdapter
+    remote_class "com.icodici.universa.contract.roles.ListRole"
+  end
+
+  # Adapter for permission to modify data
+  class ModifyDataPermission < RemoteAdapter
+    remote_class "com.icodici.universa.contract.permissions.ModifyDataPermission"
   end
 
 
+  # Wrapper for Java API Reference class
+
+  class Reference < RemoteAdapter
+    remote_class "com.icodici.universa.contract.Reference"
+
+    remote_field :name, :type, :transactional_id, :contract_id, :required, :origin, :signed_by, :fields, :roles,
+                 :matchingItems
+
+    alias matching_items matchingItems
+
+    ALL_OF = 'all_of'
+    ANY_OF = 'any_of'
+    SIMPLE_CONDITION = 'simple_condition'
+
+    TYPE_TRANSACTIONAL = 1
+    TYPE_EXISTING_DEFINITION = 2
+    TYPE_EXISTING_STATE = 3
+  end
+
   # adapter for Universa TransactionPack
   class TransactionPack < RemoteAdapter
     remote_class "com.icodici.universa.contract.TransactionPack"
@@ -57,6 +102,13 @@ module Universa
       invoke_static 'with_digest', string_id
     end
 
+    # Create a random HashId
+    # @return [HashId] random HashId
+    def self.create_random
+      invoke_static 'create_random'
+    end
+
+
     # Get binary representation. It is shorter than string representation but contain non-printable characters and
     # can cause problems if treated like a string. Use {#to_s} to get string representation instead.
     #

data/lib/universa/fs_store/entry.rb

@@ -11,7 +11,7 @@ module Universa::FSStore
   # @!method amount
   #   @return [BigDecimal] +contract.state.data.amount+ or nil. See {Contract#amount} for more.
   #
-  class Entry < Universa::StoredContract
+  class Entry < Universa::StoredContractBase
 
     extend Forwardable
 

data/lib/universa/keys.rb

@@ -35,7 +35,7 @@ module Universa
   end
 
   # A +com.icodici.crypto.PublicKey+ extension. As the key is immutable,
-  # caching is used to avoid innecessary UMI calls.
+  # caching is used to avoid unnecessary UMI calls.
   class PublicKey < RemoteAdapter
     remote_class 'com.icodici.crypto.PublicKey'
 
@@ -50,6 +50,39 @@ module Universa
     end
   end
 
+  # A +com.icodici.crypto.SymmetricKey+ extension. As the key is immutable,
+  # caching is used to avoid unnecessary UMI calls.
+  class SymmetricKey < RemoteAdapter
+    remote_class 'com.icodici.crypto.SymmetricKey'
+
+    # Derive key from password using PBKDF2 standard
+    # @param [String] password to derive key from
+    # @param [Object] rounds derivation rounds
+    # @param [Object] salt optional salt used to disallow detect password match by key match
+    # @return [SymmetricKey] instance
+    def self.from_password(password, rounds, salt=nil)
+      salt.force_encoding(Encoding::BINARY) if salt
+      invoke_static 'fromPassword', password, rounds, salt
+    end
+
+    # How many bits contains the key
+    # @return [Integer] size in bits
+    def size_in_bits
+      @bit_strength ||= getBitStrength()
+    end
+
+    # @return [Integer] size in bytes
+    def size
+      @size ||= getSize()
+    end
+
+    # Get the key as binary string
+    # @return [String] key bytes (binary string)
+    def key
+      @key ||= getKey()
+    end
+  end
+
   # The +com.icodici.crypto.KeyAddress+ extension. As it is immutable, caching is
   # used to avoid unnecessary UMI calls.
   class KeyAddress < RemoteAdapter

data/lib/universa/service.rb

@@ -143,6 +143,27 @@ module Universa
     def self.invoke_static(method_name, *args)
       Service.umi.invoke_static @remote_class_name, method_name, *args
     end
+
+    def self.remote_field *names
+      names.each {|name|
+        class_eval <<-End
+          def #{name}
+            Service.umi.get_field(self,"#{name}")
+          end
+          def #{name}=(value)
+            Service.umi.set_field(self,"#{name}", value)
+          end
+          End
+      }
+    end
+
+    def self.static_method name
+      class_eval <<-End
+        def self.#{name} *args
+          invoke_static "#{name.to_s}", *args
+        end
+      End
+    end
   end
 
 end

data/lib/universa/stored_contract.rb

@@ -1,5 +1,7 @@
 module Universa
 
+  # under construction, pls on not use yet
+  #
   # this is a base class for a contract stored in some contract chain. The implementation
   # must inherit and implement its {#load} and {#save} methods at least. To do it,
   # inherit and implement {ChainStore} to work with it.
@@ -9,7 +11,7 @@ module Universa
   # - contract could be assigned only once, no matter how, so its fields could be cached.
   # - origin, hash_id and parent are cached. So other contract parameters should be.
   #
-  class StoredContract
+  class StoredContractBase
 
     # {ChainStore} instance to which it is connected
     attr :chain_store

data/lib/universa/umi.rb

@@ -122,6 +122,19 @@ module Universa
       encode_result call("invoke", class_name, method.to_s.camelize_lower, *prepare_args(args))
     end
 
+    def get_field(remote_object, name)
+      encode_result call("get_field", remote_object._remote_id, name)
+    end
+
+    def set_field(remote_object, name, value)
+      call("set_field", remote_object._remote_id, name, prepare(value))
+      value
+    end
+
+    def invoke_static(class_name, method, *args)
+      encode_result call("invoke", class_name, method.to_s.camelize_lower, *prepare_args(args))
+    end
+
     # Close child process. No remote calls should occur after it.
     def close
       @queue.push :poison_pill
@@ -247,7 +260,9 @@ module Universa
 
     # convert single argument to UMI value to pass
     def prepare(x)
+      # p [:pre, x]
       if x.respond_to?(:_as_umi_arg)
+        # p ["uniarg"]
         x._as_umi_arg(self)
       else
         case x
@@ -266,13 +281,16 @@ module Universa
           when String
             x.encoding == Encoding::BINARY ? {__type: 'binary', base64: Base64.encode64(x)} : x
           when Ref
+            # p [:ref]
             x._as_umi_arg(self)
           when RemoteAdapter
+            # p [:ra, x.__getobj__._as_umi_arg(self)]
             # this need special treatment with direct call:
             x.__getobj__._as_umi_arg(self)
           when Hash
+            # p [:hash]
             result = {}
-            x.each { |k,v| result[k] = prepare(v)}
+            x.each {|k, v| result[k] = prepare(v)}
             result
           else
             x
@@ -283,7 +301,7 @@ module Universa
     # Convert remote call result from UMI structures to ruby types
     def encode_result value
       case value
-        when Hashie::Mash
+        when Hash
           type = value.__type
           case type
             when 'RemoteObject';
@@ -293,7 +311,8 @@ module Universa
             when 'unixtime';
               Time.at(value.seconds)
             else
-              value
+              # Deep hash conversion
+              value.transform_values! {|v| encode_result(v)}
           end
         when Hashie::Array
           value.map {|x| encode_result x}

data/lib/universa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 3.9.15.pre.p1
+  version: 3.9.15
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -139,7 +139,7 @@ files:
 - bin/umi/lib/com.icodici.common_tools-3.9.14.jar
 - bin/umi/lib/com.icodici.crypto-3.9.14.jar
 - bin/umi/lib/com.icodici.nanohttpd-2.1.0.jar
-- bin/umi/lib/com.icodici.umi-0.8.33.jar
+- bin/umi/lib/com.icodici.umi-0.8.37.jar
 - bin/umi/lib/com.icodici.universa_core-3.9.14.jar
 - bin/umi/lib/com.madgag.spongycastle.core-1.58.0.0.jar
 - bin/umi/lib/com.squareup.jnagmp.jnagmp-2.0.0.jar
@@ -192,9 +192,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: