Merge branch 'master' into fix/deposits

Former-commit-id: 476972e0c3a1c1ec858cc77fbeb1f1f74042b177 [formerly 658337b5062f39fd2ab8e31de09357c29a80ab49]
Former-commit-id: f47b6700d0c3756b6f0a51ee61f779611a48e66c
This commit is contained in:
Preston Van Loon 2018-05-13 13:23:20 -04:00 committed by GitHub
commit 133026feef
2 changed files with 8 additions and 1 deletions

View File

@ -83,6 +83,12 @@ var AppHelpFlagGroups = []flagGroup{
utils.LightKDFFlag,
},
},
{
Name: "SHARDING",
Flags: []cli.Flag{
utils.DepositFlag,
},
},
{Name: "DEVELOPER CHAIN",
Flags: []cli.Flag{
utils.DeveloperFlag,

View File

@ -55,6 +55,7 @@ import (
"github.com/ethereum/go-ethereum/p2p/nat"
"github.com/ethereum/go-ethereum/p2p/netutil"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/sharding"
whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
"gopkg.in/urfave/cli.v1"
)
@ -536,7 +537,7 @@ var (
//Sharding Settings
DepositFlag = cli.BoolFlag{
Name: "deposit",
Usage: "To become a notary with your sharding client, 100 ETH will be deposited from user's account into SMC ",
Usage: "To become a notary with your sharding client, " + new(big.Int).Div(sharding.NotaryDeposit, new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil)).String() + " ETH will be deposited into SMC",
}
)