etherlite 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e0dfced593354434b36a9de586f7b19828b9f5e7eb30764efd9623b91a3496e
-  data.tar.gz: 68fbf0acbe771dc1c86d94a969f8222b05697c0b954c41ffb78e4017ffa22180
+  metadata.gz: 98f9a12feec6ffb0a40a90f914810d9960f526920cc86bbbfe1c323ea83cc2ea
+  data.tar.gz: ea64f460710a7f52bcc3b1ea1a0ec1f7dbc2c3d06eba96f5a07df491efd07bb7
 SHA512:
-  metadata.gz: 69bdfe008c0d08c9cabcda8f651401715441eba7b97de61fc55e9b99459ac428b17b465eacdfd96698ca5cd361d7133a0c17b70e964684ae9d0cb279d5ccc861
-  data.tar.gz: dc82638a7c9a62c28bb507e0e213fe3afcf5836f2a11b8b717b6caac1b06c87bc9073373fbb0e88d0fab43557de4bf8d4be9be1ea04c9a2c0ecbc62cb4d00c3f
+  metadata.gz: 8af135b1ea2716ee896df900dcc425fd47d0384990d89964fd06b43dae03ad7c0e3bf1937937b0119ebed6171e416548d4744b258b0607ddf6a6dae9bcd45f2d
+  data.tar.gz: 6e0f1ec2f8db9860147e475b0ec7e283902ce70a580a6633d5eff126d18b3dcbd6c039f72ddeed4b1a47e0b30edd7cb7c2caa1b22fe83548add6591e2f19f7dd

data/etherlite.gemspec

@@ -3,33 +3,33 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'etherlite/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "etherlite"
+  spec.name          = 'etherlite'
   spec.version       = Etherlite::VERSION
-  spec.authors       = ["Ignacio Baixas"]
-  spec.email         = ["ignacio@budacom.com"]
+  spec.authors       = ['Ignacio Baixas']
+  spec.email         = ['ignacio@budacom.com']
 
   spec.summary       = 'Ethereum integration for ruby on rails'
   spec.description   = ''
-  spec.homepage      = "https://github.com/budacom/etherlite"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/budacom/etherlite'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activesupport"
-  spec.add_dependency "eth", "~> 0.4.4"
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'eth', '~> 0.5.10'
   spec.add_dependency 'keccak', '~> 1.3', '>= 1.3.1'
-  spec.add_dependency "power-types", "~> 0.1"
+  spec.add_dependency 'power-types', '~> 0.1'
 
-  spec.add_development_dependency "bundler", "~> 2.1"
-  spec.add_development_dependency "guard", "~> 2.14"
-  spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webmock", "~> 3.7.5"
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'guard', '~> 2.14'
+  spec.add_development_dependency 'guard-rspec', '~> 4.7'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'webmock', '~> 3.7.5'
 end

data/lib/etherlite/account/private_key.rb

@@ -5,13 +5,14 @@ module Etherlite
     class PrivateKey < Base
       def initialize(_connection, _pk)
         @key = Eth::Key.new priv: _pk
-        super _connection, Etherlite::Utils.normalize_address(@key.address)
+        super _connection, Etherlite::Utils.normalize_address(@key.address.to_s)
       end
 
       def build_raw_transaction(_options = {})
         nonce = nonce_manager.next_nonce_for(normalized_address, _options.slice(:replace, :nonce))
 
         tx = Eth::Tx.new(
+          chain_id: @connection.chain_id,
           value: _options.fetch(:value, 0),
           data: _options.fetch(:data, ''),
           gas_limit: _options.fetch(:gas, 90_000),
@@ -20,23 +21,20 @@ module Etherlite
           nonce: nonce
         )
 
-        sign_with_connection_chain tx
-
+        tx.sign @key
         tx
       end
 
       def send_transaction(_options = {})
         tx = build_raw_transaction(_options)
 
-        nonce_manager.with_next_nonce_for(normalized_address, nonce: tx.nonce) do |nonce|
-          Etherlite::Transaction.new @connection, @connection.eth_send_raw_transaction(tx.hex)
+        nonce_manager.with_next_nonce_for(normalized_address, nonce: tx.signer_nonce) do |_|
+          Etherlite::Transaction.new @connection, @connection.eth_send_raw_transaction("0x#{tx.hex}")
         end
       end
 
       private
 
-      @@eth_mutex = Mutex.new
-
       def gas_price
         # TODO: improve on this
         @gas_price ||= connection.eth_gas_price
@@ -45,13 +43,6 @@ module Etherlite
       def nonce_manager
         Etherlite::NonceManager.new @connection
       end
-
-      def sign_with_connection_chain(_tx)
-        @@eth_mutex.synchronize do
-          Eth.configure { |c| c.chain_id = @connection.chain_id }
-          _tx.sign @key
-        end
-      end
     end
   end
 end

data/lib/etherlite/api/node.rb

@@ -60,15 +60,6 @@ module Etherlite
         @anonymous_account ||= Etherlite::Account::Anonymous.new(connection)
       end
 
-      def account_from_pk(_pk)
-        Etherlite.logger.warn(
-          "use of 'account_from_pk' is deprecated and will be removed in next version, \
-use 'load_account' instead"
-        )
-
-        load_account(from_pk: _pk)
-      end
-
       def_delegators :default_account, :unlock, :lock, :normalized_address, :transfer_to, :call
     end
   end

data/lib/etherlite/connection.rb

@@ -3,7 +3,7 @@ module Etherlite
     include Api::Rpc
     include Api::ParityRpc
 
-    attr_reader :chain_id, :use_parity
+    attr_reader :uri, :chain_id, :use_parity
 
     def initialize(_uri, _options = {})
       @uri = _uri

data/lib/etherlite/version.rb

@@ -1,3 +1,3 @@
 module Etherlite
-  VERSION = "0.5.3"
+  VERSION = '0.6.0'.freeze
 end

data/lib/etherlite.rb

@@ -56,7 +56,7 @@ module Etherlite
     _url = URI(_url) unless _url.is_a? URI
 
     options = config.default_connection_options
-    options = options.merge _options.slice options.keys
+    options = options.merge _options.slice(*options.keys)
 
     Client.new Connection.new(_url, options)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: keccak
   requirement: !ruby/object:Gem::Requirement