Merge pull request #6436 from filecoin-project/feat/nv25

Feat/nv25

Author: simlecode

app/submodule/chain/chain_submodule.go

@@ -21,7 +21,6 @@ import (
 	"github.com/filecoin-project/venus/pkg/vmsupport"
 	v0api "github.com/filecoin-project/venus/venus-shared/api/chain/v0"
 	v1api "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
-	"github.com/filecoin-project/venus/venus-shared/types"
 )
 
 // ChainSubmodule enhances the `Node` with chain capabilities.
@@ -33,8 +32,7 @@ type ChainSubmodule struct { //nolint
 	SystemCall                  vm.SyscallsImpl
 	CirculatingSupplyCalculator *chain.CirculatingSupplyCalculator
 
-	CheckPoint types.TipSetKey
-	Drand      beacon.Schedule
+	Drand beacon.Schedule
 
 	config chainConfig
 
@@ -92,7 +90,6 @@ func NewChainSubmodule(ctx context.Context,
 		Drand:                       drand,
 		config:                      config,
 		Waiter:                      waiter,
-		CheckPoint:                  chainStore.GetCheckPoint(),
 	}
 	err = store.ChainReader.Load(context.TODO())
 	if err != nil {

app/submodule/chain/chaininfo_api.go

@@ -761,6 +761,7 @@ func (cia *chainInfoAPI) StateGetNetworkParams(ctx context.Context) (*types.Netw
 			UpgradePhoenixHeight:     cfg.NetworkParams.ForkUpgradeParam.UpgradePhoenixHeight,
 			UpgradeWaffleHeight:      cfg.NetworkParams.ForkUpgradeParam.UpgradeWaffleHeight,
 			UpgradeTuktukHeight:      cfg.NetworkParams.ForkUpgradeParam.UpgradeTuktukHeight,
+			UpgradeTeepHeight:        cfg.NetworkParams.ForkUpgradeParam.UpgradeTeepHeight,
 		},
 		Eip155ChainID: cfg.NetworkParams.Eip155ChainID,
 	}
@@ -942,3 +943,22 @@ func (cia *chainInfoAPI) StateCompute(ctx context.Context, height abi.ChainEpoch
 		Trace: t,
 	}, nil
 }
+
+func (cia *chainInfoAPI) StateMarketProposalPending(ctx context.Context, proposalCid cid.Cid, tsk types.TipSetKey) (bool, error) {
+	ts, err := cia.ChainGetTipSet(ctx, tsk)
+	if err != nil {
+		return false, fmt.Errorf("loading tipset %s: %w", tsk, err)
+	}
+
+	st, err := cia.chain.Stmgr.GetMarketState(ctx, ts)
+	if err != nil {
+		return false, err
+	}
+
+	props, err := st.PendingProposals()
+	if err != nil {
+		return false, err
+	}
+
+	return props.Has(proposalCid)
+}

app/submodule/chain/miner_api.go

@@ -730,12 +730,12 @@ func (msa *minerStateAPI) calculateSectorWeight(ctx context.Context, maddr addre
 		return types.EmptyInt, fmt.Errorf("market actor not found")
 	} else if s, err := market.Load(store, act); err != nil {
 		return types.EmptyInt, fmt.Errorf("loading market actor state: %w", err)
-	} else if w, vw, err := s.VerifyDealsForActivation(maddr, pci.DealIDs, height, pci.Expiration); err != nil {
+	} else if vw, err := s.VerifyDealsForActivation(maddr, pci.DealIDs, height, pci.Expiration); err != nil {
 		return types.EmptyInt, fmt.Errorf("verifying deals for activation: %w", err)
 	} else {
 		// NB: not exactly accurate, but should always lead us to *over* estimate, not under
 		duration := pci.Expiration - height
-		sectorWeight = builtin.QAPowerForWeight(ssize, duration, w, vw)
+		sectorWeight = builtin.QAPowerForWeight(ssize, duration, vw)
 	}
 
 	return sectorWeight, nil
@@ -937,7 +937,7 @@ func (msa *minerStateAPI) StateMinerInitialPledgeForSector(ctx context.Context,
 	}
 
 	verifiedWeight := big.Mul(big.NewIntUnsigned(verifiedSize), big.NewInt(int64(sectorDuration)))
-	sectorWeight := builtin.QAPowerForWeight(sectorSize, sectorDuration, big.Zero(), verifiedWeight)
+	sectorWeight := builtin.QAPowerForWeight(sectorSize, sectorDuration, verifiedWeight)
 
 	epochsSinceRampStart, rampDurationEpochs, err := msa.getPledgeRampParams(ctx, ts.Height(), state)
 	if err != nil {

app/submodule/eth/eth_api.go

@@ -1436,6 +1436,9 @@ func (a *ethAPI) EthTraceFilter(ctx context.Context, filter types.EthTraceFilter
 	for blkNum := fromBlock; blkNum <= toBlock; blkNum++ {
 		blockTraces, err := a.EthTraceBlock(ctx, strconv.FormatUint(uint64(blkNum), 10))
 		if err != nil {
+			if errors.Is(err, &types.ErrNullRound{}) {
+				continue
+			}
 			return nil, fmt.Errorf("cannot get trace for block %d: %w", blkNum, err)
 		}
 

app/submodule/eth/eth_trace.go

@@ -444,11 +444,14 @@ func decodeCreateViaEAM(et *types.ExecutionTrace) (initcode []byte, addr *types.
 	default:
 		return nil, nil, fmt.Errorf("unexpected CREATE method %d", et.Msg.Method)
 	}
-	ret, err := decodeReturn[eam12.CreateReturn](&et.MsgRct)
-	if err != nil {
-		return nil, nil, err
+	if et.MsgRct.ExitCode.IsSuccess() {
+		ret, err := decodeReturn[eam12.CreateReturn](&et.MsgRct)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to decode EAM create return: %w", err)
+		}
+		addr = (*types.EthAddress)(&ret.EthAddress)
 	}
-	return initcode, (*types.EthAddress)(&ret.EthAddress), nil
+	return initcode, addr, nil
 }
 
 // Build an EthTrace for an EVM "create" operation. This should only be called with an

extern/filecoin-ffi

@@ -21,7 +21,7 @@ func ButterflySnapNet() *NetworkConf {
 		Network: config.NetworkParamsConfig{
 			DevNet:                true,
 			NetworkType:           types.NetworkButterfly,
-			GenesisNetworkVersion: network.Version22,
+			GenesisNetworkVersion: network.Version24,
 			ReplaceProofTypes: []abi.RegisteredSealProof{
 				abi.RegisteredSealProof_StackedDrg512MiBV1,
 				abi.RegisteredSealProof_StackedDrg32GiBV1,
@@ -63,8 +63,9 @@ func ButterflySnapNet() *NetworkConf {
 				UpgradeCalibrationDragonFixHeight:    -102, // This fix upgrade only ran on calibrationnet
 				UpgradePhoenixHeight:                 -26,
 				UpgradeWaffleHeight:                  -27,
-				UpgradeTuktukHeight:                  9999999,
+				UpgradeTuktukHeight:                  -28,
 				UpgradeTuktukPowerRampDurationEpochs: builtin.EpochsInYear,
+				UpgradeTeepHeight:                    100,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
 			AddressNetwork:          address.Testnet,

fixtures/networks/butterfly.go

@@ -73,6 +73,7 @@ func Calibration() *NetworkConf {
 				UpgradeWaffleHeight:                  1779094,       // 2024-07-11T12:00:00Z
 				UpgradeTuktukHeight:                  2078794,       // 2024-10-23T13:30:00Z
 				UpgradeTuktukPowerRampDurationEpochs: builtin.EpochsInDay * 3,
+				UpgradeTeepHeight:                    2235454, // 2024-12-16T23:00:00Z
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/calibration.go

@@ -19,7 +19,7 @@ func ForceNet() *NetworkConf {
 		Network: config.NetworkParamsConfig{
 			DevNet:                true,
 			NetworkType:           types.NetworkForce,
-			GenesisNetworkVersion: network.Version23,
+			GenesisNetworkVersion: network.Version24,
 			ReplaceProofTypes: []abi.RegisteredSealProof{
 				abi.RegisteredSealProof_StackedDrg8MiBV1,
 				abi.RegisteredSealProof_StackedDrg512MiBV1,
@@ -65,8 +65,9 @@ func ForceNet() *NetworkConf {
 				UpgradeCalibrationDragonFixHeight:    -102, // This fix upgrade only ran on calibrationnet
 				UpgradePhoenixHeight:                 -26,
 				UpgradeWaffleHeight:                  -27,
-				UpgradeTuktukHeight:                  200,
+				UpgradeTuktukHeight:                  -28,
 				UpgradeTuktukPowerRampDurationEpochs: 200,
+				UpgradeTeepHeight:                    200,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandQuicknet},
 			AddressNetwork:          address.Testnet,

fixtures/networks/forcenet.go

@@ -58,6 +58,7 @@ func IntegrationNet() *NetworkConf {
 				UpgradeCalibrationDragonFixHeight: -102, // This fix upgrade only ran on calibrationnet
 				UpgradeWaffleHeight:               4154640,
 				UpgradeTuktukHeight:               4461240,
+				UpgradeTeepHeight:                 99999999,
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
 			AddressNetwork:          address.Testnet,