tezos_client 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91c8a1a25ddbd83a4e012ded7f1a05a2fdc97c08218f6b91affcf5ecf67551c
-  data.tar.gz: 76ca606aa726bb45322b9967c0ac8c3719bb7cd605b58e9d10a68982f4be2ca1
+  metadata.gz: d68c46e8ce54db3ab5deaaec705d5bb3f746706aaf35f592687f5282bf847225
+  data.tar.gz: f5d7effdcd2a84cebf396b2901189371bc9e2f47f092aa23fbae3bdcccd764c5
 SHA512:
-  metadata.gz: a14e2ec8094a5a882319291ae10b09b3a663ac13c6fad6130f00f48b61b77b067a4c6ce8ce90d2289a5613724a33f42c17225dfda689195d5551592f22b5664c
-  data.tar.gz: 7f44696344a7197c8d32716e8f4ab2bbc43b6176802815d588dd4adbe7062f4be17adeb5b8cda1e7c223ba3d268a58f7cf2789b53b19257b3e9a93c6682b8328
+  metadata.gz: a6edec149c2d3b5390cc97c761015511e6012b5524d5dfeb0cb3a68965c28b47af5780690e66ec8b6ef8f9e67c914b2527c26b7e413bb1a7f69f2d42db2ddd07
+  data.tar.gz: 22c34b38fd4cd477a4c4687a5db02ed0bce9fa0f70daae778ea78fbc6bca505836dd1ea6768a644f270807e33269efb54a02dfa3ec0eb9e57ad63ca8c1f5b079

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    tezos_client (0.4.8)
+    tezos_client (0.4.9)
       activesupport (~> 5.2.3)
       base58 (~> 0.2.3)
       bip_mnemonic (~> 0.0.2)
-      httparty (~> 0.16.2)
+      httparty (~> 0.17.0)
       money-tree (~> 0.10.0)
       rbnacl (~> 5.0.0)
       rest-client (~> 2.0.0)
@@ -49,7 +49,7 @@ GEM
     hashdiff (1.0.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.16.4)
+    httparty (0.17.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.6.0)

data/lib/tezos_client/commands.rb

@@ -17,7 +17,8 @@ class TezosClient
                    :blocks,
                    :balance,
                    :contract_manager_key,
-                   :contract_storage
+                   :contract_storage,
+                   :pending_operations
 
     def_delegators :client_interface,
                    :gen_keys,

data/lib/tezos_client/exceptions.rb

@@ -28,6 +28,18 @@ class TezosClient
     end
   end
 
+  class PreviouslyRevealedKey < RpcRequestFailure
+    attr_reader :contract
+
+    def initialize(error:, **_args)
+      @contract = error[:contract]
+
+      @message = "Previously revealed key for address #{contract}"
+
+      super
+    end
+  end
+
   class OperationFailure < Exception
     include Logger
 

data/lib/tezos_client/operation_mgr.rb

@@ -37,9 +37,9 @@ class TezosClient
     def simulate_and_update_limits
       run_result = run
 
-      run_result[:operations_result].zip(rpc_operation_args) do |operation_result, rpc_operation_args|
+      run_result[:operation_results].zip(rpc_operation_args) do |operation_result, rpc_operation_args|
         if rpc_operation_args.key?(:gas_limit)
-          rpc_operation_args[:gas_limit] = (operation_result[:consumed_gas] + 0.001).to_satoshi.to_s
+          rpc_operation_args[:gas_limit] = (operation_result[:consumed_gas].to_i.from_satoshi + 0.001).to_satoshi.to_s
         end
       end
     end
@@ -73,16 +73,25 @@ class TezosClient
       @signed_hex
     end
 
-    def test_and_broadcast
+    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,
+      }
+    end
+
+    def test_and_broadcast
+      simulate_res = simulate
 
-      operations_result = preapply
 
       op_id = broadcast
       {
         operation_id: op_id,
-        operations_result: operations_result,
+        operation_results: simulate_res[:operation_results],
       }
     end
 
@@ -97,19 +106,19 @@ class TezosClient
 
       ensure_applied!(rpc_responses)
 
-      operations_result = rpc_responses.map do |rpc_response|
+      operation_results = rpc_responses.map do |rpc_response|
         metadata = rpc_response[:metadata]
         total_consumed_storage += compute_consumed_storage(metadata)
         consumed_gas = compute_consumed_gas(metadata)
         total_consumed_gas += consumed_gas
-        { result: metadata[:operation_result], consumed_gas: consumed_gas }
+        metadata[:operation_result]
       end
 
       {
         status: :applied,
         consumed_gas: total_consumed_gas,
         consumed_storage: total_consumed_storage,
-        operations_result: operations_result
+        operation_results: operation_results
       }
     end
 
@@ -146,13 +155,14 @@ class TezosClient
     private
 
     def ensure_applied!(rpc_responses)
-      operation_results = rpc_responses.map { |response| response[:metadata][:operation_result] }
+      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
 
-      return operation_results if failed.nil?
+      return metadatas if failed.nil?
 
       failed_operation_result = operation_results.detect do |operation_result|
         operation_result[:status] == "failed"

data/lib/tezos_client/operations/operation.rb

@@ -1,6 +1,6 @@
 class TezosClient
   class Operation
-    delegate :run, :preapply, :test_and_broadcast, :signed_hex, to: :operation_mgr
+    delegate :run, :preapply, :test_and_broadcast, :simulate, :signed_hex, to: :operation_mgr
 
     def initialize(rpc_interface:, **args)
       @rpc_interface = rpc_interface

data/lib/tezos_client/operations/operation_array.rb

@@ -1,32 +1,21 @@
 class TezosClient
-  class OperationArray < Operation
+  class OperationArray < RawOperationArray
 
     def post_initialize(operations:, **args)
-      @operations = operations.clone
-    end
-
-    def rpc_operation_args
-      @rpc_operation_args ||= begin
-        initial_counter = rpc_interface.contract_counter(@args.fetch(:from)) + 1
-
-        operations.map.with_index do |operation, index|
-          counter = (initial_counter + index)
-          operation_kind = operation.delete(:kind)
-
-          operation_klass(operation_kind).new(
-            operation
-              .merge(@args.slice(:from))
-              .merge(
-                rpc_interface: rpc_interface,
-                counter: counter
-            )
-          ).rpc_operation_args
-        end
+      @raw_operations = operations.map do |operation|
+        operation_kind = operation.delete(:kind)
+        operation_klass(operation_kind).new(
+          operation.merge(
+            from: @args.fetch(:from),
+            rpc_interface: rpc_interface,
+            counter: 0 # will be set by raw_operation_array
+          )
+        ).rpc_operation_args
       end
     end
 
     private
-    attr_reader :operations
+
 
     def operation_klass(operation_name)
       "tezos_client/#{operation_name}_operation".camelize.constantize

data/lib/tezos_client/operations/raw_operation_array.rb

@@ -0,0 +1,24 @@
+class TezosClient
+  class RawOperationArray < Operation
+
+    def post_initialize(raw_operations:, **args)
+      @raw_operations = raw_operations.clone
+    end
+
+    def rpc_operation_args
+      @rpc_operation_args ||= begin
+        initial_counter = rpc_interface.contract_counter(@args.fetch(:from)) + 1
+
+        raw_operations.map.with_index do |operation, index|
+          counter = (initial_counter + index)
+          operation.merge(
+            counter: counter.to_s
+          )
+        end
+      end
+    end
+
+    private
+    attr_reader :raw_operations
+  end
+end

data/lib/tezos_client/operations/transaction_operation.rb

@@ -3,9 +3,11 @@ class TezosClient
     include EncodeUtils
 
     def rpc_operation_args
-      rpc_interface.transaction_operation(
-        operation_args
-      )
+      @rpc_operation_args ||= begin
+        rpc_interface.transaction_operation(
+          operation_args
+        )
+      end
     end
 
     private

data/lib/tezos_client/rpc_interface/helper.rb

@@ -27,7 +27,7 @@ class TezosClient
           kind: "origination",
           delegatable: args.fetch(:delegatable, false),
           spendable: args.fetch(:spendable, false),
-          balance: args.fetch(:amount,0).to_satoshi.to_s,
+          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,

data/lib/tezos_client/rpc_interface/operations.rb

@@ -39,6 +39,10 @@ class TezosClient
       def broadcast_operation(data)
         post("injection/operation?chain=main", data)
       end
+
+      def pending_operations
+        get("chains/main/mempool/pending_operations")
+      end
     end
   end
 end

data/lib/tezos_client/rpc_interface/request_manager.rb

@@ -5,13 +5,15 @@ class TezosClient
     module RequestManager
       def get(path, query: {})
         url = "http://#{@host}:#{@port}/#{path}"
-
-        response = HTTParty.get(url, headers: { "Content-Type" => "application/json" }, query: query)
+        response = nil
+        exec_time = Benchmark.realtime do
+          response = HTTParty.get(url, headers: { "Content-Type" => "application/json" }, query: query)
+        end
         formatted_response = format_response(response.parsed_response)
 
         log("-------")
         log(">>> GET #{response.request.uri.to_s} \n")
-        log("<<< code: #{response.code} \n #{tezos_contents_log(formatted_response)}")
+        log("<<< code: #{response.code} \n    exec time: #{exec_time}\n #{tezos_contents_log(formatted_response)}")
         log("-------")
         unless response.success?
           failed!(url: url, code: response.code, responses: formatted_response)
@@ -22,15 +24,19 @@ class TezosClient
 
       def post(path, content)
         url = "http://#{@host}:#{@port}/#{path}"
-        response = HTTParty.post(url,
-                                 body: content.to_json,
-                                 headers: { "Content-Type" => "application/json" })
+
+        response = nil
+        exec_time = Benchmark.realtime do
+          response = HTTParty.post(url,
+                                   body: content.to_json,
+                                   headers: { "Content-Type" => "application/json" })
+        end
 
         formatted_response = format_response(response.parsed_response)
 
         log("-------")
         log(">>> POST #{url} \n #{tezos_contents_log(content)}")
-        log("<<< code: #{response.code} \n #{tezos_contents_log(formatted_response)}")
+        log("<<< code: #{response.code} \n    exec time: #{exec_time} \n #{tezos_contents_log(formatted_response)}")
         log("-------")
 
         unless response.success?
@@ -71,15 +77,17 @@ class TezosClient
 
       def exception_klass(error)
         case get_error_id(error)
-        when "proto.003-PsddFKi3.operation.invalid_activation"
+        when /proto\.[^.]*\.operation\.invalid_activation/
           TezosClient::InvalidActivation
+        when /proto\.[^.]*\.contract\.previously_revealed_key/
+          TezosClient::PreviouslyRevealedKey
         else
           TezosClient::RpcRequestFailure
         end
       end
 
       def failed!(url:, code:, responses:)
-        error = responses[0]
+        error = responses.is_a?(String) ? responses : responses[0]
         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.8"
+  VERSION = "0.4.9"
 end

data/lib/tezos_client.rb

@@ -5,6 +5,7 @@ require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/module/delegation"
 require "timeout"
+require "benchmark"
 
 require "tezos_client/version"
 require "tezos_client/string_utils"
@@ -21,6 +22,7 @@ require "tezos_client/operations/transaction_operation"
 require "tezos_client/operations/transactions_operation"
 require "tezos_client/operations/activate_account_operation"
 require "tezos_client/operations/reveal_operation"
+require "tezos_client/operations/raw_operation_array"
 require "tezos_client/operations/operation_array"
 
 require "tezos_client/client_interface"
@@ -78,7 +80,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, **args)
+  def originate_contract(from:, amount:, secret_key:, script: nil, init_params: nil, dry_run: false, **args)
     origination_args = {
       rpc_interface: rpc_interface,
       from: from,
@@ -95,9 +97,12 @@ class TezosClient
       )
     end
 
-    res = OriginationOperation.new(origination_args).test_and_broadcast
+    operation = OriginationOperation.new(origination_args)
+    res = broadcast_operation(operation: operation, dry_run: dry_run)
 
-    res.merge(originated_contract: res[:operations_result][0][:originated_contracts][0])
+    res.merge(
+      originated_contract: res[:operation_results][0][:originated_contracts][0]
+    )
   end
 
   # Transfer funds to an account
@@ -110,51 +115,59 @@ class TezosClient
   #
   # @return [Hash] result of the transfer containing :operation_id and :operation_result
   #
-  def transfer(from:, amount:, to:, secret_key:, **args)
-    TransactionOperation.new(
+  def transfer(from:, amount:, to:, secret_key:, dry_run: false, **args)
+    operation = TransactionOperation.new(
       rpc_interface: rpc_interface,
       from: from,
       to: to,
       secret_key: secret_key,
       amount: amount,
       **args
-    ).test_and_broadcast
+    )
+
+    broadcast_operation(operation: operation, dry_run: dry_run)
   end
 
-  def activate_account(pkh:, secret:, **args)
-    ActivateAccountOperation.new(
+  def activate_account(pkh:, secret:, dry_run: false, **args)
+    operation = ActivateAccountOperation.new(
       rpc_interface: rpc_interface,
       pkh: pkh,
       secret: secret,
       **args
-    ).test_and_broadcast
+    )
+
+    broadcast_operation(operation: operation, dry_run: dry_run)
   end
 
-  def transfer_to_many(from:, amounts:, secret_key:, **args)
-    TransactionsOperation.new(
+  def transfer_to_many(from:, amounts:, secret_key:, dry_run: false, **args)
+    operation = TransactionsOperation.new(
       rpc_interface: rpc_interface,
       from: from,
       amounts: amounts,
       secret_key: secret_key,
       **args
-    ).test_and_broadcast
+    )
+
+    broadcast_operation(operation: operation, dry_run: dry_run)
   end
 
-  def reveal_pubkey(secret_key:, **args)
+  def reveal_pubkey(secret_key:, dry_run: false, **args)
     public_key = secret_key_to_public_key(secret_key)
     from = public_key_to_address(public_key)
 
-    RevealOperation.new(
+    operation = RevealOperation.new(
       liquidity_interface: liquidity_interface,
       rpc_interface: rpc_interface,
       public_key: public_key,
       from: from,
       secret_key: secret_key,
       **args
-    ).test_and_broadcast
+    )
+
+    broadcast_operation(operation: operation, dry_run: dry_run)
   end
 
-  def call_contract(args)
+  def call_contract(dry_run: false, **args)
     parameters = args.fetch(:parameters)
 
     json_params = liquidity_interface.call_parameters(
@@ -162,11 +175,28 @@ class TezosClient
       parameters: parameters
     )
 
-    transfer_args = args.merge(parameters: json_params)
+    transfer_args = args.merge(parameters: json_params, dry_run: dry_run)
 
     transfer(transfer_args)
   end
 
+  def inject_raw_operations(secret_key:, raw_operations:, dry_run: false, **args)
+    public_key = secret_key_to_public_key(secret_key)
+    from = public_key_to_address(public_key)
+
+    operation = RawOperationArray.new(
+      liquidity_interface: liquidity_interface,
+      rpc_interface: rpc_interface,
+      public_key: public_key,
+      from: from,
+      secret_key: secret_key,
+      raw_operations: raw_operations,
+      **args
+    )
+
+    broadcast_operation(operation: operation, dry_run: dry_run)
+  end
+
   def monitor_operation(operation_id, timeout: 120)
     including_block = nil
 
@@ -204,4 +234,18 @@ class TezosClient
     operations.flatten.include? operation_id
   end
 
+  private
+
+  def broadcast_operation(operation:, dry_run:)
+    res = if dry_run
+      operation.simulate
+    else
+      operation.test_and_broadcast
+    end
+
+    res.merge(
+      rpc_operation_args: operation.rpc_operation_args
+    )
+  end
+
 end

data/tezos_client.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr", "~> 4.0.0"
 
   spec.add_dependency "base58", "~> 0.2.3"
-  spec.add_dependency "httparty", "~> 0.16.2"
+  spec.add_dependency "httparty", "~> 0.17.0"
   spec.add_dependency "rbnacl", "~> 5.0.0"
   spec.add_dependency "rest-client", "~>2.0.0"
   spec.add_dependency "activesupport", "~> 5.2.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +232,7 @@ files:
 - lib/tezos_client/operations/operation.rb
 - lib/tezos_client/operations/operation_array.rb
 - lib/tezos_client/operations/origination_operation.rb
+- lib/tezos_client/operations/raw_operation_array.rb
 - lib/tezos_client/operations/reveal_operation.rb
 - lib/tezos_client/operations/transaction_operation.rb
 - lib/tezos_client/operations/transactions_operation.rb