universa 3.9.14.1 → 3.9.14.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/umi/bin/umi +1 -1
- data/bin/umi/bin/umi.bat +1 -1
- data/bin/umi/lib/{com.icodici.umi-0.8.33.jar → com.icodici.umi-0.8.35.jar} +0 -0
- data/lib/universa/contract.rb +52 -0
- data/lib/universa/service.rb +13 -0
- data/lib/universa/umi.rb +13 -0
- data/lib/universa/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0c65df7eb10cecce1c09779fbf90508acfdfa635b16c389dadf2374c593fcaf1
|
|
4
|
+
data.tar.gz: 64fb25fb4ac49fe211e72eae959356a102d19ab4a7fd0b4983c918d68be8b895
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c0b58987523a8f1afe197155d5d2a405b0d6d984a9eaa3f56ca5e42bcce247aca142ff38686df12bb60d0b1789f352ab2daba63674d06a0e8e1aa96c2b3bc1ad
|
|
7
|
+
data.tar.gz: 386da928e46af503cc2efc09f5c6d1311126bfac4a908580ece195197fc8b973b711f2191db20e68947fe49b990c1a864e5124e448622580ec409abbefff049f
|
data/bin/umi/bin/umi
CHANGED
|
@@ -344,7 +344,7 @@ declare -r lib_dir="$(realpath "${app_home}/../lib")"
|
|
|
344
344
|
declare -a app_mainclass=(com.icodici.farcallscala.Main)
|
|
345
345
|
|
|
346
346
|
declare -r script_conf_file="${app_home}/../conf/application.ini"
|
|
347
|
-
declare -r app_classpath="$lib_dir/com.icodici.umi-0.8.
|
|
347
|
+
declare -r app_classpath="$lib_dir/com.icodici.umi-0.8.35.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"
|
|
348
348
|
|
|
349
349
|
# java_cmd is overrode in process_args when -java-home is used
|
|
350
350
|
declare java_cmd=$(get_java_cmd)
|
data/bin/umi/bin/umi.bat
CHANGED
|
@@ -80,7 +80,7 @@ rem "-J" is stripped, "-D" is left as is, and everything is appended to JAVA_OPT
|
|
|
80
80
|
set _JAVA_PARAMS=
|
|
81
81
|
set _APP_ARGS=
|
|
82
82
|
|
|
83
|
-
set "APP_CLASSPATH=%APP_LIB_DIR%\com.icodici.umi-0.8.
|
|
83
|
+
set "APP_CLASSPATH=%APP_LIB_DIR%\com.icodici.umi-0.8.35.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"
|
|
84
84
|
set "APP_MAIN_CLASS=com.icodici.farcallscala.Main"
|
|
85
85
|
set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
|
|
86
86
|
|
|
Binary file
|
data/lib/universa/contract.rb
CHANGED
|
@@ -12,6 +12,7 @@ module Universa
|
|
|
12
12
|
remote_class "com.icodici.universa.contract.permissions.RevokePermission"
|
|
13
13
|
end
|
|
14
14
|
|
|
15
|
+
# Adapter for plitjoin permission
|
|
15
16
|
class SplitJoinPermission < RemoteAdapter
|
|
16
17
|
remote_class "com.icodici.universa.contract.permissions.SplitJoinPermission"
|
|
17
18
|
end
|
|
@@ -19,9 +20,53 @@ module Universa
|
|
|
19
20
|
# Adapter for Universa Role
|
|
20
21
|
class Role < RemoteAdapter
|
|
21
22
|
remote_class "com.icodici.universa.contract.roles.Role"
|
|
23
|
+
|
|
24
|
+
class RequireMode
|
|
25
|
+
ALL_OF = "ALL_OF"
|
|
26
|
+
ANY_OF = "ANY_OF"
|
|
27
|
+
end
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
# Adaoter for link role
|
|
31
|
+
class RoleLink < RemoteAdapter
|
|
32
|
+
remote_class "com.icodici.universa.contract.roles.RoleLink"
|
|
33
|
+
end
|
|
34
|
+
|
|
35
|
+
# adapter for a simple (key owner) role
|
|
36
|
+
class SimpleRole < RemoteAdapter
|
|
37
|
+
remote_class "com.icodici.universa.contract.roles.SimpleRole"
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
# adapter for a role that is a list of roles
|
|
41
|
+
class ListRole < RemoteAdapter
|
|
42
|
+
remote_class "com.icodici.universa.contract.roles.ListRole"
|
|
43
|
+
end
|
|
44
|
+
|
|
45
|
+
# Adapter for permission to modify data
|
|
46
|
+
class ModifyDataPermission < RemoteAdapter
|
|
47
|
+
remote_class "com.icodici.universa.contract.permissions.ModifyDataPermission"
|
|
22
48
|
end
|
|
23
49
|
|
|
24
50
|
|
|
51
|
+
# Wrapper for Java API Reference class
|
|
52
|
+
|
|
53
|
+
class Reference < RemoteAdapter
|
|
54
|
+
remote_class "com.icodici.universa.contract.Reference"
|
|
55
|
+
|
|
56
|
+
remote_field :name, :type, :transactional_id, :contract_id, :required, :origin, :signed_by, :fields, :roles,
|
|
57
|
+
:matchingItems
|
|
58
|
+
|
|
59
|
+
alias matching_items matchingItems
|
|
60
|
+
|
|
61
|
+
ALL_OF = 'all_of'
|
|
62
|
+
ANY_OF = 'any_of'
|
|
63
|
+
SIMPLE_CONDITION = 'simple_condition'
|
|
64
|
+
|
|
65
|
+
TYPE_TRANSACTIONAL = 1
|
|
66
|
+
TYPE_EXISTING_DEFINITION = 2
|
|
67
|
+
TYPE_EXISTING_STATE = 3
|
|
68
|
+
end
|
|
69
|
+
|
|
25
70
|
# adapter for Universa TransactionPack
|
|
26
71
|
class TransactionPack < RemoteAdapter
|
|
27
72
|
remote_class "com.icodici.universa.contract.TransactionPack"
|
|
@@ -57,6 +102,13 @@ module Universa
|
|
|
57
102
|
invoke_static 'with_digest', string_id
|
|
58
103
|
end
|
|
59
104
|
|
|
105
|
+
# Create a random HashId
|
|
106
|
+
# @return [HashId] random HashId
|
|
107
|
+
def self.create_random
|
|
108
|
+
invoke_static 'create_random'
|
|
109
|
+
end
|
|
110
|
+
|
|
111
|
+
|
|
60
112
|
# Get binary representation. It is shorter than string representation but contain non-printable characters and
|
|
61
113
|
# can cause problems if treated like a string. Use {#to_s} to get string representation instead.
|
|
62
114
|
#
|
data/lib/universa/service.rb
CHANGED
|
@@ -143,6 +143,19 @@ module Universa
|
|
|
143
143
|
def self.invoke_static(method_name, *args)
|
|
144
144
|
Service.umi.invoke_static @remote_class_name, method_name, *args
|
|
145
145
|
end
|
|
146
|
+
|
|
147
|
+
def self.remote_field *names
|
|
148
|
+
names.each {|name|
|
|
149
|
+
class_eval <<-End
|
|
150
|
+
def #{name}
|
|
151
|
+
Service.umi.get_field(self,"#{name}")
|
|
152
|
+
end
|
|
153
|
+
def #{name}=(value)
|
|
154
|
+
Service.umi.set_field(self,"#{name}", value)
|
|
155
|
+
end
|
|
156
|
+
End
|
|
157
|
+
}
|
|
158
|
+
end
|
|
146
159
|
end
|
|
147
160
|
|
|
148
161
|
end
|
data/lib/universa/umi.rb
CHANGED
|
@@ -122,6 +122,19 @@ module Universa
|
|
|
122
122
|
encode_result call("invoke", class_name, method.to_s.camelize_lower, *prepare_args(args))
|
|
123
123
|
end
|
|
124
124
|
|
|
125
|
+
def get_field(remote_object, name)
|
|
126
|
+
encode_result call("get_field", remote_object._remote_id, name)
|
|
127
|
+
end
|
|
128
|
+
|
|
129
|
+
def set_field(remote_object, name, value)
|
|
130
|
+
call("set_field", remote_object._remote_id, name, prepare(value))
|
|
131
|
+
value
|
|
132
|
+
end
|
|
133
|
+
|
|
134
|
+
def invoke_static(class_name, method, *args)
|
|
135
|
+
encode_result call("invoke", class_name, method.to_s.camelize_lower, *prepare_args(args))
|
|
136
|
+
end
|
|
137
|
+
|
|
125
138
|
# Close child process. No remote calls should occur after it.
|
|
126
139
|
def close
|
|
127
140
|
@queue.push :poison_pill
|
data/lib/universa/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: universa
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.9.14.
|
|
4
|
+
version: 3.9.14.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- sergeych
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-05-
|
|
11
|
+
date: 2019-05-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: farcall
|
|
@@ -139,7 +139,7 @@ files:
|
|
|
139
139
|
- bin/umi/lib/com.icodici.common_tools-3.9.14.jar
|
|
140
140
|
- bin/umi/lib/com.icodici.crypto-3.9.14.jar
|
|
141
141
|
- bin/umi/lib/com.icodici.nanohttpd-2.1.0.jar
|
|
142
|
-
- bin/umi/lib/com.icodici.umi-0.8.
|
|
142
|
+
- bin/umi/lib/com.icodici.umi-0.8.35.jar
|
|
143
143
|
- bin/umi/lib/com.icodici.universa_core-3.9.14.jar
|
|
144
144
|
- bin/umi/lib/com.madgag.spongycastle.core-1.58.0.0.jar
|
|
145
145
|
- bin/umi/lib/com.squareup.jnagmp.jnagmp-2.0.0.jar
|