Merging temporary release/v0.14.x branch in to main (#33)

* Initial ver. of the files and dir. structure for v0.14.0 upgrade (#16) This will need further changes. Sime data are missing. Merge config files will see tweaking, chain halt heights and final cudos mainnet genesis file for won't be available until the very last moment before the upgrade. * Removing unnecessary files (#20) * fix: Naming of merge config files (#22) * feat: Refactoring dealing with genesis-fetchhub git repository (#23) * fix: Ensure expansion of the ~ special variable in shell commands (#25) * fix: Ensure expansion of the ~ special variable in shell commands * Final adjustments in descriptions of upgrade procedure documents * update dorado config * Recocil.: reverting to embeded csv, ibc target change, adding fetch val * Ditching redundant backup validator * Refact. downl. of input files, upgr. instr. doc, set Reconcil. admin & label (#28) * fix: Revision format in github raw file URL (#30) * Adding max_validators setting in to the mainnet config (#31) * feat: Mainnet merge config - the 1st review (#32) --------- Co-authored-by: jgtormo <[email protected]>
fetchai · Oct 22, 2024 · 9f77acd · 9f77acd
1 parent b382ab0
commit 9f77acd
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/dorado-1/7-software-upgrade-v0.14.0.md b/dorado-1/7-software-upgrade-v0.14.0.md
@@ -82,15 +82,15 @@ export FETCHD_HOME_DIR=~/.fetchd
 
 ```shell
 export DESTINATION_CHAIN_ID=fetchhub-4
-export GENESIS_FETCHUB_GIT_REVISION=v0.14.0-rc10
+export GENESIS_FETCHUB_GIT_REVISION=tags/v0.14.0-rc10
 export UPGRADE_SHA256_PARAMS="--cudos-genesis-sha256 906ea6ea5b1ab5936bb9a5f350d11084eb92cba249e65e11c460ab251b27fb0e --cudos-migration-config-sha256 930dc21af917ec8f2f8820ff393c1a276297fe91d4f585757143acb2727cd6d2"
 ```
 
 ### Download merge input files
 
 ```shell
-curl https://raw.githubusercontent.com/fetchai/genesis-fetchhub/refs/heads/$GENESIS_FETCHUB_GIT_REVISION/dorado-1/data/cudos_merge_config.json -o "$FETCHD_HOME_DIR/cudos_merge_config.json"
-curl https://raw.githubusercontent.com/fetchai/genesis-fetchhub/refs/heads/$GENESIS_FETCHUB_GIT_REVISION/dorado-1/data/genesis.cudos.json.gz -o "$FETCHD_HOME_DIR/genesis.cudos.json.gz"
+curl -O https://raw.githubusercontent.com/fetchai/genesis-fetchhub/refs/$GENESIS_FETCHUB_GIT_REVISION/dorado-1/data/cudos_merge_config.json -o "$FETCHD_HOME_DIR/cudos_merge_config.json"
+curl -O https://raw.githubusercontent.com/fetchai/genesis-fetchhub/refs/$GENESIS_FETCHUB_GIT_REVISION/dorado-1/data/genesis.cudos.json.gz -o "$FETCHD_HOME_DIR/genesis.cudos.json.gz"
 ```
 
 And finally **extract** the CUDOS genesis file:

diff --git a/fetchhub-4/data/cudos_merge_config.json b/fetchhub-4/data/cudos_merge_config.json
@@ -27,20 +27,21 @@
     },
     "token_bridge": {
       "addr": "fetch1qxxlalvsdjd07p07y3rc5fu6ll8k4tmetpha8n",
-      "new_admin": "fetch15p3rl5aavw9rtu86tna5lgxfkz67zzr6ed4yhw"
+      "new_admin": "fetch14g7vxdjpdhevfu50ed2skfu3ga8l6j95vd07x8"
     }
   },
   "cudos_merge": {
-    "ibc_target_addr": "cudos15p3rl5aavw9rtu86tna5lgxfkz67zzr6tp4ltv",
-    "remaining_staking_balance_addr" : "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
-    "remaining_gravity_balance_addr" : "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
-    "remaining_distribution_balance_addr" : "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
-    "contract_destination_fallback_addr" : "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
-    "community_pool_balance_dest_addr" : "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
-    "commission_fetch_addr" : "fetch15p3rl5aavw9rtu86tna5lgxfkz67zzr6ed4yhw",
-    "extra_supply_fetch_addr" : "fetch1nxj5ynsajxwraqvx767a6ckw9g98vy56y2ut0w",
-    "vesting_collision_dest_addr" : "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+    "ibc_target_addr": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
+    "remaining_staking_balance_addr" : "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
+    "remaining_gravity_balance_addr" : "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
+    "remaining_distribution_balance_addr" : "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
+    "contract_destination_fallback_addr" : "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
+    "community_pool_balance_dest_addr" : "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
+    "commission_fetch_addr" : "fetch14g7vxdjpdhevfu50ed2skfu3ga8l6j95vd07x8",
+    "extra_supply_fetch_addr" : "fetch1htsnzy0quzh076cgdferm7v60em8xmp2vmsy5p",
+    "vesting_collision_dest_addr" : "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
     "vesting_period": 7776000,
+    "new_max_validators": 91,
     "balance_conversion_constants": [
       {
         "key": "acudos",
@@ -50,13 +51,12 @@
     "total_cudos_supply": "10000000000000000000000000000",
     "total_fetch_supply_to_mint": "88946755672000000000000000",
     "not_vested_accounts": [
-      "cudos15p3rl5aavw9rtu86tna5lgxfkz67zzr6tp4ltv",
-      "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
-      "cudos1qz8zchxad9n8m9zxzajt3shwxzqnt2ddslvgxn"
+      "cudos14g7vxdjpdhevfu50ed2skfu3ga8l6j957p0969",
+      "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr"
     ],
     "not_delegated_accounts": [
-      "cudos139tj98udp8qc6vyujg30qxax62ve6pp3265npl",
-      "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv"
+      "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
+      "cudos139tj98udp8qc6vyujg30qxax62ve6pp3265npl"
     ],
     "moved_accounts": [
       {
@@ -76,7 +76,7 @@
       },
       {
         "from": "cudos1nj49l56x7sss5hqyvfmctxr3mq64whg273g3x5",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "already had testfet"
       },
       {
@@ -86,17 +86,17 @@
       },
       {
         "from": "cudos1y90axtnymce3l9avdn65jltcud7dkvlvpgskx9",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "orchestrator"
       },
       {
         "from": "cudos1vn20zy4txu2nwz7l0552h6hpqn7vgafsa6mwll",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "orchestrator"
       },
       {
         "from": "cudos17n8xtf56hxjg68q5chvwj4j99ftsxgdu8nte50",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "relayer"
       },
       {
@@ -106,47 +106,47 @@
       },
       {
         "from": "cudos1w5caj20lujq8srwxxqn3a3j780dd6x8qteug7d",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "treasury wallet 1"
       },
       {
         "from": "cudos1uae7gc72n85cl73qlfqrlv0y8jy3mfkjrl06zh",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "treasury wallet 2"
       },
       {
         "from": "cudos1mvg6rmp56msc5m3f877u0ltrkpzwhjjstpz5ja",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "small wallet 1"
       },
       {
         "from": "cudos17xng0mvfw5yh8852egglusnurea25qacl7ufmv",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "small wallet 2"
       },
       {
         "from": "cudos10a69lcaarckhcqf0zg04t65fuzlufel57u0608",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "small wallet 3"
       },
       {
         "from": "cudos1c3qgr4df6u3awsz6rqwkxcpsef7aau7p23pew5",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "small wallet 4"
       },
       {
         "from": "cudos1y7l29p0yrz7exw9h55urd6v6vh6kjkq8dqfuh4",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "small wallet 5"
       },
       {
         "from": "cudos1qryl52su3rdpqx2etmsal6sh4ky77t8pagakw6",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "small wallet 6"
       },
       {
         "from": "cudos1genudzpvqe2t9k64xwueua35a8kfvl3fc6uc62",
-        "to": "cudos1nxj5ynsajxwraqvx767a6ckw9g98vy56kxusnv",
+        "to": "cudos1htsnzy0quzh076cgdferm7v60em8xmp27hslgr",
         "memo": "small wallet 7"
       },
       {