From 08f126cad9beb134d3f4982fea154ec3c51ceccc Mon Sep 17 00:00:00 2001 From: "Andrew Jackson (Ajax)" Date: Thu, 20 Jun 2024 11:29:44 -0500 Subject: [PATCH] deprecate msg --- build/parameters.go | 92 ++++++++++++++++++------------------ build/params_shared_funcs.go | 3 ++ build/params_shared_vals.go | 58 +++++++++++------------ 3 files changed, 78 insertions(+), 75 deletions(-) diff --git a/build/parameters.go b/build/parameters.go index 6f029fa3602..20baaa3d2df 100644 --- a/build/parameters.go +++ b/build/parameters.go @@ -15,72 +15,72 @@ var SrsJSON = proofparams.SrsJSON // NOTE: DO NOT change this unless you REALLY know what you're doing. This is consensus critical. var BundleOverrides map[actorstypes.Version]string -var BootstrappersFile = buildconstants.BootstrappersFile +var BootstrappersFile = buildconstants.BootstrappersFile // Deprecated: Use buildconstants.BootstrappersFile instead -var GenesisFile = buildconstants.GenesisFile +var GenesisFile = buildconstants.GenesisFile // Deprecated: Use buildconstants.GenesisFile instead -var NetworkBundle = buildconstants.NetworkBundle -var ActorDebugging = buildconstants.ActorDebugging +var NetworkBundle = buildconstants.NetworkBundle // Deprecated: Use buildconstants.NetworkBundle instead +var ActorDebugging = buildconstants.ActorDebugging // Deprecated: Use buildconstants.ActorDebugging instead -var GenesisNetworkVersion = buildconstants.GenesisNetworkVersion +var GenesisNetworkVersion = buildconstants.GenesisNetworkVersion // Deprecated: Use buildconstants.GenesisNetworkVersion instead -var UpgradeBreezeHeight abi.ChainEpoch = buildconstants.UpgradeBreezeHeight +var UpgradeBreezeHeight abi.ChainEpoch = buildconstants.UpgradeBreezeHeight // Deprecated: Use buildconstants.UpgradeBreezeHeight instead -var BreezeGasTampingDuration abi.ChainEpoch = buildconstants.BreezeGasTampingDuration +var BreezeGasTampingDuration abi.ChainEpoch = buildconstants.BreezeGasTampingDuration // Deprecated: Use buildconstants.BreezeGasTampingDuration instead // upgrade heights -var UpgradeSmokeHeight abi.ChainEpoch = buildconstants.UpgradeSmokeHeight -var UpgradeIgnitionHeight abi.ChainEpoch = buildconstants.UpgradeIgnitionHeight -var UpgradeRefuelHeight abi.ChainEpoch = buildconstants.UpgradeRefuelHeight -var UpgradeTapeHeight abi.ChainEpoch = buildconstants.UpgradeTapeHeight -var UpgradeAssemblyHeight abi.ChainEpoch = buildconstants.UpgradeAssemblyHeight -var UpgradeLiftoffHeight abi.ChainEpoch = buildconstants.UpgradeLiftoffHeight -var UpgradeKumquatHeight abi.ChainEpoch = buildconstants.UpgradeKumquatHeight -var UpgradeCalicoHeight abi.ChainEpoch = buildconstants.UpgradeCalicoHeight -var UpgradePersianHeight abi.ChainEpoch = buildconstants.UpgradePersianHeight -var UpgradeOrangeHeight abi.ChainEpoch = buildconstants.UpgradeOrangeHeight -var UpgradeClausHeight abi.ChainEpoch = buildconstants.UpgradeClausHeight -var UpgradeTrustHeight abi.ChainEpoch = buildconstants.UpgradeTrustHeight -var UpgradeNorwegianHeight abi.ChainEpoch = buildconstants.UpgradeNorwegianHeight -var UpgradeTurboHeight abi.ChainEpoch = buildconstants.UpgradeTurboHeight -var UpgradeHyperdriveHeight abi.ChainEpoch = buildconstants.UpgradeHyperdriveHeight -var UpgradeChocolateHeight abi.ChainEpoch = buildconstants.UpgradeChocolateHeight -var UpgradeOhSnapHeight abi.ChainEpoch = buildconstants.UpgradeOhSnapHeight -var UpgradeSkyrHeight abi.ChainEpoch = buildconstants.UpgradeSkyrHeight -var UpgradeSharkHeight abi.ChainEpoch = buildconstants.UpgradeSharkHeight -var UpgradeHyggeHeight abi.ChainEpoch = buildconstants.UpgradeHyggeHeight -var UpgradeLightningHeight abi.ChainEpoch = buildconstants.UpgradeLightningHeight -var UpgradeThunderHeight abi.ChainEpoch = buildconstants.UpgradeThunderHeight -var UpgradeWatermelonHeight abi.ChainEpoch = buildconstants.UpgradeWatermelonHeight -var UpgradeDragonHeight abi.ChainEpoch = buildconstants.UpgradeDragonHeight -var UpgradePhoenixHeight abi.ChainEpoch = buildconstants.UpgradePhoenixHeight -var UpgradeAussieHeight abi.ChainEpoch = buildconstants.UpgradeAussieHeight +var UpgradeSmokeHeight abi.ChainEpoch = buildconstants.UpgradeSmokeHeight // Deprecated: Use buildconstants.UpgradeSmokeHeight instead +var UpgradeIgnitionHeight abi.ChainEpoch = buildconstants.UpgradeIgnitionHeight // Deprecated: Use buildconstants.UpgradeIgnitionHeight instead +var UpgradeRefuelHeight abi.ChainEpoch = buildconstants.UpgradeRefuelHeight // Deprecated: Use buildconstants.UpgradeRefuelHeight instead +var UpgradeTapeHeight abi.ChainEpoch = buildconstants.UpgradeTapeHeight // Deprecated: Use buildconstants.UpgradeTapeHeight instead +var UpgradeAssemblyHeight abi.ChainEpoch = buildconstants.UpgradeAssemblyHeight // Deprecated: Use buildconstants.UpgradeAssemblyHeight instead +var UpgradeLiftoffHeight abi.ChainEpoch = buildconstants.UpgradeLiftoffHeight // Deprecated: Use buildconstants.UpgradeLiftoffHeight instead +var UpgradeKumquatHeight abi.ChainEpoch = buildconstants.UpgradeKumquatHeight // Deprecated: Use buildconstants.UpgradeKumquatHeight instead +var UpgradeCalicoHeight abi.ChainEpoch = buildconstants.UpgradeCalicoHeight // Deprecated: Use buildconstants.UpgradeCalicoHeight instead +var UpgradePersianHeight abi.ChainEpoch = buildconstants.UpgradePersianHeight // Deprecated: Use buildconstants.UpgradePersianHeight instead +var UpgradeOrangeHeight abi.ChainEpoch = buildconstants.UpgradeOrangeHeight // Deprecated: Use buildconstants.UpgradeOrangeHeight instead +var UpgradeClausHeight abi.ChainEpoch = buildconstants.UpgradeClausHeight // Deprecated: Use buildconstants.UpgradeClausHeight instead +var UpgradeTrustHeight abi.ChainEpoch = buildconstants.UpgradeTrustHeight // Deprecated: Use buildconstants.UpgradeTrustHeight instead +var UpgradeNorwegianHeight abi.ChainEpoch = buildconstants.UpgradeNorwegianHeight // Deprecated: Use buildconstants.UpgradeNorwegianHeight instead +var UpgradeTurboHeight abi.ChainEpoch = buildconstants.UpgradeTurboHeight // Deprecated: Use buildconstants.UpgradeTurboHeight instead +var UpgradeHyperdriveHeight abi.ChainEpoch = buildconstants.UpgradeHyperdriveHeight // Deprecated: Use buildconstants.UpgradeHyperdriveHeight instead +var UpgradeChocolateHeight abi.ChainEpoch = buildconstants.UpgradeChocolateHeight // Deprecated: Use buildconstants.UpgradeChocolateHeight instead +var UpgradeOhSnapHeight abi.ChainEpoch = buildconstants.UpgradeOhSnapHeight // Deprecated: Use buildconstants.UpgradeOhSnapHeight instead +var UpgradeSkyrHeight abi.ChainEpoch = buildconstants.UpgradeSkyrHeight // Deprecated: Use buildconstants.UpgradeSkyrHeight instead +var UpgradeSharkHeight abi.ChainEpoch = buildconstants.UpgradeSharkHeight // Deprecated: Use buildconstants.UpgradeSharkHeight instead +var UpgradeHyggeHeight abi.ChainEpoch = buildconstants.UpgradeHyggeHeight // Deprecated: Use buildconstants.UpgradeHyggeHeight instead +var UpgradeLightningHeight abi.ChainEpoch = buildconstants.UpgradeLightningHeight // Deprecated: Use buildconstants.UpgradeLightningHeight instead +var UpgradeThunderHeight abi.ChainEpoch = buildconstants.UpgradeThunderHeight // Deprecated: Use buildconstants.UpgradeThunderHeight instead +var UpgradeWatermelonHeight abi.ChainEpoch = buildconstants.UpgradeWatermelonHeight // Deprecated: Use buildconstants.UpgradeWatermelonHeight instead +var UpgradeDragonHeight abi.ChainEpoch = buildconstants.UpgradeDragonHeight // Deprecated: Use buildconstants.UpgradeDragonHeight instead +var UpgradePhoenixHeight abi.ChainEpoch = buildconstants.UpgradePhoenixHeight // Deprecated: Use buildconstants.UpgradePhoenixHeight instead +var UpgradeAussieHeight abi.ChainEpoch = buildconstants.UpgradeAussieHeight // Deprecated: Use buildconstants.UpgradeAussieHeight instead // This fix upgrade only ran on calibrationnet -var UpgradeWatermelonFixHeight abi.ChainEpoch = buildconstants.UpgradeWatermelonFixHeight +var UpgradeWatermelonFixHeight abi.ChainEpoch = buildconstants.UpgradeWatermelonFixHeight // Deprecated: Use buildconstants.UpgradeWatermelonFixHeight instead // This fix upgrade only ran on calibrationnet -var UpgradeWatermelonFix2Height abi.ChainEpoch = buildconstants.UpgradeWatermelonFix2Height +var UpgradeWatermelonFix2Height abi.ChainEpoch = buildconstants.UpgradeWatermelonFix2Height // Deprecated: Use buildconstants.UpgradeWatermelonFix2Height instead // This fix upgrade only ran on calibrationnet -var UpgradeCalibrationDragonFixHeight abi.ChainEpoch = buildconstants.UpgradeCalibrationDragonFixHeight +var UpgradeCalibrationDragonFixHeight abi.ChainEpoch = buildconstants.UpgradeCalibrationDragonFixHeight // Deprecated: Use buildconstants.UpgradeCalibrationDragonFixHeight instead -var SupportedProofTypes = buildconstants.SupportedProofTypes -var ConsensusMinerMinPower = buildconstants.ConsensusMinerMinPower -var PreCommitChallengeDelay = buildconstants.PreCommitChallengeDelay +var SupportedProofTypes = buildconstants.SupportedProofTypes // Deprecated: Use buildconstants.SupportedProofTypes instead +var ConsensusMinerMinPower = buildconstants.ConsensusMinerMinPower // Deprecated: Use buildconstants.ConsensusMinerMinPower instead +var PreCommitChallengeDelay = buildconstants.PreCommitChallengeDelay // Deprecated: Use buildconstants.PreCommitChallengeDelay instead -var BlockDelaySecs = buildconstants.BlockDelaySecs +var BlockDelaySecs = buildconstants.BlockDelaySecs // Deprecated: Use buildconstants.BlockDelaySecs instead -var PropagationDelaySecs = buildconstants.PropagationDelaySecs +var PropagationDelaySecs = buildconstants.PropagationDelaySecs // Deprecated: Use buildconstants.PropagationDelaySecs instead -var EquivocationDelaySecs = buildconstants.EquivocationDelaySecs +var EquivocationDelaySecs = buildconstants.EquivocationDelaySecs // Deprecated: Use buildconstants.EquivocationDelaySecs instead -const BootstrapPeerThreshold = buildconstants.BootstrapPeerThreshold +const BootstrapPeerThreshold = buildconstants.BootstrapPeerThreshold // Deprecated: Use buildconstants.BootstrapPeerThreshold instead // ChainId defines the chain ID used in the Ethereum JSON-RPC endpoint. // As per https://github.com/ethereum-lists/chains -const Eip155ChainId = buildconstants.Eip155ChainId +const Eip155ChainId = buildconstants.Eip155ChainId // Deprecated: Use buildconstants.Eip155ChainId instead -var WhitelistedBlock = buildconstants.WhitelistedBlock +var WhitelistedBlock = buildconstants.WhitelistedBlock // Deprecated: Use buildconstants.WhitelistedBlock instead -const Finality = policy.ChainFinality +const Finality = policy.ChainFinality // Deprecated: Use policy.ChainFinality instead diff --git a/build/params_shared_funcs.go b/build/params_shared_funcs.go index 4d5aa5bf327..6f78f4bee85 100644 --- a/build/params_shared_funcs.go +++ b/build/params_shared_funcs.go @@ -26,8 +26,11 @@ func DhtProtocolName(netName dtypes.NetworkName) protocol.ID { return protocol.ID("/fil/kad/" + string(netName)) } +// Deprecated: Use buildconstants.SetAddressNetwork instead. var SetAddressNetwork = buildconstants.SetAddressNetwork +// Deprecated: Use buildconstants.MustParseAddress instead. var MustParseAddress = buildconstants.MustParseAddress +// Deprecated: Use buildconstants.MustParseCid instead. var MustParseCid = buildconstants.MustParseCid diff --git a/build/params_shared_vals.go b/build/params_shared_vals.go index 399ab79ec2b..e94a43dfdbc 100644 --- a/build/params_shared_vals.go +++ b/build/params_shared_vals.go @@ -9,47 +9,47 @@ import ( // ///// // Storage -var UnixfsChunkSize uint64 = buildconstants.UnixfsChunkSize -var UnixfsLinksPerLevel = buildconstants.UnixfsLinksPerLevel +var UnixfsChunkSize uint64 = buildconstants.UnixfsChunkSize // Deprecated: Use buildconstants.UnixfsChunkSize instead +var UnixfsLinksPerLevel = buildconstants.UnixfsLinksPerLevel // Deprecated: Use buildconstants.UnixfsLinksPerLevel instead // ///// // Consensus / Network -var AllowableClockDriftSecs = buildconstants.AllowableClockDriftSecs +var AllowableClockDriftSecs = buildconstants.AllowableClockDriftSecs // Deprecated: Use buildconstants.AllowableClockDriftSecs instead // Epochs -var ForkLengthThreshold = Finality +var ForkLengthThreshold = Finality // Deprecated: Use Finality instead // Blocks (e) -var BlocksPerEpoch = buildconstants.BlocksPerEpoch +var BlocksPerEpoch = buildconstants.BlocksPerEpoch // Deprecated: Use buildconstants.BlocksPerEpoch instead // Epochs -var MessageConfidence = buildconstants.MessageConfidence +var MessageConfidence = buildconstants.MessageConfidence // Deprecated: Use buildconstants.MessageConfidence instead // constants for Weight calculation // The ratio of weight contributed by short-term vs long-term factors in a given round -var WRatioNum = buildconstants.WRatioNum -var WRatioDen = buildconstants.WRatioDen +var WRatioNum = buildconstants.WRatioNum // Deprecated: Use buildconstants.WRatioNum instead +var WRatioDen = buildconstants.WRatioDen // Deprecated: Use buildconstants.WRatioDen instead // ///// // Mining // Epochs -var TicketRandomnessLookback = buildconstants.TicketRandomnessLookback +var TicketRandomnessLookback = buildconstants.TicketRandomnessLookback // Deprecated: Use buildconstants.TicketRandomnessLookback instead // the 'f' prefix doesn't matter -var ZeroAddress = buildconstants.ZeroAddress +var ZeroAddress = buildconstants.ZeroAddress // Deprecated: Use buildconstants.ZeroAddress instead // ///// // Devnet settings -var Devnet = buildconstants.Devnet +var Devnet = buildconstants.Devnet // Deprecated: Use buildconstants.Devnet instead -var FilBase = buildconstants.FilBase -var FilAllocStorageMining = buildconstants.FilAllocStorageMining +var FilBase = buildconstants.FilBase // Deprecated: Use buildconstants.FilBase instead +var FilAllocStorageMining = buildconstants.FilAllocStorageMining // Deprecated: Use buildconstants.FilAllocStorageMining instead -var FilecoinPrecision = buildconstants.FilecoinPrecision -var FilReserved = buildconstants.FilReserved +var FilecoinPrecision = buildconstants.FilecoinPrecision // Deprecated: Use buildconstants.FilecoinPrecision instead +var FilReserved = buildconstants.FilReserved // Deprecated: Use buildconstants.FilReserved instead var InitialRewardBalance *big.Int var InitialFilReserved *big.Int @@ -65,32 +65,32 @@ func init() { } // Sync -var BadBlockCacheSize = buildconstants.BadBlockCacheSize +var BadBlockCacheSize = buildconstants.BadBlockCacheSize // Deprecated: Use buildconstants.BadBlockCacheSize instead // assuming 4000 messages per round, this lets us not lose any messages across a // 10 block reorg. -var BlsSignatureCacheSize = buildconstants.BlsSignatureCacheSize +var BlsSignatureCacheSize = buildconstants.BlsSignatureCacheSize // Deprecated: Use buildconstants.BlsSignatureCacheSize instead // Size of signature verification cache // 32k keeps the cache around 10MB in size, max -var VerifSigCacheSize = buildconstants.VerifSigCacheSize +var VerifSigCacheSize = buildconstants.VerifSigCacheSize // Deprecated: Use buildconstants.VerifSigCacheSize instead // /////// // Limits // TODO: If this is gonna stay, it should move to specs-actors -var BlockMessageLimit = buildconstants.BlockMessageLimit +var BlockMessageLimit = buildconstants.BlockMessageLimit // Deprecated: Use buildconstants.BlockMessageLimit instead -var BlockGasLimit = buildconstants.BlockGasLimit -var BlockGasTarget = buildconstants.BlockGasTarget +var BlockGasLimit = buildconstants.BlockGasLimit // Deprecated: Use buildconstants.BlockGasLimit instead +var BlockGasTarget = buildconstants.BlockGasTarget // Deprecated: Use buildconstants.BlockGasTarget instead -var BaseFeeMaxChangeDenom int64 = buildconstants.BaseFeeMaxChangeDenom -var InitialBaseFee int64 = buildconstants.InitialBaseFee -var MinimumBaseFee int64 = buildconstants.MinimumBaseFee -var PackingEfficiencyNum int64 = buildconstants.PackingEfficiencyNum -var PackingEfficiencyDenom int64 = buildconstants.PackingEfficiencyDenom +var BaseFeeMaxChangeDenom int64 = buildconstants.BaseFeeMaxChangeDenom // Deprecated: Use buildconstants.BaseFeeMaxChangeDenom instead +var InitialBaseFee int64 = buildconstants.InitialBaseFee // Deprecated: Use buildconstants.InitialBaseFee instead +var MinimumBaseFee int64 = buildconstants.MinimumBaseFee // Deprecated: Use buildconstants.MinimumBaseFee instead +var PackingEfficiencyNum int64 = buildconstants.PackingEfficiencyNum // Deprecated: Use buildconstants.PackingEfficiencyNum instead +var PackingEfficiencyDenom int64 = buildconstants.PackingEfficiencyDenom // Deprecated: Use buildconstants.PackingEfficiencyDenom instead -var MinDealDuration = buildconstants.MinDealDuration -var MaxDealDuration = buildconstants.MaxDealDuration +var MinDealDuration = buildconstants.MinDealDuration // Deprecated: Use buildconstants.MinDealDuration instead +var MaxDealDuration = buildconstants.MaxDealDuration // Deprecated: Use buildconstants.MaxDealDuration instead -const TestNetworkVersion = buildconstants.TestNetworkVersion +const TestNetworkVersion = buildconstants.TestNetworkVersion // Deprecated: Use buildconstants.TestNetworkVersion instead