search

filecoin-project / FIPs

The Filecoin Improvement Proposal repository
312 stars 166 forks source link

Fix wrong conflict resolution in FIP-0083 update #971

Closed aarshkshah1992 closed 5 months ago

aarshkshah1992 commented 5 months ago

We accidentally resolved the conflict wrongly before merging https://github.com/filecoin-project/FIPs/pull/968. This PR fixes that.

willscott commented 5 months ago

Is this expected to land for NV22?

rvagg commented 5 months ago

yes, it's in actors v13.0.0 @ https://github.com/filecoin-project/builtin-actors/blob/v13.0.0/actors/verifreg/src/emit.rs#L26 and Lotus v1.26.0, although it's not on calibnet, there's a minor upgrade there just for this and the other verifreg changes, see notes in v1.26.1 for timing of that upgrade: https://github.com/filecoin-project/lotus/releases/tag/v1.26.1

@aarshkshah1992 can you clean up the conflict here and get it ready to land this PR?

aarshkshah1992 commented 5 months ago

Closing in favour of https://github.com/filecoin-project/FIPs/pull/980