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

Merge 1.4.0 into cli for snapshots enabled #4763

Merged
merged 420 commits into from
Dec 6, 2022
Merged

Merge 1.4.0 into cli for snapshots enabled #4763

merged 420 commits into from
Dec 6, 2022

Conversation

ssd04
Copy link
Contributor

@ssd04 ssd04 commented Dec 6, 2022

Reasoning behind the pull request

Proposed changes

Testing procedure

Pre-requisites

Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:

  • was the PR targeted to the correct branch?
  • if this is a larger feature that probably needs more than one PR, is there a feat branch created?
  • if this is a feat branch merging, do all satellite projects have a proper tag inside go.mod?

miiu96 and others added 30 commits September 27, 2022 13:29
@miiu96
small fixes
3e14d80
@miiu96
fix tests
5db15d1
@miiu96
latest elrond go core
859d30b
@miiu96
update core
81da143
@miiu96
update elrond go core
9e89c37
@bogdan-rosianu
first implementation [wip]
f234645
@miiu96
fixes after review
b6f7fb2
@miiu96
Merge branch 'rc/v1.4.0' into merge-in-feat-altered
397bbb2 
# Conflicts:
#	go.sum
@miiu96
go mod tidy
c2d25ee
@miiu96
Merge pull request #4541 from ElrondNetwork/merge-in-feat-altered
199b4cc 
Merge in feat altered
@miiu96
Merge branch 'feat/altered-accounts' into integrate-indexer-feat-altered
2e98d39 
# Conflicts:
#	go.mod
#	go.sum
@miiu96
fixes
f218f9f
@bogdan-rosianu
small fixes
56d19e8
@bogdan-rosianu
first working version (for shards)
2679ea7
@miiu96
latest elrond-go-core
13716bd
@bogdan-rosianu
added functionality to meta processor + unit tests
8a3a4e3
@bogdan-rosianu
Merge branch 'integrate-indexer-feat-altered' into EN-13219-altered-a…
130f394 
…ccounts-endpoint

# Conflicts:
#	go.mod
#	go.sum
@bogdan-rosianu
fixes after merge
dad857f
@miiu96
add IsImportDBMode in ArgsSaveBlock
ee0b597
@miiu96
latest indexer
3fb0db0
@bogdan-rosianu
fix tests
f3425be
@miiu96
Merge pull request #4376 from ElrondNetwork/integrate-indexer-feat-al…
d1a8334 
…tered

Integrate indexer `feat/altered-accounts`
@bogdan-rosianu
Merge branch 'feat/altered-accounts' into EN-13219-altered-accounts-e…
884a1b8 
…ndpoint

# Conflicts:
#	go.mod
#	go.sum
@bogdan-rosianu
fixes after merge
56167a4
@bogdan-rosianu
fixes after first review
597accd
@bogdan-rosianu
(partial) fix after review
e41f36a
@bogdan-rosianu
fixes after review
49851ea
@bogdan-rosianu
fix after review
bf328fb
@bogdan-rosianu
remove test
1369533
@bogdan-rosianu
fixes after review
69558d4
andreibancioiu and others added 23 commits November 28, 2022 13:18
@andreibancioiu
Reference new storage (sketch, use commit hash).
d69170e
@bogdan-rosianu
Merge branch 'rc/v1.4.0' into fix-index-of-last-tx-processed
ffca15b
@iulianpascalau
Merge pull request #4725 from ElrondNetwork/fix-index-of-last-tx-proc…
abaf7a3 
…essed

index only non empty genesis miniblocks
@AdoAdoAdo
use proper tags
a366e97
@AdoAdoAdo
Merge branch 'update-dep-versions' of github.com:ElrondNetwork/elrond…
9a144dc 
…-go into update-dep-versions
@andreibancioiu
Merge branch 'rc/v1.4.0' into integrate-storage-immunity-logs-28
f01eea6
@andreibancioiu
Reference elrond-go-storage v1.0.3.
e1c18e7
@AdoAdoAdo
Merge branch 'rc/v1.4.0' into update-dep-versions
f0c11ba 
# Conflicts:
#	go.mod
#	go.sum
@iulianpascalau
Merge pull request #4730 from ElrondNetwork/update-dep-versions
5566848 
update dep versions
@andreibancioiu
Merge branch 'rc/v1.4.0' into integrate-storage-immunity-logs-28
77b610e
@andreibancioiu
Fix tag.
36494fc
@camilbancioiu
Prepare new flag
b89e794
@camilbancioiu
Fix instantiation
d7f8bf4
@camilbancioiu
Fixes and updates
7d4d4ed
@camilbancioiu
Fix after review
6495bae
@gabi-vuls
Merge pull request #4736 from ElrondNetwork/integrate-storage-immunit…
b1a9a21 
…y-logs-28
@camilbancioiu
Fix conflicts
7add703
@ssd04
Merge branch 'rc/v1.4.0' into move-client-filtering-to-notifier
1153317
@gabi-vuls
Merge pull request #4737 from ElrondNetwork/vm-v1_4-fix-with-flag
3871b6d 
Vm v1_4 fix with flag
@iulianpascalau
Merge branch 'rc/v1.4.0' into move-client-filtering-to-notifier
d7e5093
@iulianpascalau
Merge pull request #4717 from ElrondNetwork/move-client-filtering-to-…
bd762dc 
…notifier

remove filtering for save block data
@ssd04
Merge branch 'rc/v1.4.0' into merge-1.4.0-into-cli-for-snapshots-enabled
e69e022
@ssd04
fix conflicts after merge
4988d73
@ssd04 ssd04 added the ignore-for-release-notes Do not include item in release notes label Dec 6, 2022
@iulianpascalau iulianpascalau self-requested a review December 6, 2022 10:34
iulianpascalau
iulianpascalau approved these changes Dec 6, 2022
View reviewed changes
Copy link
Contributor

@iulianpascalau iulianpascalau left a comment

Choose a reason for hiding this comment

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

usless PR? :D

@ssd04
Copy link
Contributor Author

ssd04 commented Dec 6, 2022

i've created it to run all tests easier :D

@ssd04 ssd04 merged commit 9a16d66 into cli-flag-for-snapshots-enabled Dec 6, 2022
@ssd04 ssd04 deleted the merge-1.4.0-into-cli-for-snapshots-enabled branch December 6, 2022 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bogdan-rosianu bogdan-rosianu bogdan-rosianu approved these changes

@iulianpascalau iulianpascalau iulianpascalau approved these changes

Assignees
No one assigned
Labels
ignore-for-release-notes Do not include item in release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.