Merge pull request ethereum#412 from dinhln89/rollback

Add rollback flag command for rollback chain at block hash.
ngtuna · Jan 22, 2019 · ff61e1b · ff61e1b
2 parents 0c19b3b + 19c6b84
commit ff61e1b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 4 deletions.
diff --git a/cmd/tomo/config.go b/cmd/tomo/config.go
@@ -157,6 +157,11 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, tomoConfig) {
  common.IsTestnet = true
  }
 
+ // Check rollback hash exist.
+ if rollbackHash := ctx.GlobalString(utils.RollbackFlag.Name); rollbackHash != "" {
+ common.RollbackHash = common.HexToHash(rollbackHash)
+ }
+
  // read passwords from environment
  passwords := []string{}
  for _, env := range cfg.Account.Passwords {

diff --git a/cmd/tomo/main.go b/cmd/tomo/main.go
@@ -123,6 +123,7 @@ var (
  configFileFlag,
  utils.AnnounceTxsFlag,
  utils.StoreRewardFlag,
+ utils.RollbackFlag,
  }
 
  rpcFlags = []cli.Flag{

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -112,6 +112,12 @@ func NewApp(gitCommit, usage string) *cli.App {
 // are the same for all commands.
 
 var (
+ // Tomo flags.
+ RollbackFlag = cli.StringFlag{
+ Name: "rollback",
+ Usage: "Rollback chain at hash",
+ Value: "",
+ }
  // General settings
  AnnounceTxsFlag = cli.BoolFlag{
  Name: "announce-txs",

diff --git a/common/constants.go b/common/constants.go
@@ -23,3 +23,4 @@ const (
 var TIP2019Block = big.NewInt(1050000)
 var IsTestnet bool = false
 var StoreRewardFolder string
+var RollbackHash Hash
diff --git a/contracts/test.go b/contracts/test.go
@@ -1,4 +1,5 @@
 package contracts
+
 //
 //import (
 // "fmt"

diff --git a/contracts/validator/validator_test.go b/contracts/validator/validator_test.go
@@ -17,11 +17,11 @@ package validator
 
 import (
  "context"
+ "encoding/json"
  "math/big"
+ "math/rand"
  "testing"
  "time"
- "math/rand"
- "encoding/json"
 
  "github.com/ethereum/go-ethereum/accounts/abi/bind"
  "github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
@@ -248,4 +248,4 @@ func GetCandidatesOwnerBySigner(validator *contractValidator.TomoValidator, sign
  }
 
  return owner
-}
+}
diff --git a/contracts/validatorReader.go b/contracts/validatorReader.go
@@ -10,7 +10,7 @@ import (
 )
 
 var (
- slotValidatorMapping  = map[string]uint64{
+ slotValidatorMapping = map[string]uint64{
  "withdrawsState": 0,
  "validatorsState": 1,
  "voters": 2,

diff --git a/eth/backend.go b/eth/backend.go
@@ -170,6 +170,17 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
  }
  eth.txPool = core.NewTxPool(config.TxPool, eth.chainConfig, eth.blockchain)
 
+ if common.RollbackHash != common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000") {
+ curBlock := eth.blockchain.CurrentBlock()
+ prevBlock := eth.blockchain.GetBlockByHash(common.RollbackHash)
+
+ if curBlock.NumberU64() > prevBlock.NumberU64() {
+ for ; curBlock != nil && curBlock.NumberU64() != prevBlock.NumberU64(); curBlock = eth.blockchain.GetBlock(curBlock.ParentHash(), curBlock.NumberU64()-1) {
+ eth.blockchain.Rollback([]common.Hash{curBlock.Hash()})
+ }
+ }
+ }
+
  if eth.protocolManager, err = NewProtocolManager(eth.chainConfig, config.SyncMode, config.NetworkId, eth.eventMux, eth.txPool, eth.engine, eth.blockchain, chainDb); err != nil {
  return nil, err
  }

diff --git a/params/config.go b/params/config.go
@@ -216,6 +216,7 @@ func (c *ChainConfig) IsConstantinople(num *big.Int) bool {
 func (c *ChainConfig) IsTIP2019(num *big.Int) bool {
  return isForked(common.TIP2019Block, num)
 }
+
 // GasTable returns the gas table corresponding to the current phase (homestead or homestead reprice).
 //
 // The returned GasTable's fields shouldn't, under any circumstances, be changed.