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
6fc4d52e
Commit
6fc4d52e
authored
Jan 22, 2021
by
madengji
Committed by
vipwzw
Sep 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add transfer proof
parent
25cf36cb
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
231 additions
and
182 deletions
+231
-182
mix.go
plugin/dapp/mix/commands/mix.go
+42
-88
mix.go
plugin/dapp/mix/executor/mix.go
+2
-23
transfer.go
plugin/dapp/mix/executor/transfer.go
+8
-17
mix.proto
plugin/dapp/mix/proto/mix.proto
+56
-7
rpc.go
plugin/dapp/mix/rpc/rpc.go
+3
-12
mix.go
plugin/dapp/mix/types/mix.go
+6
-0
mix.pb.go
plugin/dapp/mix/types/mix.pb.go
+0
-0
type.go
plugin/dapp/mix/types/type.go
+39
-0
exec.go
plugin/dapp/mix/wallet/exec.go
+8
-0
mixbizdb_test.go
plugin/dapp/mix/wallet/mixbizdb_test.go
+3
-2
mixsignature.go
plugin/dapp/mix/wallet/mixsignature.go
+26
-33
proof.go
plugin/dapp/mix/wallet/proof.go
+0
-0
proof_test.go
plugin/dapp/mix/wallet/proof_test.go
+38
-0
No files found.
plugin/dapp/mix/commands/mix.go
View file @
6fc4d52e
...
@@ -930,8 +930,7 @@ func ProofCmd() *cobra.Command {
...
@@ -930,8 +930,7 @@ func ProofCmd() *cobra.Command {
Short
:
"circuit proof inputs"
,
Short
:
"circuit proof inputs"
,
}
}
cmd
.
AddCommand
(
DepositInputsCmd
())
cmd
.
AddCommand
(
DepositInputsCmd
())
cmd
.
AddCommand
(
PayInInputsCmd
())
cmd
.
AddCommand
(
TransferInputsCmd
())
cmd
.
AddCommand
(
PayOutInputsCmd
())
cmd
.
AddCommand
(
WithdrawInputsCmd
())
cmd
.
AddCommand
(
WithdrawInputsCmd
())
cmd
.
AddCommand
(
AuthInputsCmd
())
cmd
.
AddCommand
(
AuthInputsCmd
())
...
@@ -957,7 +956,7 @@ func depositSecretCmdFlags(cmd *cobra.Command) {
...
@@ -957,7 +956,7 @@ func depositSecretCmdFlags(cmd *cobra.Command) {
cmd
.
Flags
()
.
StringP
(
"authorize"
,
"a"
,
""
,
"authorize addr"
)
cmd
.
Flags
()
.
StringP
(
"authorize"
,
"a"
,
""
,
"authorize addr"
)
cmd
.
Flags
()
.
StringP
(
"amount"
,
"m"
,
""
,
"amount"
)
cmd
.
Flags
()
.
Uint64P
(
"amount"
,
"m"
,
0
,
"amount"
)
cmd
.
MarkFlagRequired
(
"amount"
)
cmd
.
MarkFlagRequired
(
"amount"
)
}
}
...
@@ -967,7 +966,7 @@ func depositSecret(cmd *cobra.Command, args []string) {
...
@@ -967,7 +966,7 @@ func depositSecret(cmd *cobra.Command, args []string) {
payment
,
_
:=
cmd
.
Flags
()
.
GetString
(
"payment"
)
payment
,
_
:=
cmd
.
Flags
()
.
GetString
(
"payment"
)
returnKey
,
_
:=
cmd
.
Flags
()
.
GetString
(
"return"
)
returnKey
,
_
:=
cmd
.
Flags
()
.
GetString
(
"return"
)
authorize
,
_
:=
cmd
.
Flags
()
.
GetString
(
"authorize"
)
authorize
,
_
:=
cmd
.
Flags
()
.
GetString
(
"authorize"
)
amount
,
_
:=
cmd
.
Flags
()
.
Get
String
(
"amount"
)
amount
,
_
:=
cmd
.
Flags
()
.
Get
Uint64
(
"amount"
)
req
:=
&
mixTy
.
DepositProofReq
{
req
:=
&
mixTy
.
DepositProofReq
{
PaymentAddr
:
payment
,
PaymentAddr
:
payment
,
...
@@ -981,89 +980,53 @@ func depositSecret(cmd *cobra.Command, args []string) {
...
@@ -981,89 +980,53 @@ func depositSecret(cmd *cobra.Command, args []string) {
ctx
.
Run
()
ctx
.
Run
()
}
}
//
Deposit
InputsCmd get para chain status by height
//
Transfer
InputsCmd get para chain status by height
func
PayIn
InputsCmd
()
*
cobra
.
Command
{
func
Transfer
InputsCmd
()
*
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
Use
:
"
payin
"
,
Use
:
"
transfer
"
,
Short
:
"one key get
pay in
put data"
,
Short
:
"one key get
transfer input out
put data"
,
Run
:
payIn
Secret
,
Run
:
transfer
Secret
,
}
}
payIn
SecretCmdFlags
(
cmd
)
transfer
SecretCmdFlags
(
cmd
)
return
cmd
return
cmd
}
}
func
payInSecretCmdFlags
(
cmd
*
cobra
.
Command
)
{
func
transferSecretCmdFlags
(
cmd
*
cobra
.
Command
)
{
cmd
.
Flags
()
.
StringP
(
"payment"
,
"p"
,
""
,
"payment addr"
)
cmd
.
Flags
()
.
StringP
(
"noteHash"
,
"n"
,
""
,
"note hash to spend"
)
cmd
.
MarkFlagRequired
(
"payment"
)
cmd
.
MarkFlagRequired
(
"noteHash"
)
cmd
.
Flags
()
.
StringP
(
"return"
,
"r"
,
""
,
"return addr"
)
cmd
.
Flags
()
.
StringP
(
"authorize"
,
"a"
,
""
,
"authorize addr"
)
cmd
.
Flags
()
.
StringP
(
"amount"
,
"m"
,
""
,
"amount"
)
cmd
.
MarkFlagRequired
(
"amount"
)
}
func
payInSecret
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
rpcLaddr
,
_
:=
cmd
.
Flags
()
.
GetString
(
"rpc_laddr"
)
payment
,
_
:=
cmd
.
Flags
()
.
GetString
(
"payment"
)
returnKey
,
_
:=
cmd
.
Flags
()
.
GetString
(
"return"
)
authorize
,
_
:=
cmd
.
Flags
()
.
GetString
(
"authorize"
)
amount
,
_
:=
cmd
.
Flags
()
.
GetString
(
"amount"
)
req
:=
&
mixTy
.
DepositProofReq
{
PaymentAddr
:
payment
,
ReturnAddr
:
returnKey
,
AuthorizeAddr
:
authorize
,
Amount
:
amount
,
}
var
res
mixTy
.
DHSecretGroup
ctx
:=
jsonclient
.
NewRPCCtx
(
rpcLaddr
,
"mix.PayInProof"
,
req
,
&
res
)
ctx
.
Run
()
}
// DepositInputsCmd get para chain status by height
func
PayOutInputsCmd
()
*
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
Use
:
"payout"
,
Short
:
"one key get payout input data"
,
Run
:
payOutSecret
,
}
payOutSecretCmdFlags
(
cmd
)
return
cmd
}
func
payOutSecretCmdFlags
(
cmd
*
cobra
.
Command
)
{
cmd
.
Flags
()
.
StringP
(
"toAddr"
,
"t"
,
""
,
"transfer to addr"
)
cmd
.
Flags
()
.
StringP
(
"payment"
,
"p"
,
""
,
"payment addr"
)
cmd
.
MarkFlagRequired
(
"toAddr"
)
cmd
.
MarkFlagRequired
(
"payment"
)
cmd
.
Flags
()
.
StringP
(
"return"
,
"r"
,
""
,
"return addr"
)
cmd
.
Flags
()
.
StringP
(
"auth"
,
"a"
,
""
,
"transfer to auth addr"
)
cmd
.
MarkFlagRequired
(
"auth"
)
cmd
.
Flags
()
.
StringP
(
"authorize"
,
"a"
,
""
,
"authorize addr"
)
cmd
.
Flags
()
.
StringP
(
"returner"
,
"r"
,
""
,
"transfer to returner addr"
)
cmd
.
MarkFlagRequired
(
"returner"
)
cmd
.
Flags
()
.
StringP
(
"amount"
,
"m"
,
""
,
"
amount"
)
cmd
.
Flags
()
.
Uint64P
(
"amount"
,
"m"
,
0
,
"transfer
amount"
)
cmd
.
MarkFlagRequired
(
"amount"
)
cmd
.
MarkFlagRequired
(
"amount"
)
}
}
func
payOut
Secret
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
func
transfer
Secret
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
rpcLaddr
,
_
:=
cmd
.
Flags
()
.
GetString
(
"rpc_laddr"
)
rpcLaddr
,
_
:=
cmd
.
Flags
()
.
GetString
(
"rpc_laddr"
)
payment
,
_
:=
cmd
.
Flags
()
.
GetString
(
"payment"
)
noteHash
,
_
:=
cmd
.
Flags
()
.
GetString
(
"noteHash"
)
returnKey
,
_
:=
cmd
.
Flags
()
.
GetString
(
"return"
)
toAddr
,
_
:=
cmd
.
Flags
()
.
GetString
(
"toAddr"
)
authorize
,
_
:=
cmd
.
Flags
()
.
GetString
(
"authorize"
)
auth
,
_
:=
cmd
.
Flags
()
.
GetString
(
"auth"
)
amount
,
_
:=
cmd
.
Flags
()
.
GetString
(
"amount"
)
returner
,
_
:=
cmd
.
Flags
()
.
GetString
(
"returner"
)
amount
,
_
:=
cmd
.
Flags
()
.
GetUint64
(
"amount"
)
req
:=
&
mixTy
.
DepositProofReq
{
req
:=
&
mixTy
.
TransferProofReq
{
PaymentAddr
:
payment
,
NoteHash
:
noteHash
,
ReturnAddr
:
returnKey
,
ToAddr
:
toAddr
,
AuthorizeAddr
:
authorize
,
ToAuthAddr
:
auth
,
ReturnAddr
:
returner
,
Amount
:
amount
,
Amount
:
amount
,
}
}
var
res
mixTy
.
Deposit
ProofResp
var
res
mixTy
.
Transfer
ProofResp
ctx
:=
jsonclient
.
NewRPCCtx
(
rpcLaddr
,
"mix.
PayOut
Proof"
,
req
,
&
res
)
ctx
:=
jsonclient
.
NewRPCCtx
(
rpcLaddr
,
"mix.
Transfer
Proof"
,
req
,
&
res
)
ctx
.
Run
()
ctx
.
Run
()
}
}
...
@@ -1109,33 +1072,24 @@ func AuthInputsCmd() *cobra.Command {
...
@@ -1109,33 +1072,24 @@ func AuthInputsCmd() *cobra.Command {
}
}
func
authSecretCmdFlags
(
cmd
*
cobra
.
Command
)
{
func
authSecretCmdFlags
(
cmd
*
cobra
.
Command
)
{
cmd
.
Flags
()
.
StringP
(
"payment"
,
"p"
,
""
,
"payment addr"
)
cmd
.
Flags
()
.
StringP
(
"noteHash"
,
"n"
,
""
,
"note hash to spend"
)
cmd
.
MarkFlagRequired
(
"payment"
)
cmd
.
MarkFlagRequired
(
"noteHash"
)
cmd
.
Flags
()
.
StringP
(
"return"
,
"r"
,
""
,
"return addr"
)
cmd
.
Flags
()
.
StringP
(
"authorize"
,
"a"
,
""
,
"authorize addr"
)
cmd
.
Flags
()
.
StringP
(
"amount"
,
"m"
,
""
,
"amount"
)
cmd
.
MarkFlagRequired
(
"amount"
)
cmd
.
Flags
()
.
Uint32P
(
"toReturn"
,
"r"
,
0
,
"authorize to returner,0:to payment,1:to returner"
)
cmd
.
MarkFlagRequired
(
"noteHash"
)
}
}
func
authSecret
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
func
authSecret
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
rpcLaddr
,
_
:=
cmd
.
Flags
()
.
GetString
(
"rpc_laddr"
)
rpcLaddr
,
_
:=
cmd
.
Flags
()
.
GetString
(
"rpc_laddr"
)
payment
,
_
:=
cmd
.
Flags
()
.
GetString
(
"payment"
)
noteHash
,
_
:=
cmd
.
Flags
()
.
GetString
(
"noteHash"
)
returnKey
,
_
:=
cmd
.
Flags
()
.
GetString
(
"return"
)
toReturn
,
_
:=
cmd
.
Flags
()
.
GetUint32
(
"toReturn"
)
authorize
,
_
:=
cmd
.
Flags
()
.
GetString
(
"authorize"
)
amount
,
_
:=
cmd
.
Flags
()
.
GetString
(
"amount"
)
req
:=
&
mixTy
.
DepositProofReq
{
req
:=
&
mixTy
.
AuthProofReq
{
PaymentAddr
:
payment
,
NoteHash
:
noteHash
,
ReturnAddr
:
returnKey
,
ToReturn
:
toReturn
,
AuthorizeAddr
:
authorize
,
Amount
:
amount
,
}
}
var
res
mixTy
.
DHSecretGrou
p
var
res
mixTy
.
AuthProofRes
p
ctx
:=
jsonclient
.
NewRPCCtx
(
rpcLaddr
,
"mix.AuthProof"
,
req
,
&
res
)
ctx
:=
jsonclient
.
NewRPCCtx
(
rpcLaddr
,
"mix.AuthProof"
,
req
,
&
res
)
ctx
.
Run
()
ctx
.
Run
()
}
}
plugin/dapp/mix/executor/mix.go
View file @
6fc4d52e
...
@@ -62,29 +62,8 @@ func (m *Mix) CheckTx(tx *types.Transaction, index int) error {
...
@@ -62,29 +62,8 @@ func (m *Mix) CheckTx(tx *types.Transaction, index int) error {
// mix隐私交易,只私对私需要特殊签名验证
// mix隐私交易,只私对私需要特殊签名验证
return
m
.
DriverBase
.
CheckTx
(
tx
,
index
)
return
m
.
DriverBase
.
CheckTx
(
tx
,
index
)
}
}
minTxFee
:=
m
.
GetAPI
()
.
GetConfig
()
.
GInt
(
"wallet.minFee"
)
_
,
_
,
err
:=
MixTransferInfoVerify
(
m
.
GetStateDB
(),
action
.
GetTransfer
())
_
,
_
,
err
:=
MixTransferInfoVerify
(
m
.
GetStateDB
(),
action
.
GetTransfer
(),
minTxFee
)
if
err
!=
nil
{
mlog
.
Error
(
"checkTx"
,
"err"
,
err
)
return
err
}
return
nil
}
// CheckTx check transaction
func
(
m
*
Mix
)
CheckTx
(
tx
*
types
.
Transaction
,
index
int
)
error
{
action
:=
new
(
mixTy
.
MixAction
)
if
err
:=
types
.
Decode
(
tx
.
Payload
,
action
);
err
!=
nil
{
mlog
.
Error
(
"CheckTx decode"
,
"err"
,
err
)
return
err
}
if
action
.
Ty
!=
mixTy
.
MixActionTransfer
{
// mix隐私交易,只私对私需要特殊签名验证
return
m
.
DriverBase
.
CheckTx
(
tx
,
index
)
}
_
,
_
,
err
:=
MixTransferInfoVerify
(
m
.
GetStateDB
(),
action
.
GetTransfer
())
if
err
!=
nil
{
if
err
!=
nil
{
mlog
.
Error
(
"checkTx"
,
"err"
,
err
)
mlog
.
Error
(
"checkTx"
,
"err"
,
err
)
return
err
return
err
...
...
plugin/dapp/mix/executor/transfer.go
View file @
6fc4d52e
...
@@ -13,7 +13,6 @@ import (
...
@@ -13,7 +13,6 @@ import (
"github.com/consensys/gurvy/bn256/twistededwards"
"github.com/consensys/gurvy/bn256/twistededwards"
dbm
"github.com/33cn/chain33/common/db"
dbm
"github.com/33cn/chain33/common/db"
"github.com/consensys/gurvy/bn256/fr"
"github.com/pkg/errors"
"github.com/pkg/errors"
)
)
...
@@ -72,18 +71,7 @@ func transferOutputVerify(db dbm.KV, proof *mixTy.ZkProofInfo) (*mixTy.TransferO
...
@@ -72,18 +71,7 @@ func transferOutputVerify(db dbm.KV, proof *mixTy.ZkProofInfo) (*mixTy.TransferO
}
}
func
getFee
()
*
twistededwards
.
Point
{
func
VerifyCommitValues
(
inputs
[]
*
mixTy
.
TransferInputPublicInput
,
outputs
[]
*
mixTy
.
TransferOutputPublicInput
,
minFee
int64
)
bool
{
//手续费 可配, 缺省100000, 即0.001, point=fee*G + 0*H
var
fee
fr
.
Element
fee
.
SetUint64
(
100000
)
.
FromMont
()
var
pointFee
twistededwards
.
Point
ed
:=
twistededwards
.
GetEdwardsCurve
()
pointFee
.
ScalarMul
(
&
ed
.
Base
,
fee
)
return
&
pointFee
}
func
VerifyCommitValues
(
inputs
[]
*
mixTy
.
TransferInputPublicInput
,
outputs
[]
*
mixTy
.
TransferOutputPublicInput
)
bool
{
var
inputPoints
,
outputPoints
[]
*
twistededwards
.
Point
var
inputPoints
,
outputPoints
[]
*
twistededwards
.
Point
for
_
,
in
:=
range
inputs
{
for
_
,
in
:=
range
inputs
{
var
p
twistededwards
.
Point
var
p
twistededwards
.
Point
...
@@ -99,7 +87,9 @@ func VerifyCommitValues(inputs []*mixTy.TransferInputPublicInput, outputs []*mix
...
@@ -99,7 +87,9 @@ func VerifyCommitValues(inputs []*mixTy.TransferInputPublicInput, outputs []*mix
outputPoints
=
append
(
outputPoints
,
&
p
)
outputPoints
=
append
(
outputPoints
,
&
p
)
}
}
//out value add fee
//out value add fee
outputPoints
=
append
(
outputPoints
,
getFee
())
//对于平行链来说, 隐私交易需要一个公共账户扣主链的手续费,隐私交易只需要扣平行链执行器内的费用即可
//由于平行链的隐私交易没有实际扣平行链mix合约的手续费,平行链Mix合约会有手续费留下,平行链隐私可以考虑手续费为0
outputPoints
=
append
(
outputPoints
,
mixTy
.
MulCurvePointG
(
uint64
(
minFee
)))
//sum input and output
//sum input and output
sumInput
:=
inputPoints
[
0
]
sumInput
:=
inputPoints
[
0
]
...
@@ -117,7 +107,7 @@ func VerifyCommitValues(inputs []*mixTy.TransferInputPublicInput, outputs []*mix
...
@@ -117,7 +107,7 @@ func VerifyCommitValues(inputs []*mixTy.TransferInputPublicInput, outputs []*mix
return
false
return
false
}
}
func
MixTransferInfoVerify
(
db
dbm
.
KV
,
transfer
*
mixTy
.
MixTransferAction
)
([]
*
mixTy
.
TransferInputPublicInput
,
[]
*
mixTy
.
TransferOutputPublicInput
,
error
)
{
func
MixTransferInfoVerify
(
db
dbm
.
KV
,
transfer
*
mixTy
.
MixTransferAction
,
minFee
int64
)
([]
*
mixTy
.
TransferInputPublicInput
,
[]
*
mixTy
.
TransferOutputPublicInput
,
error
)
{
var
inputs
[]
*
mixTy
.
TransferInputPublicInput
var
inputs
[]
*
mixTy
.
TransferInputPublicInput
var
outputs
[]
*
mixTy
.
TransferOutputPublicInput
var
outputs
[]
*
mixTy
.
TransferOutputPublicInput
...
@@ -137,7 +127,7 @@ func MixTransferInfoVerify(db dbm.KV, transfer *mixTy.MixTransferAction) ([]*mix
...
@@ -137,7 +127,7 @@ func MixTransferInfoVerify(db dbm.KV, transfer *mixTy.MixTransferAction) ([]*mix
outputs
=
append
(
outputs
,
out
)
outputs
=
append
(
outputs
,
out
)
}
}
if
!
VerifyCommitValues
(
inputs
,
outputs
)
{
if
!
VerifyCommitValues
(
inputs
,
outputs
,
minFee
)
{
return
nil
,
nil
,
errors
.
Wrap
(
mixTy
.
ErrSpendInOutValueNotMatch
,
"verifyValue"
)
return
nil
,
nil
,
errors
.
Wrap
(
mixTy
.
ErrSpendInOutValueNotMatch
,
"verifyValue"
)
}
}
...
@@ -150,7 +140,8 @@ func MixTransferInfoVerify(db dbm.KV, transfer *mixTy.MixTransferAction) ([]*mix
...
@@ -150,7 +140,8 @@ func MixTransferInfoVerify(db dbm.KV, transfer *mixTy.MixTransferAction) ([]*mix
3. add nullifier to pool
3. add nullifier to pool
*/
*/
func
(
a
*
action
)
Transfer
(
transfer
*
mixTy
.
MixTransferAction
)
(
*
types
.
Receipt
,
error
)
{
func
(
a
*
action
)
Transfer
(
transfer
*
mixTy
.
MixTransferAction
)
(
*
types
.
Receipt
,
error
)
{
inputs
,
outputs
,
err
:=
MixTransferInfoVerify
(
a
.
db
,
transfer
)
minTxFee
:=
a
.
api
.
GetConfig
()
.
GInt
(
"wallet.minFee"
)
inputs
,
outputs
,
err
:=
MixTransferInfoVerify
(
a
.
db
,
transfer
,
minTxFee
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"Transfer.MixTransferInfoVerify"
)
return
nil
,
errors
.
Wrap
(
err
,
"Transfer.MixTransferInfoVerify"
)
}
}
...
...
plugin/dapp/mix/proto/mix.proto
View file @
6fc4d52e
...
@@ -135,11 +135,7 @@ message WithdrawPublicInput {
...
@@ -135,11 +135,7 @@ message WithdrawPublicInput {
}
}
//加密了的input/output amount
message
commitAmount
{
string
X
=
1
;
string
Y
=
2
;
}
message
TransferInputPublicInput
{
message
TransferInputPublicInput
{
string
treeRootHash
=
1
;
string
treeRootHash
=
1
;
...
@@ -264,7 +260,7 @@ message DepositProofReq{
...
@@ -264,7 +260,7 @@ message DepositProofReq{
string
paymentAddr
=
1
;
string
paymentAddr
=
1
;
string
returnAddr
=
2
;
string
returnAddr
=
2
;
string
authorizeAddr
=
3
;
string
authorizeAddr
=
3
;
string
amount
=
4
;
uint64
amount
=
4
;
}
}
...
@@ -301,7 +297,7 @@ message WithdrawProofResp{
...
@@ -301,7 +297,7 @@ message WithdrawProofResp{
message
AuthProofReq
{
message
AuthProofReq
{
string
noteHash
=
1
;
string
noteHash
=
1
;
uint32
auth
Return
=
2
;
uint32
to
Return
=
2
;
}
}
message
AuthProofResp
{
message
AuthProofResp
{
...
@@ -316,6 +312,59 @@ message AuthProofResp{
...
@@ -316,6 +312,59 @@ message AuthProofResp{
}
}
message
TransferProofReq
{
string
noteHash
=
1
;
string
toAddr
=
2
;
string
toAuthAddr
=
3
;
string
returnAddr
=
4
;
uint64
amount
=
5
;
}
//加密了的input/output amount
message
commitValue
{
string
X
=
1
;
string
Y
=
2
;
}
message
TransferInputProof
{
SecretData
proof
=
1
;
string
nullifierHash
=
2
;
string
authSpendHash
=
3
;
string
noteHash
=
4
;
string
spendPrivKey
=
5
;
uint32
spendFlag
=
6
;
uint32
authFlag
=
7
;
TreePathProof
treeProof
=
8
;
commitValue
commitValue
=
9
;
string
spendRandom
=
10
;
}
message
TransferOutputProof
{
SecretData
proof
=
1
;
string
noteHash
=
2
;
DHSecretGroup
secrets
=
3
;
commitValue
commitValue
=
4
;
string
spendRandom
=
5
;
}
message
TransferProofResp
{
TransferInputProof
transferInput
=
1
;
TransferOutputProof
targetOutput
=
2
;
TransferOutputProof
changeOutput
=
3
;
}
message
CommitValueRst
{
string
noteRandom
=
1
;
string
transferRandom
=
2
;
string
changeRandom
=
3
;
commitValue
note
=
4
;
commitValue
transfer
=
5
;
commitValue
change
=
6
;
}
enum
NoteStatus
{
enum
NoteStatus
{
UNDEF
=
0
;
UNDEF
=
0
;
...
...
plugin/dapp/mix/rpc/rpc.go
View file @
6fc4d52e
...
@@ -142,7 +142,7 @@ func (c *Jrpc) DepositProof(in *mixTy.DepositProofReq, result *json.RawMessage)
...
@@ -142,7 +142,7 @@ func (c *Jrpc) DepositProof(in *mixTy.DepositProofReq, result *json.RawMessage)
return
err
return
err
}
}
func
(
c
*
Jrpc
)
AuthProof
(
in
*
mixTy
.
Deposit
ProofReq
,
result
*
json
.
RawMessage
)
error
{
func
(
c
*
Jrpc
)
AuthProof
(
in
*
mixTy
.
Auth
ProofReq
,
result
*
json
.
RawMessage
)
error
{
reply
,
err
:=
c
.
cli
.
ExecWalletFunc
(
mixTy
.
MixX
,
"AuthProof"
,
in
)
reply
,
err
:=
c
.
cli
.
ExecWalletFunc
(
mixTy
.
MixX
,
"AuthProof"
,
in
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
@@ -151,17 +151,8 @@ func (c *Jrpc) AuthProof(in *mixTy.DepositProofReq, result *json.RawMessage) err
...
@@ -151,17 +151,8 @@ func (c *Jrpc) AuthProof(in *mixTy.DepositProofReq, result *json.RawMessage) err
return
err
return
err
}
}
func
(
c
*
Jrpc
)
PayInProof
(
in
*
mixTy
.
DepositProofReq
,
result
*
json
.
RawMessage
)
error
{
func
(
c
*
Jrpc
)
TransferProof
(
in
*
mixTy
.
TransferProofReq
,
result
*
json
.
RawMessage
)
error
{
reply
,
err
:=
c
.
cli
.
ExecWalletFunc
(
mixTy
.
MixX
,
"PayInProof"
,
in
)
reply
,
err
:=
c
.
cli
.
ExecWalletFunc
(
mixTy
.
MixX
,
"TransferProof"
,
in
)
if
err
!=
nil
{
return
err
}
*
result
,
err
=
types
.
PBToJSON
(
reply
)
return
err
}
func
(
c
*
Jrpc
)
PayOutProof
(
in
*
mixTy
.
DepositProofReq
,
result
*
json
.
RawMessage
)
error
{
reply
,
err
:=
c
.
cli
.
ExecWalletFunc
(
mixTy
.
MixX
,
"PayOutProof"
,
in
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
plugin/dapp/mix/types/mix.go
View file @
6fc4d52e
...
@@ -39,3 +39,9 @@ const (
...
@@ -39,3 +39,9 @@ const (
MixActionTransfer
MixActionTransfer
MixActionAuth
MixActionAuth
)
)
//curve H point
const
(
PointHX
=
"10190477835300927557649934238820360529458681672073866116232821892325659279502"
PointHY
=
"7969140283216448215269095418467361784159407896899334866715345504515077887397"
)
plugin/dapp/mix/types/mix.pb.go
View file @
6fc4d52e
This diff is collapsed.
Click to expand it.
plugin/dapp/mix/types/type.go
View file @
6fc4d52e
...
@@ -13,6 +13,8 @@ import (
...
@@ -13,6 +13,8 @@ import (
log
"github.com/33cn/chain33/common/log/log15"
log
"github.com/33cn/chain33/common/log/log15"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/types"
"github.com/consensys/gurvy/bn256/fr"
"github.com/consensys/gurvy/bn256/twistededwards"
)
)
var
(
var
(
...
@@ -205,3 +207,40 @@ func DecodePubInput(ty VerifyType, input string) (interface{}, error) {
...
@@ -205,3 +207,40 @@ func DecodePubInput(ty VerifyType, input string) (interface{}, error) {
}
}
return
nil
,
types
.
ErrInvalidParam
return
nil
,
types
.
ErrInvalidParam
}
}
func
MulCurvePointG
(
val
interface
{})
*
twistededwards
.
Point
{
v
:=
fr
.
FromInterface
(
val
)
var
point
twistededwards
.
Point
ed
:=
twistededwards
.
GetEdwardsCurve
()
point
.
ScalarMul
(
&
ed
.
Base
,
*
v
.
FromMont
())
return
&
point
}
func
MulCurvePointH
(
val
string
)
*
twistededwards
.
Point
{
v
:=
fr
.
FromInterface
(
val
)
var
pointV
,
pointH
twistededwards
.
Point
pointH
.
X
.
SetString
(
PointHX
)
pointH
.
Y
.
SetString
(
PointHY
)
pointV
.
ScalarMul
(
&
pointH
,
*
v
.
FromMont
())
return
&
pointV
}
//A=B+C
func
CheckSumEqual
(
points
...*
twistededwards
.
Point
)
bool
{
if
len
(
points
)
<
2
{
return
false
}
//Add之前需初始化pointSum,不能空值,不然会等于0
pointSum
:=
twistededwards
.
NewPoint
(
points
[
1
]
.
X
,
points
[
1
]
.
Y
)
for
_
,
a
:=
range
points
[
2
:
]
{
pointSum
.
Add
(
&
pointSum
,
a
)
}
if
pointSum
.
X
.
Equal
(
&
points
[
0
]
.
X
)
&&
pointSum
.
Y
.
Equal
(
&
points
[
0
]
.
Y
)
{
return
true
}
return
false
}
plugin/dapp/mix/wallet/exec.go
View file @
6fc4d52e
...
@@ -54,3 +54,11 @@ func (policy *mixPolicy) On_DepositProof(req *mixTy.DepositProofReq) (types.Mess
...
@@ -54,3 +54,11 @@ func (policy *mixPolicy) On_DepositProof(req *mixTy.DepositProofReq) (types.Mess
func
(
policy
*
mixPolicy
)
On_WithdrawProof
(
req
*
mixTy
.
WithdrawProofReq
)
(
types
.
Message
,
error
)
{
func
(
policy
*
mixPolicy
)
On_WithdrawProof
(
req
*
mixTy
.
WithdrawProofReq
)
(
types
.
Message
,
error
)
{
return
policy
.
withdrawProof
(
req
)
return
policy
.
withdrawProof
(
req
)
}
}
func
(
policy
*
mixPolicy
)
On_AuthProof
(
req
*
mixTy
.
AuthProofReq
)
(
types
.
Message
,
error
)
{
return
policy
.
authProof
(
req
)
}
func
(
policy
*
mixPolicy
)
On_TransferProof
(
req
*
mixTy
.
TransferProofReq
)
(
types
.
Message
,
error
)
{
return
policy
.
transferProof
(
req
)
}
plugin/dapp/mix/wallet/mixbizdb_test.go
View file @
6fc4d52e
...
@@ -41,9 +41,10 @@ func TestNewPrivacyWithPrivKey(t *testing.T) {
...
@@ -41,9 +41,10 @@ func TestNewPrivacyWithPrivKey(t *testing.T) {
// NoteRandom:"2824204835",
// NoteRandom:"2824204835",
// Amount:"28242048",
// Amount:"28242048",
//}
//}
pub1
,
cryptData1
,
err
:=
encryptData
(
pairs
.
ShareSecretKey
.
ReceivingPk
,
types
.
Encode
(
secret1
))
data
:=
encryptData
(
pairs
.
ShareSecretKey
.
ReceivingPk
,
types
.
Encode
(
secret1
))
crypData
,
err
:=
common
.
FromHex
(
data
.
Secret
)
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
decryData1
,
err
:=
decryptData
(
pairs
.
ShareSecretKey
.
PrivKey
,
pub1
,
cryptData1
)
decryData1
,
err
:=
decryptData
(
pairs
.
ShareSecretKey
.
PrivKey
,
data
.
Epk
,
crypData
)
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
var
val
mixTy
.
SecretData
var
val
mixTy
.
SecretData
err
=
types
.
Decode
(
decryData1
,
&
val
)
err
=
types
.
Decode
(
decryData1
,
&
val
)
...
...
plugin/dapp/mix/wallet/mixsignature.go
View file @
6fc4d52e
...
@@ -12,13 +12,10 @@ import (
...
@@ -12,13 +12,10 @@ import (
"bytes"
"bytes"
"fmt"
"fmt"
"github.com/pkg/errors"
"github.com/33cn/chain33/common"
"github.com/33cn/chain33/common"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types"
"github.com/33cn/chain33/types"
mixExec
"github.com/33cn/plugin/plugin/dapp/mix/executor"
mixTy
"github.com/33cn/plugin/plugin/dapp/mix/types"
mixTy
"github.com/33cn/plugin/plugin/dapp/mix/types"
)
)
...
@@ -102,31 +99,32 @@ func (pubkey *MixSignPublicKey) Bytes() []byte {
...
@@ -102,31 +99,32 @@ func (pubkey *MixSignPublicKey) Bytes() []byte {
return
pubkey
.
key
[
:
]
return
pubkey
.
key
[
:
]
}
}
func
verifyCommitAmount
(
transfer
*
mixTy
.
MixTransferAction
)
error
{
//
var
inputs
[]
*
mixTy
.
TransferInputPublicInput
//func verifyCommitAmount(transfer *mixTy.MixTransferAction) error {
var
outputs
[]
*
mixTy
.
TransferOutputPublicInput
// var inputs []*mixTy.TransferInputPublicInput
// var outputs []*mixTy.TransferOutputPublicInput
for
_
,
k
:=
range
transfer
.
Input
{
//
v
,
err
:=
mixTy
.
DecodePubInput
(
mixTy
.
VerifyType_TRANSFERINPUT
,
k
.
PublicInput
)
// for _, k := range transfer.Input {
if
err
!=
nil
{
// v, err := mixTy.DecodePubInput(mixTy.VerifyType_TRANSFERINPUT, k.PublicInput)
return
errors
.
Wrap
(
types
.
ErrInvalidParam
,
"decode transfer Input"
)
// if err != nil {
}
// return errors.Wrap(types.ErrInvalidParam, "decode transfer Input")
inputs
=
append
(
inputs
,
v
.
(
*
mixTy
.
TransferInputPublicInput
))
// }
}
// inputs = append(inputs, v.(*mixTy.TransferInputPublicInput))
// }
for
_
,
k
:=
range
transfer
.
Output
{
//
v
,
err
:=
mixTy
.
DecodePubInput
(
mixTy
.
VerifyType_TRANSFEROUTPUT
,
k
.
PublicInput
)
// for _, k := range transfer.Output {
if
err
!=
nil
{
// v, err := mixTy.DecodePubInput(mixTy.VerifyType_TRANSFEROUTPUT, k.PublicInput)
return
errors
.
Wrap
(
types
.
ErrInvalidParam
,
"decode transfer output"
)
// if err != nil {
}
// return errors.Wrap(types.ErrInvalidParam, "decode transfer output")
outputs
=
append
(
outputs
,
v
.
(
*
mixTy
.
TransferOutputPublicInput
))
// }
}
// outputs = append(outputs, v.(*mixTy.TransferOutputPublicInput))
// }
if
!
mixExec
.
VerifyCommitValues
(
inputs
,
outputs
)
{
//
return
errors
.
Wrap
(
types
.
ErrInvalidParam
,
"verify commit amount"
)
// if !mixExec.VerifyCommitValues(inputs, outputs) {
}
// return errors.Wrap(types.ErrInvalidParam, "verify commit amount")
return
nil
// }
}
// return nil
//}
// VerifyBytes verify bytes
// VerifyBytes verify bytes
func
(
pubkey
*
MixSignPublicKey
)
VerifyBytes
(
msg
[]
byte
,
sign
crypto
.
Signature
)
bool
{
func
(
pubkey
*
MixSignPublicKey
)
VerifyBytes
(
msg
[]
byte
,
sign
crypto
.
Signature
)
bool
{
...
@@ -157,11 +155,6 @@ func (pubkey *MixSignPublicKey) VerifyBytes(msg []byte, sign crypto.Signature) b
...
@@ -157,11 +155,6 @@ func (pubkey *MixSignPublicKey) VerifyBytes(msg []byte, sign crypto.Signature) b
return
false
return
false
}
}
if
err
:=
verifyCommitAmount
(
action
.
GetTransfer
());
err
!=
nil
{
bizlog
.
Error
(
"pubkey.VerifyBytes verify amount"
,
"err"
,
err
)
return
false
}
return
true
return
true
}
}
...
...
plugin/dapp/mix/wallet/proof.go
0 → 100644
View file @
6fc4d52e
This diff is collapsed.
Click to expand it.
plugin/dapp/mix/wallet/proof_test.go
0 → 100644
View file @
6fc4d52e
package
wallet
import
(
"testing"
"github.com/stretchr/testify/assert"
)
func
TestGetCommitValue
(
t
*
testing
.
T
)
{
var
note
,
transfer
,
minFee
uint64
note
=
100
transfer
=
60
minFee
=
1
_
,
err
:=
getCommitValue
(
note
,
transfer
,
minFee
)
assert
.
Nil
(
t
,
err
)
//transfer > note
note
=
100
transfer
=
100
minFee
=
1
_
,
err
=
getCommitValue
(
note
,
transfer
,
minFee
)
t
.
Log
(
err
)
assert
.
NotNil
(
t
,
err
)
note
=
100
transfer
=
101
minFee
=
0
_
,
err
=
getCommitValue
(
note
,
transfer
,
minFee
)
t
.
Log
(
err
)
assert
.
NotNil
(
t
,
err
)
//change=0
note
=
100
transfer
=
99
minFee
=
1
_
,
err
=
getCommitValue
(
note
,
transfer
,
minFee
)
assert
.
Nil
(
t
,
err
)
}
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