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

Support network version 16 #988

Merged
merged 22 commits into from
Jul 5, 2022
Merged

Support network version 16 #988

merged 22 commits into from
Jul 5, 2022

Conversation

frrist
Copy link
Member

@frrist frrist commented Jun 15, 2022

@codecov-commenter
Copy link

codecov-commenter commented Jun 15, 2022

Codecov Report

Merging #988 (1da0a11) into master (f6cbe62) will increase coverage by 0.8%.
The diff coverage is 54.5%.

@@           Coverage Diff            @@
##           master    #988     +/-   ##
========================================
+ Coverage    34.6%   35.5%   +0.8%     
========================================
  Files          45      44      -1     
  Lines        3043    2884    -159     
========================================
- Hits         1055    1025     -30     
+ Misses       1884    1755    -129     
  Partials      104     104             

@frrist frrist linked an issue Jun 15, 2022 that may be closed by this pull request
@frrist frrist force-pushed the frrist/update-lotusv1.16.0-rc branch from 5cb9647 to ffa76d5 Compare June 16, 2022 15:52
@frrist frrist changed the base branch from master to frrist/fix-linter June 16, 2022 15:52
@frrist frrist self-assigned this Jun 16, 2022
@frrist frrist changed the title Frrist/update lotusv1.16.0 rc Support network version 16 Jun 16, 2022
@frrist frrist force-pushed the frrist/fix-linter branch from acaf7e4 to a3df9e7 Compare June 16, 2022 22:24
Base automatically changed from frrist/fix-linter to master June 18, 2022 00:02
@frrist frrist force-pushed the frrist/update-lotusv1.16.0-rc branch 2 times, most recently from 41f384a to d5162b5 Compare June 29, 2022 01:54
@frrist frrist force-pushed the frrist/update-lotusv1.16.0-rc branch 2 times, most recently from 6d8db02 to 1da0a11 Compare June 29, 2022 21:15
@frrist frrist marked this pull request as ready for review June 29, 2022 21:23
@@ -0,0 +1,332 @@
package actors
Copy link
Member Author

Choose a reason for hiding this comment

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

This file will need to exist until a lotus release containing filecoin-project/lotus#8941 is cut. It ensures the correct actor CID's are returned for actors v8 since their CID's will differ depending on the network: mainnet, calibnet, buttnet, etc. Actors v7-0 remain unchanged ofcourse

@@ -57,77 +47,3 @@ func (m *MapOpts) Equal(o *MapOpts) bool {

return true
}

func MapOptsForActorCode(c cid.Cid) (*MapOpts, error) {
Copy link
Member Author

Choose a reason for hiding this comment

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

nixed in favor of methods on the generated actor accessors that return the correct values for BitWidth and HashFunction

@frrist frrist force-pushed the frrist/update-lotusv1.16.0-rc branch 5 times, most recently from 1a37fbd to 4103871 Compare July 1, 2022 20:51
@frrist
Copy link
Member Author

frrist commented Jul 1, 2022

I've confirmed on calibration that the migration works with the below query:

select *, convert_from(decode(label, 'BASE64'), 'UTF-8') as label_decoded
from market_deal_proposals
where market_deal_proposals.is_string is not null;
deal_id state_root piece_cid padded_piece_size unpadded_piece_size is_verified client_id provider_id start_epoch end_epoch slashed_epoch storage_price_per_epoch provider_collateral client_collateral label height is_string label_decoded
178670 bafy2bzaceczazo5iv5j7axomryn4brrial2ebu4rdh3syc2itquss2jriraiy baga6ea4seaqiyefk4hpyoiab3vv2noc3dkq6mydf75b2r7cjrwgwhas3iyuqwlq 16777216 16646144 false t036853 t010938 1101093 2321528 NULL 0 0 0 bUFYQ2c1QUlnUWRIZTg4RHdkM09nWlJkdTFmMHNaYlBtU0cwYi9SbWRmTXJUV3NXNmJxOA== 1078058 true mAXCg5AIgQdHe88Dwd3OgZRdu1f0sZbPmSG0b/RmdfMrTWsW6bq8
178669 bafy2bzaceczj7k4jd7vbyyfmfhio6c2xcq3nybpjiujet7xpniby3xti4jwpq baga6ea4seaqcytfbtfxkrtjuslrlfthqgptnrgmd6pnk6mnorrtks2jxi6fpapi 262144 260096 false t036853 t010938 1090870 1993208 NULL 400 0 0 bUFWV2c1QUlndkRSczFuU1NzRHVjQ2NPVEtWa2tvWEk2N2NRdUFQRFBwc0pNYzhFVXpqTQ== 1078048 true mAVWg5AIgvDRs1nSSsDucCcOTKVkkoXI67cQuAPDPpsJMc8EUzjM
178667 bafy2bzacecmmxcu7w7akr4b6kj5znlh7dzew3kbkrohtruh5sn6ldyx4vhou6 baga6ea4seaqizpcpcpxrvb24zf4avszwo72s6zvcwjgbn6wud4bl7acikbsjwai 262144 260096 false t036853 t010938 1090870 1993208 NULL 400 0 0 bUFWV2c1QUlnbUVWWTBENHlnL2wyQzBiSjFQMXpKcXhTL0NXcTNRa0k5djNWREpXL1RQTQ== 1078037 true mAVWg5AIgmEVY0D4yg/l2C0bJ1P1zJqxS/CWq3QkI9v3VDJW/TPM
178668 bafy2bzacecmmxcu7w7akr4b6kj5znlh7dzew3kbkrohtruh5sn6ldyx4vhou6 baga6ea4seaqpba3gltbpuqomb62dgztib2lc6xh466huru434ucxghxs2l72aai 262144 260096 false t036853 t010938 1090870 1993208 NULL 400 0 0 bUFWV2c1QUlnU3FBemlEeDN0cjl2a21sM2VOMlZFWUFjNkJwK1YyOEl3UlVkU3ljZG9kdw== 1078037 true mAVWg5AIgSqAziDx3tr9vkml3eN2VEYAc6Bp+V28IwRUdSycdodw
178664 bafy2bzacedl3tc6fa2vl2nsrozbtkidgkumnc22de4enwo2xvpi5pyrscxb7e baga6ea4seaqae7o2dfzhpyfgaxqcevslhdlbfxl2ngqisebdw3z6inxozsaeaai 16777216 16646144 false t036853 t010938 1101061 2321528 NULL 0 0 0 bUFYQ2c1QUlnZjg4MTFlNVJJQVRSZEFFajlIZWovZ21HaHRoSTBwRS9xNndFT3JTMmZGSQ== 1078027 true mAXCg5AIgf8811e5RIATRdAEj9Hej/gmGhthI0pE/q6wEOrS2fFI

@frrist
Copy link
Member Author

frrist commented Jul 1, 2022

I've confirmed this branch is capable of processing the entire calibration chain with zero errors

@frrist
Copy link
Member Author

frrist commented Jul 1, 2022

Confirmed that the migration works against both a populated and empty database

@frrist frrist force-pushed the frrist/update-lotusv1.16.0-rc branch from 4103871 to b01176d Compare July 4, 2022 22:38
@frrist frrist added this to the Support Network Version v16 milestone Jul 5, 2022
* fix: many incorrect pointer equality comparisons
@frrist frrist merged commit 61fdd9b into master Jul 5, 2022
@frrist frrist deleted the frrist/update-lotusv1.16.0-rc branch July 5, 2022 22:51
frrist added a commit that referenced this pull request Jul 5, 2022
frrist added a commit that referenced this pull request Jul 5, 2022
* docs: write v0.11.0 changelog

* docs: mention PRs that landed as a part of #988

* docs: update w/ migration note

Co-authored-by: Mike Greenberg <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants