Merge pull request #2434 from Taraxa-project/master-merge

Release branch to develop
Taraxa-project · Apr 5, 2023 · fee3edc · fee3edc
2 parents 809ba74 + 455347e
commit fee3edc
Show file tree

Hide file tree

Showing 17 changed files with 1,936 additions and 1,353 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.20)
 
 # Set current version of the project
 set(TARAXA_MAJOR_VERSION 1)
-set(TARAXA_MINOR_VERSION 1)
-set(TARAXA_PATCH_VERSION 0)
+set(TARAXA_MINOR_VERSION 2)
+set(TARAXA_PATCH_VERSION 1)
 set(TARAXA_VERSION ${TARAXA_MAJOR_VERSION}.${TARAXA_MINOR_VERSION}.${TARAXA_PATCH_VERSION})
 
 # Any time a change in the network protocol is introduced this version should be increased
-set(TARAXA_NET_VERSION 2)
+set(TARAXA_NET_VERSION 1)
 # Major version is modified when DAG blocks, pbft blocks and any basic building blocks of our blockchain is modified
 # in the db
 set(TARAXA_DB_MAJOR_VERSION 1)

diff --git a/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json b/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json
@@ -237,13 +237,13 @@
     "dag_blocks_size": "0x32",
     "ghost_path_move_back": "0x0",
     "lambda_ms": "0x5DC",
-    "gas_limit": "0x7d2b7500"
+    "gas_limit": "0x12C684C0"
   },
   "dag": {
     "block_proposer": {
       "shard": 1
     },
-    "gas_limit": "0xc845880"
+    "gas_limit": "0x1E0A6E0"
   },
   "sortition": {
     "changes_count_for_average": 10,

diff --git a/libraries/cli/include/cli/config_jsons/mainnet/mainnet_config.json b/libraries/cli/include/cli/config_jsons/mainnet/mainnet_config.json
@@ -36,47 +36,47 @@
     "deep_syncing_threshold": 10,
     "boot_nodes": [
       {
-        "id": "d063098ceca0f5ea06f9455debffe6f6d5b2efdeb179215877e356cf8154afad99f058214bd25d8198a3854a4ed8f7ef97af59b0441a7d30bc4b3918c42764ef",
+        "id": "45949587c9f31f62e802175471c142da1618f4e456a77e51b0fcb3cc14b14bba7f585d44db15417fff96c29967a4778c60584ced00148bc905609a14fa7e538f",
         "ip": "boot-node-0.mainnet.taraxa.io",
         "port": 10002
       },
       {
-        "id": "572778c6636361916acbc596808e1aa4e93ee0b577188f594015ec42125f58b7ec75fd59d78ca2282bc1c8c639dfc4d0eac2e57855b4fcc932c6bc6f530cd8f6",
+        "id": "7e19406c60135be35bfd9a289044032978aa2fb6e2cda65794be92da8a6915a504eadd845946070393cfa1e57d6279bb33bcfe1571d9d6d9eefa30c733c22a27",
         "ip": "boot-node-1.mainnet.taraxa.io",
         "port": 10002
       },
       {
-        "id": "10a5108d0070559cacbb0ed368d43c98848fbc0397e9bfc1a6e7e33f15532a804d158e405657650d3ea766ed4b0d7cfcbe5867e9261deacb457da332ed1eaf2a",
+        "id": "ce741b2cae5fa26107b33bff617e249ede5920bfd7294ff66840310726aa853d0d109fe817263044c0002c8e628f58686e69611221fe6fe25eb6164e427259af",
         "ip": "boot-node-2.mainnet.taraxa.io",
         "port": 10002
       },
       {
-        "id": "1dd6ae9674dee4e30f2f2f76036ad01be34bb617095b0513bc3818c8352e040fc3648fd400896fc80a544b3c23118e143928d0d49d4d575b68327f70da342939",
+        "id": "6cb82c398c2be120d9fca945598a3fa8bbf5ecab7f3a5ccb953c9d8d473a6867b4faf53b0e3dff11bb6dbed78dfab26cfd0fbe4ae0c131aa83bf60e558a7ef8c",
         "ip": "boot-node-3.mainnet.taraxa.io",
         "port": 10002
       },
       {
-        "id": "56b74f83d3e88319cf554c6e43ca6077f7cf9594547e530582ed12196dd891b289dc7b5b4392440bcead5adbdf4e23e184b7f46940efd603c5bf0a25b36d71c6",
+        "id": "1d356bd6f835c24b5129a822ef9947485e82081b52647c4d8e25de18bea565307b545f6ac2f91d3b4b147fba195a7298cc34d1648294badb58d80462aed5f498",
         "ip": "boot-node-4.mainnet.taraxa.io",
         "port": 10002
       },
       {
-        "id": "833a3a724f5be3654524cb83307628117a668a00808fb2f34c43e5e3cb1a30354536cbdc9355172e5f285e1b4b3dde88d94385fa4df69c89da0638760ed5b0ac",
+        "id": "6b74ad39c4f8b6ccba42bab45958f884eaad63d0515521b0628ee96009824a12efae7e9840a7421ade9ee1e0c875240b1989d5593b636b8ef4aefc3c033ecace",
         "ip": "boot-node-5.mainnet.taraxa.io",
         "port": 10002
       },
       {
-        "id": "94026c10fce281ede4bae9b54606703eba77cb876ddacb3eba364b7e444618d424641de206f5d5cb39f5c04da48ebad502b76d698ed341e46721c8777a8c3f15",
+        "id": "f530a0c5d647ceade734537d00050ab51278f64210327b6c973683cfb0ff33f6393cd0b785bd9e33d9cf5474c6a47754ea92c08da60678ac677a0ba409c90cf3",
         "ip": "boot-node-6.mainnet.taraxa.io",
         "port": 10002
       },
       {
-        "id": "03947eaba01564a69d6ea238f4c264ee50b34918838fee164b1b0f0de833b0098f2d4a7c05448a0f3d3aa05d55fe4d150aa3a1553fd940a433433aff8ae57a0e",
+        "id": "c8a8bef96f04c91a07da3bf7e8b6d1ac81ef4718aa3d216ef8aab535c4015ff17a8dbfb75d726d7113ca58810028b2615d3551521b4564d0cf4db2fa7be91ed8",
         "ip": "boot-node-7.mainnet.taraxa.io",
         "port": 10002
       },
       {
-        "id": "8a3394cccb379d66e6b7b131ef8ea9f195c333020b246135bf5d888443e8b6245cef9c90f2b6466240f38c9cfa4ccaa472b0f204623f09da819068c6d1168242",
+        "id": "630476958941c5e44960793a4fc420ba5450fed6ff296dc7b51773d12cea49f5b9ad6d5836cfd379b9ffa38e3c72661175acbda28829db3855bb29b7ac804bd0",
         "ip": "boot-node-8.mainnet.taraxa.io",
         "port": 10002
       }