tezos_client 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0710a2763a47abefbb6eae49ea155d4c25a286b285d36811c8bb283095589959
-  data.tar.gz: 418d5d18d291c6bd0bb9f0435b9020646094fbe82f83bca54af25d19f062c107
+  metadata.gz: d191f6b28c2a8681bc8a72dbe4dd568ae4aa1450038ad7955eaec89764b9abc9
+  data.tar.gz: a116964161e26140dd3dc4ed47c412730450ca64394854bc57b9576d8f5045b9
 SHA512:
-  metadata.gz: fd86a0c6682019234cb89aba9f31a430f5d9431c5ad2df68b3d9d730ae0182a47f4a5b88c7710fb8d47eb1ab2d12fcd3b6403907d6fc9ed5dcd054ca2e210b33
-  data.tar.gz: d4f3d711a84ef597390f3bd7650b464f3838830f3bdcbdf5d38f71d05f9a3dc34193bee4e5e8e7f580f05b62aed1778b12f9a0a2d095484db605b220149007d3
+  metadata.gz: 92227209a94115e2c54d8d0e70b2c21c93f8ea9d8575ae1ddd281cb2ec5e2fa0e2db533312ace225fb89ba69941bbd977c9bc1030aff47bd60e36913127ca59c
+  data.tar.gz: 11a3cb9cc888ad1aab359f72bc7a6b5c9b62c11854836e676c4ba005c974eae1d2ae05f28fcbf5cdcbb8440f105d92706496eedb10bc2c01543639a94062ee6b

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    tezos_client (2.0.0)
+    tezos_client (2.1.0)
       active_interaction (>= 3.8)
-      activesupport (>= 6.0)
+      activesupport (< 7.1.0)
       base58 (~> 0.2.3)
       bip_mnemonic (~> 0.0.2)
       httparty (~> 0.21.0)
@@ -14,108 +14,76 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.4.3)
-      activesupport (= 7.0.4.3)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_interaction (5.2.0)
+    active_interaction (5.3.0)
       activemodel (>= 5.2, < 8)
       activesupport (>= 5.2, < 8)
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.4)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base58 (0.2.3)
-    bech32 (1.3.0)
+    bech32 (1.4.2)
       thor (>= 1.1.0)
+    bigdecimal (3.1.6)
     bip_mnemonic (0.0.4)
-    builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    crack (0.4.5)
+    concurrent-ruby (1.2.3)
+    crack (0.4.6)
+      bigdecimal
       rexml
-    crass (1.0.6)
     diff-lcs (1.5.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    erubi (1.12.0)
-    ffi (1.15.5)
-    hashdiff (1.0.1)
+    domain_name (0.6.20240107)
+    ffi (1.16.3)
+    hashdiff (1.1.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    loofah (2.20.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    mime-types (3.4.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
-    mini_mime (1.1.2)
-    minitest (5.18.0)
+    mime-types-data (3.2023.1205)
+    mini_mime (1.1.5)
+    minitest (5.21.2)
     money-tree (0.11.2)
       bech32 (~> 1.3)
       openssl (~> 3.1)
     multi_xml (0.6.0)
     netrc (0.11.0)
-    nokogiri (1.14.3-x86_64-darwin)
-      racc (~> 1.4)
-    openssl (3.1.0)
-    parallel (1.23.0)
-    parser (3.2.2.0)
+    openssl (3.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.1)
-    racc (1.6.2)
-    rack (2.2.6.4)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+    public_suffix (5.0.4)
+    racc (1.7.3)
+    rack (3.0.9)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rbnacl (7.1.1)
       ffi
-    regexp_parser (2.8.0)
+    regexp_parser (2.9.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -125,58 +93,59 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.50.2)
+    rspec-support (3.12.1)
+    rubocop (1.60.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-minitest (0.30.0)
+    rubocop-md (1.2.2)
+      rubocop (>= 1.0)
+    rubocop-minitest (0.34.5)
       rubocop (>= 1.39, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-packaging (0.5.2)
       rubocop (>= 1.33, < 2.0)
-    rubocop-performance (1.17.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.19.1)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-    rubocop-rails_config (1.12.1)
-      railties (>= 5.0)
-      rubocop (>= 1.39.0)
-      rubocop-ast (>= 1.0.1)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails_config (1.16.0)
+      rubocop (>= 1.57.0)
+      rubocop-ast (>= 1.26.0)
+      rubocop-md
       rubocop-minitest (~> 0.22)
       rubocop-packaging (~> 0.5)
       rubocop-performance (~> 1.11)
       rubocop-rails (~> 2.0)
     ruby-progressbar (1.13.0)
-    thor (1.2.1)
+    thor (1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     vcr (4.0.0)
-    webmock (3.18.1)
+    webmock (3.19.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.7)
 
 PLATFORMS
-  x86_64-darwin-22
+  arm64-darwin-22
 
 DEPENDENCIES
   bundler (~> 2.1)
@@ -189,4 +158,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.26
+   2.4.20

data/README.md

@@ -4,16 +4,16 @@
 
 [![Build Status](https://travis-ci.org/moneytrackio/tezos_client.svg?branch=master)](https://travis-ci.org/moneytrackio/tezos_client)
 
-Tezos Client interacts with Tezos nodes using RPC commands. 
+Tezos Client interacts with Tezos nodes using RPC commands.
 
 ## Requirements
 
 Tezos client requires SmartPy to be installed in order to work properly.
-To install it on Linux, you can basically follow the steps coded in travis-script folder. 
+To install it on Linux, you can basically follow the steps coded in travis-script folder.
 
-## Dependency 
+## Dependency
 
-### michelson-to-micheline 
+### michelson-to-micheline
 ```bash
 sudo apt-get install nodejs
 npm i -g michelson-to-micheline
@@ -37,7 +37,7 @@ npm install -g typescript
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'tezos_client'
+gem "tezos_client"
 ```
 
 And then execute:
@@ -54,13 +54,13 @@ Or install it yourself as:
 
 Generate a perfectly random key pair:
 
-```ruby 
-client = TezosClient.new 
+```ruby
+client = TezosClient.new
 key = subject.generate_key
           expect(key[:address]).to eq "tz1RfnzRopJXH32SSDap2wMYGULBAnmHxdP1"
 # => {
-#       secret_key: "edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2", 
-#       public_key: "edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr", 
+#       secret_key: "edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2",
+#       public_key: "edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr",
 #       address: "tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
 #    }
 ```
@@ -68,11 +68,11 @@ key = subject.generate_key
 Generate a key pair from a seed and a BIP 44 Path:
 
 ```ruby
-key = subject.generate_key(wallet_seed:"000102030405060708090a0b0c0d0e0f", path: "m/44'/1729'/0'/0'/0'")
+key = subject.generate_key(wallet_seed: "000102030405060708090a0b0c0d0e0f", path: "m/44'/1729'/0'/0'/0'")
           expect(key[:address]).to eq "tz1RfnzRopJXH32SSDap2wMYGULBAnmHxdP1"
 # => {
-#       secret_key: "edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2", 
-#       public_key: "edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr", 
+#       secret_key: "edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2",
+#       public_key: "edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr",
 #       address: "tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
 #    }
 ```
@@ -80,12 +80,12 @@ Generate a key pair from a BIP-39 mnemonic sentence and a BIP 44 Path:
 
 ```ruby
 key = subject.generate_key(
-          mnemonic: "below dove cushion divide future artefact orange congress maple fiscal flower enable", 
+          mnemonic: "below dove cushion divide future artefact orange congress maple fiscal flower enable",
           path: "m/44'/1729'/0'/0'/0'")
           expect(key[:address]).to eq "tz1RfnzRopJXH32SSDap2wMYGULBAnmHxdP1"
 # => {
-#       secret_key: "edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2", 
-#       public_key: "edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr", 
+#       secret_key: "edsk4T2fHv5RLL3VSXHz82SQiyFx7vZ4wwtA2u67AvAaw5yqNEvuU2",
+#       public_key: "edpkuncp7KSVhV57Qg7odwhMFcnAHnNrMppbitBPKBfvdg6fFVeNjr",
 #       address: "tz1a97x7GAvMDyrwwKTLQo131CoidXyUef48"
 #    }
 ```
@@ -93,28 +93,28 @@ key = subject.generate_key(
 
 ### Transfer funds
 
-```ruby 
-client = TezosClient.new 
+```ruby
+client = TezosClient.new
 
 client.transfer(
     amount: 1,
     from: "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq",
     to: "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq",
     secret_key: "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN"
-)
+  )
 ```
 
 ### Call a contract
 
 ```ruby
-client = TezosClient.new  
+client = TezosClient.new
 client.transfer(
     amount: 5,
     from: "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq",
     to: "KT1MZTrMDPB42P9yvjf7Cy8Lkjxjj4jetbCt",
     secret_key: "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN",
     parameters: '"pro"'
-)
+  )
 ```
 
 ### Originate a contract written in SmartPy
@@ -123,8 +123,8 @@ client.transfer(
 script = File.expand_path("./spec/fixtures/demo.py")
 source = "tz1ZWiiPXowuhN1UqNGVTrgNyf5tdxp4XUUq"
 secret_key = "edsk4EcqupPmaebat5mP57ZQ3zo8NDkwv8vQmafdYZyeXxrSc72pjN"
-amount =  0
-init_params= "MyContract()"
+amount = 0
+init_params = "MyContract()"
 client = TezosClient.new
 
 res = client.originate_contract(
@@ -133,7 +133,7 @@ res = client.originate_contract(
     script: script,
     secret_key: secret_key,
     init_params: init_params
-)
+  )
 
 puts "Origination operation: #{res[:operation_id]}"
 puts "Contract address: #{res[:originated_contract]}"

data/lib/tezos_client/operations/operation.rb

@@ -22,9 +22,11 @@ class TezosClient
 
       def operation_mgr
         @operation_mgr ||= OperationMgr.new(
-          rpc_interface: rpc_interface,
-          rpc_operation_args: rpc_operation_args,
-          **operation_options)
+          **operation_options.merge(
+            rpc_interface: rpc_interface,
+            rpc_operation_args: rpc_operation_args,
+          )
+        )
       end
 
       def operation_options

data/lib/tezos_client/operations/operation_array.rb

@@ -5,8 +5,9 @@ class TezosClient
     def post_initialize(operations:, **args)
       @raw_operations = operations.map do |operation|
         operation_kind = operation.delete(:kind)
-        operation_klass(operation_kind).new(
-          operation.merge(
+        operation_object = operation_klass(operation_kind)
+        operation_object.new(
+          **operation.merge(
             from: @args.fetch(:from),
             rpc_interface: rpc_interface,
             counter: 0 # will be set by raw_operation_array

data/lib/tezos_client/operations/transaction_operation.rb

@@ -5,9 +5,7 @@ class TezosClient
     include EncodeUtils
 
     def rpc_operation_args
-      @rpc_operation_args ||= rpc_interface.transaction_operation(
-          operation_args
-        )
+      @rpc_operation_args ||= rpc_interface.transaction_operation(**operation_args)
     end
 
     private

data/lib/tezos_client/tools/convert_to_hash/pair.rb

@@ -17,48 +17,47 @@ class TezosClient
         end
 
         private
-
-        def normalized_type
-          if type[:args].size > 2
-            {
-              prim: "pair",
-              args: [
-                type[:args][0],
-                {
-                  prim: "pair",
-                  args: type[:args][1..]
-                }
-              ]
-            }
-          else
-            type
+          def normalized_type
+            if type[:args].size > 2
+              {
+                prim: "pair",
+                args: [
+                  type[:args][0],
+                  {
+                    prim: "pair",
+                    args: type[:args][1..nil]
+                  }
+                ]
+              }
+            else
+              type
+            end
           end
-        end
 
-        def expanded_data
-          if data.is_a?(Array)
-            {prim: "Pair", args: data}
-          else
-            data
+          def expanded_data
+            if data.is_a?(Array)
+              { prim: "Pair", args: data }
+            else
+              data
+            end
           end
-        end
 
-        def normalized_data
-          if expanded_data[:args].size > 2
-            {
-              prim: "Pair",
-              args: [
-                expanded_data[:args][0],
-                {
-                  prim: "Pair",
-                  args: expanded_data[:args][1..]
-                }
-              ]
-            }
-          else
-            expanded_data
+          def normalized_data
+            if expanded_data[:args].size > 2
+              {
+                prim: "Pair",
+                args: [
+                  expanded_data[:args][0],
+                  {
+                    prim: "Pair",
+                    args: expanded_data[:args][1..nil]
+                  }
+                ]
+              }
+            else
+              expanded_data
+            end
           end
-        end
       end
     end
   end

data/lib/tezos_client/version.rb

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

data/lib/tezos_client.rb

@@ -97,7 +97,7 @@ class TezosClient
       **args
     )
 
-    operation = OriginationOperation.new(origination_args)
+    operation = OriginationOperation.new(**origination_args)
     res = broadcast_operation(operation: operation, dry_run: dry_run)
 
     res.merge(
@@ -167,7 +167,7 @@ class TezosClient
   end
 
   def build_transaction(dry_run: false, entrypoint:, params:, params_type:, **args)
-    transfer_args = transfer_args(dry_run: dry_run, entrypoint: entrypoint, params: params, params_type:params_type, **args)
+    transfer_args = transfer_args(dry_run: dry_run, entrypoint: entrypoint, params: params, params_type: params_type, **args)
 
     transaction = TransactionOperation.new(
       rpc_interface: rpc_interface,
@@ -181,10 +181,10 @@ class TezosClient
     transfer_args = transfer_args(dry_run: dry_run,
                                   entrypoint: entrypoint,
                                   params: params,
-                                  params_type:params_type,
+                                  params_type: params_type,
                                   **args)
 
-    transfer(transfer_args)
+    transfer(**transfer_args)
   end
 
   def select_entrypoint(contract_address:, entrypoint:)
@@ -320,7 +320,7 @@ class TezosClient
 
     def contract_interface(script)
       case script.to_s
-      when /[A-Za-z_\/\-]*.py/
+      when /[A-Za-z_\/-]*.py/
         smartpy_interface
       when nil
         raise "script var unset"

data/tezos_client.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty", "~> 0.21.0"
   spec.add_dependency "rbnacl", "~> 7.1"
   spec.add_dependency "rest-client", "~> 2.1"
-  spec.add_dependency "activesupport", ">= 6.0"
+  spec.add_dependency "activesupport", "< 7.1.0"
   spec.add_dependency "money-tree", "~> 0.11.2"
   spec.add_dependency "bip_mnemonic", "~> 0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Pierre Michard
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,16 +184,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: money-tree
   requirement: !ruby/object:Gem::Requirement
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: Wrapper to the tezos client.