tezos_client 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1edfdfe5f7332ebbe4ecafd4baa3f03998e02204e33f854d9f394ba84cbf98c3
-  data.tar.gz: 7544eba6b1a6d602b24025a5c2831c1e803f53f92ae5f0925daa05a0b2ef3167
+  metadata.gz: a4b97cc7f2f7ce85618cf8e16ae7b921f7e4221b1e27a1ea52c415c309076cf1
+  data.tar.gz: 6ddca2df0566dc441cc0a3389f5a0f86d9015766118d775c27166b2bab2d247e
 SHA512:
-  metadata.gz: 4a4e3ddacd06478d21821ce1e38ac5d731f2602d6cbca55e2440828de46c5933aaa8b77df00d3d989295ee325318ff53284725dc91d165ed32918cd2b3de9d8a
-  data.tar.gz: 980264f44b9761e4f7e716675a5775d1b2f3cbfd6de5d09024154c53000a1a95cc3c168efe259c1fd7b78d9a877d23a6c0fa4feea8a8bda942b753122cf73bc7
+  metadata.gz: ba5a9ae1ab33a17abe2c263a687e03278ededd753d2baaadd999ea6350d15bc2de9ccd990aee1ca6db14acd794ec45174229b517997774d5442ad34a0526260d
+  data.tar.gz: 8044d64bb09b9f0c616413a1ed308ebec7e6c9af39700fcae6c134fab3ad6c785f86faf89863ee1e0cf857488ed040d8b7e56c2901cfdc9042335697798762b0

data/.travis.yml

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (1.2.3)
+    tezos_client (1.3.0)
       active_interaction (~> 3.7)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)
@@ -14,24 +14,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionpack (6.0.3.3)
+      actionview (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       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.2)
-      activesupport (= 6.0.3.2)
+    actionview (6.0.3.3)
+      activesupport (= 6.0.3.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (3.8.2)
+    active_interaction (3.8.3)
       activemodel (>= 4, < 7)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    activemodel (6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -44,7 +44,7 @@ GEM
     bip_mnemonic (0.0.4)
     builder (3.2.4)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
@@ -59,10 +59,10 @@ GEM
     httparty (0.17.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.3)
-    loofah (2.6.0)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
@@ -70,12 +70,12 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     money-tree (0.10.0)
       ffi
     multi_xml (0.6.0)
     netrc (0.11.0)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     parallel (1.18.0)
     parser (2.6.5.0)
@@ -92,9 +92,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    railties (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -151,7 +151,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/lib/tezos_client/commands.rb

@@ -25,6 +25,7 @@ class TezosClient
                    :contract_big_maps,
                    :block_operations,
                    :contract_storage_type,
-                   :entrypoint
+                   :entrypoint,
+                   :entrypoints
   end
 end

data/lib/tezos_client/operation_mgr.rb

@@ -202,40 +202,39 @@ class TezosClient
     end
 
     private
+      def ensure_applied!(rpc_responses)
+        metadatas = rpc_responses.map { |response| response[:metadata] }
+        operation_results = metadatas.map { |metadata| metadata[:operation_result] }
+        internal_operations = metadatas.map { |metadata| metadata[:internal_operation_results] }.flatten.compact
+        operation_results.concat(internal_operations.map { |internal_operation| internal_operation[:result] })
+
+        failed = operation_results.detect do |operation_result|
+          operation_result != nil && operation_result[:status] != "applied"
+        end
 
-    def ensure_applied!(rpc_responses)
-      metadatas = rpc_responses.map { |response| response[:metadata] }
-      operation_results = metadatas.map { |metadata| metadata[:operation_result] }
-      internal_operations = metadatas.map { |metadata| metadata[:internal_operation_results] }.flatten.compact
-      operation_results.concat(internal_operations.map { |internal_operation| internal_operation[:result] })
-
-      failed = operation_results.detect do |operation_result|
-        operation_result != nil && operation_result[:status] != "applied"
-      end
+        return metadatas if failed.nil?
 
-      return metadatas if failed.nil?
+        failed_operation_result = operation_results.detect do |operation_result|
+          operation_result[:status] == "failed"
+        end
 
-      failed_operation_result = operation_results.detect do |operation_result|
-        operation_result[:status] == "failed"
+        failed!("failed", failed_operation_result[:errors], operation_results)
       end
 
-      failed!("failed", failed_operation_result[:errors], operation_results)
-    end
-
-    def exception_klass(errors)
-      error = errors[0]
-      case error[:id]
-      when TezBalanceTooLow::FIRST_ERROR_REGEXP
-        TezBalanceTooLow
-      when ScriptRuntimeError::FIRST_ERROR_REGEXP
-        ScriptRuntimeError
-      else
-        OperationFailure
+      def exception_klass(errors)
+        error = errors[0]
+        case error[:id]
+        when TezBalanceTooLow::FIRST_ERROR_REGEXP
+          TezBalanceTooLow
+        when ScriptRuntimeError::FIRST_ERROR_REGEXP
+          ScriptRuntimeError
+        else
+          OperationFailure
+        end
       end
-    end
 
-    def failed!(status, errors, metadata)
-      raise exception_klass(errors).new(metadata: metadata, errors: errors, status: status)
-    end
+      def failed!(status, errors, metadata)
+        raise exception_klass(errors).new(metadata: metadata, errors: errors, status: status)
+      end
   end
-end
+end

data/lib/tezos_client/rpc_interface/contracts.rb

@@ -37,6 +37,10 @@ class TezosClient
         get "#{contract_link(contract_id)}/storage"
       end
 
+      def entrypoints(contract_id)
+        get("#{contract_link(contract_id)}/entrypoints")
+      end
+
       def entrypoint(contract_id, entrypoint)
         get("#{contract_link(contract_id)}/entrypoints/#{entrypoint}")
       end

data/lib/tezos_client/smartpy_interface.rb

@@ -30,16 +30,16 @@ class TezosClient
     end
 
     private
-      def compile_to_michelson(args)
-        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 = "contractStorage.tz"
-          contract_script_filename = "contractCode.tz.json"
-          call_smartpy ["local-compile", script_copy_path, args[:init_params], script_path]
-
-          yield(script_path + contract_script_filename, script_path + init_script_filename)
-        end
+    def compile_to_michelson(args)
+      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]
+
+        yield(script_path + contract_script_filename, script_path + init_script_filename)
       end
+    end
   end
 end

data/lib/tezos_client/tools/annots_to_type.rb

@@ -23,20 +23,28 @@ class TezosClient::Tools::AnnotsToType < ActiveInteraction::Base
       annot_type = typed_annots[annot]
 
       unless annots.size == 1
-        return [{ "prim" => "pair", "args" => generate_type_args(annots) },
-                { "prim" => annot_type, "annots" => ["%#{annot}"] }]
+        return [
+          {
+            "prim" => annot_type,
+            "annots" => ["%#{annot}"]
+          },
+          {
+            "prim" => "pair",
+            "args" => generate_type_args(annots)
+          }
+        ]
       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.append({ "prim" => annot_type, "annots" => ["%#{annot}"] })
 
       generated_args
     end
 
     def ordered_annots
-      @ordered_annots ||= typed_annots.keys.sort
+      @ordered_annots ||= typed_annots.keys.sort.reverse
     end
 
     def validate_types

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

@@ -22,7 +22,7 @@ class TezosClient
               type: type
             ).decode
 
-          rescue NameError => e
+          rescue NameError
             raise NotImplementedError, "type '#{type[:prim]}' not implemented"
           end
 

data/lib/tezos_client/tools/hash_to_micheline.rb

@@ -22,7 +22,7 @@ class TezosClient::Tools::HashToMicheline < ActiveInteraction::Base
   # }
   hash :params, strip: false
   hash :storage_type, strip: false, default: {}
-  interface :blockchain_client, methods: [:entrypoint], default: -> { TezosClient.new }
+  interface :blockchain_client, methods: %i[entrypoint entrypoints], 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)
@@ -40,7 +40,24 @@ class TezosClient::Tools::HashToMicheline < ActiveInteraction::Base
         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))
+
+        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
 
@@ -65,12 +82,27 @@ class TezosClient::Tools::HashToMicheline < ActiveInteraction::Base
       { 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
+    end
+
     def _storage_type
-      (storage_type.presence || blockchain_client.entrypoint(contract_address, entrypoint)).deep_symbolize_keys
+      (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?)
+      return if storage_type.present? ^ (contract_address.present?)
 
       errors.add(:base,
                  "You should provide the contract_address and the entrypoint only if storage_type is not provided")

data/lib/tezos_client/tools/system_call.rb

@@ -5,10 +5,10 @@ class TezosClient
     module SystemCall
       def self.execute(cmd)
         Open3.popen3(*cmd) do |_stdin, stdout, stderr, wait_thr|
-          err = stderr.read
           status = wait_thr.value.exitstatus
 
           if status != 0
+            err  = stdout.read + stderr.read
             raise ::TezosClient::SysCallError, "command '#{cmd}' existed with status #{status}: #{err}"
           end
 

data/lib/tezos_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Pierre Michard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -316,7 +316,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project:
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: Wrapper to the tezos client.