build: backport changes for v1.30.0-rc2

api/api_full.go

@@ -989,6 +989,10 @@ type F3ParticipationLease struct {
 	ValidityTerm uint64
 }
 
+func (l *F3ParticipationLease) ToInstance() uint64 {
+	return l.FromInstance + l.ValidityTerm
+}
+
 // EthSubscriber is the reverse interface to the client, called after EthSubscribe
 type EthSubscriber interface {
 	// note: the parameter is ethtypes.EthSubscriptionResponse serialized as json object

build/buildconstants/params_2k.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 
+	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/network"
 )
@@ -98,6 +99,7 @@ var ConsensusMinerMinPower = abi.NewStoragePower(2048)
 var PreCommitChallengeDelay = abi.ChainEpoch(10)
 
 func init() {
+	SetAddressNetwork(address.Testnet)
 	getGenesisNetworkVersion := func(ev string, def network.Version) network.Version {
 		hs, found := os.LookupEnv(ev)
 		if found {

build/buildconstants/params_2k_test.go

@@ -0,0 +1,16 @@
+//go:build debug || 2k
+// +build debug 2k
+
+package buildconstants
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/filecoin-project/go-address"
+)
+
+func Test_NetworkName(t *testing.T) {
+	require.Equal(t, address.CurrentNetwork, address.Testnet)
+}

build/buildconstants/params_butterfly_test.go

@@ -0,0 +1,16 @@
+//go:build butterflynet
+// +build butterflynet
+
+package buildconstants
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/filecoin-project/go-address"
+)
+
+func Test_NetworkName(t *testing.T) {
+	require.Equal(t, address.CurrentNetwork, address.Testnet)
+}

build/buildconstants/params_calibnet.go

@@ -99,8 +99,8 @@ const UpgradeCalibrationDragonFixHeight = 1493854
 // 2024-07-11T12:00:00Z
 const UpgradeWaffleHeight = 1779094
 
-// ??????
-const UpgradeTuktukHeight = 999999999999999
+// 2024-10-23T13:30:00Z
+const UpgradeTuktukHeight = 2078794
 
 // FIP-0081: for the power actor state for pledge calculations.
 // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after
@@ -162,7 +162,8 @@ var F3ManifestServerID = MustParseID("12D3KooWS9vD9uwm8u2uPyJV32QBAhKAmPYwmziAgr
 // The initial F3 power table CID.
 var F3InitialPowerTableCID cid.Cid = cid.Undef
 
-const F3BootstrapEpoch abi.ChainEpoch = UpgradeWaffleHeight + 100
+// Calibnet F3 activation epoch is 2024-10-24T13:30:00Z - Epoch 2081674
+const F3BootstrapEpoch abi.ChainEpoch = UpgradeTuktukHeight + 2880
 
 // F3Consensus set whether F3 should checkpoint tipsets finalized by F3. This
 // flag has no effect if F3 is not enabled.

build/buildconstants/params_calibnet_test.go

@@ -0,0 +1,16 @@
+//go:build calibnet
+// +build calibnet
+
+package buildconstants
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/filecoin-project/go-address"
+)
+
+func Test_NetworkName(t *testing.T) {
+	require.Equal(t, address.CurrentNetwork, address.Testnet)
+}

build/buildconstants/params_interop_test.go

@@ -0,0 +1,16 @@
+//go:build interopnet
+// +build interopnet
+
+package buildconstants
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/filecoin-project/go-address"
+)
+
+func Test_NetworkName(t *testing.T) {
+	require.Equal(t, address.CurrentNetwork, address.Testnet)
+}

build/buildconstants/params_mainnet.go

@@ -137,9 +137,13 @@ var PropagationDelaySecs = uint64(10)
 var EquivocationDelaySecs = uint64(2)
 
 func init() {
+	var addrNetwork address.Network
 	if os.Getenv("LOTUS_USE_TEST_ADDRESSES") != "1" {
-		SetAddressNetwork(address.Mainnet)
+		addrNetwork = address.Mainnet
+	} else {
+		addrNetwork = address.Testnet
 	}
+	SetAddressNetwork(addrNetwork)
 
 	if os.Getenv("LOTUS_DISABLE_TUKTUK") == "1" {
 		UpgradeTuktukHeight = math.MaxInt64 - 1

build/buildconstants/params_mainnet_test.go

@@ -0,0 +1,16 @@
+//go:build !debug && !2k && !testground && !calibnet && !butterflynet && !interopnet
+// +build !debug,!2k,!testground,!calibnet,!butterflynet,!interopnet
+
+package buildconstants
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/filecoin-project/go-address"
+)
+
+func Test_NetworkName(t *testing.T) {
+	require.Equal(t, address.CurrentNetwork, address.Mainnet)
+}

build/buildconstants/params_testground.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 
+	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/network"
 	builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
@@ -137,6 +138,7 @@ var (
 )
 
 func init() {
+	SetAddressNetwork(address.Testnet)
 	Devnet = true
 }
 

build/buildconstants/params_testground_test.go

@@ -0,0 +1,16 @@
+//go:build testground
+// +build testground
+
+package buildconstants
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/filecoin-project/go-address"
+)
+
+func Test_NetworkName(t *testing.T) {
+	require.Equal(t, address.CurrentNetwork, address.Testnet)
+}

chain/events/filter/event.go

@@ -376,8 +376,14 @@ func (m *EventFilterManager) Revert(ctx context.Context, from, to *types.TipSet)
 	return nil
 }
 
-func (m *EventFilterManager) Install(ctx context.Context, minHeight, maxHeight abi.ChainEpoch, tipsetCid cid.Cid, addresses []address.Address,
-	keysWithCodec map[string][]types.ActorEventBlock, excludeReverted bool) (EventFilter, error) {
+func (m *EventFilterManager) Fill(
+	ctx context.Context,
+	minHeight,
+	maxHeight abi.ChainEpoch,
+	tipsetCid cid.Cid,
+	addresses []address.Address,
+	keysWithCodec map[string][]types.ActorEventBlock,
+) (EventFilter, error) {
 	m.mu.Lock()
 	if m.currentHeight == 0 {
 		// sync in progress, we haven't had an Apply
@@ -407,16 +413,33 @@ func (m *EventFilterManager) Install(ctx context.Context, minHeight, maxHeight a
 
 	if m.EventIndex != nil && minHeight != -1 && minHeight < currentHeight {
 		// Filter needs historic events
+		excludeReverted := tipsetCid == cid.Undef
 		if err := m.EventIndex.prefillFilter(ctx, f, excludeReverted); err != nil {
 			return nil, err
 		}
 	}
 
+	return f, nil
+}
+
+func (m *EventFilterManager) Install(
+	ctx context.Context,
+	minHeight,
+	maxHeight abi.ChainEpoch,
+	tipsetCid cid.Cid,
+	addresses []address.Address,
+	keysWithCodec map[string][]types.ActorEventBlock,
+) (EventFilter, error) {
+	f, err := m.Fill(ctx, minHeight, maxHeight, tipsetCid, addresses, keysWithCodec)
+	if err != nil {
+		return nil, err
+	}
+
 	m.mu.Lock()
 	if m.filters == nil {
 		m.filters = make(map[types.FilterID]EventFilter)
 	}
-	m.filters[id] = f
+	m.filters[f.(*eventFilter).id] = f
 	m.mu.Unlock()
 
 	return f, nil

chain/lf3/f3.go

@@ -141,20 +141,28 @@ func (fff *F3) runSigningLoop(ctx context.Context) {
 
 	msgCh := fff.inner.MessagesToSign()
 
-loop:
+	var mb *gpbft.MessageBuilder
+	alreadyParticipated := make(map[uint64]struct{})
 	for ctx.Err() == nil {
 		select {
 		case <-ctx.Done():
 			return
-		case mb, ok := <-msgCh:
-			if !ok {
-				continue loop
+		case <-fff.leaser.notifyParticipation:
+			if mb == nil {
+				continue
 			}
-			participants := fff.leaser.getParticipantsByInstance(mb.Payload.Instance)
-			for _, id := range participants {
-				if err := participateOnce(ctx, mb, id); err != nil {
-					log.Errorf("while participating for miner f0%d: %+v", id, err)
-				}
+		case mb = <-msgCh: // never closed
+			clear(alreadyParticipated)
+		}
+
+		participants := fff.leaser.getParticipantsByInstance(mb.Payload.Instance)
+		for _, id := range participants {
+			if _, ok := alreadyParticipated[id]; ok {
+				continue
+			} else if err := participateOnce(ctx, mb, id); err != nil {
+				log.Errorf("while participating for miner f0%d: %+v", id, err)
+			} else {
+				alreadyParticipated[id] = struct{}{}
 			}
 		}
 	}