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 nv16 changes into master #8810

Merged
merged 289 commits into from
Jun 9, 2022
Merged

Merge nv16 changes into master #8810

merged 289 commits into from
Jun 9, 2022

Conversation

arajasek
Copy link
Contributor

@arajasek arajasek commented Jun 6, 2022

This PR pulls in the changes developed in the feat/nv16 branch into master.

@arajasek arajasek requested a review from a team as a code owner June 6, 2022 14:23
@arajasek arajasek requested a review from vyzo June 8, 2022 02:37
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.

Some mostly questions, in general looks very landable.

build/params_2k.go Show resolved Hide resolved
inv.Register(actors.Version5, vm.ActorsVersionPredicate(actors.Version5), exported5.BuiltinActors()...)
inv.Register(actors.Version6, vm.ActorsVersionPredicate(actors.Version6), exported6.BuiltinActors()...)
inv.Register(actors.Version7, vm.ActorsVersionPredicate(actors.Version7), exported7.BuiltinActors()...)
inv.Register(actors.Version8, vm.ActorsVersionPredicate(actors.Version8), exported8.BuiltinActors()...)
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want v8 go actors in legacy invoker?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We do need this, yes. We ask to register the wrong BuiltinActors() (from v8 go-actors), which we then transform to use the right CIDs and setup the Methods info correctly

Copy link
Contributor

Choose a reason for hiding this comment

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

In that case, do we maybe want to keep the inline-gen here? (fine without it, just not sure why it got dropped)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Lolol, it got dropped because I thought it was gonna go, and then had to re-add it :P

I'll bring it back.

chain/gen/genesis/util.go Show resolved Hide resolved
chain/vm/runtime.go Outdated Show resolved Hide resolved
cmd/lotus-shed/cid.go Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
node/builder.go Show resolved Hide resolved
ret := res.MsgRct.GasUsed

transitionalMulti := 1.0
// Overestimate gas around the upgrade
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we create an issue to remove (or make more reusable/cleaner/self contained) this after the upgrade epoch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes!

arajasek and others added 3 commits June 8, 2022 13:18
@arajasek arajasek force-pushed the asr/feat-into-master branch from c235316 to 82e4391 Compare June 8, 2022 17:41
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.

Let's land this!

@arajasek arajasek force-pushed the asr/feat-into-master branch from 94007f8 to b211c51 Compare June 9, 2022 20:09
@arajasek arajasek merged commit c661d24 into master Jun 9, 2022
@arajasek arajasek deleted the asr/feat-into-master branch June 9, 2022 20:09
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.

10 participants