tezos_client 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 462e81ddcbebfb1cecb9c99b577810e47aa7b657b5cc3f88b3e2ffd8e23fc326
-  data.tar.gz: 1c87b82243cac80fcde31551471f25d98623c0bfa323f4eccd238ee3f776f93e
+  metadata.gz: 6918aa7a0020b8bc535f58720f2a330cd5842821f9fe4106ad6a419a3a2144f6
+  data.tar.gz: 92ea0ac98411dbaf325ba5a4de15b9d7e20c0fdc2f2a39c8385a68316a9be62d
 SHA512:
-  metadata.gz: 8ab7ba2e5e37024370536a0f31d0e6da53c31a74227d6f903b79d83e9ad700f3be4c710aac1135237ad287e99c1fbb93860ff37d8f0f4cc8dffe89a43ed81cc2
-  data.tar.gz: e1e0c5752ed8d64fe2b83b24779262d52d0c9b7136c7df6ca8cddc0d278aada1476df47efa7254188872f3684b7295834fbd979191b7788c22be2e0f79862a2f
+  metadata.gz: 73c784ec8610a4134a06e3eafe65e35f898ec319da10b55f4eb843ad081e0a7420782dee94913ba24cfe38cb136646b8df86de3cdb6ccf548a65f656f5386f46
+  data.tar.gz: e05b46acbc78a971de657dd85a8f20eb4b964958309df343a4c78950f246300123591592778870a2826d80b8bab116bca53c34d894f1dabd19f4de9bfe310171

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (0.4.13)
+    tezos_client (0.4.15)
       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.11.1)
+    ffi (1.11.3)
     hashdiff (1.0.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -57,7 +57,7 @@ GEM
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.3)
-    loofah (2.3.0)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
@@ -70,7 +70,7 @@ GEM
       ffi
     multi_xml (0.6.0)
     netrc (0.11.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     parallel (1.18.0)
     parser (2.6.5.0)

data/lib/tezos_client/client_interface/block_contextual.rb

@@ -5,9 +5,9 @@ class TezosClient
     # 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 = "#{cmd} --dry-run" if dry_run
-        cmd = "#{cmd} --arg #{arg}" unless 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

data/lib/tezos_client/client_interface/client_wrapper.rb

@@ -5,8 +5,8 @@ class TezosClient
     # 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|
+        cmd = client_cmd + command
+        Open3.popen3(*cmd) do |_stdin, stdout, stderr, wait_thr|
           err = stderr.read
           status = wait_thr.value.exitstatus
 
@@ -26,9 +26,9 @@ class TezosClient
       end
 
       def client_cmd
-        res = "tezos-client -l"
+        res = ["tezos-client", "-l"]
         if config_file
-          res = "#{res} -c #{config_file}"
+          res += ["-c", config_file]
         end
         res
       end

data/lib/tezos_client/client_interface/contract.rb

@@ -5,7 +5,7 @@ class TezosClient
     # Commands managing keys and accounts
     module Contract
       def known_contracts
-        res = call_client("list known contracts")
+        res = call_client(["list", "known", "contracts"])
         res.lines.reduce({}) do |acc, contract_output|
           address_format = /([^:]+): (\w+)/
           res = address_format.match(contract_output)

data/lib/tezos_client/client_interface/key.rb

@@ -5,11 +5,11 @@ class TezosClient
     # Commands managing keys and accounts
     module Key
       def gen_keys(name)
-        call_client("gen keys #{name}")
+        call_client(["gen", "keys", name])
       end
 
       def addresses
-        output = call_client("list known addresses")
+        output = call_client(["list", "known", "addresses"])
         output.lines.reduce({}) do |acc, address_output|
           address_format = /([^:]+): (\w+) /
           res = address_format.match(address_output)
@@ -18,15 +18,15 @@ class TezosClient
       end
 
       def import_public_key(name, public_key, force: false)
-        cmd = "import public key #{name} #{public_key}"
-        cmd = "#{cmd} --force" if force
+        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 = "#{cmd} --force" if force
+        cmd = ["import", "secret", "key", name, secret_key]
+        cmd << "--force" if force
 
         call_client(cmd)
       end

data/lib/tezos_client/client_interface/misc.rb

@@ -7,7 +7,7 @@ class TezosClient
   class ClientInterface
     module Misc
       def bootstrapped
-        call_client("bootstrapped") do |output|
+        call_client(["bootstrapped"]) do |output|
           output_format = /Current head: ([^ ]+) \(timestamp: ([^,]+), validation: (.+)\)/
           res = output_format.match(output)
           head = res[1]

data/lib/tezos_client/liquidity_inteface/liquidity_wrapper.rb

@@ -5,17 +5,17 @@ class TezosClient
     # Wrapper used to call the tezos-client binary
     module LiquidityWrapper
       def call_liquidity(command, verbose: false)
-        cmd = "#{liquidity_cmd(verbose: verbose)} #{command}"
-        log cmd
-        Open3.popen3(cmd) do |_stdin, stdout, stderr, wait_thr|
+        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
 
-          log err
           output = stdout.read
 
           if block_given?
@@ -27,8 +27,11 @@ class TezosClient
       end
 
       def liquidity_cmd(verbose:)
-        verbose_option = verbose ? "--verbose" : ""
-        "liquidity #{verbose_option} --tezos-node #{tezos_node}"
+        liquidity_request = ["liquidity"]
+        liquidity_request << "--verbose" if verbose
+        liquidity_request << "--tezos-node"
+        liquidity_request << tezos_node.to_s
+        liquidity_request
       end
     end
   end

data/lib/tezos_client/liquidity_interface.rb

@@ -16,10 +16,10 @@ class TezosClient
     end
 
     def format_params(params)
-      return "" if params.nil?
+      return [] if params.nil?
+      return [params] if params.is_a? String
 
-      params = [params] if params.is_a? String
-      params.map { |s| "'#{s}'" }.join(" ")
+      params
     end
 
     def initial_storage(args)
@@ -29,7 +29,9 @@ class TezosClient
       init_params = format_params(init_params)
 
       with_tempfile(".json") do |json_file|
-        call_liquidity "--source #{from} --json #{script} -o #{json_file.path} --init-storage #{init_params}", verbose: options[:verbose]
+        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
@@ -67,7 +69,7 @@ class TezosClient
         json_init_script_path = "#{script_basename}.initializer.tz.json"
         json_contract_script_path = "#{script_basename}.tz.json"
 
-        call_liquidity "--json #{script_copy_path}"
+        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)
@@ -110,7 +112,11 @@ class TezosClient
       script = args.fetch :script
       init_params = args.fetch :init_params
 
-      res = call_liquidity "--source #{source} #{spendable ? '--spendable' : ''} #{delegatable ? '--delegatable' : ''} --amount #{amount}tz #{script} --forge-deploy '#{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
 
@@ -119,20 +125,20 @@ class TezosClient
     end
 
     def get_storage(script:, contract_address:)
-      res = call_liquidity "#{script} --get-storage #{contract_address}"
+      res = call_liquidity ["#{script}", "--get-storage", "#{contract_address}"]
       res.strip
     end
 
     def call_parameters(script:, parameters:)
-      parameters = format_params(parameters)
+      params = format_params parameters
       with_tempfile(".json") do |json_file|
-        res = call_liquidity "--json -o #{json_file.path} #{script} --data #{parameters}"
+        res = call_liquidity ["--json", "-o", "#{json_file.path}", "#{script}", "--data"] + params
         JSON.parse res
       end
     end
 
     def pack_data(data:, type:)
-      res = call_liquidity "--pack '#{data}' '#{type}'"
+      res = call_liquidity ["--pack", "#{data}", "#{type}"]
       res.strip
     end
   end

data/lib/tezos_client/rpc_interface/request_manager.rb

@@ -71,7 +71,7 @@ class TezosClient
 
       def get_error_id(error)
         error[:id]
-      rescue TypeError
+      rescue TypeError, NoMethodError
         nil
       end
 
@@ -87,7 +87,7 @@ class TezosClient
       end
 
       def failed!(url:, code:, responses:)
-        error = responses.is_a?(String) ? responses : responses[0]
+        error = responses.is_a?(Array) ? responses[0] : responses
         raise exception_klass(error).new(
           error: error,
           url: url,

data/lib/tezos_client/version.rb

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

data/lib/tezos_client.rb

@@ -229,8 +229,17 @@ class TezosClient
   end
 
   def block_include_operation?(operation_id, block_id)
+    retries ||= 0
+
     operations = rpc_interface.get("chains/main/blocks/#{block_id}/operation_hashes")
     operations.flatten.include? operation_id
+  rescue TezosClient::RpcRequestFailure
+    if (retries += 1) < 3
+      sleep(2)
+      retry
+    else
+      raise
+    end
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -285,7 +285,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Wrapper to the tezos client.