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

Merge dev into liquid staking 22 06 2022 #4215

Merged

Conversation

mariusmihaic
Copy link
Contributor

@mariusmihaic mariusmihaic commented Jun 22, 2022

  • Merge dev into liquid staking 22 06 2022

bogdan-rosianu and others added 30 commits May 20, 2022 13:36
- used the elrond's pubsub fork and removed a replace
- refactored imports
- added more metrics in the trie syncer
…-proxy-if-not-ready-for-vm-queries

EN-12330: export metric erd_are_vm_queries_ready
iulianpascalau and others added 19 commits June 10, 2022 15:35
# Conflicts:
#	config/epochConfig.go
#	genesis/process/shardGenesisBlockCreator.go
#	go.mod
#	go.sum
#	node/nodeRunner.go
#	process/factory/shard/vmContainerFactory.go
…n-prepend

Async callback with built in prepend
# Conflicts:
#	cmd/node/config/enableEpochs.toml
#	config/epochConfig.go
#	genesis/process/shardGenesisBlockCreator.go
#	go.mod
#	go.sum
#	node/nodeRunner.go
#	p2p/libp2p/netMessenger_test.go
#	process/block/baseProcess.go
#	process/block/baseProcess_test.go
#	process/block/metablock.go
#	process/block/shardblock.go
# Conflicts:
#	cmd/node/config/enableEpochs.toml
#	node/nodeRunner.go
#	state/interface.go
#	vm/systemSmartContracts/esdt.go
#	vm/systemSmartContracts/esdt_test.go
@mariusmihaic mariusmihaic self-assigned this Jun 22, 2022
miiu96
miiu96 previously approved these changes Jun 22, 2022
ssd04
ssd04 previously approved these changes Jun 22, 2022
@mariusmihaic mariusmihaic dismissed stale reviews from ssd04 and miiu96 via dae4018 June 22, 2022 13:43
@@ -732,96 +732,97 @@ func TestValidatorsProvider_GetAuctionList(t *testing.T) {
response := vp.GetAuctionList()
require.Empty(t, response)
})

Copy link
Contributor

Choose a reason for hiding this comment

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

Add a todo here to FIX the test or remove it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is no fix for this actually.
It is the first API version; which will be completely removed.
I think it used a map while processing causing non-deterministic results

@mariusmihaic mariusmihaic merged commit c12be90 into feat/liquid-staking Jun 22, 2022
@mariusmihaic mariusmihaic deleted the merge-dev-into-liquid-staking-22-06-2022 branch June 22, 2022 14:11
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.

None yet

9 participants