tezos_client 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee3c68e5d6cffc2ac7406a7c4084e3552c47cbd68c03570e4ca1df7bc390514a
-  data.tar.gz: ec225c29031adde39b24b28a8b8f16188284da34c3afc0aafd788a95300f2b52
+  metadata.gz: b34f7593bef70d5be1219dd4beba9e00f6114da81783148585312cd32eeb82e8
+  data.tar.gz: 862385f6e2fbf82ac12ab9ce912939b9a9499a10a856d447da5d9878afc08ce5
 SHA512:
-  metadata.gz: baf64e4c19c600a270cc0fe653e5825113557f32368db57d10e449b5458a75c1c5931de4e6e1b123cdc7d183b977ae15085150de2a57458b1a477c18344d7321
-  data.tar.gz: d41ef55a2ca3cf47615fea6860dff285bef062f86553ca558934b11717b545b21068ee33bedf8192e50596805b49e39a0ebf32644078f669275ac95dd0d572cd
+  metadata.gz: fbf5f33ee51bc2a45edaed55c67bfa7d58addbcc5668eb87198765cdfd50e387bda96769ef238f63011c78e66f802efc89ef293cdd2fb57d9f50de8e0ad2fa45
+  data.tar.gz: 83682fe26418295979576a1a88d66d5b1af082ca2e4195b47286ccaf1a1cc3c24470a4b5ded42b0062bf17d97ad9ded3d5e1768f645c2985c9c683f9395b5c80

data/Gemfile.lock

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

data/lib/tezos_client/commands.rb

@@ -22,6 +22,9 @@ class TezosClient
                    :pending_operations,
                    :pack_data,
                    :big_map_value,
-                   :list_big_map_by_contract
+                   :contract_big_maps,
+                   :block_operations,
+                   :contract_storage_type,
+                   :entrypoint
   end
 end

data/lib/tezos_client/rpc_interface/contracts.rb

@@ -28,20 +28,28 @@ class TezosClient
         get "#{contract_link(contract_id)}/manager_key"
       end
 
+      def contract_storage_type(contract_id)
+        contract = contract_detail(contract_id)
+        contract[:script][:code].find { |elem| elem[:prim] == "storage" }[:args].first
+      end
+
       def contract_storage(contract_id)
         get "#{contract_link(contract_id)}/storage"
       end
 
+      def entrypoint(contract_id, entrypoint)
+        get("#{contract_link(contract_id)}/entrypoints/#{entrypoint}")
+      end
+
       def big_map_value(big_map_id:, key:, key_type:)
         expr_key = encode_script_expr(data: key, type: key_type)
 
         get "/chains/main/blocks/head/context/big_maps/#{big_map_id}/#{expr_key}"
       end
 
-      def list_big_map_by_contract(contract_address:)
+      def contract_big_maps(contract_address)
         contract_storage = contract_storage(contract_address)
-        contract = contract_detail(contract_address)
-        storage_type = contract[:script][:code].find { |elem| elem[:prim] == "storage" }[:args].first
+        storage_type = contract_storage_type(contract_address)
 
         TezosClient::Tools::FindBigMapsInStorage.run!(
           storage: contract_storage,

data/lib/tezos_client/tools/convert_to_hash.rb

@@ -1,99 +1,19 @@
 # frozen_string_literal: true
 
-class TezosClient::Tools::ConvertToHash < ActiveInteraction::Base
-  interface :data
-  interface :type
+require_relative "convert_to_hash/base"
 
-  def execute
-    decorated_value
-  end
-
-  private
-  def value
-    case type[:prim]
-    when "pair"
-      pair_type
-    when "list"
-      list_type
-    when "int"
-      int_type
-    when "nat"
-      int_type
-    when "key"
-      key_type
-    when "timestamp"
-      timestamp_type
-    when "string"
-      string_type
-    when "address"
-      address_type
-    else
-      raise "type '#{type[:prim]}' not implemented"
-    end
-  end
+Dir[File.join(__dir__, "convert_to_hash", "*.rb")].each { |file| require file }
 
-  def pair_type
-    raise "Not a 'Pair' type" unless data[:prim] == "Pair"
-    raise "Difference detected between data and type \nDATA: #{data} \nTYPE:#{type} " unless data[:args].size == type[:args].size
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      interface :data
+      interface :type
 
-    (data[:args]).zip(type[:args]).map do |data_n, type_n|
-      compose(
-        TezosClient::Tools::ConvertToHash,
-        data: data_n,
-        type: type_n
-      )
-    end.reduce({}, &:merge)
-  end
-
-  def list_type
-    convert_list_element(data: data, element_type: type[:args].first)
-  end
+      def execute
+        TezosClient::Tools::ConvertToHash::Base.new(data: data, type: type).value
+      end
 
-  def convert_list_element(data:, element_type:)
-    data.map do |elem|
-      compose(
-        TezosClient::Tools::ConvertToHash,
-        data: elem,
-        type: element_type
-      )
     end
   end
-
-  def int_type
-    data[:int].to_i
-  end
-
-  def key_type
-    data[:bytes] || data[:string]
-  end
-
-  def timestamp_type
-    Time.zone.at(data[:int].to_i)
-  end
-
-  def string_type
-    data[:string]
-  end
-
-  def address_type
-    data[:bytes] || data[:string]
-  end
-
-  def decorated_value
-    anonymous? ? value : { var_name => value }
-  end
-
-  def anonymous?
-    !(type.key?(:annots) && type[:annots].any?)
-  end
-
-  def var_name_annot
-    type[:annots].first
-  end
-
-  def var_name
-    return nil if anonymous?
-
-    "#{var_name_annot[1..-1]}".to_sym
-  end
 end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class Address < Base
+        include TezosClient::Crypto
+
+        def decode
+          if data.key?(:bytes)
+            if data[:bytes].start_with?("0000")
+              encode_tz(:tz1, data[:bytes][4..-1])
+            elsif data[:bytes].start_with?("0001")
+              encode_tz(:tz2, data[:bytes][4..-1])
+            elsif data[:bytes].start_with?("0002")
+              encode_tz(:tz3, data[:bytes][4..-1])
+            elsif data[:bytes].start_with?("01")
+              encode_tz(:KT, data[:bytes][2..-3])
+            else
+              data[:bytes]
+            end
+          else
+            data[:string]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+
+      class Base
+        def initialize(data:, type:)
+          @data = data
+          @type = type
+        end
+
+        attr_accessor :data, :type
+
+        def value
+          anonymous? ? decode : { var_name => decode }
+        end
+
+        protected
+
+        def decode
+          klass.new(data: data, type: type).decode
+
+        rescue NameError
+          raise NotImplementedError, "type '#{type[:prim]}' not implemented"
+        end
+
+        def anonymous?
+          !(type.key?(:annots) && type[:annots].any?)
+        end
+
+        def var_name_annot
+          type[:annots].first
+        end
+
+        def var_name
+          return nil if anonymous?
+
+          "#{var_name_annot[1..-1]}".to_sym
+        end
+
+        private
+
+        def klass
+          "TezosClient::Tools::ConvertToHash::#{type[:prim].camelize}".constantize
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class TezosClient
+  class BigMap < Struct.new(:name, :id, :value_type, :key_type); end
+
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class BigMap < Base
+        def decode
+          ::TezosClient::BigMap.new(
+            var_name,
+            data[:int],
+            type[:args].second,
+            type[:args].first
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class Bytes < Base
+        def decode
+          data[:bytes] || data[:string]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class Int < Base
+        def decode
+          data[:int].to_i
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class Key < Base
+        include TezosClient::Crypto
+
+        def decode
+          if data.key?(:bytes)
+            if data[:bytes].start_with?("00")
+              encode_tz(:edpk, data[:bytes][2..-1])
+            elsif data[:bytes].start_with?("01")
+              encode_tz(:sppk, data[:bytes][2..-1])
+            elsif data[:bytes].start_with?("02")
+              encode_tz(:p2pk, data[:bytes][2..-1])
+            else
+              data[:bytes]
+            end
+          else
+            data[:string]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class List < Base
+        def decode
+          data.map do |elem|
+            TezosClient::Tools::ConvertToHash::Base.new(
+              data: elem,
+              type: elem_type
+            ).value
+          end
+        end
+
+        def elem_type
+          type[:args].first
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class Nat < Base
+        def decode
+          data[:int].to_i
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class Pair < Base
+        def decode
+          raise "Not a 'Pair' type" unless data[:prim] == "Pair"
+          raise "Difference detected between data and type \nDATA: #{data} \nTYPE:#{type} " unless data[:args].size == type[:args].size
+
+          (data[:args]).zip(type[:args]).map do |data_n, type_n|
+            TezosClient::Tools::ConvertToHash::Base.new(
+              data: data_n,
+              type: type_n
+            ).value
+          end.reduce({}, &:merge)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class Signature < Base
+        include TezosClient::Crypto
+
+        def decode
+          if data.key?(:bytes)
+            encode_tz(:edsig, data[:bytes])
+          else
+            data[:string]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class String < Base
+        def decode
+          data[:string]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class TezosClient
+  module Tools
+    class ConvertToHash < ActiveInteraction::Base
+      class Timestamp < Base
+        def decode
+          Time.zone.at(data[:int].to_i)
+        end
+      end
+    end
+  end
+end

data/lib/tezos_client/tools/find_big_maps_in_storage.rb

@@ -7,50 +7,19 @@ class TezosClient::Tools::FindBigMapsInStorage < ActiveInteraction::Base
        strip: false
 
   def execute
-    case storage_type[:prim]
-    when "pair"
-      pair_type(data: storage, type: storage_type)
-    when "list"
-      list_type(data: storage, type: storage_type)
-    when "big_map"
-      big_map_type(data: storage, type: storage_type)
-    end
-  end
-
-  def pair_type(data:, type:)
-    raise "Not a 'Pair' type" unless data[:prim] == "Pair"
-    raise "Difference detected between data and type \nDATA: #{data} \nTYPE:#{type} " unless data[:args].size == type[:args].size
-
-    (0 .. data[:args].size - 1).map do |iter|
-      compose(
-        TezosClient::Tools::FindBigMapsInStorage,
-        storage: data[:args][iter],
-        storage_type: type[:args][iter]
-      )
-    end.compact.flatten
+    hash_storage
+      .map(&:last)
+      .select { |value| value.is_a? TezosClient::BigMap }
+      .map(&:to_h)
+      .map(&:with_indifferent_access)
   end
 
-  def list_type(data:, type:)
-    element_type = type[:args].first
-    data.map do |elem|
+  private
+    def hash_storage
       compose(
         TezosClient::Tools::ConvertToHash,
-        data: elem,
-        type: element_type
+        data: storage,
+        type: storage_type
       )
     end
-  end
-
-  def big_map_type(data:, type:)
-    {
-      name: var_name(type),
-      id: data[:int],
-      value_type: type[:args].second,
-      key_type: type[:args].first
-    }.with_indifferent_access
-  end
-
-  def var_name(type)
-    "#{type[:annots].first[1..-1]}".to_sym
-  end
 end

data/lib/tezos_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Pierre Michard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -275,6 +275,18 @@ files:
 - lib/tezos_client/smartpy_interface.rb
 - lib/tezos_client/string_utils.rb
 - lib/tezos_client/tools/convert_to_hash.rb
+- lib/tezos_client/tools/convert_to_hash/address.rb
+- lib/tezos_client/tools/convert_to_hash/base.rb
+- lib/tezos_client/tools/convert_to_hash/big_map.rb
+- lib/tezos_client/tools/convert_to_hash/bytes.rb
+- lib/tezos_client/tools/convert_to_hash/int.rb
+- lib/tezos_client/tools/convert_to_hash/key.rb
+- lib/tezos_client/tools/convert_to_hash/list.rb
+- lib/tezos_client/tools/convert_to_hash/nat.rb
+- lib/tezos_client/tools/convert_to_hash/pair.rb
+- lib/tezos_client/tools/convert_to_hash/signature.rb
+- lib/tezos_client/tools/convert_to_hash/string.rb
+- lib/tezos_client/tools/convert_to_hash/timestamp.rb
 - lib/tezos_client/tools/find_big_maps_in_storage.rb
 - lib/tezos_client/tools/system_call.rb
 - lib/tezos_client/tools/temporary_file.rb
@@ -301,7 +313,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Wrapper to the tezos client.