Allow starting networks from arbitrary actor versions #6305
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arajasek
force-pushed
the
asr/genesis-actor
branch
from
739a810
to
632a989
Compare
arajasek
commented
May 20, 2021
| @@ -24,20 +24,20 @@ var UpgradeIgnitionHeight = abi.ChainEpoch(-2) | |||
| var UpgradeRefuelHeight = abi.ChainEpoch(-3) | |||
| var UpgradeTapeHeight = abi.ChainEpoch(-4) | |||
|
|
|||
| var UpgradeActorsV2Height = abi.ChainEpoch(10) | |||
| var UpgradeLiftoffHeight = abi.ChainEpoch(-5) | |||
| var UpgradeActorsV2Height = abi.ChainEpoch(-5) | |||
There was a problem hiding this comment.
Changed these thinking we could make devnets start from latest nv by default, but can undo that.
arajasek
commented
May 20, 2021
| @@ -366,6 +376,45 @@ func (s *state{{.v}}) decodeSectorPreCommitOnChainInfo(val *cbg.Deferred) (Secto | |||
| return fromV{{.v}}SectorPreCommitOnChainInfo(sp), nil | |||
| } | |||
|
|
|||
| func (s *state{{.v}}) EraseAllUnproven() error { | |||
There was a problem hiding this comment.
This is the only objectively horrible hack I had to add to make this work.
There was a problem hiding this comment.
At least the only one that isn't super easy to remove later.
arajasek
commented
May 20, 2021
| @@ -662,37 +662,6 @@ func (vm *VM) Flush(ctx context.Context) (cid.Cid, error) { | |||
| return root, nil | |||
| } | |||
|
|
|||
| // MutateState usage: MutateState(ctx, idAddr, func(cst cbor.IpldStore, st *ActorStateType) error {...}) | |||
| func (vm *VM) MutateState(ctx context.Context, addr address.Address, fn interface{}) error { | |||
There was a problem hiding this comment.
Quite happy that this is dead.
arajasek
commented
May 20, 2021
|
|
||
| // TODO: Get from build | ||
| // TODO: make a list/schedule of these. | ||
| var GenesisNetworkVersion = func() network.Version { |
There was a problem hiding this comment.
Happy this is gone
|
This is against |
magik6k
reviewed
May 20, 2021
chain/actors/agen/main.go
Outdated
Comment on lines
16
to
20
| var versionImports = map[int]string{ | ||
| 0: "/", | ||
| 2: "/v2/", | ||
| 3: "/v3/", | ||
| latestVersion: "/v4/", | ||
| 0: "/", | ||
| 2: "/v2/", | ||
| 3: "/v3/", | ||
| lotusactors.LatestVersion: "/v4/", |
There was a problem hiding this comment.
Can we just generate this from lotusactors.Versions? (1 less thing to do manually every time)
Comment on lines
38
to
63
| func MakeState(store adt.Store, av actors.Version, addr address.Address) (State, error) { | ||
| switch av { | ||
| {{range .versions}} | ||
| case actors.Version{{.}}: | ||
| return make{{.}}(store, addr) | ||
| {{end}} | ||
| } | ||
| return nil, xerrors.Errorf("unknown actor version %d", av) | ||
| } | ||
|
|
||
| func GetActorCodeID(av actors.Version) (cid.Cid, error) { | ||
| switch av { | ||
| {{range .versions}} | ||
| case actors.Version{{.}}: | ||
| return builtin{{.}}.AccountActorCodeID, nil | ||
| {{end}} | ||
| } | ||
|
|
||
| return cid.Undef, xerrors.Errorf("unknown actor version %d", av) | ||
| } | ||
|
|
||
| type State interface { | ||
| cbor.Marshaler | ||
|
|
||
| PubkeyAddress() (address.Address, error) | ||
| GetState() interface{} |
There was a problem hiding this comment.
Mixed tabs with spaces (use tabs)
arajasek
force-pushed
the
asr/genesis-actor
branch
from
632a989
to
cf574ca
Compare
magik6k
approved these changes
May 26, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5817
Allowed me to get to height 1500 on a devnet starting from v4 actors, so I'm gonna call this a win.