etherlite 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe14df0fc898d4e298d57704e8a7f2acf0cb3dcace02b94903b8f295f94e971c
-  data.tar.gz: 87c4bc2dca3fb92d8a1eca54080cbfa50107defe48d0007cc5e6c3910bdfaa4e
+  metadata.gz: bbd613d95d4aaec97652278de22e3599754a18979185f8a0eeaea0ef6db3e3c4
+  data.tar.gz: c21fe17680a4b4cc82eceedbd413df822da0c9475b9ee4c58f9ba124a481d82e
 SHA512:
-  metadata.gz: c1e16e2460b1e67948efd91921b1e03e6805c114fdba9a375c4b83695baa6d01ca80b46fc3530be5ac923c641d47190cc7fc466cdf6daef793f55cb54993be0a
-  data.tar.gz: 76cb54b21dd785777fcd474f0bbf85e374b9a6aad8bd64d1ddfed73f195c51a736b339045b09056be8da32c34e7d272abcf7393b4bc1bd187efe2fb2186adc57
+  metadata.gz: 202253e8cea38ae5b51977e130e442cdcc5fb4563f93dd5da802e6dbc8e86e154e08a4b13fc50f05b17c17ba4541d8a9adb6406aee7fb05f79e90fde8e8da594
+  data.tar.gz: 1cbca94d66686e94db2ff819f4d21f6c64035a6004ab56d9d641ab02895ea8dbdb00495a120f4813c75cf00a9d1e0d4efe8e1655f2d23cb907615c0cf60102f6

data/lib/etherlite/account/base.rb

@@ -9,6 +9,15 @@ module Etherlite::Account
       @normalized_address = _normalized_address
     end
 
+    def next_nonce
+      if @connection.use_parity
+        @connection.parity_next_nonce(address)
+      else
+        # https://github.com/ethereum/go-ethereum/issues/2736
+        @connection.eth_get_transaction_count(address, 'pending')
+      end
+    end
+
     def transfer_to(_target, _options = {})
       send_transaction _options.merge(to: _target, value: _options.fetch(:amount, 0))
     end

data/lib/etherlite/account/private_key.rb

@@ -9,10 +9,8 @@ module Etherlite
       end
 
       def send_transaction(_options = {})
-        nonce_options = {
-          replace: _options.fetch(:replace, false)
-        }
-
+        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/lib/etherlite/nonce_manager.rb

@@ -17,8 +17,10 @@ module Etherlite
       last_nonce
     end
 
-    def with_next_nonce_for(_normalized_address, replace: false)
+    def with_next_nonce_for(_normalized_address, replace: false, nonce: nil)
       @@nonce_mutex.synchronize do
+        return yield nonce if nonce.present?
+
         next_nonce = last_nonce_for(_normalized_address)
         next_nonce += 1 if next_nonce.negative? || !replace # if first tx, don't replace
 

data/lib/etherlite/version.rb

@@ -1,3 +1,3 @@
 module Etherlite
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

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