Fixes to migration script

scripts/archive/migration/README.md

@@ -100,15 +100,15 @@ Since berkeley migration script supports all berkeley migration phases. We need
 #### Initial migration
 
 ```
-./scripts/archive/migration/berkeley_migration.sh initial -g  ../../umt_testing/o1labs-umt-pre-fork-run-1-ledger.json -s postgres://postgres:postgres@localhost:5432/umt_testing_initial -t postgres://postgres:postgres@localhost:5432/migrated -b mina_network_block_data -bs 1000 -n o1labs-umt-pre-fork-run-1
+mina-berkeley-migration-script initial -g  ../../umt_testing/o1labs-umt-pre-fork-run-1-ledger.json -s postgres://postgres:postgres@localhost:5432/umt_testing_initial -t postgres://postgres:postgres@localhost:5432/migrated -b mina_network_block_data -bs 1000 -n o1labs-umt-pre-fork-run-1
 ```
 
 this command should output migration-replayer-XXX.json which should be used in next run
 
 #### Incremental migration
 
 ```
-./scripts/archive/migration/berkeley_migration.sh incremental -g  ../../umt_testing/o1labs-umt-pre-fork-run-1-ledger.json -s postgres://postgres:postgres@localhost:5432/umt_testing_increment -t postgres://postgres:postgres@localhost:5432/migrated -b mina_network_block_data -bs 50 -n o1labs-umt-pre-fork-run-1 -r migration-checkpoint-597.json
+mina-berkeley-migration-script incremental -g  ../../umt_testing/o1labs-umt-pre-fork-run-1-ledger.json -s postgres://postgres:postgres@localhost:5432/umt_testing_increment -t postgres://postgres:postgres@localhost:5432/migrated -b mina_network_block_data -bs 50 -n o1labs-umt-pre-fork-run-1 -r migration-checkpoint-597.json
 ```
 
 where:
@@ -118,7 +118,7 @@ migration-checkpoint-597.json - is a last checkpoint from initial run
 #### Final migration
 
 ```
-./scripts/archive/migration/berkeley_migration.sh final -g  ../../umt_testing/o1labs-umt-pre-fork-run-1-ledger.json -s postgres://postgres:postgres@localhost:5432/umt_testing_final -t postgres://postgres:postgres@localhost:5432/migrated -b mina_network_block_data -bs 50 -n o1labs-umt-pre-fork-run-1 -r migration-checkpoint-2381.json -fc ../../umt_testing/fork-umt-02-29-2024.json -f 3NLnD1Yp4MS9LtMXikD1YyySZNVgCXA82b5eQVpmYZ5kyTo4Xsr7
+mina-berkeley-migration-script final -g  ../../umt_testing/o1labs-umt-pre-fork-run-1-ledger.json -s postgres://postgres:postgres@localhost:5432/umt_testing_final -t postgres://postgres:postgres@localhost:5432/migrated -b mina_network_block_data -bs 50 -n o1labs-umt-pre-fork-run-1 -r migration-checkpoint-2381.json -fc ../../umt_testing/fork-umt-02-29-2024.json
 ```
 
 where `3NLnD1Yp4MS9LtMXikD1YyySZNVgCXA82b5eQVpmYZ5kyTo4Xsr7` was extracted from fork config file:

scripts/archive/migration/mina-berkeley-migration-script

@@ -209,7 +209,7 @@ function initial(){
 function check_log_for_error() {
     local __log=$1;
 
-    grep Error "$__log";
+    grep '"level":"Error"' "$__log";
     local __have_errors=$?;
 
     if [ $__have_errors -eq 0 ]; then 
@@ -537,19 +537,18 @@ function final_help(){
     echo ""
     printf "  %-25s %s\n" "-h | --help" "show help";
     printf "  %-25s %s\n" "-r | --replayer-checkpoint" "[file] path to genesis ledger file";
-    printf "  %-25s %s\n" "-f | --fork-state-hash" "[hash] fork state hash";
     printf "  %-25s %s\n" "-s | --source-db" "[connection_str] connection string to database to be migrated";
     printf "  %-25s %s\n" "-t | --target-db" "[connection_str] connection string to database which will hold migrated data";
     printf "  %-25s %s\n" "-b | --blocks-bucket" "[string] name of precomputed blocks bucket. NOTICE: there is an assumption that precomputed blocks are named with format: {network}-{height}-{state_hash}.json";
     printf "  %-25s %s\n" "-bs | --blocks-batch-size" "[int] number of precomputed blocks to be fetch at once from Gcloud. Bigger number like 1000 can help speed up migration process";
     printf "  %-25s %s\n" "-n | --network" "[string] network name when determining precomputed blocks. NOTICE: there is an assumption that precomputed blocks are named with format: {network}-{height}-{state_hash}.json";
-    printf "  %-25s %s\n" "-fc | --fork-config" "[file] Fork-state config file is dump file in form of json containing fork block and ledger file. It should be provied by MF or O(1)Labs team after fork block is announced";
+    printf "  %-25s %s\n" "-fc | --fork-genesis-config" "[file] Genesis config file for the fork network. It should be provied by MF or O(1)Labs team after fork block is announced";
     printf "  %-25s %s\n" "-d | --delete-blocks" "delete blocks after they are processed (saves space with -sb)"
     printf "  %-25s %s\n" "-p | --prefetch-blocks" "downloads all blocks at once instead of incrementally"
     echo ""
     echo "Example:"
     echo ""
-    echo "  " $CLI_NAME final --replayer-checkpoint migration-replayer-checkpoint-1233.json --fork-state-hash 3NLnD1Yp4MS9LtMXikD1YyySZNVgCXA82b5eQVpmYZ5kyTo4Xsr7 --genesis-ledger "genesis_ledgers/mainnet.json" --source-db "postgres://postgres:pass@localhost:5432/archive_balances_migrated" --target-db "postgres://postgres:pass@localhost:5432/migrated" --blocks-batch-size 10 --blocks-bucket "mina_network_block_data" --network "mainnet" --fork-config fork_config.json 
+    echo "  " $CLI_NAME final --replayer-checkpoint migration-replayer-checkpoint-1233.json --genesis-ledger "genesis_ledgers/mainnet.json" --source-db "postgres://postgres:pass@localhost:5432/archive_balances_migrated" --target-db "postgres://postgres:pass@localhost:5432/migrated" --blocks-batch-size 10 --blocks-bucket "mina_network_block_data" --network "mainnet" --fork-genesis-config fork_genesis_config.json 
     echo ""
     echo "Notes:"
     echo "  1. After run migrated data will be filled with migrated blocks till last block in source db"
@@ -574,8 +573,7 @@ function final(){
     local __stream_blocks=true
     local __network='' 
     local __checkpoint_interval=1000
-    local __fork_state_hash=''
-    local __fork_config=''
+    local __fork_genesis_config=''
 
     while [ ${#} -gt 0 ]; do
         error_message="Error: a value is needed for '$1'";
@@ -587,12 +585,8 @@ function final(){
                 __genesis_ledger=${2:?$error_message}
                 shift 2;
             ;;
-            -f | --fork-state-hash )
-                __fork_state_hash=${2:?$error_message}
-                shift 2;
-            ;;
-            -fc | --fork-config )
-                __fork_config=${2:?$error_message}
+            -fc | --fork-genesis-config )
+                __fork_genesis_config=${2:?$error_message}
                 shift 2;
             ;;
             -r | --replayer-checkpoint )
@@ -662,15 +656,9 @@ function final(){
         echo "Genesis ledger not defined"
         exit 1
     fi
-    if [ -z "$__fork_state_hash" ]; then
+    if [ -z "$__fork_genesis_config" ]; then
         echo ""
-        echo "Fork state hash not defined. Please refer to mina or o(1) Labs team announcements regarding fork block state hash"
-        echo "which is required to run final migration"
-        exit 1
-    fi
-    if [ -z "$__fork_config" ]; then
-        echo ""
-        echo "Fork config file is not defined. Please refer to mina or o(1) Labs team announcements regarding fork block state hash"
+        echo "Fork genesis config file is not defined. Please refer to mina or o(1) Labs team announcements regarding fork block state hash"
         echo "which is required to run final migration"
         exit 1
     fi
@@ -694,10 +682,9 @@ function final(){
         "$__keep_precomputed_blocks" \
         "$__stream_blocks" \
         "$__network" \
-        "$__fork_state_hash" \
         "$__checkpoint_interval" \
         "$__replayer_checkpoint" \
-        "$__fork_config"
+        "$__fork_genesis_config"
 }
 
 function run_final_migration() {
@@ -709,12 +696,11 @@ function run_final_migration() {
     local __keep_precomputed_blocks=$6
     local __stream_blocks=$7
     local __network=$8
-    local __fork_state_hash=$9
-    local __checkpoint_interval=${10}
-    local __replayer_checkpoint=${11}
-    local __fork_config=${12}
-
+    local __checkpoint_interval=$9
+    local __replayer_checkpoint=${10}
+    local __fork_genesis_config=${11}
 
+    local __fork_state_hash="$(jq -r .proof.fork.state_hash "$__fork_genesis_config")"
     local __date=$(date '+%Y-%m-%d_%H%M')
     local __berkely_migration_log="berkeley_migration_$__date.log"
     local __replayer_log="replayer_$__date.log"
@@ -758,7 +744,7 @@ function run_final_migration() {
     mina-berkeley-migration-verifier post-fork \
         --mainnet-archive-uri "$__mainnet_archive_uri" \
         --migrated-archive-uri "$__migrated_archive_uri" \
-        --fork-config-file "$__fork_config" \
+        --fork-genesis-config "$__fork_genesis_config" \
         --migrated-replayer-output "$migrated_replayer_output"
 
 }

src/app/berkeley_migration_verifier/Readme.md

@@ -12,15 +12,15 @@ Application for validating migrated archive schema content. Performed checks rel
 Basic usage :
 
 ```
-mina-berkeley-migration-verifier --mainnet-archive-uri postgres://postgres:postgres@localhost:5432/source_archive --migrated-archive-uri postgres://postgres:postgres@localhost:5432/archive_migrated --migrated-replayer-output  migrated_replayer.json --fork-config-file fork_config_fixed.json 
+mina-berkeley-migration-verifier --mainnet-archive-uri postgres://postgres:postgres@localhost:5432/source_archive --migrated-archive-uri postgres://postgres:postgres@localhost:5432/archive_migrated --migrated-replayer-output  migrated_replayer.json --fork-genesis-config fork_config_fixed.json 
 ```
 
 where:
 
 - **mainnet-archive-uri** is a connection string to original schema
 - **migrated-archive-uri** is a connection string to already migrated schema
 - **migrated-replayer-output** is an output for replayer on migrated schema
-- **fork-config-file** is a state dump with forked ledger
+- **fork-genesis-config** is a genesis config for the fork network
 
 ### Dependencies
 

src/app/berkeley_migration_verifier/berkeley_migration_verifier.ml

@@ -255,14 +255,14 @@ let compare_internal_commands migrated_pool mainnet_pool ~work_dir =
   in
   diff_files internal_commands_berk internal_commands_main
 
-let compare_ledger_hash ~migrated_replayer_output ~fork_config_file =
+let compare_ledger_hash ~migrated_replayer_output ~fork_genesis_config_file =
   let checkpoint_ledger_hash =
     Yojson.Basic.from_file migrated_replayer_output
     |> member "genesis_ledger" |> member "hash" |> to_string
     |> Ledger_hash.of_base58_check_exn
   in
   let fork_ledger_hash =
-    Yojson.Basic.from_file fork_config_file
+    Yojson.Basic.from_file fork_genesis_config_file
     |> member "ledger" |> member "hash" |> to_string
     |> Ledger_hash.of_base58_check_exn
   in
@@ -353,24 +353,26 @@ let pre_fork_validations ~mainnet_archive_uri ~migrated_archive_uri () =
         Deferred.Or_error.errorf
           "Some tests failed. Please refer to above output for details"
 
-let fork_config_exn ~fork_config_file =
-  Yojson.Basic.from_file fork_config_file |> member "proof" |> member "fork"
+let fork_config_exn ~fork_genesis_config_file =
+  Yojson.Basic.from_file fork_genesis_config_file
+  |> member "proof" |> member "fork"
 
-let fork_block_state_hash_exn ~fork_config_file =
-  fork_config_exn ~fork_config_file |> member "state_hash" |> to_string
+let fork_block_state_hash_exn ~fork_genesis_config_file =
+  fork_config_exn ~fork_genesis_config_file |> member "state_hash" |> to_string
 
-let fork_block_height_exn ~fork_config_file =
-  fork_config_exn ~fork_config_file |> member "blockchain_length" |> to_int
+let fork_block_height_exn ~fork_genesis_config_file =
+  fork_config_exn ~fork_genesis_config_file
+  |> member "blockchain_length" |> to_int
 
 let post_fork_validations ~mainnet_archive_uri ~migrated_archive_uri
-    ~migrated_replayer_output ~fork_config_file () =
+    ~migrated_replayer_output ~fork_genesis_config_file () =
   Async.printf
     "Running verifications for incremental migration between '%s' and '%s' \
      schemas. It may take a couple of minutes... \n"
     mainnet_archive_uri migrated_archive_uri ;
 
-  let fork_height = fork_block_height_exn ~fork_config_file in
-  let fork_state_hash = fork_block_state_hash_exn ~fork_config_file in
+  let fork_height = fork_block_height_exn ~fork_genesis_config_file in
+  let fork_state_hash = fork_block_state_hash_exn ~fork_genesis_config_file in
 
   let mainnet_archive_uri = Uri.of_string mainnet_archive_uri in
   let migrated_archive_uri = Uri.of_string migrated_archive_uri in
@@ -451,7 +453,7 @@ let post_fork_validations ~mainnet_archive_uri ~migrated_archive_uri
       |> Test.eval ;
 
       let check =
-        compare_ledger_hash ~migrated_replayer_output ~fork_config_file
+        compare_ledger_hash ~migrated_replayer_output ~fork_genesis_config_file
       in
       Test.of_check check ~name:"Verify fork config vs migrated replayer output"
         ~idx:8 ~prefix:"A10.3" test_count
@@ -494,14 +496,15 @@ let post_fork_migration_command =
         ~aliases:[ "-migrated-replayer-output" ]
         Command.Param.(required string)
         ~doc:"Path Path to migrated replayer output"
-    and fork_config_file =
-      Command.Param.flag "--fork-config-file" ~aliases:[ "-fork-config-file" ]
+    and fork_genesis_config_file =
+      Command.Param.flag "--fork-genesis-config"
+        ~aliases:[ "-fork-genesis-config" ]
         Command.Param.(required string)
-        ~doc:"String Path to fork config file"
+        ~doc:"String Path to config file of the fork network"
     in
 
     post_fork_validations ~mainnet_archive_uri ~migrated_archive_uri
-      ~migrated_replayer_output ~fork_config_file)
+      ~migrated_replayer_output ~fork_genesis_config_file)
 
 let commands =
   [ ("pre-fork", incremental_migration_command)