tezos_client 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e2dc6502a81aa8acb23cab552f03edbb1c94d7e21bfa2e653f9d662b0f2f5b5
-  data.tar.gz: 807c964c0919c93331e3e45610195705bed3ead65ca71a51f46b13d557ba4b14
+  metadata.gz: a4767efa7b67fc781a2bee7f46beefc6a40f649fc4d3639fd279f1a0fcf76ed4
+  data.tar.gz: 4fef498bf7d952d82202ee4323efa107f7456b2d2f4aabfaabc5fb20cd451a9d
 SHA512:
-  metadata.gz: 6b8d7f60f470bc533c3305cc33c007614b87461c5c0ec64e9d0a535ded2ba5707108cd5c359b89b5f292d215a2aa1ed2eaeffed9c55efa6a0c8f0dd51b46d08a
-  data.tar.gz: 80532f0a06a7f8d4e810c80ef4c90ddac5e1bf4513bb17e10bc2b1659ed0e7319ed620649f655285d03fe34b1e5a971359d7fa676192f02b0089c17a08f8bd39
+  metadata.gz: 4fcdbd1fca67c85791fd3259c29d140417f2712d458cb61d57136fe035a3aacbecfd89a1de8f47db0772481251fc6b670696044c3e424042b80afd59265530ab
+  data.tar.gz: 3a6eeff8a54d35eddaf62da354b420718805f110e2996838aab6b6a564f1e44a57bd5572a1b5a3717cec311234820e5ebbd51fb18d908064eaff861862b0f0ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (1.3.1)
+    tezos_client (1.3.2)
       active_interaction (~> 3.7)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)

data/README.md

@@ -27,7 +27,8 @@ need the tezos version (not Dune version)
 [SmartPy](https://smartpy.io/)
 
 ```bash
-sh <(curl -s https://SmartPy.io/SmartPyBasic/SmartPy.sh) local-install /
+sh <(curl -s https://smartpy.io/dev-20200924-23b26494361d96abf034bdbb1ad1af396f95fd61/cli/SmartPy.sh) local-install-auto
+export PATH=$PATH:$HOME/smartpy-cli/
 ```
 
 ### TypeScript (for dev)

data/lib/tezos_client.rb

@@ -165,14 +165,19 @@ class TezosClient
   end
 
   def call_contract(dry_run: false, entrypoint:, params:, params_type:, **args)
+    _entrypoint = select_entrypoint(
+      contract_address: args[:to],
+      entrypoint: entrypoint
+    )
+
     json_params = micheline_params(
       params: params,
-      entrypoint: entrypoint,
+      entrypoint: _entrypoint,
       params_type: params_type
     )
 
     transfer_args = args.merge(
-      entrypoint: entrypoint,
+      entrypoint: _entrypoint,
       parameters: json_params,
       dry_run: dry_run
     )
@@ -180,6 +185,18 @@ class TezosClient
     transfer(transfer_args)
   end
 
+  def select_entrypoint(contract_address:, entrypoint:)
+    entrypoints = entrypoints(contract_address)["entrypoints"].keys
+
+    if entrypoints.count == 0
+      "default"
+    elsif entrypoints.include?(entrypoint)
+      entrypoint
+    else
+      raise ::ArgumentError, "entrypoint #{entrypoint} not found in #{entrypoints}"
+    end
+  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)

data/lib/tezos_client/commands.rb

@@ -26,6 +26,7 @@ class TezosClient
                    :block_operations,
                    :contract_storage_type,
                    :entrypoint,
-                   :entrypoints
+                   :entrypoints,
+                   :select_entrypoint
   end
 end

data/lib/tezos_client/tools/hash_to_micheline.rb

@@ -22,7 +22,7 @@ class TezosClient::Tools::HashToMicheline < ActiveInteraction::Base
   # }
   hash :params, strip: false
   hash :storage_type, strip: false, default: {}
-  interface :blockchain_client, methods: %i[entrypoint entrypoints], default: -> { TezosClient.new }
+  interface :blockchain_client, methods: %i[entrypoint entrypoints select_entrypoint], default: -> { TezosClient.new }
 
   # if storage_type is not received, it is fetched from the blockchain using
   # contract_address and entrypoint (that are mandatory in this case)
@@ -83,18 +83,10 @@ class TezosClient::Tools::HashToMicheline < ActiveInteraction::Base
     end
 
     def _entrypoint
-      @_entrypoint ||= select_entrypoint
-    end
-
-    def select_entrypoint
-      entrypoints = blockchain_client.entrypoints(contract_address)["entrypoints"].keys
-      if entrypoints.count == 0
-        "default"
-      elsif entrypoints.include?(entrypoint)
-        entrypoint
-      else
-        errors.add(:entrypoint, :not_found)
-      end
+      @_entrypoint ||= blockchain_client.select_entrypoint(
+        contract_address: contract_address,
+        entrypoint: entrypoint
+      )
     end
 
     def _storage_type

data/lib/tezos_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Pierre Michard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Wrapper to the tezos client.