From 003ff4d485bac95373656e894ba570ee259f0b42 Mon Sep 17 00:00:00 2001 From: Adw8 Date: Wed, 4 Sep 2024 17:00:47 +0530 Subject: [PATCH] Add multiaddr to nitro vars file --- .gitignore | 1 + nitro-nodes-setup/README.md | 42 +++++++++++-------- nitro-nodes-setup/nitro-vars-example.yml | 12 +++--- .../templates/configs/l1-nitro-config.env.j2 | 4 +- .../templates/configs/l2-nitro-config.env.j2 | 4 +- 5 files changed, 35 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index c9ddd1f..bf19fc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ nitro-nodes-setup/out/ +nitro-nodes-setup/nitro-vars.yml diff --git a/nitro-nodes-setup/README.md b/nitro-nodes-setup/README.md index d1094f5..8ad8ff3 100644 --- a/nitro-nodes-setup/README.md +++ b/nitro-nodes-setup/README.md @@ -2,7 +2,7 @@ ## Setup Ansible -To get started, follow the [installation](../../README.md#installation) guide to setup ansible on your machine +To get started, follow the [installation](../README.md#installation) guide to setup ansible on your machine ## Run a nitro node @@ -18,10 +18,10 @@ The following commands have to be executed in [`nitro-nodes-setup`](./) director ```bash # L1 WS endpoint - l1_nitro_chain_url: "" + nitro_l1_chain_url: "" # L2 WS endpoint - l2_nitro_chain_url: "" + nitro_l2_chain_url: "" # Private key for your nitro address nitro_sc_pk: "" @@ -41,13 +41,19 @@ The following commands have to be executed in [`nitro-nodes-setup`](./) director # Address of the bridge node bridge_contract_address: "" - # Multi address of the bridge node - nitro_bridge_multiaddr "" + # Multiaddr of the L1 bridge node + nitro_l1_bridge_multiaddr: "" - # Multiaddr with publically accessible IP address / DNS for your nitro node + # Multiaddr of the L2 bridge node + nitro_l2_bridge_multiaddr: "" + + # Multiaddr with publically accessible IP address / DNS for your L1 nitro node # Example: "/ip4/192.168.x.y/tcp/3009" # Example: "/dns4/example.com/tcp/3009" - nitro_node_multiaddr: "" + nitro_l1_ext_multiaddr: "" + + # Multiaddr with publically accessible IP address / DNS for your L2 nitro node + nitro_l2_ext_multiaddr: "" ``` - To run a nitro node, execute the `run-nitro-nodes.yml` Ansible playbook by running the following command. @@ -55,29 +61,29 @@ The following commands have to be executed in [`nitro-nodes-setup`](./) director NOTE: By default, deployments are created in the `nitro-nodes-setup/out` directory. To change this location, update the `nitro_directory` variable in the [setup-vars.yml](./setup-vars.yml) file. ```bash - LANG=en_US.utf8 ansible-playbook -i localhost, --connection=local run-nitro-nodes.yml --extra-vars='{ "target_host": "localhost"}' --user $USER + LANG=en_US.utf8 ansible-playbook -i localhost, --connection=local run-nitro-nodes.yml --extra-vars='{ "target_host": "localhost"}' -kK --user $USER ``` - For skipping container build, run with `"skip_container_build" : true` in the `--extra-vars` parameter: ```bash - LANG=en_US.utf8 ansible-playbook -i localhost, --connection=local run-nitro-nodes.yml --extra-vars='{ "target_host": "localhost", "skip_container_build": true }' --user $USER + LANG=en_US.utf8 ansible-playbook -i localhost, --connection=local run-nitro-nodes.yml --extra-vars='{ "target_host": "localhost", "skip_container_build": true }' -kK --user $USER ``` ## Check Deployment Status - - Run the following command in the directory where the deployments are created +- Run the following command in the directory where the deployments are created - - Check L1 nitro node logs: + - Check L1 nitro node logs: - ```bash - laconic-so deployment --dir l1-nitro-deployment logs nitro-node -f - ``` + ```bash + laconic-so deployment --dir l1-nitro-deployment logs nitro-node -f + ``` - - Check L2 nitro node logs: + - Check L2 nitro node logs: - ```bash - laconic-so deployment --dir l2-nitro-deployment logs nitro-node -f - ``` + ```bash + laconic-so deployment --dir l2-nitro-deployment logs nitro-node -f + ``` Follow steps from [Demo](https://git.vdb.to/cerc-io/nitro-stack/src/branch/main/nitro-bridge-demo.md#demo) to create mirror channels on L2, create virtual channel and make payments diff --git a/nitro-nodes-setup/nitro-vars-example.yml b/nitro-nodes-setup/nitro-vars-example.yml index addf6b0..8b03de2 100644 --- a/nitro-nodes-setup/nitro-vars-example.yml +++ b/nitro-nodes-setup/nitro-vars-example.yml @@ -1,12 +1,12 @@ -l1_nitro_chain_url: "" -l2_nitro_chain_url: "" +nitro_l1_chain_url: "" +nitro_l2_chain_url: "" nitro_sc_pk: "" nitro_chain_pk: "" na_address: "" vpa_address: "" ca_address: "" bridge_contract_address: "" -nitro_bridge_ip: "" -nitro_node_ip: "" -nitro_bridge_multiaddr: "" -nitro_node_multiaddr: "" +nitro_l1_bridge_multiaddr: "" +nitro_l2_bridge_multiaddr: "" +nitro_l1_ext_multiaddr: "" +nitro_l2_ext_multiaddr: "" diff --git a/nitro-nodes-setup/templates/configs/l1-nitro-config.env.j2 b/nitro-nodes-setup/templates/configs/l1-nitro-config.env.j2 index 7ad1a3a..2b1a75e 100644 --- a/nitro-nodes-setup/templates/configs/l1-nitro-config.env.j2 +++ b/nitro-nodes-setup/templates/configs/l1-nitro-config.env.j2 @@ -4,5 +4,5 @@ NITRO_CHAIN_PK={{ nitro_chain_pk }} NA_ADDRESS={{ na_address }} VPA_ADDRESS={{ vpa_address }} CA_ADDRESS={{ ca_address }} -NITRO_BOOTPEERS={{ nitro_bridge_multiaddr }} -NITRO_EXT_MULTIADDR={{ nitro_node_multiaddr }} +NITRO_BOOTPEERS={{ nitro_l1_bridge_multiaddr }} +NITRO_EXT_MULTIADDR={{ nitro_l1_ext_multiaddr }} diff --git a/nitro-nodes-setup/templates/configs/l2-nitro-config.env.j2 b/nitro-nodes-setup/templates/configs/l2-nitro-config.env.j2 index 7290137..363faaf 100644 --- a/nitro-nodes-setup/templates/configs/l2-nitro-config.env.j2 +++ b/nitro-nodes-setup/templates/configs/l2-nitro-config.env.j2 @@ -5,6 +5,6 @@ NA_ADDRESS={{ na_address }} VPA_ADDRESS={{ vpa_address }} CA_ADDRESS={{ ca_address }} BRIDGE_ADDRESS={{ bridge_contract_address }} -NITRO_BOOTPEERS={{ nitro_bridge_multiaddr }} -NITRO_EXT_MULTIADDR={{ nitro_node_multiaddr }} +NITRO_BOOTPEERS={{ nitro_l2_bridge_multiaddr }} +NITRO_EXT_MULTIADDR={{ nitro_l2_ext_multiaddr }} NITRO_L2=true