Merge branch 'filecoin-project:master' into nv25-skeleton

filecoin-project · Nov 25, 2024 · 1b9e56f · 1b9e56f
2 parents 0162452 + 0d1d7c2
commit 1b9e56f
Show file tree

Hide file tree

Showing 48 changed files with 1,245 additions and 440 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,21 @@
 # Lotus changelog
 
 # UNRELEASED
+- Improve eth filter performance for nodes serving many clients. ([filecoin-project/lotus#12603](https://github.com/filecoin-project/lotus/pull/12603))
+
+## Improvements
+
+- The miner actor builtin `QAPowerForWeight` no longer accepts the unused "dealWeight" parameter, the function signature now only takes 3 arguments: sectorSize, sectorDuration, verifiedWeight. ([filecoin-project/lotus#12445](https://github.com/filecoin-project/lotus/pull/12445))
+
+## Bug Fixes
+
+- Make `EthTraceFilter` / `trace_filter` skip null rounds instead of erroring. ([filecoin-project/lotus#12702](https://github.com/filecoin-project/lotus/pull/12702))
+- Event APIs (`GetActorEventsRaw`, `SubscribeActorEventsRaw`, `eth_getLogs`, `eth_newFilter`, etc.) will now return an error when a request matches more than `MaxFilterResults` (default: 10,000) rather than silently truncating the results. Also apply an internal event matcher for `eth_getLogs` (etc.) to avoid builtin actor events on database query so as not to include them in `MaxFilterResults` calculation. ([filecoin-project/lotus#12671](https://github.com/filecoin-project/lotus/pull/12671))
+- `ChainIndexer#GetMsgInfo` returns an `ErrNotFound` when there are no rows. ([filecoin-project/lotus#12680](https://github.com/filecoin-project/lotus/pull/12680))
+
+## New Features
+
+* Implement F3 utility CLIs to list the power table for a given instance and sum the proportional power of a set of actors that participate in a given instance. See: https://github.com/filecoin-project/lotus/pull/12698.
 
 # UNRELEASED v1.31.0
 

diff --git a/api/api_storage.go b/api/api_storage.go
@@ -172,7 +172,7 @@ type StorageMiner interface {
 	// SealingSchedDiag dumps internal sealing scheduler state
 	SealingSchedDiag(ctx context.Context, doSched bool) (interface{}, error) //perm:admin
 	SealingAbort(ctx context.Context, call storiface.CallID) error           //perm:admin
-	// SealingSchedRemove removes a request from sealing pipeline
+	// SealingRemoveRequest removes a request from sealing pipeline
 	SealingRemoveRequest(ctx context.Context, schedId uuid.UUID) error //perm:admin
 
 	// paths.SectorIndex

diff --git a/build/openrpc/miner.json b/build/openrpc/miner.json
@@ -3235,7 +3235,7 @@
         {
             "name": "Filecoin.SealingRemoveRequest",
             "description": "```go\nfunc (s *StorageMinerStruct) SealingRemoveRequest(p0 context.Context, p1 uuid.UUID) error {\n\tif s.Internal.SealingRemoveRequest == nil {\n\t\treturn ErrNotSupported\n\t}\n\treturn s.Internal.SealingRemoveRequest(p0, p1)\n}\n```",
-            "summary": "SealingSchedRemove removes a request from sealing pipeline\n",
+            "summary": "SealingRemoveRequest removes a request from sealing pipeline\n",
             "paramStructure": "by-position",
             "params": [
                 {

diff --git a/chain/actors/builtin/builtin.go b/chain/actors/builtin/builtin.go
@@ -8,8 +8,8 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/builtin"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v15/miner"
 	smoothingtypes "github.com/filecoin-project/go-state-types/builtin/v8/util/smoothing"
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
 	"github.com/filecoin-project/go-state-types/manifest"
 	"github.com/filecoin-project/go-state-types/proof"
 	builtin0 "github.com/filecoin-project/specs-actors/actors/builtin"
@@ -56,8 +56,8 @@ type ExtendedSectorInfo = proof.ExtendedSectorInfo
 type PoStProof = proof.PoStProof
 type FilterEstimate = smoothingtypes.FilterEstimate
 
-func QAPowerForWeight(size abi.SectorSize, duration abi.ChainEpoch, dealWeight, verifiedWeight abi.DealWeight) abi.StoragePower {
-	return minertypes.QAPowerForWeight(size, duration, dealWeight, verifiedWeight)
+func QAPowerForWeight(size abi.SectorSize, duration abi.ChainEpoch, verifiedWeight abi.DealWeight) abi.StoragePower {
+	return minertypes.QAPowerForWeight(size, duration, verifiedWeight)
 }
 
 func ActorNameByCode(c cid.Cid) string {

diff --git a/chain/actors/builtin/builtin.go.template b/chain/actors/builtin/builtin.go.template
@@ -19,7 +19,7 @@ import (
 
 	"github.com/filecoin-project/lotus/chain/actors"
 
-	minertypes "github.com/filecoin-project/go-state-types/builtin/v9/miner"
+	minertypes "github.com/filecoin-project/go-state-types/builtin/v15/miner"
 	smoothingtypes "github.com/filecoin-project/go-state-types/builtin/v8/util/smoothing"
 )
 
@@ -56,8 +56,8 @@ type ExtendedSectorInfo = proof.ExtendedSectorInfo
 type PoStProof = proof.PoStProof
 type FilterEstimate = smoothingtypes.FilterEstimate
 
-func QAPowerForWeight(size abi.SectorSize, duration abi.ChainEpoch, dealWeight, verifiedWeight abi.DealWeight) abi.StoragePower {
-	return minertypes.QAPowerForWeight(size, duration, dealWeight, verifiedWeight)
+func QAPowerForWeight(size abi.SectorSize, duration abi.ChainEpoch, verifiedWeight abi.DealWeight) abi.StoragePower {
+	return minertypes.QAPowerForWeight(size, duration, verifiedWeight)
 }
 
 func ActorNameByCode(c cid.Cid) string {

diff --git a/chain/actors/builtin/market/actor.go.template b/chain/actors/builtin/market/actor.go.template
@@ -90,7 +90,7 @@ type State interface {
 	Proposals() (DealProposals, error)
 	VerifyDealsForActivation(
 		minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
-	) (weight, verifiedWeight abi.DealWeight, err error)
+	) (verifiedWeight abi.DealWeight, err error)
 	NextID() (abi.DealID, error)
 	GetState() interface{}
 	GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes.AllocationId, error)

diff --git a/chain/actors/builtin/market/market.go b/chain/actors/builtin/market/market.go
@@ -173,7 +173,7 @@ type State interface {
 	Proposals() (DealProposals, error)
 	VerifyDealsForActivation(
 		minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
-	) (weight, verifiedWeight abi.DealWeight, err error)
+	) (verifiedWeight abi.DealWeight, err error)
 	NextID() (abi.DealID, error)
 	GetState() interface{}
 	GetAllocationIdForPendingDeal(dealId abi.DealID) (verifregtypes.AllocationId, error)

diff --git a/chain/actors/builtin/market/state.go.template b/chain/actors/builtin/market/state.go.template
@@ -146,9 +146,9 @@ func (s *state{{.v}}) LockedTable() (BalanceTable, error) {
 
 func (s *state{{.v}}) VerifyDealsForActivation(
 	minerAddr address.Address, deals []abi.DealID, currEpoch, sectorExpiry abi.ChainEpoch,
-) (weight, verifiedWeight abi.DealWeight, err error) {
-	w, vw{{if (ge .v 2)}}, _{{end}}, err := market{{.v}}.ValidateDealsForActivation(&s.State, s.store, deals, minerAddr, sectorExpiry, currEpoch)
-	return w, vw, err
+) (verifiedWeight abi.DealWeight, err error) {
+	_, vw{{if (ge .v 2)}}, _{{end}}, err := market{{.v}}.ValidateDealsForActivation(&s.State, s.store, deals, minerAddr, sectorExpiry, currEpoch)
+	return vw, err
 }
 
 func (s *state{{.v}}) NextID() (abi.DealID, error) {

diff --git a/chain/actors/builtin/market/v0.go b/chain/actors/builtin/market/v0.go
diff --git a/chain/actors/builtin/market/v10.go b/chain/actors/builtin/market/v10.go
diff --git a/chain/actors/builtin/market/v11.go b/chain/actors/builtin/market/v11.go
diff --git a/chain/actors/builtin/market/v12.go b/chain/actors/builtin/market/v12.go
diff --git a/chain/actors/builtin/market/v13.go b/chain/actors/builtin/market/v13.go
diff --git a/chain/actors/builtin/market/v14.go b/chain/actors/builtin/market/v14.go
diff --git a/chain/actors/builtin/market/v15.go b/chain/actors/builtin/market/v15.go
diff --git a/chain/actors/builtin/market/v2.go b/chain/actors/builtin/market/v2.go
diff --git a/chain/actors/builtin/market/v3.go b/chain/actors/builtin/market/v3.go
diff --git a/chain/actors/builtin/market/v4.go b/chain/actors/builtin/market/v4.go
diff --git a/chain/actors/builtin/market/v5.go b/chain/actors/builtin/market/v5.go
diff --git a/chain/actors/builtin/market/v6.go b/chain/actors/builtin/market/v6.go
diff --git a/chain/actors/builtin/market/v7.go b/chain/actors/builtin/market/v7.go
diff --git a/chain/actors/builtin/market/v8.go b/chain/actors/builtin/market/v8.go
diff --git a/chain/actors/builtin/market/v9.go b/chain/actors/builtin/market/v9.go