Commit d52b87a1 authored by jiangpeng's avatar jiangpeng Committed by vipwzw

add subcfg genesis amount

parent 3603d6d7
...@@ -67,6 +67,7 @@ type client struct { ...@@ -67,6 +67,7 @@ type client struct {
authAccount string authAccount string
privateKey crypto.PrivKey privateKey crypto.PrivKey
wg sync.WaitGroup wg sync.WaitGroup
subCfg *subConfig
} }
type subConfig struct { type subConfig struct {
...@@ -77,6 +78,7 @@ type subConfig struct { ...@@ -77,6 +78,7 @@ type subConfig struct {
AuthAccount string `json:"authAccount,omitempty"` AuthAccount string `json:"authAccount,omitempty"`
WaitBlocks4CommitMsg int32 `json:"waitBlocks4CommitMsg,omitempty"` WaitBlocks4CommitMsg int32 `json:"waitBlocks4CommitMsg,omitempty"`
SearchHashMatchedBlockDepth int32 `json:"searchHashMatchedBlockDepth,omitempty"` SearchHashMatchedBlockDepth int32 `json:"searchHashMatchedBlockDepth,omitempty"`
GenesisAmount int64 `json:"genesisAmount,omitempty"`
} }
// New function to init paracross env // New function to init paracross env
...@@ -134,6 +136,7 @@ func New(cfg *types.Consensus, sub []byte) queue.Module { ...@@ -134,6 +136,7 @@ func New(cfg *types.Consensus, sub []byte) queue.Module {
authAccount: subcfg.AuthAccount, authAccount: subcfg.AuthAccount,
privateKey: priKey, privateKey: priKey,
isCaughtUp: false, isCaughtUp: false,
subCfg: &subcfg,
} }
if subcfg.WaitBlocks4CommitMsg < 2 { if subcfg.WaitBlocks4CommitMsg < 2 {
panic("config WaitBlocks4CommitMsg should not less 2") panic("config WaitBlocks4CommitMsg should not less 2")
...@@ -250,7 +253,7 @@ func (client *client) CreateGenesisTx() (ret []*types.Transaction) { ...@@ -250,7 +253,7 @@ func (client *client) CreateGenesisTx() (ret []*types.Transaction) {
//gen payload //gen payload
g := &cty.CoinsAction_Genesis{} g := &cty.CoinsAction_Genesis{}
g.Genesis = &types.AssetsGenesis{} g.Genesis = &types.AssetsGenesis{}
g.Genesis.Amount = 1e8 * types.Coin g.Genesis.Amount = client.subCfg.GenesisAmount * types.Coin
tx.Payload = types.Encode(&cty.CoinsAction{Value: g, Ty: cty.CoinsActionGenesis}) tx.Payload = types.Encode(&cty.CoinsAction{Value: g, Ty: cty.CoinsActionGenesis})
ret = append(ret, &tx) ret = append(ret, &tx)
return return
......
...@@ -99,6 +99,8 @@ emptyBlockInterval=4 ...@@ -99,6 +99,8 @@ emptyBlockInterval=4
authAccount="1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4" authAccount="1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4"
#等待平行链共识消息在主链上链并成功的块数,超出会重发共识消息,最小是2 #等待平行链共识消息在主链上链并成功的块数,超出会重发共识消息,最小是2
waitBlocks4CommitMsg=2 waitBlocks4CommitMsg=2
#创世地址额度
genesisAmount=100000000
[store] [store]
name="mavl" name="mavl"
......
...@@ -101,6 +101,8 @@ authAccount="" ...@@ -101,6 +101,8 @@ authAccount=""
#等待平行链共识消息在主链上链并成功的块数,超出会重发共识消息,最小是2 #等待平行链共识消息在主链上链并成功的块数,超出会重发共识消息,最小是2
waitBlocks4CommitMsg=2 waitBlocks4CommitMsg=2
searchHashMatchedBlockDepth=100 searchHashMatchedBlockDepth=100
#创世地址额度
genesisAmount=100000000
[store] [store]
name="mavl" name="mavl"
......
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