universa 3.14.2.1 → 3.14.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 634b16b7d4ee30cc046a3f20ed5c3db1de4d7ddda5a2cc22a7fd87462b10b4d2
-  data.tar.gz: 6733a5eeba94d4e574e3873db94bc07eccba8261b0e0de79802795399f3b4640
+  metadata.gz: 6487e468be6041ca989e00499911941b71f8684fcdf171e9659c3934f26a54f8
+  data.tar.gz: 0e04d054937e42a0955a48597fc20766327b2438d036c490d4dbe12b79d86ae5
 SHA512:
-  metadata.gz: 9c2633e546d18a264e7ee4200d8830f1af180eb3dffdfae24d6b65ab6eb3ecca6967c2c7ade942fce239959ed74ddc2dbd71d7caf5e64517574b72d7089e23dd
-  data.tar.gz: 49c671d2d33706044361e6bcf26d6ebab5512dae06f037f38a4ee665efa18a59f532c471b63efde248f2f81b4fd23b20d55876af09da4c01bd21c5ed24c3b7e9
+  metadata.gz: 3106d98aa41169ff04865fcf6b21705077f0d365ac9064cb577b8a5e68af6aafc8086999f10d2da3e5641e8f0e59d839fa68011a9ff4acfb18c44c8c7197ad36
+  data.tar.gz: f5be6b114d0df7d4e625c6b8c4a4a7a2469105c10f8fe9fcba1d792e8f361a4827040956ddb1ca2bbc9fb771027d19c83d5873daf32ba4d0cf8e22eead6475b4

data/lib/universa/contract.rb

@@ -35,6 +35,15 @@ module Universa
     end
   end
 
+  # Safe58 allows human-friendly binary-to-characters codec. It automatically corrects recognition
+  # errors like 0 instead of 0 and 1 instead of I. The code does not use characters that look alike and
+  # uses only encglish letters and digits that also simplify select-copy-paste routine.
+  #
+  # important! arguments MUST be binary strings, so use
+  #
+  #     str.force_encoding('binary')
+  #
+  # as need, otherwise it will not work as expected.
   class Safe58 < RemoteAdapter
     remote_class "net.sergeych.utils.Safe58"
 
@@ -253,7 +262,7 @@ module Universa
     # @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_expires_at expires_at.utc
       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"))
@@ -333,7 +342,7 @@ module Universa
     # set +expires_at+ field
     # @param [Time] time when this contract will be expired, if yet +APPROVED+.
     def expires_at=(time)
-      set_expires_at time
+      set_expires_at time.utc
     end
 
     # @return definition data

data/lib/universa/dump.rb

@@ -0,0 +1,40 @@
+module Universa
+
+  # Convert binary data to a human-readable dump string, like
+  #
+  # <code>
+  # 000000 27 23 64 61 74 61 c4 2d 0f |'#data.-.|
+  # 000008 0f 1f 43 63 6f 6e 74 72 61 |..Ccontra|
+  # </code>
+  #
+  # @param data[String] data to dump
+  # @param line_bytes[Number] how many bytes to show in each line
+  # @return [String] dump as a string
+  def dump_bytes data, line_bytes=16
+    data.force_encoding Encoding::BINARY
+    offset = 0
+    res = []
+
+    while( offset < data.length )
+
+      left = "%06x" % offset
+      portion = data[offset..(offset+line_bytes)].bytes
+
+      bytes = portion.map { |x| "%02x" % x }.join(' ')
+      chars = portion.map { |c| x = c.ord; x >= 32 && x <= 'z'.ord ? x.chr : '.' }.join('')
+
+      if chars.length < line_bytes
+        pad = line_bytes - chars.length + 1
+        chars += ' ' * pad
+        bytes += '   ' * pad
+      end
+
+      res << "#{left} #{bytes} |#{chars}|"
+
+      offset += line_bytes
+    end
+    res.join("\n")
+  end
+
+  module_function :dump_bytes
+end

data/lib/universa/version.rb

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

data/samples/load_contract.rb

@@ -0,0 +1,10 @@
+require_relative '../lib/universa/dump'
+
+source_file = ARGV[0] || File.expand_path("~/Downloads/c.unicon")
+
+packed = open(source_file,'rb') { |f| f.read }
+
+puts Universa::dump_bytes(packed)
+
+require 'base64'
+puts Base64.encode64(packed)

data/samples/safe58_sample.rb

@@ -0,0 +1,45 @@
+# example:
+#
+# rationale:
+# We want to pass order code to user which is potentially long integer (sam, above 9 characters in decimal
+# notation), but the bank insist oreder code in the payment purpose should be 5-8 characters.
+#
+# solution:
+#
+# pack long id (we assume it will fit 5 bytes that give us >60 billions which is usually more
+# than enough) to short and easy to human-retype code using SAFE58 encoding by Universa.
+#
+# It will nirmally give us 6 letter-code which is well protected against recognition mistakes,
+# for example 0 instead of o or 1 instead of I or i. It autocorrects it and does not use like characters.
+#
+require 'universa'
+
+# sample long to encode, 12 billions+ (12`884`901`887)
+id = 0x2FFFFffff
+
+def int_to_safe58(value)
+    # pack to BE 8-byte long
+    packed = [value].pack("Q>")
+
+    # important: safe58 needs binary encoded string, but pack already gives us binary string,
+    # so we strip 3 first bytes which are are zeroes and encode the rest to safe 58:
+    Universa::Safe58.encode(packed[3..])
+end
+
+def safe58_to_int(encoded)
+    # decode 5 bytes
+    bytes = Universa::Safe58.decode(encoded)
+    # pad left with 3 zero bytes to get back 64 bit integer and unpack it:
+    "\x0\x0\x0#{bytes}".unpack("Q>")[0]
+end
+
+puts "Encoded: #{id} -> #{int_to_safe58 id}"
+
+id2 = safe58_to_int(int_to_safe58(id))
+puts "Decoded: #{int_to_safe58 id} -> #{id2}"
+
+id == id2 or raise "test failed"
+
+puts "ALL OK"
+
+

data/universa.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby-ext"
   spec.add_dependency "ansi"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 3.14.2.1
+  version: 3.14.2.2
 platform: ruby
 authors:
 - sergeych
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,7 @@ files:
 - lib/universa/chain_store.rb
 - lib/universa/client.rb
 - lib/universa/contract.rb
+- lib/universa/dump.rb
 - lib/universa/errors.rb
 - lib/universa/fs_store/entry.rb
 - lib/universa/fs_store/file_store.rb
@@ -181,12 +182,14 @@ files:
 - lib/universa/version.rb
 - lib/universa/weak_reference.rb
 - sample_ping.rb
+- samples/load_contract.rb
+- samples/safe58_sample.rb
 - universa.gemspec
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,8 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Expose Universa Java API to ruby
 test_files: []