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

Sync master with feature/protocol-state-kvstore #5655

Merged
merged 1,343 commits into from
Apr 11, 2024
Merged

Sync master with feature/protocol-state-kvstore #5655

merged 1,343 commits into from
Apr 11, 2024

Conversation

jordanschalm
Copy link
Member

@jordanschalm jordanschalm commented Apr 10, 2024 •
edited
Loading

Syncing our feature branch with master as a part of #5120. In particular, I'd like to pull in some recent changes Leo made on master which touch the SealingSegment:

Conflicts

Conflicts were minimal:

  • added go-clone dependency on feature branch, ruffling the **/go.mod files
  • very small change to createEpochSetupEvent function signature in service event fixtures
CONFLICT (content): Merge conflict in go.mod
CONFLICT (content): Merge conflict in insecure/go.mod
CONFLICT (content): Merge conflict in integration/go.mod
CONFLICT (content): Merge conflict in utils/unittest/service_events_fixtures.go

AndriiDiachuk and others added 30 commits March 13, 2024 14:46
@AndriiDiachuk
fixed previous redundant changes
c719cff
@AndriiDiachuk
Removed params and commented code
2fee978
@AndriiDiachuk
Removed unused function
a2b93d1
@Guitarheroua
Merge remote-tracking branch 'UlyanaAndrukhiv/UlyanaAndrukhiv/subscri…
eb16e71 
…be-blocks' into guitarheroua/send-and-subscribe-transaction_statuses
@UlyanaAndrukhiv
Updated according to comments
4bed022
@janezpodhostnik
Merge pull request #5497 from onflow/janez/charge-for-storage-check-2
d7a1ea9 
Meter computation in the account storage check
@AndriiDiachuk
Added missing methods local only handler, uncomented test
b5cdfb2
@AndriiDiachuk
Merge branch 'master' into AndriiDiachuk/add-standard-access-api-impl…
cf0fe2f 
…ementation-on-observer
@UlyanaAndrukhiv
Removed OnExecutionData from state stream engine
a1241bd
@UlyanaAndrukhiv
Moved fatal log inside execution data tracker, removed unnecessary Ge…
2f8254d 
…tHighestHeight type
@UlyanaAndrukhiv
Fixed error code in godoc
9675f59
@UlyanaAndrukhiv
Merge branch 'master' into UlyanaAndrukhiv/subscribe-blocks
ffe008c
@UlyanaAndrukhiv
Updated according to last comment
39d6307
@UlyanaAndrukhiv
Updated flow-emulator
4b23c0a
@peterargue
Merge pull request #5307 from UlyanaAndrukhiv/UlyanaAndrukhiv/subscri…
0bb7997 
…be-blocks

[Access] Implement gRPC streaming endpoint SubscribeBlocks
@peterargue
Merge branch 'master' into guitarheroua/send-and-subscribe-transactio…
c74a3b6 
…n_statuses
@peterargue
[Admin] Add support for CPU profiles via admin server - master backport
5439a32
@Guitarheroua
Updated flow-emulator
27fadb9
@Guitarheroua @durkmurder
Apply suggestions from code review
33a9f8e 
Co-authored-by: Yurii Oleksyshyn <[email protected]>
@Guitarheroua
Revert unnecessary changes
44ea43f
@Guitarheroua
Merge branch 'guitarheroua/send-and-subscribe-transaction_statuses' o…
61ad359 
…f github.com:Guitarheroua/flow-go into guitarheroua/send-and-subscribe-transaction_statuses
@AndriiDiachuk
Added default params in observer config
814d573
@AndriiDiachuk
Merge branch 'AndriiDiachuk/add-standard-access-api-implementation-on…
74a30d3 
…-observer' of https://github.com/AndriiDiachuk/flow-go into AndriiDiachuk/add-standard-access-api-implementation-on-observer
@AndriiDiachuk
Merged
5052a99
@AndriiDiachuk
Added logs in GetEventsForHeight
f753c8e
@Guitarheroua
Fixed remarks
86b74e4
@AndriiDiachuk
Fixed integration test for indexer enabled case
3bf27ff
@AndriiDiachuk
Removed commented code
d72e04a
@Guitarheroua
Fixed test
3f231cb
@AndriiDiachuk
Removed more comnments
22070de
peterargue and others added 17 commits April 4, 2024 17:13
@peterargue
Merge pull request #5602 from The-K-R-O-K/UlyanaAndrukhiv/event-strea…
0b0592c 
…ming

[Access] Unify Event streaming endpoint on the execution data gRPC API
@UlyanaAndrukhiv
Removed replace for protobuf, updated version
8da90cc
@UlyanaAndrukhiv
Removed replace for flow-emulator, updated version
4b8293b
@peterargue
Merge pull request #5626 from The-K-R-O-K/UlyanaAndrukhiv/version-upd…
ad12394 
…ates

Updates protobuf and flow-emulator versions
@AndriiDiachuk
Refactored test where all rpcs is being checked
f32b4b6
@AndriiDiachuk
Merge branch 'master' of github.com:AndriiDiachuk/flow-go into observ…
0b9e68a 
…er-access-api-integration-tests-extend
@fxamacker
Add storage health check flags for atree migration
eaf2bc4
@peterargue
[Network] Use string concatination in rpc tracer ID
a224298
@peterargue
Merge pull request #5612 from AndriiDiachuk/observer-access-api-integ…
b92fe5d 
…ration-tests-extend

[Access] Extend observer Access API integration tests for local data
@fxamacker
Move reusable migration funcs to migrations/utils.go
6ab8300
@fxamacker
Merge branch 'master' into fxamacker/add-storage-health-check-flag-fo…
1d32ad0 
…r-atree-migration
@fxamacker
Merge pull request #5636 from onflow/fxamacker/add-storage-health-che…
54a1eef 
…ck-flag-for-atree-migration

Add storage health check flags for atree migration
@peterargue
Merge pull request #5641 from onflow/petera/5640-update-string-concat…
a203323 
…-rpc-tracer1

[Network] Use string concatenation in rpc tracer ID
@turbolent
simplify migration runtime, no need for interface and environment
9eb8a81
@turbolent
simplify validation runtime: no need for interface and environment
9882d23
@turbolent
Merge pull request #5651 from onflow/bastian/simplify-migration-runtimes
aa08b01 
Simplify migration runtime, no need for interface and environment
@jordanschalm
Merge branch 'master' into jordan/merge-kvstore-master
06e93d8
@jordanschalm jordanschalm changed the title Jordan/merge kvstore master Sync master with feature/protocol-state-kvstore Apr 10, 2024
@jordanschalm jordanschalm marked this pull request as ready for review April 10, 2024 21:19
@jordanschalm jordanschalm merged commit 01fcf31 into feature/protocol-state-kvstore Apr 11, 2024
55 checks passed
@jordanschalm jordanschalm deleted the jordan/merge-kvstore-master branch April 11, 2024 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@durkmurder durkmurder durkmurder approved these changes

@zhangchiqing zhangchiqing zhangchiqing approved these changes

@peterargue peterargue Awaiting requested review from peterargue peterargue is a code owner

@ramtinms ramtinms Awaiting requested review from ramtinms

@janezpodhostnik janezpodhostnik Awaiting requested review from janezpodhostnik janezpodhostnik is a code owner

@AlexHentschel AlexHentschel Awaiting requested review from AlexHentschel AlexHentschel is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.