EthStorage Mining

cmd/geth/main.go

@@ -133,6 +133,9 @@ var (
 		utils.MinerNoVerifyFlag,
 		utils.SstorageShardFlag,
 		utils.SstorageFileFlag,
+		utils.SstorageMineFlag,
+		utils.SstorageTXSignerFlag,
+		utils.SstorageMinerContractFlag,
 		utils.NATFlag,
 		utils.NoDiscoverFlag,
 		utils.DiscoveryV5Flag,

cmd/sstorage/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
 	"io"
 	"os"
@@ -15,7 +16,7 @@ import (
 )
 
 var (
-	chunkLen  *uint64
+	kvLen     *uint64
 	miner     *string
 	filenames *[]string
 
@@ -62,8 +63,14 @@ var ShardWriteCmd = &cobra.Command{
 	Run:   runShardWrite,
 }
 
+var CheckEmtpyKVsCmd = &cobra.Command{
+	Use:   "check_empty_kvs",
+	Short: "check empty Kvs have been filled",
+	Run:   runCheckEmtpyKVs,
+}
+
 func init() {
-	chunkLen = CreateCmd.Flags().Uint64("len", 0, "Chunk idx len to create")
+	kvLen = CreateCmd.Flags().Uint64("kv_len", 0, "kv idx len to create")
 
 	filenames = rootCmd.PersistentFlags().StringArray("filename", []string{}, "Data filename")
 	miner = rootCmd.PersistentFlags().String("miner", "", "miner address")
@@ -110,9 +117,9 @@ func runCreate(cmd *cobra.Command, args []string) {
 	}
 	minerAddr := common.HexToAddress(*miner)
 
-	log.Info("Creating data file", "chunkIdx", *chunkIdx, "chunkLen", *chunkLen, "miner", minerAddr, "encodeType", *encodeType)
+	log.Info("Creating data file", "kvIdx", *kvIdx, "kvLen", *kvLen, "miner", minerAddr, "encodeType", *encodeType)
 
-	_, err := sstorage.Create((*filenames)[0], *chunkIdx, *chunkLen, 0, *kvSize, *encodeType, minerAddr)
+	_, err := sstorage.Create((*filenames)[0], *kvIdx, *kvLen, 0, *kvSize, *encodeType, minerAddr)
 	if err != nil {
 		log.Crit("create failed", "error", err)
 	}
@@ -231,6 +238,40 @@ func runShardWrite(cmd *cobra.Command, args []string) {
 	log.Info("Write value", "kvIdx", *kvIdx, "bytes", len(bs))
 }
 
+func runCheckEmtpyKVs(cmd *cobra.Command, args []string) {
+	setupLogger()
+
+	if len(*filenames) != 1 {
+		log.Crit("must provide a filename")
+	}
+
+	var err error
+	var df *sstorage.DataFile
+	df, err = sstorage.OpenDataFile((*filenames)[0])
+	if err != nil {
+		log.Crit("open failed", "error", err)
+	}
+
+	commit := common.Hash{}
+	chunkPerKv := df.KVSize() / sstorage.CHUNK_SIZE
+	startChunkIdx := (*kvIdx) * chunkPerKv
+	log.Info("start to verify", "kvidx", *kvIdx, "startChunkIdx", startChunkIdx, "EndChunkIdx", df.EndChunkIdx())
+	for chunkIdx := startChunkIdx; chunkIdx < df.EndChunkIdx(); chunkIdx++ {
+		maskedChunkData, err := df.Read(chunkIdx, int(sstorage.CHUNK_SIZE))
+		if err != nil {
+			log.Warn("read sstorage file failed", "chunkidx", chunkIdx, "error", err)
+		}
+		encodeKey := sstorage.CalcEncodeKey(commit, chunkIdx, df.Miner())
+		unmaskedChunk := sstorage.DecodeChunk(maskedChunkData, 2, encodeKey)
+		if bytes.Compare(unmaskedChunk, make([]byte, sstorage.CHUNK_SIZE)) != 0 {
+			log.Warn("verify empty chunk", "chunkidx", chunkIdx)
+		}
+		if chunkIdx%(chunkPerKv*100) == 0 {
+			log.Info("verify verify state", "chunkidx", chunkIdx)
+		}
+	}
+}
+
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "sstorage",
@@ -243,6 +284,7 @@ func init() {
 	rootCmd.AddCommand(ChunkWriteCmd)
 	rootCmd.AddCommand(ShardReadCmd)
 	rootCmd.AddCommand(ShardWriteCmd)
+	rootCmd.AddCommand(CheckEmtpyKVsCmd)
 }
 
 func main() {

cmd/utils/flags.go

@@ -578,6 +578,18 @@ var (
 		Usage: "Add sharded storage data file",
 		Value: nil,
 	}
+	SstorageMineFlag = cli.BoolFlag{
+		Name:  "sstorage.mine",
+		Usage: "Enable sstorage mining",
+	}
+	SstorageTXSignerFlag = cli.StringFlag{
+		Name:  "sstorage.txsigner",
+		Usage: "Account used to sign tx submit to sstorage miner contract",
+	}
+	SstorageMinerContractFlag = cli.StringFlag{
+		Name:  "sstorage.minercontract",
+		Usage: "Sstorage miner contract",
+	}
 	// Logging and debug settings
 	EthStatsURLFlag = cli.StringFlag{
 		Name:  "ethstats",
@@ -1137,6 +1149,15 @@ func setSstorage(ctx *cli.Context, cfg *ethconfig.Config) {
 	if ctx.GlobalIsSet(SstorageFileFlag.Name) {
 		cfg.SstorageFiles = ctx.GlobalStringSlice(SstorageFileFlag.Name)
 	}
+	if ctx.GlobalIsSet(SstorageMineFlag.Name) {
+		cfg.SstorageMine = ctx.GlobalBool(SstorageMineFlag.Name)
+	}
+	if ctx.GlobalIsSet(SstorageTXSignerFlag.Name) {
+		cfg.SstorageTXSigner = ctx.GlobalString(SstorageTXSignerFlag.Name)
+	}
+	if ctx.GlobalIsSet(SstorageMinerContractFlag.Name) {
+		cfg.SstorageMinerContract = ctx.GlobalString(SstorageMinerContractFlag.Name)
+	}
 
 	sstorage.InitializeConfig()
 	for _, s := range cfg.SstorageShards {

consensus/tendermint/gov/gov.go

@@ -101,7 +101,7 @@ func (g *Governance) NextValidatorsAndPowersForProposal() ([]common.Address, []u
 		return nil, nil, 0, common.Hash{}, err
 	}
 
-	validators, powers, err := g.getValidatorsAndPowersFromContract(header.Hash())
+	validators, powers, err := g.getValidatorsAndPowersFromContract(header.Number())
 	if err != nil {
 		return nil, nil, 0, common.Hash{}, err
 	}
@@ -131,7 +131,7 @@ func (g *Governance) NextValidatorsAndPowersAt(remoteChainNumber uint64, hash co
 		fmt.Errorf("block hash mismatch", "remoteChainNumber hash", header.Hash(), "hash", hash)
 	}
 
-	validators, powers, err := g.getValidatorsAndPowersFromContract(hash)
+	validators, powers, err := g.getValidatorsAndPowersFromContract(header.Number())
 	if err != nil {
 		return nil, nil, err
 	}
@@ -141,7 +141,7 @@ func (g *Governance) NextValidatorsAndPowersAt(remoteChainNumber uint64, hash co
 }
 
 // getValidatorsAndPowersFromContract get next validators from contract
-func (g *Governance) getValidatorsAndPowersFromContract(blockHash common.Hash) ([]common.Address, []uint64, error) {
+func (g *Governance) getValidatorsAndPowersFromContract(blockNumber *big.Int) ([]common.Address, []uint64, error) {
 	data, err := g.validatorSetABI.Pack(contractFunc_GetValidator)
 	if err != nil {
 		return nil, nil, err
@@ -154,7 +154,7 @@ func (g *Governance) getValidatorsAndPowersFromContract(blockHash common.Hash) (
 		Gas:  gas,
 		Data: msgData,
 	}
-	result, err := g.client.CallContractAtHash(g.ctx, msg, blockHash)
+	result, err := g.client.CallContract(g.ctx, msg, blockNumber)
 	if err != nil {
 		return nil, nil, err
 	}