tezos_client 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 996f52ab508d2c26e7fc291462f8758b0dd30db32415f657cc050b89cacc272e
-  data.tar.gz: 20138f2fd23c49133d839fa0963c1c0920f4525eee31d8d39a62d1afebeec1ac
+  metadata.gz: a192811cdc281656ad008df4408d830283c77f7ccf66150c0282005a68505f7c
+  data.tar.gz: d1c9561af9631e8db8c54b867983efc0e0c54c0628a8f88354fc0a0d55e861dd
 SHA512:
-  metadata.gz: 287af23b98733a8b8411e8ec85eccdd5b797f74189fd2e88aabc34fb98d997c74f52e163a7eee54611c5de7b67ea124f297b2697fd4e90f3b6c62728ab869428
-  data.tar.gz: 0d73408994a10d1d8906308faf8f5d19995e7d2cd759abe1c520c7aa1577812a55b8490a6a727afe426d7c47837fa77fd47b760b2b53b5f2f5be40bd643185f8
+  metadata.gz: 334a46f80c4e6873dbd587413589d343eaba149881f6b99dcc44c658f5c904fded810ed938748aa3085bcd70db198f74564ae1e2e5a2099a6d55b40e2c425569
+  data.tar.gz: bc6a850b461d0608f82d1929745a5c34493f4c34365e4018e3bcc1ee6f3ab7e8b26613d540e05556932166a7e6af3c4fea3db60e663898bef25518ba6593810d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (0.2.0)
+    tezos_client (0.2.1)
       activesupport (~> 5.2.0)
       base58 (~> 0.2.3)
       httparty (~> 0.16.2)

data/lib/tezos_client/operation.rb

@@ -7,8 +7,6 @@ class TezosClient
 
     attr_accessor :liquidity_interface,
                   :rpc_interface,
-                  :base_58_signature,
-                  :signed_hex,
                   :from,
                   :operation_args,
                   :rpc_args
@@ -19,9 +17,9 @@ class TezosClient
       @from = args.fetch(:from) { raise ArgumentError, "Argument :from missing" }
       @secret_key = args.fetch(:secret_key)
       @init_args = args
-      @signed = false
       @operation_args = {}
       initialize_operation_args
+      @signed_operation_args_h = nil
       @rpc_args = rpc_interface.operation(@operation_args)
     end
 
@@ -37,12 +35,16 @@ class TezosClient
       rpc_interface.head_hash
     end
 
+    def remote_counter
+      @remote_counter ||= rpc_interface.contract_counter(from) + 1
+    end
+
     def counter
-      @init_args.fetch(:counter) { rpc_interface.contract_counter(from) + 1 }
+      @counter ||= @init_args.fetch(:counter) { remote_counter }
     end
 
     def protocol
-      rpc_interface.protocols[0]
+      rpc_interface.protocol
     end
 
     def simulate_and_update_limits
@@ -61,27 +63,47 @@ class TezosClient
         secret_key: @secret_key,
         operation_hex: to_hex
       ) do |base_58_signature, signed_hex, _op_id|
+        @signed_operation_args_h = operation_args.hash
         @base_58_signature = base_58_signature
         @signed_hex = signed_hex
       end
+    end
+
+    def signed?
+      @signed_operation_args_h == operation_args.hash
+    end
+
+    def base_58_signature
+      sign unless signed?
+      @base_58_signature
+    end
 
-      @signed = true
+    def signed_hex
+      sign unless signed?
+      @signed_hex
     end
 
     def test_and_broadcast
+      # https://gitlab.com/tezos/tezos/issues/376
+      operation_args.merge!(counter: remote_counter)
+
       # simulate operations and adjust gas limits
       simulate_and_update_limits
-      sign
       operation_result = preapply
+
+      # https://gitlab.com/tezos/tezos/issues/376
+      operation_args.merge!(counter: counter)
+
       op_id = broadcast
       {
         operation_id: op_id,
-        operation_result: operation_result
+        operation_result: operation_result,
+        counter: counter
       }
     end
 
     def run
-      rpc_response = rpc_interface.run_operation(**operation_args, signature: RANDOM_SIGNATURE)
+      rpc_response = rpc_interface.run_operation(**operation_args, signature: base_58_signature)
 
       operation_result = ensure_applied!(rpc_response)
 
@@ -97,8 +119,6 @@ class TezosClient
     end
 
     def preapply
-      raise "can not preapply unsigned operations" unless @signed
-
       res = rpc_interface.preapply_operation(
         **operation_args,
         signature: base_58_signature,
@@ -108,7 +128,6 @@ class TezosClient
     end
 
     def broadcast
-      raise "can not preapply unsigned operations" unless @signed
       rpc_interface.broadcast_operation(signed_hex)
     end
 

data/lib/tezos_client/rpc_interface/context.rb

@@ -20,7 +20,8 @@ class TezosClient
       end
 
       def protocol
-        get "/protocols/main"
+        metadata = get "/chains/main/blocks/head/metadata"
+        metadata[:protocol]
       end
     end
   end

data/lib/tezos_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Pierre Michard