feat: implement FIP-0061 #10629

arajasek · 2023-04-05T19:57:38Z

Related Issues

#10375

Proposed Changes

As described in #10375

Additional Info

Needs:

feat: implement FIP-0061 builtin-actors#1257 landed & in a release that's bundled in
feat: Implement FIP-0061 go-state-types#182 landed & in a release

Checklist

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

Commits have a clear commit message.
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, build, chore, ci, docs, perf, refactor, revert, style, test
- area, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps
New features have usage guidelines and / or documentation updates in
- Lotus Documentation
- Discussion Tutorials
Tests exist for new functionality or change in behavior
CI is green

arajasek · 2023-04-06T14:24:13Z

chain/gen/genesis/miners.go

-				Peer:          []byte(m.PeerId),
-				SealProofType: spt,
+			var params []byte
+			if nv <= network.Version10 {


This change was unearthed, but not caused by FIP-0061 -- it was "working" before because the SealProofType was coincidentally the same value as the PoStProofType, and the power2.CreateMinerParams marshaled to the same bytes as the power3.CreateMinerParams, and so it...worked.

arajasek · 2023-04-06T15:27:40Z

(New tests will pass when actors bundle updated)

magik6k

Tests are sad

    ensemble.go:457: 
        	Error Trace:	/home/circleci/project/itests/ensemble.go:457
        	            				/home/circleci/project/itests/ensemble_presets.go:22
        	            				/home/circleci/project/itests/wdpost_test.go:358
        	Error:      	Received unexpected error:
        	            	starting node:
        	            	    github.com/filecoin-project/lotus/node.New
        	            	        /home/circleci/project/node/builder.go:378
        	            	  - could not build arguments for function "github.com/filecoin-project/lotus/node/modules/lp2p".StartListening.func1
        	            	    	/home/circleci/project/node/modules/lp2p/addrs.go:85:
        	            	    failed to build host.Host:
        	            	    could not build arguments for function "reflect".makeFuncStub
        	            	    	/usr/local/go/src/reflect/asm_amd64.s:28:
        	            	    failed to build lp2p.BaseIpfsRouting:
        	            	    could not build arguments for function "reflect".makeFuncStub
        	            	    	/usr/local/go/src/reflect/asm_amd64.s:28:
        	            	    failed to build dtypes.NetworkName:
        	            	    could not build arguments for function "reflect".makeFuncStub
        	            	    	/usr/local/go/src/reflect/asm_amd64.s:28:
        	            	    failed to build dtypes.AfterGenesisSet:
        	            	    received non-nil error from function "reflect".makeFuncStub
        	            	    	/usr/local/go/src/reflect/asm_amd64.s:28:
        	            	    genesis func failed:
        	            	        github.com/filecoin-project/lotus/node/modules.SetGenesis
        	            	            /home/circleci/project/node/modules/genesis.go:73
        	            	      - make genesis block failed:
        	            	        github.com/filecoin-project/lotus/node/modules/testing.MakeGenesisMem.func1.1
        	            	            /home/circleci/project/node/modules/testing/genesis.go:39
        	            	      - setup miners failed:
        	            	        github.com/filecoin-project/lotus/chain/gen/genesis.MakeGenesisBlock
        	            	            /home/circleci/project/chain/gen/genesis/genesis.go:583
        	            	      - failed to create genesis miner:
        	            	        github.com/filecoin-project/lotus/chain/gen/genesis.SetupStorageMiners
        	            	            /home/circleci/project/chain/gen/genesis/miners.go:168
        	            	      - doExec apply message failed:
        	            	        github.com/filecoin-project/lotus/chain/gen/genesis.doExecValue
        	            	            /home/circleci/project/chain/gen/genesis/util.go:36
        	            	      - implicit message failed with exit code: 16 and error: message failed with backtrace:
        	            	    00: f04 (method 2) -- send aborted with code 16 (16)
        	            	    01: f01 (method 2) -- constructor failed: send aborted with code 16 (16)
        	            	    02: f01000 (method 1) -- proof type Invalid(10) not allowed for new miner actors (16)
        	            	     (RetCode=16)
        	Test:       	TestWindowPostV1P1NV19
--- FAIL: TestWindowPostV1P1NV19 (4.84s)

magik6k · 2023-04-06T16:13:04Z

chain/actors/builtin/miner/utils.go

+	case nv >= network.Version19:
 		switch ssize {
 		case 2 << 10:
-			return abi.RegisteredSealProof_StackedDrg2KiBV1, nil
+			return abi.RegisteredSealProof_StackedDrg2KiBV1_1, nil
 		case 8 << 20:
-			return abi.RegisteredSealProof_StackedDrg8MiBV1, nil
+			return abi.RegisteredSealProof_StackedDrg8MiBV1_1, nil
 		case 512 << 20:
-			return abi.RegisteredSealProof_StackedDrg512MiBV1, nil
+			return abi.RegisteredSealProof_StackedDrg512MiBV1_1, nil
 		case 32 << 30:
-			return abi.RegisteredSealProof_StackedDrg32GiBV1, nil
+			return abi.RegisteredSealProof_StackedDrg32GiBV1_1, nil
 		case 64 << 30:
-			return abi.RegisteredSealProof_StackedDrg64GiBV1, nil
+			return abi.RegisteredSealProof_StackedDrg64GiBV1_1, nil


Why is this needed?

It shouldn't be, you're right.

cmd/lotus-bench/main.go

magik6k · 2023-04-06T16:28:06Z

storage/sealer/ffiwrapper/sealer_test.go

+		t.Fatalf("%+v", err)
+	}
+
+	proofs, skp, err := sealer.GenerateWindowPoSt(context.TODO(), seals[0].ref.ID.Miner, ppt, xsis, randomness)


We can just hardcode V1_1 here

magik6k · 2023-04-06T16:38:48Z

storage/sealer/ffiwrapper/verifier_cgo.go

+	if len(sectorInfo) == 0 {
+		return nil, xerrors.Errorf("must provide sectors for winning post")
+	}
+	ppt, err := sectorInfo[0].SealProof.RegisteredWinningPoStProof()
+	if err != nil {
+		return nil, xerrors.Errorf("failed to convert to winning post proof: %w", err)
+	}
+
+	privsectors, skipped, done, err := sb.pubExtendedSectorToPriv(ctx, minerID, sectorInfo, nil, ppt) // TODO: FAULTS?


Am I reading this correctly - there is technically no change here, right?

Yeah, no functional change to the Winning PoSt side of things, just the refactor to actually supply the proof type to pubExtendedSectorToPriv (needed for the Window PoSt changes).

storage/wdpost/wdpost_run.go

magik6k

Afaict looks good.

Technically we should be able to make sector skipping more efficient with these changes, but let's maybe not touch working, hard to test PoSt code in a required upgrade.

magik6k · 2023-04-07T10:17:54Z

go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/filecoin-project/go-legs v0.4.4
 	github.com/filecoin-project/go-padreader v0.0.1
 	github.com/filecoin-project/go-paramfetch v0.0.4
-	github.com/filecoin-project/go-state-types v0.11.0-alpha-2
+	github.com/filecoin-project/go-state-types v0.11.0-alpha-3.0.20230406204105-2813ee9cbb0b


Needs a tag

Will be updating to the RC shortly.

arajasek requested a review from a team as a code owner April 5, 2023 19:57

arajasek force-pushed the feat/grindability branch 2 times, most recently from c381faa to 304c899 Compare April 6, 2023 14:22

arajasek commented Apr 6, 2023

View reviewed changes

arajasek force-pushed the feat/grindability branch 2 times, most recently from 80a37da to 8b35840 Compare April 6, 2023 14:56

feat: implement FIP-0061

6d45c37

magik6k reviewed Apr 6, 2023

View reviewed changes

arajasek added 2 commits April 6, 2023 14:39

Address review

0356163

Add and test the FIP-0061 migration

74567a1

arajasek force-pushed the feat/grindability branch 2 times, most recently from 58cc178 to e3e9624 Compare April 6, 2023 20:27

Update actors bundles to fip/20230406

82a3578

arajasek force-pushed the feat/grindability branch from e3e9624 to 82a3578 Compare April 6, 2023 20:44

magik6k approved these changes Apr 7, 2023

View reviewed changes

Update to go-state-types master

22045b8

arajasek merged commit 76705b5 into release/v1.22.0 Apr 10, 2023

arajasek deleted the feat/grindability branch April 10, 2023 16:01

0x5459 mentioned this pull request Apr 12, 2023

feat(vsm): update for fip-0061 ipfs-force-community/damocles#685

Merged

5 tasks

LinZexiao mentioned this pull request Apr 12, 2023

Feat/actor state migrate for nv19 / actor nv19 状态迁移 filecoin-project/venus#5902

Merged

6 tasks

Fatman13 mentioned this pull request Apr 17, 2023

[venus] merge nv19 consensus / NV19 代码合并 filecoin-project/venus#5678

Closed

29 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: implement FIP-0061 #10629

feat: implement FIP-0061 #10629

arajasek commented Apr 5, 2023 •

edited

Loading

arajasek Apr 6, 2023

arajasek commented Apr 6, 2023

magik6k left a comment

magik6k Apr 6, 2023

arajasek Apr 6, 2023

magik6k Apr 6, 2023

magik6k Apr 6, 2023

arajasek Apr 6, 2023

magik6k left a comment

magik6k Apr 7, 2023

arajasek Apr 10, 2023

feat: implement FIP-0061 #10629

feat: implement FIP-0061 #10629

Conversation

arajasek commented Apr 5, 2023 • edited Loading

Related Issues

Proposed Changes

Additional Info

Checklist

Choose a reason for hiding this comment

arajasek commented Apr 6, 2023

magik6k left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

magik6k left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arajasek commented Apr 5, 2023 •

edited

Loading