Fix issues with call() and call_with_transaction()

.gitignore

@@ -1 +1,10 @@
 *.py[co]
+*.bin
+.cache/
+.tern-port
+.tox/
+ethjsonrpc.egg-info/
+geth.log
+**/geth
+**/history
+**/keystore

README.rst

@@ -177,7 +177,6 @@ Implemented JSON-RPC methods
 * eth_getTransactionReceipt
 * eth_getUncleByBlockHashAndIndex
 * eth_getUncleByBlockNumberAndIndex
-* eth_getCompilers
 * eth_compileSolidity
 * eth_compileLLL
 * eth_compileSerpent
@@ -191,10 +190,6 @@ Implemented JSON-RPC methods
 * eth_getWork
 * eth_submitWork
 * eth_submitHashrate
-* db_putString
-* db_getString
-* db_putHex
-* db_getHex
 * shh_version
 * shh_post
 * shh_newIdentity

ethjsonrpc/client.py

@@ -113,7 +113,7 @@ def call(self, address, sig, args, result_types):
         transaction (useful for reading data)
         '''
         data = self._encode_function(sig, args)
-        data_hex = data.encode('hex')
+        data_hex = '0x'+data.encode('hex')
         response = self.eth_call(to_address=address, data=data_hex)
         return decode_abi(result_types, response[2:].decode('hex'))
 
@@ -125,7 +125,7 @@ def call_with_transaction(self, from_, address, sig, args, gas=None, gas_price=N
         gas = gas or self.DEFAULT_GAS_PER_TX
         gas_price = gas_price or self.DEFAULT_GAS_PRICE
         data = self._encode_function(sig, args)
-        data_hex = data.encode('hex')
+        data_hex = '0x'+data.encode('hex')
         return self.eth_sendTransaction(from_address=from_, to_address=address, data=data_hex, gas=gas,
                                         gas_price=gas_price, value=value)
 
@@ -246,7 +246,10 @@ def eth_getBalance(self, address=None, block=BLOCK_TAG_LATEST):
         '''
         address = address or self.eth_coinbase()
         block = validate_block(block)
-        return hex_to_dec(self._call('eth_getBalance', [address, block]))
+        bal = self._call('eth_getBalance', [address, block])
+        if bal and bal != '<nil>':
+          return hex_to_dec(bal)
+        return 0
 
     def eth_getStorageAt(self, address=None, position=0, block=BLOCK_TAG_LATEST):
         '''
@@ -264,7 +267,10 @@ def eth_getTransactionCount(self, address, block=BLOCK_TAG_LATEST):
         TESTED
         '''
         block = validate_block(block)
-        return hex_to_dec(self._call('eth_getTransactionCount', [address, block]))
+        hex = self._call('eth_getTransactionCount', [address, block])
+        if hex != None:
+          return hex_to_dec(hex)
+        return 0
 
     def eth_getBlockTransactionCountByHash(self, block_hash):
         '''
@@ -466,38 +472,6 @@ def eth_getUncleByBlockNumberAndIndex(self, block=BLOCK_TAG_LATEST, index=0):
         block = validate_block(block)
         return self._call('eth_getUncleByBlockNumberAndIndex', [block, hex(index)])
 
-    def eth_getCompilers(self):
-        '''
-        https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getcompilers
-
-        TESTED
-        '''
-        return self._call('eth_getCompilers')
-
-    def eth_compileSolidity(self, code):
-        '''
-        https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_compilesolidity
-
-        TESTED
-        '''
-        return self._call('eth_compileSolidity', [code])
-
-    def eth_compileLLL(self, code):
-        '''
-        https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_compilelll
-
-        N/A
-        '''
-        return self._call('eth_compileLLL', [code])
-
-    def eth_compileSerpent(self, code):
-        '''
-        https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_compileserpent
-
-        N/A
-        '''
-        return self._call('eth_compileSerpent', [code])
-
     def eth_newFilter(self, from_block=BLOCK_TAG_LATEST, to_block=BLOCK_TAG_LATEST, address=None, topics=None):
         '''
         https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_newfilter
@@ -584,44 +558,6 @@ def eth_submitHashrate(self, hash_rate, client_id):
         '''
         return self._call('eth_submitHashrate', [hex(hash_rate), client_id])
 
-    def db_putString(self, db_name, key, value):
-        '''
-        https://github.com/ethereum/wiki/wiki/JSON-RPC#db_putstring
-
-        TESTED
-        '''
-        warnings.warn('deprecated', DeprecationWarning)
-        return self._call('db_putString', [db_name, key, value])
-
-    def db_getString(self, db_name, key):
-        '''
-        https://github.com/ethereum/wiki/wiki/JSON-RPC#db_getstring
-
-        TESTED
-        '''
-        warnings.warn('deprecated', DeprecationWarning)
-        return self._call('db_getString', [db_name, key])
-
-    def db_putHex(self, db_name, key, value):
-        '''
-        https://github.com/ethereum/wiki/wiki/JSON-RPC#db_puthex
-
-        TESTED
-        '''
-        if not value.startswith('0x'):
-            value = '0x{}'.format(value)
-        warnings.warn('deprecated', DeprecationWarning)
-        return self._call('db_putHex', [db_name, key, value])
-
-    def db_getHex(self, db_name, key):
-        '''
-        https://github.com/ethereum/wiki/wiki/JSON-RPC#db_gethex
-
-        TESTED
-        '''
-        warnings.warn('deprecated', DeprecationWarning)
-        return self._call('db_getHex', [db_name, key])
-
     def shh_version(self):
         '''
         https://github.com/ethereum/wiki/wiki/JSON-RPC#shh_version

ethjsonrpc/utils.py

@@ -5,7 +5,9 @@ def hex_to_dec(x):
     '''
     Convert hex to decimal
     '''
-    return int(x, 16)
+    if x:
+      return int(x, 16)
+    return 0
 
 
 def clean_hex(d):

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='ethjsonrpc',
-    version='0.3.0',
+    version='0.4.0',
     description='Ethereum JSON-RPC client',
     long_description=open('README.rst').read(),
     author='ConsenSys',

tests/Example.sol

@@ -0,0 +1,14 @@
+pragma solidity ^0.4.0;
+
+contract Example {
+
+   string s;
+
+   function set_s(string new_s) {
+       s = new_s;
+   }
+
+   function get_s() returns (string) {
+       return s;
+   }
+}

tests/Makefile

@@ -0,0 +1,21 @@
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+GETH := $(ROOT_DIR)/bin/geth.sh
+SOURCES = $(wildcard *.sol)
+BINS = $(SOURCES:.sol=.bin)
+
+.PHONY: start
+start:
+	@sh $(GETH) start
+
+%.bin: %.sol
+	@solc --bin --output-dir ${ROOT_DIR} $<
+
+compile: $(BINS)
+
+.PHONY: test
+test: start compile
+	@pytest -v -s && sh $(GETH) stop || sh $(GETH) stop
+
+.PHONY: clean
+clean:
+	@rm -f ${BINS} && sh $(GETH) clean

tests/bin/geth.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+LOG="$DIR"/geth.log
+PID="$DIR"/geth.pid
+IPC="$DIR"/geth.ipc
+
+start() {
+  if [ ! -e "$PID" ]; then
+    geth --dev --rpc --datadir "$DIR" "$IPC" 2> "$LOG" &
+    echo $! > "$PID" && \
+    until $(curl --output /dev/null --silent --head --fail http://127.0.0.1:8545); do
+      sleep 1
+    done
+    geth --datadir "$DIR" --exec 'loadScript("'"$DIR"'/setup.js"); console.log(miner)' attach "$IPC"
+  fi
+}
+
+stop() {
+  if [ -e "$PID" ]; then
+    kill $(cat "$PID")
+    rm "$PID"
+  fi
+}
+
+if [ "$1" = "start" ]; then
+  start
+elif [ "$1" = "stop" ]; then
+  stop
+elif [ "$1" = "clean" ]; then
+  rm -f "$PID" "$LOG" "$IPC"
+fi
+
+

tests/bin/setup.js

@@ -0,0 +1,7 @@
+if( !web3.eth.accounts ) {
+    personal.newAccount( "" );
+}
+var main = web3.eth.accounts[0];
+miner.setEtherbase( main );
+miner.start();
+personal.unlockAccount( main, "" );