From 782a7ff5cb034e5aa48b542ca2af70c28bddcaf7 Mon Sep 17 00:00:00 2001 From: Daniel Liu <139250065@qq.com> Date: Fri, 14 Nov 2025 22:32:34 +0800 Subject: [PATCH] all: fix typos, close XFN-23 (#1725) --- common/constants.all.go | 62 +++++++++++------------ common/constants.mainnet.go | 2 +- consensus/XDPoS/engines/engine_v2/vote.go | 2 +- consensus/misc/dao.go | 2 +- core/txpool/journal.go | 2 +- core/txpool/lending_tx_journal.go | 2 +- core/txpool/list.go | 2 +- core/txpool/order_tx_journal.go | 2 +- core/types/transaction_signing.go | 4 +- params/config.go | 4 +- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/common/constants.all.go b/common/constants.all.go index 72c13b29eb..3400ccad6f 100644 --- a/common/constants.all.go +++ b/common/constants.all.go @@ -75,40 +75,40 @@ type constant struct { blacklist map[Address]struct{} } -// variables for specific networks, copy values from maintnet constant to pass tests +// variables for specific networks, copy values from mainnet constant to pass tests var ( - BlackListHFNumber = MaintnetConstant.blackListHFNumber - MaxMasternodesV2 = MaintnetConstant.maxMasternodesV2 // Last v1 masternodes + BlackListHFNumber = MainnetConstant.blackListHFNumber + MaxMasternodesV2 = MainnetConstant.maxMasternodesV2 // Last v1 masternodes - TIP2019Block = MaintnetConstant.tip2019Block - TIPSigning = MaintnetConstant.tipSigning - TIPRandomize = MaintnetConstant.tipRandomize - TIPNoHalvingMNReward = MaintnetConstant.tipNoHalvingMNReward - TIPXDCX = MaintnetConstant.tipXDCX - TIPXDCXLending = MaintnetConstant.tipXDCXLending - TIPXDCXCancellationFee = MaintnetConstant.tipXDCXCancellationFee - TIPTRC21Fee = MaintnetConstant.tipTRC21Fee - TIPIncreaseMasternodes = MaintnetConstant.tipIncreaseMasternodes - BerlinBlock = MaintnetConstant.berlinBlock - LondonBlock = MaintnetConstant.londonBlock - MergeBlock = MaintnetConstant.mergeBlock - ShanghaiBlock = MaintnetConstant.shanghaiBlock - BlockNumberGas50x = MaintnetConstant.blockNumberGas50x - TIPXDCXMinerDisable = MaintnetConstant.tipXDCXMinerDisable - TIPXDCXReceiverDisable = MaintnetConstant.tipXDCXReceiverDisable - Eip1559Block = MaintnetConstant.eip1559Block - CancunBlock = MaintnetConstant.cancunBlock - TIPUpgradeReward = MaintnetConstant.tipUpgradeReward - TipUpgradePenalty = MaintnetConstant.tipUpgradePenalty - TIPEpochHalving = MaintnetConstant.tipEpochHalving + TIP2019Block = MainnetConstant.tip2019Block + TIPSigning = MainnetConstant.tipSigning + TIPRandomize = MainnetConstant.tipRandomize + TIPNoHalvingMNReward = MainnetConstant.tipNoHalvingMNReward + TIPXDCX = MainnetConstant.tipXDCX + TIPXDCXLending = MainnetConstant.tipXDCXLending + TIPXDCXCancellationFee = MainnetConstant.tipXDCXCancellationFee + TIPTRC21Fee = MainnetConstant.tipTRC21Fee + TIPIncreaseMasternodes = MainnetConstant.tipIncreaseMasternodes + BerlinBlock = MainnetConstant.berlinBlock + LondonBlock = MainnetConstant.londonBlock + MergeBlock = MainnetConstant.mergeBlock + ShanghaiBlock = MainnetConstant.shanghaiBlock + BlockNumberGas50x = MainnetConstant.blockNumberGas50x + TIPXDCXMinerDisable = MainnetConstant.tipXDCXMinerDisable + TIPXDCXReceiverDisable = MainnetConstant.tipXDCXReceiverDisable + Eip1559Block = MainnetConstant.eip1559Block + CancunBlock = MainnetConstant.cancunBlock + TIPUpgradeReward = MainnetConstant.tipUpgradeReward + TipUpgradePenalty = MainnetConstant.tipUpgradePenalty + TIPEpochHalving = MainnetConstant.tipEpochHalving - TRC21IssuerSMC = MaintnetConstant.trc21IssuerSMC - XDCXListingSMC = MaintnetConstant.xdcxListingSMC - RelayerRegistrationSMC = MaintnetConstant.relayerRegistrationSMC - LendingRegistrationSMC = MaintnetConstant.lendingRegistrationSMC + TRC21IssuerSMC = MainnetConstant.trc21IssuerSMC + XDCXListingSMC = MainnetConstant.xdcxListingSMC + RelayerRegistrationSMC = MainnetConstant.relayerRegistrationSMC + LendingRegistrationSMC = MainnetConstant.lendingRegistrationSMC - ignoreSignerCheckBlockArray = MaintnetConstant.ignoreSignerCheckBlockArray - blacklist = MaintnetConstant.blacklist + ignoreSignerCheckBlockArray = MainnetConstant.ignoreSignerCheckBlockArray + blacklist = MainnetConstant.blacklist ) func IsIgnoreSignerCheckBlock(blockNumber uint64) bool { @@ -129,7 +129,7 @@ func IsInBlacklist(address *Address) bool { func CopyConstants(chainID uint64) { var c *constant switch chainID { - case MaintnetConstant.chainID: + case MainnetConstant.chainID: return case TestnetConstant.chainID: c = &TestnetConstant diff --git a/common/constants.mainnet.go b/common/constants.mainnet.go index 8d00b7b486..b4123fee70 100644 --- a/common/constants.mainnet.go +++ b/common/constants.mainnet.go @@ -4,7 +4,7 @@ import ( "math/big" ) -var MaintnetConstant = constant{ +var MainnetConstant = constant{ chainID: 50, blackListHFNumber: 38383838, maxMasternodesV2: 108, diff --git a/consensus/XDPoS/engines/engine_v2/vote.go b/consensus/XDPoS/engines/engine_v2/vote.go index a622b91fff..c7a8cdec82 100644 --- a/consensus/XDPoS/engines/engine_v2/vote.go +++ b/consensus/XDPoS/engines/engine_v2/vote.go @@ -322,7 +322,7 @@ func (x *XDPoS_v2) hygieneVotePool() { } // Clean up any votes round that is 10 rounds older if keyedRound < int64(round)-utils.PoolHygieneRound { - log.Debug("[hygieneVotePool] Cleaned vote poll at round", "Round", keyedRound, "currentRound", round, "Key", k) + log.Debug("[hygieneVotePool] Cleaned vote pool at round", "Round", keyedRound, "currentRound", round, "Key", k) x.votePool.ClearByPoolKey(k) } } diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 588296a35e..da873dd0b2 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -28,7 +28,7 @@ import ( ) var ( - // ErrBadProDAOExtra is returned if a header doens't support the DAO fork on a + // ErrBadProDAOExtra is returned if a header doesn't support the DAO fork on a // pro-fork client. ErrBadProDAOExtra = errors.New("bad DAO pro-fork extra-data") diff --git a/core/txpool/journal.go b/core/txpool/journal.go index 88550a56b2..bf35ecaf12 100644 --- a/core/txpool/journal.go +++ b/core/txpool/journal.go @@ -57,7 +57,7 @@ func newTxJournal(path string) *journal { // load parses a transaction journal dump from disk, loading its contents into // the specified pool. func (journal *journal) load(add func([]*types.Transaction) []error) error { - // Skip the parsing if the journal file doens't exist at all + // Skip the parsing if the journal file doesn't exist at all if !common.FileExist(journal.path) { return nil } diff --git a/core/txpool/lending_tx_journal.go b/core/txpool/lending_tx_journal.go index e56ab70051..f484ff9e12 100644 --- a/core/txpool/lending_tx_journal.go +++ b/core/txpool/lending_tx_journal.go @@ -43,7 +43,7 @@ func newLendingTxJournal(path string) *lendingtxJournal { // load parses a transaction journal dump from disk, loading its contents into // the specified pool. func (journal *lendingtxJournal) load(add func(*types.LendingTransaction) error) error { - // Skip the parsing if the journal file doens't exist at all + // Skip the parsing if the journal file doesn't exist at all if !common.FileExist(journal.path) { return nil } diff --git a/core/txpool/list.go b/core/txpool/list.go index 5dbd1ab757..9abd002025 100644 --- a/core/txpool/list.go +++ b/core/txpool/list.go @@ -495,7 +495,7 @@ func (h *priceHeap) Pop() interface{} { } // pricedList is a price-sorted heap to allow operating on transactions pool -// contents in a price-incrementing way. It's built opon the all transactions +// contents in a price-incrementing way. It's built upon all transactions // in txpool but only interested in the remote part. It means only remote transactions // will be considered for tracking, sorting, eviction, etc. // diff --git a/core/txpool/order_tx_journal.go b/core/txpool/order_tx_journal.go index d6689d611a..5c6e0fa09d 100644 --- a/core/txpool/order_tx_journal.go +++ b/core/txpool/order_tx_journal.go @@ -43,7 +43,7 @@ func newOrderTxJournal(path string) *ordertxJournal { // load parses a transaction journal dump from disk, loading its contents into // the specified pool. func (journal *ordertxJournal) load(add func(*types.OrderTransaction) error) error { - // Skip the parsing if the journal file doens't exist at all + // Skip the parsing if the journal file doesn't exist at all if !common.FileExist(journal.path) { return nil } diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index d92aa655a3..31fe31cc56 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -469,13 +469,13 @@ func recoverPlain(sighash common.Hash, R, S, Vb *big.Int, homestead bool) (commo if !crypto.ValidateSignatureValues(V, R, S, homestead) { return common.Address{}, ErrInvalidSig } - // encode the snature in uncompressed format + // encode the signature in uncompressed format r, s := R.Bytes(), S.Bytes() sig := make([]byte, crypto.SignatureLength) copy(sig[32-len(r):32], r) copy(sig[64-len(s):64], s) sig[64] = V - // recover the public key from the snature + // recover the public key from the signature pub, err := crypto.Ecrecover(sighash[:], sig) if err != nil { return common.Address{}, err diff --git a/params/config.go b/params/config.go index a420680c6f..861b8b7852 100644 --- a/params/config.go +++ b/params/config.go @@ -240,8 +240,8 @@ var ( Gap: 450, FoudationWalletAddr: common.HexToAddress("xdc92a289fe95a85c53b8d0d113cbaef0c1ec98ac65"), V2: &V2{ - SwitchEpoch: common.MaintnetConstant.TIPV2SwitchBlock.Uint64() / 900, - SwitchBlock: common.MaintnetConstant.TIPV2SwitchBlock, + SwitchEpoch: common.MainnetConstant.TIPV2SwitchBlock.Uint64() / 900, + SwitchBlock: common.MainnetConstant.TIPV2SwitchBlock, CurrentConfig: MainnetV2Configs[0], AllConfigs: MainnetV2Configs, },