tezos_client 1.3.4 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5257dbe976b3fba269aa9e6d4a966d2fbc7e4deaac30d5efc76a8a5699529623
-  data.tar.gz: 4b55b56b163c326a644fbaf62eda1e3e63b70f77e68af76ce0030f71a740c315
+  metadata.gz: 1c8d4619d5d7e8e2284ffeaabf6246eaf8d820f9bd6254531fab3e8d91ccaa34
+  data.tar.gz: 7e1af738f349993d04fb2927f74997c97b450ec237be00da00beba3493537318
 SHA512:
-  metadata.gz: ae3837fedb178aaf48381cb110379c184097e32cfc547122c68dcf725c3b795c12bba2e172187f68da8096024abaa3e556e46804e5b31d9649920f65672038b8
-  data.tar.gz: 04fa056b5ae0c34c4f01f4c481999a389e2246df3f6dc698327964ced7250d353e87f1533d1deb04548b578c78cda91256eb6136eb778ed85082617991bb6ccd
+  metadata.gz: 12cb96c43a471b6b95bbff5bd08ffa881625665c8a8b3f1cf863f3e689e56943fcab60da963800a5f1d41c1e7d232a1082123b87dc617369eba6660b54982385
+  data.tar.gz: a6aac981053e825b65802caca8855113068f9a8e9a9cfdcc4fcd57c594083c9b6b65563ea61874ae145f6e9ee528b78edefc1c1ecee8161c5135fab7d196b8fd

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    tezos_client (1.3.4)
-      active_interaction (> 3.8)
+    tezos_client (1.4.1)
+      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.5)
-      actionview (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actionpack (6.0.3.7)
+      actionview (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
       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.5)
-      activesupport (= 6.0.3.5)
+    actionview (6.0.3.7)
+      activesupport (= 6.0.3.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (4.0.0)
+    active_interaction (4.0.1)
       activemodel (>= 5, < 7)
-    activemodel (6.0.3.5)
-      activesupport (= 6.0.3.5)
-    activesupport (6.0.3.5)
+    activemodel (6.0.3.7)
+      activesupport (= 6.0.3.7)
+    activesupport (6.0.3.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -52,37 +52,35 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.10.0)
-    ffi (1.14.2)
+    ffi (1.15.1)
     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.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     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.11.1)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.11.6-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.5.2)
     rack (2.2.3)
@@ -93,14 +91,14 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    railties (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rbnacl (5.0.0)
       ffi
     regexp_parser (2.1.1)
@@ -108,42 +106,46 @@ GEM
       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.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.4)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    rubocop (0.93.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.15.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      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)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.6.0)
+      parser (>= 3.0.1.1)
+    rubocop-packaging (0.5.1)
+      rubocop (>= 0.89, < 2.0)
+    rubocop-performance (1.11.3)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.10.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rails_config (0.7.3)
-      railties (>= 3.0)
-      rubocop (~> 0.74)
-      rubocop-performance (~> 1.3)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rails_config (1.5.3)
+      railties (>= 5.0)
+      rubocop (>= 1.13)
+      rubocop-ast (>= 1.0.1)
+      rubocop-packaging (~> 0.5)
+      rubocop-performance (~> 1.11)
       rubocop-rails (~> 2.0)
     ruby-progressbar (1.11.0)
     thor (1.1.0)
@@ -153,19 +155,19 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     vcr (4.0.0)
-    webmock (3.7.6)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1)
   pry
   rake (~> 13.0)
   rspec (~> 3.0)
@@ -175,4 +177,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.17.3
+   2.2.18

data/README.md

@@ -20,10 +20,10 @@ npm i -g michelson-to-micheline
 ```
 
 ### SmartPy
-[SmartPy](https://smartpy.io/)
+[SmartPy](https://smartpy.io/releases/20210317-bc925bb73dc885ac2b4dde9689e805d9b0bc6125/)
 
 ```bash
-sh <(curl -s https://smartpy.io/dev-20200924-23b26494361d96abf034bdbb1ad1af396f95fd61/cli/SmartPy.sh) local-install-auto
+sh <(curl -s https://smartpy.io/releases/20210317-bc925bb73dc885ac2b4dde9689e805d9b0bc6125/cli/install.sh)
 export PATH=$PATH:$HOME/smartpy-cli/
 ```
 

data/lib/tezos_client.rb

@@ -82,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,
@@ -92,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)

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/convert_to_hash/big_map.rb

@@ -7,12 +7,19 @@ class TezosClient
     class ConvertToHash < ActiveInteraction::Base
       class BigMap < Base
         def decode
-          ::TezosClient::BigMap.new(
-            var_name,
-            data[:int],
-            type[:args].second,
-            type[:args].first
-          )
+          if data.is_a? Hash
+            ::TezosClient::BigMap.new(
+              var_name,
+              data[:int],
+              type[:args].second,
+              type[:args].first
+            )
+          else
+            TezosClient::Tools::ConvertToHash::Map.new(
+              data: data,
+              type: type
+            ).value[var_name]
+          end
         end
       end
     end

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

@@ -7,20 +7,20 @@ class TezosClient
         include TezosClient::Crypto
 
         def decode
-          if data.key?(:bytes)
-            if data[:bytes].start_with?("00")
-              encode_tz(:edpk, data[:bytes][2..-1])
-            elsif data[:bytes].start_with?("01")
-              encode_tz(:sppk, data[:bytes][2..-1])
-            elsif data[:bytes].start_with?("02")
-              encode_tz(:p2pk, data[:bytes][2..-1])
-            else
-              data[:bytes]
-            end
+          if tmp_data.start_with?("00")
+            encode_tz(:edpk, tmp_data[2..-1])
+          elsif tmp_data.start_with?("01")
+            encode_tz(:sppk, tmp_data[2..-1])
+          elsif tmp_data.start_with?("02")
+            encode_tz(:p2pk, tmp_data[2..-1])
           else
-            data[:string]
+            tmp_data
           end
         end
+
+        def tmp_data
+          @tmp_data ||= data[:bytes] || data[:string]
+        end
       end
     end
   end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class KeyHash < Base
+        def decode
+          Address.new(data: data, type: type).decode
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class Set < Base
+        def decode
+          List.new(data: data, type: type).decode.to_set
+        end
+      end
+    end
+  end
+end
+

data/lib/tezos_client/version.rb

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

data/tezos_client.gemspec

@@ -7,12 +7,12 @@ require "tezos_client/version"
 Gem::Specification.new do |spec|
   spec.name          = "tezos_client"
   spec.version       = TezosClient::VERSION
-  spec.authors       = ["Pierre Michard"]
-  spec.email         = ["pierre@moneytrack.io"]
+  spec.authors       = ["Pierre Michard", "Sébastien Lauret", "Othmane El Kesri"]
+  spec.email         = ["pierre@moneytrack.io", "sebastien@moneytrack.io", "othmane@moneytrack.io"]
 
   spec.summary       = "Wrapper to the tezos client."
   spec.description   = ""
-  spec.homepage      = "http://moneytrack.io"
+  spec.homepage      = "https://moneytrack.io"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop-rails_config"
@@ -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.8"
+  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"

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.2
 platform: ruby
 authors:
 - Pierre Michard
+- Sébastien Lauret
+- Othmane El Kesri
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +114,14 @@ dependencies:
   name: active_interaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
@@ -223,6 +225,8 @@ dependencies:
 description: ''
 email:
 - pierre@moneytrack.io
+- sebastien@moneytrack.io
+- othmane@moneytrack.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -270,7 +274,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
@@ -282,11 +285,13 @@ files:
 - lib/tezos_client/tools/convert_to_hash/bytes.rb
 - lib/tezos_client/tools/convert_to_hash/int.rb
 - lib/tezos_client/tools/convert_to_hash/key.rb
+- lib/tezos_client/tools/convert_to_hash/key_hash.rb
 - lib/tezos_client/tools/convert_to_hash/list.rb
 - lib/tezos_client/tools/convert_to_hash/map.rb
 - lib/tezos_client/tools/convert_to_hash/nat.rb
 - lib/tezos_client/tools/convert_to_hash/option.rb
 - lib/tezos_client/tools/convert_to_hash/pair.rb
+- lib/tezos_client/tools/convert_to_hash/set.rb
 - lib/tezos_client/tools/convert_to_hash/signature.rb
 - lib/tezos_client/tools/convert_to_hash/string.rb
 - lib/tezos_client/tools/convert_to_hash/timestamp.rb
@@ -309,7 +314,7 @@ files:
 - lib/tezos_client/version.rb
 - tezos_client.gemspec
 - travis-scripts/prepare-ubuntu.sh
-homepage: http://moneytrack.io
+homepage: https://moneytrack.io
 licenses:
 - MIT
 metadata:
@@ -329,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 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