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

Jump to bottom

Log Ethereum 1 deposits before chainstart #4499

Merged
merged 2 commits into from Jan 11, 2020
Merged

Log Ethereum 1 deposits before chainstart #4499

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15bc363
Log Ethereum 1 deposits before chainstart
mcdee Jan 11, 2020
ed91aca
Merge branch 'master' into logdeposits
prestonvanloon Jan 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions beacon-chain/powchain/log_processing.go
View file
Open in desktop
Expand Up @@ -184,6 +184,13 @@ func (s *Service) ProcessDepositLog(ctx context.Context, depositLog gethTypes.Lo
"merkleTreeIndex": index,
}).Debug("Deposit registered from deposit contract")
validDepositsCount.Inc()
// Notify users what is going on, from time to time.
if !s.chainStartData.Chainstarted {
Copy link
Member

Choose a reason for hiding this comment

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

How is this different than the following log?
https://github.com/prysmaticlabs/prysm/blob/master/beacon-chain/powchain/log_processing.go#L185

Do you want to remove that? They seem similar

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The one you linked provides per-deposit information, including the public key of the deposit. This one provides more of a progress meter, showing only one report every 512 deposits and no detailed information. I think they both have a place.

Copy link
Member

Choose a reason for hiding this comment

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

Got it. 👍

deposits := len(s.chainStartData.ChainstartDeposits)
if deposits%512 == 0 {
log.WithField("deposits", deposits).Info("Processing deposits from Ethereum 1 chain")
}
}
} else {
log.WithFields(logrus.Fields{
"eth1Block": depositLog.BlockHash.Hex(),
Expand Down