From 0d903015083383b18a7d6a566a97581899d6bbf1 Mon Sep 17 00:00:00 2001 From: ping-ke Date: Tue, 29 Mar 2022 16:20:32 +0800 Subject: [PATCH] Update mainnet config for root chain posw (#653) * update mainnet config for root chain posw * update enable BOOST_TIMESTAMP * update mainnet BOOST_TIMESTAMP --- .../singularity/cluster_config_bootnodes.json | 15 ++++++++++-- .../singularity/cluster_config_template.json | 8 +++---- .../cluster_config_template_8nodes.json | 24 +++++++++++++------ 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/mainnet/singularity/cluster_config_bootnodes.json b/mainnet/singularity/cluster_config_bootnodes.json index a9aa8fecb..62ab88a43 100644 --- a/mainnet/singularity/cluster_config_bootnodes.json +++ b/mainnet/singularity/cluster_config_bootnodes.json @@ -14,6 +14,7 @@ "GENESIS_DIR": null, "QUARKCHAIN": { "CHAIN_SIZE": 8, + "BASE_ETH_CHAIN_ID":100000, "MAX_NEIGHBORS": 32, "NETWORK_ID": 1, "TRANSACTION_QUEUE_SIZE_LIMIT_PER_SHARD": 10000, @@ -28,7 +29,6 @@ "ENABLE_TX_TIMESTAMP": 1561791600, "ENABLE_EVM_TIMESTAMP": 1569567600, "ENABLE_EIP155_SIGNER_TIMESTAMP": 1631577600, - "BASE_ETH_CHAIN_ID":100000, "ENABLE_QKCHASHX_HEIGHT": 1480000, "ENABLE_NON_RESERVED_NATIVE_TOKEN_TIMESTAMP": 1588291200, "ENABLE_GENERAL_NATIVE_TOKEN_TIMESTAMP": 1588291200, @@ -85,7 +85,18 @@ "COINBASE_AMOUNT": 156000000000000000000, "DIFFICULTY_ADJUSTMENT_CUTOFF_TIME": 40, "DIFFICULTY_ADJUSTMENT_FACTOR": 1024, - "EPOCH_INTERVAL": 525600 + "EPOCH_INTERVAL": 525600, + "POSW_CONFIG": { + "ENABLED": true, + "ENABLE_TIMESTAMP": 1569567600, + "DIFF_DIVIDER": 10000, + "WINDOW_SIZE": 512, + "TOTAL_STAKE_PER_BLOCK": 1000000000000000000000000, + "BOOST_TIMESTAMP": 1649736000, + "BOOST_MULTIPLIER_PER_STEP": 2, + "BOOST_STEPS": 13, + "BOOST_STEP_INTERVAL": 86400 + } }, "CHAINS": [ { diff --git a/mainnet/singularity/cluster_config_template.json b/mainnet/singularity/cluster_config_template.json index d0a32c98a..c92986375 100644 --- a/mainnet/singularity/cluster_config_template.json +++ b/mainnet/singularity/cluster_config_template.json @@ -12,6 +12,7 @@ "GENESIS_DIR": null, "QUARKCHAIN": { "CHAIN_SIZE": 8, + "BASE_ETH_CHAIN_ID":100000, "MAX_NEIGHBORS": 32, "NETWORK_ID": 1, "TRANSACTION_QUEUE_SIZE_LIMIT_PER_SHARD": 10000, @@ -27,7 +28,6 @@ "ENABLE_EVM_TIMESTAMP": 1569567600, "ENABLE_QKCHASHX_HEIGHT": 1480000, "ENABLE_EIP155_SIGNER_TIMESTAMP": 1631577600, - "BASE_ETH_CHAIN_ID":100000, "ENABLE_NON_RESERVED_NATIVE_TOKEN_TIMESTAMP": 1588291200, "ENABLE_GENERAL_NATIVE_TOKEN_TIMESTAMP": 1588291200, "ENABLE_POSW_STAKING_DECAY_TIMESTAMP": 1588291200, @@ -90,10 +90,10 @@ "DIFF_DIVIDER": 10000, "WINDOW_SIZE": 512, "TOTAL_STAKE_PER_BLOCK": 1000000000000000000000000, - "BOOST_TIMESTAMP": 1646064000, + "BOOST_TIMESTAMP": 1649736000, "BOOST_MULTIPLIER_PER_STEP": 2, - "BOOST_STEPS": 10, - "BOOST_STEP_INTERVAL": 172800 + "BOOST_STEPS": 13, + "BOOST_STEP_INTERVAL": 86400 } }, "CHAINS": [ diff --git a/mainnet/singularity/cluster_config_template_8nodes.json b/mainnet/singularity/cluster_config_template_8nodes.json index 82c1724b8..8db8c27a7 100644 --- a/mainnet/singularity/cluster_config_template_8nodes.json +++ b/mainnet/singularity/cluster_config_template_8nodes.json @@ -12,6 +12,7 @@ "GENESIS_DIR": null, "QUARKCHAIN": { "CHAIN_SIZE": 8, + "BASE_ETH_CHAIN_ID":100000, "MAX_NEIGHBORS": 32, "NETWORK_ID": 1, "TRANSACTION_QUEUE_SIZE_LIMIT_PER_SHARD": 10000, @@ -27,7 +28,6 @@ "ENABLE_EVM_TIMESTAMP": 1569567600, "ENABLE_QKCHASHX_HEIGHT": 1480000, "ENABLE_EIP155_SIGNER_TIMESTAMP": 1631577600, - "BASE_ETH_CHAIN_ID":100000, "ENABLE_NON_RESERVED_NATIVE_TOKEN_TIMESTAMP": 1588291200, "ENABLE_GENERAL_NATIVE_TOKEN_TIMESTAMP": 1588291200, "TX_WHITELIST_SENDERS": [ @@ -82,7 +82,18 @@ "COINBASE_AMOUNT": 156000000000000000000, "DIFFICULTY_ADJUSTMENT_CUTOFF_TIME": 40, "DIFFICULTY_ADJUSTMENT_FACTOR": 1024, - "EPOCH_INTERVAL": 525600 + "EPOCH_INTERVAL": 525600, + "POSW_CONFIG": { + "ENABLED": true, + "ENABLE_TIMESTAMP": 1569567600, + "DIFF_DIVIDER": 10000, + "WINDOW_SIZE": 512, + "TOTAL_STAKE_PER_BLOCK": 1000000000000000000000000, + "BOOST_TIMESTAMP": 1649736000, + "BOOST_MULTIPLIER_PER_STEP": 2, + "BOOST_STEPS": 13, + "BOOST_STEP_INTERVAL": 86400 + } }, "CHAINS": [ { @@ -123,11 +134,10 @@ "DIFFICULTY_ADJUSTMENT_FACTOR": 512, "EXTRA_SHARD_BLOCKS_IN_ROOT_BLOCK": 12, "POSW_CONFIG": { - "ENABLED": true, - "ENABLE_TIMESTAMP": 1569567600, - "DIFF_DIVIDER": 10000, - "WINDOW_SIZE": 512, - "TOTAL_STAKE_PER_BLOCK": 1000000000000000000000000 + "ENABLED": false, + "DIFF_DIVIDER": 20, + "WINDOW_SIZE": 256, + "TOTAL_STAKE_PER_BLOCK": 0 }, "EPOCH_INTERVAL": 3153600 },