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

Update from Master #2447

Merged
merged 55 commits into from
Apr 30, 2019
Merged

Update from Master #2447

merged 55 commits into from
Apr 30, 2019

Conversation

nisdas
Copy link
Member

@nisdas nisdas commented Apr 30, 2019

Merging in the latest changes from master

rauljordan and others added 30 commits April 22, 2019 17:08
* use att targets

* risky head request

* timing lmd

* fixed ancestor cache hits

* tests pass

* comment on func

* advance state transition

* advance N empty state transitions

* imports

* imports

* use risky head state

* use validator registry

* revert timing

* imports
* Update com_github_atlassian_bazel_tools commit hash to 31382b2

* Update io_bazel_rules_k8s commit hash to e7b408f

* Update libp2p

* fixed nat

* nat
* fix broken initial sync

* tests pass
* add cached serialized state to reduce use of proto clone

* review comments

* review comments

* comments on cache
* handle nil block

* blocking rpc till synced

* remove unused field

* remove log

* fix tests
* remove ancestor cache flag

* ancestor cache on by default
* default bootstrap node and local network flag

* default relay node value

* Update shared/p2p/service.go

Co-Authored-By: rauljordan <raul@prysmaticlabs.com>

* use no discovery
* clear db by default

* revert changes

* comment

* run with clear db
* automatically resolve contract address

* Update beacon-chain/node/node.go

Co-Authored-By: rauljordan <raul@prysmaticlabs.com>

* testnet contract endpoint

* fmt

* use config in msg
* added todo to hash file in ssz

* params and copy of block cache

* start hash cache

* Hash cache implementation

* fixed some comments

* fixed promatheus duplicate counter name

* removed TODO

* change to use special expiration cache

* function name fixes junk object generator

* naming changes

* gazzle fix

* added pruning last read data test

* fixed gometallinter errors

* fix benchmarks and no int64 not serializable

* move struct from test

* add feature flag

* fix merge issues

* add featureflag to beacon and validator

* featureflag init for tests

* added feature flag to all ssz dependent tests

* remove setter func

* replace k8s tweaked expiration cache to https://github.com/karlseguin/ccache

* remove else

* change request by preston

* added init featureflags to genesis_test

* Update shared/ssz/hash_cache.go

add dot

Co-Authored-By: shayzluf <thezluf@gmail.com>

* Update shared/ssz/hash_cache.go

Co-Authored-By: shayzluf <thezluf@gmail.com>

* Update shared/ssz/hash_cache.go

remove extra space

Co-Authored-By: shayzluf <thezluf@gmail.com>

* Update shared/params/config.go

add dot

Co-Authored-By: shayzluf <thezluf@gmail.com>

* Update shared/featureconfig/config.go

remove dot

Co-Authored-By: shayzluf <thezluf@gmail.com>

* Update shared/featureconfig/config.go

remove dot

Co-Authored-By: shayzluf <thezluf@gmail.com>

* remove powchain from prometheus hash cache name

* fixes fron change requests

* fix change requests

* remove faulty merge test

* gazelle fix

* fix fmt.sprintf

* remove debug binary

* fix gazelle
* fix state reads

* add method to retrieve validator from state

* lint

* gosec
* fix state reads

* add method to retrieve validator from state

* lint

* batch update attestation

* handle nil case

* add test

* lint

* batch update attestation
* fix state reads

* add method to retrieve validator from state

* lint

* batch update attestation

* handle nil case

* add test

* lint

* batch update attestation

* use state instead

* fix test
* 1st attemp to optimize blk fetch w/ att tgt fetch

* test test test test
* Revert "Use State Instead of Cached Registry (#2372)"

This reverts commit 941810e.

* handle panic

* fix logging

* add test

* gazelle
* update validator logs

* ops, revert mid point

* do it before the wait

* delta
* added exporter

* fixed jaeger export

* lint

* imports
* no more calls

* fix lint unused

* Update beacon-chain/attestation/service.go

Co-Authored-By: rauljordan <raul@prysmaticlabs.com>

* fix tests

* fixed broken tests

* using ctx

* fixed single state req

* tests pass

* fix one of last major bottlenecks

* fix test

* lint
* implemented valIdxLookup and tests

* comments

* comments

* look up in db

* uncomment
* lock down receive block

* imports
* remove duplicated funcs

* lint

* remove duplicated tests
* upgrading linter from gometalinter to golangci-lint

* fixed golangci-lint linting

* removed linting before_script command

* removed disable-all command

* Fixed golang config file

* fixed golang config file v2

* removed gosec issue rule

* formatting

* fixed travis build to run golangci-lint

* Add install golangci-lint command

* fixing golangci-lint script

* removed https://

* Added golangci-lint cmd script

* added go get for local lint install

* created a before_script

* add install before script

* Added get script

* added go mod download

* removed go mod downloads

* changed

* removed before script

* Added before script go get lint

* added exit zero to see what went wrong

* removed golang run script

* removed before script

* change lint command

* verbose output

* removed verbose

* change linter enable and disable configuration

* Update .golangci.yml

Removed gotype as a linter

* Update .golangci.yml

Added typecheck linter

* Update .golangci.yml

Added fixed lint version

* Update .golangci.yml

Added gotype

* Update .golangci.yml

Added typecheck

* removed env:lint

* Added env lint

* fixing lint upgrade

* Changing travis configuration

* FIxed spelling errors

* disabled typecheck

* Enabled typecheck

* remove binary

* Deleting lib binary

* adding more linters

* fixed constants

* fix spelling

* fixed all lint issues

* Revert "Changing travis configuration"

This reverts commit 334afe9.

* Merge branch 'master' of https://github.com/prysmaticlabs/prysm into update-linter

* Changed from Infof to Info

* Fixing commits

* fixing commits with linter config

* added install

* Fixing

* fix log statement
* only accept the highest finalized slot from peers

* use best peer for state requests

* peer id

* rem old tests

* req peers tests pass

* warn level support for peer not having the same protocol

* pretty

* best peer

* comments

* req peers done

* tests passing

* fully functional

* enforce receiving from the best peer

* comments

* lint fixes
frederickalcantara and others added 25 commits April 27, 2019 11:56
* Added flag to disable rewards/penatlty logging

* Added flag disable log info validator function

* Added flag to disable rewards/penatlty logging

* Changed value to not have it log when it is on and have it logged when it's off

* Added flag to disable rewards/penatlty logging

* Built for cli & types

* fixing flag issue

* Added ctxCli to the validator struct

* Accepted change

* Fixing conditionals and merge conflicts

* Added bracket

* fixed the return statement to its proper place

* Added validator conditional for logging penalties & rewards

* Added conditional for logging penality/reward info

* Making conditional command line log refactorable

* also part of the last commit

* Changed value variable to lowercase

* Fixed if conditional for penalty reward validation

* Synced with master

* Fixed bazel build

* Syncing with master

* Sync with master

* Added true values to logValidator Balances

* Changed values from true to false

* FIX WIP

* Added variables to the validators

* Added negation for logValidatorBalances variable

The name of the flag is DisablePenaltyRewardLogFlag. Since the name of the var is logValidatorBalances. We are assuming that the variable will have a positive. It makes more sense to negate the disable flag as a value rather than keep it positive.

Co-Authored-By: frederickalcantara <frederickaalcantara@gmail.com>

* fixed password

* Remove prevBalance line
* use with fields for forked block

* spacing
* proto: illegal wireType 7 :(

* set addr to todo for now so somethign gets sent

* push latest progress

* Add feedback from @raulk. Stream never connects

* working handshake handler

* add exclusions for relay/bootstrap node

* fix tests, still need to add new ones

* remove race, fails coverage

* Add test for negotiation

* gazelle

* regen pb

* Update shared/p2p/handshake_handler.go

Co-Authored-By: prestonvanloon <preston@prysmaticlabs.com>
* fix block processing

* add in defer

* do not update chainhead

* save historical states from all blocks, so that fork choice can retrieve it

* revert changes

* make new changes

* remove forkchoice at the end
* use http instead of websocket for on demand block fetching

* use http
* serve pprof http

* add comment for linter
* make fixes

* change condition

* comment

* fixed up a few var names for clarity

* added test for isDescendant

* chain split reorg test

* interface for atts service

* comprehensive reorg regression test added

* space

* all tests pass

* target handler

* ci lint

* Update beacon-chain/sync/receive_block.go

Co-Authored-By: rauljordan <raul@prysmaticlabs.com>
* disable historical state pruning

* imports

* lint
* Update io_bazel_rules_k8s commit hash to c1daa04

* Update dependency build_bazel_rules_nodejs to v0.28.0

* Update dependency com_github_rjeczalik_notify to v0.9.2

* Update dependency io_opencensus_go to v0.21.0

* Update dependency org_golang_google_api to v0.4.0

* Update libp2p

* Update dependency com_github_deckarep_golang_set to v1

* Update dependency com_github_edsrzf_mmap_go to v1

* Update dependency com_github_go_stack_stack to v1

* Update dependency com_github_karlseguin_ccache to v2

* Update dependency com_github_rs_cors to v1

* Update dependency in_gopkg_urfave_cli_v1 to v1

* Update prysm_testnet_site commit hash to 3848e91

* extra bracket

* fix build
* make changes

* more changes
* set ejection threshold and add gauge

* spaces

* gaz
* fix for pending deposits

* add regression tests
* add truncate lib

* use trunc

* spaces
* include bad deposits in the db

* fmt

* Update beacon-chain/powchain/log_processing.go

Co-Authored-By: rauljordan <raul@prysmaticlabs.com>

* lint

* comment
* prune atts > one epoch old

* use VerifyAttestation instead

* added test to prune invalid att

* space

* added ctx

* fixed existing tests

* gaz

* gazelle
* prune atts > one epoch old

* use VerifyAttestation instead

* added test to prune invalid att

* space

* added ctx

* fixed existing tests

* gaz

* gazelle

* update filter for pruning atts

* gaz
… into updateFromMaster

# Conflicts:
#	WORKSPACE
#	beacon-chain/blockchain/fork_choice.go
#	beacon-chain/blockchain/fork_choice_test.go
#	beacon-chain/core/balances/rewards_penalties.go
#	beacon-chain/core/balances/rewards_penalties_test.go
#	beacon-chain/core/blocks/block_operations.go
#	beacon-chain/core/epoch/BUILD.bazel
#	beacon-chain/core/epoch/epoch_processing.go
#	beacon-chain/core/validators/validator.go
#	beacon-chain/db/state.go
#	beacon-chain/node/node.go
#	beacon-chain/node/p2p_config.go
#	beacon-chain/powchain/log_processing_test.go
#	beacon-chain/rpc/proposer_server.go
#	beacon-chain/sync/service.go
#	proto/beacon/p2p/v1/types.pb.go
#	shared/featureconfig/config.go
#	shared/featureconfig/flags.go
#	shared/p2p/service.go
#	shared/params/config.go
#	validator/client/validator_metrics.go
#	validator/node/node.go
@codecov
Copy link

codecov bot commented Apr 30, 2019

Codecov Report

Merging #2447 into spec-v0.6 will decrease coverage by 1.16%.
The diff coverage is 65.27%.

@@              Coverage Diff              @@
##           spec-v0.6    #2447      +/-   ##
=============================================
- Coverage      65.28%   64.12%   -1.17%     
=============================================
  Files            121      124       +3     
  Lines           9677     9808     +131     
=============================================
- Hits            6318     6289      -29     
- Misses          2660     2821     +161     
+ Partials         699      698       -1

1 similar comment
@codecov
Copy link

codecov bot commented Apr 30, 2019

Codecov Report

Merging #2447 into spec-v0.6 will decrease coverage by 1.16%.
The diff coverage is 65.27%.

@@              Coverage Diff              @@
##           spec-v0.6    #2447      +/-   ##
=============================================
- Coverage      65.28%   64.12%   -1.17%     
=============================================
  Files            121      124       +3     
  Lines           9677     9808     +131     
=============================================
- Hits            6318     6289      -29     
- Misses          2660     2821     +161     
+ Partials         699      698       -1

Copy link
Member

@terencechain terencechain left a comment

Choose a reason for hiding this comment

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

thanks man!

@terencechain terencechain merged commit c1fdfcd into spec-v0.6 Apr 30, 2019
@nisdas nisdas deleted the updateFromMaster branch April 30, 2019 04:51
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.

5 participants