Fix transaction execution #313
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pipermerriam
approved these changes
Jan 26, 2018
| @@ -145,31 +144,6 @@ def prepare_child_message(self, | |||
| ) | |||
| return child_message | |||
|
|
|||
| def prepare_child_sharding_message(self, | |||
There was a problem hiding this comment.
this looks like a good change.
evm/rlp/transactions.py
Outdated
| @@ -161,6 +164,10 @@ class BaseShardingTransaction(rlp.Serializable): | |||
| ('code', binary), | |||
| ] | |||
|
|
|||
| def __init__(self, chain_id, shard_id, to, data, gas, gas_price, access_list, code): | |||
| super().__init__(chain_id, shard_id, to, data, gas, gas_price, access_list, code) | |||
There was a problem hiding this comment.
You could *args, **kwargs both this call and the __init__ signature here since you aren't using any of these variables in the local context.
jannikluhn
force-pushed
the
fix-tx-execution
branch
from
4122720 to
ba70f4c
Compare
|
Maybe update |
|
Will do that in a separate PR (in my experience, fixing Travis requires some trial and error and I'd like to keep this one clean). |
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces #276 (I suck at rebasing and thought rewriting this would be faster -- probably mistakenly, but well...).
computation.state_dbwhen available.Message.gas_priceandMessage.origin#262)test_sharding_vmand user account contract tests have been updated to provide transactions with correct access listsWhen fixing 3) I noticed the use of
prepare_child_messagewas not consistent:BaseComputationhas methodsprepare_child_messageandprepare_child_sharding_message.ShardingMessagehas an additionalprepare_child_message.What I did was removing all
prepare_child_sharding_messages and implementingShardingComputation.prepare_child_message. So now only the computation objects have aprepare_child_message, and the sharding specific functionality (passing on access list and sighash) is implemented inShardingComputation. I don't see anything wrong with this, just mentioning it explicitly because it's probably the only noteworthy difference to #276.Cute Animal Picture