diff --git a/go.mod b/go.mod index b7c1e4f62..f79f9eaa5 100644 --- a/go.mod +++ b/go.mod @@ -319,7 +319,7 @@ require ( github.com/filecoin-project/boost-graphsync v0.13.9 github.com/filecoin-project/boost/extern/boostd-data v0.0.0-20231124125934-3233c510357f github.com/filecoin-project/go-data-segment v0.0.1 - github.com/filecoin-project/lotus v1.26.0-rc1 + github.com/filecoin-project/lotus v1.26.0-rc3 github.com/ipfs/boxo v0.12.0 github.com/ipfs/go-ds-leveldb v0.5.0 github.com/ipfs/kubo v0.22.0 diff --git a/go.sum b/go.sum index ae51fd51d..e32d9853e 100644 --- a/go.sum +++ b/go.sum @@ -389,8 +389,8 @@ github.com/filecoin-project/go-storedcounter v0.1.0 h1:Mui6wSUBC+cQGHbDUBcO7rfh5 github.com/filecoin-project/go-storedcounter v0.1.0/go.mod h1:4ceukaXi4vFURIoxYMfKzaRF5Xv/Pinh2oTnoxpv+z8= github.com/filecoin-project/kubo-api-client v0.0.2-0.20230829103503-14448166d14d h1:KX85N/juToCpFXeYtWKGZ1lGPTjRo1i3QBUhxgOtYck= github.com/filecoin-project/kubo-api-client v0.0.2-0.20230829103503-14448166d14d/go.mod h1:6+uTL2U1NwtLg0Dnz+6ksFGhRY1y9CygWFKKC1h/HV0= -github.com/filecoin-project/lotus v1.26.0-rc1 h1:GpqEmM3J+BX9ZvNF/KTdrvNMWPZs6vKFR6l5kAHpUwk= -github.com/filecoin-project/lotus v1.26.0-rc1/go.mod h1:6FC17T8tgqFKiTGXNAuy4HdsHcksuk0HyjWDF8my+aA= +github.com/filecoin-project/lotus v1.26.0-rc3 h1:CynFw4VH6J2Vgpwp6/7o4kSlyQ8UQ4yAN2TCm8I6fp8= +github.com/filecoin-project/lotus v1.26.0-rc3/go.mod h1:6FC17T8tgqFKiTGXNAuy4HdsHcksuk0HyjWDF8my+aA= github.com/filecoin-project/pubsub v1.0.0 h1:ZTmT27U07e54qV1mMiQo4HDr0buo8I1LDHBYLXlsNXM= github.com/filecoin-project/pubsub v1.0.0/go.mod h1:GkpB33CcUtUNrLPhJgfdy4FDx4OMNR9k+46DHx/Lqrg= github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao= diff --git a/node/config/doc_gen.go b/node/config/doc_gen.go index 73861abee..f0379218c 100644 --- a/node/config/doc_gen.go +++ b/node/config/doc_gen.go @@ -1144,13 +1144,57 @@ see https://lotus.filecoin.io/storage-providers/advanced-configurations/market/# Comment: ``, }, }, - "lotus_config.Events": []DocField{ + "lotus_config.DeprecatedEvents": []DocField{ + { + Name: "DisableRealTimeFilterAPI", + Type: "bool", + + Comment: `DisableRealTimeFilterAPI is DEPRECATED and will be removed in a future release. Use Events.DisableRealTimeFilterAPI instead.`, + }, + { + Name: "DisableHistoricFilterAPI", + Type: "bool", + + Comment: `DisableHistoricFilterAPI is DEPRECATED and will be removed in a future release. Use Events.DisableHistoricFilterAPI instead.`, + }, + { + Name: "FilterTTL", + Type: "Duration", + + Comment: `FilterTTL is DEPRECATED and will be removed in a future release. Use Events.FilterTTL instead.`, + }, + { + Name: "MaxFilters", + Type: "int", + + Comment: `MaxFilters is DEPRECATED and will be removed in a future release. Use Events.MaxFilters instead.`, + }, + { + Name: "MaxFilterResults", + Type: "int", + + Comment: `MaxFilterResults is DEPRECATED and will be removed in a future release. Use Events.MaxFilterResults instead.`, + }, + { + Name: "MaxFilterHeightRange", + Type: "uint64", + + Comment: `MaxFilterHeightRange is DEPRECATED and will be removed in a future release. Use Events.MaxFilterHeightRange instead.`, + }, + { + Name: "DatabasePath", + Type: "string", + + Comment: `DatabasePath is DEPRECATED and will be removed in a future release. Use Events.DatabasePath instead.`, + }, + }, + "lotus_config.EventsConfig": []DocField{ { Name: "DisableRealTimeFilterAPI", Type: "bool", Comment: `DisableRealTimeFilterAPI will disable the RealTimeFilterAPI that can create and query filters for actor events as they are emitted. -The API is enabled when EnableEthRPC or Events.EnableActorEventsAPI is true, but can be disabled selectively with this flag.`, +The API is enabled when Fevm.EnableEthRPC or EnableActorEventsAPI is true, but can be disabled selectively with this flag.`, }, { Name: "DisableHistoricFilterAPI", @@ -1158,7 +1202,16 @@ The API is enabled when EnableEthRPC or Events.EnableActorEventsAPI is true, but Comment: `DisableHistoricFilterAPI will disable the HistoricFilterAPI that can create and query filters for actor events that occurred in the past. HistoricFilterAPI maintains a queryable index of events. -The API is enabled when EnableEthRPC or Events.EnableActorEventsAPI is true, but can be disabled selectively with this flag.`, +The API is enabled when Fevm.EnableEthRPC or EnableActorEventsAPI is true, but can be disabled selectively with this flag.`, + }, + { + Name: "EnableActorEventsAPI", + Type: "bool", + + Comment: `EnableActorEventsAPI enables the Actor events API that enables clients to consume events +emitted by (smart contracts + built-in Actors). +This will also enable the RealTimeFilterAPI and HistoricFilterAPI by default, but they can be +disabled by setting their respective Disable* options.`, }, { Name: "FilterTTL", @@ -1196,17 +1249,6 @@ the database must already exist and be writeable. If a relative path is provided relative to the CWD (current working directory).`, }, }, - "lotus_config.EventsConfig": []DocField{ - { - Name: "EnableActorEventsAPI", - Type: "bool", - - Comment: `EnableActorEventsAPI enables the Actor events API that enables clients to consume events -emitted by (smart contracts + built-in Actors). -This will also enable the RealTimeFilterAPI and HistoricFilterAPI by default, but they can be -disabled by setting their respective Disable* options in Fevm.Events.`, - }, - }, "lotus_config.FaultReporterConfig": []DocField{ { Name: "EnableConsensusFaultReporter", @@ -1261,7 +1303,7 @@ Set to 0 to keep all mappings`, }, { Name: "Events", - Type: "Events", + Type: "DeprecatedEvents", Comment: ``, },