Merge remote-tracking branch 'origin/master' into close-write

chain/vm/fvm.go

@@ -205,14 +205,14 @@ func (x *FvmExtern) VerifyConsensusFault(ctx context.Context, a, b, extra []byte
 	// check blocks are properly signed by their respective miner
 	// note we do not need to check extra's: it is a parent to block b
 	// which itself is signed, so it was willingly included by the miner
-	gasA, sigErr := x.VerifyBlockSig(ctx, &blockA)
+	gasA, sigErr := x.verifyBlockSig(ctx, &blockA)
 	totalGas += gasA
 	if sigErr != nil {
 		log.Info("invalid consensus fault: cannot verify first block sig: %w", sigErr)
 		return ret, totalGas
 	}
 
-	gas2, sigErr := x.VerifyBlockSig(ctx, &blockB)
+	gas2, sigErr := x.verifyBlockSig(ctx, &blockB)
 	totalGas += gas2
 	if sigErr != nil {
 		log.Info("invalid consensus fault: cannot verify second block sig: %w", sigErr)
@@ -225,7 +225,7 @@ func (x *FvmExtern) VerifyConsensusFault(ctx context.Context, a, b, extra []byte
 	return ret, totalGas
 }
 
-func (x *FvmExtern) VerifyBlockSig(ctx context.Context, blk *types.BlockHeader) (int64, error) {
+func (x *FvmExtern) verifyBlockSig(ctx context.Context, blk *types.BlockHeader) (int64, error) {
 	waddr, gasUsed, err := x.workerKeyAtLookback(ctx, blk.Miner, blk.Height)
 	if err != nil {
 		return gasUsed, err

cmd/lotus-bench/main.go

@@ -468,7 +468,7 @@ var sealBenchCmd = &cli.Command{
 		}
 
 		bo.EnvVar = make(map[string]string)
-		for _, envKey := range []string{"BELLMAN_NO_GPU", "FIL_PROOFS_MAXIMIZE_CACHING", "FIL_PROOFS_USE_GPU_COLUMN_BUILDER",
+		for _, envKey := range []string{"BELLMAN_NO_GPU", "FIL_PROOFS_USE_GPU_COLUMN_BUILDER",
 			"FIL_PROOFS_USE_GPU_TREE_BUILDER", "FIL_PROOFS_USE_MULTICORE_SDR", "BELLMAN_CUSTOM_GPU"} {
 			envValue, found := os.LookupEnv(envKey)
 			if found {

snap/snapcraft.yaml

@@ -36,7 +36,7 @@ parts:
       - libhwloc15
       - ocl-icd-libopencl1
     override-build: |
-      LDFLAGS="-z noexecstack" make lotus lotus-miner lotus-worker
+      LDFLAGS="" make lotus lotus-miner lotus-worker
       cp lotus lotus-miner lotus-worker $SNAPCRAFT_PART_INSTALL
       cp scripts/snap-lotus-entrypoint.sh $SNAPCRAFT_PART_INSTALL
 

storage/sealer/README.md

@@ -21,16 +21,15 @@ Please report your issues with regards to sector-storage at the [lotus issue tra
 Manages is the top-level piece of the storage system gluing all the other pieces
 together. It also implements scheduling logic.
 
-### `package stores`
+### `package paths`
 
 This package implements the sector storage subsystem. Fundamentally the storage
 is divided into `path`s, each path has it's UUID, and stores a set of sector
-'files'. There are currently 3 types of sector files - `unsealed`, `sealed`,
+'files'. There are currently 5 types of sector files - `unsealed`, `sealed`, `cache`, `update` and `update-cache`.
-and `cache`.
 
 Paths can be shared between nodes by sharing the underlying filesystem.
 
-### `stores.Local`
+### `paths.Local`
 
 The Local store implements SectorProvider for paths mounted in the local
 filesystem. Paths can be shared between nodes, and support shared filesystems
@@ -38,12 +37,12 @@ such as NFS.
 
 stores.Local implements all native filesystem-related operations 
 
-### `stores.Remote`
+### `paths.Remote`
 
 The Remote store extends Local store, handles fetching sector files into a local
 store if needed, and handles removing sectors from non-local stores.
 
-### `stores.Index`
+### `paths.Index`
 
 The Index is a singleton holding metadata about storage paths, and a mapping of
 sector files to paths