etherlite 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd54c39f71674af50c15e5b2c1a75c9c972083d3
-  data.tar.gz: 3d7afe1cdf25b667e2d6365b3c786458fd1a37c2
+  metadata.gz: 1b367f296ffd50994239be945e0e546b3e7dbdb0
+  data.tar.gz: f6b56c996e394c582dc2262f0b7a14f7034b28b3
 SHA512:
-  metadata.gz: 523fd7b998e5ce21dee58c5bbd1290e5fe5f73c26cab92ac3f5fe67935d65a45e025a7cc813bc0f829b63bf1d516d461f62f3e74d2dd4ce037cdf75f80a4c00c
-  data.tar.gz: 0cfaf81870210ac15218299f99602312828e1f5a8b758667567f4a07d0ff7bc976d62ef992990a6b80194cdafb952ae5d26a1254e61b76cbda5b6b91b0d59bf4
+  metadata.gz: 1b8ddbb397d7c8c988a9619f9919bacbd5688a83cf691b1563a454a9a1c20ed7059df406e25d2bf17c4045ca43c868b9f7a081355b53997cc6b63b7ae0bf0c82
+  data.tar.gz: 7a2c9922d666eaaed434f184f9122193535d52f4c22098f780098c5b8ebdb2bbfe175d788830c338b19029e2071bc78d18ccec9020937b0b9672b380481d9090

data/.gitignore

@@ -1,3 +1,4 @@
+*.gem
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/lib/etherlite/account.rb

@@ -17,11 +17,11 @@ module Etherlite
       @passphrase = nil
     end
 
-    def send_to(_target, _options = {})
+    def transfer_to(_target, _options = {})
       params = {
-        from: '0x' + @normalized_address,
+        from: json_encoded_address,
         to: Utils.encode_address_param(_target),
-        value: Utils.encode_quantity_param(_options[:amount] || 0)
+        value: Utils.encode_quantity_param(_options.fetch(:amount, 0))
       }
 
       send_transaction params, _options
@@ -32,7 +32,7 @@ module Etherlite
       options = _params.last.is_a?(Hash) ? _params.pop : {}
 
       params = {
-        from: '0x' + @normalized_address,
+        from: json_encoded_address,
         to: Utils.encode_address_param(_target),
         data: _function.encode(_params)
       }

data/lib/etherlite/address.rb

@@ -2,20 +2,16 @@ module Etherlite
   class Address
     include Etherlite::Api::Address
 
-    attr_reader :connection, :address
+    attr_reader :connection, :normalized_address
 
     def initialize(_connection, _normalized_address)
       @connection = _connection
-      @address = _normalized_address
+      @normalized_address = _normalized_address
     end
 
     def to_s
       # TODO: format address using case-chechsum
       address
     end
-
-    private
-
-    attr_reader :normalized_address
   end
 end

data/lib/etherlite/api/address.rb

@@ -1,21 +1,25 @@
 module Etherlite
   module Api
     module Address
-      extend Forwardable
-
       def address
-        normalized_address
+        '0x' + normalized_address
       end
 
       def get_balance(block: :latest)
         Etherlite::Utils.hex_to_uint(
           connection.ipc_call(
             :eth_getBalance,
-            '0x' + normalized_address,
+            json_encoded_address,
             Etherlite::Utils.encode_block_param(block)
           )
         )
       end
+
+      private
+
+      def json_encoded_address
+        '0x' + normalized_address
+      end
     end
   end
 end

data/lib/etherlite/api/node.rb

@@ -2,6 +2,7 @@ module Etherlite
   module Api
     module Node
       extend Forwardable
+      include Address
 
       def get_block_number
         Etherlite::Utils.hex_to_uint connection.ipc_call(:eth_blockNumber)
@@ -30,7 +31,7 @@ module Etherlite
         @first_account ||= accounts.first
       end
 
-      def_delegators :first_account, :unlock, :lock, :get_balance, :send_to, :call
+      def_delegators :first_account, :unlock, :lock, :normalized_address, :transfer_to, :call
     end
   end
 end

data/lib/etherlite/client.rb

@@ -4,8 +4,8 @@ module Etherlite
 
     attr_reader :connection
 
-    def initialize
-      @connection = Connection.new
+    def initialize(_connection)
+      @connection = _connection
     end
   end
 end

data/lib/etherlite/commands/abi/load_contract.rb

@@ -52,7 +52,7 @@ module Etherlite::Abi
 
       event_class = Class.new(Etherlite::Contract::EventBase) do
         event_inputs.each do |input|
-          define_method(input.name) { attributes[input.name] }
+          define_method(input.name) { attributes[input.original_name] }
         end
       end
 

data/lib/etherlite/commands/contract/event_base/decode_log_inputs.rb

@@ -8,11 +8,11 @@ class Etherlite::Contract::EventBase
       @inputs.each { |i| (i.indexed? ? indexed : non_indexed) << i }
 
       @json['data'][2..-1].scan(/.{64}/).each_with_index do |data, i|
-        attributes[non_indexed[i].name] = non_indexed[i].type.decode(@connection, data)
+        attributes[non_indexed[i].original_name] = non_indexed[i].type.decode(@connection, data)
       end
 
       @json['topics'][1..-1].each_with_index do |topic, i|
-        attributes[indexed[i].name] = indexed[i].type.decode(@connection, topic[2..-1])
+        attributes[indexed[i].original_name] = indexed[i].type.decode(@connection, topic[2..-1])
       end
 
       attributes

data/lib/etherlite/commands/utils/validate_address.rb

@@ -1,6 +1,6 @@
 module Etherlite::Utils
   class ValidateAddress < PowerTypes::Command.new(:address)
-    MATCHER = /^(0x)?[0-9a-fA-F]{40}$/
+    MATCHER = /^0x[0-9a-fA-F]{40}$/
 
     def perform
       return false unless MATCHER === @address

data/lib/etherlite/contract/base.rb

@@ -30,7 +30,7 @@ module Etherlite::Contract
 
     def get_logs(events: nil, from_block: :earliest, to_block: :latest)
       params = {
-        address: '0x' + @normalized_address,
+        address: json_encoded_address,
         fromBlock: Etherlite::Utils.encode_block_param(from_block),
         toBlock: Etherlite::Utils.encode_block_param(to_block)
       }

data/lib/etherlite/utils.rb

@@ -38,8 +38,8 @@ module Etherlite
     end
 
     def normalize_address_param(_value)
-      if _value.respond_to? :address
-        _value.address
+      if _value.respond_to? :normalized_address
+        _value.normalized_address
       else
         _value = _value.to_s
         raise ArgumentError, 'invalid address' unless valid_address? _value

data/lib/etherlite/version.rb

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

metadata

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