eth 0.5.8 → 0.5.10

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.
     #
@@ -73,6 +76,7 @@ module Eth
     #
     # @return [Eth::Address] the coinbase account address.
     def default_account
+      raise ArgumentError, "The default account is not available on remote connections!" unless local?
       @default_account ||= Address.new eth_coinbase["result"]
     end
 
@@ -99,6 +103,17 @@ module Eth
       eth_get_transaction_count(address, "pending")["result"].to_i 16
     end
 
+    # Resolves an ENS name to an Ethereum address on the connected chain.
+    #
+    # @param ens_name [String] The ENS name, e.g., `fancy.eth`.
+    # @param registry [String] the address for the ENS registry.
+    # @param coin_type [Integer] the coin type as per EIP-2304.
+    # @return [Eth::Address] the Ethereum address resolved from the ENS record.
+    def resolve_ens(ens_name, registry = Ens::DEFAULT_ADDRESS, coin_type = Ens::CoinType::ETHEREUM)
+      ens = Ens::Resolver.new(self, registry)
+      ens.resolve(ens_name, coin_type)
+    end
+
     # Simply transfer Ether to an account and waits for it to be mined.
     # Uses `eth_coinbase` and external signer if no sender key is
     # provided.
@@ -115,7 +130,7 @@ module Eth
     # if no sender key is provided.
     #
     # **Note**, that many remote providers (e.g., Infura) do not provide
-    # any accounts. Provide a `sender_key` if you experience issues.
+    # any accounts. Provide a `sender_key:` if you experience issues.
     #
     # @overload transfer(destination, amount)
     #   @param destination [Eth::Address] the destination address.
@@ -156,6 +171,9 @@ module Eth
         return eth_send_raw_transaction(tx.hex)["result"]
       else
 
+        # we do not allow accessing accounts on remote connections
+        raise ArgumentError, "The default account is not available on remote connections, please provide a :sender_key!" unless local?
+
         # use the default account as sender and external signer
         params.merge!({
           from: default_account,
@@ -165,6 +183,39 @@ module Eth
       end
     end
 
+    # Transfers a token that implements the ERC20 `transfer()` interface.
+    #
+    # See {#transfer_erc20} for params and overloads.
+    #
+    # @return [Object] returns the result of the transaction.
+    def transfer_erc20_and_wait(erc20_contract, destination, amount, **kwargs)
+      transact_and_wait(erc20_contract, "transfer", destination, amount, **kwargs)
+    end
+
+    # Transfers a token that implements the ERC20 `transfer()` interface.
+    #
+    # **Note**, that many remote providers (e.g., Infura) do not provide
+    # any accounts. Provide a `sender_key:` if you experience issues.
+    #
+    # @overload transfer_erc20(erc20_contract, destination, amount)
+    #   @param erc20_contract [Eth::Contract] the ERC20 contract to write to.
+    #   @param destination [Eth::Address] the destination address.
+    #   @param amount [Integer] the transfer amount (mind the `decimals()`).
+    # @overload transfer_erc20(erc20_contract, destination, amount, **kwargs)
+    #   @param erc20_contract [Eth::Contract] the ERC20 contract to write to.
+    #   @param destination [Eth::Address] the destination address.
+    #   @param amount [Integer] the transfer amount (mind the `decimals()`).
+    #   @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.
+    #   @param **tx_value [Integer] optional transaction value field filling.
+    # @return [Object] returns the result of the transaction.
+    def transfer_erc20(erc20_contract, destination, amount, **kwargs)
+      destination = destination.to_s if destination.instance_of? Eth::Address
+      transact(erc20_contract, "transfer", destination, amount, **kwargs)
+    end
+
     # Deploys a contract and waits for it to be mined. Uses
     # `eth_coinbase` or external signer if no sender key is provided.
     #
@@ -181,7 +232,7 @@ module Eth
     # if no sender key is provided.
     #
     # **Note**, that many remote providers (e.g., Infura) do not provide
-    # any accounts. Provide a `sender_key` if you experience issues.
+    # any accounts. Provide a `sender_key:` if you experience issues.
     #
     # @overload deploy(contract)
     #   @param contract [Eth::Contract] contracts to deploy.
@@ -235,6 +286,10 @@ module Eth
         tx.sign kwargs[:sender_key]
         return eth_send_raw_transaction(tx.hex)["result"]
       else
+
+        # Does not allow accessing accounts on remote connections
+        raise ArgumentError, "The default account is not available on remote connections, please provide a :sender_key!" unless local?
+
         # Uses the default account as sender and external signer
         params.merge!({
           from: default_account,
@@ -263,9 +318,15 @@ module Eth
     #   @param **gas_limit [Integer] optional gas limit override for deploying the contract.
     # @return [Object] returns the result of the call.
     def call(contract, function, *args, **kwargs)
-      func = contract.functions.select { |func| func.name == function }[0]
-      raise ArgumentError, "this function does not exist!" if func.nil?
-      output = call_raw(contract, func, *args, **kwargs)
+      func = contract.functions.select { |func| func.name == function }
+      raise ArgumentError, "this function does not exist!" if func.nil? || func.size === 0
+      selected_func = func.first
+      func.each do |f|
+        if f.inputs.size === args.size
+          selected_func = f
+        end
+      end
+      output = call_raw(contract, selected_func, *args, **kwargs)
       if output&.length == 1
         return output[0]
       else
@@ -277,7 +338,7 @@ module Eth
     # contract read/write).
     #
     # **Note**, that many remote providers (e.g., Infura) do not provide
-    # any accounts. Provide a `sender_key` if you experience issues.
+    # any accounts. Provide a `sender_key:` if you experience issues.
     #
     # @overload transact(contract, function)
     #   @param contract [Eth::Contract] the subject contract to write to.
@@ -331,6 +392,10 @@ module Eth
         tx.sign kwargs[:sender_key]
         return eth_send_raw_transaction(tx.hex)["result"]
       else
+
+        # do not allow accessing accounts on remote connections
+        raise ArgumentError, "The default account is not available on remote connections, please provide a :sender_key!" unless local?
+
         # use the default account as sender and external signer
         params.merge!({
           from: default_account,
@@ -345,9 +410,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
@@ -362,9 +433,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
@@ -377,15 +448,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.
@@ -397,7 +477,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
@@ -413,6 +493,17 @@ module Eth
 
     private
 
+    # Allows to determine if we work with a local connectoin
+    def local?
+      if self.instance_of? Eth::Client::Ipc
+        return true
+      elsif self.host === "127.0.0.1" || self.host === "localhost"
+        return true
+      else
+        return false
+      end
+    end
+
     # 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)
@@ -430,7 +521,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
@@ -460,17 +551,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/coin_type.rb

@@ -0,0 +1,50 @@
+# 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.
+
+# Provides the {Eth} module.
+module Eth
+  # Provides ENS specific functionality
+  # ref: https://ens.domains
+  module Ens
+    # Provides EIP-2304 / SLIP-44 cointypes to resolve ENS addresses.
+    # ref: https://eips.ethereum.org/EIPS/eip-2304
+    module CoinType
+      extend self
+
+      # ENS coin type for Bitcoin.
+      BITCOIN = 0.freeze
+
+      # ENS coin type for Litecoin.
+      LITECOIN = 2.freeze
+
+      # ENS coin type for Dogecoin.
+      DOGECOIN = 3.freeze
+
+      # ENS coin type for Ethereum.
+      ETHEREUM = 60.freeze
+
+      # ENS coin type for Ethereum Classic.
+      ETHEREUM_CLASSIC = 61.freeze
+
+      # ENS coin type for Rootstock.
+      ROOTSTOCK = 137.freeze
+
+      # ENS coin type for Bitcoin Cash.
+      BITCOIN_CASH = 145.freeze
+
+      # ENS coin type for Binance.
+      BINANCE = 714.freeze
+    end
+  end
+end

data/lib/eth/ens/resolver.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.
@@ -16,6 +16,7 @@
 
 # Provides the {Eth} module.
 module Eth
+
   # Provides ENS specific functionality
   # ref: https://ens.domains
   module Ens
@@ -23,43 +24,84 @@ module Eth
     # 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
+      # The client instance used to resolve the ENS.
+      attr_accessor :client
+
+      # The address of the ENS registry on the given chain.
+      attr_accessor :registry
 
-      # Create an instance of the ENS Resolver
+      # Create an instance of the ENS Resolver.
       #
-      # @param client [Eth::Client] The client instance
-      # @param address [String] The address of the ENS contract
+      # @param client [Eth::Client] The client instance used to resolve the ENS.
+      # @param address [String] The address of the ENS registry on the given chain.
       def initialize(client, address = DEFAULT_ADDRESS)
         @client = client
-        @contract = Eth::Contract.from_abi(
-          name: "ENS",
+        @registry = Eth::Contract.from_abi(
+          name: "ENSRegistryWithFallback",
           address: address,
-          abi: JSON.parse(File.read(File.join(File.dirname(__FILE__), "../../../abis/ens.json"))),
+          abi: JSON.parse(File.read(File.join(File.dirname(__FILE__), "../../../abi/ens_registry.json"))),
         )
       end
 
-      # Resolve an ENS name to an address
+      # Resolve an ENS name owner.
+      #
+      # @param ens_name [String] The ENS name, e.g., `fancy.eth`.
+      # @return [String] The owner address of the name as a hex string.
+      def owner(ens_name)
+        @client.call(@registry, "owner", namehash(ens_name))
+      end
+
+      # Retrieve the public resolver for the given ENS name.
       #
-      # @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))
+      # @param ens_name [String] The ENS name, e.g., `fancy.eth`.
+      # @return [Eth::Contract] The public resolver contract that can be used
+      #   to resolve ENS names.
+      def resolver(ens_name)
+        address = @client.call(@registry, "resolver", namehash(ens_name))
+        Eth::Contract.from_abi(
+          name: "ENSPublicResolver",
+          address: address,
+          abi: JSON.parse(File.read(File.join(File.dirname(__FILE__), "../../../abi/ens_resolver.json"))),
+        )
+      end
+
+      # Resolve an ENS name to an address.
+      #
+      # @param ens_name [String] The ENS name, e.g., `fancy.eth`.
+      # @return [String] The owner address of the name as a hex string.
+      def resolve(ens_name, coin_type = Ens::CoinType::ETHEREUM)
+        if coin_type === Ens::CoinType::ETHEREUM
+          return @client.call(resolver(ens_name), "addr", namehash(ens_name))
+        elsif coin_type === Ens::CoinType::ETHEREUM_CLASSIC
+          data = @client.call(resolver(ens_name), "addr", namehash(ens_name), coin_type)
+          return Util.bin_to_prefixed_hex data
+        else
+          raise NotImplementedError, "Coin type #{coin_type} not implemented!"
+        end
+      end
+
+      # Resolve a text record for a given ENS name.
+      #
+      # @param ens_name [String] The ENS name, e.g., `fancy.eth`.
+      # @param key [String] The key for the text record, e.g., `url`.
+      # @return [String] The text record.
+      def text(ens_name, key = "description")
+        @client.call(resolver(ens_name), "text", namehash(ens_name), key)
       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
+      # @param ens_name [String] The ENS name, e.g., `fancy.eth`.
+      # @return [String] The node as a hex string.
       def namehash(ens_name)
-        node = ("0" * 64)
+        node = Util.hex_to_bin("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*"))
+          hash = Util.keccak256(label)
+          node = Util.keccak256(node + hash)
         end
-        "0x#{node}"
+        Util.bin_to_prefixed_hex node
       end
 
       # Normalize a string as specified by http://unicode.org/reports/tr46/
@@ -67,10 +109,12 @@ module Eth
       # @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
+        name = input.dup
+        if name.gsub!(/[`~!@#$%^&*()_=+\[\]{}<>,;:'"\/\\|?]/, "").nil?
+          return input.downcase
+        else
+          raise ArgumentError, "Provided ENS name contains illegal characters: #{input}"
+        end
       end
     end
   end

data/lib/eth/ens.rb

@@ -0,0 +1,28 @@
+# 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.
+
+require "eth/ens/coin_type"
+require "eth/ens/resolver"
+
+# Provides the {Eth} module.
+module Eth
+  # Provides ENS specific functionality
+  # ref: https://ens.domains
+  module Ens
+    extend self
+
+    # The default address for ENS, which applies to most chains
+    DEFAULT_ADDRESS = Address.new("0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e").freeze
+  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.