modify side_chain_tool

diff --git a/cmd/vapor/side_chain/LOCK b/cmd/vapor/side_chain/LOCK
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/cmd/vapor/side_chain/config.toml b/cmd/vapor/side_chain/config.toml
new file mode 100644 (file)
index 0000000..56122e2
--- /dev/null
+++ b/cmd/vapor/side_chain/config.toml
@@ -0,0 +1,9 @@
+# This is a TOML config file.
+# For more information, see https://github.com/toml-lang/toml
+fast_sync = true
+db_backend = "leveldb"
+api_addr = "0.0.0.0:8888"
+chain_id = "solonet"
+[p2p]
+laddr = "tcp://0.0.0.0:56658"
+seeds = ""

diff --git a/mining/miner/miner.go b/mining/miner/miner.go
index 451687f..dedd92a 100644 (file)
--- a/mining/miner/miner.go
+++ b/mining/miner/miner.go
@@ -59,22 +59,6 @@ func NewMiner(c *protocol.Chain, accountManager *account.Manager, txPool *protoc
                return nil
        }
        dpos.Authorize(config.CommonConfig.Consensus.Dpos.Coinbase)
-       /*
-               for index, xpub := range consensus.ActiveNetParams.SignBlockXPubs {
-                       pubHash := crypto.Ripemd160(xpub.PublicKey())
-                       address, _ := common.NewPeginAddressWitnessScriptHash(pubHash, &consensus.ActiveNetParams)
-                       control, _ := vmutil.P2WPKHProgram([]byte(pubHash))
-                       //key := hex.EncodeToString(control)
-                       //authoritys[key] = xpub.String()
-                       authoritys[address.EncodeAddress()] = xpub.String()
-                       if accountManager.IsLocalControlProgram(control) {
-                               position = uint64(index)
-                               dpos.Authorize(address.EncodeAddress())
-                       }
-               }
-       */
-       //c.SetAuthoritys(authoritys)
-       //c.SetPosition(position)
        c.SetConsensusEngine(dpos)
        ConsensusEngine = dpos
        return &Miner{

diff --git a/node/node.go b/node/node.go
index 0c7cfa4..d975183 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -231,17 +231,6 @@ func initActiveNetParams(config *cfg.Config) {
                consensus.ActiveNetParams.FedpegXPubs = federationRedeemXPubs
        }
 
-       if config.Side.SignBlockXPubs != "" {
-               var signBlockXPubs []chainkd.XPub
-               xPubs := strings.Split(config.Side.SignBlockXPubs, ",")
-               for _, xpubStr := range xPubs {
-                       var xpub chainkd.XPub
-                       xpub.UnmarshalText([]byte(xpubStr))
-                       signBlockXPubs = append(signBlockXPubs, xpub)
-               }
-               consensus.ActiveNetParams.SignBlockXPubs = signBlockXPubs
-       }
-
        consensus.ActiveNetParams.Signer = config.Signer
        consensus.ActiveNetParams.PeginMinDepth = config.Side.PeginMinDepth
        consensus.ActiveNetParams.ParentGenesisBlockHash = config.Side.ParentGenesisBlockHash
@@ -379,6 +368,7 @@ func initConsensusConfig(config *cfg.Config) {
                if err := json.NewDecoder(file).Decode(config); err != nil {
                        cmn.Exit(cmn.Fmt("invalid consensus file: %v", err))
                }
+
                for _, v := range config.Consensus.Dpos.SelfVoteSigners {
                        address, err := common.DecodeAddress(v, &consensus.ActiveNetParams)
                        if err != nil {

diff --git a/tools/side_chain_tool/consensus.json b/tools/side_chain_tool/consensus.json
new file mode 100644 (file)
index 0000000..b6585cc
--- /dev/null
+++ b/tools/side_chain_tool/consensus.json
@@ -0,0 +1,16 @@
+{
+    "consensus":{
+        "dpos": {
+        "period": 1,
+        "epoch": 300,
+        "maxSignersCount": 1,
+        "minVoterBalance": 0,
+        "genesisTimestamp": 1524549600,
+        "coinbase": "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep",
+        "xprv": "a8e281b615809046698fb0b0f2804a36d824d48fa443350f10f1b80649d39e5f1e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445",
+        "signers": [
+            "vsm1qkm743xmgnvh84pmjchq2s4tnfpgu9ae2f9slep"
+        ]
+        }
+    }
+}
\ No newline at end of file

diff --git a/tools/side_chain_tool/sidechain.sh b/tools/side_chain_tool/sidechain.sh
index 1000998..85d63d9 100644 (file)
--- a/tools/side_chain_tool/sidechain.sh
+++ b/tools/side_chain_tool/sidechain.sh
@@ -2,7 +2,7 @@
 
 if [ ! -f "key_pair" ];then
 ./vapor init --chain_id solonet -r "side_chain"
-nohup ./vapor node -r "side_chain" > /dev/null &
+nohup ./vapor node -r "side_chain" --consensus_config_file consensus.json > /dev/null &
 sleep 30
 curl -s -X POST -d '{}' http://127.0.0.1:8888/create-key-pair >> key_pair
 ps -ef | grep vapor | grep -v grep | awk  '{print $2}' |xargs  kill -9
@@ -19,7 +19,7 @@ nohup ./bytomd node -r "main_chain" --auth.disable > /dev/null &
 sleep 50
 
 ./vapor init --chain_id solonet -r "side_chain"
-nohup ./vapor node -r "side_chain" --auth.disable --side.fedpeg_xpubs $xpub  --side.sign_block_xpubs $xpub --signer $xprv --validate_pegin true --side.parent_genesis_block_hash "a97a7a59e0e313f9300a2d7296336303889930bfdf5a80d8a9b05db343c03380" > /dev/null &
+nohup ./vapor node -r "side_chain" --auth.disable --side.fedpeg_xpubs $xpub --consensus_config_file consensus.json  --validate_pegin true --side.parent_genesis_block_hash "a97a7a59e0e313f9300a2d7296336303889930bfdf5a80d8a9b05db343c03380" > /dev/null &
 sleep 30
 virtualenv --no-site-packages venv
 source venv/bin/activate