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.

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

Cleanup and Refactoring #72

Merged
merged 14 commits into from
Jun 28, 2018
Merged

Cleanup and Refactoring #72

merged 14 commits into from
Jun 28, 2018

Conversation

gakonst
Copy link
Contributor

@gakonst gakonst commented Jun 28, 2018

As #70 but without the messy rebase/fast forward

@gakonst gakonst requested a review from aupiff June 28, 2018 13:55
Copy link
Contributor

@aupiff aupiff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

* Event for block submission logging
* @noteice The event indicates the addition of a new Plasma block
* @param blockNumber The index of the block in which a deposit transaction
* is included
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blockNumber: The number of the block that was submitted

@@ -185,6 +185,9 @@ contract RootChain is ERC721Receiver {
smt = new SparseMerkleTree();
}


/// @dev called by a Validator to append a Plamsa block to the Plasma chain
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo Plamsa

@gakonst gakonst mentioned this pull request Jun 28, 2018
aupiff and others added 5 commits June 28, 2018 16:55
setChallenged is only called once and should be removed to make the contract shorter & easier to read.
- setChallenged exists as a separate function becuase of stack limit errors
- changing getExitIndex function to return an impossible exit value in case a particular slot's exit is not found
@gakonst gakonst mentioned this pull request Jun 28, 2018
@aupiff aupiff merged commit 6a99472 into master Jun 28, 2018
@aupiff aupiff deleted the cleanup-from-master branch June 28, 2018 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants