etherlite 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8da5b22ad0f7b8dd87c4513e7bc4e8ea71462e2
-  data.tar.gz: 053ecfcd4d1233cb41ec6883ad7f24ea5fa962b0
+  metadata.gz: b26ef9659e1ea23ddedd3959500bcf341cde07b4
+  data.tar.gz: 05edd2b33d17ceb66a7461d8e6d9f9dc06935057
 SHA512:
-  metadata.gz: d3911d293c3a523876cbd5afc799e90f4c635c0f2ca186ccd8ce637f735a1643ba3204e0d106fef06d345f42157b4afb956957a4a07f4f2efee634f44adba7b0
-  data.tar.gz: 366a51cfe7e7ef58400e837a61ef222c340e44f60d2dfe7050051a99018ff5adf38d3632b9b4c8b7e6f940c76f6bc21a23be9424ba91a418b398f5bb9b627bb4
+  metadata.gz: 962d4b0f389a0824a48de67397cb69f96d8f46da2be0d9a1551f320e2a13d8f1a1b4234594d54347d0b269adbd61ecbb8d2d570c07533987560117a644da2b4c
+  data.tar.gz: 0196cf0b26cd6ad397bee4f1d24b2dab1c512fc7de247fbebc860d2bbb5dfd16df141f04f1b68a9b08a03eb7431eac1d625fd9d7189da1c3e12abe7eac34aa84

data/lib/etherlite/account/base.rb

@@ -33,6 +33,10 @@ module Etherlite::Account
       raise NotSupportedError, 'transactions are not supported by this kind of account'
     end
 
+    def ==(_other)
+      normalized_address == _other.normalized_address
+    end
+
     private
 
     def call_constant(_target, _function, _params, _options)

data/lib/etherlite/api/address.rb

@@ -6,12 +6,8 @@ module Etherlite
       end
 
       def get_balance(block: :latest)
-        Etherlite::Utils.hex_to_uint(
-          connection.ipc_call(
-            :eth_getBalance,
-            json_encoded_address,
-            Etherlite::Utils.encode_block_param(block)
-          )
+        connection.eth_get_balance(
+          json_encoded_address, Etherlite::Utils.encode_block_param(block)
         )
       end
 

data/lib/etherlite/api/node.rb

@@ -12,6 +12,22 @@ module Etherlite
         connection.eth_gas_price
       end
 
+      def get_transaction(_hash)
+        load_transaction(_hash).refresh
+      end
+
+      def load_transaction(_hash)
+        Transaction.new(connection, _hash)
+      end
+
+      def load_account(from_pk: nil)
+        Etherlite::Account::PrivateKey.new connection, from_pk
+      end
+
+      def load_address(_address)
+        Etherlite::Address.new(connection, Etherlite::Utils.normalize_address_param(_address))
+      end
+
       def register_account(_passphrase)
         address = connection.ipc_call(:personal_newAccount, _passphrase)
         Etherlite::Account::Local.new @connection, Etherlite::Utils.normalize_address(address)
@@ -28,7 +44,12 @@ module Etherlite
       end
 
       def account_from_pk(_pk)
-        Etherlite::Account::PrivateKey.new connection, _pk
+        Etherlite.logger.warn(
+          "use of 'account_from_pk' is deprecated and will be removed in next version, \
+use 'load_account' instead"
+        )
+
+        load_account(from_pk: _pk)
       end
 
       def_delegators :default_account, :unlock, :lock, :normalized_address, :transfer_to, :call

data/lib/etherlite/api/rpc.rb

@@ -17,6 +17,10 @@ module Etherlite
         Etherlite::Utils.hex_to_uint ipc_call(:eth_getTransactionCount, _address, _block)
       end
 
+      def eth_get_balance(_address, _block = 'latest')
+        Etherlite::Utils.hex_to_uint ipc_call(:eth_getBalance, _address, _block)
+      end
+
       def eth_call(_params, _block = 'latest')
         ipc_call(:eth_call, _params, _block)
       end

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

@@ -24,7 +24,7 @@ module Etherlite::Abi
     private
 
     def unlinked_binary
-      @artifact['unlinked_binary'] || ''
+      @artifact['unlinked_binary'] || @artifact['bytecode'] || ''
     end
 
     def abi_definitions

data/lib/etherlite/transaction.rb

@@ -10,11 +10,25 @@ module Etherlite
 
     def refresh
       @receipt = @connection.eth_get_transaction_receipt(@tx_hash) || {}
-      mined?
+      self
+    end
+
+    def removed?
+      @receipt.nil?
+    end
+
+    def succeeded?
+      !removed? && @receipt['status'] == 1
     end
 
     def mined?
-      @receipt.key? 'blockNumber'
+      !removed? && @receipt.key?('blockNumber')
+    end
+
+    def confirmations
+      return 0 unless mined?
+
+      @connection.eth_block_number - block_number
     end
 
     def gas_used
@@ -31,7 +45,8 @@ module Etherlite
 
     def wait_for_block(timeout: 120)
       start = Time.now
-      while !refresh
+      while !refresh.mined?
+        return false if removed?
         return false if Time.now - start > timeout
         sleep 1
       end

data/lib/etherlite/types/bytes.rb

@@ -14,6 +14,9 @@ module Etherlite::Types
     end
 
     def encode(_value)
+      raise ArgumentError, "invalid argument type for 'bytes'" unless _value.is_a? ::String
+
+      _value.unpack('H*').first.rjust(64, '0')
     end
   end
 end

data/lib/etherlite/version.rb

@@ -1,3 +1,3 @@
 module Etherlite
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etherlite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3