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 #3803

Merged
merged 2,094 commits into from Mar 1, 2022

Conversation

mariusmihaic
Copy link
Contributor

@mariusmihaic mariusmihaic commented Feb 15, 2022

  • Merge dev into liquid staking/ staking v4

AdoAdoAdo and others added 30 commits January 29, 2022 10:16
…ed-sc-execution-28.01.2022

Merge dev into feat scheduled sc execution - 28.01.2022
…registry

epochStart, storage: fix backwards compatibility metachain trigger registry
# Conflicts:
#	dblookupext/esdtSupply/logsProcessor_test.go
…ata-header-v2

Indexer with additional data
# Conflicts:
#	go.mod
#	go.sum
#	node/external/blockAPI/baseBlock.go
#	node/external/blockAPI/shardBlock.go
#	node/nodeBlocks_test.go
@codecov
Copy link

codecov bot commented Feb 16, 2022

Codecov Report

❗ No coverage uploaded for pull request base (feat/liquid-staking@15fa38e). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 65043df differs from pull request most recent head fee83c2. Consider uploading reports for the commit fee83c2 to get more accurate results

Impacted file tree graph

@@                  Coverage Diff                   @@
##             feat/liquid-staking    #3803   +/-   ##
======================================================
  Coverage                       ?   74.24%           
======================================================
  Files                          ?      601           
  Lines                          ?    79351           
  Branches                       ?        0           
======================================================
  Hits                           ?    58918           
  Misses                         ?    15869           
  Partials                       ?     4564           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 15fa38e...fee83c2. Read the comment docs.

iulianpascalau and others added 20 commits February 16, 2022 10:09
Update readme.md + fixed race condition in unit test
…rs-in-api-block

Extend API route for blocks
updated integration tests to use gasschedule v4
…stantiation

Cleanup: moved the blockchain instantiation from the vm container factory
@sasurobert sasurobert marked this pull request as ready for review February 28, 2022 15:12
sasurobert
sasurobert previously approved these changes Feb 28, 2022
@mariusmihaic mariusmihaic self-assigned this Feb 28, 2022
# Conflicts:
#	process/factory/metachain/vmContainerFactory.go
@iulianpascalau iulianpascalau merged commit bf944cd into feat/liquid-staking Mar 1, 2022
@iulianpascalau iulianpascalau deleted the merge-dev-into-liquid-staking branch March 1, 2022 09:04
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