etherlite 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc29fa8a2381a001b79627f9b851b9df230fb6d6
-  data.tar.gz: 99c02011cd1453f7277bdbb3efe0a4c1aff648b9
+  metadata.gz: ed20095933d11d8e8d7b9cda7dce06cfb6acd1bf
+  data.tar.gz: aebb4e88d292b3c021cebb1b87318fd8b51abd2d
 SHA512:
-  metadata.gz: f385968df3f4005adfb1a0b8605c0995848c71934ee2c4e12e9920d8bc60f1d040a568f15fafdc4dc670d199b6b698a8f8ab5f9772d58918b5fd25d0fbcb67c9
-  data.tar.gz: 74527462ecd791fcf1da3a35115cbda0e0c54b42a2405dd8ca4d5ee2ee92b19407d61a88414f62deb7a6b2a9447b036652065c2b2181252eb5b956612c614056
+  metadata.gz: dff58138afca0dd99d83692a218a4e410880c6f07cb6bdf0727ff8603f8ce107a5ec9c5ab7886462e831ef4bbd0dcb16bb9b2f254ea5dd7e9a328f3a345ff79d
+  data.tar.gz: d7c84736ea549eb7b3f59c9bf41e5fc493ebb3c37aaad2b25caff2a7c1d6db5ce196c7809eccf5fe1252ef1b1cd8705f6400819b6345f1af9ae54c851d880ce9

data/lib/etherlite.rb

@@ -28,6 +28,8 @@ require "etherlite/configuration"
 require "etherlite/abi"
 require "etherlite/utils"
 require "etherlite/connection"
+require "etherlite/transaction"
+require "etherlite/nonce_manager"
 require "etherlite/pk_account"
 require "etherlite/account"
 require "etherlite/address"

data/lib/etherlite/account.rb

@@ -73,11 +73,13 @@ module Etherlite
       _params[:gasPrice] = Utils.encode_quantity_param(_opt[:gas_price]) if _opt.key? :gas_price
 
       passphrase = _opt.fetch(:passphrase, @passphrase)
-      if passphrase.nil?
-        @connection.ipc_call(:eth_sendTransaction, _params)
-      else
-        @connection.ipc_call(:personal_sendTransaction, _params, passphrase)
-      end
+      tx_hash = if passphrase.nil?
+                  @connection.ipc_call(:eth_sendTransaction, _params)
+                else
+                  @connection.ipc_call(:personal_sendTransaction, _params, passphrase)
+                end
+
+      Transaction.new @connection, tx_hash
     end
   end
 end

data/lib/etherlite/connection.rb

@@ -9,7 +9,7 @@ module Etherlite
       payload = { jsonrpc: "2.0", method: _method, params: _params, id: id }
 
       # TODO: support ipc
-      Net::HTTP.start(@uri.hostname, @uri.port) do |http|
+      Net::HTTP.start(@uri.hostname, @uri.port, use_ssl: use_ssl?) do |http|
         return handle_response http.post(
           @uri.path.empty? ? '/' : @uri.path,
           payload.to_json,
@@ -24,6 +24,10 @@ module Etherlite
       (Time.now.to_f * 1000.0).to_i
     end
 
+    def use_ssl?
+      @uri.scheme == 'https'
+    end
+
     def handle_response(_response, _id)
       case _response
       when Net::HTTPSuccess

data/lib/etherlite/nonce_manager.rb

@@ -0,0 +1,45 @@
+module Etherlite
+  class NonceManager
+    @@nonce_cache = {}
+    @@nonce_mutex = Mutex.new
+
+    def initialize(_connection)
+      @connection = _connection
+    end
+
+    def last_nonce_for(_address)
+      _address = Utils.encode_address_param _address
+      last_nonce = @@nonce_cache[_address]
+      last_nonce = last_observed_nonce_for(_address) if last_nonce.nil?
+      last_nonce
+    end
+
+    def with_next_nonce_for(_address)
+      _address = Utils.encode_address_param _address
+
+      @@nonce_mutex.synchronize do
+        next_nonce = last_nonce_for(_address) + 1
+
+        begin
+          result = yield next_nonce
+          @@nonce_cache[_address] = next_nonce
+          return result
+        rescue
+          # if yield fails, cant be sure about transaction status so must rely again on observing.
+          @@nonce_cache.delete _address
+          raise
+        end
+      end
+    end
+
+    private
+
+    def last_observed_nonce_for(_address)
+      # TODO: support using tx_pool API to improve this:
+      # http://qnimate.com/calculating-nonce-for-raw-transactions-in-geth/
+      Etherlite::Utils.hex_to_uint(
+        @connection.ipc_call(:eth_getTransactionCount, _address, 'pending')
+      ) - 1
+    end
+  end
+end

data/lib/etherlite/pk_account.rb

@@ -52,23 +52,31 @@ module Etherlite
     end
 
     def send_transaction(_value, _hex_data, _hex_address, _opt)
-      tx = Eth::Tx.new(
-        value: _value,
-        data: _hex_data,
-        gas_limit: _opt.fetch(:gas, 90_000),
-        gas_price: _opt.fetch(:gas_price, gas_price),
-        to: _hex_address,
-        nonce: 0
-      )
+      tx_hash = nonce_manager.with_next_nonce_for(@key.address) do |nonce|
+        tx = Eth::Tx.new(
+          value: _value,
+          data: _hex_data,
+          gas_limit: _opt.fetch(:gas, 90_000),
+          gas_price: _opt.fetch(:gas_price, gas_price),
+          to: _hex_address,
+          nonce: nonce
+        )
+
+        tx.sign @key
 
-      tx.sign @key
+        @connection.ipc_call(:eth_sendRawTransaction, tx.hex)
+      end
 
-      @connection.ipc_call(:eth_sendRawTransaction, tx.hex)
+      Transaction.new @connection, tx_hash
     end
 
     def gas_price
       # TODO: improve on this
       @gas_price ||= Etherlite::Utils.hex_to_uint @connection.ipc_call(:eth_gasPrice)
     end
+
+    def nonce_manager
+      NonceManager.new @connection
+    end
   end
 end

data/lib/etherlite/transaction.rb

@@ -0,0 +1,10 @@
+module Etherlite
+  class Transaction
+    attr_reader :tx_hash
+
+    def initialize(_connection, _tx_hash)
+      @connection = _connection
+      @tx_hash = _tx_hash
+    end
+  end
+end

data/lib/etherlite/version.rb

@@ -1,3 +1,3 @@
 module Etherlite
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3
@@ -175,10 +175,12 @@ files:
 - lib/etherlite/contract/event_base.rb
 - lib/etherlite/contract/event_input.rb
 - lib/etherlite/contract/function.rb
+- lib/etherlite/nonce_manager.rb
 - lib/etherlite/pk_account.rb
 - lib/etherlite/railtie.rb
 - lib/etherlite/railties/configuration_extensions.rb
 - lib/etherlite/railties/utils.rb
+- lib/etherlite/transaction.rb
 - lib/etherlite/types/address.rb
 - lib/etherlite/types/array_base.rb
 - lib/etherlite/types/array_dynamic.rb