Commit 20999292 authored by mdj33's avatar mdj33 Committed by vipwzw

modify 0 amount process

parent 9b7c5006
...@@ -329,7 +329,7 @@ func nodeGroupApply(cmd *cobra.Command, args []string) { ...@@ -329,7 +329,7 @@ func nodeGroupApply(cmd *cobra.Command, args []string) {
return return
} }
payload := &pt.ParaNodeGroupApply{Op: op, Addrs: addrs, CoinsFrozen: int64(math.Trunc((coins)*1e4)) * 1e4} payload := &pt.ParaNodeGroupApply{Op: op, Addrs: addrs, CoinsFrozen: int64(math.Trunc((coins+0.0000001)*1e4)) * 1e4}
params := &rpctypes.CreateTxIn{ params := &rpctypes.CreateTxIn{
Execer: types.ExecName(pt.ParaX), Execer: types.ExecName(pt.ParaX),
ActionName: "NodeGroupApply", ActionName: "NodeGroupApply",
......
...@@ -494,6 +494,9 @@ func (a *action) nodeGroupCoinsFrozen(addrs []string, configCoinsFrozen int64) ( ...@@ -494,6 +494,9 @@ func (a *action) nodeGroupCoinsFrozen(addrs []string, configCoinsFrozen int64) (
if configCoinsFrozen < confCoins { if configCoinsFrozen < confCoins {
return nil, pt.ErrParaNodeGroupFrozenCoinsNotEnough return nil, pt.ErrParaNodeGroupFrozenCoinsNotEnough
} }
if configCoinsFrozen == 0{
return receipt,nil
}
var logs []*types.ReceiptLog var logs []*types.ReceiptLog
var kv []*types.KeyValue var kv []*types.KeyValue
...@@ -522,6 +525,10 @@ func (a *action) nodeGroupCoinsActive(addrs []string, configCoinsFrozen int64) ( ...@@ -522,6 +525,10 @@ func (a *action) nodeGroupCoinsActive(addrs []string, configCoinsFrozen int64) (
realExec := string(types.GetRealExecName(a.tx.Execer)) realExec := string(types.GetRealExecName(a.tx.Execer))
realExecAddr := dapp.ExecAddress(realExec) realExecAddr := dapp.ExecAddress(realExec)
if configCoinsFrozen == 0{
return receipt,nil
}
for _, addr := range addrs { for _, addr := range addrs {
r, err := a.coinsAccount.ExecActive(addr, realExecAddr, configCoinsFrozen) r, err := a.coinsAccount.ExecActive(addr, realExecAddr, configCoinsFrozen)
if err != nil { if err != nil {
......
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