tezos_client 0.4.17 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e64070f9d16862fe3ea855743decfd8177b364643e52166efd959cac713997
-  data.tar.gz: f6393e2ee64d200169e1ffa47c2b9bb65cf5cd1b5c3507d7bf9d812f6aa1daac
+  metadata.gz: 579469179cc4a5bb283d1bcf72b47ef45526cfa043b8e726c0f0fd28ce898660
+  data.tar.gz: 96812ca579b2385498b1d6d77ec0402b971e0cd5404a14358d82afef38d9a155
 SHA512:
-  metadata.gz: 37f86d63ec3aab4310e6328ef7e5f4a9e935e693e98eef92ccdd640a562667692ed7850230a7014386f5030ee962cc8e74f1d3c6171c0b595f9b26000ddd41d7
-  data.tar.gz: ca437a9e9a68bef967f10b5621582f10b28a3ee6ae5e23033509b950bd686a1b1a617188088a2eb0463fdfacd2fb9ad82bb4396b1726eb042f255b6854d75f61
+  metadata.gz: 2430302849c553bb54824fdb7f9f42f2370e382996217560895a4423fb7639d4ce3ed35bbeab04726385b156759ffff938912cb1d9d9c10f0a59fbc682e9e573
+  data.tar.gz: 9e998064917d3163aa589ba96bf7dbbb06cee177192d9487d17d5d181141634b951fb2c3c0c39358abe911efc21b7c44e9bbefc670171f0b613c8417a71abeed

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+node_modules/
 
 # rspec failure tracking
 .rspec_status
@@ -15,3 +16,4 @@
 
 # vim ctags
 .tags
+

data/.travis.yml

@@ -1,4 +1,6 @@
 ---
+service:
+  - docker
 dist: xenial
 language: ruby
 sudo: required
@@ -6,17 +8,22 @@ cache:
   bundler: true
   directories:
   - $HOME/.opam
-  - liquidity
 rvm:
   - 2.5.1
-env:
-  - OPAMYES=1
 before_install:
   - sh travis-scripts/prepare-ubuntu.sh
-  - sh travis-scripts/install-opam.sh
-  - sh travis-scripts/install-liquidity.sh
+  - mkdir $HOME/bin
+  - docker pull moneytrack/liquidity:babylonnet
+  - id=$(docker create moneytrack/liquidity:babylonnet)
+  - docker cp $id:/home/opam/.opam/4.07/bin/liquidity - > $HOME/bin/liquidity
+  - chmod +x liquidity
+  - curl -s https://SmartPy.io/SmartPyBasicTest2/SmartPy.sh > SmartPy.sh
+  - chmod +x ./SmartPy.sh
+  - ./SmartPy.sh local-install-custom SmartPyBasicTest2 $HOME/bin/smartpy
+  - rm ./SmartPy.sh
+  - export PATH="$PATH:$HOME/bin/:$HOME/bin/smartpy/SmartPyBasic/"
+  - npm link michelson-to-micheline
   - gem install bundler -v 1.16.3
 script:
-  - eval `opam config env`
   - bundle install
-  - bundle exec rake
+  - bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (0.4.17)
+    tezos_client (1.0.0)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)
       bip_mnemonic (~> 0.0.2)
@@ -47,7 +47,7 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.9.0)
-    ffi (1.12.2)
+    ffi (1.12.1)
     hashdiff (1.0.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -65,7 +65,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
-    minitest (5.12.2)
+    minitest (5.13.0)
     money-tree (0.10.0)
       ffi
     multi_xml (0.6.0)
@@ -146,7 +146,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.2.0)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -10,6 +10,31 @@ Tezos Client interracts with tezos nodes using RPC commands.
 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. 
 
+## Dependency 
+
+### michelson-to-micheline 
+```bash
+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/)
+
+```bash
+sh <(curl -s https://SmartPy.io/SmartPyBasic/SmartPy.sh) local-install /
+```
+
+### TypeScript (for dev)
+```bash
+npm install -g typescript
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -122,10 +147,48 @@ TezosClient.new.call_contract(
   script: File.expand_path("./spec/fixtures/demo.liq"),
   secret_key: "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN",
   to: "KT1STzq9p2tfW3K4RdoM9iYd1htJ4QcJ8Njs",
-  parameters: [ "manage", "(Some { destination = tz1YLtLqD1fWHthSVHPD116oYvsd4PTAHUoc; amount = 1tz })" ]
+  entrypoint: "manage",
+  params: "(Some { destination = tz1YLtLqD1fWHthSVHPD116oYvsd4PTAHUoc; amount = 1tz })" ,
+  params_type: :caml
 )
 ```
 
+### Originate a contract written in SmartPy
+
+```ruby
+script = File.expand_path("./spec/fixtures/demo.py")
+source = "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq"
+secret_key = "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN"
+amount =  0
+init_params = "MyContract(1, 1)"
+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]}"
+```
+
+### Call a contract written in SmartPy
+```ruby
+TezosClient.new.call_contract(
+  from: "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq",
+  secret_key: "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN",
+  to: "KT1STzq9p2tfW3K4RdoM9iYd1htJ4QcJ8Njs",
+  amount: 0,
+  entrypoint: "myEntryPoint",
+  params: { int: 1 },
+  params_type: :micheline
+)
+```
+
+
 ## Options
 
 ### Liquidity options

data/lib/tezos_client/client_interface/block_contextual.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class TezosClient
-  class ClientInterface
-    # Commands managing keys and accounts
-    module BlockContextual
-      def transfer(quantity:, from:, to:, dry_run: false, arg: nil)
-        cmd = ["transfer", quantity, "from", from, "to", to]
-        cmd << "--dry-run" if dry_run
-        cmd += ["--arg", "#{arg}"] unless arg.nil?
-
-        res = call_client(cmd)
-      end
-    end
-  end
-end

data/lib/tezos_client/client_interface/client_wrapper.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-class TezosClient
-  class ClientInterface
-    # Wrapper used to call the tezos-client binary
-    module ClientWrapper
-      def call_client(command)
-        cmd = client_cmd + command
-        Open3.popen3(*cmd) do |_stdin, stdout, stderr, wait_thr|
-          err = stderr.read
-          status = wait_thr.value.exitstatus
-
-          if status != 0
-            raise "command '#{cmd}' existed with status #{status}: #{err}"
-          end
-
-          log err
-          output = stdout.read
-
-          if block_given?
-            yield(output)
-          else
-            output
-          end
-        end
-      end
-
-      def client_cmd
-        res = ["tezos-client", "-l"]
-        if config_file
-          res += ["-c", config_file]
-        end
-        res
-      end
-    end
-  end
-end

data/lib/tezos_client/client_interface/contract.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class TezosClient
-  class ClientInterface
-    # Commands managing keys and accounts
-    module Contract
-      def known_contracts
-        res = call_client(["list", "known", "contracts"])
-        res.lines.reduce({}) do |acc, contract_output|
-          address_format = /([^:]+): (\w+)/
-          res = address_format.match(contract_output)
-          acc.merge(res[1] => res[2])
-        end
-      end
-    end
-  end
-end

data/lib/tezos_client/client_interface/key.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-class TezosClient
-  class ClientInterface
-    # Commands managing keys and accounts
-    module Key
-      def gen_keys(name)
-        call_client(["gen", "keys", name])
-      end
-
-      def addresses
-        output = call_client(["list", "known", "addresses"])
-        output.lines.reduce({}) do |acc, address_output|
-          address_format = /([^:]+): (\w+) /
-          res = address_format.match(address_output)
-          acc.merge(res[1] => res[2])
-        end
-      end
-
-      def import_public_key(name, public_key, force: false)
-        cmd = ["import", "public", "key", name, public_key]
-        cmd << "--force" if force
-
-        call_client(cmd)
-      end
-
-      def import_secret_key(name, secret_key, force: false)
-        cmd = ["import", "secret", "key", name, secret_key]
-        cmd << "--force" if force
-
-        call_client(cmd)
-      end
-    end
-  end
-end

data/lib/tezos_client/client_interface/misc.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "open3"
-require "date"
-
-class TezosClient
-  class ClientInterface
-    module Misc
-      def bootstrapped
-        call_client(["bootstrapped"]) do |output|
-          output_format = /Current head: ([^ ]+) \(timestamp: ([^,]+), validation: (.+)\)/
-          res = output_format.match(output)
-          head = res[1]
-          timestamp = DateTime.parse(res[2])
-          validation = DateTime.parse(res[3])
-
-          {
-              "block" => head,
-              "timestamp" => timestamp,
-              "validated_at" => validation
-          }
-        end
-      end
-    end
-  end
-end

data/lib/tezos_client/commands.rb

@@ -18,18 +18,12 @@ class TezosClient
                    :balance,
                    :contract_manager_key,
                    :contract_storage,
-                   :pending_operations
-
-    def_delegators :client_interface,
-                   :gen_keys,
-                   :addresses,
-                   :import_public_key,
-                   :import_secret_key,
-                   :known_contracts,
-                   :transfer
+                   :pending_operations,
+                   :pack_data,
+                   :big_map_value
 
     def_delegators :liquidity_interface,
                    :get_storage,
-                   :pack_data
+                   :liquidity_pack_data
   end
 end

data/lib/tezos_client/crypto.rb

@@ -15,6 +15,7 @@ class TezosClient
       tz2:    [6, 161, 161],
       tz3:    [6, 161, 164],
       KT:     [2, 90, 121],
+      expr:   [13, 44, 64, 27],
       edpk:   [13, 15, 37, 217],
       edsk2:  [13, 15, 58, 7],
       spsk:   [17, 162, 224, 201],
@@ -112,10 +113,7 @@ class TezosClient
     def generate_key(mnemonic: nil, password: nil, wallet_seed: nil, path: nil)
       signing_key = generate_signing_key(mnemonic: mnemonic, password: password, wallet_seed: wallet_seed, path: path).to_bytes.to_hex
 
-      verify_key = RbNaCl::SigningKey.new(signing_key.to_bin)
-      hex_pubkey = verify_key.to_s.to_hex
-
-      secret_key = encode_tz(:edsk, signing_key + hex_pubkey)
+      secret_key = encode_tz(:edsk2, signing_key)
       public_key = secret_key_to_public_key(secret_key)
       address = public_key_to_address(public_key)
 
@@ -199,6 +197,12 @@ class TezosClient
       key.merge(activation_secret: wallet_config[:secret])
     end
 
+    def encode_script_expr(data:, type:)
+      packed_key = pack_data(data: data, type: type)
+      raw_expr_key = RbNaCl::Hash::Blake2b.digest(packed_key["packed"].to_bin, digest_size: 32).to_hex
+      encode_tz(:expr, raw_expr_key)
+    end
+
     private
       def generate_signing_key(mnemonic: nil, password: nil, wallet_seed: nil, path: nil)
         if mnemonic

data/lib/tezos_client/exceptions.rb

@@ -18,6 +18,15 @@ class TezosClient
     end
   end
 
+  class SysCallError < RuntimeError
+  end
+
+  class LiquidityError < SysCallError
+  end
+
+  class SmartPyError < SysCallError
+  end
+
   class InvalidActivation < RpcRequestFailure
     attr_reader :pkh
 
@@ -101,6 +110,4 @@ class TezosClient
       super
     end
   end
-
-  class UnknownTransactionError < Exception; end
 end

data/lib/tezos_client/liquidity_inteface/liquidity_wrapper.rb

@@ -6,24 +6,10 @@ class TezosClient
     module LiquidityWrapper
       def call_liquidity(command, verbose: false)
         cmd = liquidity_cmd(verbose: verbose).concat command
-        log cmd.to_s
-        Open3.popen3(*cmd) do |_stdin, stdout, stderr, wait_thr|
-          err = stderr.read
-          status = wait_thr.value.exitstatus
-          log err
 
-          if status != 0
-            raise "command '#{cmd}' existed with status #{status}: #{err}"
-          end
-
-          output = stdout.read
-
-          if block_given?
-            yield(output)
-          else
-            output
-          end
-        end
+        Tools::SystemCall.execute(cmd)
+      rescue SysCallError => e
+        raise LiquidityError, e.message
       end
 
       def liquidity_cmd(verbose:)

data/lib/tezos_client/liquidity_interface.rb

@@ -28,7 +28,7 @@ class TezosClient
       init_params = args.fetch :init_params
       init_params = format_params(init_params)
 
-      with_tempfile(".json") do |json_file|
+      Tools::TemporaryFile.with_tempfile(".json") do |json_file|
         cmd_opt = ["--source", from.to_s,"--json", script.to_s, "-o", json_file.path.to_s, "--init-storage"] + init_params
 
         call_liquidity cmd_opt, verbose: options[:verbose]
@@ -36,34 +36,8 @@ class TezosClient
       end
     end
 
-    def with_tempfile(extension)
-      file = Tempfile.new(["script", extension])
-      yield(file)
-
-    ensure
-      file.unlink
-    end
-
-    def with_file_copy(source_file_path)
-      source_file = File.open(source_file_path, "r")
-      source_extention = File.extname(source_file_path)
-
-      file_copy_path = nil
-
-      res = with_tempfile(source_extention) do |file_copy|
-        file_copy.write(source_file.read)
-        file_copy_path = file_copy.path
-        file_copy.close
-        yield(file_copy_path)
-      end
-
-      res
-    ensure
-      File.delete(file_copy_path) if File.exists? file_copy_path
-    end
-
-    def json_scripts(args)
-      with_file_copy(args[:script]) do |script_copy_path|
+    def json_scripts(script:)
+      Tools::TemporaryFile.with_file_copy(script) do |script_copy_path|
         script_basename = script_copy_path.sub(/.liq$/, "")
 
         json_init_script_path = "#{script_basename}.initializer.tz.json"
@@ -96,7 +70,7 @@ class TezosClient
 
     def origination_script(args)
       storage = initial_storage(args)
-      _json_init_script, json_contract_script = json_scripts(args)
+      _json_init_script, json_contract_script = json_scripts(script: args[:script])
 
       {
         code: json_contract_script,
@@ -129,15 +103,16 @@ class TezosClient
       res.strip
     end
 
-    def call_parameters(script:, parameters:)
+    def call_parameters(script:, entrypoint:, parameters:)
       params = format_params parameters
-      with_tempfile(".json") do |json_file|
+      Tools::TemporaryFile.with_tempfile(".json") do |json_file|
+        params = [ entrypoint ] + params
         res = call_liquidity ["--json", "-o", "#{json_file.path}", "#{script}", "--data"] + params
         JSON.parse res
       end
     end
 
-    def pack_data(data:, type:)
+    def liquidity_pack_data(data:, type:)
       res = call_liquidity ["--pack", "#{data}", "#{type}"]
       res.strip
     end

data/lib/tezos_client/operation_mgr.rb

@@ -39,6 +39,10 @@ class TezosClient
       @protocol ||= rpc_interface.protocol
     end
 
+    def chain_id
+      @chain_id ||= rpc_interface.chain_id
+    end
+
     def simulate_and_update_limits
       run_result = run
 
@@ -47,13 +51,21 @@ class TezosClient
           rpc_operation_args[:gas_limit] = (operation_result[:consumed_gas].to_i.from_satoshi + 0.001).to_satoshi.to_s
         end
       end
+
+      run_result
     end
 
     def to_hex
       rpc_interface.forge_operations(operations: rpc_operation_args, branch: branch)
     end
 
+    def valid_secret_key?
+      @secret_key&.match?(/^edsk/)
+    end
+
     def sign
+      raise ArgumentError, "Invalid secret key" unless valid_secret_key?
+
       sign_operation(
         secret_key: @secret_key,
         operation_hex: to_hex
@@ -80,52 +92,73 @@ class TezosClient
 
     def simulate
       # simulate operations and adjust gas limits
-      simulate_and_update_limits
-      res = preapply
-      operation_results = res.map { |metadata| metadata[:operation_result] }
-
-      {
-        operation_results: operation_results,
-      }
+      run_result = simulate_and_update_limits
+      if valid_secret_key?
+        preapply
+      else
+        run_result
+      end
     end
 
     def test_and_broadcast
       simulate_res = simulate
       op_id = broadcast
 
-      {
+      simulate_res.merge(
         operation_id: op_id,
-        operation_results: simulate_res[:operation_results],
-      }
+      )
     end
 
     def run
       rpc_responses = rpc_interface.run_operations(
         operations: rpc_operation_args,
-        signature: base_58_signature,
-        branch: branch)
-
-      total_consumed_storage = 0
-      total_consumed_gas = 0
+        signature: RANDOM_SIGNATURE,
+        branch: branch,
+        chain_id: chain_id
+      )
 
       ensure_applied!(rpc_responses)
 
-      operation_results = rpc_responses.map do |rpc_response|
-        metadata = rpc_response[:metadata]
+      convert_rpc_response(rpc_responses)
+    end
 
-        total_consumed_storage += compute_consumed_storage(metadata)
-        consumed_gas = compute_consumed_gas(metadata)
-        total_consumed_gas += consumed_gas
+    def convert_rpc_response(rpc_responses)
+      converted_rpc_responce = {
+        status: :applied,
+        operation_results: operation_results(rpc_responses),
+        internal_operation_results: internal_operation_result(rpc_responses)
+      }
+
+      converted_rpc_responce.merge(consumed_tez(rpc_responses))
+    end
 
-        metadata[:operation_result][:consumed_gas] = consumed_gas if metadata.key? :operation_result
+    def operation_results(rpc_responses)
+      rpc_responses.map do |rpc_response|
+        metadata = rpc_response[:metadata]
+        metadata[:operation_result][:consumed_gas] = compute_consumed_gas(metadata) if metadata.key? :operation_result
         metadata[:operation_result]
       end
+    end
+
+    def internal_operation_result(rpc_responses)
+      rpc_responses.map do |rpc_response|
+        rpc_response[:metadata][:internal_operation_results]
+      end.compact.flatten
+    end
+
+    def consumed_tez(rpc_responses)
+      total_consumed_storage = 0
+      total_consumed_gas = 0
+
+      rpc_responses.each do |rpc_response|
+        metadata = rpc_response[:metadata]
+        total_consumed_storage += compute_consumed_storage(metadata)
+        total_consumed_gas += compute_consumed_gas(metadata)
+      end
 
       {
-        status: :applied,
-        consumed_gas: total_consumed_gas,
         consumed_storage: total_consumed_storage,
-        operation_results: operation_results
+        consumed_gas: total_consumed_gas
       }
     end
 
@@ -144,7 +177,6 @@ class TezosClient
       (metadata.dig(:operation_result, :paid_storage_size_diff) || "0").to_i.from_satoshi
     end
 
-
     def preapply
       rpc_responses = rpc_interface.preapply_operations(
         operations: rpc_operation_args,
@@ -153,6 +185,8 @@ class TezosClient
         branch: branch)
 
       ensure_applied!(rpc_responses)
+
+      convert_rpc_response(rpc_responses)
     end
 
     def broadcast
@@ -168,39 +202,18 @@ class TezosClient
 
     def ensure_applied!(rpc_responses)
       metadatas = rpc_responses.map { |response| response[:metadata] }
-      operation_full_results = metadatas.map do |metadata|
-        { op_result: metadata[:operation_result], internal_operation_results: metadata[:internal_operation_results]}
-      end
+      operation_results = metadatas.map { |metadata| metadata[:operation_result] }
 
-      failed = operation_full_results.map{|op_res| op_res[:op_result]}.detect do |operation_result|
+      failed = operation_results.detect do |operation_result|
         operation_result != nil && operation_result[:status] != "applied"
       end
 
       return metadatas if failed.nil?
 
-      process_transaction_errors!(operation_full_results)
-    end
-
-    def process_transaction_errors!(operations_full_results)
-      detect_operation = ->(op_full_results, status: "failed") do
-        op_full_results.detect do |operation_result|
-          operation_result[:op_result][:status] == status
-        end
-      end
-
-      failed_operation_result = detect_operation.call(operations_full_results)
-
-      if failed_operation_result.nil?
-        backtracked_operation_result = detect_operation.call(operations_full_results, status: "backtracked")
-        raise UnknownTransactionError if backtracked_operation_result.nil?
-
-        internal_operations_results = backtracked_operation_result[:internal_operation_results].map{|op| op[:result]}
-        failed_operation_result = internal_operations_results.detect { |op_result| op_result[:status] == "failed" }
-      else
-        failed_operation_result = failed_operation_result[:op_result]
+      failed_operation_result = operation_results.detect do |operation_result|
+        operation_result[:status] == "failed"
       end
 
-      operation_results = operations_full_results.map { |full_result| full_result[:op_result] }
       failed!("failed", failed_operation_result[:errors], operation_results)
     end
 

data/lib/tezos_client/operations/transaction_operation.rb

@@ -32,7 +32,15 @@ class TezosClient
     end
 
     def parameters
-      (@args[:parameters].is_a? String) ? encode_args(@args[:parameters]) : @args[:parameters]
+      parameters = @args[:parameters].clone
+      if parameters.is_a? String
+        {
+          entrypoint: "default",
+          value: encode_args(@args[:parameters])
+        }
+      else
+        parameters
+      end
     end
   end
 end

data/lib/tezos_client/rpc_interface/blocks.rb

@@ -11,7 +11,7 @@ class TezosClient
         query = {
           length: length,
           head: head,
-          min_date: min_date&.utc&.iso8601
+          min_date: min_date&.to_i
         }.compact
 
         res = get "chains/main/blocks/", query: query

data/lib/tezos_client/rpc_interface/contracts.rb

@@ -3,6 +3,7 @@
 class TezosClient
   class RpcInterface
     using CurrencyUtils
+    include Crypto
 
     module Contracts
       def contract_link(contract_id)
@@ -26,6 +27,12 @@ class TezosClient
       def contract_storage(contract_id)
         get "#{contract_link(contract_id)}/storage"
       end
+
+      def big_map_value(big_map_id:, key:, type_key:)
+        expr_key = encode_script_expr(data: key, type: type_key)
+
+        get "/chains/main/blocks/head/context/big_maps/#{big_map_id}/#{expr_key}"
+      end
     end
   end
 end

data/lib/tezos_client/rpc_interface/helper.rb

@@ -16,24 +16,22 @@ class TezosClient
           counter: counter(args).to_s,
           fee: args.fetch(:fee, 0.05).to_satoshi.to_s
         }
-        operation[:parameters] = args[:parameters] if args[:parameters]
+
+        if args[:parameters]
+          operation[:parameters] = args[:parameters]
+        end
         operation
       end
 
       def origination_operation(args)
-        manager = (args.fetch(:manager) { args.fetch(:from) })
-
         operation = {
           kind: "origination",
-          delegatable: args.fetch(:delegatable, false),
-          spendable: args.fetch(:spendable, false),
           balance: args.fetch(:amount, 0).to_satoshi.to_s,
           source: args.fetch(:from),
           gas_limit: args.fetch(:gas_limit, 0.1).to_satoshi.to_s,
           storage_limit: args.fetch(:storage_limit, 0.06).to_satoshi.to_s,
           counter: counter(args).to_s,
           fee: args.fetch(:fee, 0.05).to_satoshi.to_s,
-          manager_pubkey: manager
         }
 
         operation[:script] = args[:script] if args[:script]

data/lib/tezos_client/rpc_interface/operations.rb

@@ -20,9 +20,12 @@ class TezosClient
 
       def run_operations(operations:, **options)
         content = {
-          branch: options.fetch(:branch),
-          contents: operations,
-          signature: options.fetch(:signature)
+          operation: {
+            branch: options.fetch(:branch),
+            contents: operations,
+            signature: options.fetch(:signature)
+          },
+          chain_id: options.fetch(:chain_id)
         }
         res = post("chains/main/blocks/head/helpers/scripts/run_operation", content)
         res["contents"]
@@ -43,6 +46,14 @@ class TezosClient
       def pending_operations
         get("chains/main/mempool/pending_operations")
       end
+
+      def pack_data(data:, type:)
+        content = {
+            data: data,
+            type: type
+        }
+        post("/chains/main/blocks/head/helpers/scripts/pack_data", content)
+      end
     end
   end
 end

data/lib/tezos_client/rpc_interface.rb

@@ -26,6 +26,5 @@ class TezosClient
       @host = host
       @port = port
     end
-
   end
 end

data/lib/tezos_client/smartpy_inteface/micheline_serializer_wrapper.rb

@@ -0,0 +1,17 @@
+# 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

data/lib/tezos_client/smartpy_inteface/smartpy_wrapper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class TezosClient
+  class SmartpyInterface
+    # Wrapper used to call the tezos-client binary
+    module SmartpyWrapper
+      def call_smartpy(command)
+        cmd = smartpy_cmd + command
+
+        Tools::SystemCall.execute(cmd)
+      rescue SysCallError => e
+        raise SmartPyError, e.to_s
+      end
+
+      def smartpy_cmd
+        [ "SmartPy.sh" ]
+      end
+    end
+  end
+end

data/lib/tezos_client/smartpy_interface.rb

@@ -0,0 +1,46 @@
+# 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))
+
+        [JSON.parse(micheline_storage), JSON.parse(micheline_contract)]
+      end
+    end
+
+    def origination_script(args)
+      json_init_script, json_contract_script = json_scripts(args)
+
+      {
+        code: json_contract_script,
+        storage: json_init_script
+      }
+    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
+    end
+  end
+end

data/lib/tezos_client/tools/system_call.rb

@@ -0,0 +1,24 @@
+class TezosClient
+  module Tools
+    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
+            raise ::TezosClient::SysCallError, "command '#{cmd}' existed with status #{status}: #{err}"
+          end
+
+          output = stdout.read
+
+          if block_given?
+            yield(output)
+          else
+            output
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/temporary_file.rb

@@ -0,0 +1,30 @@
+class TezosClient
+  module Tools
+    module TemporaryFile
+      def self.with_file_copy(source_file_path)
+        source_file = File.open(source_file_path, "r")
+        source_extention = File.extname(source_file_path)
+
+        file_copy_path = nil
+
+        res = Tools::TemporaryFile.with_tempfile(source_extention) do |file_copy|
+          file_copy.write(source_file.read)
+          file_copy_path = file_copy.path
+          file_copy.close
+          yield(file_copy_path)
+        end
+
+        res
+      ensure
+        File.delete(file_copy_path) if File.exists? file_copy_path
+      end
+
+      def self.with_tempfile(extension)
+        file = Tempfile.new(["script", extension])
+        yield(file)
+      ensure
+        file.unlink
+      end
+    end
+  end
+end

data/lib/tezos_client/version.rb

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

data/lib/tezos_client.rb

@@ -6,6 +6,7 @@ require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/module/delegation"
 require "timeout"
 require "benchmark"
+require "open3"
 
 require "tezos_client/version"
 require "tezos_client/string_utils"
@@ -25,9 +26,12 @@ require "tezos_client/operations/reveal_operation"
 require "tezos_client/operations/raw_operation_array"
 require "tezos_client/operations/operation_array"
 
-require "tezos_client/client_interface"
+require "tezos_client/tools/system_call"
+require "tezos_client/tools/temporary_file"
+
 require "tezos_client/rpc_interface"
 require "tezos_client/liquidity_interface"
+require "tezos_client/smartpy_interface"
 
 class TezosClient
   using CurrencyUtils
@@ -38,9 +42,9 @@ class TezosClient
   include Commands
   include Crypto
 
-  attr_accessor :client_interface
   attr_accessor :rpc_interface
   attr_accessor :liquidity_interface
+  attr_accessor :smartpy_interface
 
   RANDOM_SIGNATURE = "edsigu165B7VFf3Dpw2QABVzEtCxJY2gsNBNcE3Ti7rRxtDUjqTFRpg67EdAQmY6YWPE5tKJDMnSTJDFu65gic8uLjbW2YwGvAZ"
 
@@ -50,15 +54,14 @@ class TezosClient
     @liquidity_options = liquidity_options
 
     @client_config_file = ENV["TEZOS_CLIENT_CONFIG_FILE"]
-    @client_interface = ClientInterface.new(
-      config_file: @client_config_file
-    )
 
     @rpc_interface = RpcInterface.new(
       host: @rpc_node_address,
       port: @rpc_node_port
     )
 
+    @smartpy_interface = SmartpyInterface.new
+
     @liquidity_interface = LiquidityInterface.new(
       rpc_node_address: @rpc_node_address,
       rpc_node_port: @rpc_node_port,
@@ -79,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:, script: nil, init_params: nil, dry_run: false, **args)
+  def originate_contract(from:, amount:, secret_key: nil, script: nil, init_params: nil, dry_run: false, **args)
     origination_args = {
       rpc_interface: rpc_interface,
       from: from,
@@ -88,13 +91,11 @@ class TezosClient
       **args
     }
 
-    if script != nil
-      origination_args[:script] = liquidity_interface.origination_script(
-        from: from,
-        script: script,
-        init_params: init_params
-      )
-    end
+    origination_args[:script] = contract_interface(script).origination_script(
+      from: from,
+      script: script,
+      init_params: init_params
+    )
 
     operation = OriginationOperation.new(origination_args)
     res = broadcast_operation(operation: operation, dry_run: dry_run)
@@ -166,15 +167,19 @@ class TezosClient
     broadcast_operation(operation: operation, dry_run: dry_run)
   end
 
-  def call_contract(dry_run: false, **args)
-    parameters = args.fetch(:parameters)
-
-    json_params = liquidity_interface.call_parameters(
-      script: args.fetch(:script),
-      parameters: parameters
+  def call_contract(dry_run: false, entrypoint:, params:, script: nil, params_type:, **args)
+    json_params = micheline_params(
+      params: params,
+      entrypoint: entrypoint,
+      script: script,
+      params_type: params_type
     )
 
-    transfer_args = args.merge(parameters: json_params, dry_run: dry_run)
+    transfer_args = args.merge(
+      entrypoint: entrypoint,
+      parameters: json_params,
+      dry_run: dry_run
+    )
 
     transfer(transfer_args)
   end
@@ -242,6 +247,10 @@ class TezosClient
     end
   end
 
+  def self.root_path
+    File.expand_path(File.dirname(__FILE__))
+  end
+
   private
 
   def broadcast_operation(operation:, dry_run:)
@@ -256,4 +265,50 @@ class TezosClient
     )
   end
 
+  def liquidity_contract? filename
+    filename&.to_s&.end_with?(".liq")
+  end
+
+  def micheline_params(params:, entrypoint:, script: nil, params_type:)
+    {
+      entrypoint: entrypoint,
+      value: convert_params(
+        params: params,
+        entrypoint: entrypoint,
+        script: script,
+        params_type: params_type
+      )
+    }
+  end
+
+  def convert_params(params:, entrypoint:, script: nil, params_type:)
+    case params_type.to_sym
+    when :micheline
+      params
+    when :caml
+      raise ::ArgumentError, "need liquidity script path with camel type" if script.nil?
+
+      liquidity_interface.call_parameters(
+        script: script,
+        entrypoint: entrypoint,
+        parameters: params
+      )
+    else
+      raise ::ArgumentError, "params type must be equal to [ :micheline, :caml ]"
+    end
+  end
+
+
+  def contract_interface(script)
+    case script.to_s
+    when /[A-Za-z_\/\-]*.liq/
+      liquidity_interface
+    when /[A-Za-z_\/\-]*.py/
+      smartpy_interface
+    when nil
+      raise "script var unset"
+    else
+      raise "unknown contract type"
+    end
+  end
 end

data/travis-scripts/prepare-ubuntu.sh

@@ -11,4 +11,4 @@ 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
+     bubblewrap libev-dev libhidapi-dev npm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 1.0.0
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,7 +227,6 @@ files:
 - bin/console
 - bin/setup
 - lib/tezos_client.rb
-- lib/tezos_client/client_interface.rb
 - lib/tezos_client/client_interface/block_contextual.rb
 - lib/tezos_client/client_interface/client_wrapper.rb
 - lib/tezos_client/client_interface/contract.rb
@@ -259,11 +258,14 @@ 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
+- lib/tezos_client/tools/system_call.rb
+- lib/tezos_client/tools/temporary_file.rb
 - lib/tezos_client/version.rb
 - tezos_client.gemspec
-- travis-scripts/install-liquidity.sh
-- travis-scripts/install-opam.sh
 - travis-scripts/prepare-ubuntu.sh
 homepage: http://moneytrack.io
 licenses:

data/lib/tezos_client/client_interface.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "client_interface/client_wrapper"
-require_relative "client_interface/misc"
-require_relative "client_interface/key"
-require_relative "client_interface/contract"
-require_relative "client_interface/block_contextual"
-
-class TezosClient
-  class ClientInterface
-    attr_reader :config_file
-
-    include Logger
-
-    include ClientWrapper
-    include Misc
-    include Key
-    include Contract
-    include BlockContextual
-
-    def initialize(config_file: nil)
-      @config_file = config_file
-    end
-  end
-end

data/travis-scripts/install-liquidity.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-#set -ex
-# This script is used in .travis.yml for continuous integration on travis.
-# BTW, it also show some needed system packages to build liquidity
-# Travis CI is done on Ubuntu trusty
-export OPAMYES=1
-
-[ -d "liquidity/.git" ] || git clone --depth=50 https://github.com/OCamlPro/liquidity.git liquidity
-cd liquidity
-git pull
-# git checkout next
-git checkout 5ed5b09674cb96f8cd4ac83a55621f77d9a9110c
-
-eval `opam config env`
-
-opam install camlp4 ctypes-foreign ocaml-migrate-parsetree
-make build-deps
-make clone-tezos
-make
-make install

data/travis-scripts/install-opam.sh

@@ -1,12 +0,0 @@
-# This script is used in .travis.yml for continuous integration on travis.
-# Travis CI is done on Ubuntu trusty
-
-export OPAMYES=1
-wget https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh
-yes "" | sh install.sh
-
-opam switch create liquidity 4.06.1  || opam switch set liquidity
-
-eval $(opam config env)
-
-opam update