chore: merge release v1.14 to master

CHANGELOG.md

@@ -1,5 +1,22 @@
 # venus changelog
 
+## v1.14.0
+
+* chore: update sophon-auth
+
+## v1.14.0-rc6
+
+* opt: migration: set premigration to 90 minute [[#6217](https://github.com/filecoin-project/venus/pull/6217)]
+* fix: light-weight patch to fix calibrationnet again by removing move_partitions from built-in actors [[#6223](https://github.com/filecoin-project/venus/pull/6223)]
+
+## v1.14.0-rc5
+
+fix: nv21fix migration: correctly upgrade system actor [[#6215](https://github.com/filecoin-project/venus/pull/6215)]
+
+## v1.14.0-rc4
+
+chore: update to builtin-actors v12.0.0-rc.2 [[#6207](https://github.com/filecoin-project/venus/pull/6207)]
+
 ## v1.14.0-rc3
 
 * chore: reset butterflynet [[#6191](https://github.com/filecoin-project/venus/pull/6191)]

app/submodule/eth/eth_api.go

@@ -711,10 +711,12 @@ func (a *ethAPI) EthFeeHistory(ctx context.Context, p jsonrpc.RawParams) (types.
 		}
 
 		rewards, totalGasUsed := calculateRewardsAndGasUsed(rewardPercentiles, txGasRewards)
+		maxGas := constants.BlockGasLimit * int64(len(ts.Blocks()))
 
 		// arrays should be reversed at the end
 		baseFeeArray = append(baseFeeArray, types.EthBigInt(basefee))
-		gasUsedRatioArray = append(gasUsedRatioArray, float64(totalGasUsed)/float64(constants.BlockGasLimit))
+		gasUsedRatioArray = append(gasUsedRatioArray, float64(totalGasUsed)/float64(maxGas))
+
 		rewardsArray = append(rewardsArray, rewards)
 		oldestBlkHeight = uint64(ts.Height())
 		blocksIncluded++

app/submodule/eth/eth_utils.go

@@ -610,7 +610,13 @@ func newEthTxReceipt(ctx context.Context, tx types.EthTx, lookup *types.MsgLooku
 		return types.EthTxReceipt{}, fmt.Errorf("failed to lookup tipset %s when constructing the eth txn receipt: %w", lookup.TipSet, err)
 	}
 
-	baseFee := ts.Blocks()[0].ParentBaseFee
+	// The tx is located in the parent tipset
+	parentTS, err := ca.ChainGetTipSet(ctx, ts.Parents())
+	if err != nil {
+		return types.EthTxReceipt{}, fmt.Errorf("failed to lookup tipset %s when constructing the eth txn receipt: %w", ts.Parents(), err)
+	}
+
+	baseFee := parentTS.Blocks()[0].ParentBaseFee
 	gasOutputs := gas.ComputeGasOutputs(lookup.Receipt.GasUsed, int64(tx.Gas), baseFee, big.Int(tx.MaxFeePerGas), big.Int(tx.MaxPriorityFeePerGas), true)
 	totalSpent := big.Sum(gasOutputs.BaseFeeBurn, gasOutputs.MinerTip, gasOutputs.OverEstimationBurn)
 

fixtures/networks/butterfly.go

@@ -31,31 +31,33 @@ func ButterflySnapNet() *NetworkConf {
 			MinVerifiedDealSize:     1 << 20,
 			PreCommitChallengeDelay: abi.ChainEpoch(150),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration: 120,
-				UpgradeBreezeHeight:      -1,
-				UpgradeSmokeHeight:       -2,
-				UpgradeIgnitionHeight:    -3,
-				UpgradeRefuelHeight:      -4,
-				UpgradeAssemblyHeight:    -5,
-				UpgradeTapeHeight:        -6,
-				UpgradeLiftoffHeight:     -7,
-				UpgradeKumquatHeight:     -8,
-				UpgradeCalicoHeight:      -9,
-				UpgradePersianHeight:     -10,
-				UpgradeOrangeHeight:      -11,
-				UpgradeClausHeight:       -12,
-				UpgradeTrustHeight:       -13,
-				UpgradeNorwegianHeight:   -14,
-				UpgradeTurboHeight:       -15,
-				UpgradeHyperdriveHeight:  -16,
-				UpgradeChocolateHeight:   -17,
-				UpgradeOhSnapHeight:      -18,
-				UpgradeSkyrHeight:        -19,
-				UpgradeSharkHeight:       -20,
-				UpgradeHyggeHeight:       -21,
-				UpgradeLightningHeight:   -22,
-				UpgradeThunderHeight:     -23,
-				UpgradeWatermelonHeight:  400,
+				BreezeGasTampingDuration:    120,
+				UpgradeBreezeHeight:         -1,
+				UpgradeSmokeHeight:          -2,
+				UpgradeIgnitionHeight:       -3,
+				UpgradeRefuelHeight:         -4,
+				UpgradeAssemblyHeight:       -5,
+				UpgradeTapeHeight:           -6,
+				UpgradeLiftoffHeight:        -7,
+				UpgradeKumquatHeight:        -8,
+				UpgradeCalicoHeight:         -9,
+				UpgradePersianHeight:        -10,
+				UpgradeOrangeHeight:         -11,
+				UpgradeClausHeight:          -12,
+				UpgradeTrustHeight:          -13,
+				UpgradeNorwegianHeight:      -14,
+				UpgradeTurboHeight:          -15,
+				UpgradeHyperdriveHeight:     -16,
+				UpgradeChocolateHeight:      -17,
+				UpgradeOhSnapHeight:         -18,
+				UpgradeSkyrHeight:           -19,
+				UpgradeSharkHeight:          -20,
+				UpgradeHyggeHeight:          -21,
+				UpgradeLightningHeight:      -22,
+				UpgradeThunderHeight:        -23,
+				UpgradeWatermelonHeight:     400,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/calibration.go

@@ -22,6 +22,7 @@ func Calibration() *NetworkConf {
 				"/dns4/bootstrap-1.calibration.fildev.network/tcp/1347/p2p/12D3KooWDTayrBojBn9jWNNUih4nNQQBGJD7Zo3gQCKgBkUsS6dp",
 				"/dns4/bootstrap-2.calibration.fildev.network/tcp/1347/p2p/12D3KooWNRxTHUn8bf7jz1KEUPMc2dMgGfa4f8ZJTsquVSn3vHCG",
 				"/dns4/bootstrap-3.calibration.fildev.network/tcp/1347/p2p/12D3KooWFWUqE9jgXvcKHWieYs9nhyp6NF4ftwLGAHm4sCv73jjK",
+				"/dns4/calibration.node.glif.io/tcp/1237/p2p/12D3KooWQPYouEAsUQKzvFUA9sQ8tz4rfpqtTzh2eL6USd9bwg7x",
 			},
 			Period: "30s",
 		},
@@ -38,31 +39,33 @@ func Calibration() *NetworkConf {
 			MinVerifiedDealSize:     1 << 20,
 			PreCommitChallengeDelay: abi.ChainEpoch(150),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration: 120,
-				UpgradeBreezeHeight:      -1,
-				UpgradeSmokeHeight:       -2,
-				UpgradeIgnitionHeight:    -3,
-				UpgradeRefuelHeight:      -4,
-				UpgradeAssemblyHeight:    30,
-				UpgradeTapeHeight:        60,
-				UpgradeLiftoffHeight:     -5,
-				UpgradeKumquatHeight:     90,
-				UpgradeCalicoHeight:      120,
-				UpgradePersianHeight:     120 + (builtin2.EpochsInHour * 1),
-				UpgradeClausHeight:       270,
-				UpgradeOrangeHeight:      300,
-				UpgradeTrustHeight:       330,
-				UpgradeNorwegianHeight:   360,
-				UpgradeTurboHeight:       390,
-				UpgradeHyperdriveHeight:  420,
-				UpgradeChocolateHeight:   450,
-				UpgradeOhSnapHeight:      480,
-				UpgradeSkyrHeight:        510,
-				UpgradeSharkHeight:       16800,
-				UpgradeHyggeHeight:       322354,        // 2023-02-21T16:30:00Z
-				UpgradeLightningHeight:   489094,        // 2023-04-20T14:00:00Z
-				UpgradeThunderHeight:     489094 + 3120, // 2023-04-21T16:00:00Z
-				UpgradeWatermelonHeight:  1013134,       // 2023-10-19T13:00:00Z
+				BreezeGasTampingDuration:    120,
+				UpgradeBreezeHeight:         -1,
+				UpgradeSmokeHeight:          -2,
+				UpgradeIgnitionHeight:       -3,
+				UpgradeRefuelHeight:         -4,
+				UpgradeAssemblyHeight:       30,
+				UpgradeTapeHeight:           60,
+				UpgradeLiftoffHeight:        -5,
+				UpgradeKumquatHeight:        90,
+				UpgradeCalicoHeight:         120,
+				UpgradePersianHeight:        120 + (builtin2.EpochsInHour * 1),
+				UpgradeClausHeight:          270,
+				UpgradeOrangeHeight:         300,
+				UpgradeTrustHeight:          330,
+				UpgradeNorwegianHeight:      360,
+				UpgradeTurboHeight:          390,
+				UpgradeHyperdriveHeight:     420,
+				UpgradeChocolateHeight:      450,
+				UpgradeOhSnapHeight:         480,
+				UpgradeSkyrHeight:           510,
+				UpgradeSharkHeight:          16800,
+				UpgradeHyggeHeight:          322354,        // 2023-02-21T16:30:00Z
+				UpgradeLightningHeight:      489094,        // 2023-04-20T14:00:00Z
+				UpgradeThunderHeight:        489094 + 3120, // 2023-04-21T16:00:00Z
+				UpgradeWatermelonHeight:     1013134,       // 2023-10-19T13:00:00Z
+				UpgradeWatermelonFixHeight:  1070494,       // 2023-11-07T13:00:00Z
+				UpgradeWatermelonFix2Height: 1108174,       // 2023-11-21T13:00:00Z
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/forcenet.go

@@ -40,24 +40,26 @@ func ForceNet() *NetworkConf {
 				// Miners, clients, developers, custodians all need time to prepare.
 				// We still have upgrades and state changes to do, but can happen after signaling timing here.
 
-				UpgradeAssemblyHeight:   -7, // critical: the network can bootstrap from v1 only
-				UpgradeKumquatHeight:    -8,
-				UpgradeCalicoHeight:     -9,
-				UpgradePersianHeight:    -10,
-				UpgradeOrangeHeight:     -11,
-				UpgradeClausHeight:      -12,
-				UpgradeTrustHeight:      -13,
-				UpgradeNorwegianHeight:  -14,
-				UpgradeTurboHeight:      -15,
-				UpgradeHyperdriveHeight: -16,
-				UpgradeChocolateHeight:  -17,
-				UpgradeOhSnapHeight:     -18,
-				UpgradeSkyrHeight:       -19,
-				UpgradeSharkHeight:      -20,
-				UpgradeHyggeHeight:      -21,
-				UpgradeLightningHeight:  -22,
-				UpgradeThunderHeight:    -23,
-				UpgradeWatermelonHeight: 200,
+				UpgradeAssemblyHeight:       -7, // critical: the network can bootstrap from v1 only
+				UpgradeKumquatHeight:        -8,
+				UpgradeCalicoHeight:         -9,
+				UpgradePersianHeight:        -10,
+				UpgradeOrangeHeight:         -11,
+				UpgradeClausHeight:          -12,
+				UpgradeTrustHeight:          -13,
+				UpgradeNorwegianHeight:      -14,
+				UpgradeTurboHeight:          -15,
+				UpgradeHyperdriveHeight:     -16,
+				UpgradeChocolateHeight:      -17,
+				UpgradeOhSnapHeight:         -18,
+				UpgradeSkyrHeight:           -19,
+				UpgradeSharkHeight:          -20,
+				UpgradeHyggeHeight:          -21,
+				UpgradeLightningHeight:      -22,
+				UpgradeThunderHeight:        -23,
+				UpgradeWatermelonHeight:     200,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: config.DrandMainnet},
 			AddressNetwork:          address.Testnet,

fixtures/networks/hyperspace.go

@@ -34,28 +34,33 @@ func HyperspaceNet() *NetworkConf {
 			MinVerifiedDealSize:     1 << 20,
 			PreCommitChallengeDelay: abi.ChainEpoch(10),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration: 120,
-				UpgradeBreezeHeight:      -1,
-				UpgradeSmokeHeight:       -2,
-				UpgradeIgnitionHeight:    -3,
-				UpgradeRefuelHeight:      -4,
-				UpgradeAssemblyHeight:    -5,
-				UpgradeTapeHeight:        -6,
-				UpgradeLiftoffHeight:     -7,
-				UpgradeKumquatHeight:     -8,
-				UpgradeCalicoHeight:      -9,
-				UpgradePersianHeight:     -10,
-				UpgradeOrangeHeight:      -11,
-				UpgradeClausHeight:       -12,
-				UpgradeTrustHeight:       -13,
-				UpgradeNorwegianHeight:   -14,
-				UpgradeTurboHeight:       -15,
-				UpgradeHyperdriveHeight:  -16,
-				UpgradeChocolateHeight:   -17,
-				UpgradeOhSnapHeight:      -18,
-				UpgradeSkyrHeight:        -19,
-				UpgradeSharkHeight:       -20,
-				UpgradeHyggeHeight:       -21,
+				BreezeGasTampingDuration:    120,
+				UpgradeBreezeHeight:         -1,
+				UpgradeSmokeHeight:          -2,
+				UpgradeIgnitionHeight:       -3,
+				UpgradeRefuelHeight:         -4,
+				UpgradeAssemblyHeight:       -5,
+				UpgradeTapeHeight:           -6,
+				UpgradeLiftoffHeight:        -7,
+				UpgradeKumquatHeight:        -8,
+				UpgradeCalicoHeight:         -9,
+				UpgradePersianHeight:        -10,
+				UpgradeOrangeHeight:         -11,
+				UpgradeClausHeight:          -12,
+				UpgradeTrustHeight:          -13,
+				UpgradeNorwegianHeight:      -14,
+				UpgradeTurboHeight:          -15,
+				UpgradeHyperdriveHeight:     -16,
+				UpgradeChocolateHeight:      -17,
+				UpgradeOhSnapHeight:         -18,
+				UpgradeSkyrHeight:           -19,
+				UpgradeSharkHeight:          -20,
+				UpgradeHyggeHeight:          -21,
+				UpgradeLightningHeight:      -22,
+				UpgradeThunderHeight:        -23,
+				UpgradeWatermelonHeight:     200,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/integrationtestnet.go

@@ -26,31 +26,33 @@ func IntegrationNet() *NetworkConf {
 			MinVerifiedDealSize:     1 << 20,
 			PreCommitChallengeDelay: abi.ChainEpoch(150),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration: 120,
-				UpgradeBreezeHeight:      41280,
-				UpgradeSmokeHeight:       51000,
-				UpgradeIgnitionHeight:    94000,
-				UpgradeRefuelHeight:      130800,
-				UpgradeAssemblyHeight:    138720,
-				UpgradeTapeHeight:        140760,
-				UpgradeLiftoffHeight:     148888,
-				UpgradeKumquatHeight:     170000,
-				UpgradeCalicoHeight:      265200,
-				UpgradePersianHeight:     265200 + (120 * 60),
-				UpgradeOrangeHeight:      336458,
-				UpgradeClausHeight:       343200,
-				UpgradeTrustHeight:       550321,
-				UpgradeNorwegianHeight:   665280,
-				UpgradeTurboHeight:       712320,
-				UpgradeHyperdriveHeight:  892800,
-				UpgradeChocolateHeight:   1231620,
-				UpgradeOhSnapHeight:      1594680,
-				UpgradeSkyrHeight:        1960320,
-				UpgradeSharkHeight:       2383680,
-				UpgradeHyggeHeight:       2683348,
-				UpgradeLightningHeight:   2809800,
-				UpgradeThunderHeight:     2809800 + 2880*21,
-				UpgradeWatermelonHeight:  999999999999999,
+				BreezeGasTampingDuration:    120,
+				UpgradeBreezeHeight:         41280,
+				UpgradeSmokeHeight:          51000,
+				UpgradeIgnitionHeight:       94000,
+				UpgradeRefuelHeight:         130800,
+				UpgradeAssemblyHeight:       138720,
+				UpgradeTapeHeight:           140760,
+				UpgradeLiftoffHeight:        148888,
+				UpgradeKumquatHeight:        170000,
+				UpgradeCalicoHeight:         265200,
+				UpgradePersianHeight:        265200 + (120 * 60),
+				UpgradeOrangeHeight:         336458,
+				UpgradeClausHeight:          343200,
+				UpgradeTrustHeight:          550321,
+				UpgradeNorwegianHeight:      665280,
+				UpgradeTurboHeight:          712320,
+				UpgradeHyperdriveHeight:     892800,
+				UpgradeChocolateHeight:      1231620,
+				UpgradeOhSnapHeight:         1594680,
+				UpgradeSkyrHeight:           1960320,
+				UpgradeSharkHeight:          2383680,
+				UpgradeHyggeHeight:          2683348,
+				UpgradeLightningHeight:      2809800,
+				UpgradeThunderHeight:        2809800 + 2880*21,
+				UpgradeWatermelonHeight:     3431940,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},
 			AddressNetwork:          address.Testnet,

fixtures/networks/interopnet.go

@@ -31,31 +31,33 @@ func InteropNet() *NetworkConf {
 			MinVerifiedDealSize:     256,
 			PreCommitChallengeDelay: abi.ChainEpoch(10),
 			ForkUpgradeParam: &config.ForkUpgradeConfig{
-				BreezeGasTampingDuration: 0,
-				UpgradeBreezeHeight:      -1,
-				UpgradeSmokeHeight:       -2,
-				UpgradeIgnitionHeight:    -3,
-				UpgradeRefuelHeight:      -4,
-				UpgradeAssemblyHeight:    -5,
-				UpgradeTapeHeight:        -6,
-				UpgradeLiftoffHeight:     -7,
-				UpgradeKumquatHeight:     -8,
-				UpgradeCalicoHeight:      -9,
-				UpgradePersianHeight:     -10,
-				UpgradeOrangeHeight:      -11,
-				UpgradeClausHeight:       -12,
-				UpgradeTrustHeight:       -13,
-				UpgradeNorwegianHeight:   -14,
-				UpgradeTurboHeight:       -15,
-				UpgradeHyperdriveHeight:  -16,
-				UpgradeChocolateHeight:   -17,
-				UpgradeOhSnapHeight:      -18,
-				UpgradeSkyrHeight:        -19,
-				UpgradeSharkHeight:       -20,
-				UpgradeHyggeHeight:       -21,
-				UpgradeLightningHeight:   -22,
-				UpgradeThunderHeight:     -23,
-				UpgradeWatermelonHeight:  50,
+				BreezeGasTampingDuration:    0,
+				UpgradeBreezeHeight:         -1,
+				UpgradeSmokeHeight:          -2,
+				UpgradeIgnitionHeight:       -3,
+				UpgradeRefuelHeight:         -4,
+				UpgradeAssemblyHeight:       -5,
+				UpgradeTapeHeight:           -6,
+				UpgradeLiftoffHeight:        -7,
+				UpgradeKumquatHeight:        -8,
+				UpgradeCalicoHeight:         -9,
+				UpgradePersianHeight:        -10,
+				UpgradeOrangeHeight:         -11,
+				UpgradeClausHeight:          -12,
+				UpgradeTrustHeight:          -13,
+				UpgradeNorwegianHeight:      -14,
+				UpgradeTurboHeight:          -15,
+				UpgradeHyperdriveHeight:     -16,
+				UpgradeChocolateHeight:      -17,
+				UpgradeOhSnapHeight:         -18,
+				UpgradeSkyrHeight:           -19,
+				UpgradeSharkHeight:          -20,
+				UpgradeHyggeHeight:          -21,
+				UpgradeLightningHeight:      -22,
+				UpgradeThunderHeight:        -23,
+				UpgradeWatermelonHeight:     50,
+				UpgradeWatermelonFixHeight:  -100, // This fix upgrade only ran on calibrationnet
+				UpgradeWatermelonFix2Height: -101, // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 1},
 			AddressNetwork:          address.Testnet,