universa 3.12.6.1 → 3.13.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/umi/bin/umi +4 -4
- data/bin/umi/bin/umi.bat +1 -1
- data/bin/umi/lib/{com.icodici.common_tools-3.12.6.jar → com.icodici.common_tools-3.13.1.jar} +0 -0
- data/bin/umi/lib/{com.icodici.crypto-3.12.6.jar → com.icodici.crypto-3.13.1.jar} +0 -0
- data/bin/umi/lib/{com.icodici.umi-0.8.63.jar → com.icodici.umi-0.8.66.jar} +0 -0
- data/bin/umi/lib/{com.icodici.universa_core-3.12.6.jar → com.icodici.universa_core-3.13.1.jar} +0 -0
- data/lib/universa/contract.rb +7 -0
- data/lib/universa/keys.rb +3 -2
- data/lib/universa/version.rb +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f6c5bd0ff2fe994b5ab3d60bf1a5b94ae57632b442d7ea0846ac6c49a92a1fc1
|
|
4
|
+
data.tar.gz: 8f6d65ecbedf21879f329359e3af7fc6095b42718349fd11bd49bb6fa45ac4e9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fb6602ec3a8df8cd6c88ccaf1690311658e23ebb088d62e6cb4a5e6255027182ac4a5e4ac7c723bdb9cc5a5f072f9d9169c1484799227cc8bfe6b9756e3cbb71
|
|
7
|
+
data.tar.gz: 2896498a14742c58a311e31a70b434d62f2f64d171680ef2f522e83ce5812dd570059db74999e2cb441af83226e8a90397fe7438da6aaf1d9d3dffde0bc51f6d
|
data/bin/umi/bin/umi
CHANGED
|
@@ -267,7 +267,7 @@ loadConfigFile() {
|
|
|
267
267
|
}
|
|
268
268
|
|
|
269
269
|
# Now check to see if it's a good enough version
|
|
270
|
-
# TODO - Check to see if we have a configured default java version, otherwise use 1.
|
|
270
|
+
# TODO - Check to see if we have a configured default java version, otherwise use 1.6
|
|
271
271
|
java_version_check() {
|
|
272
272
|
readonly java_version=$("$java_cmd" -version 2>&1 | awk -F '"' '/version/ {print $2}')
|
|
273
273
|
if [[ "$java_version" == "" ]]; then
|
|
@@ -281,10 +281,10 @@ java_version_check() {
|
|
|
281
281
|
if [[ "$major" -eq "1" ]]; then
|
|
282
282
|
local major=$(echo "$java_version" | cut -d'.' -f2)
|
|
283
283
|
fi
|
|
284
|
-
if [[ "$major" -lt "
|
|
284
|
+
if [[ "$major" -lt "6" ]]; then
|
|
285
285
|
echo
|
|
286
286
|
echo The java installation you have is not up to date
|
|
287
|
-
echo $app_name requires at least version 1.
|
|
287
|
+
echo $app_name requires at least version 1.6+, you have
|
|
288
288
|
echo version $java_version
|
|
289
289
|
echo
|
|
290
290
|
echo Please go to http://www.java.com/getjava/ and download
|
|
@@ -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.66.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.13.1.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.13.1.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.13.1.jar:$lib_dir/org.bouncycastle.bcprov-jdk15on-1.62.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.66.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.13.1.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.13.1.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.13.1.jar;%APP_LIB_DIR%\org.bouncycastle.bcprov-jdk15on-1.62.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
|
|
data/bin/umi/lib/{com.icodici.common_tools-3.12.6.jar → com.icodici.common_tools-3.13.1.jar}
RENAMED
|
Binary file
|
|
Binary file
|
|
Binary file
|
data/bin/umi/lib/{com.icodici.universa_core-3.12.6.jar → com.icodici.universa_core-3.13.1.jar}
RENAMED
|
Binary file
|
data/lib/universa/contract.rb
CHANGED
|
@@ -35,6 +35,13 @@ module Universa
|
|
|
35
35
|
end
|
|
36
36
|
end
|
|
37
37
|
|
|
38
|
+
class Safe58 < RemoteAdapter
|
|
39
|
+
remote_class "net.sergeych.utils.Safe58"
|
|
40
|
+
|
|
41
|
+
static_method :encode
|
|
42
|
+
static_method :decode
|
|
43
|
+
end
|
|
44
|
+
|
|
38
45
|
class Parcel < RemoteAdapter
|
|
39
46
|
remote_class "com.icodici.universa.contract.Parcel"
|
|
40
47
|
|
data/lib/universa/keys.rb
CHANGED
|
@@ -79,12 +79,13 @@ module Universa
|
|
|
79
79
|
end
|
|
80
80
|
|
|
81
81
|
# Check signature
|
|
82
|
+
#
|
|
82
83
|
# @param [String] data as binary or normal string
|
|
83
84
|
# @param [Object] signature as binary string
|
|
84
|
-
# @param [Object] hash_type to use
|
|
85
|
+
# @param [Object] hash_type to use (SHA256, SHA512, SHA3_384 and so on)
|
|
85
86
|
# @return true if it is ok
|
|
86
87
|
def verify(data, signature, hash_type = "SHA3_384")
|
|
87
|
-
__getobj__.verify(data.force_encoding('binary'), signature, hash_type)
|
|
88
|
+
__getobj__.verify(data.force_encoding('binary'), signature.force_encoding('binary'), hash_type)
|
|
88
89
|
end
|
|
89
90
|
|
|
90
91
|
# @param [String] data binary or usual data string
|
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.
|
|
4
|
+
version: 3.13.1.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- sergeych
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-11-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: farcall
|
|
@@ -149,11 +149,11 @@ files:
|
|
|
149
149
|
- bin/umi/lib/com.fasterxml.jackson.core.jackson-databind-2.8.11.1.jar
|
|
150
150
|
- bin/umi/lib/com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.8.11.jar
|
|
151
151
|
- bin/umi/lib/com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.8.11.jar
|
|
152
|
-
- bin/umi/lib/com.icodici.common_tools-3.
|
|
153
|
-
- bin/umi/lib/com.icodici.crypto-3.
|
|
152
|
+
- bin/umi/lib/com.icodici.common_tools-3.13.1.jar
|
|
153
|
+
- bin/umi/lib/com.icodici.crypto-3.13.1.jar
|
|
154
154
|
- bin/umi/lib/com.icodici.nanohttpd-2.1.0.jar
|
|
155
|
-
- bin/umi/lib/com.icodici.umi-0.8.
|
|
156
|
-
- bin/umi/lib/com.icodici.universa_core-3.
|
|
155
|
+
- bin/umi/lib/com.icodici.umi-0.8.66.jar
|
|
156
|
+
- bin/umi/lib/com.icodici.universa_core-3.13.1.jar
|
|
157
157
|
- bin/umi/lib/com.squareup.jnagmp.jnagmp-2.0.0.jar
|
|
158
158
|
- bin/umi/lib/com.typesafe.play.play-functional_2.12-2.6.10.jar
|
|
159
159
|
- bin/umi/lib/com.typesafe.play.play-json_2.12-2.6.10.jar
|