etherlite 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d5972b71c09d1bb9d1a3f732b8c1b5fe0057ad46c0159c1c93e5fbe690ef695
-  data.tar.gz: 3b4fc972adac1ecbf23b7188040e8ba729d136ef89f51a4045d9c2339725ff34
+  metadata.gz: 3e2219e30428821c5866a33aa415a4ab4217b3b6f66eaa20f4bd701f64070cdc
+  data.tar.gz: df7c5c3d51712a08cd3aabc203ebfc4a0daa853610666d0d111f166e1607cf73
 SHA512:
-  metadata.gz: 6b594fc27d066ecd3ee27025f990996d9badc2bc37efc9b770bfad55cf8a96b2779fb61a59d1dbb214de5905bff3863fa7b9975b145f94a9e88521e9055838d0
-  data.tar.gz: 416610c6eb6f4466c5aee182147ee8bc456b8aaaf851cf5a1644bde4583df980a3dcaa822c92617e25393bdf145386200366f284c0310fcb13b283032f7a4a94
+  metadata.gz: ba8e3b442d736af75785838a131a02c02a6075c67fe1126f4ba60bc0ae24df2fb37924bf253fd9bf846f71fb91f6ebff35edb6fa6bc7fd322824bd2ea593122a
+  data.tar.gz: 9d6c0edd407d09be73e90a2ad3bd53d323f7297073bfff84fd22f6a0f6a4a844ff3c11080b6a142ccb17d1e2823123d71abaa5f6f91c079fb320fe5b9a9e1fd7

data/lib/etherlite/account/private_key.rb

@@ -8,23 +8,27 @@ module Etherlite
         super _connection, Etherlite::Utils.normalize_address(@key.address)
       end
 
+      def build_raw_transaction(_options = {})
+        nonce = nonce_manager.next_nonce_for(normalized_address, _options.slice(:replace, :nonce))
+
+        tx = Eth::Tx.new(
+          value: _options.fetch(:value, 0),
+          data: _options.fetch(:data, ''),
+          gas_limit: _options.fetch(:gas, 90_000),
+          gas_price: _options.fetch(:gas_price, gas_price),
+          to: (Etherlite::Utils.encode_address_param(_options[:to]) if _options.key?(:to)),
+          nonce: nonce
+        )
+
+        sign_with_connection_chain tx
+
+        tx
+      end
+
       def send_transaction(_options = {})
-        nonce_options = _options.slice(:replace, :nonce)
-        
-        nonce_manager.with_next_nonce_for(normalized_address, nonce_options) do |nonce|
-          tx = Eth::Tx.new(
-            value: _options.fetch(:value, 0),
-            data: _options.fetch(:data, ''),
-            gas_limit: _options.fetch(:gas, 90_000),
-            gas_price: _options.fetch(:gas_price, gas_price),
-            to: (Etherlite::Utils.encode_address_param(_options[:to]) if _options.key?(:to)),
-            nonce: nonce
-          )
-
-          # Since eth gem does not allow configuration of chains for every tx, we need
-          # to globally configure it before signing. This is not thread safe so a mutex is needed.
-          sign_with_connection_chain tx
+        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)
         end
       end

data/lib/etherlite/nonce_manager.rb

@@ -17,16 +17,22 @@ module Etherlite
       last_nonce
     end
 
-    def with_next_nonce_for(_normalized_address, replace: false, nonce: nil)
-      @@nonce_mutex.synchronize do
-        return yield nonce if nonce.present?
+    def next_nonce_for(_normalized_address, replace: false, nonce: nil)
+      if nonce.nil?
+        nonce = last_nonce_for(_normalized_address)
+        nonce += 1 if nonce.negative? || !replace # if first tx, don't replace
+      end
 
-        next_nonce = last_nonce_for(_normalized_address)
-        next_nonce += 1 if next_nonce.negative? || !replace # if first tx, don't replace
+      nonce
+    end
+
+    def with_next_nonce_for(_normalized_address, _options = {})
+      @@nonce_mutex.synchronize do
+        nonce = next_nonce_for(_normalized_address, _options)
 
         begin
-          result = yield next_nonce
-          @@nonce_cache[_normalized_address] = next_nonce if caching_enabled?
+          result = yield nonce
+          @@nonce_cache[_normalized_address] = nonce if caching_enabled?
           return result
         rescue
           # if yield fails, cant be sure about transaction status so must rely again on observing.

data/lib/etherlite/version.rb

@@ -1,3 +1,3 @@
 module Etherlite
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3