tezos_client 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c8d4619d5d7e8e2284ffeaabf6246eaf8d820f9bd6254531fab3e8d91ccaa34
-  data.tar.gz: 7e1af738f349993d04fb2927f74997c97b450ec237be00da00beba3493537318
+  metadata.gz: fd58876a037528bff5019e089ead07ea6eaa2f4e68ec029f33c73735d4710370
+  data.tar.gz: 588d6eb55a1a226cb824968033f181296572886cf08aae029d6227e824350db2
 SHA512:
-  metadata.gz: 12cb96c43a471b6b95bbff5bd08ffa881625665c8a8b3f1cf863f3e689e56943fcab60da963800a5f1d41c1e7d232a1082123b87dc617369eba6660b54982385
-  data.tar.gz: a6aac981053e825b65802caca8855113068f9a8e9a9cfdcc4fcd57c594083c9b6b65563ea61874ae145f6e9ee528b78edefc1c1ecee8161c5135fab7d196b8fd
+  metadata.gz: d6bdd249d4606aac1c18aad5acead48d4a2296816942e42b1cbe77ae4e5202efd4ce73fcaa088e17db500d7874988ae7452bc70d6dd1ee48485af0674f7362fb
+  data.tar.gz: 88bb21809370468db816e00267ad93b6a727c90dbea8afe6a7f2aa67881acf120beb085287d8964e1217b605b9a1c05fbb0d7740ce65dd086e96d11e0b792621

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (1.4.1)
+    tezos_client (1.4.2)
       active_interaction (>= 3.8)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)
@@ -14,154 +14,158 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.7)
-      actionview (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionpack (6.0.4.4)
+      actionview (= 6.0.4.4)
+      activesupport (= 6.0.4.4)
       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.7)
-      activesupport (= 6.0.3.7)
+    actionview (6.0.4.4)
+      activesupport (= 6.0.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (4.0.1)
-      activemodel (>= 5, < 7)
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activesupport (6.0.3.7)
+    active_interaction (4.1.0)
+      activemodel (>= 5, < 8)
+      activesupport (>= 5, < 8)
+    activemodel (6.0.4.4)
+      activesupport (= 6.0.4.4)
+    activesupport (6.0.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     base58 (0.2.3)
     bip_mnemonic (0.0.4)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.10.0)
-    ffi (1.15.1)
+    ffi (1.15.5)
     hashdiff (1.0.1)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     httparty (0.17.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.10)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.1)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.4)
+    mime-types-data (3.2022.0105)
+    minitest (5.15.0)
     money-tree (0.10.0)
       ffi
     multi_xml (0.6.0)
     netrc (0.11.0)
-    nokogiri (1.11.6-x86_64-darwin)
+    nokogiri (1.13.1-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    railties (6.0.4.4)
+      actionpack (= 6.0.4.4)
+      activesupport (= 6.0.4.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
+    rainbow (3.1.1)
+    rake (13.0.6)
     rbnacl (5.0.0)
       ffi
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.15.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.6.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
+    rubocop-minitest (0.17.1)
+      rubocop (>= 0.90, < 2.0)
     rubocop-packaging (0.5.1)
       rubocop (>= 0.89, < 2.0)
-    rubocop-performance (1.11.3)
+    rubocop-performance (1.13.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.10.1)
+    rubocop-rails (2.13.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
-    rubocop-rails_config (1.5.3)
+    rubocop-rails_config (1.8.2)
       railties (>= 5.0)
-      rubocop (>= 1.13)
+      rubocop (>= 1.19)
       rubocop-ast (>= 1.0.1)
+      rubocop-minitest (~> 0.15)
       rubocop-packaging (~> 0.5)
       rubocop-performance (~> 1.11)
       rubocop-rails (~> 2.0)
     ruby-progressbar (1.11.0)
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (2.0.0)
+    unf_ext (0.0.8)
+    unicode-display_width (2.1.0)
     vcr (4.0.0)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   x86_64-darwin-19

data/README.md

@@ -59,9 +59,9 @@ client = TezosClient.new
 key = subject.generate_key
           expect(key[:address]).to eq "tz1RfnzRopJXH32SSDap2wMYGULBAnmHxdP1"
 # => {
-#       :secret_key=>"edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2", 
-#       :public_key=>"edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr", 
-#       :address=>"tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
+#       secret_key: "edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2", 
+#       public_key: "edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr", 
+#       address: "tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
 #    }
 ```
 
@@ -71,9 +71,9 @@ Generate a key pair from a seed and a BIP 44 Path:
 key = subject.generate_key(wallet_seed:"000102030405060708090a0b0c0d0e0f", path: "m/44'/1729'/0'/0'/0'")
           expect(key[:address]).to eq "tz1RfnzRopJXH32SSDap2wMYGULBAnmHxdP1"
 # => {
-#       :secret_key=>"edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2", 
-#       :public_key=>"edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr", 
-#       :address=>"tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
+#       secret_key: "edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2", 
+#       public_key: "edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr", 
+#       address: "tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
 #    }
 ```
 Generate a key pair from a BIP-39 mnemonic sentence and a BIP 44 Path:
@@ -84,9 +84,9 @@ key = subject.generate_key(
           path: "m/44'/1729'/0'/0'/0'")
           expect(key[:address]).to eq "tz1RfnzRopJXH32SSDap2wMYGULBAnmHxdP1"
 # => {
-#       :secret_key=>"edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2", 
-#       :public_key=>"edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr", 
-#       :address=>"tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
+#       secret_key: "edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2", 
+#       public_key: "edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr", 
+#       address: "tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
 #    }
 ```
 

data/lib/tezos_client/compute_operation_args_counters.rb

@@ -31,8 +31,8 @@ class TezosClient
       def group_by_max_counter(arr)
         arr.map(&:with_indifferent_access)
            .group_by { |hsh| hsh[:source] }
-           .each_with_object({}) do |(source, contents), acc|
-          acc[source] = contents.max_by { |content| content[:counter].to_i }[:counter]
+           .transform_values do |contents|
+          contents.max_by { |content| content[:counter].to_i }[:counter]
         end
       end
   end

data/lib/tezos_client/exceptions.rb

@@ -103,7 +103,7 @@ class TezosClient
       rejection_error = errors.detect { |error| error[:id].match? ERROR_REGEXP }
 
       @location = rejection_error[:location]
-      @contract =  first_error[:contractHandle]
+      @contract = first_error[:contractHandle]
       @with = rejection_error[:with]
       @message = "Script runtime Error when executing #{contract}: #{with} (location: #{location})"
       super

data/lib/tezos_client/operations/transaction_operation.rb

@@ -5,11 +5,9 @@ class TezosClient
     include EncodeUtils
 
     def rpc_operation_args
-      @rpc_operation_args ||= begin
-        rpc_interface.transaction_operation(
+      @rpc_operation_args ||= rpc_interface.transaction_operation(
           operation_args
         )
-      end
     end
 
     private

data/lib/tezos_client/operations/transactions_operation.rb

@@ -3,14 +3,12 @@
 class TezosClient
   class TransactionsOperation < Operation
     def rpc_operation_args
-      @rpc_operation_args ||= begin
-        OperationArray.new(
+      @rpc_operation_args ||= OperationArray.new(
           operations: operations,
           secret_key: @args.fetch(:secret_key),
           from: @args.fetch(:from),
           rpc_interface: rpc_interface
         ).rpc_operation_args
-      end
     end
 
     def operations

data/lib/tezos_client/smartpy_interface.rb

@@ -28,50 +28,50 @@ 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 = "step_000_cont_0_storage.json"
-        contract_script_filename = "step_000_cont_0_contract.json"
-
-        cmd_line = ["compile", script_copy_path, script_path].concat(
-          optional_inputs(args[:smartpy_flags], args[:init_params])
-        )
+      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 = "step_000_cont_0_storage.json"
+          contract_script_filename = "step_000_cont_0_contract.json"
+
+          cmd_line = ["compile", script_copy_path, script_path].concat(
+            optional_inputs(args[:smartpy_flags], args[:init_params])
+          )
 
-        call_smartpy cmd_line
+          call_smartpy cmd_line
 
-        yield(script_path + "default/" + contract_script_filename, script_path + "default/" + init_script_filename)
+          yield(script_path + "default/" + contract_script_filename, script_path + "default/" + init_script_filename)
+        end
       end
-    end
 
-    def optional_inputs(flags, init_params)
-      inputs = []
+      def optional_inputs(flags, init_params)
+        inputs = []
 
-      inputs.concat(optional_flags(flags))
-      inputs.concat(optional_args(init_params))
+        inputs.concat(optional_flags(flags))
+        inputs.concat(optional_args(init_params))
 
-      inputs
-    end
+        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_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?
+      def optional_args(init_params = [])
+        return [] if init_params.count.zero?
 
-      ["--"].concat(
-        init_params.map do |init_param|
-          init_param.to_json
-        end
-      )
-    end
+        ["--"].concat(
+          init_params.map do |init_param|
+            init_param.to_json
+          end
+        )
+      end
   end
 end

data/lib/tezos_client/tools/annots_to_type.rb

@@ -72,7 +72,7 @@ class TezosClient::Tools::AnnotsToType < ActiveInteraction::Base
 
     def validate_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 }
+      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/key_hash.rb

@@ -11,4 +11,3 @@ class TezosClient
     end
   end
 end
-

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

@@ -6,7 +6,7 @@ class TezosClient
       class Option < Base
         def decode
           if data[:prim] == "None"
-            return nil
+            nil
           elsif data[:prim] == "Some"
             TezosClient::Tools::ConvertToHash::Base.new(
               data: data[:args][0],

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

@@ -11,4 +11,3 @@ class TezosClient
     end
   end
 end
-

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

@@ -22,9 +22,7 @@ class TezosClient
               data: data,
               type: type
             ).encode
-
           rescue NameError
-            raise
             raise NotImplementedError, "type '#{type[:prim]}' not implemented"
           end
 

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

@@ -7,38 +7,37 @@ class TezosClient
         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
-            ]
+            args: args
           }
         end
 
-        def data_0
-          if data.is_a? ::Array
-            data[0]
-          else
-            data
+        private
+          def args
+            type[:args].each_with_index.map do |type, index|
+              TezosClient::Tools::HashToMicheline::Base.new(
+                data: data_n(index),
+                type: type
+              ).value
+            end
+          end
+
+          def args_count
+            type[:args].size
           end
-        end
 
-        def data_1
-          if data.is_a? ::Array
-            if data.size > 2
-              data.drop(1)
+          def data_n(n)
+            if data.is_a? ::Array
+              is_last_arg = n == (args_count - 1)
+              # Handle the case when last arg is i Pair, which arguments are the last elements of the data
+              if is_last_arg && data.size > args_count
+                data.drop(args_count - 1)
+              else
+                data[n]
+              end
             else
-              data[1]
+              data
             end
-          else
-            data
           end
-        end
       end
     end
   end

data/lib/tezos_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Pierre Michard
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -334,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Wrapper to the tezos client.