Merge branch 'release/v1.12.0' into jen/12tomaster

node/config/def.go

@@ -109,7 +109,8 @@ func DefaultStorageMiner() *StorageMiner {
 			CommitBatchWait:  Duration(24 * time.Hour),    // this can be up to 30 days
 			CommitBatchSlack: Duration(1 * time.Hour),     // time buffer for forceful batch submission before sectors/deals in batch would start expiring, higher value will lower the chances for message fail due to expiration
 
-			AggregateAboveBaseFee: types.FIL(types.BigMul(types.PicoFil, types.NewInt(150))), // 0.15 nFIL
+			BatchPreCommitAboveBaseFee: types.FIL(types.BigMul(types.PicoFil, types.NewInt(320))), // 0.32 nFIL
+			AggregateAboveBaseFee:      types.FIL(types.BigMul(types.PicoFil, types.NewInt(320))), // 0.32 nFIL
 
 			TerminateBatchMin:  1,
 			TerminateBatchMax:  100,

node/config/doc_gen.go

@@ -717,6 +717,13 @@ avoid the relatively high cost of unsealing the data later, at the cost of more
 
 			Comment: `time buffer for forceful batch submission before sectors/deals in batch would start expiring`,
 		},
+		{
+			Name: "BatchPreCommitAboveBaseFee",
+			Type: "types.FIL",
+
+			Comment: `network BaseFee below which to stop doing precommit batching, instead
+sending precommit messages to the chain individually`,
+		},
 		{
 			Name: "AggregateAboveBaseFee",
 			Type: "types.FIL",

node/config/types.go

@@ -221,6 +221,10 @@ type SealingConfig struct {
 	// time buffer for forceful batch submission before sectors/deals in batch would start expiring
 	CommitBatchSlack Duration
 
+	// network BaseFee below which to stop doing precommit batching, instead
+	// sending precommit messages to the chain individually
+	BatchPreCommitAboveBaseFee types.FIL
+
 	// network BaseFee below which to stop doing commit aggregation, instead
 	// submitting proofs to the chain individually
 	AggregateAboveBaseFee types.FIL