tezos_client 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37c983e5bf0b57cb2d3758165076d7c17e091214c61401b5107989fab6b3e09f
-  data.tar.gz: 301462a20464486d1ad37bf0708aa00d1e2db30105f1944eacc4dbd67074d6a8
+  metadata.gz: a1459f7dd534e408bd13520b14789b9f719a6cec9b004f5ab3ca00c151da1ac4
+  data.tar.gz: 2aa7c36fc10c82537de03593e592703274daedcff36edec84130c98cc385098f
 SHA512:
-  metadata.gz: ec1a70b4066f70964182d811877cc6a2cad18ae95403a4a86e3e3758a35413922c85115fcf7e3c26edaf9e34f1d27f00f5a109c4050dfa9cc001479a3916b570
-  data.tar.gz: 3e2d3c82e9b811990f2682f7d4ce8992c1399850f43dfa587d0fe9f5f2c88f3307235792677210d8c71348ae0d9f083844e7617b194c851e6bbbf2b1c86a2bc3
+  metadata.gz: fa9dc95f337c4bbbda410392c03d6305c93ee8f4dfec1810f629c0143a4beb3ce88789f5c4eaa809ae572bb4871ad44b0e87d35071727f9800cc9167f290492f
+  data.tar.gz: e625840ea65befc0adc6ece5e334d8e869daabbaa2e6a9fc51881dda0ba3971dcec2f0d3274968e07a7e9268e1af93469c1f70f1395fa3d773119e871ab55f2a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (1.2.1)
+    tezos_client (1.2.2)
       active_interaction (~> 3.7)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)
@@ -14,29 +14,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (3.8.0)
+    active_interaction (3.8.2)
       activemodel (>= 4, < 7)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activesupport (6.0.2.2)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
@@ -52,25 +52,25 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.9.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     hashdiff (1.0.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httparty (0.17.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.3)
-    loofah (2.4.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     money-tree (0.10.0)
       ffi
     multi_xml (0.6.0)
@@ -84,7 +84,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (4.0.1)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -92,9 +92,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -140,11 +140,11 @@ GEM
     safe_yaml (1.0.5)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.6.0)
     vcr (4.0.0)
     webmock (3.7.6)

data/lib/tezos_client.rb

@@ -36,6 +36,8 @@ require "tezos_client/smartpy_interface"
 
 require "tezos_client/tools/convert_to_hash"
 require "tezos_client/tools/find_big_maps_in_storage"
+require "tezos_client/tools/hash_to_micheline"
+require "tezos_client/tools/annots_to_type"
 
 class TezosClient
   using CurrencyUtils

data/lib/tezos_client/tools/annots_to_type.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class TezosClient::Tools::AnnotsToType < ActiveInteraction::Base
+  # example of typed_annots :
+  # {
+  #   spending_ref: "string",
+  #   remainder_amount: "nat",
+  #   expires_at: "timestamp"
+  # }
+  hash :typed_annots, strip: false
+
+  validate :validate_types
+
+  def execute
+    return { "prim" => typed_annots.values.first } if typed_annots.size == 1
+
+    { "prim" => "pair", "args" => generate_type_args(ordered_annots) }
+  end
+
+  private
+    def generate_type_args(annots)
+      annot = annots.pop
+      annot_type = typed_annots[annot]
+
+      unless annots.size == 1
+        return [{ "prim" => "pair", "args" => generate_type_args(annots) },
+                { "prim" => annot_type, "annots" => ["%#{annot}"] }]
+      end
+
+      generated_args = [{ "prim" => annot_type, "annots" => ["%#{annot}"] }]
+      annot = annots.pop
+      annot_type = typed_annots[annot]
+      generated_args.unshift({ "prim" => annot_type, "annots" => ["%#{annot}"] })
+
+      generated_args
+    end
+
+    def ordered_annots
+      @ordered_annots ||= typed_annots.keys.sort
+    end
+
+    def validate_types
+      allowed_types = TezosClient::Tools::HashToMicheline::TYPES_MAPPING.keys
+      return if typed_annots.values.map(&:to_sym).all? { |type| type.in? allowed_types }
+
+      errors.add(:base, "The allowed types are: #{allowed_types.join(', ')}")
+    end
+end

data/lib/tezos_client/tools/hash_to_micheline.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+class TezosClient::Tools::HashToMicheline < ActiveInteraction::Base
+  # TODO: handle Arrays and Maps
+  TYPES_MAPPING = {
+    int: :int,
+    nat: :int,
+    string: :string,
+    signature: :string,
+    bytes: :bytes,
+    timestamp: :int,
+    key: :string,
+    address: :string
+  }.freeze
+
+  string :contract_address, default: nil
+  string :entrypoint, default: nil
+  # example of params:
+  # {
+  #   spending_ref: "toto",
+  #   expires_at: Time.now
+  # }
+  hash :params, strip: false
+  hash :storage_type, strip: false, default: {}
+  interface :blockchain_client, methods: [:entrypoint], default: -> { TezosClient.new }
+
+  # if storage_type is not received, it is fetched from the blockchain using
+  # contract_address and entrypoint (that are mandatory in this case)
+  validate :storage_type_or_contract_address_presence
+
+  def execute
+    return hash_type_to_hash_data(_storage_type.fetch(:prim), params.values.first) if params.size == 1
+
+    { prim: "Pair", args: generate_micheline(_storage_type[:args]) }
+  end
+
+  private
+    def generate_micheline(remaining_storage_type)
+      remaining_storage_type.each_with_object([]) do |h, acc|
+        next acc << { prim: "Pair", args: generate_micheline(h[:args]) } if h[:prim] == "pair"
+
+        annot = h[:annots].first.slice(1..-1).to_sym # remove '%'
+        acc << hash_type_to_hash_data(h[:prim], params.fetch(annot))
+      end
+    end
+
+    def convert_type(michelson_type)
+      TYPES_MAPPING.fetch(michelson_type.to_sym)
+    end
+
+    def hash_type_to_hash_data(michelson_type, value)
+      type = convert_type(michelson_type)
+
+      converted_value = case michelson_type.to_sym
+                        when :nat, :int
+                          value.to_s
+                        when :timestamp
+                          errors.add(:base, "timestamp input must be an instance of Time") unless value.is_a? Time
+
+                          value.to_i.to_s
+                        else
+                          value
+      end
+
+      { type => converted_value }
+    end
+
+    def _storage_type
+      (storage_type.presence || blockchain_client.entrypoint(contract_address, entrypoint)).deep_symbolize_keys
+    end
+
+    def storage_type_or_contract_address_presence
+      return if storage_type.present? ^ (contract_address.present? && entrypoint.present?)
+
+      errors.add(:base,
+                 "You should provide the contract_address and the entrypoint only if storage_type is not provided")
+    end
+end

data/lib/tezos_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class TezosClient
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Pierre Michard
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -274,6 +274,7 @@ files:
 - lib/tezos_client/smartpy_inteface/smartpy_wrapper.rb
 - lib/tezos_client/smartpy_interface.rb
 - lib/tezos_client/string_utils.rb
+- lib/tezos_client/tools/annots_to_type.rb
 - lib/tezos_client/tools/convert_to_hash.rb
 - lib/tezos_client/tools/convert_to_hash/address.rb
 - lib/tezos_client/tools/convert_to_hash/base.rb
@@ -289,6 +290,7 @@ files:
 - lib/tezos_client/tools/convert_to_hash/string.rb
 - lib/tezos_client/tools/convert_to_hash/timestamp.rb
 - lib/tezos_client/tools/find_big_maps_in_storage.rb
+- lib/tezos_client/tools/hash_to_micheline.rb
 - lib/tezos_client/tools/system_call.rb
 - lib/tezos_client/tools/temporary_file.rb
 - lib/tezos_client/version.rb
@@ -299,7 +301,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -314,8 +316,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.4
+signing_key:
 specification_version: 4
 summary: Wrapper to the tezos client.
 test_files: []