universa 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed104de6164cf27de489c0876518ee3394a9fb9c99a0914e6583a4f39f571942
-  data.tar.gz: b86327d0d5177c6f0f1d9d49e02f2689da2315a15f844458420104427200915b
+  metadata.gz: 61a9637495cf67d3ac90b3447038b6b224646cd4f36a2db7619aae13274232af
+  data.tar.gz: 2b6b963df5082f420ab80bf3bd47c509846ddb4d3085cc9eb19939e4c906c9ed
 SHA512:
-  metadata.gz: 0335ca25f8c9e002f15b482bf0e0bc96c10cb6f77343dae4df2101ade54855e63a8ef407a0021a95c84dfa0f4bebaca21141881922071967bca7747b60a9a276
-  data.tar.gz: e8e54f3825441507640af2ce38dea63aa6ac25bc770be5f11f5f2b908215f3e066d6759c5ea02afa5a61c3153d3002b00c22affe1d49a57308997f61026b1729
+  metadata.gz: 973eb722475a35230ce1c595faab7c47e730eb7573f737d113475d5cb4405f4d5fc6c1a3f02393e7e177e5a384d838acf53aa65641a5b5f76172ee42e60bc88b
+  data.tar.gz: a901518e1151a239f43f309512d1e9e8bf6f87e40a31f111b994c6f9086aad9e41cd31cb5fae7c6370d80309f6d37c6c522b7b14c347baaed12f5f09bcc56c49

data/README.md

@@ -29,6 +29,8 @@ Or install it yourself as:
 
 ## Usage
 
+### Direct access to UMI 
+ 
 So far, you can only get direct access the the Java API functions. To get it:
 
 ```ruby
@@ -55,6 +57,22 @@ for more information see:
 - Universa UMI server: https://kb.universa.io/umi_protocol/98
 - Farcall [gem](https://github.com/sergeych/farcall) and [protocol](https://github.com/sergeych/farcall/wiki).
 
+### Use UMI service (alfa state)
+
+The Universa::Service greatly simplify work taking all boilerplate. Just create objects almost as usual and use them
+as is they are local:
+
+```ruby
+key = PrivateKey,new(open('mykey.private.unikey', 'rb').read)
+contract = Contract.new(key)
+
+contract.seal()
+p contract.check()
+```
+
+The system will create UMI server and do all the work for you. Look at the RemoteAdapter class to see how does it
+work. Soon we'll add adapters for all frequently used Universa classes.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/umi/bin/umi

@@ -267,7 +267,7 @@ loadConfigFile() {
 }
 
 # Now check to see if it's a good enough version
-# TODO - Check to see if we have a configured default java version, otherwise use 1.6
+# TODO - Check to see if we have a configured default java version, otherwise use 1.8
 java_version_check() {
   readonly java_version=$("$java_cmd" -version 2>&1 | awk -F '"' '/version/ {print $2}')
   if [[ "$java_version" == "" ]]; then
@@ -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.8.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.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"
 
 # 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.8.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.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_MAIN_CLASS=com.icodici.farcallscala.Main"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

data/lib/universa.rb

@@ -1,7 +1,11 @@
 require "universa/version"
 require "universa/string_utils"
 require "universa/errors"
+require "universa/tools"
 require "universa/umi"
+require "universa/service"
+require "universa/keys"
+require "universa/contract"
 
 # The Universa gem
 #

data/lib/universa/contract.rb

@@ -0,0 +1,20 @@
+module Universa
+
+  # Universa contract adapter.
+  class Contract < RemoteAdapter
+    remote_class "com.icodici.universa.contract.Contract"
+
+    # seal the contract
+    # @return [String] contract packed to the binary string
+    def seal
+      @proxy.seal()
+    end
+
+    # returns keys that will be used to sign this contract on next {seal}.
+    # @return [Set<PrivateKey>] set of private keys
+    def signing_keys
+      get_keys_to_sign_with
+    end
+  end
+
+end

data/lib/universa/keys.rb

@@ -0,0 +1,52 @@
+module Universa
+
+  # A +com.icodici.crypto.PrivateKey+ extension. As the key is immutable,
+  # caching is used to avoid innecessary UMI calls.
+  class PrivateKey < RemoteAdapter
+    remote_class 'com.icodici.crypto.PrivateKey'
+
+    # @return [KeyAddress] short address of the corresponding public key
+    def short_address
+      @short_address ||= public_key.short_address
+    end
+
+    # @return [KeyAddress] long address of the corresponding public key
+    def long_address
+      @long_address ||= public_key.long_address
+    end
+
+    # @return [PublicKey] public key that matches this
+    def public_key
+      @public_key ||= get_public_key
+    end
+  end
+
+  # A +com.icodici.crypto.PublicKey+ extension. As the key is immutable,
+  # caching is used to avoid innecessary UMI calls.
+  class PublicKey < RemoteAdapter
+    remote_class 'com.icodici.crypto.PublicKey'
+
+    # @return [KeyAddress] short address
+    def short_address
+      @short_address ||= get_short_address()
+    end
+
+    # @return [KeyAddress] long address
+    def long_address
+      @long_address ||= get_long_address()
+    end
+  end
+
+  # The +com.icodici.crypto.KeyAddress+ extension. As it is immutable, caching is
+  # used to avoid unnecessary UMI calls.
+  class KeyAddress < RemoteAdapter
+    remote_class 'com.icodici.crypto.KeyAddress'
+
+    # String form of the key which could be used to unpack it back
+    # @return [String] packed string representation
+    def to_s
+      @string ||= toString()
+    end
+  end
+
+end

data/lib/universa/service.rb

@@ -0,0 +1,143 @@
+require 'singleton'
+
+module Universa
+
+  # The service is a singleton to provide porcess-wide objects and methods. For example,
+  # the {UMI} interface and reference class factory are unique per-process for Universa
+  # library. It uses exactly one lazy created {UMI} connection which is shared among all threads.
+  # As UMI server is multithreaded by nature, is will not block ruby threads waiting for remote
+  # invocation.
+  class Service
+    include Singleton
+
+    # Setup service initial parameters
+    def initialize
+      @config = SmartHash.new path: nil
+      @known_proxies = {}
+      [Contract, PrivateKey, PublicKey, KeyAddress].each {|klass| register_proxy klass}
+    end
+
+    # Implementation of {Service.configure}
+    def configure &block
+      raise Error, "config call must happen before interface creation" if @umi
+      block.call @config
+    end
+
+    # Implementation of {Service.umi}
+    def umi
+      c = @config.to_h.transform_keys(&:to_sym).update(convert_case: true)
+      c[:factory] = -> (ref) {create_proxy(ref)}
+      @umi ||= UMI.new(c.delete(:path), **c)
+    end
+
+
+    # push string to service log
+    def log msg
+      puts "U:Service: #{msg}"
+    end
+
+    # Create objectproxy for known types
+    # @param [Ref] ref to transform
+    # @return [RemoteAdapter | Ref] transformed or source reference
+    def create_proxy ref
+      proxy_class = @known_proxies[ref._remote_class_name]
+      return ref unless proxy_class
+      proxy_class.new(ReferenceCreationData.new(ref))
+    end
+
+    class << self
+
+      # Call it before everything to update UMI interface parameters before is is created.
+      # Calling it when UMI is already constructed raises Error.
+      def configure &block
+        instance.configure &block
+      end
+
+      # Get the global UMI interface, creating it if need.
+      # @return [UMI] ready interface
+      def umi
+        instance.umi
+      end
+    end
+
+    private
+
+    def register_proxy klass
+      remote_class_name = klass.remote_class_name
+      raise Error, "#{remote_class_name} is already registered in Service" if @known_proxies.include?(remote_class_name)
+      @known_proxies[remote_class_name] = klass
+    end
+  end
+
+  # The basic class to write remote class adapters (extensions). Delegates contained {Ref} instance therefore behaves
+  # like remote interface with some extensions.
+  #
+  # Key feature of RemoteAdapter class is the cross-call persistence. It means once created instances of the
+  # RemoteAdapter descendants are cached just like (in fact, instead of) {Ref} instances, so  when the remote party
+  # returns the reference to the object once wrapped by this instance, the instance will be returned unless it is
+  # already garbage collected. instance will be returned, what means sort of cross-platform calls persistence.
+  #
+  # Extending this class normally should not implement the constructor, By defaul the constructor is passed to
+  # 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.
+    #
+    # @param [*Any] args any arguments that remote constructor may accept.
+    def initialize(*args)
+      if args.length == 1 && args[0].is_a?(ReferenceCreationData)
+        @remote = args[0].ref
+      else
+        # 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
+      end
+    end
+
+    # Delegated object
+    # @return [Ref] the wrapped instance whose methpds are delegated by this
+    def __getobj__
+      @remote
+    end
+
+    # Updating proxied object is not allowed. Raises error.
+    def __setobj__
+      raise "ObectProxy does not support changing referenced object"
+    end
+
+    # Returns remote class name. There is no need to override it, when inheriting it use +remote_class+ helper:
+    #
+    #   class MyKeyAddress < ObjectProxy
+    #      remote_class 'com.icodici.crypto.KeyAddress'
+    #
+    #      #...
+    #   end
+    #
+    # Notice: remote_class will do allnecessary work for you.
+    #
+    # @return [String] remote class name
+    def self.remote_class_name
+      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"
+    end
+
+    # debugging label
+    def inspect
+      "<#{self.class.name}:#{__id__}:#{@remote._remote_class_name}:#{@remote._remote_id}}>"
+    end
+
+    # call the remote toString(). Does not cache it.
+    # @return [String]
+    def to_s
+      toString()
+    end
+  end
+
+end

data/lib/universa/tools.rb

@@ -0,0 +1,8 @@
+require 'farcall/smart_hash'
+
+module Universa
+
+  # The Hashie::Mash without warnings, just copied from Farcall to not to copy it again
+  class SmartHash < Farcall::SmartHash
+  end
+end

data/lib/universa/umi.rb

@@ -64,7 +64,7 @@ module Universa
     # @param [String] system expected on the remote side. 'UMI' us a universa umi server.
     # @param [Boolean] convert_case it true, convert ruby style snake case `get_some_stuff()` to java style lower camel
     #                  case `getSomeStuff()` while calling methods. Does not affect class names on {instantiate}.
-    def initialize(path = nil, version_check: /./, system: "UMI", log: 'sessionlog.txt', convert_case: true)
+    def initialize(path = nil, version_check: /./, system: "UMI", log: 'sessionlog.txt', convert_case: true, factory: nil)
       path ||= File.expand_path(File.split(__FILE__)[0] + "/../../bin/umi/bin/umi")
       @in, @out, @err, @wtr = Open3.popen3("#{path} #{log ? "-log #{log}" : ''}")
       @endpoint = Farcall::Endpoint.new(
@@ -73,7 +73,7 @@ module Universa
       @lock = Monitor.new
       @cache = {}
       @closed = false
-      @convert_case = convert_case
+      @convert_case, @factory = convert_case, factory
       @references = {}
       start_cleanup_queue
       @version = call("version")
@@ -95,9 +95,9 @@ module Universa
     # housekeeping required, like memory leaks prevention and direct method calling.
     #
     # @return [Ref] reference to the remotely created object. See {Ref}.
-    def instantiate(object_class_name, *args)
+    def instantiate(object_class_name, *args, adapter: nil)
       ensure_open
-      create_reference call("instantiate", object_class_name, *prepare_args(args))
+      create_reference call("instantiate", object_class_name, *prepare_args(args)), adapter
     end
 
     # Invoke method by name. Should not be used directly; use {Ref} instance to call its methods.
@@ -163,8 +163,9 @@ module Universa
 
     # Create a reference correcting adapting remote types to ruby ecosystem, for example loads
     # remote Java Set to a local ruby Set.
-    def create_reference reference_record
-      r = build_reference reference_record
+    def create_reference(reference_record, adapter = nil)
+      r = build_reference reference_record, adapter
+      return r if adapter
       case reference_record.className
         when 'java.util.HashSet'
           r.toArray()
@@ -175,16 +176,31 @@ module Universa
 
     # Create a reference from UMI remote object reference structure. Returns existing object if any. Takes care
     # of dropping remote object when ruby object gets collected.
-    def build_reference reference_record
+    def build_reference(reference_record, proxy)
       @lock.synchronize {
         remote_id = reference_record.id
         ref = @cache[remote_id]&.get
         if !ref
           # log "Creating new reference to remote #{remote_id}"
           ref = Ref.new(self, reference_record)
-          ObjectSpace.define_finalizer(ref, create_finalizer(remote_id))
-          @cache[remote_id] = WeakReference.new(ref)
+          # IF we provide proxy that will consume the ref, we'll cache the proxy object,
+          # otherwise we run factory and cahce whatever it returns or the ref itself
+          obj = if proxy
+                  # Proxy object will delegate the ref we return from there
+                  # no action need
+                  proxy
+                else
+                  # new object: factory may create proxy for us and we'll cache it for later
+                  # use:
+                  @factory and ref = @factory.call(ref)
+                  ref
+                end
+          # Important: we set finalizer fot the target object
+          ObjectSpace.define_finalizer(obj, create_finalizer(remote_id))
+          # and we cache target object
+          @cache[remote_id] = WeakReference.new(obj)
         end
+        # but we return reference: it the proxy constructor calls us, it'll need the ref:
         ref
       }
     end
@@ -334,9 +350,14 @@ module Universa
       @id
     end
 
+    # name of the remote class (provided by remote)
+    def _remote_class_name
+      @ref.className
+    end
+
     # Internal use only. Allow processing remote commands as local calls
     def respond_to_missing?(method_name, include_private = false)
-      method_name[0] == '_' ? super : true
+      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
@@ -357,13 +378,13 @@ module Universa
 
     # short data label for instance
     def inspect
-      "<UMI:Ref:#{@umi.__id__}:#{@ref.className}:#{@id})>"
+      "<UMI:Ref:#{@umi.__id__}:#{@ref.className}:#{@id}>"
     end
 
     # Checks that references are euqal: either both point to the same remote object or respective remote objects
     # are reported equals by the remote +equals()+ call.
     def ==(other)
-      other.is_a?(Ref) && other._umi == @umi &&
+      (other.is_a?(Ref) || other.is_a?(RemoteAdapter)) && other._umi == @umi &&
           (other._remote_id == @id || other.equals(self))
     end
 
@@ -373,6 +394,24 @@ module Universa
       other.is_a?(Ref) && other._umi == @umi && other._remote_id == @id
     end
 
+    private
+
+    LOCAL_METHODS = Set.new(%i[i_respond_to_everything_so_im_not_really_a_matcher to_hash to_ary description])
+  end
+
+  # Service uses this class to contruct {RemoteAdapter} pointing to the existing remote object instead
+  # of instantiating new one.
+  #
+  class ReferenceCreationData
+    # reference to create proxy for
+    # @return [Ref]
+    attr :ref
+
+    # we need to wrap this ref
+    # @param [Ref] ref to wrap in {RemoteAdapter}
+    def initialize ref
+      @ref = ref
+    end
   end
 
 end

data/lib/universa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -95,7 +95,6 @@ files:
 - 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.nanohttpd-2.1.0.jar
-- bin/umi/lib/com.icodici.umi-0.8.8.jar
 - bin/umi/lib/com.icodici.universa_core-3.8.3.jar
 - bin/umi/lib/com.madgag.spongycastle.core-1.58.0.0.jar
 - bin/umi/lib/com.squareup.jnagmp.jnagmp-2.0.0.jar
@@ -111,8 +110,12 @@ files:
 - bin/umi/lib/org.yaml.snakeyaml-1.18.jar
 - exe/universa
 - lib/universa.rb
+- lib/universa/contract.rb
 - lib/universa/errors.rb
+- lib/universa/keys.rb
+- lib/universa/service.rb
 - lib/universa/string_utils.rb
+- lib/universa/tools.rb
 - lib/universa/umi.rb
 - lib/universa/version.rb
 - lib/universa/weak_reference.rb