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

VM: Refactor pricelist to be based on network versions #8369

Merged
merged 2 commits into from
Mar 25, 2022
Merged

Conversation

arajasek
Copy link
Contributor

Related Issues

Partially addresses #6652

This was motivated by trying to sync the new FVM-based caterpillarnet using the LegacyVM. The 2 VMs are expected to interoperate, but don't, because the LegacyVM expects to use the "old" (genesis) pricelist, which is wrong for network v15.

Proposed Changes

The proposed change is to make pricelist selection based on both epoch and network version. For anything after network v8, we can select the pricelist based on the version.

The epoch-based selection is preserved for backwards compatibility alone.

Additional Info

Checklist

Before you mark the PR ready for review, please make sure that:

  • All commits have a clear commit message.
  • The PR title is in the form of of <PR type>: <area>: <change being made>
    • example: fix: mempool: Introduce a cache for valid signatures
    • PR type: fix, feat, INTERFACE BREAKING CHANGE, CONSENSUS BREAKING, build, chore, ci, docs,perf, refactor, revert, style, test
    • area: api, chain, state, vm, data transfer, market, mempool, message, block production, multisig, networking, paychan, proving, sealing, wallet, deps
  • This PR has tests for new functionality or change in behaviour
  • If new user-facing features are introduced, clear usage guidelines and / or documentation updates should be included in https://lotus.filecoin.io or Discussion Tutorials.
  • CI is green

@arajasek arajasek requested a review from a team as a code owner March 25, 2022 00:00
Copy link
Contributor

@magik6k magik6k left a comment

Choose a reason for hiding this comment

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

Or not quite approve, CI is angry

Failed
=== RUN   TestMessagePool
2022-03-25T00:00:23.133Z	INFO	messagepool	messagepool/messagepool.go:439	mpool ready
    messagepool_test.go:261: getting network version: Epoch 1 has no defined network version
--- FAIL: TestMessagePool (0.00s)

@codecov
Copy link

codecov bot commented Mar 25, 2022

Codecov Report

Merging #8369 (0bfbcfb) into master (11db419) will decrease coverage by 0.02%.
The diff coverage is 65.21%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8369      +/-   ##
==========================================
- Coverage   40.21%   40.18%   -0.03%     
==========================================
  Files         684      684              
  Lines       74557    74565       +8     
==========================================
- Hits        29985    29967      -18     
- Misses      39342    39364      +22     
- Partials     5230     5234       +4     
Impacted Files Coverage Δ
chain/vm/fvm.go 0.00% <0.00%> (ø)
chain/vm/mkactor.go 48.48% <0.00%> (ø)
chain/messagepool/selection.go 83.84% <40.00%> (-0.46%) ⬇️
chain/messagepool/messagepool.go 63.90% <50.00%> (+0.13%) ⬆️
chain/consensus/filcns/filecoin.go 52.17% <100.00%> (ø)
chain/messagepool/check.go 76.08% <100.00%> (-1.17%) ⬇️
chain/stmgr/forks.go 47.29% <100.00%> (ø)
chain/vm/gas.go 79.16% <100.00%> (+0.59%) ⬆️
chain/vm/vm.go 62.69% <100.00%> (ø)
chain/events/message_cache.go 87.50% <0.00%> (-12.50%) ⬇️
... and 21 more

@magik6k magik6k merged commit 7dc19bb into master Mar 25, 2022
@magik6k magik6k deleted the asr/pricelist branch March 25, 2022 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

2 participants