etherlite 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b367f296ffd50994239be945e0e546b3e7dbdb0
-  data.tar.gz: f6b56c996e394c582dc2262f0b7a14f7034b28b3
+  metadata.gz: cc3672a5fe74a7af2cd535015ad05b291e5d07c0
+  data.tar.gz: b67bf5d1345c35d4a4a60da6a8b87d5266607768
 SHA512:
-  metadata.gz: 1b8ddbb397d7c8c988a9619f9919bacbd5688a83cf691b1563a454a9a1c20ed7059df406e25d2bf17c4045ca43c868b9f7a081355b53997cc6b63b7ae0bf0c82
-  data.tar.gz: 7a2c9922d666eaaed434f184f9122193535d52f4c22098f780098c5b8ebdb2bbfe175d788830c338b19029e2071bc78d18ccec9020937b0b9672b380481d9090
+  metadata.gz: b10b9675ff4a41b94e7dba7cfac2797b01008164fab0ac7a1d65ec1b89abb294d57d1ee8c4660dcbdb38470a7f5f1524ad66040fce9366d167aa146b1519db65
+  data.tar.gz: 0ab16b1be44be94cdbb0a6f6c78bc03154eaeae30c6ce14bcf1f2afd41e68a55c3e1a4cd2873e62ea78443c0fcc80d932dcee91147b7df2eb4b4cefc3e5757f1

data/etherlite.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "digest-sha3", "~> 1.1"
   spec.add_dependency "power-types", "~> 0.1"
+  spec.add_dependency "eth", "~> 0.4.4"
   spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.12"

data/lib/etherlite.rb

@@ -28,6 +28,7 @@ require "etherlite/configuration"
 require "etherlite/abi"
 require "etherlite/utils"
 require "etherlite/connection"
+require "etherlite/pk_account"
 require "etherlite/account"
 require "etherlite/address"
 require "etherlite/client"

data/lib/etherlite/account.rb

@@ -31,26 +31,42 @@ module Etherlite
       _function = Utils.parse_function(_function) unless _function.is_a? Contract::Function
       options = _params.last.is_a?(Hash) ? _params.pop : {}
 
-      params = {
+      if _function.constant?
+        call_constant _target, _function, _params, options
+      else
+        send_function_transaction _target, _function, _params, options
+      end
+    end
+
+    private
+
+    attr_reader :normalized_address
+
+    def call_constant(_target, _function, _params, _options)
+      ipc_params = {
         from: json_encoded_address,
         to: Utils.encode_address_param(_target),
         data: _function.encode(_params)
       }
 
-      if _function.constant?
-        _function.decode @connection, @connection.ipc_call(:eth_call, params, "latest")
-      else
-        if _function.payable? && options.key?(:pay)
-          params[:value] = Utils.encode_quantity_param options[:pay]
-        end
+      block = Utils.encode_block_param _options.fetch(:block, :latest)
 
-        send_transaction params, options
-      end
+      _function.decode @connection, @connection.ipc_call(:eth_call, ipc_params, block)
     end
 
-    private
+    def send_function_transaction(_target, _function, _params, _options)
+      ipc_params = {
+        from: json_encoded_address,
+        to: Utils.encode_address_param(_target),
+        data: _function.encode(_params)
+      }
 
-    attr_reader :normalized_address
+      value = _options.fetch(:pay, 0)
+      raise 'function is not payable' if value > 0 && !_function.payable?
+      ipc_params[:value] = value
+
+      send_transaction(ipc_params, _options)
+    end
 
     def send_transaction(_params, _opt)
       _params[:gas] = Utils.encode_quantity_param(_opt[:gas]) if _opt.key? :gas

data/lib/etherlite/pk_account.rb

@@ -0,0 +1,74 @@
+require 'eth'
+
+module Etherlite
+  class PkAccount
+    include Etherlite::Api::Address
+
+    attr_reader :connection
+
+    def initialize(_connection, _pk)
+      @connection = _connection
+      @key = Eth::Key.new priv: _pk
+    end
+
+    def normalized_address
+      @normalized_address ||= Utils.normalize_address @key.address
+    end
+
+    def transfer_to(_target, _options = {})
+      send_transaction(
+        _options.fetch(:amount, 0), '', Utils.encode_address_param(_target), _options
+      )
+    end
+
+    def call(_target, _function, *_params)
+      _function = Utils.parse_function(_function) unless _function.is_a? Contract::Function
+      options = _params.last.is_a?(Hash) ? _params.pop : {}
+
+      if _function.constant?
+        call_constant _target, _function, _params, options
+      else
+        value = options.fetch(:pay, 0)
+        raise 'function is not payable' if value > 0 && !_function.payable?
+
+        send_transaction(
+          value, _function.encode(_params), Utils.encode_address_param(_target), options
+        )
+      end
+    end
+
+    private
+
+    def call_constant(_target, _function, _params, _options)
+      ipc_params = {
+        from: json_encoded_address,
+        to: Utils.encode_address_param(_target),
+        data: _function.encode(_params)
+      }
+
+      block = Utils.encode_block_param _options.fetch(:block, :latest)
+
+      _function.decode @connection, @connection.ipc_call(:eth_call, ipc_params, block)
+    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.sign @key
+
+      @connection.ipc_call(:eth_sendRawTransaction, tx.hex)
+    end
+
+    def gas_price
+      # TODO: improve on this
+      @gas_price ||= Etherlite::Utils.hex_to_uint @connection.ipc_call(:eth_gasPrice)
+    end
+  end
+end

data/lib/etherlite/types/address.rb

@@ -10,7 +10,7 @@ module Etherlite::Types
 
     def encode(_value)
       _value = Etherlite::Utils.normalize_address_param _value
-      _value.to_raw_hex.rjust(64, '0')
+      _value.rjust(64, '0')
     end
 
     def decode(_connection, _value)

data/lib/etherlite/version.rb

@@ -1,3 +1,3 @@
 module Etherlite
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: eth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +175,7 @@ files:
 - lib/etherlite/contract/event_base.rb
 - lib/etherlite/contract/event_input.rb
 - lib/etherlite/contract/function.rb
+- lib/etherlite/pk_account.rb
 - lib/etherlite/railtie.rb
 - lib/etherlite/railties/configuration_extensions.rb
 - lib/etherlite/railties/utils.rb