tezos_client 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e2dc6502a81aa8acb23cab552f03edbb1c94d7e21bfa2e653f9d662b0f2f5b5
-  data.tar.gz: 807c964c0919c93331e3e45610195705bed3ead65ca71a51f46b13d557ba4b14
+  metadata.gz: 2f5b9a5c58bf1640c1dea1b7e50476ec7f73d8921f643aae09ee78bc6c52831f
+  data.tar.gz: d6ab0bf0fe3a61153e932f826495cc63a4ef111d58059a998461f4a75a45dbe7
 SHA512:
-  metadata.gz: 6b8d7f60f470bc533c3305cc33c007614b87461c5c0ec64e9d0a535ded2ba5707108cd5c359b89b5f292d215a2aa1ed2eaeffed9c55efa6a0c8f0dd51b46d08a
-  data.tar.gz: 80532f0a06a7f8d4e810c80ef4c90ddac5e1bf4513bb17e10bc2b1659ed0e7319ed620649f655285d03fe34b1e5a971359d7fa676192f02b0089c17a08f8bd39
+  metadata.gz: 97e1173843fbd7856cd3b533cdb7dafc0377825709756c07f32ac17b2645264b77fa3bc96dffba72bcd9142c6312911497d2117b237dfe04c8b91aa26eeded29
+  data.tar.gz: 28f6dddae3bef46b9dfa12ec10195c33c6a4cef8dbae0a629123d8b6bea92a289a0e378fde25a27c68cb3c83f183a332b720b8ad2d89b72f2c7e11eeac749fc4

data/.travis.yml

@@ -13,11 +13,8 @@ rvm:
 before_install:
   - sh travis-scripts/prepare-ubuntu.sh
   - mkdir -p $HOME/bin
-  - curl -s https://smartpy.io/dev-20200912-bbb4b34cb579f3d52320c3d2aed8ebcef04429b0/cli/SmartPy.sh > SmartPy.sh
-  - chmod +x ./SmartPy.sh
-  - ./SmartPy.sh local-install-auto $HOME/bin/smartpy/cli
-  - rm ./SmartPy.sh
-  - export PATH="$PATH:$HOME/bin/:$HOME/bin/smartpy/cli/"
+  - curl -s https://smartpy.io/cli/install.sh > SmartPyInstaller.sh &&  yes | sh SmartPyInstaller.sh
+  - export PATH="$PATH:$HOME/bin/:$HOME/smartpy-cli/"
   - npm link michelson-to-micheline
   - gem install bundler -v 1.16.3
 script:

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    tezos_client (1.3.1)
-      active_interaction (~> 3.7)
+    tezos_client (1.3.4)
+      active_interaction (>= 3.8)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)
       bip_mnemonic (~> 0.0.2)
@@ -14,24 +14,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.3)
-      actionview (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actionpack (6.0.3.5)
+      actionview (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
       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.3.3)
-      activesupport (= 6.0.3.3)
+    actionview (6.0.3.5)
+      activesupport (= 6.0.3.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (3.8.3)
-      activemodel (>= 4, < 7)
-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activesupport (6.0.3.3)
+    active_interaction (4.0.0)
+      activemodel (>= 5, < 7)
+    activemodel (6.0.3.5)
+      activesupport (= 6.0.3.5)
+    activesupport (6.0.3.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -39,51 +39,52 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
+    ast (2.4.2)
     base58 (0.2.3)
     bip_mnemonic (0.0.4)
     builder (3.2.4)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.7)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.9.0)
-    ffi (1.13.1)
-    hashdiff (1.0.0)
+    erubi (1.10.0)
+    ffi (1.14.2)
+    hashdiff (1.0.1)
     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.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    loofah (2.7.0)
+    loofah (2.9.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.2020.0512)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mime-types-data (3.2021.0225)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
     money-tree (0.10.0)
       ffi
     multi_xml (0.6.0)
     netrc (0.11.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.18.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (4.0.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -92,9 +93,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    railties (6.0.3.5)
+      actionpack (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -102,56 +103,63 @@ GEM
     rake (13.0.1)
     rbnacl (5.0.0)
       ffi
+    regexp_parser (2.1.1)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.75.1)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.4)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.0)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.3.2)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.10.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
+      rubocop (>= 0.90.0, < 2.0)
     rubocop-rails_config (0.7.3)
       railties (>= 3.0)
       rubocop (~> 0.74)
       rubocop-performance (~> 1.3)
       rubocop-rails (~> 2.0)
-    ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    thor (1.0.1)
+    ruby-progressbar (1.11.0)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
     vcr (4.0.0)
     webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -4,11 +4,12 @@
 
 [![Build Status](https://travis-ci.org/moneytrackio/tezos_client.svg?branch=master)](https://travis-ci.org/moneytrackio/tezos_client)
 
-Tezos Client interracts with tezos nodes using RPC commands. 
+Tezos Client interacts with Tezos nodes using RPC commands. 
 
-## Requirements:
-Tezos client requires liquidity to be installed in order to work properly.
-For installing on linux, you can basically follow the steps coded in travis-script folder. 
+## Requirements
+
+Tezos client requires SmartPy to be installed in order to work properly.
+To install it on Linux, you can basically follow the steps coded in travis-script folder. 
 
 ## Dependency 
 
@@ -18,16 +19,12 @@ sudo apt-get install nodejs
 npm i -g michelson-to-micheline
 ```
 
-### liquidity
-[liquidity installation](http://www.liquidity-lang.org/doc/installation/index.html)
-
-need the tezos version (not Dune version)
-
 ### SmartPy
-[SmartPy](https://smartpy.io/)
+[SmartPy](https://smartpy.io/releases/20210317-bc925bb73dc885ac2b4dde9689e805d9b0bc6125/)
 
 ```bash
-sh <(curl -s https://SmartPy.io/SmartPyBasic/SmartPy.sh) local-install /
+sh <(curl -s https://smartpy.io/releases/20210317-bc925bb73dc885ac2b4dde9689e805d9b0bc6125/cli/install.sh)
+export PATH=$PATH:$HOME/smartpy-cli/
 ```
 
 ### TypeScript (for dev)
@@ -53,9 +50,10 @@ Or install it yourself as:
 
 ## Usage
 
-### Generate Tezos key paris
+### Generate Tezos key pairs
+
+Generate a perfectly random key pair:
 
-Generate a prefectly random key pair:
 ```ruby 
 client = TezosClient.new 
 key = subject.generate_key
@@ -68,6 +66,7 @@ key = subject.generate_key
 ```
 
 Generate a key pair from a seed and a BIP 44 Path:
+
 ```ruby
 key = subject.generate_key(wallet_seed:"000102030405060708090a0b0c0d0e0f", path: "m/44'/1729'/0'/0'/0'")
           expect(key[:address]).to eq "tz1RfnzRopJXH32SSDap2wMYGULBAnmHxdP1"
@@ -77,7 +76,8 @@ key = subject.generate_key(wallet_seed:"000102030405060708090a0b0c0d0e0f", path:
 #       :address=>"tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
 #    }
 ```
-Generate a key pair from a  BIP-39 mnemonic sentence and a BIP 44 Path:
+Generate a key pair from a BIP-39 mnemonic sentence and a BIP 44 Path:
+
 ```ruby
 key = subject.generate_key(
           mnemonic: "below dove cushion divide future artefact orange congress maple fiscal flower enable", 
@@ -117,28 +117,6 @@ client.transfer(
 )
 ```
 
-### Originate a contract written in liquidity
-
-```ruby
-script = File.expand_path("./spec/fixtures/demo.py")
-source = "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq"
-secret_key = "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN"
-amount =  0
-init_params= "MyContract()"
-client = TezosClient.new
-
-res = client.originate_contract(
-    from: source,
-    amount: amount,
-    script: script,
-    secret_key: secret_key,
-    init_params: init_params
-)
-
-puts "Origination operation: #{res[:operation_id]}"
-puts "Contract address: #{res[:originated_contract]}"
-```
-
 ### Originate a contract written in SmartPy
 
 ```ruby
@@ -146,7 +124,7 @@ script = File.expand_path("./spec/fixtures/demo.py")
 source = "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq"
 secret_key = "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN"
 amount =  0
-init_params = "MyContract(1, 1)"
+init_params= "MyContract()"
 client = TezosClient.new
 
 res = client.originate_contract(
@@ -162,6 +140,7 @@ puts "Contract address: #{res[:originated_contract]}"
 ```
 
 ### Call a contract written in SmartPy
+
 ```ruby
 TezosClient.new.call_contract(
   from: "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq",

data/lib/tezos_client.rb

@@ -4,6 +4,8 @@ require "pp"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/module/delegation"
+require "active_support/core_ext/time"
+require "active_support/core_ext/array"
 require "timeout"
 require "benchmark"
 require "open3"
@@ -80,7 +82,7 @@ class TezosClient
   #
   # @return [Hash] result of the origination containing :operation_id, :operation_result and :originated_contract
   #
-  def originate_contract(from:, amount:, secret_key: nil, script: nil, init_params: nil, dry_run: false, **args)
+  def originate_contract(from:, amount:, secret_key: nil, script: nil, init_params: [], dry_run: false, **args)
     origination_args = {
       rpc_interface: rpc_interface,
       from: from,
@@ -90,9 +92,9 @@ class TezosClient
     }
 
     origination_args[:script] = contract_interface(script).origination_script(
-      from: from,
       script: script,
-      init_params: init_params
+      init_params: init_params,
+      **args
     )
 
     operation = OriginationOperation.new(origination_args)
@@ -165,14 +167,19 @@ class TezosClient
   end
 
   def call_contract(dry_run: false, entrypoint:, params:, params_type:, **args)
+    _entrypoint = select_entrypoint(
+      contract_address: args[:to],
+      entrypoint: entrypoint
+    )
+
     json_params = micheline_params(
       params: params,
-      entrypoint: entrypoint,
+      entrypoint: _entrypoint,
       params_type: params_type
     )
 
     transfer_args = args.merge(
-      entrypoint: entrypoint,
+      entrypoint: _entrypoint,
       parameters: json_params,
       dry_run: dry_run
     )
@@ -180,6 +187,18 @@ class TezosClient
     transfer(transfer_args)
   end
 
+  def select_entrypoint(contract_address:, entrypoint:)
+    entrypoints = entrypoints(contract_address)["entrypoints"].keys
+
+    if entrypoints.count == 0
+      "default"
+    elsif entrypoints.include?(entrypoint)
+      entrypoint
+    else
+      raise ::ArgumentError, "entrypoint #{entrypoint} not found in #{entrypoints}"
+    end
+  end
+
   def inject_raw_operations(secret_key:, raw_operations:, dry_run: false, **args)
     public_key = secret_key_to_public_key(secret_key)
     from = public_key_to_address(public_key)

data/lib/tezos_client/commands.rb

@@ -26,6 +26,7 @@ class TezosClient
                    :block_operations,
                    :contract_storage_type,
                    :entrypoint,
-                   :entrypoints
+                   :entrypoints,
+                   :select_entrypoint
   end
 end

data/lib/tezos_client/crypto.rb

@@ -238,7 +238,7 @@ class TezosClient
       end
 
       def ignore_0x(payload)
-        payload.starts_with?("0x") ? payload[2..-1] : payload
+        payload.start_with?("0x") ? payload[2..-1] : payload
       end
   end
 end

data/lib/tezos_client/logger.rb

@@ -13,7 +13,7 @@ class TezosClient
       self.class.logger << out + "\n"
     end
 
-    FILTERED_KEYS = [:code, :contractCode]
+    FILTERED_KEYS = [:code, :contractCode, :contract_code]
     def tezos_contents_log_filter(content)
       if content.is_a? Array
         content.map { |el| tezos_contents_log_filter(el) }

data/lib/tezos_client/smartpy_interface.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
 require_relative "smartpy_inteface/smartpy_wrapper"
-require_relative "smartpy_inteface/micheline_serializer_wrapper"
 
 class TezosClient
   class SmartpyInterface
     include Logger
     include SmartpyWrapper
-    include MichelineSerializerWrapper
 
     attr_reader :options
 
     def json_scripts(args)
       compile_to_michelson(args) do |contract_script_filename, init_script_filename|
         micheline_contract = File.read(contract_script_filename)
-        micheline_storage = convert_michelson_to_micheline(File.read(init_script_filename))
+        micheline_storage = File.read(init_script_filename)
 
         [JSON.parse(micheline_storage), JSON.parse(micheline_contract)]
       end
@@ -34,12 +32,46 @@ class TezosClient
       Tools::TemporaryFile.with_file_copy(args[:script]) do |script_copy_path|
         script_basename = script_copy_path.split("/").last.sub(/.py$/, "")
         script_path = "/tmp/#{script_basename}/"
-        init_script_filename = "#{script_basename}_storage_init.tz"
-        contract_script_filename = "#{script_basename}_compiled.json"
-        call_smartpy ["compile", script_copy_path, args[:init_params], script_path]
+        init_script_filename = "step_000_cont_0_storage.json"
+        contract_script_filename = "step_000_cont_0_contract.json"
 
-        yield(script_path + contract_script_filename, script_path + init_script_filename)
+        cmd_line = ["compile", script_copy_path, script_path].concat(
+          optional_inputs(args[:smartpy_flags], args[:init_params])
+        )
+
+        call_smartpy cmd_line
+
+        yield(script_path + "default/" + contract_script_filename, script_path + "default/" + init_script_filename)
       end
     end
+
+    def optional_inputs(flags, init_params)
+      inputs = []
+
+      inputs.concat(optional_flags(flags))
+      inputs.concat(optional_args(init_params))
+
+      inputs
+    end
+
+    def optional_flags(flags)
+      (flags || {}).map do |key, value|
+        if value.is_a?(FalseClass) || value.is_a?(TrueClass)
+          "--#{key}"
+        else
+          ["--#{key}", value.to_s]
+        end
+      end.flatten
+    end
+
+    def optional_args(init_params = [])
+      return [] if init_params.count.zero?
+
+      ["--"].concat(
+        init_params.map do |init_param|
+          init_param.to_json
+        end
+      )
+    end
   end
 end

data/lib/tezos_client/tools/annots_to_type.rb

@@ -11,6 +11,17 @@ class TezosClient::Tools::AnnotsToType < ActiveInteraction::Base
 
   validate :validate_types
 
+  TYPES_MAPPING = {
+    int: :int,
+    nat: :int,
+    string: :string,
+    signature: :string,
+    bytes: :bytes,
+    timestamp: :int,
+    key: :string,
+    address: :string
+  }.freeze
+
   def execute
     return { "prim" => typed_annots.values.first } if typed_annots.size == 1
 
@@ -18,16 +29,28 @@ class TezosClient::Tools::AnnotsToType < ActiveInteraction::Base
   end
 
   private
+    def micheline_type(annot_type, annot)
+      if annot_type.to_s.start_with?("optional_")
+        {
+          "prim" => "option",
+          "args" => [{ "prim" => annot_type.to_s.delete_prefix("optional_") }],
+          "annots" => ["%#{annot}"]
+        }
+      else
+        {
+          "prim" => annot_type,
+          "annots" => ["%#{annot}"]
+        }
+      end
+    end
+
     def generate_type_args(annots)
       annot = annots.pop
       annot_type = typed_annots[annot]
 
       unless annots.size == 1
         return [
-          {
-            "prim" => annot_type,
-            "annots" => ["%#{annot}"]
-          },
+          micheline_type(annot_type, annot),
           {
             "prim" => "pair",
             "args" => generate_type_args(annots)
@@ -35,10 +58,10 @@ class TezosClient::Tools::AnnotsToType < ActiveInteraction::Base
         ]
       end
 
-      generated_args = [{ "prim" => annot_type, "annots" => ["%#{annot}"] }]
+      generated_args = [micheline_type(annot_type, annot)]
       annot = annots.pop
       annot_type = typed_annots[annot]
-      generated_args.append({ "prim" => annot_type, "annots" => ["%#{annot}"] })
+      generated_args.append(micheline_type(annot_type, annot))
 
       generated_args
     end
@@ -48,8 +71,8 @@ class TezosClient::Tools::AnnotsToType < ActiveInteraction::Base
     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 }
+      allowed_types = TYPES_MAPPING.keys
+      return if typed_annots.values.map{|type| type.to_s.delete_prefix("optional_").to_sym}.all? { |type| allowed_types.include? type }
 
       errors.add(:base, "The allowed types are: #{allowed_types.join(', ')}")
     end

data/lib/tezos_client/tools/convert_to_hash.rb

@@ -7,8 +7,8 @@ Dir[File.join(__dir__, "convert_to_hash", "*.rb")].each { |file| require file }
 class TezosClient
   module Tools
     class ConvertToHash < ActiveInteraction::Base
-      interface :data
-      interface :type
+      interface :data, methods: []
+      interface :type, methods: []
 
       def execute
         TezosClient::Tools::ConvertToHash::Base.new(data: data, type: type).value

data/lib/tezos_client/tools/convert_to_hash/base.rb

@@ -42,7 +42,7 @@ class TezosClient
 
         private
           def klass
-            "TezosClient::Tools::ConvertToHash::#{type[:prim].camelize}".constantize
+            "#{self.class.name.deconstantize}::#{type[:prim].camelize}".constantize
           end
       end
     end

data/lib/tezos_client/tools/convert_to_hash/timestamp.rb

@@ -8,6 +8,8 @@ class TezosClient
           if data.key? :int
             Time.zone.at(data[:int].to_i)
           elsif data.key? :string
+            return Time.zone.at(data[:string].to_i) if data[:string].match?(/\A\d+\z/)
+
             Time.zone.parse(data[:string])
           else
             raise "Can not convert timestamp: #{data}"

data/lib/tezos_client/tools/hash_to_micheline.rb

@@ -1,18 +1,11 @@
 # 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
+require_relative "hash_to_micheline/base"
+
+Dir[File.join(__dir__, "hash_to_micheline", "*.rb")].each { |file| require file }
+
 
+class TezosClient::Tools::HashToMicheline < ActiveInteraction::Base
   string :contract_address, default: nil
   string :entrypoint, default: nil
   # example of params:
@@ -20,81 +13,32 @@ class TezosClient::Tools::HashToMicheline < ActiveInteraction::Base
   #   spending_ref: "toto",
   #   expires_at: Time.now
   # }
-  hash :params, strip: false
+  interface :params, methods: []
   hash :storage_type, strip: false, default: {}
-  interface :blockchain_client, methods: %i[entrypoint entrypoints], default: -> { TezosClient.new }
+  interface :blockchain_client, methods: %i[entrypoint entrypoints select_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]) }
+    TezosClient::Tools::HashToMicheline::Base.new(data: _params, type: _storage_type).value
   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 '%'
-
-        if h[:prim] == "option"
-          value = params.fetch(annot)
-          if value
-            acc << {
-              "prim": "Some",
-              "args": [
-                hash_type_to_hash_data(h[:args][0][:prim], params.fetch(annot))
-              ]
-            }
-          else
-            acc << {
-              "prim": "None"
-            }
-          end
-        else
-          acc << hash_type_to_hash_data(h[:prim], params.fetch(annot))
-        end
-      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
+    def _params
+      if params.respond_to?(:keys) && params.keys.size == 1 && !_storage_type.key?(:annots)
+        params.values.first
+      else
+        params
       end
-
-      { type => converted_value }
     end
 
     def _entrypoint
-      @_entrypoint ||= select_entrypoint
-    end
-
-    def select_entrypoint
-      entrypoints = blockchain_client.entrypoints(contract_address)["entrypoints"].keys
-      if entrypoints.count == 0
-        "default"
-      elsif entrypoints.include?(entrypoint)
-        entrypoint
-      else
-        errors.add(:entrypoint, :not_found)
-      end
+      @_entrypoint ||= blockchain_client.select_entrypoint(
+        contract_address: contract_address,
+        entrypoint: entrypoint
+      )
     end
 
     def _storage_type

data/lib/tezos_client/tools/hash_to_micheline/address.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Address < Base
+        def encode
+          raise "#{data} #{data.class} Not a 'String' type" unless data.is_a? ::String
+          { string: data }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/base.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Base
+        def initialize(data:, type:)
+          @data = data
+          @type = type
+        end
+
+        attr_accessor :data, :type
+
+        def value
+          @data = anonymous? ? @data : @data.fetch(var_name)
+          encode
+        end
+
+        protected
+          def encode
+            klass.new(
+              data: data,
+              type: type
+            ).encode
+
+          rescue NameError
+            raise
+            raise NotImplementedError, "type '#{type[:prim]}' not implemented"
+          end
+
+          def anonymous?
+            !(type.key?(:annots) && type[:annots].any?)
+          end
+
+          def var_name_annot
+            type[:annots].first
+          end
+
+          def var_name
+            return nil if anonymous?
+
+            "#{var_name_annot[1..-1]}".to_sym
+          end
+
+        private
+          def klass
+            "#{self.class.name.deconstantize}::#{type[:prim].to_s.camelize}".constantize
+          end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/bytes.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Bytes < Base
+        def encode
+          raise "#{data} #{data.class} Not a 'String' type" unless data.is_a? ::String
+          { bytes: data }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/contract.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Contract < Base
+        def encode
+          raise "#{data} #{data.class} Not a 'String' type" unless data.is_a? ::String
+          { string: data }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/int.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Int < Base
+        def encode
+          { int: data.to_s }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/key.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Key < Base
+        def encode
+          raise "#{data} #{data.class} Not a 'String' type" unless data.is_a? ::String
+          { string: data }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/nat.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Nat < Base
+        def encode
+          { int: data.to_s }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/option.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Option < Base
+        def encode
+          return { prim: "None" } if data.nil?
+
+          {
+            prim: "Some",
+            args: [
+              TezosClient::Tools::HashToMicheline::Base.new(
+                data: data,
+                type: type[:args][0]
+              ).value
+            ]
+          }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/pair.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Pair < Base
+        def encode
+          {
+            prim: "Pair",
+            args: [
+              TezosClient::Tools::HashToMicheline::Base.new(
+                data: data_0,
+                type: type[:args][0]
+              ).value,
+              TezosClient::Tools::HashToMicheline::Base.new(
+                data: data_1,
+                type: type[:args][1]
+              ).value
+            ]
+          }
+        end
+
+        def data_0
+          if data.is_a? ::Array
+            data[0]
+          else
+            data
+          end
+        end
+
+        def data_1
+          if data.is_a? ::Array
+            if data.size > 2
+              data.drop(1)
+            else
+              data[1]
+            end
+          else
+            data
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/signature.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Signature < Base
+        def encode
+          raise "#{data} does not seem to be a signature" unless data.start_with?("edsig")
+          { string: data }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/string.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class String < Base
+        def encode
+          raise "#{data} #{data.class} Not a 'String' type" unless data.is_a? ::String
+          { string: data }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/hash_to_micheline/timestamp.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class HashToMicheline < ActiveInteraction::Base
+      class Timestamp < Base
+        def encode
+          raise "timestamp input (#{data}) must be an instance of Time" unless data.is_a? Time
+          { int: data.to_i.to_s }
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/version.rb

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

data/tezos_client.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr", "~> 4.0.0"
   spec.add_development_dependency "pry"
 
-  spec.add_dependency "active_interaction", "~> 3.7"
+  spec.add_dependency "active_interaction", ">= 3.8"
   spec.add_dependency "base58", "~> 0.2.3"
   spec.add_dependency "httparty", "~> 0.17.0"
   spec.add_dependency "rbnacl", "~> 5.0.0"

data/travis-scripts/prepare-ubuntu.sh

@@ -11,4 +11,9 @@ sudo add-apt-repository "deb http://fr.archive.ubuntu.com/ubuntu bionic main uni
 sudo apt-get update -qq
 sudo apt-get install -y -qq \
      libsecp256k1-dev libsecp256k1-0 libsodium-dev libssl-dev \
-     bubblewrap libev-dev libhidapi-dev npm
+     bubblewrap libev-dev libhidapi-dev
+
+wget -qO- https://deb.nodesource.com/setup_14.x | sudo -E bash -
+sudo apt install -y nodejs
+node --version
+npm --version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Pierre Michard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,16 +112,16 @@ dependencies:
   name: active_interaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: base58
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,6 @@ files:
 - lib/tezos_client/rpc_interface/monitor.rb
 - lib/tezos_client/rpc_interface/operations.rb
 - lib/tezos_client/rpc_interface/request_manager.rb
-- lib/tezos_client/smartpy_inteface/micheline_serializer_wrapper.rb
 - lib/tezos_client/smartpy_inteface/smartpy_wrapper.rb
 - lib/tezos_client/smartpy_interface.rb
 - lib/tezos_client/string_utils.rb
@@ -292,6 +291,18 @@ files:
 - 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/hash_to_micheline/address.rb
+- lib/tezos_client/tools/hash_to_micheline/base.rb
+- lib/tezos_client/tools/hash_to_micheline/bytes.rb
+- lib/tezos_client/tools/hash_to_micheline/contract.rb
+- lib/tezos_client/tools/hash_to_micheline/int.rb
+- lib/tezos_client/tools/hash_to_micheline/key.rb
+- lib/tezos_client/tools/hash_to_micheline/nat.rb
+- lib/tezos_client/tools/hash_to_micheline/option.rb
+- lib/tezos_client/tools/hash_to_micheline/pair.rb
+- lib/tezos_client/tools/hash_to_micheline/signature.rb
+- lib/tezos_client/tools/hash_to_micheline/string.rb
+- lib/tezos_client/tools/hash_to_micheline/timestamp.rb
 - lib/tezos_client/tools/system_call.rb
 - lib/tezos_client/tools/temporary_file.rb
 - lib/tezos_client/version.rb
@@ -317,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Wrapper to the tezos client.

data/lib/tezos_client/smartpy_inteface/micheline_serializer_wrapper.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class TezosClient
-  class SmartpyInterface
-    module MichelineSerializerWrapper
-      def convert_michelson_to_micheline(script)
-        cmd = ["michelson-to-micheline", script]
-
-        Tools::SystemCall.execute(cmd)
-      end
-
-      def actual_project_path
-        TezosClient.root_path
-      end
-    end
-  end
-end