Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
3abdcf52
Commit
3abdcf52
authored
Jul 27, 2020
by
madengji
Committed by
33cn
Aug 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
para bind miner cmd
parent
073e10e3
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
174 additions
and
66 deletions
+174
-66
paracross.go
plugin/dapp/paracross/commands/paracross.go
+83
-0
query.go
plugin/dapp/paracross/executor/query.go
+25
-0
reward.go
plugin/dapp/paracross/executor/reward.go
+57
-63
paracross.proto
plugin/dapp/paracross/proto/paracross.proto
+9
-3
No files found.
plugin/dapp/paracross/commands/paracross.go
View file @
3abdcf52
...
...
@@ -321,11 +321,13 @@ func superNodeCmd() *cobra.Command {
cmd
.
AddCommand
(
nodeVoteCmd
())
cmd
.
AddCommand
(
nodeQuitCmd
())
cmd
.
AddCommand
(
nodeCancelCmd
())
cmd
.
AddCommand
(
nodeBindCmd
())
cmd
.
AddCommand
(
getNodeInfoCmd
())
cmd
.
AddCommand
(
getNodeIDInfoCmd
())
cmd
.
AddCommand
(
getNodeListCmd
())
cmd
.
AddCommand
(
nodeModifyCmd
())
cmd
.
AddCommand
(
getNodeBindListCmd
())
return
cmd
}
...
...
@@ -518,6 +520,87 @@ func createNodeModifyTx(cmd *cobra.Command, args []string) {
}
func
nodeBindCmd
()
*
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
Use
:
"bind"
,
Short
:
"bind miner for specific account"
,
Run
:
createNodeBindTx
,
}
addNodeBindFlags
(
cmd
)
return
cmd
}
func
addNodeBindFlags
(
cmd
*
cobra
.
Command
)
{
cmd
.
Flags
()
.
Uint32P
(
"action"
,
"a"
,
1
,
"action bind:1 or unbind:2"
)
cmd
.
MarkFlagRequired
(
"action"
)
cmd
.
Flags
()
.
Uint64P
(
"coins"
,
"c"
,
0
,
"bind coins, unbind not needed"
)
cmd
.
Flags
()
.
StringP
(
"node"
,
"n"
,
""
,
"target node to bind/unbind miner"
)
cmd
.
MarkFlagRequired
(
"node"
)
}
func
createNodeBindTx
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
paraName
,
_
:=
cmd
.
Flags
()
.
GetString
(
"paraName"
)
action
,
_
:=
cmd
.
Flags
()
.
GetUint32
(
"action"
)
node
,
_
:=
cmd
.
Flags
()
.
GetString
(
"node"
)
coins
,
_
:=
cmd
.
Flags
()
.
GetUint32
(
"coins"
)
if
!
strings
.
HasPrefix
(
paraName
,
"user.p"
)
{
fmt
.
Fprintln
(
os
.
Stderr
,
"paraName is not right, paraName format like `user.p.guodun.`"
)
return
}
if
action
==
1
&&
coins
==
0
{
fmt
.
Fprintln
(
os
.
Stderr
,
"coins should bigger than 0"
)
}
payload
:=
&
pt
.
ParaBindMinerInfo
{
BindAction
:
int32
(
action
),
BindCount
:
int64
(
coins
),
TargetAddr
:
node
}
params
:=
&
rpctypes
.
CreateTxIn
{
Execer
:
getRealExecName
(
paraName
,
pt
.
ParaX
),
ActionName
:
"ParaBindMiner"
,
Payload
:
types
.
MustPBToJSON
(
payload
),
}
rpcLaddr
,
_
:=
cmd
.
Flags
()
.
GetString
(
"rpc_laddr"
)
ctx
:=
jsonclient
.
NewRPCCtx
(
rpcLaddr
,
"Chain33.CreateTransaction"
,
params
,
nil
)
ctx
.
RunWithoutMarshal
()
}
func
getNodeBindListCmd
()
*
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
Use
:
"bind_list"
,
Short
:
"Get node bind miner account list"
,
Run
:
nodeBindInfo
,
}
addNodeBindCmdFlags
(
cmd
)
return
cmd
}
func
addNodeBindCmdFlags
(
cmd
*
cobra
.
Command
)
{
cmd
.
Flags
()
.
StringP
(
"node"
,
"n"
,
""
,
"super node addr to bind miner"
)
cmd
.
MarkFlagRequired
(
"node"
)
}
func
nodeBindInfo
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
rpcLaddr
,
_
:=
cmd
.
Flags
()
.
GetString
(
"rpc_laddr"
)
addr
,
_
:=
cmd
.
Flags
()
.
GetString
(
"addr"
)
var
params
rpctypes
.
Query4Jrpc
params
.
Execer
=
pt
.
ParaX
params
.
FuncName
=
"GetNodeBindMinerList"
params
.
Payload
=
types
.
MustPBToJSON
(
&
types
.
ReqString
{
Data
:
addr
})
var
res
pt
.
RespParaNodeBindList
ctx
:=
jsonclient
.
NewRPCCtx
(
rpcLaddr
,
"Chain33.Query"
,
params
,
&
res
)
ctx
.
Run
()
}
// getNodeInfoCmd get node current status
func
getNodeInfoCmd
()
*
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
...
...
plugin/dapp/paracross/executor/query.go
View file @
3abdcf52
...
...
@@ -533,3 +533,28 @@ func (p *Paracross) Query_GetHeight(req *types.ReqString) (*pt.ParacrossConsensu
}
return
nil
,
types
.
ErrDecode
}
// Query_GetNodeBindMinerList query get super node bind miner list
func
(
p
*
Paracross
)
Query_GetNodeBindMinerList
(
in
*
types
.
ReqString
)
(
types
.
Message
,
error
)
{
if
in
==
nil
||
len
(
in
.
Data
)
==
0
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"in=%v"
,
in
)
}
list
,
err
:=
getBindNodeInfo
(
p
.
GetStateDB
(),
in
.
Data
)
if
err
!=
nil
{
return
nil
,
err
}
var
resp
pt
.
RespParaNodeBindList
resp
.
List
=
list
for
_
,
addr
:=
range
list
.
Miners
{
info
,
err
:=
getBindAddrInfo
(
p
.
GetStateDB
(),
in
.
Data
,
addr
)
if
err
!=
nil
{
return
nil
,
err
}
resp
.
Details
=
append
(
resp
.
Details
,
info
)
}
return
&
resp
,
nil
}
plugin/dapp/paracross/executor/reward.go
View file @
3abdcf52
...
...
@@ -5,6 +5,7 @@ import (
"github.com/pkg/errors"
dbm
"github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/types"
pt
"github.com/33cn/plugin/plugin/dapp/paracross/types"
)
...
...
@@ -18,7 +19,7 @@ const (
func
(
a
*
action
)
getBindAddrs
(
nodes
[]
string
,
statusHeight
int64
)
[]
*
pt
.
ParaNodeBindList
{
var
lists
[]
*
pt
.
ParaNodeBindList
for
_
,
m
:=
range
nodes
{
list
,
err
:=
a
.
getBindNodeInfo
(
m
)
list
,
err
:=
getBindNodeInfo
(
a
.
db
,
m
)
if
isNotFound
(
errors
.
Cause
(
err
))
{
continue
}
...
...
@@ -78,7 +79,7 @@ func (a *action) rewardBindAddr(coinReward int64, bindList []*pt.ParaNodeBindLis
var
bindAddrList
[]
*
pt
.
ParaBindMinerInfo
for
_
,
node
:=
range
bindList
{
for
_
,
miner
:=
range
node
.
Miners
{
info
,
err
:=
a
.
getBindAddrInfo
(
node
.
SuperNode
,
miner
)
info
,
err
:=
getBindAddrInfo
(
a
.
db
,
node
.
SuperNode
,
miner
)
if
err
!=
nil
{
return
nil
,
0
,
err
}
...
...
@@ -113,7 +114,6 @@ func (a *action) rewardBindAddr(coinReward int64, bindList []*pt.ParaNodeBindLis
// reward 挖矿奖励, 主要处理挖矿分配逻辑,先实现基本策略,后面根据需求进行重构
func
(
a
*
action
)
reward
(
nodeStatus
*
pt
.
ParacrossNodeStatus
,
stat
*
pt
.
ParacrossHeightStatus
)
(
*
types
.
Receipt
,
error
)
{
//获取挖矿相关配置,这里需注意是共识的高度,而不是交易的高度
cfg
:=
a
.
api
.
GetConfig
()
coinReward
:=
cfg
.
MGInt
(
"mver.consensus.paracross.coinReward"
,
nodeStatus
.
Height
)
*
types
.
Coin
...
...
@@ -169,7 +169,6 @@ func (a *action) reward(nodeStatus *pt.ParacrossNodeStatus, stat *pt.ParacrossHe
// getMiners 获取提交共识消息的矿工地址
func
getMiners
(
detail
*
pt
.
ParacrossStatusDetails
,
blockHash
[]
byte
)
[]
string
{
addrs
:=
make
([]
string
,
0
)
for
i
,
hash
:=
range
detail
.
BlockHash
{
if
bytes
.
Equal
(
hash
,
blockHash
)
{
...
...
@@ -242,21 +241,16 @@ func makeNodeBindReceipt(addr string, prev, current *pt.ParaNodeBindList) *types
//绑定到超级节点
func
(
a
*
action
)
bind2Node
(
node
string
)
(
*
types
.
Receipt
,
error
)
{
key
:=
calcParaBindMinerNode
(
node
)
data
,
err
:=
a
.
db
.
Get
(
key
)
if
err
!=
nil
&&
err
!=
types
.
ErrNotFound
{
return
nil
,
errors
.
Wrapf
(
err
,
"unbind2Node get failed node=%s"
,
node
)
info
,
err
:=
getBindNodeInfo
(
a
.
db
,
node
)
if
!
isNotFound
(
errors
.
Cause
(
err
))
{
return
nil
,
errors
.
Wrap
(
err
,
"bind2Node"
)
}
//found
if
len
(
data
)
>
0
{
var
list
pt
.
ParaNodeBindList
err
=
types
.
Decode
(
data
,
&
list
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"bind2Node decode failed node=%s"
,
node
)
}
listCopy
:=
list
list
.
Miners
=
append
(
list
.
Miners
,
a
.
fromaddr
)
return
makeNodeBindReceipt
(
node
,
&
listCopy
,
&
list
),
nil
if
info
!=
nil
{
listCopy
:=
*
info
info
.
Miners
=
append
(
info
.
Miners
,
a
.
fromaddr
)
return
makeNodeBindReceipt
(
node
,
&
listCopy
,
info
),
nil
}
//unfound
var
list
pt
.
ParaNodeBindList
...
...
@@ -267,7 +261,7 @@ func (a *action) bind2Node(node string) (*types.Receipt, error) {
//从超级节点解绑
func
(
a
*
action
)
unbind2Node
(
node
string
)
(
*
types
.
Receipt
,
error
)
{
list
,
err
:=
a
.
getBindNodeInfo
(
node
)
list
,
err
:=
getBindNodeInfo
(
a
.
db
,
node
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"unbind2Node"
)
}
...
...
@@ -281,9 +275,9 @@ func (a *action) unbind2Node(node string) (*types.Receipt, error) {
}
func
(
a
*
action
)
getBindNodeInfo
(
node
string
)
(
*
pt
.
ParaNodeBindList
,
error
)
{
func
getBindNodeInfo
(
db
dbm
.
KV
,
node
string
)
(
*
pt
.
ParaNodeBindList
,
error
)
{
key
:=
calcParaBindMinerNode
(
node
)
data
,
err
:=
a
.
db
.
Get
(
key
)
data
,
err
:=
db
.
Get
(
key
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"get key failed node=%s"
,
node
)
}
...
...
@@ -296,9 +290,9 @@ func (a *action) getBindNodeInfo(node string) (*pt.ParaNodeBindList, error) {
return
&
list
,
nil
}
func
(
a
*
action
)
getBindAddrInfo
(
node
,
addr
string
)
(
*
pt
.
ParaBindMinerInfo
,
error
)
{
func
getBindAddrInfo
(
db
dbm
.
KV
,
node
,
addr
string
)
(
*
pt
.
ParaBindMinerInfo
,
error
)
{
key
:=
calcParaBindMinerAddr
(
node
,
addr
)
data
,
err
:=
a
.
db
.
Get
(
key
)
data
,
err
:=
db
.
Get
(
key
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"get key failed node=%s,addr=%s"
,
node
,
addr
)
}
...
...
@@ -311,79 +305,74 @@ func (a *action) getBindAddrInfo(node, addr string) (*pt.ParaBindMinerInfo, erro
return
&
info
,
nil
}
func
(
a
*
action
)
bindOp
(
info
*
pt
.
ParaBindMinerInfo
)
(
*
types
.
Receipt
,
error
)
{
if
len
(
info
.
Addr
)
>
0
&&
info
.
Addr
!=
a
.
fromaddr
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"bindMiner addr=%s not from addr %s"
,
info
.
Addr
,
a
.
fromaddr
)
func
(
a
*
action
)
bindOp
(
cmd
*
pt
.
ParaBindMinerInfo
)
(
*
types
.
Receipt
,
error
)
{
if
len
(
cmd
.
Addr
)
>
0
&&
cmd
.
Addr
!=
a
.
fromaddr
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"bindMiner addr=%s not from addr %s"
,
cmd
.
Addr
,
a
.
fromaddr
)
}
if
info
.
BindCount
<=
0
{
if
cmd
.
BindCount
<=
0
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"bindMiner bindCount nil from addr %s"
,
a
.
fromaddr
)
}
ok
,
err
:=
a
.
isValidSuperNode
(
info
.
TargetAddr
)
ok
,
err
:=
a
.
isValidSuperNode
(
cmd
.
TargetAddr
)
if
err
!=
nil
||
!
ok
{
return
nil
,
errors
.
Wrapf
(
err
,
"invalid target node=%s"
,
info
.
TargetAddr
)
return
nil
,
errors
.
Wrapf
(
err
,
"invalid target node=%s"
,
cmd
.
TargetAddr
)
}
key
:=
calcParaBindMinerAddr
(
info
.
TargetAddr
,
a
.
fromaddr
)
data
,
err
:=
a
.
db
.
Get
(
key
)
if
err
!=
nil
&&
err
!=
types
.
ErrNotFound
{
return
nil
,
err
current
,
err
:=
getBindAddrInfo
(
a
.
db
,
cmd
.
TargetAddr
,
a
.
fromaddr
)
if
!
isNotFound
(
errors
.
Cause
(
err
))
{
return
nil
,
errors
.
Wrap
(
err
,
"getBindAddrInfo"
)
}
//found, 修改当前的绑定
if
len
(
data
)
>
0
{
if
current
!=
nil
{
var
receipt
*
types
.
Receipt
var
acct
pt
.
ParaBindMinerInfo
err
=
types
.
Decode
(
data
,
&
acct
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"bindOp decode for addr=%s"
,
a
.
fromaddr
)
}
if
info
.
BindCount
==
acct
.
BindCount
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"bindOp bind coins not change current=%d, modify=%d"
,
acct
.
BindCount
,
info
.
BindCount
)
if
cmd
.
BindCount
==
current
.
BindCount
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"bind coins same current=%d, cmd=%d"
,
current
.
BindCount
,
cmd
.
BindCount
)
}
//释放一部分冻结coins
if
info
.
BindCount
<
acc
t
.
BindCount
{
receipt
,
err
=
a
.
coinsAccount
.
ExecActive
(
a
.
fromaddr
,
a
.
execaddr
,
(
acct
.
BindCount
-
info
.
BindCount
)
*
types
.
Coin
)
if
cmd
.
BindCount
<
curren
t
.
BindCount
{
receipt
,
err
=
a
.
coinsAccount
.
ExecActive
(
a
.
fromaddr
,
a
.
execaddr
,
(
current
.
BindCount
-
cmd
.
BindCount
)
*
types
.
Coin
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"bindOp Active addr=%s,execaddr=%s,coins=%d"
,
a
.
fromaddr
,
a
.
execaddr
,
acct
.
BindCount
-
info
.
BindCount
)
return
nil
,
errors
.
Wrapf
(
err
,
"bindOp Active addr=%s,execaddr=%s,coins=%d"
,
a
.
fromaddr
,
a
.
execaddr
,
current
.
BindCount
-
cmd
.
BindCount
)
}
}
//冻结更多
receipt
,
err
=
a
.
coinsAccount
.
ExecFrozen
(
a
.
fromaddr
,
a
.
execaddr
,
(
info
.
BindCount
-
acc
t
.
BindCount
)
*
types
.
Coin
)
receipt
,
err
=
a
.
coinsAccount
.
ExecFrozen
(
a
.
fromaddr
,
a
.
execaddr
,
(
cmd
.
BindCount
-
curren
t
.
BindCount
)
*
types
.
Coin
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"bindOp frozen more addr=%s,execaddr=%s,coins=%d"
,
a
.
fromaddr
,
a
.
execaddr
,
info
.
BindCount
-
acc
t
.
BindCount
)
return
nil
,
errors
.
Wrapf
(
err
,
"bindOp frozen more addr=%s,execaddr=%s,coins=%d"
,
a
.
fromaddr
,
a
.
execaddr
,
cmd
.
BindCount
-
curren
t
.
BindCount
)
}
acctCopy
:=
acc
t
acct
.
BindCount
=
info
.
BindCount
acctCopy
:=
*
curren
t
current
.
BindCount
=
cmd
.
BindCount
r
:=
makeAddrBindReceipt
(
info
.
TargetAddr
,
a
.
fromaddr
,
&
acctCopy
,
&
acc
t
)
r
:=
makeAddrBindReceipt
(
cmd
.
TargetAddr
,
a
.
fromaddr
,
&
acctCopy
,
curren
t
)
return
mergeReceipt
(
receipt
,
r
),
nil
}
//not found, 增加新绑定
receipt
,
err
:=
a
.
coinsAccount
.
ExecFrozen
(
a
.
fromaddr
,
a
.
execaddr
,
info
.
BindCount
*
types
.
Coin
)
receipt
,
err
:=
a
.
coinsAccount
.
ExecFrozen
(
a
.
fromaddr
,
a
.
execaddr
,
cmd
.
BindCount
*
types
.
Coin
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"bindOp frozen addr=%s,execaddr=%s,count=%d"
,
a
.
fromaddr
,
a
.
execaddr
,
info
.
BindCount
)
return
nil
,
errors
.
Wrapf
(
err
,
"bindOp frozen addr=%s,execaddr=%s,count=%d"
,
a
.
fromaddr
,
a
.
execaddr
,
cmd
.
BindCount
)
}
//bind addr
acct
:=
&
pt
.
ParaBindMinerInfo
{
Addr
:
a
.
fromaddr
,
Bind
Status
:
opBind
,
BindCount
:
info
.
BindCount
,
Bind
Action
:
opBind
,
BindCount
:
cmd
.
BindCount
,
BlockTime
:
a
.
blocktime
,
TargetAddr
:
info
.
TargetAddr
,
BlockHeight
:
a
.
height
,
TargetAddr
:
cmd
.
TargetAddr
,
}
rBind
:=
makeAddrBindReceipt
(
info
.
TargetAddr
,
a
.
fromaddr
,
nil
,
acct
)
rBind
:=
makeAddrBindReceipt
(
cmd
.
TargetAddr
,
a
.
fromaddr
,
nil
,
acct
)
mergeReceipt
(
receipt
,
rBind
)
//增加到列表中
rList
,
err
:=
a
.
bind2Node
(
info
.
TargetAddr
)
rList
,
err
:=
a
.
bind2Node
(
cmd
.
TargetAddr
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -392,8 +381,8 @@ func (a *action) bindOp(info *pt.ParaBindMinerInfo) (*types.Receipt, error) {
}
func
(
a
*
action
)
unBindOp
(
info
*
pt
.
ParaBindMinerInfo
)
(
*
types
.
Receipt
,
error
)
{
acct
,
err
:=
a
.
getBindAddrInfo
(
info
.
TargetAddr
,
a
.
fromaddr
)
func
(
a
*
action
)
unBindOp
(
cmd
*
pt
.
ParaBindMinerInfo
)
(
*
types
.
Receipt
,
error
)
{
acct
,
err
:=
getBindAddrInfo
(
a
.
db
,
cmd
.
TargetAddr
,
a
.
fromaddr
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -411,11 +400,11 @@ func (a *action) unBindOp(info *pt.ParaBindMinerInfo) (*types.Receipt, error) {
}
//删除 bind addr
rUnBind
:=
makeAddrBindReceipt
(
info
.
TargetAddr
,
a
.
fromaddr
,
acct
,
nil
)
rUnBind
:=
makeAddrBindReceipt
(
cmd
.
TargetAddr
,
a
.
fromaddr
,
acct
,
nil
)
mergeReceipt
(
receipt
,
rUnBind
)
//从列表删除
rUnList
,
err
:=
a
.
unbind2Node
(
info
.
TargetAddr
)
rUnList
,
err
:=
a
.
unbind2Node
(
cmd
.
TargetAddr
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -429,11 +418,16 @@ func (a *action) bindMiner(info *pt.ParaBindMinerInfo) (*types.Receipt, error) {
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"bindMiner targetAddr should not be nil to addr %s"
,
a
.
fromaddr
)
}
if
info
.
BindStatus
!=
opBind
&&
info
.
BindStatus
!=
opUnBind
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"bindMiner status=%d not correct"
,
info
.
BindStatus
)
//只允许平行链操作
if
!
types
.
IsParaExecName
(
string
(
a
.
tx
.
Execer
))
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"exec=%s,should prefix with user.p."
,
string
(
a
.
tx
.
Execer
))
}
if
info
.
BindAction
!=
opBind
&&
info
.
BindAction
!=
opUnBind
{
return
nil
,
errors
.
Wrapf
(
types
.
ErrInvalidParam
,
"bindMiner action=%d not correct"
,
info
.
BindAction
)
}
if
info
.
Bind
Status
==
opBind
{
if
info
.
Bind
Action
==
opBind
{
return
a
.
bindOp
(
info
)
}
return
a
.
unBindOp
(
info
)
...
...
plugin/dapp/paracross/proto/paracross.proto
View file @
3abdcf52
...
...
@@ -161,10 +161,11 @@ message RespParacrossNodeGroups {
//para bind miner
message
ParaBindMinerInfo
{
string
addr
=
1
;
// miner addr
int32
bind
Status
=
2
;
// 0: init,
1: bind, 2:unbind
int32
bind
Action
=
2
;
//
1: bind, 2:unbind
int64
bindCount
=
3
;
// bind coins count
int64
blockTime
=
4
;
// status bind block time
string
targetAddr
=
5
;
// super node addr
string
targetAddr
=
4
;
// super node addr
int64
blockTime
=
5
;
// action bind block time
int64
blockHeight
=
6
;
// action bind block height
}
message
ReceiptParaBindMinerInfo
{
...
...
@@ -183,6 +184,11 @@ message ReceiptParaNodeBindListUpdate{
ParaNodeBindList
current
=
2
;
}
message
RespParaNodeBindList
{
ParaNodeBindList
list
=
1
;
repeated
ParaBindMinerInfo
details
=
2
;
}
message
ParaBlock2MainMap
{
int64
height
=
1
;
string
blockHash
=
2
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment