Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

From etherpoker #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

From etherpoker #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3966e16
Changes from the etherpoker project
jimkberry Sep 15, 2015
5b52cbd
Formatting changes to match repo style
jimkberry Sep 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions ethjsonrpc/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,25 @@ def _encode_function(self, signature, param_values):
types = signature[signature.find('(') + 1: signature.find(')')].split(',')
encoded_params = encode_abi(types, param_values)
return utils.zpad(utils.encode_int(prefix), 4) + encoded_params

def _install_contract(self, language, contract_code, value=0, from_address=None, gas=None, gas_price=None):
byte_code = self.compilers[language](contract_code)
return self.eth_sendTransaction(data=byte_code, value=value, from_address=from_address, gas=gas, gas_price=gas_price)

def _install_contract(self, language, contract_code, value=0, from_address=None,
gas=None, gas_price=None, ctor_sig=None, ctor_params=None, byte_data=None):
'''
Compiles a contract and then sends a transaction to create it - maybe passing parameters
to the constructor if ctor_sig and ctor_params are provided.
If byte_data is provided it is sent as-is rather than performing any compilation
'''
if not byte_data:
byte_data = self.compilers[language](contract_code)

# constructor parameters>
if ctor_sig:
types = ctor_sig[ctor_sig.find('(') + 1: ctor_sig.find(')')].split(',')
encoded_params = encode_abi(types, ctor_params)
byte_data = byte_data + encoded_params

return self.eth_sendTransaction(data=byte_data, value=value, from_address=from_address, gas=gas, gas_price=gas_price)

def install_solidity_contract(self, contract_code, value=0, from_address=None, gas=None, gas_price=None):
'''
Installs a solidity contract into ethereum node
Expand All @@ -107,7 +121,7 @@ def install_lll_contract(self, contract_code, value=0, from_address=None, gas=No
'''
return self._install_contract('lll', contract_code, value, from_address, gas, gas_price)

def contract_instant_call(self, to_address, function_signature, function_parameters=None, result_types=None, default_block=BLOCK_TAG_LATEST):
def contract_instant_call(self, to_address, function_signature, function_parameters=None, result_types=None, default_block=BLOCK_TAG_LATEST, from_address=None):
'''
This method makes a instant call on a contract function without the need to have the contract source code.
Examples of function_signature in solidity:
Expand All @@ -125,9 +139,15 @@ def contract_instant_call(self, to_address, function_signature, function_paramet
},
default_block
]
response = self._call('eth_call', params)

if from_address:
params[0]['from'] = from_address

response = self._call('eth_call', params)
return decode_abi(result_types, response[2:].decode('hex'))



def contract_transaction_call(self, to_address, function_signature, function_parameters=None, from_address=None, gas=None, gas_price=None, default_block=BLOCK_TAG_LATEST):
'''
This method makes a call on a contract function through a transaction. Returns the transaction_id.
Expand All @@ -141,12 +161,12 @@ def contract_transaction_call(self, to_address, function_signature, function_par
# Default values for gas and gas_price
gas = gas or self.DEFAULT_GAS_FOR_TRANSACTIONS
gas_price = gas_price or self.DEFAULT_GAS_PRICE

# Default value for from_address
from_address = from_address or self.eth_accounts()[0]

data = self._encode_function(function_signature, function_parameters)

params = {
'from': from_address,
'to': to_address,
Expand All @@ -158,6 +178,7 @@ def contract_transaction_call(self, to_address, function_signature, function_par
response = self._call('eth_sendTransaction', [params])
return response


def create_contract(self, contract_code, value=0, from_address=None, gas=None, gas_price=None):
self.update_code(contract_code)
byte_code = serpent.compile(contract_code)
Expand Down