Merge pull request #2582 from Taraxa-project/jail_upd

chore: jail updates
Taraxa-project · Oct 12, 2023 · 26156cf · 26156cf
2 parents d43825a + 8bd1450
commit 26156cf
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/libraries/cli/include/cli/config_jsons/default/default_config.json b/libraries/cli/include/cli/config_jsons/default/default_config.json
@@ -2,6 +2,7 @@
   "data_path": "",
   "is_light_node": false,
   "final_chain_cache_in_blocks": 5,
+  "report_malicious_behaviour" : true,
   "network": {
     "rpc": {
       "http_port": 7777,

diff --git a/libraries/cli/include/cli/config_jsons/devnet/devnet_config.json b/libraries/cli/include/cli/config_jsons/devnet/devnet_config.json
@@ -2,6 +2,7 @@
   "data_path": "",
   "is_light_node": false,
   "final_chain_cache_in_blocks": 5,
+  "report_malicious_behaviour" : true,
   "network": {
     "rpc": {
       "http_port": 7777,

diff --git a/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json b/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json
@@ -270,7 +270,7 @@
     },
     "magnolia_hf": {
       "block_num": 10000,
-      "jail_time": 163459
+      "jail_time": 1000
     }
   }
 }
diff --git a/libraries/cli/include/cli/config_jsons/mainnet/mainnet_config.json b/libraries/cli/include/cli/config_jsons/mainnet/mainnet_config.json
@@ -2,6 +2,7 @@
   "data_path": "",
   "is_light_node": false,
   "final_chain_cache_in_blocks": 5,
+  "report_malicious_behaviour" : true,
   "network": {
     "rpc": {
       "http_port": 7777,

diff --git a/libraries/cli/include/cli/config_jsons/testnet/testnet_config.json b/libraries/cli/include/cli/config_jsons/testnet/testnet_config.json
@@ -2,6 +2,7 @@
   "data_path": "",
   "is_light_node": false,
   "final_chain_cache_in_blocks": 5,
+  "report_malicious_behaviour" : true,
   "network": {
     "rpc": {
       "http_port": 7777,

diff --git a/libraries/cli/include/cli/config_jsons/testnet/testnet_genesis.json b/libraries/cli/include/cli/config_jsons/testnet/testnet_genesis.json
@@ -137,7 +137,7 @@
     "rewards_distribution_frequency": {},
     "magnolia_hf" : {
       "block_num" : 0,
-      "jail_time": 163459
+      "jail_time": 1000
     }
   }
 }
diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm
+0 −5		taraxa/state/contracts/slashing/precompiled/slashing_contract.go
+1 −1		taraxa/state/contracts/tests/slashing/slashing_test.go