diff --git a/examples/inventory-dev.yml b/examples/inventory-dev.yml index 9bdba3fe2..f56aa4391 100644 --- a/examples/inventory-dev.yml +++ b/examples/inventory-dev.yml @@ -3,7 +3,7 @@ all: vars: chain_home_clear: true - chain_version: v14.1.0 + chain_version: v15.1.0 api_enabled: true chain_id: "my-devnet" chain_use_ssl_proxy: true diff --git a/examples/inventory-hermes.yml b/examples/inventory-hermes.yml index 51ad9fc84..4b1cf6951 100644 --- a/examples/inventory-hermes.yml +++ b/examples/inventory-hermes.yml @@ -3,7 +3,7 @@ all: vars: chain_home_clear: true - chain_version: v14.1.0 + chain_version: v15.1.0 hermes_version: v1.3.0 ansible_user: root children: diff --git a/examples/inventory-local-genesis.yml b/examples/inventory-local-genesis.yml index a7cbdb712..8ca8f1a24 100644 --- a/examples/inventory-local-genesis.yml +++ b/examples/inventory-local-genesis.yml @@ -3,8 +3,8 @@ all: vars: chain_home_clear: true - chain_version: v14.1.0 - genesis_url: "https://files.polypore.xyz/genesis/mainnet-genesis-tinkered/latest_v13.json.gz" + chain_version: v15.1.0 + genesis_url: "https://files.polypore.xyz/genesis/mainnet-genesis-tinkered/latest_v15.json.gz" ansible_user: root enable_swap: true # Set this for machines with <32GB RAM swap_size: 32768 diff --git a/examples/inventory-local-rs-testnet-neutron.yml b/examples/inventory-local-rs-testnet-neutron.yml index e38761d51..adffc3b87 100644 --- a/examples/inventory-local-rs-testnet-neutron.yml +++ b/examples/inventory-local-rs-testnet-neutron.yml @@ -6,7 +6,7 @@ all: provider: vars: node_user: provider - chain_version: v14.1.0 + chain_version: v15.1.0 moniker: rs-validator chain_id: test-provider chain_denom: uatom diff --git a/examples/inventory-local-rs-testnet.yml b/examples/inventory-local-rs-testnet.yml index 083bf655a..737574a54 100644 --- a/examples/inventory-local-rs-testnet.yml +++ b/examples/inventory-local-rs-testnet.yml @@ -6,7 +6,7 @@ all: provider: vars: node_user: provider - chain_version: v14.1.0 + chain_version: v15.1.0 moniker: rs-validator chain_id: test-provider chain_denom: uatom diff --git a/roles/rs-setup/tasks/main.yml b/roles/rs-setup/tasks/main.yml index 66d6a661e..80215e308 100644 --- a/roles/rs-setup/tasks/main.yml +++ b/roles/rs-setup/tasks/main.yml @@ -16,14 +16,19 @@ - name: Submit consumer chain proposal shell: | - {{ chain_binary_name }} tx gov submit-proposal consumer-addition {{ provider_user_home }}/consumer-proposal.json --keyring-backend test --chain-id {{ chain_id }} --from validator --home {{ provider_home }} --gas auto --fees {{ chain_tx_fees }} --gas-adjustment {{ gas_adjustment }} -b block -y --output json > {{ provider_user_home }}/proposal_result.json + {{ chain_binary_name }} tx gov submit-legacy-proposal consumer-addition {{ provider_user_home }}/consumer-proposal.json --keyring-backend test --chain-id {{ chain_id }} --from validator --home {{ provider_home }} --gas auto --fees {{ chain_tx_fees }} --gas-adjustment {{ gas_adjustment }} -b sync -y --output json > {{ provider_user_home }}/proposal_result.json environment: PATH: "{{provider_home}}/cosmovisor/current/bin:{{ ansible_env.PATH }}" become_user: '{{ provider_user }}' +- name: Wait for block to be added to chain + shell: sleep 6 - name: Collect proposal ID shell: | - jq -r '.logs[0].events[4].attributes[0].value' {{ provider_user_home }}/proposal_result.json + txhash=$(jq -r '.txhash' {{ provider_user_home }}/proposal_result.json) + {{ chain_binary_name }} q tx $txhash -o json | jq -r '.logs[0].events[1] | select(.type == "submit_proposal") | .attributes[0].value' + environment: + PATH: "{{provider_home}}/cosmovisor/current/bin:{{ ansible_env.PATH }}" register: proposal_id become_user: '{{ provider_user }}' @@ -33,11 +38,12 @@ - name: Vote on proposal shell: | - {{ chain_binary_name }} tx gov vote {{proposal_id.stdout}} yes --from validator --keyring-backend test --chain-id {{ provider_chain_id }} --home {{ provider_home }} --gas auto --fees {{ chain_tx_fees }} --gas-adjustment {{ gas_adjustment }} -b block -y + {{ chain_binary_name }} tx gov vote {{proposal_id.stdout}} yes --from validator --keyring-backend test --chain-id {{ provider_chain_id }} --home {{ provider_home }} --gas auto --fees {{ chain_tx_fees }} --gas-adjustment {{ gas_adjustment }} -b sync -y environment: PATH: "{{ provider_home }}/cosmovisor/current/bin:{{ ansible_env.PATH }}" become_user: '{{ provider_user }}' - +- name: Wait for vote to be added on chain + shell: sleep 6 - name: Collect voting period shell: | GOV_PARAMS=$({{ chain_binary_name }} q gov params -o json) diff --git a/roles/rs-setup/templates/consumer-addition-proposal.json.j2 b/roles/rs-setup/templates/consumer-addition-proposal.json.j2 index 049b1f473..6cd4c80b2 100644 --- a/roles/rs-setup/templates/consumer-addition-proposal.json.j2 +++ b/roles/rs-setup/templates/consumer-addition-proposal.json.j2 @@ -15,5 +15,6 @@ "transfer_timeout_period": {{ consumer_transfer_timeout_period }}, "ccv_timeout_period": {{ consumer_ccv_timeout_period }}, "unbonding_period": {{ consumer_unbonding_period }}, - "deposit": "{{consumer_proposal_deposit}}" + "deposit": "{{consumer_proposal_deposit}}", + "summary": "test chain" } \ No newline at end of file