Skip to content
This repository has been archived by the owner on Aug 8, 2018. It is now read-only.

Fix Issue with mining to 0x3535 (important for FFG testnet) #280

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix Issue with mining to 0x3535 (important for FFG testnet) #280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pyethapp/eth_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ def __init__(self, app):

super(ChainService, self).__init__(app)
log.info('initializing chain')
coinbase = app.services.accounts.coinbase
self.coinbase = app.services.accounts.coinbase
env = Env(self.db, sce['block'])

genesis_data = sce.get('genesis_data', {})
if not genesis_data:
genesis_data = mk_genesis_data(env)
self.chain = Chain(
env=env, genesis=genesis_data, coinbase=coinbase,
env=env, genesis=genesis_data, coinbase=self.coinbase,
new_head_cb=self._on_new_head)
header = self.chain.state.prev_headers[0]
log.info('chain at', number=header.number)
Expand Down Expand Up @@ -244,7 +244,7 @@ def head_candidate(self):
# make_head_candidate modifies it.
txqueue = copy.deepcopy(self.transaction_queue)
self._head_candidate, self._head_candidate_state = make_head_candidate(
self.chain, txqueue, timestamp=int(time.time()))
self.chain, txqueue, timestamp=int(time.time()), coinbase=self.coinbase)
return self._head_candidate

def add_transaction(self, tx, origin=None, force_broadcast=False, force=False):
Expand Down