fix: genesis preseal: get it working

chain/gen/genesis/miners.go

@@ -18,6 +18,7 @@ import (
 	"github.com/filecoin-project/go-state-types/big"
 	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	power11 "github.com/filecoin-project/go-state-types/builtin/v11/power"
+	miner14 "github.com/filecoin-project/go-state-types/builtin/v14/miner"
 	minertypes "github.com/filecoin-project/go-state-types/builtin/v8/miner"
 	markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
 	miner9 "github.com/filecoin-project/go-state-types/builtin/v9/miner"
@@ -41,6 +42,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/power"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/reward"
+	"github.com/filecoin-project/lotus/chain/actors/builtin/system"
 	"github.com/filecoin-project/lotus/chain/actors/policy"
 	"github.com/filecoin-project/lotus/chain/consensus"
 	lrand "github.com/filecoin-project/lotus/chain/rand"
@@ -491,7 +493,12 @@ func SetupStorageMiners(ctx context.Context, cs *store.ChainStore, sys vm.Syscal
 				// Commit one-by-one, otherwise pledge math tends to explode
 				var paramBytes []byte
 
-				if av >= actorstypes.Version6 {
+				if av >= actorstypes.Version14 {
+					confirmParams := &miner14.InternalSectorSetupForPresealParams{
+						Sectors: []abi.SectorNumber{preseal.SectorID},
+					}
+					paramBytes = mustEnc(confirmParams)
+				} else if av >= actorstypes.Version6 {
 					// TODO: fixup
 					confirmParams := &builtin6.ConfirmSectorProofsParams{
 						Sectors: []abi.SectorNumber{preseal.SectorID},
@@ -506,9 +513,17 @@ func SetupStorageMiners(ctx context.Context, cs *store.ChainStore, sys vm.Syscal
 					paramBytes = mustEnc(confirmParams)
 				}
 
-				_, err = doExecValue(ctx, genesisVm, minerInfos[i].maddr, power.Address, big.Zero(), builtintypes.MethodsMiner.ConfirmSectorProofsValid, paramBytes)
-				if err != nil {
-					return cid.Undef, xerrors.Errorf("failed to confirm presealed sectors: %w", err)
+				var csErr error
+				if nv >= network.Version23 {
+					_, csErr = doExecValue(ctx, genesisVm, minerInfos[i].maddr, system.Address, big.Zero(), builtintypes.MethodsMiner.InternalSectorSetupForPreseal,
+						paramBytes)
+				} else {
+					_, csErr = doExecValue(ctx, genesisVm, minerInfos[i].maddr, power.Address, big.Zero(), builtintypes.MethodsMiner.InternalSectorSetupForPreseal,
+						paramBytes)
+				}
+
+				if csErr != nil {
+					return cid.Undef, xerrors.Errorf("failed to confirm presealed sectors: %w", csErr)
 				}
 
 				if av >= actorstypes.Version2 {

gen/bundle/bundle.go

@@ -18,7 +18,7 @@ import (
 	"github.com/ipfs/go-cid"
 )
 
-var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMetadata{
+var EmbeddedBuiltinActorsMetadata = []*BuiltinActorsMetadata{
 {{- range . }} {
 	Network: {{printf "%q" .Network}},
 	Version: {{.Version}},

go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/filecoin-project/go-jsonrpc v0.3.2
 	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.14.0-rc1
+	github.com/filecoin-project/go-state-types v0.14.0-rc2
 	github.com/filecoin-project/go-statemachine v1.0.3
 	github.com/filecoin-project/go-statestore v0.2.0
 	github.com/filecoin-project/go-storedcounter v0.1.0

go.sum

@@ -291,8 +291,9 @@ github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go
 github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
 github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
 github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
-github.com/filecoin-project/go-state-types v0.14.0-rc1 h1:kWBGX/uqZmYotYMNmw+R/fIuot/k0KMcEtB7PKFy1SQ=
 github.com/filecoin-project/go-state-types v0.14.0-rc1/go.mod h1:cHpOPup9H1g2T29dKHAjC2sc7/Ef5ypjuW9A3I+e9yY=
+github.com/filecoin-project/go-state-types v0.14.0-rc2 h1:jx+iOyy7un1G6ozkvKpIBVFhs6Rg23j6NAoiIjBmGTc=
+github.com/filecoin-project/go-state-types v0.14.0-rc2/go.mod h1:cHpOPup9H1g2T29dKHAjC2sc7/Ef5ypjuW9A3I+e9yY=
 github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk=
 github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
 github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI=

itests/fevm_test.go

@@ -51,50 +51,13 @@ func decodeOutputToUint64(output []byte) (uint64, error) {
 	err := binary.Read(buf, binary.BigEndian, &result)
 	return result, err
 }
-func buildInputFromuint64(number uint64) []byte {
+func buildInputFromUint64(number uint64) []byte {
 	// Convert the number to a binary uint64 array
 	binaryNumber := make([]byte, 8)
 	binary.BigEndian.PutUint64(binaryNumber, number)
 	return inputDataFromArray(binaryNumber)
 }
 
-// recursive delegate calls that fail due to gas limits are currently getting to 229 iterations
-// before running out of gas
-func recursiveDelegatecallFail(ctx context.Context, t *testing.T, client *kit.TestFullNode, filename string, count uint64) {
-	expectedIterationsBeforeFailing := int(220)
-	fromAddr, idAddr := client.EVM().DeployContractFromFilename(ctx, filename)
-	t.Log("recursion count - ", count)
-	inputData := buildInputFromuint64(count)
-	_, _, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "recursiveCall(uint256)", inputData)
-
-	require.NoError(t, err)
-
-	result, _, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "totalCalls()", []byte{})
-	require.NoError(t, err)
-
-	resultUint, err := decodeOutputToUint64(result)
-	require.NoError(t, err)
-
-	require.NotEqual(t, int(resultUint), int(count))
-	require.Equal(t, expectedIterationsBeforeFailing, int(resultUint))
-}
-func recursiveDelegatecallSuccess(ctx context.Context, t *testing.T, client *kit.TestFullNode, filename string, count uint64) {
-	t.Log("Count - ", count)
-
-	fromAddr, idAddr := client.EVM().DeployContractFromFilename(ctx, filename)
-	inputData := buildInputFromuint64(count)
-	_, _, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "recursiveCall(uint256)", inputData)
-	require.NoError(t, err)
-
-	result, _, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "totalCalls()", []byte{})
-	require.NoError(t, err)
-
-	resultUint, err := decodeOutputToUint64(result)
-	require.NoError(t, err)
-
-	require.Equal(t, int(count), int(resultUint))
-}
-
 // TestFEVMRecursive does a basic fevm contract installation and invocation
 func TestFEVMRecursive(t *testing.T) {
 	callCounts := []uint64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 100, 230, 330}
@@ -107,7 +70,7 @@ func TestFEVMRecursive(t *testing.T) {
 	for _, callCount := range callCounts {
 		callCount := callCount // linter unhappy unless callCount is local to loop
 		t.Run(fmt.Sprintf("TestFEVMRecursive%d", callCount), func(t *testing.T) {
-			_, _, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "recursiveCall(uint256)", buildInputFromuint64(callCount))
+			_, _, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "recursiveCall(uint256)", buildInputFromUint64(callCount))
 			require.NoError(t, err)
 		})
 	}
@@ -125,7 +88,7 @@ func TestFEVMRecursiveFail(t *testing.T) {
 	for _, failCallCount := range failCallCounts {
 		failCallCount := failCallCount // linter unhappy unless callCount is local to loop
 		t.Run(fmt.Sprintf("TestFEVMRecursiveFail%d", failCallCount), func(t *testing.T) {
-			_, wait, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "recursiveCall(uint256)", buildInputFromuint64(failCallCount))
+			_, wait, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "recursiveCall(uint256)", buildInputFromUint64(failCallCount))
 			require.Error(t, err)
 			require.Equal(t, exitcode.ExitCode(37), wait.Receipt.ExitCode)
 		})
@@ -156,23 +119,51 @@ func TestFEVMRecursive2(t *testing.T) {
 
 // TestFEVMRecursiveDelegatecallCount tests the maximum delegatecall recursion depth.
 func TestFEVMRecursiveDelegatecallCount(t *testing.T) {
-
 	ctx, cancel, client := kit.SetupFEVMTest(t)
 	defer cancel()
 
-	highestSuccessCount := uint64(226)
+	// these depend on the actors bundle, may need to be adjusted with a network upgrade
+	const highestSuccessCount = 228
+	const expectedIterationsBeforeFailing = 222
 
 	filename := "contracts/RecursiveDelegeatecall.hex"
-	recursiveDelegatecallSuccess(ctx, t, client, filename, uint64(1))
-	recursiveDelegatecallSuccess(ctx, t, client, filename, uint64(2))
-	recursiveDelegatecallSuccess(ctx, t, client, filename, uint64(10))
-	recursiveDelegatecallSuccess(ctx, t, client, filename, uint64(100))
-	recursiveDelegatecallSuccess(ctx, t, client, filename, highestSuccessCount)
 
-	recursiveDelegatecallFail(ctx, t, client, filename, highestSuccessCount+1)
-	recursiveDelegatecallFail(ctx, t, client, filename, uint64(1000))
-	recursiveDelegatecallFail(ctx, t, client, filename, uint64(10000000))
+	testCases := []struct {
+		recursionCount uint64
+		expectSuccess  bool
+	}{
+		// success
+		{1, true},
+		{2, true},
+		{10, true},
+		{100, true},
+		{highestSuccessCount, true},
+		// failure
+		{highestSuccessCount + 1, false},
+		{1000, false},
+		{10000000, false},
+	}
+	for _, tc := range testCases {
+		t.Run(fmt.Sprintf("recursionCount=%d,expectSuccess=%t", tc.recursionCount, tc.expectSuccess), func(t *testing.T) {
+			fromAddr, idAddr := client.EVM().DeployContractFromFilename(ctx, filename)
+			inputData := buildInputFromUint64(tc.recursionCount)
+			_, _, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "recursiveCall(uint256)", inputData)
+			require.NoError(t, err)
+
+			result, _, err := client.EVM().InvokeContractByFuncName(ctx, fromAddr, idAddr, "totalCalls()", []byte{})
+			require.NoError(t, err)
+
+			resultUint, err := decodeOutputToUint64(result)
+			require.NoError(t, err)
 
+			if tc.expectSuccess {
+				require.Equal(t, int(tc.recursionCount), int(resultUint))
+			} else {
+				require.NotEqual(t, int(resultUint), int(tc.recursionCount), "unexpected recursion count, if the actors bundle has changed, this test may need to be adjusted")
+				require.Equal(t, int(expectedIterationsBeforeFailing), int(resultUint))
+			}
+		})
+	}
 }
 
 // TestFEVMBasic does a basic fevm contract installation and invocation
@@ -585,44 +576,52 @@ func TestFEVMRecursiveActorCall(t *testing.T) {
 	filenameActor := "contracts/RecCall.hex"
 	fromAddr, actorAddr := client.EVM().DeployContractFromFilename(ctx, filenameActor)
 
-	testN := func(n, r int, ex exitcode.ExitCode) func(t *testing.T) {
-		return func(t *testing.T) {
+	exitCodeStackOverflow := exitcode.ExitCode(37)
+	exitCodeTransactionReverted := exitcode.ExitCode(33)
+
+	testCases := []struct {
+		stackDepth     int
+		recursionLimit int
+		exitCode       exitcode.ExitCode
+	}{
+		{0, 1, exitcode.Ok},
+		{1, 1, exitcode.Ok},
+		{20, 1, exitcode.Ok},
+		{200, 1, exitcode.Ok},
+		{251, 1, exitcode.Ok},
+		{252, 1, exitCodeStackOverflow},
+		{0, 10, exitcode.Ok},
+		{1, 10, exitcode.Ok},
+		{20, 10, exitcode.Ok},
+		{200, 10, exitcode.Ok},
+		{251, 10, exitcode.Ok},
+		{252, 10, exitCodeStackOverflow},
+		{0, 32, exitcode.Ok},
+		{1, 32, exitcode.Ok},
+		{20, 32, exitcode.Ok},
+		{200, 32, exitcode.Ok},
+		{251, 32, exitcode.Ok},
+		{252, 32, exitCodeStackOverflow},
+		// the following are actors bundle dependent and may need to be tweaked with a network upgrade
+		{0, 255, exitcode.Ok},
+		{251, 164, exitcode.Ok},
+		{0, 261, exitCodeTransactionReverted},
+		{251, 173, exitCodeTransactionReverted},
+	}
+	for _, tc := range testCases {
+		var fail string
+		if tc.exitCode != exitcode.Ok {
+			fail = "-fails"
+		}
+		t.Run(fmt.Sprintf("stackDepth=%d,recursionLimit=%d%s", tc.stackDepth, tc.recursionLimit, fail), func(t *testing.T) {
 			inputData := make([]byte, 32*3)
-			binary.BigEndian.PutUint64(inputData[24:], uint64(n))
-			binary.BigEndian.PutUint64(inputData[32+24:], uint64(n))
-			binary.BigEndian.PutUint64(inputData[32+32+24:], uint64(r))
+			binary.BigEndian.PutUint64(inputData[24:], uint64(tc.stackDepth))
+			binary.BigEndian.PutUint64(inputData[32+24:], uint64(tc.stackDepth))
+			binary.BigEndian.PutUint64(inputData[32+32+24:], uint64(tc.recursionLimit))
 
-			client.EVM().InvokeContractByFuncNameExpectExit(ctx, fromAddr, actorAddr, "exec1(uint256,uint256,uint256)", inputData, ex)
-		}
+			client.EVM().InvokeContractByFuncNameExpectExit(ctx, fromAddr, actorAddr, "exec1(uint256,uint256,uint256)", inputData, tc.exitCode)
+		})
 	}
-
-	t.Run("n=0,r=1", testN(0, 1, exitcode.Ok))
-	t.Run("n=1,r=1", testN(1, 1, exitcode.Ok))
-	t.Run("n=20,r=1", testN(20, 1, exitcode.Ok))
-	t.Run("n=200,r=1", testN(200, 1, exitcode.Ok))
-	t.Run("n=251,r=1", testN(251, 1, exitcode.Ok))
-
-	t.Run("n=252,r=1-fails", testN(252, 1, exitcode.ExitCode(37))) // 37 means stack overflow
-
-	t.Run("n=0,r=10", testN(0, 10, exitcode.Ok))
-	t.Run("n=1,r=10", testN(1, 10, exitcode.Ok))
-	t.Run("n=20,r=10", testN(20, 10, exitcode.Ok))
-	t.Run("n=200,r=10", testN(200, 10, exitcode.Ok))
-	t.Run("n=251,r=10", testN(251, 10, exitcode.Ok))
-
-	t.Run("n=252,r=10-fails", testN(252, 10, exitcode.ExitCode(37)))
-
-	t.Run("n=0,r=32", testN(0, 32, exitcode.Ok))
-	t.Run("n=1,r=32", testN(1, 32, exitcode.Ok))
-	t.Run("n=20,r=32", testN(20, 32, exitcode.Ok))
-	t.Run("n=200,r=32", testN(200, 32, exitcode.Ok))
-	t.Run("n=251,r=32", testN(251, 32, exitcode.Ok))
-
-	t.Run("n=0,r=252", testN(0, 252, exitcode.Ok))
-	t.Run("n=251,r=164", testN(251, 164, exitcode.Ok))
-
-	t.Run("n=0,r=255-fails", testN(0, 255, exitcode.ExitCode(33))) // 33 means transaction reverted
-	t.Run("n=251,r=167-fails", testN(251, 167, exitcode.ExitCode(33)))
 }
 
 // TestFEVMRecursiveActorCallEstimate