forked from ethereum/go-ethereum
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request ethereum#41 from lochjin/v1.14.2-qng
V1.14.2 qng
- Loading branch information
Showing
14 changed files
with
292 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package legacypool | ||
|
|
||
| import ( | ||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/core/types" | ||
| ) | ||
|
|
||
| func (pool *LegacyPool) RemoveTx(hash common.Hash, outofbound bool) { | ||
| pool.mu.Lock() | ||
| defer pool.mu.Unlock() | ||
| pool.removeTx(hash, outofbound, true) | ||
| } | ||
|
|
||
| func (pool *LegacyPool) All() *lookup { | ||
| return pool.all | ||
| } | ||
|
|
||
| func (pool *LegacyPool) AddRemotesSync(txs []*types.Transaction) []error { | ||
| return pool.addRemotesSync(txs) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package txpool | ||
|
|
||
| func (p *TxPool) Subpools() []SubPool { | ||
| return p.subpools | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // Copyright (c) 2017-2022 The qitmeer developers | ||
|
|
||
| package ethereum | ||
|
|
||
| import ( | ||
| "github.com/ethereum/go-ethereum/internal/flags" | ||
| "github.com/ethereum/go-ethereum/internal/web3ext" | ||
| "github.com/urfave/cli/v2" | ||
| "math/big" | ||
| ) | ||
|
|
||
| var Modules = web3ext.Modules | ||
|
|
||
| func GlobalBig(ctx *cli.Context, name string) *big.Int { | ||
| return flags.GlobalBig(ctx, name) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package miner | ||
|
|
||
| import ( | ||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/core/state" | ||
| "github.com/ethereum/go-ethereum/core/txpool" | ||
| "github.com/ethereum/go-ethereum/core/types" | ||
| "github.com/holiman/uint256" | ||
| "math/big" | ||
| ) | ||
|
|
||
| type IMiner interface { | ||
| SetExtra(extra []byte) error | ||
| Pending() (*types.Block, types.Receipts, *state.StateDB) | ||
| SetGasCeil(ceil uint64) | ||
| SetGasTip(tip *big.Int) error | ||
| BuildPayload(args *BuildPayloadArgs) (*Payload, error) | ||
| } | ||
|
|
||
| type TransactionsByPriceAndNonce interface { | ||
| Peek() (*txpool.LazyTransaction, *uint256.Int) | ||
| Shift() | ||
| Pop() | ||
| } | ||
|
|
||
| func NewTransactionsByPriceAndNonce(signer types.Signer, txs map[common.Address][]*txpool.LazyTransaction, baseFee *big.Int) TransactionsByPriceAndNonce { | ||
| return newTransactionsByPriceAndNonce(signer, txs, baseFee) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,187 @@ | ||
| package params | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "math/big" | ||
| ) | ||
|
|
||
| type MeerChainConfig struct { | ||
| ChainID *big.Int // chainId identifies the current chain and is used for replay protection | ||
| } | ||
|
|
||
| var ( | ||
| QngMainnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(813), | ||
| } | ||
| QngTestnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(8131), | ||
| } | ||
| QngMixnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(8132), | ||
| } | ||
| QngPrivnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(8133), | ||
| } | ||
|
|
||
| AmanaChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(8134), | ||
| } | ||
| AmanaTestnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(81341), | ||
| } | ||
| AmanaMixnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(81342), | ||
| } | ||
| AmanaPrivnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(81343), | ||
| } | ||
|
|
||
| FlanaChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(8135), | ||
| } | ||
| FlanaTestnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(81351), | ||
| } | ||
| FlanaMixnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(81352), | ||
| } | ||
| FlanaPrivnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(81353), | ||
| } | ||
|
|
||
| MizanaChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(8136), | ||
| } | ||
| MizanaTestnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(81361), | ||
| } | ||
| MizanaMixnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(81362), | ||
| } | ||
| MizanaPrivnetChainConfig = &MeerChainConfig{ | ||
| ChainID: big.NewInt(81363), | ||
| } | ||
| ) | ||
|
|
||
| func init() { | ||
| NetworkNames[QngMainnetChainConfig.ChainID.String()] = "qng" | ||
| NetworkNames[QngTestnetChainConfig.ChainID.String()] = "qng-test" | ||
| NetworkNames[QngMixnetChainConfig.ChainID.String()] = "qng-mix" | ||
| NetworkNames[QngPrivnetChainConfig.ChainID.String()] = "qng-priv" | ||
|
|
||
| NetworkNames[AmanaChainConfig.ChainID.String()] = "amana" | ||
| NetworkNames[AmanaTestnetChainConfig.ChainID.String()] = "amana-test" | ||
| NetworkNames[AmanaMixnetChainConfig.ChainID.String()] = "amana-mix" | ||
| NetworkNames[AmanaPrivnetChainConfig.ChainID.String()] = "amana-priv" | ||
|
|
||
| NetworkNames[FlanaChainConfig.ChainID.String()] = "flana" | ||
| NetworkNames[FlanaTestnetChainConfig.ChainID.String()] = "flana-test" | ||
| NetworkNames[FlanaMixnetChainConfig.ChainID.String()] = "flana-mix" | ||
| NetworkNames[FlanaPrivnetChainConfig.ChainID.String()] = "flana-priv" | ||
|
|
||
| NetworkNames[MizanaChainConfig.ChainID.String()] = "mizana" | ||
| NetworkNames[MizanaTestnetChainConfig.ChainID.String()] = "mizana-test" | ||
| NetworkNames[MizanaMixnetChainConfig.ChainID.String()] = "mizana-mix" | ||
| NetworkNames[MizanaPrivnetChainConfig.ChainID.String()] = "mizana-priv" | ||
| } | ||
|
|
||
| func IsQngNetwork(chainID *big.Int) bool { | ||
| if chainID.Cmp(QngMainnetChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(QngTestnetChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(QngMixnetChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(QngPrivnetChainConfig.ChainID) == 0 { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func IsAmanaNetwork(chainID *big.Int) bool { | ||
| if chainID.Cmp(AmanaChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(AmanaTestnetChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(AmanaMixnetChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(AmanaPrivnetChainConfig.ChainID) == 0 { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func IsFlanaNetwork(chainID *big.Int) bool { | ||
| if chainID.Cmp(FlanaChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(FlanaTestnetChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(FlanaMixnetChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(FlanaPrivnetChainConfig.ChainID) == 0 { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func IsMizanaNetwork(chainID *big.Int) bool { | ||
| if chainID.Cmp(MizanaChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(MizanaTestnetChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(MizanaMixnetChainConfig.ChainID) == 0 || | ||
| chainID.Cmp(MizanaPrivnetChainConfig.ChainID) == 0 { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func QngEIPsBanner(banner string, c *ChainConfig) string { | ||
| banner += "\n" | ||
|
|
||
| // Create a list of forks with a short description of them. Forks that only | ||
| // makes sense for mainnet should be optional at printing to avoid bloating | ||
| // the output for testnets and private networks. | ||
| banner += "Pre-Merge hard forks (block based):\n" | ||
| banner += fmt.Sprintf(" - Homestead: #%-8v (EIP-606 Requires:EIP-2, EIP-7, EIP-8)\n", c.HomesteadBlock) | ||
| if c.DAOForkBlock != nil { | ||
| banner += fmt.Sprintf(" - DAO Fork: #%-8v (EIP-779 Requires:EIP-606)\n", c.DAOForkBlock) | ||
| } | ||
| banner += fmt.Sprintf(" - Tangerine Whistle (EIP 150): #%-8v (EIP-608 Requires:EIP-150, EIP-779)\n", c.EIP150Block) | ||
| banner += fmt.Sprintf(" - Spurious Dragon/1 (EIP 155): #%-8v (EIP-607 Requires:EIP-155, EIP-160, EIP-161, EIP-170, EIP-608)\n", c.EIP155Block) | ||
| banner += fmt.Sprintf(" - Spurious Dragon/2 (EIP 158): #%-8v (EIP-607 Requires:EIP-155, EIP-160, EIP-161, EIP-170, EIP-608)\n", c.EIP155Block) | ||
| banner += fmt.Sprintf(" - Byzantium: #%-8v (EIP-609 Requires:EIP-100, EIP-140, EIP-196, EIP-197, EIP-198, EIP-211, EIP-214, EIP-607, EIP-649, EIP-658)\n", c.ByzantiumBlock) | ||
| banner += fmt.Sprintf(" - Constantinople: #%-8v (EIP-1013 Requires:EIP-145, EIP-609, EIP-1014, EIP-1052, EIP-1234, EIP-1283)\n", c.ConstantinopleBlock) | ||
| banner += fmt.Sprintf(" - Petersburg: #%-8v (EIP-1716 Requires:EIP-1013, EIP-1283)\n", c.PetersburgBlock) | ||
| banner += fmt.Sprintf(" - Istanbul: #%-8v (EIP-1679 Requires:EIP-152, EIP-1108, EIP-1344, EIP-1716, EIP-1884, EIP-2028, EIP-2200)\n", c.IstanbulBlock) | ||
| if c.MuirGlacierBlock != nil { | ||
| banner += fmt.Sprintf(" - Muir Glacier: #%-8v (EIP-2387 Requires:EIP-1679, EIP-2384)\n", c.MuirGlacierBlock) | ||
| } | ||
| banner += fmt.Sprintf(" - Berlin: #%-8v (EIP-2565 EIP-2929 EIP-2718 EIP-2930 Requires:EIP-198)\n", c.BerlinBlock) | ||
| banner += fmt.Sprintf(" - London: #%-8v (EIP-1559 EIP-3198 EIP-3529 EIP-3541 EIP-3554 Requires:EIP-2718, EIP-2930, EIP-2200, EIP-2929, EIP-2930)\n", c.LondonBlock) | ||
| if c.ArrowGlacierBlock != nil { | ||
| banner += fmt.Sprintf(" - Arrow Glacier: #%-8v (EIP-4345)\n", c.ArrowGlacierBlock) | ||
| } | ||
| if c.GrayGlacierBlock != nil { | ||
| banner += fmt.Sprintf(" - Gray Glacier: #%-8v (EIP-5133)\n", c.GrayGlacierBlock) | ||
| } | ||
| banner += "\n" | ||
|
|
||
| // Add a special section for the merge as it's non-obvious | ||
| if c.TerminalTotalDifficulty == nil { | ||
| banner += "The Merge is not yet available for this network!\n" | ||
| banner += " - Hard-fork specification: EIP-3675 EIP-4399 Requires:EIP-2124\n" | ||
| } else { | ||
| banner += "Merge configured:\n" | ||
| banner += " - Hard-fork specification: EIP-3675 EIP-4399 Requires:EIP-2124\n" | ||
| banner += fmt.Sprintf(" - Network known to be merged: %v\n", c.TerminalTotalDifficultyPassed) | ||
| banner += fmt.Sprintf(" - Total terminal difficulty: %v\n", c.TerminalTotalDifficulty) | ||
| if c.MergeNetsplitBlock != nil { | ||
| banner += fmt.Sprintf(" - Merge netsplit block: #%-8v\n", c.MergeNetsplitBlock) | ||
| } | ||
| } | ||
| banner += "\n" | ||
|
|
||
| // Create a list of forks post-merge | ||
| banner += "Post-Merge hard forks (timestamp based):\n" | ||
| if c.ShanghaiTime != nil { | ||
| banner += fmt.Sprintf(" - Shanghai: @%-10v (EIP-3651 EIP-3855 EIP-3860 EIP-4895 EIP-6049 Requires:EIP-2929, EIP-170)\n", *c.ShanghaiTime) | ||
| } | ||
| if c.CancunTime != nil { | ||
| banner += fmt.Sprintf(" - Cancun: @%-10v\n", *c.CancunTime) | ||
| } | ||
| if c.PragueTime != nil { | ||
| banner += fmt.Sprintf(" - Prague: @%-10v\n", *c.PragueTime) | ||
| } | ||
|
|
||
| return banner | ||
| } |
Oops, something went wrong.