tezos_client 0.4.9 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d68c46e8ce54db3ab5deaaec705d5bb3f746706aaf35f592687f5282bf847225
-  data.tar.gz: f5d7effdcd2a84cebf396b2901189371bc9e2f47f092aa23fbae3bdcccd764c5
+  metadata.gz: c0a4f06598c871a6a091162764772e2314c0e066f3a802cf272bd123010c99a8
+  data.tar.gz: 379749cd74ba26165beda45f4379c84bd48ab1cd1380d142f7a1c298b8c41c97
 SHA512:
-  metadata.gz: a6edec149c2d3b5390cc97c761015511e6012b5524d5dfeb0cb3a68965c28b47af5780690e66ec8b6ef8f9e67c914b2527c26b7e413bb1a7f69f2d42db2ddd07
-  data.tar.gz: 22c34b38fd4cd477a4c4687a5db02ed0bce9fa0f70daae778ea78fbc6bca505836dd1ea6768a644f270807e33269efb54a02dfa3ec0eb9e57ad63ca8c1f5b079
+  metadata.gz: f9dba5d7b1d7ed4189fd19f798e6a0d472f81d216e6809323187a5b3328aac9c4b5d2c06145486762c1f80b8a9f2658901f57f811b1ab2c90606d852cdd15b18
+  data.tar.gz: 653e578e0b6593fc9186e449cc5af8646ee3b331e9f31000ad316ce6c078d1aba7282a39d8d2f42f709abade18ad4791d4866cce44d8de1b59c411c14646ee29

data/.gitignore

@@ -11,4 +11,7 @@
 .rspec_status
 
 # Rubymine configuration file
-.idea/*
+.idea/*
+
+# vim ctags
+.tags

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (0.4.9)
+    tezos_client (0.4.11)
       activesupport (~> 5.2.3)
       base58 (~> 0.2.3)
       bip_mnemonic (~> 0.0.2)
@@ -37,6 +37,7 @@ GEM
     base58 (0.2.3)
     bip_mnemonic (0.0.4)
     builder (3.2.3)
+    coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -73,6 +74,9 @@ GEM
     parallel (1.17.0)
     parser (2.6.4.0)
       ast (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     public_suffix (4.0.1)
     rack (2.0.7)
     rack-test (1.1.0)
@@ -147,6 +151,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop-rails_config

data/lib/tezos_client/compute_operation_args_counters.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class TezosClient
+  class ComputeOperationArgsCounters
+    def initialize(pending_operations:, operation_args:)
+      @pending_operations = pending_operations
+      @operation_args = Marshal.load(Marshal.dump(operation_args)) # deep copy of the object
+    end
+
+    def call
+      max_counter_by_source = group_by_max_counter(
+        @pending_operations["applied"].map { |operation| operation["contents"] }
+                                      .flatten
+                                      .select { |content| content.has_key?("source") }
+      )
+
+      @operation_args.each do |operation|
+        source = operation[:source]
+        # do not update the counter of an operation not present in the mempool
+        next unless max_counter_by_source[source]
+
+        operation[:counter] = (max_counter_by_source[source].to_i + 1).to_s
+        # update max_counter_by_source as if the current operation was added to the mempool
+        max_counter_by_source[source] = operation[:counter]
+      end
+
+      @operation_args
+    end
+
+    private
+      def group_by_max_counter(arr)
+        arr.map(&:with_indifferent_access)
+           .group_by { |hsh| hsh[:source] }
+           .each_with_object({}) do |(source, contents), acc|
+          acc[source] = contents.max_by { |content| content[:counter].to_i }[:counter]
+        end
+      end
+  end
+end

data/lib/tezos_client/operation_mgr.rb

@@ -1,6 +1,6 @@
+require "tezos_client/compute_operation_args_counters"
 
 class TezosClient
-
   class OperationMgr
     include Crypto
     using CurrencyUtils
@@ -16,12 +16,17 @@ class TezosClient
       @signed_operation_args_h = nil
       @branch = args[:branch]
       @protocol = args[:protocol]
+      @ignore_counter_error = args[:ignore_counter_error]
     end
 
     def multiple_operations?
       @multiple_operations
     end
 
+    def ignore_counter_error?
+      !!@ignore_counter_error
+    end
+
     def single_operation?
       !multiple_operations?
     end
@@ -86,9 +91,8 @@ class TezosClient
 
     def test_and_broadcast
       simulate_res = simulate
-
-
       op_id = broadcast
+
       {
         operation_id: op_id,
         operation_results: simulate_res[:operation_results],
@@ -108,9 +112,12 @@ class TezosClient
 
       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
+
+        metadata[:operation_result][:consumed_gas] = consumed_gas if metadata.key? :operation_result
         metadata[:operation_result]
       end
 
@@ -123,11 +130,11 @@ class TezosClient
     end
 
     def compute_consumed_gas(metadata)
-      consumed_gas = (metadata.dig(:operation_result, :consumed_gas) || "0").to_i.from_satoshi
+      consumed_gas = (metadata.dig(:operation_result, :consumed_gas) || "0").to_i
 
       if metadata.key?(:internal_operation_results)
         metadata[:internal_operation_results].each do |internal_operation_result|
-          consumed_gas += (internal_operation_result[:result][:consumed_gas] || "0").to_i.from_satoshi
+          consumed_gas += (internal_operation_result[:result][:consumed_gas] || "0").to_i
         end
       end
       consumed_gas
@@ -149,6 +156,11 @@ class TezosClient
     end
 
     def broadcast
+      self.rpc_operation_args = ::TezosClient::ComputeOperationArgsCounters.new(
+        pending_operations: rpc_interface.pending_operations,
+        operation_args: rpc_operation_args
+      ).call if ignore_counter_error?
+
       rpc_interface.broadcast_operation(signed_hex)
     end
 

data/lib/tezos_client/operations/operation.rb

@@ -1,6 +1,6 @@
 class TezosClient
   class Operation
-    delegate :run, :preapply, :test_and_broadcast, :simulate, :signed_hex, to: :operation_mgr
+    delegate :run, :preapply, :test_and_broadcast, :broadcast, :simulate, :signed_hex, to: :operation_mgr
 
     def initialize(rpc_interface:, **args)
       @rpc_interface = rpc_interface
@@ -27,7 +27,7 @@ class TezosClient
     end
 
     def operation_options
-      @args.slice(:secret_key, :protocol, :branch)
+      @args.slice(:secret_key, :protocol, :branch, :ignore_counter_error)
     end
   end
-end
+end

data/lib/tezos_client/version.rb

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

data/lib/tezos_client.rb

@@ -29,7 +29,6 @@ require "tezos_client/client_interface"
 require "tezos_client/rpc_interface"
 require "tezos_client/liquidity_interface"
 
-
 class TezosClient
   using CurrencyUtils
   using StringUtils

data/tezos_client.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-rails_config"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "vcr", "~> 4.0.0"
+  spec.add_development_dependency "pry"
 
   spec.add_dependency "base58", "~> 0.2.3"
   spec.add_dependency "httparty", "~> 0.17.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.11
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: base58
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,7 @@ files:
 - lib/tezos_client/client_interface/key.rb
 - lib/tezos_client/client_interface/misc.rb
 - lib/tezos_client/commands.rb
+- lib/tezos_client/compute_operation_args_counters.rb
 - lib/tezos_client/crypto.rb
 - lib/tezos_client/currency_utils.rb
 - lib/tezos_client/encode_utils.rb