eth 0.5.7 → 0.5.9

data/lib/eth/client.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,6 +37,9 @@ module Eth
     # The default gas limit for the transaction, defaults to {Tx::DEFAULT_GAS_LIMIT}.
     attr_accessor :gas_limit
 
+    # A custom error type if a contract interaction fails.
+    class ContractExecutionError < StandardError; end
+
     # Creates a new RPC-Client, either by providing an HTTP/S host or
     # an IPC path. Supports basic authentication with username and password.
     #
@@ -106,8 +109,8 @@ module Eth
     # See {#transfer} for params and overloads.
     #
     # @return [String] the transaction hash once it is mined.
-    def transfer_and_wait(destination, amount, sender_key = nil, legacy = false)
-      wait_for_tx(transfer(destination, amount, sender_key, legacy))
+    def transfer_and_wait(destination, amount, **kwargs)
+      wait_for_tx(transfer(destination, amount, **kwargs))
     end
 
     # Simply transfer Ether to an account without any call data or
@@ -117,19 +120,24 @@ module Eth
     # **Note**, that many remote providers (e.g., Infura) do not provide
     # any accounts. Provide a `sender_key` if you experience issues.
     #
-    # @param destination [Eth::Address] the destination address.
-    # @param amount [Integer] the transfer amount in Wei.
-    # @param sender_key [Eth::Key] the sender private key.
-    # @param legacy [Boolean] enables legacy transactions (pre-EIP-1559).
+    # @overload transfer(destination, amount)
+    #   @param destination [Eth::Address] the destination address.
+    #   @param amount [Integer] the transfer amount in Wei.
+    # @overload transfer(destination, amount, **kwargs)
+    #   @param destination [Eth::Address] the destination address.
+    #   @param amount [Integer] the transfer amount in Wei.
+    #   @param **sender_key [Eth::Key] the sender private key.
+    #   @param **legacy [Boolean] enables legacy transactions (pre-EIP-1559).
+    #   @param **nonce [Integer] optional specific nonce for transaction.
     # @return [String] the local transaction hash.
-    def transfer(destination, amount, sender_key = nil, legacy = false)
+    def transfer(destination, amount, **kwargs)
       params = {
         value: amount,
         to: destination,
         gas_limit: gas_limit,
         chain_id: chain_id,
       }
-      if legacy
+      if kwargs[:legacy]
         params.merge!({
           gas_price: max_fee_per_gas,
         })
@@ -139,22 +147,22 @@ module Eth
           max_gas_fee: max_fee_per_gas,
         })
       end
-      unless sender_key.nil?
+      unless kwargs[:sender_key].nil?
 
         # use the provided key as sender and signer
         params.merge!({
-          from: sender_key.address,
-          nonce: get_nonce(sender_key.address),
+          from: kwargs[:sender_key].address,
+          nonce: kwargs[:nonce] || get_nonce(kwargs[:sender_key].address),
         })
         tx = Eth::Tx.new(params)
-        tx.sign sender_key
+        tx.sign kwargs[:sender_key]
         return eth_send_raw_transaction(tx.hex)["result"]
       else
 
         # use the default account as sender and external signer
         params.merge!({
           from: default_account,
-          nonce: get_nonce(default_account),
+          nonce: kwargs[:nonce] || get_nonce(default_account),
         })
         return eth_send_transaction(params)["result"]
       end
@@ -189,6 +197,7 @@ module Eth
     #   @param **sender_key [Eth::Key] the sender private key.
     #   @param **legacy [Boolean] enables legacy transactions (pre-EIP-1559).
     #   @param **gas_limit [Integer] optional gas limit override for deploying the contract.
+    #   @param **nonce [Integer] optional specific nonce for transaction.
     # @return [String] the transaction hash.
     # @raise [ArgumentError] in case the contract does not have any source.
     def deploy(contract, *args, **kwargs)
@@ -223,7 +232,7 @@ module Eth
         # Uses the provided key as sender and signer
         params.merge!({
           from: kwargs[:sender_key].address,
-          nonce: get_nonce(kwargs[:sender_key].address),
+          nonce: kwargs[:nonce] || get_nonce(kwargs[:sender_key].address),
         })
         tx = Eth::Tx.new(params)
         tx.sign kwargs[:sender_key]
@@ -232,7 +241,7 @@ module Eth
         # Uses the default account as sender and external signer
         params.merge!({
           from: default_account,
-          nonce: get_nonce(default_account),
+          nonce: kwargs[:nonce] || get_nonce(default_account),
         })
         return eth_send_transaction(params)["result"]
       end
@@ -288,6 +297,8 @@ module Eth
     #   @param **legacy [Boolean] enables legacy transactions (pre-EIP-1559).
     #   @param **address [Eth::Address] contract address.
     #   @param **gas_limit [Integer] optional gas limit override for deploying the contract.
+    #   @param **nonce [Integer] optional specific nonce for transaction.
+    #   @param **tx_value [Integer] optional transaction value field filling.
     # @return [Object] returns the result of the transaction.
     def transact(contract, function, *args, **kwargs)
       gas_limit = if kwargs[:gas_limit]
@@ -297,7 +308,7 @@ module Eth
         end
       fun = contract.functions.select { |func| func.name == function }[0]
       params = {
-        value: 0,
+        value: kwargs[:tx_value] || 0,
         gas_limit: gas_limit,
         chain_id: chain_id,
         to: kwargs[:address] || contract.address,
@@ -317,7 +328,7 @@ module Eth
         # use the provided key as sender and signer
         params.merge!({
           from: kwargs[:sender_key].address,
-          nonce: get_nonce(kwargs[:sender_key].address),
+          nonce: kwargs[:nonce] || get_nonce(kwargs[:sender_key].address),
         })
         tx = Eth::Tx.new(params)
         tx.sign kwargs[:sender_key]
@@ -326,7 +337,7 @@ module Eth
         # use the default account as sender and external signer
         params.merge!({
           from: default_account,
-          nonce: get_nonce(default_account),
+          nonce: kwargs[:nonce] || get_nonce(default_account),
         })
         return eth_send_transaction(params)["result"]
       end
@@ -337,9 +348,15 @@ module Eth
     #
     # See {#transact} for params and overloads.
     #
+    # @raise [Client::ContractExecutionError] if the execution fails.
     # @return [Object] returns the result of the transaction.
     def transact_and_wait(contract, function, *args, **kwargs)
-      wait_for_tx(transact(contract, function, *args, **kwargs))
+      begin
+        hash = wait_for_tx(transact(contract, function, *args, **kwargs))
+        return hash if tx_succeeded? hash
+      rescue IOError => e
+        raise ContractExecutionError, e
+      end
     end
 
     # Provides an interface to call `isValidSignature` as per EIP-1271 on a given
@@ -354,9 +371,9 @@ module Eth
     # @raise [ArgumentError] in case the contract cannot be called yet.
     def is_valid_signature(contract, hash, signature, magic = "1626ba7e")
       raise ArgumentError, "Contract not deployed yet." if contract.address.nil?
-      hash = Util.hex_to_bin hash if Util.is_hex? hash
-      signature = Util.hex_to_bin signature if Util.is_hex? signature
-      magic = Util.hex_to_bin magic if Util.is_hex? magic
+      hash = Util.hex_to_bin hash if Util.hex? hash
+      signature = Util.hex_to_bin signature if Util.hex? signature
+      magic = Util.hex_to_bin magic if Util.hex? magic
       result = call(contract, "isValidSignature", hash, signature)
       return result === magic
     end
@@ -369,15 +386,24 @@ module Eth
       @id = 0
     end
 
-    # Checkes wether a transaction is mined or not.
+    # Checks whether a transaction is mined or not.
     #
     # @param hash [String] the transaction hash.
     # @return [Boolean] true if included in a block.
-    def is_mined_tx?(hash)
+    def tx_mined?(hash)
       mined_tx = eth_get_transaction_by_hash hash
       !mined_tx.nil? && !mined_tx["result"].nil? && !mined_tx["result"]["blockNumber"].nil?
     end
 
+    # Checks whether a contract transaction succeeded or not.
+    #
+    # @param hash [String] the transaction hash.
+    # @return [Boolean] true if status is success.
+    def tx_succeeded?(hash)
+      tx_receipt = eth_get_transaction_receipt(hash)
+      !tx_receipt.nil? && !tx_receipt["result"].nil? && tx_receipt["result"]["status"] == "0x1"
+    end
+
     # Waits for an transaction to be mined by the connected chain.
     #
     # @param hash [String] the transaction hash.
@@ -389,7 +415,7 @@ module Eth
       retry_rate = 0.1
       loop do
         raise Timeout::Error if ((Time.now - start_time) > timeout)
-        return hash if is_mined_tx? hash
+        return hash if tx_mined? hash
         sleep retry_rate
       end
     end
@@ -406,39 +432,14 @@ module Eth
     private
 
     # Non-transactional function call called from call().
+    # @see https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_call
     def call_raw(contract, func, *args, **kwargs)
-      gas_limit = if kwargs[:gas_limit]
-          kwargs[:gas_limit]
-        else
-          Tx.estimate_intrinsic_gas(contract.bin) + Tx::CREATE_GAS
-        end
       params = {
-        gas_limit: gas_limit,
-        chain_id: chain_id,
         data: call_payload(func, args),
-      }
-      if kwargs[:address] || contract.address
-        params.merge!({ to: kwargs[:address] || contract.address })
-      end
-      if kwargs[:legacy]
-        params.merge!({
-          gas_price: max_fee_per_gas,
-        })
-      else
-        params.merge!({
-          priority_fee: max_priority_fee_per_gas,
-          max_gas_fee: max_fee_per_gas,
-        })
-      end
-      unless kwargs[:sender_key].nil?
-        # Uses the provided key as sender and signer
-        params.merge!({
-          from: kwargs[:sender_key].address,
-          nonce: get_nonce(kwargs[:sender_key].address),
-        })
-        tx = Eth::Tx.new(params)
-        tx.sign kwargs[:sender_key]
-      end
+        to: kwargs[:address] || contract.address,
+        from: kwargs[:from],
+      }.compact
+
       raw_result = eth_call(params)["result"]
       types = func.outputs.map { |i| i.type }
       return nil if raw_result == "0x"
@@ -447,7 +448,7 @@ module Eth
 
     # Encodes function call payloads.
     def call_payload(fun, args)
-      types = fun.inputs.map { |i| i.type }
+      types = fun.inputs.map(&:parsed_type)
       encoded_str = Util.bin_to_hex(Eth::Abi.encode(types, args))
       Util.prefix_hex(fun.signature + (encoded_str.empty? ? "0" * 64 : encoded_str))
     end
@@ -477,17 +478,28 @@ module Eth
       @id += 1
     end
 
+    # expects Hash object
+    def camelize!(params)
+      params.transform_keys! do |k|
+        k = k.to_s.split(/_/).map(&:capitalize).join
+        k[0] = k[0].downcase
+        k.to_sym
+      end
+    end
+
     # Recursively marshals all request parameters.
     def marshal(params)
+      params = params.dup
       if params.is_a? Array
         return params.map! { |param| marshal(param) }
       elsif params.is_a? Hash
+        params = camelize!(params)
         return params.transform_values! { |param| marshal(param) }
       elsif params.is_a? Numeric
         return Util.prefix_hex "#{params.to_i.to_s(16)}"
       elsif params.is_a? Address
         return params.to_s
-      elsif Util.is_hex? params
+      elsif Util.hex? params
         return Util.prefix_hex params
       else
         return params

data/lib/eth/constant.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/eth/contract/event.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/eth/contract/function.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ module Eth
     # @param inputs [Array<Eth::Contract::FunctionInput>] function input class list.
     # @return [String] function string.
     def self.calc_signature(name, inputs)
-      "#{name}(#{inputs.collect { |x| x.raw_type }.join(",")})"
+      "#{name}(#{inputs.map { |x| x.parsed_type.to_s }.join(",")})"
     end
 
     # Encodes a function signature.

data/lib/eth/contract/function_input.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ module Eth
     # @param data [Hash] contract abi data.
     def initialize(data)
       @raw_type = data["type"]
-      @type = Eth::Abi::Type.parse(data["type"])
+      @type = Eth::Abi::Type.parse(data["type"], data["components"])
       @name = data["name"]
     end
 
@@ -34,5 +34,10 @@ module Eth
     def type
       @type.base_type + @type.sub_type + @type.dimensions.map { |dimension| "[#{dimension > 0 ? dimension : ""}]" }.join("")
     end
+
+    # Returns parsed types.
+    def parsed_type
+      @type
+    end
   end
 end

data/lib/eth/contract/function_output.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/eth/contract/initializer.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/eth/contract.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/eth/eip712.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -149,7 +149,7 @@ module Eth
     # @return [Array] the data in the data structure we want to hash.
     # @raise [TypedDataError] if the data fails validation.
     def enforce_typed_data(data)
-      data = JSON.parse data if Util.is_hex? data
+      data = JSON.parse data if Util.hex? data
       raise TypedDataError, "Data is missing, try again with data." if data.nil? or data.empty?
       raise TypedDataError, "Data types are missing." if data[:types].nil? or data[:types].empty?
       raise TypedDataError, "Data primaryType is missing." if data[:primaryType].nil? or data[:primaryType].empty?

data/lib/eth/ens/resolver.rb

@@ -0,0 +1,77 @@
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# -*- encoding : ascii-8bit -*-
+
+# Provides the {Eth} module.
+module Eth
+  # Provides ENS specific functionality
+  # ref: https://ens.domains
+  module Ens
+
+    # Utility class for resolving ENS names to Ethereum addresses
+    class Resolver
+
+      # The default address for ENS, which applies to most chains
+      DEFAULT_ADDRESS = "0x00000000000c2e074ec69a0dfb2997ba6c7d2e1e".freeze
+
+      # Create an instance of the ENS Resolver
+      #
+      # @param client [Eth::Client] The client instance
+      # @param address [String] The address of the ENS contract
+      def initialize(client, address = DEFAULT_ADDRESS)
+        @client = client
+        @contract = Eth::Contract.from_abi(
+          name: "ENS",
+          address: address,
+          abi: JSON.parse(File.read(File.join(File.dirname(__FILE__), "../../../abis/ens.json"))),
+        )
+      end
+
+      # Resolve an ENS name to an address
+      #
+      # @param ens_name [String] The ENS name, eg: fancy.eth
+      # @return [String] The owner address of the name, as a hex string
+      def resolve(ens_name)
+        @client.call(@contract, "owner", namehash(ens_name))
+      end
+
+      # Generate node for the given domain name
+      # See: https://docs.ens.domains/contract-api-reference/name-processing
+      #
+      # @param ens_name [String] The ENS name, eg: fancy.eth
+      # @return [String] The node as a hex string
+      def namehash(ens_name)
+        node = ("0" * 64)
+        name = normalize(ens_name)
+        name.split(".").reverse.each do |label|
+          hash = Digest::Keccak.new(256).hexdigest(label)
+          node = Digest::Keccak.new(256).hexdigest([node + hash].pack("H*"))
+        end
+        "0x#{node}"
+      end
+
+      # Normalize a string as specified by http://unicode.org/reports/tr46/
+      #
+      # @param input [String] The input string
+      # @return [String] The normalized output string
+      def normalize(input)
+        # TODO: This is fairly complicated, and there doesn't seem to be a ruby
+        # library which can handle it perfectly.
+        # https://www.unicode.org/reports/tr46/tr46-27.html
+        input.downcase
+      end
+    end
+  end
+end

data/lib/eth/key/decrypter.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/eth/key/encrypter.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/eth/key.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ module Eth
       unless priv.nil?
 
         # Converts hex private keys to binary strings.
-        priv = Util.hex_to_bin priv if Util.is_hex? priv
+        priv = Util.hex_to_bin priv if Util.hex? priv
 
         # Creates a keypair from existing private key data.
         key = ctx.key_pair_from_private_key priv
@@ -74,10 +74,10 @@ module Eth
       compact, recovery_id = context.sign_recoverable(@private_key, blob).compact
       signature = compact.bytes
       v = Chain.to_v recovery_id, chain_id
-      is_leading_zero = true
+      leading_zero = true
       [v].pack("N").unpack("C*").each do |byte|
-        is_leading_zero = false if byte > 0 and is_leading_zero
-        signature.append byte unless is_leading_zero and byte === 0
+        leading_zero = false if byte > 0 and leading_zero
+        signature.append byte unless leading_zero and byte === 0
       end
       Util.bin_to_hex signature.pack "c*"
     end

data/lib/eth/rlp/decoder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ module Eth
       # @raise [Eth::Rlp::DecodingError] if the input string does not end after
       #     the root item.
       def perform(rlp)
-        rlp = Util.hex_to_bin rlp if Util.is_hex? rlp
+        rlp = Util.hex_to_bin rlp if Util.hex? rlp
         rlp = Util.str_to_bytes rlp
         begin
           item, next_start = consume_item rlp, 0

data/lib/eth/rlp/encoder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,8 +41,8 @@ module Eth
       # Encodes the raw item.
       def encode_raw(item)
         return item if item.instance_of? Rlp::Data
-        return encode_primitive item if Util.is_primitive? item
-        return encode_list item if Util.is_list? item
+        return encode_primitive item if Util.primitive? item
+        return encode_list item if Util.list? item
         raise EncodingError "Cannot encode object of type #{item.class.name}"
       end
 

data/lib/eth/rlp/sedes/big_endian_int.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/eth/rlp/sedes/binary.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ module Eth
         # @raise [DeserializationError] if provided serial is of wrong type.
         # @raise [DeserializationError] if provided serial is of wrong length.
         def deserialize(serial)
-          raise DeserializationError, "Objects of type #{serial.class} cannot be deserialized" unless Util.is_primitive? serial
+          raise DeserializationError, "Objects of type #{serial.class} cannot be deserialized" unless Util.primitive? serial
           raise DeserializationError, "#{serial.class} has invalid length" unless valid_length? serial.size
           serial
         end

data/lib/eth/rlp/sedes/list.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,9 +34,9 @@ module Eth
           super()
           @strict = strict
           elements.each do |e|
-            if Sedes.is_sedes?(e)
+            if Sedes.sedes?(e)
               push e
-            elsif Util.is_list?(e)
+            elsif Util.list?(e)
               push List.new(elements: e)
             else
               raise TypeError, "Instances of List must only contain sedes objects or nested sequences thereof."
@@ -51,7 +51,7 @@ module Eth
         # @raise [SerializationError] if provided array is not a sequence.
         # @raise [SerializationError] if provided array is of wrong length.
         def serialize(obj)
-          raise SerializationError, "Can only serialize sequences" unless Util.is_list?(obj)
+          raise SerializationError, "Can only serialize sequences" unless Util.list?(obj)
           raise SerializationError, "List has wrong length" if (@strict && self.size != obj.size) || self.size < obj.size
           result = []
           obj.zip(self).each_with_index do |(element, sedes), i|
@@ -67,7 +67,7 @@ module Eth
         # @raise [DeserializationError] if provided serial is not a sequence.
         # @raise [DeserializationError] if provided serial is of wrong length.
         def deserialize(serial)
-          raise DeserializationError, "Can only deserialize sequences" unless Util.is_list?(serial)
+          raise DeserializationError, "Can only deserialize sequences" unless Util.list?(serial)
           raise DeserializationError, "List has wrong length" if @strict && serial.size != self.size
           result = []
           len = [serial.size, self.size].min

data/lib/eth/rlp/sedes.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -39,10 +39,10 @@ module Eth
         # @param obj [Object] the Ruby object for which to find a sedes object.
         # @raise [TypeError] if no appropriate sedes could be found.
         def infer(obj)
-          return obj.class if is_sedes? obj.class
+          return obj.class if sedes? obj.class
           return big_endian_int if obj.is_a?(Integer) && obj >= 0
           return binary if Binary.valid_type? obj
-          return List.new(elements: obj.map { |item| infer item }) if Util.is_list? obj
+          return List.new(elements: obj.map { |item| infer item }) if Util.list? obj
           raise TypeError, "Did not find sedes handling type #{obj.class.name}"
         end
 
@@ -50,7 +50,7 @@ module Eth
         #
         # @param obj [Object] the object to check.
         # @return [Boolean] true if it's serializable and deserializable.
-        def is_sedes?(obj)
+        def sedes?(obj)
           obj.respond_to?(:serialize) && obj.respond_to?(:deserialize)
         end
 

data/lib/eth/rlp.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/eth/signature.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2022 The Ruby-Eth Contributors
+# Copyright (c) 2016-2023 The Ruby-Eth Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ module Eth
     # @return [String, String, String] the `r`, `s`, and `v` values.
     # @raise [SignatureError] if signature is of unknown size.
     def dissect(signature)
-      signature = Util.bin_to_hex signature unless Util.is_hex? signature
+      signature = Util.bin_to_hex signature unless Util.hex? signature
       signature = Util.remove_hex_prefix signature
       if signature.size < 130
         raise SignatureError, "Unknown signature length #{signature.size}!"
@@ -70,7 +70,7 @@ module Eth
       context = Secp256k1::Context.new
       r, s, v = dissect signature
       v = v.to_i(16)
-      if !Chain.is_ledger? v and !Chain.is_legacy? v
+      if !Chain.ledger? v and !Chain.legacy? v
         min_v = 2 * chain_id + 35
         raise SignatureError, "Invalid signature v byte #{v} for chain ID #{chain_id}!" if v < min_v
       end
@@ -126,7 +126,7 @@ module Eth
 
         # recover message from personal_sign
         recovered_key = personal_recover blob, signature, chain_id
-      elsif blob.instance_of? String and (Util.is_hex? blob or blob.encoding == Encoding::ASCII_8BIT)
+      elsif blob.instance_of? String and (Util.hex? blob or blob.encoding == Encoding::ASCII_8BIT)
 
         # if nothing else, recover from arbitrary signature
         recovered_key = recover blob, signature, chain_id