From f9d8738f2a1a8df843db5233033ca7b77a4e0b96 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Thu, 20 Nov 2025 14:56:27 +0800 Subject: [PATCH] all: fix typos, close XFN-23 #1725 --- common/constants.all.go | 52 +++++++++++------------ 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, 37 insertions(+), 37 deletions(-) diff --git a/common/constants.all.go b/common/constants.all.go index ad156929c6..66bc618bc5 100644 --- a/common/constants.all.go +++ b/common/constants.all.go @@ -74,35 +74,35 @@ type constant struct { // variables for specific networks, copy values from maintnet 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 + 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 - 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 { diff --git a/common/constants.mainnet.go b/common/constants.mainnet.go index 600cc9c8fb..33c7bbfa0f 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 2fed93f392..85219d9818 100644 --- a/consensus/XDPoS/engines/engine_v2/vote.go +++ b/consensus/XDPoS/engines/engine_v2/vote.go @@ -286,7 +286,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 e8af25a69a..5d36102a08 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -27,7 +27,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 871807729c..33762ab7be 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 _, err := os.Stat(journal.path); os.IsNotExist(err) { return nil } diff --git a/core/txpool/lending_tx_journal.go b/core/txpool/lending_tx_journal.go index fb9b487ac5..a59fbf2073 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 _, err := os.Stat(journal.path); os.IsNotExist(err) { return nil } diff --git a/core/txpool/list.go b/core/txpool/list.go index fbeb3d144d..a96f495d63 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 the 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 cbcb49c7b7..752f3a2430 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 _, err := os.Stat(journal.path); os.IsNotExist(err) { return nil } diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 5198dac87b..a9117ad0a7 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 1517fa804b..35ee36f1ed 100644 --- a/params/config.go +++ b/params/config.go @@ -195,8 +195,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, },