clean/mv-actors-bundle

build/builtin_actors.go → build/actors/builtin_actors.go

@@ -1,4 +1,4 @@
-package build
+package actors
 
 import (
 	"archive/tar"
@@ -21,31 +21,32 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 
 	"github.com/filecoin-project/lotus/blockstore"
+	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 )
 
-//go:embed actors/*.tar.zst
+//go:embed *.tar.zst
 var embeddedBuiltinActorReleases embed.FS
 
 func init() {
-	if BundleOverrides == nil {
-		BundleOverrides = make(map[actorstypes.Version]string)
+	if build.BundleOverrides == nil {
+		build.BundleOverrides = make(map[actorstypes.Version]string)
 	}
 	for _, av := range actors.Versions {
 		path := os.Getenv(fmt.Sprintf("LOTUS_BUILTIN_ACTORS_V%d_BUNDLE", av))
 		if path == "" {
 			continue
 		}
-		BundleOverrides[actorstypes.Version(av)] = path
+		build.BundleOverrides[actorstypes.Version(av)] = path
 	}
-	if err := loadManifests(NetworkBundle); err != nil {
+	if err := loadManifests(build.NetworkBundle); err != nil {
 		panic(err)
 	}
 
 	// The following code cid existed temporarily on the calibnet testnet, as a "buggy" storage miner actor implementation.
 	// We include them in our builtin bundle, but intentionally omit from metadata.
-	if NetworkBundle == "calibrationnet" {
+	if build.NetworkBundle == "calibrationnet" {
 		actors.AddActorMeta("storageminer", cid.MustParse("bafk2bzacecnh2ouohmonvebq7uughh4h3ppmg4cjsk74dzxlbbtlcij4xbzxq"), actorstypes.Version12)
 		actors.AddActorMeta("storageminer", cid.MustParse("bafk2bzaced7emkbbnrewv5uvrokxpf5tlm4jslu2jsv77ofw2yqdglg657uie"), actorstypes.Version12)
 		actors.AddActorMeta("verifiedregistry", cid.MustParse("bafk2bzacednskl3bykz5qpo54z2j2p4q44t5of4ktd6vs6ymmg2zebsbxazkm"), actorstypes.Version13)
@@ -54,21 +55,21 @@ func init() {
 
 // UseNetworkBundle switches to a different network bundle, by name.
 func UseNetworkBundle(netw string) error {
-	if NetworkBundle == netw {
+	if build.NetworkBundle == netw {
 		return nil
 	}
 	if err := loadManifests(netw); err != nil {
 		return err
 	}
-	NetworkBundle = netw
+	build.NetworkBundle = netw
 	return nil
 }
 
 func loadManifests(netw string) error {
 	overridden := make(map[actorstypes.Version]struct{})
 	var newMetadata []*BuiltinActorsMetadata
 	// First, prefer overrides.
-	for av, path := range BundleOverrides {
+	for av, path := range build.BundleOverrides {
 		root, actorCids, err := readBundleManifestFromFile(path)
 		if err != nil {
 			return err
@@ -248,7 +249,7 @@ func readBundleManifest(r io.Reader) (cid.Cid, map[string]cid.Cid, error) {
 }
 
 // GetEmbeddedBuiltinActorsBundle returns the builtin-actors bundle for the given actors version.
-func GetEmbeddedBuiltinActorsBundle(version actorstypes.Version, networkBundleName string) ([]byte, bool) {
+func GetEmbeddedBuiltinActorsBundle(version actorstypes.Version, NetworkBundleName string) ([]byte, bool) {
 	fi, err := embeddedBuiltinActorReleases.Open(fmt.Sprintf("actors/v%d.tar.zst", version))
 	if err != nil {
 		return nil, false
@@ -259,7 +260,7 @@ func GetEmbeddedBuiltinActorsBundle(version actorstypes.Version, networkBundleNa
 	defer uncompressed.Close() //nolint
 
 	tarReader := tar.NewReader(uncompressed)
-	targetFileName := fmt.Sprintf("builtin-actors-%s.car", networkBundleName)
+	targetFileName := fmt.Sprintf("builtin-actors-%s.car", NetworkBundleName)
 	for {
 		header, err := tarReader.Next()
 		switch err {

build/builtin_actors_gen_test.go → build/actors/builtin_actors_gen_test.go

@@ -1,7 +1,7 @@
 //go:build release
 // +build release
 
-package build_test
+package actors_test
 
 import (
 	"archive/tar"

build/builtin_actors_test.go → build/actors/builtin_actors_test.go

@@ -1,4 +1,4 @@
-package build_test
+package actors_test
 
 import (
 	"testing"
@@ -8,17 +8,17 @@ import (
 	actorstypes "github.com/filecoin-project/go-state-types/actors"
 	"github.com/filecoin-project/go-state-types/manifest"
 
-	"github.com/filecoin-project/lotus/build"
+	actors2 "github.com/filecoin-project/lotus/build/actors"
 	"github.com/filecoin-project/lotus/chain/actors"
 )
 
 // Test that the embedded metadata is correct.
 func TestEmbeddedMetadata(t *testing.T) {
-	metadata, err := build.ReadEmbeddedBuiltinActorsMetadata()
+	metadata, err := actors2.ReadEmbeddedBuiltinActorsMetadata()
 	require.NoError(t, err)
 
 	for i, v1 := range metadata {
-		v2 := build.EmbeddedBuiltinActorsMetadata[i]
+		v2 := actors2.EmbeddedBuiltinActorsMetadata[i]
 		require.Equal(t, v1.Network, v2.Network)
 		require.Equal(t, v1.Version, v2.Version)
 		require.Equal(t, v1.ManifestCid, v2.ManifestCid)

chain/consensus/filcns/upgrades.go

@@ -50,6 +50,7 @@ import (
 
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/build"
+	actors2 "github.com/filecoin-project/lotus/build/actors"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/builtin"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/multisig"
@@ -1962,7 +1963,7 @@ func upgradeActorsV12Common(
 
 	var manifestCid cid.Cid
 	if initState.NetworkName == "calibrationnet" {
-		embedded, ok := build.GetEmbeddedBuiltinActorsBundle(actorstypes.Version12, calibnetv12BuggyBundleSuffix1)
+		embedded, ok := actors2.GetEmbeddedBuiltinActorsBundle(actorstypes.Version12, calibnetv12BuggyBundleSuffix1)
 		if !ok {
 			return cid.Undef, xerrors.Errorf("didn't find buggy calibrationnet bundle")
 		}
@@ -2027,7 +2028,7 @@ func buildUpgradeActorsV12MinerFix(oldBuggyMinerCID, newManifestCID cid.Cid) fun
 		}
 
 		// this loads the second buggy bundle, for UpgradeWatermelonFixHeight
-		embedded, ok := build.GetEmbeddedBuiltinActorsBundle(actorstypes.Version12, calibnetv12BuggyBundleSuffix2)
+		embedded, ok := actors2.GetEmbeddedBuiltinActorsBundle(actorstypes.Version12, calibnetv12BuggyBundleSuffix2)
 		if !ok {
 			return cid.Undef, xerrors.Errorf("didn't find buggy calibrationnet bundle")
 		}
@@ -2260,7 +2261,7 @@ func upgradeActorsV13Common(
 
 	var manifestCid cid.Cid
 	if initState.NetworkName == "calibrationnet" {
-		embedded, ok := build.GetEmbeddedBuiltinActorsBundle(actorstypes.Version13, calibnetv13BuggyBundleSuffix1)
+		embedded, ok := actors2.GetEmbeddedBuiltinActorsBundle(actorstypes.Version13, calibnetv13BuggyBundleSuffix1)
 		if !ok {
 			return cid.Undef, xerrors.Errorf("didn't find buggy calibrationnet bundle")
 		}
@@ -2325,7 +2326,7 @@ func upgradeActorsV13VerifregFix(oldBuggyVerifregCID, newManifestCID cid.Cid) fu
 		}
 
 		// this loads the buggy bundle, for UpgradeDragonHeight
-		embedded, ok := build.GetEmbeddedBuiltinActorsBundle(actorstypes.Version13, calibnetv13BuggyBundleSuffix1)
+		embedded, ok := actors2.GetEmbeddedBuiltinActorsBundle(actorstypes.Version13, calibnetv13BuggyBundleSuffix1)
 		if !ok {
 			return cid.Undef, xerrors.Errorf("didn't find buggy calibrationnet bundle")
 		}

chain/gen/gen.go

@@ -3,7 +3,6 @@ package gen
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"io"
 	"os"
 	"sync/atomic"
@@ -34,6 +33,8 @@ import (
 	"github.com/filecoin-project/lotus/chain/consensus"
 	"github.com/filecoin-project/lotus/chain/consensus/filcns"
 	genesis2 "github.com/filecoin-project/lotus/chain/gen/genesis"
+	"github.com/filecoin-project/lotus/chain/gen/gentypes"
+	"github.com/filecoin-project/lotus/chain/gen/genutils"
 	"github.com/filecoin-project/lotus/chain/index"
 	"github.com/filecoin-project/lotus/chain/rand"
 	"github.com/filecoin-project/lotus/chain/stmgr"
@@ -78,7 +79,7 @@ type ChainGen struct {
 
 	w *wallet.LocalWallet
 
-	eppProvs  map[address.Address]WinningPoStProver
+	eppProvs  map[address.Address]gentypes.WinningPoStProver
 	Miners    []address.Address
 	receivers []address.Address
 	// a SecP address
@@ -244,7 +245,7 @@ func NewGeneratorWithSectorsAndUpgradeSchedule(numSectors int, us stmgr.UpgradeS
 		return nil, xerrors.Errorf("set genesis failed: %w", err)
 	}
 
-	mgen := make(map[address.Address]WinningPoStProver)
+	mgen := make(map[address.Address]gentypes.WinningPoStProver)
 	for i := range tpl.Miners {
 		mgen[genesis2.MinerAddress(uint64(i))] = &wppProvider{}
 	}
@@ -362,7 +363,7 @@ func (cg *ChainGen) nextBlockProof(ctx context.Context, pts *types.TipSet, m add
 		rbase = entries[len(entries)-1]
 	}
 
-	eproof, err := IsRoundWinner(ctx, round, m, rbase, mbi, mc)
+	eproof, err := genutils.IsRoundWinner(ctx, round, m, rbase, mbi, mc)
 	if err != nil {
 		return nil, nil, nil, xerrors.Errorf("checking round winner failed: %w", err)
 	}
@@ -394,7 +395,7 @@ func (cg *ChainGen) nextBlockProof(ctx context.Context, pts *types.TipSet, m add
 		})
 	}
 
-	vrfout, err := ComputeVRF(ctx, sf, worker, ticketRand)
+	vrfout, err := genutils.ComputeVRF(ctx, sf, worker, ticketRand)
 	if err != nil {
 		return nil, nil, nil, xerrors.Errorf("compute VRF: %w", err)
 	}
@@ -420,7 +421,7 @@ func (cg *ChainGen) NextTipSetWithNulls(nulls abi.ChainEpoch) (*MinedTipSet, err
 	return mts, nil
 }
 
-func (cg *ChainGen) SetWinningPoStProver(m address.Address, wpp WinningPoStProver) {
+func (cg *ChainGen) SetWinningPoStProver(m address.Address, wpp gentypes.WinningPoStProver) {
 	cg.eppProvs[m] = wpp
 }
 
@@ -624,10 +625,7 @@ func (mca mca) WalletSign(ctx context.Context, a address.Address, v []byte) (*cr
 	})
 }
 
-type WinningPoStProver interface {
-	GenerateCandidates(context.Context, abi.PoStRandomness, uint64) ([]uint64, error)
-	ComputeProof(context.Context, []proof7.ExtendedSectorInfo, abi.PoStRandomness, abi.ChainEpoch, network.Version) ([]proof7.PoStProof, error)
-}
+type WinningPoStProver gentypes.WinningPoStProver
 
 type wppProvider struct{}
 
@@ -639,49 +637,6 @@ func (wpp *wppProvider) ComputeProof(context.Context, []proof7.ExtendedSectorInf
 	return ValidWpostForTesting, nil
 }
 
-func IsRoundWinner(ctx context.Context, round abi.ChainEpoch,
-	miner address.Address, brand types.BeaconEntry, mbi *api.MiningBaseInfo, a MiningCheckAPI) (*types.ElectionProof, error) {
-
-	buf := new(bytes.Buffer)
-	if err := miner.MarshalCBOR(buf); err != nil {
-		return nil, xerrors.Errorf("failed to cbor marshal address: %w", err)
-	}
-
-	electionRand, err := rand.DrawRandomnessFromBase(brand.Data, crypto.DomainSeparationTag_ElectionProofProduction, round, buf.Bytes())
-	if err != nil {
-		return nil, xerrors.Errorf("failed to draw randomness: %w", err)
-	}
-
-	vrfout, err := ComputeVRF(ctx, a.WalletSign, mbi.WorkerKey, electionRand)
-	if err != nil {
-		return nil, xerrors.Errorf("failed to compute VRF: %w", err)
-	}
-
-	ep := &types.ElectionProof{VRFProof: vrfout}
-	j := ep.ComputeWinCount(mbi.MinerPower, mbi.NetworkPower)
-	ep.WinCount = j
-	if j < 1 {
-		return nil, nil
-	}
-
-	return ep, nil
-}
-
-type SignFunc func(context.Context, address.Address, []byte) (*crypto.Signature, error)
-
-func ComputeVRF(ctx context.Context, sign SignFunc, worker address.Address, sigInput []byte) ([]byte, error) {
-	sig, err := sign(ctx, worker, sigInput)
-	if err != nil {
-		return nil, err
-	}
-
-	if sig.Type != crypto.SigTypeBLS {
-		return nil, fmt.Errorf("miner worker address was not a BLS key")
-	}
-
-	return sig.Data, nil
-}
-
 type genFakeVerifier struct{}
 
 var _ storiface.Verifier = (*genFakeVerifier)(nil)

chain/gen/gentypes/gentypes.go

@@ -0,0 +1,14 @@
+package gentypes
+
+import (
+	"context"
+
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/network"
+	proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof"
+)
+
+type WinningPoStProver interface {
+	GenerateCandidates(context.Context, abi.PoStRandomness, uint64) ([]uint64, error)
+	ComputeProof(context.Context, []proof7.ExtendedSectorInfo, abi.PoStRandomness, abi.ChainEpoch, network.Version) ([]proof7.PoStProof, error)
+}

chain/gen/genutils/genutils.go

@@ -0,0 +1,69 @@
+package genutils
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/filecoin-project/go-state-types/crypto"
+
+	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/chain/rand"
+	"github.com/filecoin-project/lotus/chain/types"
+)
+
+type MiningCheckAPI interface {
+	StateGetRandomnessFromBeacon(ctx context.Context, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte, tsk types.TipSetKey) (abi.Randomness, error)
+	StateGetRandomnessFromTickets(ctx context.Context, personalization crypto.DomainSeparationTag, randEpoch abi.ChainEpoch, entropy []byte, tsk types.TipSetKey) (abi.Randomness, error)
+
+	MinerGetBaseInfo(context.Context, address.Address, abi.ChainEpoch, types.TipSetKey) (*api.MiningBaseInfo, error)
+
+	WalletSign(context.Context, address.Address, []byte) (*crypto.Signature, error)
+}
+
+func IsRoundWinner(ctx context.Context, round abi.ChainEpoch,
+	miner address.Address, brand types.BeaconEntry, mbi *api.MiningBaseInfo, a MiningCheckAPI) (*types.ElectionProof, error) {
+
+	buf := new(bytes.Buffer)
+	if err := miner.MarshalCBOR(buf); err != nil {
+		return nil, xerrors.Errorf("failed to cbor marshal address: %w", err)
+	}
+
+	electionRand, err := rand.DrawRandomnessFromBase(brand.Data, crypto.DomainSeparationTag_ElectionProofProduction, round, buf.Bytes())
+	if err != nil {
+		return nil, xerrors.Errorf("failed to draw randomness: %w", err)
+	}
+
+	vrfout, err := ComputeVRF(ctx, a.WalletSign, mbi.WorkerKey, electionRand)
+	if err != nil {
+		return nil, xerrors.Errorf("failed to compute VRF: %w", err)
+	}
+
+	ep := &types.ElectionProof{VRFProof: vrfout}
+	j := ep.ComputeWinCount(mbi.MinerPower, mbi.NetworkPower)
+	ep.WinCount = j
+	if j < 1 {
+		return nil, nil
+	}
+
+	return ep, nil
+}
+
+type SignFunc func(context.Context, address.Address, []byte) (*crypto.Signature, error)
+
+func ComputeVRF(ctx context.Context, sign SignFunc, worker address.Address, sigInput []byte) ([]byte, error) {
+	sig, err := sign(ctx, worker, sigInput)
+	if err != nil {
+		return nil, err
+	}
+
+	if sig.Type != crypto.SigTypeBLS {
+		return nil, fmt.Errorf("miner worker address was not a BLS key")
+	}
+
+	return sig.Data, nil
+}