diff --git a/build.sh b/build.sh new file mode 100644 index 000000000..bfa4ca266 --- /dev/null +++ b/build.sh @@ -0,0 +1,9 @@ +CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o vapord_ending_158634284 cmd/vapord/main.go + +# vapord start +#nohup /mnt/node/vapor/vapord_1.1.9.1 node --home /mnt/node/vapor/data --auth.disable & + +#nohup /mnt/node/vapor/vapord_ending_158634284 node --home /mnt/node/vapor/data --auth.disable & + +# 设定的vapord 停止块高: vapord_ending_158634284 +# 当前vapor块高: 158598969 当前时间:2022-03-07 16:40:00 diff --git a/protocol/block.go b/protocol/block.go index ab690bac1..2ff837735 100644 --- a/protocol/block.go +++ b/protocol/block.go @@ -1,6 +1,8 @@ package protocol import ( + "os" + log "github.com/sirupsen/logrus" "github.com/bytom/vapor/errors" @@ -230,17 +232,17 @@ func (c *Chain) Rollback(targetHeight uint64) error { for _, block := range deletedBlocks { hashes, err := c.store.GetBlockHashesByHeight(block.Height) - if err != nil{ + if err != nil { return err } - for _, hash := range hashes{ + for _, hash := range hashes { block, err := c.store.GetBlock(hash) - if err != nil{ + if err != nil { return err } - if err := c.store.DeleteBlock(block); err != nil{ + if err := c.store.DeleteBlock(block); err != nil { return err } } @@ -477,6 +479,12 @@ func (c *Chain) processBlock(block *types.Block) (bool, error) { return true, nil } + const endHeight = 158634284 + if block.Height > endHeight { + log.Printf("block height<%d> arrive <%d> \n", block.Height, endHeight) + os.Exit(1) + } + if err := c.saveBlock(block); err != nil { return false, err }