Merge remote-tracking branch 'origin/master' into ci/dependency-checker

filecoin-project · Dec 13, 2024 · a422aed · a422aed
2 parents 42fc4b4 + 4317d1a
commit a422aed
Show file tree

Hide file tree

Showing 50 changed files with 1,341 additions and 1,025 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@
 # UNRELEASED
 
 - Add json output of tipsets to `louts chain list`. ([filecoin-project/lotus#12691](https://github.com/filecoin-project/lotus/pull/12691))
+- Remove IPNI advertisement relay over pubsub via Lotus node as it now has been deprecated. ([filecoin-project/lotus#12768](https://github.com/filecoin-project/lotus/pull/12768)
+- During a network upgrade, log migration progress every 2 seconds so they are more helpful and informative. The `LOTUS_MIGRATE_PROGRESS_LOG_SECONDS` environment variable can be used to change this if needed. ([filecoin-project/lotus#12732](https://github.com/filecoin-project/lotus/pull/12732))
+- Add F3GetCertificate & F3GetLatestCertificate to the gateway. ([filecoin-project/lotus#12778](https://github.com/filecoin-project/lotus/pull/12778))
 
 # UNRELEASED v.1.32.0
 

diff --git a/api/api_gateway.go b/api/api_gateway.go
@@ -7,6 +7,7 @@ import (
 	"github.com/ipfs/go-cid"
 
 	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-f3/certs"
 	"github.com/filecoin-project/go-jsonrpc"
 	"github.com/filecoin-project/go-state-types/abi"
 	verifregtypes "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
@@ -141,4 +142,7 @@ type Gateway interface {
 	GetActorEventsRaw(ctx context.Context, filter *types.ActorEventFilter) ([]*types.ActorEvent, error)
 	SubscribeActorEventsRaw(ctx context.Context, filter *types.ActorEventFilter) (<-chan *types.ActorEvent, error)
 	ChainGetEvents(context.Context, cid.Cid) ([]types.Event, error)
+
+	F3GetCertificate(ctx context.Context, instance uint64) (*certs.FinalityCertificate, error)
+	F3GetLatestCertificate(ctx context.Context) (*certs.FinalityCertificate, error)
 }
diff --git a/api/proxy_gen.go b/api/proxy_gen.go
diff --git a/build/buildconstants/params_calibnet.go b/build/buildconstants/params_calibnet.go
@@ -102,8 +102,8 @@ const UpgradeWaffleHeight = 1779094
 // 2024-10-23T13:30:00Z
 const UpgradeTuktukHeight = 2078794
 
-// 2024-12-16T23:00:00Z
-const UpgradeTeepHeight = 2235454
+// Canceled - See update in: https://github.com/filecoin-project/community/discussions/74#discussioncomment-11549619
+const UpgradeTeepHeight = 9999999999
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after