tezos_client 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 014c9a05ae3cd9274cb1c05389dc09ba2b392d4696f473e2f46cc9f4937a28ee
-  data.tar.gz: a9b296c7d4e3eda79f7a4aabbea8754aa598a668b257a06ee883295c0697effb
+  metadata.gz: 6de17ecf9250b846d61ac7c09163ae7d724bbf2cef921accfb363c17642d09bd
+  data.tar.gz: eceb944bc3de48585b37adb47d9004193b3b96b6803071ccb543c969d8d11888
 SHA512:
-  metadata.gz: 983b7ab275287b10d6f049e8ef70590c6379ff487da32a7edea2f7f7e775fac922028fba84b76174d393e976a13d56cd15be7521e6fd8bac7096b4408aac8f6f
-  data.tar.gz: 494b2b66f0f4e99ea176d01d526365841f17a27b156e03b98c5d76b441c4461cdc657db9843cb3fa84b605812d253ea3f3d166c06eb350a709e06de10ce77c7a
+  metadata.gz: af341ffed833a6f8683653b96f8a3cbc0b9397e7b5d56e734a6a528f96904c2ec45d252bd05be6ea8f009a54b55cc7d758784006c99c393ac3d4871913aeede9
+  data.tar.gz: 4a0ae7f0d075caace39047dcc9a012811484a0569a86223a508e8bb8fbbad578456bea5852c3243ff1b99ec4fdbc847abefd8dddaa24d3dd5e6490fb1e44323a

data/.travis.yml

@@ -13,10 +13,6 @@ rvm:
 before_install:
   - sh travis-scripts/prepare-ubuntu.sh
   - mkdir -p $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 $HOME/bin/liquidity
   - curl -s https://SmartPy.io/SmartPyBasic/SmartPy.sh > SmartPy.sh
   - chmod +x ./SmartPy.sh
   - ./SmartPy.sh local-install $HOME/bin/smartpy

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (1.0.1)
+    tezos_client (1.1.1)
       active_interaction (~> 3.7)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)
@@ -75,7 +75,7 @@ GEM
       ffi
     multi_xml (0.6.0)
     netrc (0.11.0)
-    nokogiri (1.10.5)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     parallel (1.18.0)
     parser (2.6.5.0)

data/README.md

@@ -120,11 +120,11 @@ client.transfer(
 ### Originate a contract written in liquidity
 
 ```ruby
-script = File.expand_path("./spec/fixtures/demo.liq")
+script = File.expand_path("./spec/fixtures/demo.py")
 source = "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq"
 secret_key = "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN"
 amount =  0
-init_params = '"test"'
+init_params= "MyContract()"
 client = TezosClient.new
 
 res = client.originate_contract(
@@ -139,20 +139,6 @@ puts "Origination operation: #{res[:operation_id]}"
 puts "Contract address: #{res[:originated_contract]}"
 ```
 
-### Call a contract written in liquidity
-```ruby
-TezosClient.new.call_contract(
-  from: "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq",
-  amount: 0,
-  script: File.expand_path("./spec/fixtures/demo.liq"),
-  secret_key: "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN",
-  to: "KT1STzq9p2tfW3K4RdoM9iYd1htJ4QcJ8Njs",
-  entrypoint: "manage",
-  params: "(Some { destination = tz1YLtLqD1fWHthSVHPD116oYvsd4PTAHUoc; amount = 1tz })" ,
-  params_type: :caml
-)
-```
-
 ### Originate a contract written in SmartPy
 
 ```ruby
@@ -191,15 +177,6 @@ TezosClient.new.call_contract(
 
 ## Options
 
-### Liquidity options
-
-`TezosClient.new(..., liquidity_options: { options... })`
-
-Available options :
-
-* verbose (boolean) : enable verbose mode of Liquidity commands.
-
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/tezos_client/commands.rb

@@ -23,9 +23,5 @@ class TezosClient
                    :pack_data,
                    :big_map_value,
                    :list_big_map_by_contract
-
-    def_delegators :liquidity_interface,
-                   :get_storage,
-                   :liquidity_pack_data
   end
 end

data/lib/tezos_client/exceptions.rb

@@ -2,7 +2,6 @@
 
 class TezosClient
   class RpcRequestFailure < StandardError
-
     attr_reader :status_code
     attr_reader :error
 
@@ -21,9 +20,6 @@ class TezosClient
   class SysCallError < RuntimeError
   end
 
-  class LiquidityError < SysCallError
-  end
-
   class SmartPyError < SysCallError
   end
 

data/lib/tezos_client/logger.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "active_support/concern"
 
 class TezosClient

data/lib/tezos_client/operation_mgr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "tezos_client/compute_operation_args_counters"
 
 class TezosClient
@@ -199,38 +201,37 @@ class TezosClient
     end
 
     private
+      def ensure_applied!(rpc_responses)
+        metadatas = rpc_responses.map { |response| response[:metadata] }
+        operation_results = metadatas.map { |metadata| metadata[:operation_result] }
 
-    def ensure_applied!(rpc_responses)
-      metadatas = rpc_responses.map { |response| response[:metadata] }
-      operation_results = metadatas.map { |metadata| metadata[:operation_result] }
+        failed = operation_results.detect do |operation_result|
+          operation_result != nil && operation_result[:status] != "applied"
+        end
 
-      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

data/lib/tezos_client/operations/activate_account_operation.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 class TezosClient
   class ActivateAccountOperation < Operation
-
     def rpc_operation_args
       @rpc_operation_args ||= rpc_interface.activate_account_operation(
         operation_args
@@ -14,4 +15,4 @@ class TezosClient
       }
     end
   end
-end
+end

data/lib/tezos_client/operations/operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TezosClient
   class Operation
     delegate :run, :preapply, :test_and_broadcast, :broadcast, :simulate, :signed_hex, to: :operation_mgr
@@ -9,25 +11,24 @@ class TezosClient
     end
 
     protected
+      attr_reader :rpc_interface
 
-    attr_reader :rpc_interface, :liquidity_interface
-
-    def rpc_operation_args
-      raise NotImplementedError, "#{__method__} is a virtual method"
-    end
+      def rpc_operation_args
+        raise NotImplementedError, "#{__method__} is a virtual method"
+      end
 
-    def post_initialize(*_args)
-    end
+      def post_initialize(*_args)
+      end
 
-    def operation_mgr
-      @operation_mgr ||= OperationMgr.new(
-        rpc_interface: rpc_interface,
-        rpc_operation_args: rpc_operation_args,
-        **operation_options)
-    end
+      def operation_mgr
+        @operation_mgr ||= OperationMgr.new(
+          rpc_interface: rpc_interface,
+          rpc_operation_args: rpc_operation_args,
+          **operation_options)
+      end
 
-    def operation_options
-      @args.slice(:secret_key, :protocol, :branch, :ignore_counter_error)
-    end
+      def operation_options
+        @args.slice(:secret_key, :protocol, :branch, :ignore_counter_error)
+      end
   end
 end

data/lib/tezos_client/operations/operation_array.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 class TezosClient
   class OperationArray < RawOperationArray
-
     def post_initialize(operations:, **args)
       @raw_operations = operations.map do |operation|
         operation_kind = operation.delete(:kind)
@@ -15,10 +16,8 @@ class TezosClient
     end
 
     private
-
-
-    def operation_klass(operation_name)
-      "tezos_client/#{operation_name}_operation".camelize.constantize
-    end
+      def operation_klass(operation_name)
+        "tezos_client/#{operation_name}_operation".camelize.constantize
+      end
   end
-end
+end

data/lib/tezos_client/operations/origination_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TezosClient
   class OriginationOperation < Operation
     def rpc_operation_args
@@ -16,4 +18,4 @@ class TezosClient
       )
     end
   end
-end
+end

data/lib/tezos_client/operations/raw_operation_array.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 class TezosClient
   class RawOperationArray < Operation
-
     def post_initialize(raw_operations:, **args)
       @raw_operations = raw_operations.clone
     end
@@ -19,6 +20,6 @@ class TezosClient
     end
 
     private
-    attr_reader :raw_operations
+      attr_reader :raw_operations
   end
-end
+end

data/lib/tezos_client/operations/reveal_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TezosClient
   class RevealOperation < Operation
     def rpc_operation_args
@@ -6,4 +8,4 @@ class TezosClient
       )
     end
   end
-end
+end

data/lib/tezos_client/operations/transaction_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TezosClient
   class TransactionOperation < Operation
     include EncodeUtils
@@ -11,36 +13,35 @@ class TezosClient
     end
 
     private
+      def operation_args
+        operation_args = @args.slice(
+          :amount,
+          :from,
+          :to,
+          :gas_limit,
+          :storage_limit,
+          :fee,
+          :counter
+        )
+        operation_args[:parameters] = parameters if has_parameters?
 
-    def operation_args
-      operation_args = @args.slice(
-        :amount,
-        :from,
-        :to,
-        :gas_limit,
-        :storage_limit,
-        :fee,
-        :counter
-      )
-      operation_args[:parameters] = parameters if has_parameters?
-
-      operation_args
-    end
+        operation_args
+      end
 
-    def has_parameters?
-      @args.key? :parameters
-    end
+      def has_parameters?
+        @args.key? :parameters
+      end
 
-    def parameters
-      parameters = @args[:parameters].clone
-      if parameters.is_a? String
-        {
-          entrypoint: "default",
-          value: encode_args(@args[:parameters])
-        }
-      else
-        parameters
+      def parameters
+        parameters = @args[:parameters].clone
+        if parameters.is_a? String
+          {
+            entrypoint: "default",
+            value: encode_args(@args[:parameters])
+          }
+        else
+          parameters
+        end
       end
-    end
   end
-end
+end

data/lib/tezos_client/operations/transactions_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TezosClient
   class TransactionsOperation < Operation
     def rpc_operation_args
@@ -6,8 +8,7 @@ class TezosClient
           operations: operations,
           secret_key: @args.fetch(:secret_key),
           from: @args.fetch(:from),
-          rpc_interface: rpc_interface,
-          liquidity_interface: liquidity_interface
+          rpc_interface: rpc_interface
         ).rpc_operation_args
       end
     end
@@ -28,4 +29,4 @@ class TezosClient
       end
     end
   end
-end
+end

data/lib/tezos_client/rpc_interface/contracts.rb

@@ -32,8 +32,8 @@ class TezosClient
         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)
+      def big_map_value(big_map_id:, key:, key_type:)
+        expr_key = encode_script_expr(data: key, type: key_type)
 
         get "/chains/main/blocks/head/context/big_maps/#{big_map_id}/#{expr_key}"
       end

data/lib/tezos_client/rpc_interface/request_manager.rb

@@ -12,7 +12,7 @@ class TezosClient
         formatted_response = format_response(response.parsed_response)
 
         log("-------")
-        log(">>> GET #{response.request.uri.to_s} \n")
+        log(">>> GET #{response.request.uri} \n")
         log("<<< code: #{response.code} \n    exec time: #{exec_time}\n #{tezos_contents_log(formatted_response)}")
         log("-------")
         unless response.success?
@@ -68,54 +68,53 @@ class TezosClient
       end
 
       private
+        def get_error_id(error)
+          error[:id]
+        rescue TypeError, NoMethodError
+          nil
+        end
 
-      def get_error_id(error)
-        error[:id]
-      rescue TypeError, NoMethodError
-        nil
-      end
-
-      def exception_klass(error)
-        case get_error_id(error)
-        when /proto\.[^.]*\.operation\.invalid_activation/
-          TezosClient::InvalidActivation
-        when /proto\.[^.]*\.contract\.previously_revealed_key/
-          TezosClient::PreviouslyRevealedKey
-        else
-          TezosClient::RpcRequestFailure
+        def exception_klass(error)
+          case get_error_id(error)
+          when /proto\.[^.]*\.operation\.invalid_activation/
+            TezosClient::InvalidActivation
+          when /proto\.[^.]*\.contract\.previously_revealed_key/
+            TezosClient::PreviouslyRevealedKey
+          else
+            TezosClient::RpcRequestFailure
+          end
         end
-      end
 
-      def failed!(url:, code:, responses:)
-        error = responses.is_a?(Array) ? responses[0] : responses
-        raise exception_klass(error).new(
-          error: error,
-          url: url,
-          status_code: code
-        )
-      end
+        def failed!(url:, code:, responses:)
+          error = responses.is_a?(Array) ? responses[0] : responses
+          raise exception_klass(error).new(
+            error: error,
+            url: url,
+            status_code: code
+          )
+        end
 
-      def monitor_event_reader(uuid, event_handler)
-        proc do |event_response|
-          event_response.read_body do |event_json|
-            event = format_response(JSON.parse(event_json))
-            log("Monitor #{uuid}: received chunk #{event.pretty_inspect}")
-            event_handler.call(event)
+        def monitor_event_reader(uuid, event_handler)
+          proc do |event_response|
+            event_response.read_body do |event_json|
+              event = format_response(JSON.parse(event_json))
+              log("Monitor #{uuid}: received chunk #{event.pretty_inspect}")
+              event_handler.call(event)
+            end
           end
         end
-      end
 
-      def format_response(response)
-        if response.is_a? Array
-          response.map do |el|
-            (el.is_a? Hash) ? el.with_indifferent_access : el
+        def format_response(response)
+          if response.is_a? Array
+            response.map do |el|
+              (el.is_a? Hash) ? el.with_indifferent_access : el
+            end
+          elsif response.is_a? Hash
+            response.with_indifferent_access
+          else
+            response
           end
-        elsif response.is_a? Hash
-          response.with_indifferent_access
-        else
-          response
         end
-      end
     end
   end
-end
+end

data/lib/tezos_client/smartpy_inteface/micheline_serializer_wrapper.rb

@@ -14,4 +14,4 @@ class TezosClient
       end
     end
   end
-end
+end

data/lib/tezos_client/smartpy_interface.rb

@@ -30,17 +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)
+      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
 end

data/lib/tezos_client/tools/convert_to_hash.rb

@@ -5,7 +5,6 @@ class TezosClient::Tools::ConvertToHash < ActiveInteraction::Base
   interface :type
 
   def execute
-
     case type[:prim]
     when "pair"
       pair_type(data: data, type: type)
@@ -29,61 +28,60 @@ class TezosClient::Tools::ConvertToHash < ActiveInteraction::Base
   end
 
   private
+    def pair_type(data:, type:)
+      raise "Not a 'Pair' type" unless data[:prim] == "Pair"
+      raise "Difference detected between data and type \nDATA: #{data} \nTYPE:#{type} " unless data[:args].size == type[:args].size
+
+      result = {}
+      data[:args].size.times do |iter|
+        result.merge!(
+          compose(
+            TezosClient::Tools::ConvertToHash,
+            data: data[:args][iter],
+            type: type[:args][iter]
+          )
+        )
+      end
+      result
+    end
 
-  def pair_type(data:, type:)
-    raise "Not a 'Pair' type" unless data[:prim] == "Pair"
-    raise "Difference detected between data and type \nDATA: #{data} \nTYPE:#{type} " unless data[:args].size == type[:args].size
+    def list_type(data:, type:)
+      {
+        var_name(type) => convert_list_element(data: data, element_type: type[:args].first)
+      }
+    end
 
-    result = {}
-    data[:args].size.times do |iter|
-      result.merge!(
+    def convert_list_element(data:, element_type:)
+      data.map do |elem|
         compose(
           TezosClient::Tools::ConvertToHash,
-          data: data[:args][iter],
-          type: type[:args][iter]
+          data: elem,
+          type: element_type
         )
-      )
+      end
     end
-    result
-  end
 
-  def list_type(data:, type:)
-    {
-      var_name(type) => convert_list_element(data: data, element_type: type[:args].first)
-    }
-  end
-
-  def convert_list_element(data:, element_type:)
-    data.map do |elem|
-      compose(
-        TezosClient::Tools::ConvertToHash,
-        data: elem,
-        type: element_type
-      )
+    def int_type(data:, type:)
+      { var_name(type) => data[:int].to_i }
     end
-  end
-
-  def int_type(data:, type:)
-    { var_name(type) => data[:int].to_i }
-  end
 
-  def key_type(data:, type:)
-    { var_name(type) => data[:bytes] || data[:string] }
-  end
+    def key_type(data:, type:)
+      { var_name(type) => data[:bytes] || data[:string] }
+    end
 
-  def timestamp_type(data:, type:)
-    { var_name(type) => Time.zone.at(data[:int].to_i) }
-  end
+    def timestamp_type(data:, type:)
+      { var_name(type) => Time.zone.at(data[:int].to_i) }
+    end
 
-  def string_type(data:, type:)
-    { var_name(type) => data[:string] }
-  end
+    def string_type(data:, type:)
+      { var_name(type) => data[:string] }
+    end
 
-  def address_type(data:, type:)
-    { var_name(type) => data[:bytes] || data[:string] }
-  end
+    def address_type(data:, type:)
+      { var_name(type) => data[:bytes] || data[:string] }
+    end
 
-  def var_name(type)
-    "#{type[:annots].first[1..-1]}".to_sym
-  end
+    def var_name(type)
+      "#{type[:annots].first[1..-1]}".to_sym
+    end
 end

data/lib/tezos_client/tools/find_big_maps_in_storage.rb

@@ -45,12 +45,12 @@ class TezosClient::Tools::FindBigMapsInStorage < ActiveInteraction::Base
     {
       name: var_name(type),
       id: data[:int],
-      type_value: type[:args].second,
-      type_key: type[:args].first
+      value_type: type[:args].second,
+      key_type: type[:args].first
     }.with_indifferent_access
   end
 
   def var_name(type)
     "#{type[:annots].first[1..-1]}".to_sym
   end
-end
+end

data/lib/tezos_client/tools/system_call.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TezosClient
   module Tools
     module SystemCall
@@ -21,4 +23,4 @@ class TezosClient
       end
     end
   end
-end
+end

data/lib/tezos_client/tools/temporary_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TezosClient
   module Tools
     module TemporaryFile
@@ -16,7 +18,7 @@ class TezosClient
 
         res
       ensure
-        File.delete(file_copy_path) if File.exists? file_copy_path
+        File.delete(file_copy_path) if File.exist? file_copy_path
       end
 
       def self.with_tempfile(extension)
@@ -27,4 +29,4 @@ class TezosClient
       end
     end
   end
-end
+end

data/lib/tezos_client/version.rb

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

data/lib/tezos_client.rb

@@ -32,7 +32,6 @@ 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"
 
 require "tezos_client/tools/convert_to_hash"
@@ -48,7 +47,6 @@ class TezosClient
   include Crypto
 
   attr_accessor :rpc_interface
-  attr_accessor :liquidity_interface
   attr_accessor :smartpy_interface
 
   RANDOM_SIGNATURE = "edsigu165B7VFf3Dpw2QABVzEtCxJY2gsNBNcE3Ti7rRxtDUjqTFRpg67EdAQmY6YWPE5tKJDMnSTJDFu65gic8uLjbW2YwGvAZ"
@@ -56,7 +54,6 @@ class TezosClient
   def initialize(rpc_node_address: "127.0.0.1", rpc_node_port: 8732, liquidity_options: {})
     @rpc_node_address = rpc_node_address
     @rpc_node_port = rpc_node_port
-    @liquidity_options = liquidity_options
 
     @client_config_file = ENV["TEZOS_CLIENT_CONFIG_FILE"]
 
@@ -66,12 +63,6 @@ class TezosClient
     )
 
     @smartpy_interface = SmartpyInterface.new
-
-    @liquidity_interface = LiquidityInterface.new(
-      rpc_node_address: @rpc_node_address,
-      rpc_node_port: @rpc_node_port,
-      options: @liquidity_options
-    )
   end
 
   # Originates a contract on the tezos blockchain
@@ -161,7 +152,6 @@ class TezosClient
     from = public_key_to_address(public_key)
 
     operation = RevealOperation.new(
-      liquidity_interface: liquidity_interface,
       rpc_interface: rpc_interface,
       public_key: public_key,
       from: from,
@@ -172,11 +162,10 @@ class TezosClient
     broadcast_operation(operation: operation, dry_run: dry_run)
   end
 
-  def call_contract(dry_run: false, entrypoint:, params:, script: nil, params_type:, **args)
+  def call_contract(dry_run: false, entrypoint:, params:, params_type:, **args)
     json_params = micheline_params(
       params: params,
       entrypoint: entrypoint,
-      script: script,
       params_type: params_type
     )
 
@@ -194,7 +183,6 @@ class TezosClient
     from = public_key_to_address(public_key)
 
     operation = RawOperationArray.new(
-      liquidity_interface: liquidity_interface,
       rpc_interface: rpc_interface,
       public_key: public_key,
       from: from,
@@ -257,63 +245,46 @@ class TezosClient
   end
 
   private
+    def broadcast_operation(operation:, dry_run:)
+      res = if dry_run
+        operation.simulate
+      else
+        operation.test_and_broadcast
+      end
 
-  def broadcast_operation(operation:, dry_run:)
-    res = if dry_run
-      operation.simulate
-    else
-      operation.test_and_broadcast
+      res.merge(
+        rpc_operation_args: operation.rpc_operation_args
+      )
     end
 
-    res.merge(
-      rpc_operation_args: operation.rpc_operation_args
-    )
-  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,
+    def micheline_params(params:, entrypoint:, params_type:)
+      {
         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?
+        value: convert_params(
+          params: params,
+          params_type: params_type
+        )
+      }
+    end
 
-      liquidity_interface.call_parameters(
-        script: script,
-        entrypoint: entrypoint,
-        parameters: params
-      )
-    else
-      raise ::ArgumentError, "params type must be equal to [ :micheline, :caml ]"
+    def convert_params(params:,  params_type:)
+      case params_type.to_sym
+      when :micheline
+        params
+      else
+        raise ::ArgumentError, "params type must be equal to [ :micheline ]"
+      end
     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"
+    def contract_interface(script)
+      case script.to_s
+      when /[A-Za-z_\/\-]*.py/
+        smartpy_interface
+      when nil
+        raise "script var unset"
+      else
+        raise "unknown contract type"
+      end
     end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -252,8 +252,6 @@ files:
 - lib/tezos_client/currency_utils.rb
 - lib/tezos_client/encode_utils.rb
 - lib/tezos_client/exceptions.rb
-- lib/tezos_client/liquidity_inteface/liquidity_wrapper.rb
-- lib/tezos_client/liquidity_interface.rb
 - lib/tezos_client/logger.rb
 - lib/tezos_client/operation_mgr.rb
 - lib/tezos_client/operations/activate_account_operation.rb
@@ -303,7 +301,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Wrapper to the tezos client.

data/lib/tezos_client/liquidity_inteface/liquidity_wrapper.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class TezosClient
-  class LiquidityInterface
-    # Wrapper used to call the tezos-client binary
-    module LiquidityWrapper
-      def call_liquidity(command, verbose: false)
-        cmd = liquidity_cmd(verbose: verbose).concat command
-
-        Tools::SystemCall.execute(cmd)
-      rescue SysCallError => e
-        raise LiquidityError, e.message
-      end
-
-      def liquidity_cmd(verbose:)
-        liquidity_request = ["liquidity"]
-        liquidity_request << "--verbose" if verbose
-        liquidity_request << "--tezos-node"
-        liquidity_request << tezos_node.to_s
-        liquidity_request
-      end
-    end
-  end
-end

data/lib/tezos_client/liquidity_interface.rb

@@ -1,120 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "liquidity_inteface/liquidity_wrapper"
-
-class TezosClient
-  class LiquidityInterface
-    include Logger
-    include LiquidityWrapper
-
-    attr_reader :options
-
-    def initialize(rpc_node_address: "127.0.0.1", rpc_node_port: 8732, options: {})
-      @rpc_node_address = rpc_node_address
-      @rpc_node_port = rpc_node_port
-      @options = options
-    end
-
-    def format_params(params)
-      return [] if params.nil?
-      return [params] if params.is_a? String
-
-      params.map(&:to_s)
-    end
-
-    def initial_storage(args)
-      from = args.fetch :from
-      script = args.fetch :script
-      init_params = args.fetch :init_params
-      init_params = format_params(init_params)
-
-      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]
-        JSON.parse json_file.read.strip
-      end
-    end
-
-    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"
-        json_contract_script_path = "#{script_basename}.tz.json"
-
-        call_liquidity ["--json", "#{script_copy_path}"]
-
-        json_contract_script_file = File.open(json_contract_script_path)
-        json_contract_script = JSON.parse(json_contract_script_file.read)
-        json_contract_script_file.close
-
-        if File.exists? json_init_script_path
-          json_init_script_file = File.open(json_init_script_path)
-          json_init_script = JSON.parse(json_init_script_file.read)
-          json_init_script_file.close
-        end
-
-        if block_given?
-          yield(json_init_script, json_contract_script)
-        else
-          return json_init_script, json_contract_script
-        end
-
-      ensure
-        [json_init_script_path, json_contract_script_path].each do |file_path|
-          File.delete file_path if File.exists? file_path
-        end
-      end
-    end
-
-    def origination_script(args)
-      storage = initial_storage(args)
-      _json_init_script, json_contract_script = json_scripts(script: args[:script])
-
-      {
-        code: json_contract_script,
-        storage: storage
-      }
-    end
-
-    def forge_deploy(args)
-      amount = args.fetch(:amount, 0)
-      spendable = args.fetch(:spendable, false)
-      delegatable = args.fetch(:delegatable, false)
-      source = args.fetch :from
-      script = args.fetch :script
-      init_params = args.fetch :init_params
-
-      cmd_opt = ["--source", "#{source}"]
-      cmd_opt << "--spendable" if spendable
-      cmd_opt << "--delegatable" if delegatable
-      cmd_opt += ["--amount", "#{amount}tz", "#{script}", "--forge-deploy", init_params]
-      res = call_liquidity cmd_opt
-      res.strip
-    end
-
-    def tezos_node
-      "#{@rpc_node_address}:#{@rpc_node_port}"
-    end
-
-    def get_storage(script:, contract_address:)
-      res = call_liquidity ["#{script}", "--get-storage", "#{contract_address}"]
-      res.strip
-    end
-
-    def call_parameters(script:, entrypoint:, parameters:)
-      params = format_params parameters
-      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 liquidity_pack_data(data:, type:)
-      res = call_liquidity ["--pack", "#{data}", "#{type}"]
-      res.strip
-    end
-  end
-end