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

Makefile (#3779): pass docker build arguments (stable) #4239

Merged
merged 1 commit into from
May 25, 2022

Conversation

battlmonstr
Copy link
Contributor

Dockerfile requires some --build-arg options.
Fix "docker" target to pass them.
Fix GIT_TAG to reflect the most recent tag related to HEAD, instead of an unrelated most recent tag.
Use it as the image VERSION.

Image tags need to be passed explicitly if needed:

DOCKER_FLAGS='-t erigon:latest' make docker

Copy link
Collaborator

@AskAlexSharov AskAlexSharov left a comment

Choose a reason for hiding this comment

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

I see next output on mac:

git checkout devel
git pull --tags
git describe --tags '--match=v*'
v2021.10.03-1137-g2da927b74

so, it shows oldest tag, not newest

@battlmonstr
Copy link
Contributor Author

battlmonstr commented May 24, 2022

I see next output on mac:

git checkout devel
git pull --tags
git describe --tags '--match=v*'
v2021.10.03-1137-g2da927b74

so, it shows oldest tag, not newest

I believe that v2021.10.03 is the most recent tag on the devel branch, just before devel was forked from master. As far as I understand, version v2021.10.03 was released, then devel was forked, then after 1137 commits we have commit g2da927b74 on devel, and there are no other tags on commits in between.
If you want to see another version, need to tag some commit on the devel branch.

Also can see a previous tag before that like so:

$ git describe --tags '--match=v*' v2021.10.03^
v2021.10.02

so v2021.10.02 is the most recent tag on a branch with a tip that's 1 commit before v2021.10.03

@battlmonstr
Copy link
Contributor Author

battlmonstr commented May 24, 2022

As far as I understand we're not releasing from devel, but Alexey is maintaining some alpha branches where he merges and cherry-picks devel commits, and tags the result there.

One way to avoid seeing the stable tag v2021.10.03 on devel all the time, could be to mark some commit as v2022.MM.DD-dev.

@AskAlexSharov
Copy link
Collaborator

I like your last idea. feel free to do something make sense for you.

@battlmonstr
Copy link
Contributor Author

battlmonstr commented May 24, 2022

@AskAlexSharov this PR is a backport for the stable branch. A way to verify this would be to merge this to stable, make a new stable version tag/release (the previous one was v2022.04.02). Wait for the docker build to appear at https://hub.docker.com/repository/docker/thorax/erigon/builds , run this container with /usr/local/bin/erigon and see what it outputs.

One problem I see now though (both stable and devel), is that the Docker Hub build is not using make docker, but uses Dockerfile as a starting point. It means that the variables BUILD_DATE, VCS_REF, VERSION are gonna be empty there. We need to change it so that the variables are populated by the shell/make script from the build stage instead of passing them as ARGs.

@battlmonstr battlmonstr marked this pull request as draft May 24, 2022 13:09
@AskAlexSharov AskAlexSharov marked this pull request as ready for review May 24, 2022 13:22
@AskAlexSharov
Copy link
Collaborator

“de-draft” by accident

Dockerfile requires some --build-arg options.
Fix "docker" target to pass them.
Fix GIT_TAG to reflect the most recent tag related to HEAD, instead of an unrelated most recent tag.
Use it as the image VERSION.

Image tags need to be passed explicitly if needed:

    DOCKER_FLAGS='-t erigon:latest' make docker
@battlmonstr battlmonstr marked this pull request as ready for review May 24, 2022 19:12
@battlmonstr battlmonstr merged commit 28c62ff into stable May 25, 2022
@battlmonstr battlmonstr deleted the makegittag branch May 25, 2022 13:53
bgelb added a commit to bgelb/erigon that referenced this pull request Jun 16, 2022
* block by timestamp for stable (erigontech#3617)

* Add timings of forward stages to logs (erigontech#3621)

* save

* save

* deleted bor and starknet from doc (erigontech#3627)

* add nosqlite tag (erigontech#3653)

* add nosqlite tag

* save

* save (erigontech#3665)

* save (erigontech#3663)

* linter up (erigontech#3672) (erigontech#3673)

* linter up (erigontech#3672)

* save

* save

* Revert node DB cache (erigontech#3581) (erigontech#3674) (erigontech#3675)

Revert "Prevent frequent commits to the node DB in sentries (erigontech#2505)".
This reverts commit 65a9a26.

* [stable] Fixes to discovery nodedb (erigontech#3691)

* Update to erigon-lib stable

* Discovery: throttle node DB commits (erigontech#3581) (erigontech#3656)

UpdateFindFails/UpdateLastPingReceived/UpdateLastPongReceived events
are causing bursty DB commits (100 per minute).

This optimization throttles the disk writes to happen at most once in a few seconds,
because this info doesn't need to be persisted immediately.

This helps on HDD drives.

* Update erigon-lib

* Discovery: split node records to a sepatate DB table (erigontech#3581) (erigontech#3667)

Problem:
QuerySeeds will poke 150 random entries in the whole node DB and ignore hitting "field" entries.
In a bootstrap scenario it might hit hundreds of :lastping :lastpong entries,
and very few true "node record" entries.
After running for 15 minutes I've got totalEntryCount=1508 nodeRecordCount=114 entries.
There's a 1/16 chance of hitting a "node record" entry.
It means finding just about 10 nodes of 114 total on average from 150 attempts.

Solution:
Split "node record" entries to a separate table such that QuerySeeds doesn't do idle cycle hits.

* Discovery: add Context to Listen. (erigontech#3577)

Add explicit Context to ListenV4 and ListenV5.
This makes it possible to stop listening by an external signal.

* Discovery: refactor public key to node ID conversions. (erigontech#3634)

Encode and hash logic was duplicated in multiple places.
* Move encoding to p2p/discover/v4wire
* Move hashing to p2p/enode/idscheme

* Change newRandomLookup to create a proper random key on a curve.

* Discovery: speed up lookup tests (erigontech#3677)

* Update erigon-lib

Co-authored-by: Alexey Sharp <[email protected]>
Co-authored-by: battlmonstr <[email protected]>

* [stable] Fixes for state overrides in RPC (erigontech#3693)

* State override support (erigontech#3628)

* added stateOverride type

* solved import cycle

* refactoring

* imported wrong package

* fixed Call arguments

* typo

* override for traceCall

* Fix eth call (erigontech#3618)

* added isFake

* using isFake instead of checkNonce

* Revert "using isFake instead of checkNonce"

This reverts commit 6a202bb.

* Revert "added isFake"

This reverts commit 2c48024.

* only checking EOA if we are checking for Nonce

Co-authored-by: Enrique Jose  Avila Asapche <[email protected]>

* new bootnodes (erigontech#3591) (erigontech#3695)

Co-authored-by: Enrique Jose  Avila Asapche <[email protected]>

* Update skip analysis and preverified hashes (erigontech#3700) (erigontech#3704)

Co-authored-by: Alexey Sharp <[email protected]>

Co-authored-by: Alexey Sharp <[email protected]>

* Update version.go (erigontech#3701)

* rpcdaemon: fix TxContext in traceBlock (erigontech#3716)

Previously `txCtx` is not updated for every tx, which
leads to wrong tracing results.

* Mdbx: WriteMap fallback on error (erigontech#3714)

* save

* save

* Pool cost fix (erigontech#3725)

* save

* save

* Update to erigon-lib stable

Co-authored-by: Alex Sharp <[email protected]>

* mdbx v0.11.6 (erigontech#3771)

* mdbx fix after v0.11.6 (erigontech#3775)

* save

* save

* save

* [stable] Event log subscription (erigontech#3773)

* Logs sub (erigontech#3666)

* save

* Add onLogs

* Fix lint

* Add proper logs

* Update go.mod

* goimports

* Add unwind

* feat/rpcadaemon_logs_sub (erigontech#3751)

* Fixes to subscribe logs (erigontech#3769)

* Fixes to subscribe logs

* Add criteria to logs subscription

* Skeleton of RPC daemon event log distribution

* Simplify

* Send aggregated filter to Erigon

* Change API

* Print

* Fixes

* Fix topics filtering

* Fill txHash and blockHash

* Timing logs, fill tx index

* Print

* More print

* Print

* Asynchronous sending of log events to RPC daemon

* Remove prints

* Only extract logs if there are subscribers

* Check empty when RPC daemon is removed

Co-authored-by: Alex Sharp <[email protected]>
Co-authored-by: Alexey Sharp <[email protected]>

* Fix up

* Update to erigon-lib stable

* Update to erigon-lib stable

Co-authored-by: primal_concrete_sledge <[email protected]>
Co-authored-by: Alex Sharp <[email protected]>
Co-authored-by: Alexey Sharp <[email protected]>

* Update version.go (erigontech#3776)

* Update Skip analysis and preverified hashes (erigontech#3777) (erigontech#3778)

* Update skip analysis

* Add preverified hashes for mainnet and ropsten

* preverified hashes and bootnode for sepolia

Co-authored-by: Alexey Sharp <[email protected]>

Co-authored-by: Alexey Sharp <[email protected]>

* Integration: reset StageFinish also (erigontech#3783)

* docker hub - fetch git tags before build erigontech#3781

* fix nil pointer in fetch.go (erigontech#3802)

* Update preverified hashes and skip analysis (erigontech#3831) (erigontech#3832)

* Update skip_analysis

* Preverified hashes

Co-authored-by: Alexey Sharp <[email protected]>

Co-authored-by: Alexey Sharp <[email protected]>

* Fix 'all defaults' case for eth_estimateGas (erigontech#3790) (erigontech#3824)

* Fix 'all defaults' case for eth_estimateGas

* fix tests

Co-authored-by: Igor Mandrigin <[email protected]>

Co-authored-by: Igor Mandrigin <[email protected]>
Co-authored-by: Igor Mandrigin <[email protected]>

* Update version.go (erigontech#3829)

* Change libmdbx submodule origin  (erigontech#3894)

* save

* Restore testdata

Co-authored-by: Alexey Sharp <[email protected]>

* Update to erigon-lib stable (erigontech#3895)

Co-authored-by: Alexey Sharp <[email protected]>

* Update version.go (erigontech#3896)

* Update skip_analysis.go (erigontech#3897) (erigontech#3898)

* save (erigontech#3904)

* [stable] Fixes for header download (erigontech#3911)

* Rollback preverified hashes for mainnet

* Not remove header

* Set verified = true

* Fix verified extendUp and connect

* Skip already persisted links

* Prevent rewriting historical headers

* Not load links after highestInDb

* Restore preverified

* Fix tests

* Fix error handling

Co-authored-by: Alexey Sharp <[email protected]>

* save (erigontech#3916)

* Update libmdbx source (erigontech#3974)

Same change as already merged in `devel`

* Makefile (erigontech#3779): pass docker build arguments (erigontech#4239)

Dockerfile requires some --build-arg options.
Fix "docker" target to pass them.
Fix GIT_TAG to reflect the most recent tag related to HEAD, instead of an unrelated most recent tag.
Use it as the image VERSION.

Image tags need to be passed explicitly if needed:

    DOCKER_FLAGS='-t erigon:latest' make docker

* save (erigontech#4346)

* Gray Glacier bomb delay (erigontech#4444)

* Update version.go on stable branch (erigontech#4447)

* Update version.go

* Fix lint

Co-authored-by: Alexey Sharp <[email protected]>

* Clean up

* in transaction execution, subtract from account balance only after enough gaspool is ensured (erigontech#4450)

- noticed the difference when executing testdata#10 in go-ethereum and erigon

* Update skip_analysis.go (erigontech#4452)

* Adjust version

Co-authored-by: Enrique Jose  Avila Asapche <[email protected]>
Co-authored-by: Alex Sharov <[email protected]>
Co-authored-by: battlmonstr <[email protected]>
Co-authored-by: ledgerwatch <[email protected]>
Co-authored-by: Alexey Sharp <[email protected]>
Co-authored-by: can <[email protected]>
Co-authored-by: Alex Sharp <[email protected]>
Co-authored-by: primal_concrete_sledge <[email protected]>
Co-authored-by: Igor Mandrigin <[email protected]>
Co-authored-by: Igor Mandrigin <[email protected]>
Co-authored-by: Andrea Lanfranchi <[email protected]>
Co-authored-by: Andrew Ashikhmin <[email protected]>
Co-authored-by: sudeep <[email protected]>
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.

2 participants