diff --git a/docs/demo.md b/docs/demo.md index 371ab0f..d32482e 100644 --- a/docs/demo.md +++ b/docs/demo.md @@ -75,9 +75,6 @@ - Export required env vars: ```bash - # private key of the existing account - export PVT_KEY= - # desired key name export KEY_NAME= @@ -92,6 +89,8 @@ ansible-playbook -i localhost, -c local ~/cerc/laconicd-stack/playbooks/validator/create-validator.yml ``` + - Input private key of the existing account when prompted + - Check the validator list: ```bash diff --git a/docs/run-first-validator.md b/docs/run-first-validator.md index 9ce040c..686638f 100644 --- a/docs/run-first-validator.md +++ b/docs/run-first-validator.md @@ -83,9 +83,6 @@ - Update `~/cerc/laconicd-stack/playbooks/first-validator/first-validator-vars.yml` with required values: ```bash - # Use the private key of the existing account that was exported in previous steps - pvt_key: "" - # Path to the generated mainnet genesis file # Use the absolute path of generated output directory in the previous steps genesis_file: "/genesis.json" @@ -117,6 +114,8 @@ ansible-playbook -i localhost, -c local ~/cerc/laconicd-stack/playbooks/first-validator/run-first-validator.yml ``` + - Input private key of the existing account that was exported in previous steps when prompted + - Check logs to ensure that node is running: ```bash diff --git a/docs/run-validator.md b/docs/run-validator.md index 400a409..8a47aca 100644 --- a/docs/run-validator.md +++ b/docs/run-validator.md @@ -74,9 +74,6 @@ - Export required env vars: ```bash - # Use the private key of the existing account that was exported in previous steps - export PVT_KEY= - # desired key name export KEY_NAME= @@ -91,6 +88,8 @@ ansible-playbook -i localhost, -c local ~/cerc/laconicd-stack/playbooks/validator/create-validator.yml ``` + - Input private key of the existing account that was exported in previous steps when prompted + - Check the validator list: ```bash diff --git a/playbooks/first-validator/first-validator-vars.example.yml b/playbooks/first-validator/first-validator-vars.example.yml index c66ff5f..5df97ac 100644 --- a/playbooks/first-validator/first-validator-vars.example.yml +++ b/playbooks/first-validator/first-validator-vars.example.yml @@ -3,6 +3,5 @@ cerc_chain_id: "laconic-mainnet" min_gas_price: 0.001 cerc_loglevel: "info" key_name: "laconic-validator" -pvt_key: "" genesis_file: "" staking_amount_file: "" diff --git a/playbooks/first-validator/run-first-validator.yml b/playbooks/first-validator/run-first-validator.yml index df87d38..8ac9bf6 100644 --- a/playbooks/first-validator/run-first-validator.yml +++ b/playbooks/first-validator/run-first-validator.yml @@ -75,19 +75,25 @@ dest: "{{data_directory}}/{{ mainnet_deployment_dir }}/data/laconicd-data/tmp/genesis.json" mode: '0644' - - name: Fail if pvt_key is not set + - name: Prompt for validator private key + vars: + private_key_prompt: "Please enter your validator private key: " + pause: + prompt: "{{ private_key_prompt }}" + echo: no + register: private_key_input + + - name: Fail if private key is not provided fail: - msg: >- - Private key (pvt_key) is not set in first-validator-vars.yml. - This is required for creating the gentx. - when: not pvt_key + msg: "Private key is required for creating the gentx." + when: private_key_input.user_input | default('') | trim == '' - name: Run script to create and collect gentx shell: | docker run -i \ -v {{data_directory}}/{{ mainnet_deployment_dir }}/data/laconicd-data:/root/.laconicd \ -v {{data_directory}}/{{ mainnet_deployment_dir }}/config/mainnet-laconicd:/scripts \ - -e "PVT_KEY={{ pvt_key }}" \ + -e "PVT_KEY={{ private_key_input.user_input }}" \ -e "KEY_NAME={{ key_name }}" \ -e "CERC_MONIKER={{ cerc_moniker }}" \ -e "CERC_CHAIN_ID={{ cerc_chain_id }}" \ diff --git a/playbooks/validator/create-validator.yml b/playbooks/validator/create-validator.yml index feafe29..85317e5 100644 --- a/playbooks/validator/create-validator.yml +++ b/playbooks/validator/create-validator.yml @@ -5,7 +5,6 @@ data_directory: "{{ lookup('env', 'DATA_DIRECTORY') }}" deployment_dir: "{{ lookup('env', 'MAINNET_DEPLOYMENT_DIR') }}" key_name: "{{ lookup('env', 'KEY_NAME') }}" - pvt_key: "{{ lookup('env', 'PVT_KEY') }}" tasks: - name: Fail if DATA_DIRECTORY or MAINNET_DEPLOYMENT_DIR env vars are not set fail: @@ -14,16 +13,22 @@ Please export both DATA_DIRECTORY and MAINNET_DEPLOYMENT_DIR before running the playbook. when: lookup('env', 'DATA_DIRECTORY') == '' or lookup('env', 'MAINNET_DEPLOYMENT_DIR') == '' - - name: Fail if pvt_key is not set + - name: Prompt for validator private key + vars: + private_key_prompt: "Please enter your validator private key: " + pause: + prompt: "{{ private_key_prompt }}" + echo: no + register: private_key_input + + - name: Fail if private key is not provided fail: - msg: >- - Neither private key (pvt_key) is set. - Please export PVT_KEY. - when: not pvt_key + msg: "Private key is required for creating the gentx." + when: private_key_input.user_input | default('') | trim == '' - name: Import private key in laconicd shell: | - laconic-so deployment --dir {{ data_directory }}/{{ deployment_dir }} exec laconicd "laconicd keys import-hex {{ key_name }} {{ pvt_key }} --keyring-backend test" + laconic-so deployment --dir {{ data_directory }}/{{ deployment_dir }} exec laconicd "laconicd keys import-hex {{ key_name }} {{ private_key_input.user_input }} --keyring-backend test" - name: Run create-validator script shell: |