diff --git a/ops/ansible/playbooks/resync.yml b/ops/ansible/playbooks/resync.yml index 37e57881f..b6d6d91fb 100644 --- a/ops/ansible/playbooks/resync.yml +++ b/ops/ansible/playbooks/resync.yml @@ -6,4 +6,5 @@ - include_role: name: chain_node tasks_from: purge-and-restart - + + \ No newline at end of file diff --git a/ops/ansible/roles/chain_node/tasks/build-chain.yml b/ops/ansible/roles/chain_node/tasks/build-chain.yml index c40bf5b3a..1f6166c51 100644 --- a/ops/ansible/roles/chain_node/tasks/build-chain.yml +++ b/ops/ansible/roles/chain_node/tasks/build-chain.yml @@ -29,8 +29,8 @@ - name: compile gateway command: - cmd: '{{ cargo_bin }} +nightly build --release' - chdir: '{{ gateway_home }}' + cmd: "{{ cargo_bin }} build --release" # appropriate nightly is rustup default + chdir: "{{ gateway_home }}" async: 3600 poll: 0 register: gateway diff --git a/ops/ansible/roles/chain_node/tasks/build-essentials.yml b/ops/ansible/roles/chain_node/tasks/build-essentials.yml index b03ea0585..18a79e712 100644 --- a/ops/ansible/roles/chain_node/tasks/build-essentials.yml +++ b/ops/ansible/roles/chain_node/tasks/build-essentials.yml @@ -1,14 +1,13 @@ - - name: ensure a list of packages installed apt: pkg: "{{ packages }}" state: present update_cache: true - become: 'yes' + become: "yes" - name: check for rustup stat: - path: '{{ rustup_home }}' + path: "{{ rustup_home }}" changed_when: false register: rustup_home_binary @@ -16,23 +15,26 @@ block: - name: download rustup-init... get_url: - url: '{{ rustup_init_url }}' + url: "{{ rustup_init_url }}" dest: /tmp/rustup-init mode: 0755 - name: install rust... command: /tmp/rustup-init -y args: - creates: '{{ rustup_home }}' + creates: "{{ rustup_home }}" - name: install stable rust - command: '{{ rustup_home }} default stable' + command: "{{ rustup_home }} default stable" - name: install nightly toolchain - command: '{{ rustup_home }} toolchain install nightly' + command: "{{ rustup_home }} toolchain install nightly-2021-05-24" - name: install wasm - command: '{{ rustup_home }} target add wasm32-unknown-unknown --toolchain nightly' + command: "{{ rustup_home }} target add wasm32-unknown-unknown --toolchain nightly-2021-05-24" + + - name: default to nightly rust + command: "{{ rustup_home }} default nightly-2021-05-24" always: - name: clean rustup diff --git a/ops/ansible/roles/chain_node/tasks/purge-and-restart.yml b/ops/ansible/roles/chain_node/tasks/purge-and-restart.yml index abefce31d..07b36fcf6 100644 --- a/ops/ansible/roles/chain_node/tasks/purge-and-restart.yml +++ b/ops/ansible/roles/chain_node/tasks/purge-and-restart.yml @@ -5,19 +5,20 @@ name: gateway.service state: stopped -- name: bring chain spec - become: true - ansible.builtin.copy: - src: "{{ chain_spec }}" - dest: "{{ gateway_user_home }}/chainSpec.json" - owner: gateway - mode: '0644' +# chainspecs have gotten much more stable +# - name: bring chain spec +# become: true +# ansible.builtin.copy: +# src: "{{ chain_spec }}" +# dest: "{{ gateway_chain_spec_raw }}" +# owner: gateway +# mode: '0644' - name: purge chain become: true shell: | set -o pipefail - {{ gateway_bin }} purge-chain -y --chain "{{ gateway_user_home }}/chainSpec.json" --base-path {{ chain_data_dir }} --database paritydb + {{ gateway_bin }} purge-chain -y --chain {{ gateway_chain_spec_raw }} --base-path {{ chain_data_dir }} --database paritydb-experimental args: executable: /bin/bash changed_when: False @@ -29,8 +30,7 @@ vars: peers: "{{ bootnodes }}" authority: "{{ authority }}" - tags: - gateway-service + tags: gateway-service - name: reinstall Gateway systemd unit file (full node) template: src=gateway-full-node.j2 dest=/etc/systemd/system/gateway.service @@ -38,12 +38,11 @@ when: "'full_node' in group_names" vars: peers: "{{ groups['authority_node'] }}" - tags: - gateway-service + tags: gateway-service - name: start gateway service become: true systemd: name: gateway.service state: started - daemon_reload: yes \ No newline at end of file + daemon_reload: yes diff --git a/ops/ansible/roles/chain_node/tasks/resync_fulls.yml b/ops/ansible/roles/chain_node/tasks/resync_fulls.yml index 5bd953757..df6187919 100644 --- a/ops/ansible/roles/chain_node/tasks/resync_fulls.yml +++ b/ops/ansible/roles/chain_node/tasks/resync_fulls.yml @@ -1,4 +1,3 @@ - - name: stop gateway service when: "'full_node' in group_names" become: true @@ -11,7 +10,7 @@ when: "'full_node' in group_names" shell: | set -o pipefail - {{ gateway_bin }} purge-chain -y --chain "{{ gateway_user_home }}/chainSpec.json" --base-path {{ chain_data_dir }} --database paritydb-experimental + {{ gateway_bin }} purge-chain -y --chain {{ gateway_chain_spec_raw }} --base-path {{ chain_data_dir }} --database paritydb-experimental args: executable: /bin/bash changed_when: False @@ -22,13 +21,12 @@ when: "'full_node' in group_names" vars: peers: "{{ groups['authority_node'] }}" - tags: - gateway-service + tags: gateway-service -# - name: start gateway service -# when: "'full_node' in group_names" -# become: true -# systemd: -# name: gateway.service -# state: started -# daemon_reload: yes \ No newline at end of file +- name: start gateway service + when: "'full_node' in group_names" + become: true + systemd: + name: gateway.service + state: started + daemon_reload: yes diff --git a/ops/ansible/roles/chain_node/templates/gateway-authority-node.j2 b/ops/ansible/roles/chain_node/templates/gateway-authority-node.j2 index 0e02897a4..bc80f77b5 100644 --- a/ops/ansible/roles/chain_node/templates/gateway-authority-node.j2 +++ b/ops/ansible/roles/chain_node/templates/gateway-authority-node.j2 @@ -14,7 +14,7 @@ Environment="KEYRING_TYPE={{ keyring_type | default('IN_MEMORY') }}" Environment="MINER={{ miner }}" ExecStart={{ gateway_bin }} \ --base-path {{ chain_data_dir }} \ - --chain "{{ gateway_user_home }}/chainSpec.json" \ + --chain {{ gateway_chain_spec_raw }} \ --port 30333 \ --ws-port 9944 \ --ws-external \ @@ -22,6 +22,7 @@ ExecStart={{ gateway_bin }} \ --rpc-methods Unsafe \ --rpc-external \ --no-mdns \ + --log pallet_cash=debug \ --node-key-file {{ node_key_priv_file }} \ {% for bootnode_multi_addr in peers -%} --bootnodes {{ bootnode_multi_addr }} \ diff --git a/ops/ansible/roles/chain_node/templates/gateway-full-node.j2 b/ops/ansible/roles/chain_node/templates/gateway-full-node.j2 index d68f67de3..0345064c9 100644 --- a/ops/ansible/roles/chain_node/templates/gateway-full-node.j2 +++ b/ops/ansible/roles/chain_node/templates/gateway-full-node.j2 @@ -8,7 +8,7 @@ WorkingDirectory={{ gateway_user_home }} Environment="MINER={{ miner }}" ExecStart={{ gateway_bin }} \ --base-path {{ chain_data_dir }} \ - --chain "{{ gateway_user_home }}/chainSpec.json" \ + --chain {{ gateway_chain_spec_raw }} \ --port 30333 \ --ws-port 9944 \ --ws-external \ diff --git a/ops/ansible/roles/chain_node/vars/main/git.yml b/ops/ansible/roles/chain_node/vars/main/git.yml index a19f91eef..366df8f51 100644 --- a/ops/ansible/roles/chain_node/vars/main/git.yml +++ b/ops/ansible/roles/chain_node/vars/main/git.yml @@ -1,4 +1,4 @@ ssh_home: "{{ ansible_env.HOME }}/.ssh" git_deploy_key: "{{ ssh_home }}/id_rsa_gateway_deploy" git_repo: "ssh://git@github.com/compound-finance/gateway.git" -git_branch: "cob/rpcs" +git_branch: "develop" diff --git a/ops/ansible/roles/chain_node/vars/main/paths.yml b/ops/ansible/roles/chain_node/vars/main/paths.yml index 5f3214759..62957b907 100644 --- a/ops/ansible/roles/chain_node/vars/main/paths.yml +++ b/ops/ansible/roles/chain_node/vars/main/paths.yml @@ -1,4 +1,3 @@ - rustup_init_url: https://sh.rustup.rs cargo_home: "{{ ansible_env.HOME }}/.cargo" cargo_bin_dir: "{{ cargo_home }}/bin" @@ -7,3 +6,4 @@ subkey_bin: "{{ cargo_bin_dir }}/subkey" rustup_home: "{{ cargo_home }}/bin/rustup" gateway_home: "{{ ansible_env.HOME }}/gateway" gateway_bin: "{{ ansible_env.HOME }}/gateway/target/release/gateway" +gateway_chain_spec_raw: "{{ ansible_env.HOME }}/gateway/chains/testnet/chain-spec-raw.json"