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
b2831b11
Commit
b2831b11
authored
Dec 10, 2018
by
heyubin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add by hyb for lint
parent
d6ca975e
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
17 additions
and
8 deletions
+17
-8
action.go
plugin/dapp/multisig/executor/action.go
+1
-2
exec_del_local.go
plugin/dapp/multisig/executor/exec_del_local.go
+1
-0
exec_local.go
plugin/dapp/multisig/executor/exec_local.go
+1
-0
exec_test.go
plugin/dapp/multisig/executor/exec_test.go
+1
-0
kv.go
plugin/dapp/multisig/executor/kv.go
+1
-0
multisig.go
plugin/dapp/multisig/executor/multisig.go
+2
-4
multisigdb.go
plugin/dapp/multisig/executor/multisigdb.go
+1
-0
query.go
plugin/dapp/multisig/executor/query.go
+2
-2
jrpc_channel_test.go
plugin/dapp/multisig/rpc/jrpc_channel_test.go
+1
-0
rpc.go
plugin/dapp/multisig/rpc/rpc.go
+1
-0
types.go
plugin/dapp/multisig/rpc/types.go
+1
-0
const.go
plugin/dapp/multisig/types/const.go
+2
-0
errors.go
plugin/dapp/multisig/types/errors.go
+1
-0
types.go
plugin/dapp/multisig/types/types.go
+1
-0
No files found.
plugin/dapp/multisig/executor/action.go
View file @
b2831b11
...
...
@@ -382,10 +382,9 @@ func (a *action) MultiSigConfirmTx(ConfirmTx *mty.MultiSigConfirmTx) (*types.Rec
}
else
if
multiSigTx
.
TxType
==
mty
.
TransferOperate
{
transfer
:=
payload
.
GetMultiSigExecTransferFrom
()
return
a
.
executeTransferTx
(
multiSigAcc
,
multiSigTx
,
transfer
,
owner
,
mty
.
IsConfirm
)
}
else
{
}
multisiglog
.
Error
(
"MultiSigConfirmTx:GetMultiSigTx"
,
"multiSigAccAddr"
,
multiSigAccAddr
,
"Confirm TxId"
,
ConfirmTx
.
TxId
,
"TxType unknown"
,
multiSigTx
.
TxType
)
return
nil
,
mty
.
ErrTxTypeNoMatch
}
}
//多重签名账户请求权重的修改,返回新的KeyValue对和ReceiptLog信息
...
...
plugin/dapp/multisig/executor/exec_del_local.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
executor
import
(
...
...
plugin/dapp/multisig/executor/exec_local.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
executor
import
(
...
...
plugin/dapp/multisig/executor/exec_test.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
executor
import
(
...
...
plugin/dapp/multisig/executor/kv.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
executor
import
(
...
...
plugin/dapp/multisig/executor/multisig.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
executor
/*
...
...
@@ -901,10 +902,7 @@ func isConfirmed(requiredWeight uint64, multiSigTx *mty.MultiSigTx) bool {
for
_
,
owner
:=
range
multiSigTx
.
ConfirmedOwner
{
totalweight
+=
owner
.
Weight
}
if
totalweight
>=
requiredWeight
{
return
true
}
return
false
return
totalweight
>=
requiredWeight
}
//确认某笔交易的额度是否满足每日限额,返回是否满足,以及新的newLastDay时间
...
...
plugin/dapp/multisig/executor/multisigdb.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
executor
import
(
...
...
plugin/dapp/multisig/executor/query.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
executor
import
(
...
...
@@ -154,8 +155,7 @@ func (m *MultiSig) Query_MultiSigTxids(in *mty.ReqMultiSigTxids) (types.Message,
multisiglog
.
Error
(
"Query_MultiSigTxids:getMultiSigTx"
,
"addr"
,
addr
,
"txid"
,
txid
,
"err"
,
err
)
continue
}
var
findTxid
uint64
findTxid
=
txid
findTxid
:=
txid
//查找Pending/Executed的交易txid
if
in
.
Pending
&&
!
multiSigTx
.
Executed
||
in
.
Executed
&&
multiSigTx
.
Executed
{
multiSigTxids
.
Txids
=
append
(
multiSigTxids
.
Txids
,
findTxid
)
...
...
plugin/dapp/multisig/rpc/jrpc_channel_test.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
rpc_test
import
(
...
...
plugin/dapp/multisig/rpc/rpc.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
rpc
import
(
...
...
plugin/dapp/multisig/rpc/types.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
rpc
import
(
...
...
plugin/dapp/multisig/types/const.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
types
import
(
...
...
@@ -12,6 +13,7 @@ import (
var
multisiglog
=
log15
.
New
(
"module"
,
"execs.multisig"
)
// OwnerAdd : 交易操作类型
var
(
OwnerAdd
uint64
=
1
OwnerDel
uint64
=
2
...
...
plugin/dapp/multisig/types/errors.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
types
import
"errors"
...
...
plugin/dapp/multisig/types/types.go
View file @
b2831b11
// Copyright Fuzamei Corp. 2018 All Rights Reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package
types
import
(
...
...
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