aboutsummaryrefslogtreecommitdiffstats
path: root/params
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2019-03-19 16:22:55 +0800
committerWei-Ning Huang <w@byzantine-lab.io>2019-06-13 18:11:42 +0800
commit52abd7878fc59776550c73b0e1c6746448c83c17 (patch)
tree5824ad4b21fd51b2bfb496914791d71de99dfceb /params
parent55e22571a1cd5ef5d27a29ab1b0ecfb1b78cb264 (diff)
downloadgo-tangerine-52abd7878fc59776550c73b0e1c6746448c83c17.tar
go-tangerine-52abd7878fc59776550c73b0e1c6746448c83c17.tar.gz
go-tangerine-52abd7878fc59776550c73b0e1c6746448c83c17.tar.bz2
go-tangerine-52abd7878fc59776550c73b0e1c6746448c83c17.tar.lz
go-tangerine-52abd7878fc59776550c73b0e1c6746448c83c17.tar.xz
go-tangerine-52abd7878fc59776550c73b0e1c6746448c83c17.tar.zst
go-tangerine-52abd7878fc59776550c73b0e1c6746448c83c17.zip
core: vm: automatically calculate notary set size (#276)
Diffstat (limited to 'params')
-rw-r--r--params/config.go34
-rw-r--r--params/gen_dexcon_config.go20
2 files changed, 27 insertions, 27 deletions
diff --git a/params/config.go b/params/config.go
index 52570d5a4..f61a9b6df 100644
--- a/params/config.go
+++ b/params/config.go
@@ -26,10 +26,10 @@ import (
// Genesis hashes to enforce below configs on.
var (
- MainnetGenesisHash = common.HexToHash("0xcde2f22a8ccad92a6839880e445bccf3949aae712056a9d139a318f9f4b18fe8")
- TestnetGenesisHash = common.HexToHash("0x7463c980be61ae7e32e8a7611c9532989dfc4463c264b9ef3d31bfe490780425")
- TaipeiGenesisHash = common.HexToHash("0x953540c8dc6155c506b85be9944b97c636948e2cb47b698e4bdf7d58563a6e01")
- YilanGenesisHash = common.HexToHash("0x70654e2b863f01f00f843e6c4b0ecf2af39f7e27493f577ca4526b40eb1773c7")
+ MainnetGenesisHash = common.HexToHash("0x8ac8e240790046eb72225eb2a2381f3ef5a7a88291fffc702ba08503cc2a1341")
+ TestnetGenesisHash = common.HexToHash("0x3caf9a977e579b4de001956508b57563a4b61742c66f49323a1294ad214da29d")
+ TaipeiGenesisHash = common.HexToHash("0x13e85a0207f2888ac9c1746c94d5d7fd87ff637cbd080b42d5db1252341f4428")
+ YilanGenesisHash = common.HexToHash("0x6b1a94b5e4c24665942a3b768bd98b39d61771a5eaba97c0466644d78d8a2f11")
)
// TrustedCheckpoints associates each known checkpoint with the genesis hash of
@@ -66,8 +66,8 @@ var (
BlockGasLimit: 40000000,
LambdaBA: 250,
LambdaDKG: 2500,
- NotarySetSize: 4,
- DKGSetSize: 4,
+ NotaryParamAlpha: 70.5,
+ NotaryParamBeta: 264,
RoundLength: 600,
MinBlockInterval: 1000,
FineValues: []*big.Int{
@@ -117,8 +117,8 @@ var (
BlockGasLimit: 80000000,
LambdaBA: 250,
LambdaDKG: 10000,
- NotarySetSize: 24,
- DKGSetSize: 24,
+ NotaryParamAlpha: 70.5,
+ NotaryParamBeta: 264,
RoundLength: 1200,
MinBlockInterval: 1000,
FineValues: []*big.Int{
@@ -159,8 +159,8 @@ var (
BlockGasLimit: 21000 * 5000,
LambdaBA: 250,
LambdaDKG: 10000,
- NotarySetSize: 24,
- DKGSetSize: 24,
+ NotaryParamAlpha: 70.5,
+ NotaryParamBeta: 264,
RoundLength: 1200,
MinBlockInterval: 500,
FineValues: []*big.Int{
@@ -209,8 +209,8 @@ var (
BlockGasLimit: 21000 * 5000,
LambdaBA: 250,
LambdaDKG: 10000,
- NotarySetSize: 4,
- DKGSetSize: 4,
+ NotaryParamAlpha: 70.5,
+ NotaryParamBeta: 264,
RoundLength: 1200,
MinBlockInterval: 500,
FineValues: []*big.Int{
@@ -359,8 +359,8 @@ type DexconConfig struct {
BlockGasLimit uint64 `json:"blockGasLimit"`
LambdaBA uint64 `json:"lambdaBA"`
LambdaDKG uint64 `json:"lambdaDKG"`
- NotarySetSize uint32 `json:"notarySetSize"`
- DKGSetSize uint32 `json:"dkgSetSize"`
+ NotaryParamAlpha float32 `json:"notaryParamAlpha"`
+ NotaryParamBeta float32 `json:"notaryParamBeta"`
RoundLength uint64 `json:"roundLength"`
MinBlockInterval uint64 `json:"minBlockInterval"`
FineValues []*big.Int `json:"fineValues"`
@@ -376,7 +376,7 @@ type dexconConfigSpecMarshaling struct {
// String implements the stringer interface, returning the consensus engine details.
func (d *DexconConfig) String() string {
- return fmt.Sprintf("{GenesisCRSText: %v Owner: %v MinStake: %v LockupPeriod: %v MiningVelocity: %v NextHalvingSupply: %v LastHalvedAmount: %v MinGasPrice: %v BlockGasLimit: %v LambdaBA: %v LambdaDKG: %v NotarySetSize: %v DKGSetSize: %v RoundLength: %v MinBlockInterval: %v FineValues: %v}",
+ return fmt.Sprintf("{GenesisCRSText: %v Owner: %v MinStake: %v LockupPeriod: %v MiningVelocity: %v NextHalvingSupply: %v LastHalvedAmount: %v MinGasPrice: %v BlockGasLimit: %v LambdaBA: %v LambdaDKG: %v NotaryParamAlpha: %v NotaryParamBeta: %v RoundLength: %v MinBlockInterval: %v FineValues: %v}",
d.GenesisCRSText,
d.Owner,
d.MinStake,
@@ -388,8 +388,8 @@ func (d *DexconConfig) String() string {
d.BlockGasLimit,
d.LambdaBA,
d.LambdaDKG,
- d.NotarySetSize,
- d.DKGSetSize,
+ d.NotaryParamAlpha,
+ d.NotaryParamBeta,
d.RoundLength,
d.MinBlockInterval,
d.FineValues,
diff --git a/params/gen_dexcon_config.go b/params/gen_dexcon_config.go
index 38753916a..dbceb1676 100644
--- a/params/gen_dexcon_config.go
+++ b/params/gen_dexcon_config.go
@@ -26,8 +26,8 @@ func (d DexconConfig) MarshalJSON() ([]byte, error) {
BlockGasLimit uint64 `json:"blockGasLimit"`
LambdaBA uint64 `json:"lambdaBA"`
LambdaDKG uint64 `json:"lambdaDKG"`
- NotarySetSize uint32 `json:"notarySetSize"`
- DKGSetSize uint32 `json:"dkgSetSize"`
+ NotaryParamAlpha float32 `json:"notaryParamAlpha"`
+ NotaryParamBeta float32 `json:"notaryParamBeta"`
RoundLength uint64 `json:"roundLength"`
MinBlockInterval uint64 `json:"minBlockInterval"`
FineValues []*math.HexOrDecimal256 `json:"fineValues"`
@@ -44,8 +44,8 @@ func (d DexconConfig) MarshalJSON() ([]byte, error) {
enc.BlockGasLimit = d.BlockGasLimit
enc.LambdaBA = d.LambdaBA
enc.LambdaDKG = d.LambdaDKG
- enc.NotarySetSize = d.NotarySetSize
- enc.DKGSetSize = d.DKGSetSize
+ enc.NotaryParamAlpha = d.NotaryParamAlpha
+ enc.NotaryParamBeta = d.NotaryParamBeta
enc.RoundLength = d.RoundLength
enc.MinBlockInterval = d.MinBlockInterval
if d.FineValues != nil {
@@ -71,8 +71,8 @@ func (d *DexconConfig) UnmarshalJSON(input []byte) error {
BlockGasLimit *uint64 `json:"blockGasLimit"`
LambdaBA *uint64 `json:"lambdaBA"`
LambdaDKG *uint64 `json:"lambdaDKG"`
- NotarySetSize *uint32 `json:"notarySetSize"`
- DKGSetSize *uint32 `json:"dkgSetSize"`
+ NotaryParamAlpha *float32 `json:"notaryParamAlpha"`
+ NotaryParamBeta *float32 `json:"notaryParamBeta"`
RoundLength *uint64 `json:"roundLength"`
MinBlockInterval *uint64 `json:"minBlockInterval"`
FineValues []*math.HexOrDecimal256 `json:"fineValues"`
@@ -114,11 +114,11 @@ func (d *DexconConfig) UnmarshalJSON(input []byte) error {
if dec.LambdaDKG != nil {
d.LambdaDKG = *dec.LambdaDKG
}
- if dec.NotarySetSize != nil {
- d.NotarySetSize = *dec.NotarySetSize
+ if dec.NotaryParamAlpha != nil {
+ d.NotaryParamAlpha = *dec.NotaryParamAlpha
}
- if dec.DKGSetSize != nil {
- d.DKGSetSize = *dec.DKGSetSize
+ if dec.NotaryParamBeta != nil {
+ d.NotaryParamBeta = *dec.NotaryParamBeta
}
if dec.RoundLength != nil {
d.RoundLength = *dec.RoundLength