universa 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6ba5e26ea3e8ef5c6f66da7c2e13045f752e251ff8783b990376b06f95af31
-  data.tar.gz: 543afbaaeb3813cfe082171469ef6997dfcd67ad96de62d434556c673d62d198
+  metadata.gz: 776f0bcfb9e7585da4111d9993189eae6b511997bf97aa5043b21087eef47fdf
+  data.tar.gz: fe9ba7b8e817d8861de95a295384fd42b2ef868989d409b00ab13dbce4fb84a7
 SHA512:
-  metadata.gz: 576c85a3a975de182195866635820dcbbb2a1dc531526440aee8dbb8d35d4783db45b2cec8b0c1ac7908caaa7b57de7c4bc893412dee60e84425bd047511e422
-  data.tar.gz: 677b361b35bcfe73ed8005735123ab6eea59a3077d41646a3dbccea9bd2885169d416dcf7f7929128e46e64347b4e0d9780c4732d9470e13985b839d36101241
+  metadata.gz: 6c3d0054df59af8d90215705005d718d845f9aea9bde929aca654968d40f516aeba94d4149faec8c13f9d679c4724cd0ea580ad0eab21738baa05414f7678a37
+  data.tar.gz: b2b15a3502bace0b271963bf8003fd64e37d2892cb53b7cfce2fabada446cfd218dae9b033ea3620bae52c9eb322e3efd80c6e810873f8e186dce822e4fcd5f2

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.10.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.8.3.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.3.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.3.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.11.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.8.4.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.4.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.4.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.10.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.8.3.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.3.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.3.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.11.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.8.4.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.4.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.4.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/client.rb

@@ -131,9 +131,6 @@ module Universa
                   .transform_values!(&:sort)
       # We roughly assume the full network size as:
       network_max_size = nodes.size
-      nodes.each {|k, v|
-        puts "#{k}: (#{v.size}) #{v.map(&:rate)}}"
-      }
       # Refine result: takes most voted nodes and only these with 80% consensus
       # and map it to Connection objects
       min_rate = n * 0.8
@@ -206,9 +203,7 @@ module Universa
     # @param [String|Symbol] name of the command
     # @return [SmartHash] with the command result
     def execute name, **kwargs
-      Service.umi.with_trace {
-        connection.command name.to_s, *kwargs.to_a.flatten
-      }
+      connection.command name.to_s, *kwargs.to_a.flatten
     end
 
     protected

data/lib/universa/contract.rb

@@ -1,9 +1,70 @@
 module Universa
 
+  # Adapter for Universa ChangeOwnerPermission
+  class ChangeOwnerPermission < RemoteAdapter
+    remote_class "com.icodici.universa.contract.permissions.ChangeOwnerPermission"
+  end
+
+  # Adapter for Universa Role
+  class Role < RemoteAdapter
+    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
+  end
+
   # Universa contract adapter.
   class Contract < RemoteAdapter
     remote_class "com.icodici.universa.contract.Contract"
 
+    # Create simple contract with preset critical parts:
+    #
+    # - expiration set to 90 days unless specified else
+    # - issuer role is set to the address of the issuer key, short ot long
+    # - creator role is set as link to issuer
+    # - owner role is set as link to issuer
+    # - change owner permission is set to link to owner
+    #
+    # The while contract is then signed by the issuer key. Not that it will not seal it: caller almost always
+    # will add more data before it, then must call #seal().
+    #
+    # @param [PrivateKey] issuer_key also will be used to sign it
+    # @param [Time] expires_at defaults to 90 days
+    # @param [Boolean] use_short_address set to true to use short address of the issuer key in the role
+    # @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_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"))
+      contract.add_permission ChangeOwnerPermission.new(contract.owner.link_as "@owner")
+      contract.add_signer_key issuer_key
+      contract
+    end
+
+    # Load from transaction pack
+    def self.from_packed packed
+      self.invoke_static "fromPackedTransaction", packed
+    end
+
     # seal the contract
     # @return [String] contract packed to the binary string
     def seal
@@ -16,6 +77,54 @@ module Universa
       get_keys_to_sign_with
     end
 
+    # Shortcut ofr get_creator
+    # @return [Role] universa role of the creator
+    def creator
+      get_creator
+    end
+
+    # @return [Role] issuer role
+    def issuer
+      get_issuer
+    end
+
+    # @return [Role] owner role
+    def owner
+      get_owner
+    end
+
+    # Shortcut for is_ok
+    def ok?
+      is_ok
+    end
+
+    # shortcut for getHashId
+    def hash_id
+      get_id
+    end
+
+    # shortcut for get_expires_at
+    def expires_at
+      get_expires_at
+    end
+
+    # @return definition data
+    def definition
+      get_definition.get_data
+    end
+
+    def packed
+      get_packed_transaction
+    end
+
+    # trace found errors (call it afer check()): the Java version will not be able to trace to the
+    # process stdout, so we reqrite it here
+    def trace_errors
+      getErrors.each {|e|
+        puts "(#{e.object || ''}): #{e.error}"
+      }
+    end
+
   end
 
 end

data/lib/universa/keys.rb

@@ -47,6 +47,21 @@ module Universa
     def to_s
       @string ||= toString()
     end
+
+    # Unpack from binary bytes
+    # @param [String] binary_string with binary packed bytes
+    def self.from_packed(binary_string)
+      binary_string.force_encoding 'binary'
+      KeyAddress.new(binary_string)
+    end
+
+    # returns binary representation. It is not a string representation!
+    # @return [String] binary string representation
+    def packed
+      s = get_packed
+      s.force_encoding 'binary'
+      s
+    end
   end
 
 end

data/lib/universa/service.rb

@@ -14,7 +14,7 @@ module Universa
     def initialize
       @config = SmartHash.new path: nil
       @known_proxies = {}
-      [Contract, PrivateKey, PublicKey, KeyAddress].each {|klass| register_proxy klass}
+      [Contract, PrivateKey, PublicKey, KeyAddress, Binder, Role, ChangeOwnerPermission].each {|klass| register_proxy klass}
     end
 
     # Implementation of {Service.configure}
@@ -92,7 +92,7 @@ module Universa
         # User called constructor
         remote_class_name = self.class.remote_class_name
         remote_class_name&.length or raise Error, "provide remote_class_name"
-        @remote = Service.umi.instantiate remote_class_name.split('.')[-1], *args, adapter: self
+        @remote = Service.umi.instantiate remote_class_name, *args, adapter: self
       end
     end
 
@@ -119,13 +119,13 @@ module Universa
     #
     # @return [String] remote class name
     def self.remote_class_name
-      raise Error, "provde remote class name"
+      @remote_class_name or raise Error, "provde remote class name"
     end
 
     # Registers remote class name to be used with this adapted. Call it early in descendant class
     # declaration.
     def self.remote_class name
-      class_eval "def self.remote_class_name; '#{name}'; end"
+      @remote_class_name = name
     end
 
     # debugging label
@@ -138,6 +138,10 @@ module Universa
     def to_s
       toString()
     end
+
+    def self.invoke_static(method_name, *args)
+      Service.umi.invoke_static @remote_class_name, method_name, *args
+    end
   end
 
 end

data/lib/universa/umi.rb

@@ -106,10 +106,13 @@ module Universa
       ensure_open
       ref._umi == self or raise InterchangeError
       @convert_case and method = method.to_s.camelize_lower
+      # p ["invoke", ref._remote_id, method, *prepare_args(args)]
       result = call("invoke", ref._remote_id, method, *prepare_args(args))
       encode_result result
-    rescue
-      $!.print_stack_trace
+    end
+
+    def invoke_static(class_name, method, *args)
+      encode_result call("invoke", class_name, method, *prepare_args(args))
     end
 
     # Close child process. No remote calls should occur after it.
@@ -236,6 +239,8 @@ module Universa
           x._as_umi_arg(self)
         else
           case x
+            when Time
+              { __type: 'unixtime', seconds: x.to_i}
             when String
               x.encoding == Encoding::BINARY ? {__type: 'binary', base64: Base64.encode64(x)} : x
             else
@@ -280,6 +285,13 @@ module Universa
       result = @endpoint.sync_call(command, *args, **EMPTY_KWARGS)
       log "<< #{result}"
       result
+    rescue Farcall::RemoteError => e
+      case e.remote_class
+        when 'NoSuchMethodException'
+          raise NoMethodError, e.message
+        else
+          raise
+      end
     end
 
     def log msg
@@ -362,7 +374,7 @@ module Universa
       method_name[0] == '_' || LOCAL_METHODS.include?(method_name) ? super : true
     end
 
-    #Internal use only. Call remote method as needed. This is where all the magick comes from: it call remote method instead of the
+    # Internal use only. Call remote method as needed. This is where all the magick comes from: it call remote method instead of the
     # local one, exactly like it is local.
     def method_missing(method_name, *args, &block)
       if method_name[0] == '_'

data/lib/universa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-10 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -134,11 +134,11 @@ files:
 - 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.3.jar
-- bin/umi/lib/com.icodici.crypto-3.8.3.jar
+- bin/umi/lib/com.icodici.common_tools-3.8.4.jar
+- bin/umi/lib/com.icodici.crypto-3.8.4.jar
 - bin/umi/lib/com.icodici.nanohttpd-2.1.0.jar
-- bin/umi/lib/com.icodici.umi-0.8.10.jar
-- bin/umi/lib/com.icodici.universa_core-3.8.3.jar
+- bin/umi/lib/com.icodici.umi-0.8.11.jar
+- bin/umi/lib/com.icodici.universa_core-3.8.4.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