Unwind all config loading changes since last release #16547
Conversation
|
!ci-build-me |
|
!ci-nightly-me |
|
Nightly run here: https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies/builds/3242 |
|
!ci-build-me |
| let add_genesis_accounts ~logger | ||
| ~(precomputed_values_opt : Precomputed_values.t option) pool = | ||
| match precomputed_values_opt with | ||
| let add_genesis_accounts ~logger ~(runtime_config_opt : Runtime_config.t option) |
There was a problem hiding this comment.
reviewer note
now we use the runtime config opt instead of the precomputed_value type. This seems a like we want to expose more to deeper levels of the application. The intention is to now parse the precomputed values out.
There was a problem hiding this comment.
now we pass in the constraint and genesis constants from a higher level.
There was a problem hiding this comment.
i was wrong we now compute the genesis proof and inputs within the add genesis accounts function.
| Process.run | ||
| ~env:(`Extend [ ("MINA_CONFIG_FILE", config_file) ]) |
There was a problem hiding this comment.
MINA_CONFIG_FILE can now be set to specify the config file path for testing.
| @@ -344,7 +350,7 @@ module Make (Inputs : Intf.Inputs_intf) : | |||
| flag "--daemon-address" ~aliases:[ "daemon-address" ] | |||
| (required (Arg_type.create Host_and_port.of_string)) | |||
| ~doc:"HOST-AND-PORT address daemon is listening on" | |||
| and cli_proof_level = | |||
| and proof_level = | |||
There was a problem hiding this comment.
proof level can be set from the command line and ovveride the compile time config entry.
| @@ -309,6 +310,8 @@ let there_and_back_again ~num_txn_per_acct ~txns_per_block ~slot_time ~fill_rate | |||
| return () | |||
|
|
|||
| let output_there_and_back_cmds = | |||
| let genesis_constants = Genesis_constants.Compiled.genesis_constants in | |||
| ~minimum_user_command_fee:genesis_constants.minimum_user_command_fee | ||
| ~default_transaction_fee:default | ||
| in | ||
| there_and_back_again ~num_txn_per_acct ~txns_per_block ~txn_fee_option |
There was a problem hiding this comment.
no more daemon overriding with this logic
| and graphql_target_node_option = | ||
| flag "--graphql-target-node" ~aliases:[ "graphql-target-node" ] | ||
| ~doc: | ||
| "URL The graphql node to send graphl commands to. must be in \ | ||
| format `<ip>:<port>`. default is `127.0.0.1:3085`" | ||
| (optional string) | ||
| and minimum_user_command_fee_opt = Cli_lib.Flag.fee_common in |
There was a problem hiding this comment.
this code removes the runtime overwrite and sticks to the compile time configuration.
| @@ -387,33 +390,23 @@ let output_there_and_back_cmds = | |||
| transactions, if this is not present then we use the env var \ | |||
| MINA_PRIVKEY_PASS" | |||
| (optional string) | |||
| and config_file = Cli_lib.Flag.config_files | |||
There was a problem hiding this comment.
we no longer care about the runtime files, only the baked in compile config.
|
For later after the review is completed; noting it down while I remember I want to make sure we can fully sync to mainnet and complete bootstrap with the current compile time config. By complete I expect to see the log looking something like |
This PR unwinds all the changes around loading configurations since the last release. This is a more aggressive version of #16546.
This PR was created by reverting the merges of each of a short list of offending PRs:
Some of these have small conflicts, mostly generated from the merge with #16093.
The remaining commits are to fix compilation failures after the reverts, except for 1bb57d6 which takes a more opinionated approach to actually propagate and use the runtime config's values for the implementation from #16093.