diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-02-22 13:14:55 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:22 +0800 |
| commit | 2354d4aa747616a8fd4fb9482ada8042fd362139 (patch) | |
| tree | 46fe0953c0258591c2cd415c3760764ff613a5bb /params/gen_dexcon_config.go | |
| parent | 81193a683d6328b627ee0e5f0f3689b3473e29ea (diff) | |
| download | go-tangerine-2354d4aa747616a8fd4fb9482ada8042fd362139.tar go-tangerine-2354d4aa747616a8fd4fb9482ada8042fd362139.tar.gz go-tangerine-2354d4aa747616a8fd4fb9482ada8042fd362139.tar.bz2 go-tangerine-2354d4aa747616a8fd4fb9482ada8042fd362139.tar.lz go-tangerine-2354d4aa747616a8fd4fb9482ada8042fd362139.tar.xz go-tangerine-2354d4aa747616a8fd4fb9482ada8042fd362139.tar.zst go-tangerine-2354d4aa747616a8fd4fb9482ada8042fd362139.zip | |
core: Remove K, Phi and NumChains from Governance (#198)
* change default sync_core.sh
* vendor: sync to latest core
* core: Remove K, Phi and NumChain
Diffstat (limited to 'params/gen_dexcon_config.go')
| -rw-r--r-- | params/gen_dexcon_config.go | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/params/gen_dexcon_config.go b/params/gen_dexcon_config.go index 29ebf2eaf..566ed9fcd 100644 --- a/params/gen_dexcon_config.go +++ b/params/gen_dexcon_config.go @@ -23,14 +23,11 @@ func (d DexconConfig) MarshalJSON() ([]byte, error) { NextHalvingSupply *math.HexOrDecimal256 `json:"nextHalvingSupply"` LastHalvedAmount *math.HexOrDecimal256 `json:"lastHalvedAmount"` BlockGasLimit uint64 `json:"blockGasLimit"` - NumChains uint32 `json:"numChains"` LambdaBA uint64 `json:"lambdaBA"` LambdaDKG uint64 `json:"lambdaDKG"` - K uint32 `json:"k"` - PhiRatio float32 `json:"phiRatio"` NotarySetSize uint32 `json:"notarySetSize"` DKGSetSize uint32 `json:"dkgSetSize"` - RoundInterval uint64 `json:"roundInterval"` + RoundLength uint64 `json:"roundLength"` MinBlockInterval uint64 `json:"minBlockInterval"` FineValues []*math.HexOrDecimal256 `json:"fineValues"` } @@ -43,14 +40,11 @@ func (d DexconConfig) MarshalJSON() ([]byte, error) { enc.NextHalvingSupply = (*math.HexOrDecimal256)(d.NextHalvingSupply) enc.LastHalvedAmount = (*math.HexOrDecimal256)(d.LastHalvedAmount) enc.BlockGasLimit = d.BlockGasLimit - enc.NumChains = d.NumChains enc.LambdaBA = d.LambdaBA enc.LambdaDKG = d.LambdaDKG - enc.K = d.K - enc.PhiRatio = d.PhiRatio enc.NotarySetSize = d.NotarySetSize enc.DKGSetSize = d.DKGSetSize - enc.RoundInterval = d.RoundInterval + enc.RoundLength = d.RoundLength enc.MinBlockInterval = d.MinBlockInterval if d.FineValues != nil { enc.FineValues = make([]*math.HexOrDecimal256, len(d.FineValues)) @@ -72,14 +66,11 @@ func (d *DexconConfig) UnmarshalJSON(input []byte) error { NextHalvingSupply *math.HexOrDecimal256 `json:"nextHalvingSupply"` LastHalvedAmount *math.HexOrDecimal256 `json:"lastHalvedAmount"` BlockGasLimit *uint64 `json:"blockGasLimit"` - NumChains *uint32 `json:"numChains"` LambdaBA *uint64 `json:"lambdaBA"` LambdaDKG *uint64 `json:"lambdaDKG"` - K *uint32 `json:"k"` - PhiRatio *float32 `json:"phiRatio"` NotarySetSize *uint32 `json:"notarySetSize"` DKGSetSize *uint32 `json:"dkgSetSize"` - RoundInterval *uint64 `json:"roundInterval"` + RoundLength *uint64 `json:"roundLength"` MinBlockInterval *uint64 `json:"minBlockInterval"` FineValues []*math.HexOrDecimal256 `json:"fineValues"` } @@ -111,29 +102,20 @@ func (d *DexconConfig) UnmarshalJSON(input []byte) error { if dec.BlockGasLimit != nil { d.BlockGasLimit = *dec.BlockGasLimit } - if dec.NumChains != nil { - d.NumChains = *dec.NumChains - } if dec.LambdaBA != nil { d.LambdaBA = *dec.LambdaBA } if dec.LambdaDKG != nil { d.LambdaDKG = *dec.LambdaDKG } - if dec.K != nil { - d.K = *dec.K - } - if dec.PhiRatio != nil { - d.PhiRatio = *dec.PhiRatio - } if dec.NotarySetSize != nil { d.NotarySetSize = *dec.NotarySetSize } if dec.DKGSetSize != nil { d.DKGSetSize = *dec.DKGSetSize } - if dec.RoundInterval != nil { - d.RoundInterval = *dec.RoundInterval + if dec.RoundLength != nil { + d.RoundLength = *dec.RoundLength } if dec.MinBlockInterval != nil { d.MinBlockInterval = *dec.MinBlockInterval |