tezos_client 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51e427c6e828b0dcfbe66daccac99c8881d155230b4d0efd0be253af2b1a3b99
-  data.tar.gz: 8b2ef9adcfd62f92ef9b0b98ec44964e8425e43074729c8f0a8a48949b8ae6e9
+  metadata.gz: 2f5b9a5c58bf1640c1dea1b7e50476ec7f73d8921f643aae09ee78bc6c52831f
+  data.tar.gz: d6ab0bf0fe3a61153e932f826495cc63a4ef111d58059a998461f4a75a45dbe7
 SHA512:
-  metadata.gz: b02cacf6f37704e03a2df7c6400ce4bed6cb74bfdbec7b4ff25ff7045f9ba4d3d51350637320522d9508291de300dbe68f23ffc249f980f4e1d6c332e61e8fa7
-  data.tar.gz: c19c93b09dd4943fd5d8b054538361d53b813aafba033b91280ac6a6383256c2139253b370d798c4ada43dd794cfdd7318156c261bb1022b18b61b37b9672526
+  metadata.gz: 97e1173843fbd7856cd3b533cdb7dafc0377825709756c07f32ac17b2645264b77fa3bc96dffba72bcd9142c6312911497d2117b237dfe04c8b91aa26eeded29
+  data.tar.gz: 28f6dddae3bef46b9dfa12ec10195c33c6a4cef8dbae0a629123d8b6bea92a289a0e378fde25a27c68cb3c83f183a332b720b8ad2d89b72f2c7e11eeac749fc4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (1.3.5)
+    tezos_client (1.3.4)
       active_interaction (>= 3.8)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Pierre Michard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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
@@ -329,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