Skip to content

P
plugin
Commit 6c15a065 authored by liuyuhang's avatar liuyuhang
Browse files
Options

modify some dapp cli command config

parent b47ce606
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 41 deletions
go.mod
View file @ 6c15a065
......@@ -38,4 +38,4 @@ require (
gopkg.in/sourcemap.v1 v1.0.5 // indirect
)
replace github.com/33cn/chain33 => github.com/lyh169/chain33 v0.0.0-20190930095658-54e45a73f547
replace github.com/33cn/chain33 => github.com/lyh169/chain33 v0.0.0-20191010100821-0fe85b69ee68
go.sum
View file @ 6c15a065
......@@ -119,6 +119,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/lyh169/chain33 v0.0.0-20190930095658-54e45a73f547 h1:dFTRKC3WuOQGQMCmo9X3MPdASNKklcbvOJ3NP9c67ig=
github.com/lyh169/chain33 v0.0.0-20190930095658-54e45a73f547/go.mod h1:4I8n+Zyf3t0UKM5jjpqJY627Tub62oXkLsdzIv4r6rQ=
github.com/lyh169/chain33 v0.0.0-20191010100821-0fe85b69ee68 h1:ynWPfBxKR/nvifxCkknY0RKSWQH9UNT6Q2dcamik/Ws=
github.com/lyh169/chain33 v0.0.0-20191010100821-0fe85b69ee68/go.mod h1:4I8n+Zyf3t0UKM5jjpqJY627Tub62oXkLsdzIv4r6rQ=
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
......
plugin/dapp/hashlock/commands/hashlock.go
View file @ 6c15a065
......@@ -44,12 +44,6 @@ func HashlockLockCmd() *cobra.Command {
}
func addHashlockLockCmdFlags(cmd *cobra.Command) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
cmd.Flags().StringP("secret", "s", "", "secret information")
cmd.MarkFlagRequired("secret")
cmd.Flags().Float64P("amount", "a", 0.0, "locking amount")
......@@ -61,18 +55,28 @@ func addHashlockLockCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringP("return", "r", "", "return address")
cmd.MarkFlagRequired("return")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
cmd.Flags().Float64P("fee", "f", defaultFee, "transaction fee")
cmd.Flags().Float64P("fee", "f", 0.0, "transaction fee")
}
func hashlockLockCmd(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
secret, _ := cmd.Flags().GetString("secret")
toAddr, _ := cmd.Flags().GetString("to")
returnAddr, _ := cmd.Flags().GetString("return")
delay, _ := cmd.Flags().GetInt64("delay")
amount, _ := cmd.Flags().GetFloat64("amount")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
fee, _ := cmd.Flags().GetFloat64("fee")
if fee < defaultFee {
fee = defaultFee
}
if delay < 60 {
fmt.Println("delay period changed to 60")
......@@ -115,23 +119,27 @@ func HashlockUnlockCmd() *cobra.Command {
}
func addHashlockCmdFlags(cmd *cobra.Command) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
cmd.Flags().StringP("secret", "s", "", "secret information")
cmd.MarkFlagRequired("secret")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
cmd.Flags().Float64P("fee", "f", defaultFee, "transaction fee")
cmd.Flags().Float64P("fee", "f", 0.0, "transaction fee")
}
func hashlockUnlockCmd(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
secret, _ := cmd.Flags().GetString("secret")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
fee, _ := cmd.Flags().GetFloat64("fee")
if fee < defaultFee {
fee = defaultFee
}
feeInt64 := int64(fee*types.InputPrecision) * types.Multiple1E4
params := pty.HashlockUnlockTx{
......@@ -164,9 +172,20 @@ func HashlockSendCmd() *cobra.Command {
}
func hashlockSendCmd(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
secret, _ := cmd.Flags().GetString("secret")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
fee, _ := cmd.Flags().GetFloat64("fee")
if fee < defaultFee {
fee = defaultFee
}
feeInt64 := int64(fee*types.InputPrecision) * types.Multiple1E4
params := pty.HashlockSendTx{
......
plugin/dapp/retrieve/cmd/retrieve.go
View file @ 6c15a065
......@@ -53,12 +53,6 @@ func BackupCmd() *cobra.Command {
}
func addBakupCmdFlags(cmd *cobra.Command) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
cmd.Flags().StringP("backup", "b", "", "backup address")
cmd.MarkFlagRequired("backup")
cmd.Flags().StringP("default", "t", "", "default address")
......@@ -66,16 +60,26 @@ func addBakupCmdFlags(cmd *cobra.Command) {
cmd.Flags().Int64P("delay", "d", 60, "delay period (minimum 60 seconds)")
cmd.MarkFlagRequired("delay")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
cmd.Flags().Float64P("fee", "f", defaultFee, "transaction fee")
cmd.Flags().Float64P("fee", "f", 0.0, "transaction fee")
}
func backupCmd(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
backup, _ := cmd.Flags().GetString("backup")
defaultAddr, _ := cmd.Flags().GetString("default")
delay, _ := cmd.Flags().GetInt64("delay")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
fee, _ := cmd.Flags().GetFloat64("fee")
if fee < defaultFee {
fee = defaultFee
}
if delay < 60 {
fmt.Println("delay period changed to 60")
......@@ -104,28 +108,15 @@ func PrepareCmd() *cobra.Command {
}
func addRetrieveCmdFlags(cmd *cobra.Command) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
cmd.Flags().StringP("backup", "b", "", "backup address")
cmd.MarkFlagRequired("backup")
cmd.Flags().StringP("default", "t", "", "default address")
cmd.MarkFlagRequired("default")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
cmd.Flags().Float64P("fee", "f", defaultFee, "sign address")
cmd.Flags().Float64P("fee", "f", 0.0, "sign address")
}
func addPerformCmdFlags(cmd *cobra.Command) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
cmd.Flags().StringP("backup", "b", "", "backup address")
cmd.MarkFlagRequired("backup")
cmd.Flags().StringP("default", "t", "", "default address")
......@@ -134,15 +125,25 @@ func addPerformCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringArrayP("exec", "e", []string{}, "asset exec")
cmd.Flags().StringArrayP("symbol", "s", []string{}, "asset symbol")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
cmd.Flags().Float64P("fee", "f", defaultFee, "sign address")
cmd.Flags().Float64P("fee", "f", 0.0, "sign address")
}
func prepareCmd(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
backup, _ := cmd.Flags().GetString("backup")
defaultAddr, _ := cmd.Flags().GetString("default")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
fee, _ := cmd.Flags().GetFloat64("fee")
if fee < defaultFee {
fee = defaultFee
}
feeInt64 := int64(fee*types.InputPrecision) * types.Multiple1E4
params := rpc.RetrievePrepareTx{
......@@ -166,10 +167,21 @@ func PerformCmd() *cobra.Command {
}
func performCmd(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
backup, _ := cmd.Flags().GetString("backup")
defaultAddr, _ := cmd.Flags().GetString("default")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
fee, _ := cmd.Flags().GetFloat64("fee")
if fee < defaultFee {
fee = defaultFee
}
execs, _ := cmd.Flags().GetStringArray("exec")
symbols, _ := cmd.Flags().GetStringArray("symbol")
......@@ -205,10 +217,21 @@ func CancelCmd() *cobra.Command {
}
func cancelCmd(cmd *cobra.Command, args []string) {
title, _ := cmd.Flags().GetString("title")
cfg := types.GetCliSysParam(title)
if cfg == nil {
panic(fmt.Sprintln("can not find CliSysParam title", title))
}
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
backup, _ := cmd.Flags().GetString("backup")
defaultAddr, _ := cmd.Flags().GetString("default")
defaultFee := float64(cfg.GInt("MinFee")) / float64(types.Coin)
fee, _ := cmd.Flags().GetFloat64("fee")
if fee < defaultFee {
fee = defaultFee
}
feeInt64 := int64(fee*types.InputPrecision) * types.Multiple1E4
params := rpc.RetrieveCancelTx{
......
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