Compare commits
3 Commits
v1.3.11
...
fix-v1.3.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
05c1f1438c | ||
|
|
4b5eebead1 | ||
|
|
b5603d2e98 |
@@ -199,7 +199,7 @@ Delete the selected BLS account from the BLS wallet.`,
|
|||||||
Name: "generate-proof",
|
Name: "generate-proof",
|
||||||
Usage: "Generate ownership proof for the selected BLS account from the BLS wallet",
|
Usage: "Generate ownership proof for the selected BLS account from the BLS wallet",
|
||||||
Action: blsAccountGenerateProof,
|
Action: blsAccountGenerateProof,
|
||||||
ArgsUsage: "<operator address> <BLS pubkey>",
|
ArgsUsage: "<BLS pubkey>",
|
||||||
Category: "BLS ACCOUNT COMMANDS",
|
Category: "BLS ACCOUNT COMMANDS",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
utils.DataDirFlag,
|
utils.DataDirFlag,
|
||||||
|
|||||||
@@ -202,10 +202,6 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
|
|||||||
v := ctx.Uint64(utils.OverrideFeynman.Name)
|
v := ctx.Uint64(utils.OverrideFeynman.Name)
|
||||||
cfg.Eth.OverrideFeynman = &v
|
cfg.Eth.OverrideFeynman = &v
|
||||||
}
|
}
|
||||||
if ctx.IsSet(utils.OverrideFeynmanFix.Name) {
|
|
||||||
v := ctx.Uint64(utils.OverrideFeynmanFix.Name)
|
|
||||||
cfg.Eth.OverrideFeynmanFix = &v
|
|
||||||
}
|
|
||||||
backend, _ := utils.RegisterEthService(stack, &cfg.Eth)
|
backend, _ := utils.RegisterEthService(stack, &cfg.Eth)
|
||||||
|
|
||||||
// Configure log filter RPC API.
|
// Configure log filter RPC API.
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ var (
|
|||||||
utils.OverrideCancun,
|
utils.OverrideCancun,
|
||||||
utils.OverrideVerkle,
|
utils.OverrideVerkle,
|
||||||
utils.OverrideFeynman,
|
utils.OverrideFeynman,
|
||||||
utils.OverrideFeynmanFix,
|
|
||||||
utils.EnablePersonal,
|
utils.EnablePersonal,
|
||||||
utils.TxPoolLocalsFlag,
|
utils.TxPoolLocalsFlag,
|
||||||
utils.TxPoolNoLocalsFlag,
|
utils.TxPoolNoLocalsFlag,
|
||||||
|
|||||||
@@ -319,11 +319,6 @@ var (
|
|||||||
Usage: "Manually specify the Feynman fork timestamp, overriding the bundled setting",
|
Usage: "Manually specify the Feynman fork timestamp, overriding the bundled setting",
|
||||||
Category: flags.EthCategory,
|
Category: flags.EthCategory,
|
||||||
}
|
}
|
||||||
OverrideFeynmanFix = &cli.Uint64Flag{
|
|
||||||
Name: "override.feynmanfix",
|
|
||||||
Usage: "Manually specify the FeynmanFix fork timestamp, overriding the bundled setting",
|
|
||||||
Category: flags.EthCategory,
|
|
||||||
}
|
|
||||||
SyncModeFlag = &flags.TextMarshalerFlag{
|
SyncModeFlag = &flags.TextMarshalerFlag{
|
||||||
Name: "syncmode",
|
Name: "syncmode",
|
||||||
Usage: `Blockchain sync mode ("snap" or "full")`,
|
Usage: `Blockchain sync mode ("snap" or "full")`,
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -39,7 +39,9 @@ web3.eth.sendTransaction({
|
|||||||
web3.eth.sendTransaction({
|
web3.eth.sendTransaction({
|
||||||
from: "consensus address of your validator",
|
from: "consensus address of your validator",
|
||||||
to: "0x0000000000000000000000000000000000001000",
|
to: "0x0000000000000000000000000000000000001000",
|
||||||
gas: "1000000",
|
|
||||||
data: "0x04c4fec6"
|
data: "0x04c4fec6"
|
||||||
})
|
})
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -187,7 +187,9 @@ var (
|
|||||||
ShanghaiTime: newUint64(1702972800),
|
ShanghaiTime: newUint64(1702972800),
|
||||||
KeplerTime: newUint64(1702972800),
|
KeplerTime: newUint64(1702972800),
|
||||||
FeynmanTime: newUint64(1710136800),
|
FeynmanTime: newUint64(1710136800),
|
||||||
FeynmanFixTime: newUint64(1711342800),
|
|
||||||
|
// TODO
|
||||||
|
FeynmanFixTime: nil,
|
||||||
|
|
||||||
Parlia: &ParliaConfig{
|
Parlia: &ParliaConfig{
|
||||||
Period: 3,
|
Period: 3,
|
||||||
@@ -224,12 +226,12 @@ var (
|
|||||||
HertzfixBlock: big.NewInt(8),
|
HertzfixBlock: big.NewInt(8),
|
||||||
ShanghaiTime: newUint64(0),
|
ShanghaiTime: newUint64(0),
|
||||||
KeplerTime: newUint64(0),
|
KeplerTime: newUint64(0),
|
||||||
FeynmanTime: newUint64(0),
|
FeynmanTime: _rialto_upgrade_height_,
|
||||||
FeynmanFixTime: newUint64(0),
|
FeynmanFixTime: _rialto_upgrade_height_,
|
||||||
|
|
||||||
Parlia: &ParliaConfig{
|
Parlia: &ParliaConfig{
|
||||||
Period: 3,
|
Period: _rialto_parlia_period_,
|
||||||
Epoch: 200,
|
Epoch: _rialto_parlia_epoch_,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -464,7 +466,7 @@ type ChainConfig struct {
|
|||||||
ShanghaiTime *uint64 `json:"shanghaiTime,omitempty"` // Shanghai switch time (nil = no fork, 0 = already on shanghai)
|
ShanghaiTime *uint64 `json:"shanghaiTime,omitempty"` // Shanghai switch time (nil = no fork, 0 = already on shanghai)
|
||||||
KeplerTime *uint64 `json:"keplerTime,omitempty"` // Kepler switch time (nil = no fork, 0 = already activated)
|
KeplerTime *uint64 `json:"keplerTime,omitempty"` // Kepler switch time (nil = no fork, 0 = already activated)
|
||||||
FeynmanTime *uint64 `json:"feynmanTime,omitempty"` // Feynman switch time (nil = no fork, 0 = already activated)
|
FeynmanTime *uint64 `json:"feynmanTime,omitempty"` // Feynman switch time (nil = no fork, 0 = already activated)
|
||||||
FeynmanFixTime *uint64 `json:"feynmanFixTime,omitempty"` // FeynmanFix switch time (nil = no fork, 0 = already activated)
|
FeynmanFixTime *uint64 `json:"feynmanFixTime,omitempty"` // Feynman switch time (nil = no fork, 0 = already activated)
|
||||||
CancunTime *uint64 `json:"cancunTime,omitempty"` // Cancun switch time (nil = no fork, 0 = already on cancun)
|
CancunTime *uint64 `json:"cancunTime,omitempty"` // Cancun switch time (nil = no fork, 0 = already on cancun)
|
||||||
PragueTime *uint64 `json:"pragueTime,omitempty"` // Prague switch time (nil = no fork, 0 = already on prague)
|
PragueTime *uint64 `json:"pragueTime,omitempty"` // Prague switch time (nil = no fork, 0 = already on prague)
|
||||||
VerkleTime *uint64 `json:"verkleTime,omitempty"` // Verkle switch time (nil = no fork, 0 = already on verkle)
|
VerkleTime *uint64 `json:"verkleTime,omitempty"` // Verkle switch time (nil = no fork, 0 = already on verkle)
|
||||||
|
|||||||
Reference in New Issue
Block a user