Skip to content

P
plugin
Commit 895a68b2 authored by mdj33's avatar mdj33 Committed by vipwzw
Browse files
Options

fix super manager approve bug

parent 25ef0c82
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 20 deletions
plugin/dapp/paracross/cmd/build/testcase.sh
View file @ 895a68b2
......@@ -108,6 +108,7 @@ function para_transfer() {
# para_create_manage_nodegroup
para_create_nodegroup
echo "=========== # config token blacklist ============="
#token precreate
txhash=$(para_configkey "${PARA_CLI}" "token-blacklist" "BTY")
echo "txhash=$txhash"
......@@ -136,7 +137,8 @@ function para_create_nodegroup_test() {
query_tx "${PARA_CLI}" "${txhash}"
status=$(${PARA_CLI} para nodegroup_status -t user.p.para. | jq -r ".status")
if [ "$status" != 1 ]; then
echo "status not apply"
echo "status not apply status=$status"
exit 1
fi
balance=$(${CLI} account balance -a 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 -e paracross | jq -r ".frozen")
if [ "$balance" != "$PARA_COIN_FROZEN" ]; then
......@@ -144,13 +146,15 @@ function para_create_nodegroup_test() {
exit 1
fi
echo "=========== # para chain quit node group ============="
##quit
txhash=$(${PARA_CLI} send para nodegroup -o 3 -a "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4,1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR,1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k,1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs" -c 20 -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b)
echo "tx=$txhash"
query_tx "${PARA_CLI}" "${txhash}"
status=$(${PARA_CLI} para nodegroup_status -t user.p.para. | jq -r ".status")
if [ "$status" != 3 ]; then
echo "status not quit"
echo "status not quit status=$status"
exit 1
fi
balance=$(${CLI} account balance -a 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 -e paracross | jq -r ".balance")
if [ "$balance" != "$PARA_COIN_FROZEN" ]; then
......@@ -163,15 +167,18 @@ function para_create_nodegroup_test() {
function para_create_nodegroup() {
para_create_nodegroup_test
echo "=========== # para chain create node group again ============="
##apply
txhash=$(${PARA_CLI} send para nodegroup -o 1 -a "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4,1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR,1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k,1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs" -c 20 -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b)
echo "tx=$txhash"
query_tx "${PARA_CLI}" "${txhash}"
status=$(${PARA_CLI} para nodegroup_status -t user.p.para. | jq -r ".status")
if [ "$status" != 1 ]; then
echo "status not apply"
echo "status not apply status=$status"
exit 1
fi
echo "=========== # para chain approve node group ============="
##approve
txhash=$(${PARA_CLI} send para nodegroup -o 2 -a "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4, 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR, 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k, 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs," -k 0xc34b5d9d44ac7b754806f761d3d4d2c4fe5214f6b074c19f069c4f5c2a29c8cc)
echo "tx=$txhash"
......@@ -179,22 +186,21 @@ function para_create_nodegroup() {
status=$(${PARA_CLI} para nodegroup_status -t user.p.para. | jq -r ".status")
if [ "$status" != 2 ]; then
echo "status not approve"
echo "status not approve status=$status"
exit 1
fi
addrs=$(${PARA_CLI} para nodegroup_addrs -t user.p.para. | jq -r ".value")
if [ "$addrs" != "[1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs]" ]; then
echo "para node group err"
fi
${PARA_CLI} para nodegroup_addrs -t user.p.para.
echo "=========== # para chain quit node group fail ============="
##quit fail
txhash=$(${PARA_CLI} send para nodegroup -o 3 -a "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4,1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR,1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k,1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs" -k 0x6da92a632ab7deb67d38c0f6560bcfed28167998f6496db64c258d5e8393a81b)
echo "tx=$txhash"
query_tx "${CLI}" "${txhash}"
status=$(${CLI} para nodegroup_status -t user.p.para. | jq -r ".status")
if [ "$status" != 2 ]; then
echo "status quit not approve"
echo "status quit not approve status=$status"
exit 1
fi
balance=$(${CLI} account balance -a 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 -e paracross | jq -r ".frozen")
if [ "$balance" != "$PARA_COIN_FROZEN" ]; then
......
plugin/dapp/paracross/executor/superaccount.go
View file @ 895a68b2
......@@ -313,7 +313,7 @@ func (a *action) superManagerVoteProc(title string) error {
confStopBlocks := conf.GInt("paraConsensusStopBlocks")
data, err := a.exec.paracrossGetHeight(title)
if err != nil {
clog.Info("paracross.nodeVote get consens height", "err", err.Error())
clog.Info("paracross.superManagerVoteProc get consens height", "title",title,"err", err.Error())
return err
}
var consensMainHeight int64
......@@ -322,15 +322,16 @@ func (a *action) superManagerVoteProc(title string) error {
if consensHeight == -1 {
consensMainHeight = status.MainHeight
} else {
stat, err := a.exec.paracrossGetStateTitleHeight(title, consensMainHeight)
stat, err := a.exec.paracrossGetStateTitleHeight(title, consensHeight)
if err != nil {
clog.Info("paracross.superManagerVoteProc get consens title height", "title",title,"conesusHeight",consensHeight,"err", err.Error())
return err
}
consensMainHeight = stat.(*pt.ParacrossHeightStatus).MainHeight
}
//return err to stop tx pass to para chain
if a.exec.GetMainHeight() <= consensMainHeight+confStopBlocks*int64(status.EmptyBlockInterval) {
clog.Error("paracross.nodeVote, super manager height not reach", "currHeight", a.exec.GetMainHeight(),
clog.Error("superManagerVoteProc, super manager height not reach", "currHeight", a.exec.GetMainHeight(),
"consensHeight", consensHeight, "mainHeight", consensMainHeight, "confHeight", confStopBlocks, "interval", status.EmptyBlockInterval)
return pt.ErrParaConsensStopBlocksNotReach
}
......@@ -623,7 +624,8 @@ func (a *action) nodeGroupApply(config *pt.ParaNodeGroupConfig) (*types.Receipt,
Title: config.Title,
ApplyAddr: strings.Join(addrs, ","),
CoinsFrozen: config.CoinsFrozen,
MainHeight: a.exec.GetMainHeight()}
MainHeight: a.exec.GetMainHeight(),
EmptyBlockInterval:config.EmptyBlockInterval}
saveNodeGroup(a.db, config.Title, stat)
r := makeParaNodeGroupApplyReiceipt(config.Title, a.fromaddr, status, stat, pt.TyLogParaNodeGroupApply)
receipt.KV = append(receipt.KV, r.KV...)
......@@ -662,7 +664,8 @@ func (a *action) nodeGroupQuit(config *pt.ParaNodeGroupConfig) (*types.Receipt,
Title: config.Title,
ApplyAddr: status.ApplyAddr,
CoinsFrozen: status.CoinsFrozen,
MainHeight: a.exec.GetMainHeight()}
MainHeight: a.exec.GetMainHeight(),
EmptyBlockInterval:status.EmptyBlockInterval}
saveNodeGroup(a.db, config.Title, stat)
r := makeParaNodeGroupApplyReiceipt(config.Title, a.fromaddr, status, stat, pt.TyLogParaNodeGroupQuit)
receipt.KV = append(receipt.KV, r.KV...)
......@@ -736,7 +739,8 @@ func (a *action) nodeGroupApprove(config *pt.ParaNodeGroupConfig) (*types.Receip
Title: config.Title,
ApplyAddr: status.ApplyAddr,
CoinsFrozen: status.CoinsFrozen,
MainHeight: a.exec.GetMainHeight()}
MainHeight: a.exec.GetMainHeight(),
EmptyBlockInterval:status.EmptyBlockInterval}
saveNodeGroup(a.db, config.Title, stat)
r = makeParaNodeGroupApplyReiceipt(config.Title, a.fromaddr, status, stat, pt.TyLogParaNodeGroupApprove)
receipt.KV = append(receipt.KV, r.KV...)
......
plugin/dapp/paracross/executor/superaccount_test.go
View file @ 895a68b2
......@@ -212,7 +212,7 @@ func voteTest(suite *NodeManageTestSuite, addr string, join bool) {
}
func (suite *NodeManageTestSuite) testNodeGroupConfigQuit() {
config := &pt.ParaNodeGroupApply{
config := &pt.ParaNodeGroupConfig{
Addrs: applyAddrs,
Op: pt.ParacrossNodeGroupApply,
}
......@@ -222,7 +222,7 @@ func (suite *NodeManageTestSuite) testNodeGroupConfigQuit() {
receipt := nodeCommit(suite, PrivKeyB, tx)
checkGroupApplyReceipt(suite, receipt)
config = &pt.ParaNodeGroupApply{
config = &pt.ParaNodeGroupConfig{
Addrs: applyAddrs,
Op: pt.ParacrossNodeGroupQuit,
}
......@@ -237,7 +237,7 @@ func (suite *NodeManageTestSuite) testNodeGroupConfigQuit() {
func (suite *NodeManageTestSuite) testNodeGroupConfig() {
suite.testNodeGroupConfigQuit()
config := &pt.ParaNodeGroupApply{
config := &pt.ParaNodeGroupConfig{
Addrs: applyAddrs,
Op: pt.ParacrossNodeGroupApply,
}
......@@ -247,7 +247,7 @@ func (suite *NodeManageTestSuite) testNodeGroupConfig() {
receipt := nodeCommit(suite, PrivKeyB, tx)
checkGroupApplyReceipt(suite, receipt)
config = &pt.ParaNodeGroupApply{
config = &pt.ParaNodeGroupConfig{
Addrs: applyAddrs,
Op: pt.ParacrossNodeGroupApprove,
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment