Update stage2 port mapping

Part of [Service provider auctions for web deployments](https://www.notion.so/Service-provider-auctions-for-web-deployments-104a6b22d47280dbad51d28aa3a91d75)

- Update instructions for nitro node deployments

Co-authored-by: Adw8 <adwaitgharpure@gmail.com>
Co-authored-by: Shreerang Kale <shreerangkale@gmail.com>
Co-authored-by: Neeraj <neeraj.rtly@gmail.com>
Reviewed-on: #32
Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com>
Co-committed-by: Prathamesh Musale <prathamesh.musale0@gmail.com>

README.md

@@ -10,6 +10,7 @@ Stacks to run a node for laconic testnet
 
 - [Update deployments after code changes](./ops/update-deployments.md)
 - [Halt stage0 and start stage1](./ops/stage0-to-stage1.md)
+- [Halt stage1 and start stage2](./ops/stage1-to-stage2.md)
 - [Create deployments from scratch (for reference only)](./ops/deployments-from-scratch.md)
 - [Deploy and transfer new tokens for nitro operations](./ops/nitro-token-ops.md)
 
@@ -17,6 +18,10 @@ Stacks to run a node for laconic testnet
 
 Follow steps in [testnet-onboarding-validator.md](./testnet-onboarding-validator.md) to onboard your participant and join as a validator on the LORO testnet
 
+## Join SAPO testnet
+
+Follow steps in [Upgrade to SAPO testnet](./testnet-onboarding-validator.md#upgrade-to-sapo-testnet) to upgrade your LORO testnet node for SAPO testnet
+
 ## Run testnet Nitro Node
 
 Follow steps in [testnet-nitro-node.md](./testnet-nitro-node.md) to run you Nitro node for the testnet

ops/configs/backend-config.toml

@@ -0,0 +1,40 @@
+[server]
+  host = "0.0.0.0"
+  port = 8000
+  gqlPath = "/graphql"
+  [server.session]
+    secret = "<redacted>"
+    # Frontend webapp URL origin
+    appOriginUrl = "https://deploy.apps.vaasl.io"
+    # Set to true if server running behind proxy
+    trustProxy = true
+    # Backend URL hostname
+    domain = "deploy-backend.apps.vaasl.io"
+
+[database]
+  dbPath = "/data/db/deploy-backend"
+
+[gitHub]
+  webhookUrl = "https://deploy-backend.apps.vaasl.io"
+  [gitHub.oAuth]
+    clientId = "<redacted>"
+    clientSecret = "<redacted>"
+
+[registryConfig]
+  fetchDeploymentRecordDelay = 5000
+  checkAuctionStatusDelay = 5000
+  restEndpoint = "https://laconicd-sapo.laconic.com"
+  gqlEndpoint = "https://laconicd-sapo.laconic.com/api"
+  chainId = "laconic-testnet-2"
+  privateKey = "<redacted>"
+  bondId = "<redacted>"
+  authority = "vaasl"
+  [registryConfig.fee]
+    gasPrice = "0.001alnt"
+
+[auction]
+  commitFee = "1000"
+  commitsDuration = "60s"
+  revealFee = "1000"
+  revealsDuration = "60s"
+  denom = "alnt"

ops/nitro-token-ops.md

@@ -1,6 +1,8 @@
 # Nitro Token Ops
 
-## Setup
+## Deploy and transfer custom tokens
+
+### Setup
 
 * Go to the directory where `nitro-contracts-deployment` is present:
 
@@ -8,7 +10,7 @@
   cd /srv/bridge
   ```
 
-## Deploy new token
+### Deploy new token
 
 * To deploy another token:
 
@@ -48,7 +50,7 @@
 
   * Check in the generated file at location `ops/stage2/assets.json` within this repository
 
-## Transfer deployed tokens to given address
+### Transfer deployed tokens to given address
 
 * To transfer a token to an account:
 
@@ -57,7 +59,25 @@
   export TOKEN_NAME="<name-of-token-to-be-transferred>"
   export ASSET_ADDRESS=$(laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "jq -r '.\"$GETH_CHAIN_ID\"[0].contracts.$TOKEN_NAME.address' /app/deployment/nitro-addresses.json")
   export ACCOUNT="<target-account-address>"
-  export AMOUNT="<transfer-amount>"
 
-  laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "cd packages/nitro-protocol && yarn hardhat transfer --contract $ASSET_ADDRESS --to $ACCOUNT --amount 1000 --network geth"
+  laconic-so deployment --dir nitro-contracts-deployment exec nitro-contracts "cd packages/nitro-protocol && yarn hardhat transfer --contract $ASSET_ADDRESS --to $ACCOUNT --amount 100 --network geth"
+  ```
+
+## Transfer ETH
+
+* Go to the directory where `fixturenet-eth-deployment` is present:
+
+  ```bash
+  cd /srv/fixturenet-eth
+  ```
+
+* To transfer ETH to an account:
+
+  ```bash
+  export FUNDED_ADDRESS="0xe6CE22afe802CAf5fF7d3845cec8c736ecc8d61F"
+  export FUNDED_PK="888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218"
+
+  export TO_ADDRESS="<target-account-address>"
+
+  laconic-so deployment --dir fixturenet-eth-deployment exec foundry "cast send $TO_ADDRESS --value 1ether --from $FUNDED_ADDRESS --private-key $FUNDED_PK"
   ```

ops/stage0-to-stage1.md

@@ -93,7 +93,7 @@ Once all the participants have completed their onboarding, stage0 laconicd chain
     scp dev@<deployments-server-hostname>:/srv/laconicd/stage1-deployment/data/laconicd-data/config/genesis.json </path/to/local/directory>
     ```
 
-* Now users can follow the steps to [Join as a validator on stage1](https://git.vdb.to/cerc-io/testnet-laconicd-stack/src/branch/main/testnet-onboarding-validator.md#join-as-a-validator-on-stage1)
+* Now users can follow the steps to [Join as a validator on stage1](../testnet-onboarding-validator.md#join-as-a-validator-on-stage1)
 
 ## Bank Transfer
 

ops/stage1-to-stage2.md

@@ -0,0 +1,150 @@
+# Halt stage1 and start stage2
+
+## Login
+
+* Log in as `dev` user on the deployments VM
+
+* All the deployments are placed in the `/srv` directory:
+
+  ```bash
+  cd /srv
+  ```
+
+## Halt stage1
+
+* Confirm the the currently running node is for stage1 chain:
+
+  ```bash
+  # On stage1 deployment machine
+  STAGE1_DEPLOYMENT=/srv/laconicd/testnet-laconicd-deployment
+
+  laconic-so deployment --dir $STAGE1_DEPLOYMENT logs laconicd -f --tail 30
+
+  # Note: stage1 node on deployments VM has been changed to run from /srv/laconicd/testnet-laconicd-deployment instead of  /srv/laconicd/stage1-deployment
+  ```
+
+* Stop the stage1 deployment:
+
+  ```bash
+  laconic-so deployment --dir $STAGE1_DEPLOYMENT stop
+
+  # Stopping this deployment marks the end of testnet stage1
+  ```
+
+## Export stage1 state
+
+* Export the chain state:
+
+  ```bash
+  docker run -it \
+    -v $STAGE1_DEPLOYMENT/data/laconicd-data:/root/.laconicd \
+    cerc/laconicd-stage1:local bash -c "laconicd export | jq > /root/.laconicd/stage1-state.json"
+  ```
+
+* Archive the state and node config and keys:
+
+  ```bash
+  sudo tar -czf /srv/laconicd/stage1-laconicd-export.tar.gz --exclude="./data" --exclude="./tmp" -C $STAGE1_DEPLOYMENT/data/laconicd-data .
+  sudo chown dev:dev /srv/laconicd/stage1-laconicd-export.tar.gz
+  ```
+
+## Initialize stage2
+
+* Copy over the stage1 state and node export archive to stage2 deployment machine
+
+* Extract the stage1 state and node config to stage2 deployment dir:
+
+  ```bash
+  # On stage2 deployment machine
+  cd /srv/laconicd
+
+  # Unarchive
+  tar -xzf stage1-laconicd-export.tar.gz -C stage2-deployment/data/laconicd-data
+
+  # Verify contents
+  ll stage2-deployment/data/laconicd-data
+  ```
+
+* Initialize stage2 chain:
+
+  ```bash
+  DEPLOYMENT_DIR=$(pwd)
+
+  cd ~/cerc/fixturenet-laconicd-stack/stack-orchestrator/stacks/fixturenet-laconicd
+
+  STAGE2_CHAIN_ID=laconic-testnet-2
+  ./scripts/initialize-stage2.sh $DEPLOYMENT_DIR/stage2-deployment $STAGE2_CHAIN_ID LaconicStage2 os 1000000000000000
+
+  # Enter the keyring passphrase for account from stage1 when prompted
+
+  cd $DEPLOYMENT_DIR
+  ```
+
+  * Resets the node data (`unsafe-reset-all`)
+
+  * Initializes the `stage2-deployment` node
+
+  * Generates the genesis file for stage2 with stage1 state
+
+    * Carries over accounts, balances and laconicd modules from stage1
+
+    * Skips staking and validator data
+
+* Copy over the genesis file outside data directory:
+
+  ```bash
+  cp stage2-deployment/data/laconicd-data/config/genesis.json stage2-deployment
+  ```
+
+## Start stage2
+
+* Start the stage2 deployment:
+
+  ```bash
+  laconic-so deployment --dir stage2-deployment start
+  ```
+
+* Check status of stage2 laconicd:
+
+  ```bash
+  # List down the container and check health status
+  docker ps -a | grep laconicd
+
+  # Follow logs for laconicd container, check that new blocks are getting created
+  laconic-so deployment --dir stage2-deployment logs laconicd -f
+  ```
+
+* Get the node's peer adddress and stage2 genesis file to share with the participants:
+
+  * Get the node id:
+
+    ```bash
+    echo $(laconic-so deployment --dir stage2-deployment exec laconicd "laconicd cometbft show-node-id")@laconicd-sapo.laconic.com:36656
+    ```
+
+  * Get the genesis file:
+
+    ```bash
+    scp dev@<deployments-server-hostname>:/srv/laconicd/stage2-deployment/genesis.json </path/to/local/directory>
+    ```
+
+* Now users can follow the steps to [Upgrade to SAPO testnet](../testnet-onboarding-validator.md#upgrade-to-sapo-testnet)
+
+## Bank Transfer
+
+* Transfer tokens to an address:
+
+  ```bash
+  cd /srv/laconicd
+
+  RECEIVER_ADDRESS=
+  AMOUNT=
+
+  laconic-so deployment --dir stage2-deployment exec laconicd "laconicd tx bank send alice ${RECEIVER_ADDRESS} ${AMOUNT}alnt --from alice --fees 1000alnt"
+  ```
+
+* Check balance:
+
+  ```bash
+  laconic-so deployment --dir stage2-deployment exec laconicd "laconicd query bank balances ${RECEIVER_ADDRESS}"
+  ```

ops/stage2/upgrade-node-to-testnet2.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Exit on error
+set -e
+set -u
+
+NODE_HOME="$HOME/.laconicd"
+testnet2_genesis="$NODE_HOME/tmp-testnet2/genesis.json"
+
+if [ ! -f ${testnet2_genesis} ]; then
+  echo "testnet2 genesis file not found, exiting..."
+  exit 1
+fi
+
+# Remove data but keep keys
+laconicd cometbft unsafe-reset-all
+
+# Use provided genesis config
+cp $testnet2_genesis $NODE_HOME/config/genesis.json
+
+# Set chain id in config
+chain_id=$(jq -r '.chain_id' $testnet2_genesis)
+laconicd config set client chain-id $chain_id --home $NODE_HOME
+
+echo "Node data reset and ready for testnet2!"

stack-orchestrator/compose/docker-compose-laconic-console.yml

@@ -9,7 +9,8 @@ services:
       CERC_LACONICD_USER_KEY: ${CERC_LACONICD_USER_KEY}
       CERC_LACONICD_BOND_ID: ${CERC_LACONICD_BOND_ID}
       CERC_LACONICD_GAS: ${CERC_LACONICD_GAS:-200000}
-      CERC_LACONICD_FEES: ${CERC_LACONICD_FEES:-200000alnt}
+      CERC_LACONICD_FEES: ${CERC_LACONICD_FEES:-200alnt}
+      CERC_LACONICD_GASPRICE: ${CERC_LACONICD_GASPRICE:-0.001alnt}
     volumes:
       - ../config/laconic-console/cli/create-config.sh:/app/create-config.sh
       - laconic-registry-data:/laconic-registry-data

stack-orchestrator/compose/docker-compose-laconic-shopify.yml

@@ -5,7 +5,7 @@ services:
     depends_on:
       faucet:
         condition: service_healthy
-    command: ["bash", "-c", "./start-faucet.sh"]
+    command: ["bash", "-c", "./start-shopify.sh"]
     environment:
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
       CERC_SHOPIFY_GRAPHQL_URL: ${CERC_SHOPIFY_GRAPHQL_URL}

stack-orchestrator/compose/docker-compose-testnet-laconicd.yml

@@ -7,6 +7,7 @@ services:
       CERC_MONIKER: ${CERC_MONIKER:-TestnetNode}
       CERC_CHAIN_ID: ${CERC_CHAIN_ID:-laconic_9000-1}
       CERC_PEERS: ${CERC_PEERS}
+      MIN_GAS_PRICE: ${MIN_GAS_PRICE:-0.001}
       CERC_LOGLEVEL: ${CERC_LOGLEVEL:-info}
     volumes:
       - laconicd-data:/root/.laconicd

stack-orchestrator/config/laconic-console/cli/create-config.sh

@@ -18,6 +18,7 @@ services:
     chainId: ${CERC_LACONICD_CHAIN_ID}
     gas: ${CERC_LACONICD_GAS}
     fees: ${CERC_LACONICD_FEES}
+    gasPrice: ${CERC_LACONICD_GASPRICE}
 EOF
 
 echo "Exported config to $config_file"

stack-orchestrator/config/laconic-shopify/product_pricings.json

@@ -1,5 +1,5 @@
 {
-    "10 webapp deployments": "100000",
+    "10 pre-paid webapp deployments": "100000",
     "100 webapp deployments": "1000000",
     "500 webapp deployments": "5000000",
     "1000 webapp deployments": "10000000"

stack-orchestrator/config/laconicd/run-laconicd.sh

@@ -21,6 +21,7 @@ echo "Env:"
 echo "Moniker: $CERC_MONIKER"
 echo "Chain Id: $CERC_CHAIN_ID"
 echo "Persistent peers: $CERC_PEERS"
+echo "Min gas price: $MIN_GAS_PRICE"
 echo "Log level: $CERC_LOGLEVEL"
 
 NODE_HOME=/root/.laconicd
@@ -46,6 +47,7 @@ sed -i "s/^persistent_peers *=.*/persistent_peers = \"$CERC_PEERS\"/g" $NODE_HOM
 echo "Starting laconicd node..."
 laconicd start \
   --api.enable \
+  --minimum-gas-prices=${MIN_GAS_PRICE}alnt \
   --rpc.laddr="tcp://0.0.0.0:26657" \
   --gql-playground --gql-server \
   --log_level $CERC_LOGLEVEL \

stack-orchestrator/stacks/laconic-console/README.md

@@ -83,9 +83,14 @@ Instructions for running laconic registry CLI and console
   # Gas limit for txs (default: 200000)
   CERC_LACONICD_GAS=
 
-  # Max fees for txs (default: 200000alnt)
+  # Max fees for txs (default: 200alnt)
   CERC_LACONICD_FEES=
 
+  # Gas price to use for txs (default: 0.001alnt)
+  # Use for auto fees calculation, gas and fees not required to be set in that case
+  # Reference: https://git.vdb.to/cerc-io/laconic-registry-cli#gas-and-fees
+  CERC_LACONICD_GASPRICE=
+
   # Console configuration
 
   # Laconicd (hosted) GQL endpoint (default: http://localhost:9473)

stack-orchestrator/stacks/testnet-laconicd/README.md

@@ -122,6 +122,9 @@ Instructions for running a laconicd testnet full node and joining as a validator
 
   # Output log level (default: info)
   CERC_LOGLEVEL=
+
+  # Minimum gas price in alnt to accept for transactions (default: "0.001")
+  MIN_GAS_PRICE
   ```
 
 * Inside the `laconic-console-deployment` deployment directory, open `config.env` file and set following env variables:
@@ -143,9 +146,14 @@ Instructions for running a laconicd testnet full node and joining as a validator
   # Gas limit for txs (default: 200000)
   CERC_LACONICD_GAS=
 
-  # Max fees for txs (default: 200000alnt)
+  # Max fees for txs (default: 200alnt)
   CERC_LACONICD_FEES=
 
+  # Gas price to use for txs (default: 0.001alnt)
+  # Use for auto fees calculation, gas and fees not required to be set in that case
+  # Reference: https://git.vdb.to/cerc-io/laconic-registry-cli#gas-and-fees
+  CERC_LACONICD_GASPRICE=
+
   # Console configuration
 
   # Laconicd (hosted) GQL endpoint (default: http://localhost:9473)

testnet-nitro-node.md

@@ -14,6 +14,8 @@
 
 * On deployment machine:
 
+  * User with passwordless sudo: see [setup](https://git.vdb.to/cerc-io/testnet-ops/src/branch/main/user-setup/README.md#user-setup)
+
   * laconic-so: see [installation](https://git.vdb.to/cerc-io/testnet-ops/src/branch/main/stack-orchestrator-setup/README.md#setup-stack-orchestrator)
 
 ## Setup
@@ -28,43 +30,68 @@
 
   ```bash
   wget -O nitro-vars.yml https://git.vdb.to/cerc-io/testnet-laconicd-stack/raw/branch/main/ops/stage2/nitro-node-config.yml
-
-  # Expected variables in the fetched config file:
-
-  # nitro_chain_url: ""
-  # na_address: ""
-  # ca_address: ""
-  # vpa_address: ""
-  # bridge_nitro_address: ""
-  # nitro_l1_bridge_multiaddr: ""
-  # nitro_l2_bridge_multiaddr: ""
   ```
 
 * Fetch required asset addresses:
 
   ```bash
   wget -O assets.json https://git.vdb.to/cerc-io/testnet-laconicd-stack/raw/branch/main/ops/stage2/assets.json
-
-  # Example output:
-  # {
-  #   "1212": [
-  #     {
-  #       "name": "geth",
-  #       "chainId": "1212",
-  #       "contracts": {
-  #         "TestToken": {
-  #           "address": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"
-  #         },
-  #         "TestToken2": {
-  #           "address": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9"
-  #         }
-  #       }
-  #     }
-  #   ]
-  # }
   ```
 
-* TODO: Get L1 tokens on your address
+* Ask testnet operator to send L1 tokens and ETH to your chain address
+
+  * [README for transferring tokens](./ops/nitro-token-ops.md#transfer-deployed-tokens-to-given-address)
+
+  * [README for transferring ETH](./ops/nitro-token-ops.md#transfer-eth)
+
+* Check balance of your tokens once they are transferred:
+
+  ```bash
+  # Note: Account address should be without "0x"
+  export ACCOUNT_ADDRESS="<account-address>"
+
+  export GETH_CHAIN_ID="1212"
+  export GETH_CHAIN_URL="https://fixturenet-eth.laconic.com"
+
+  export ASSET_ADDRESS_1=$(jq -r --arg chainId "$GETH_CHAIN_ID" '.[$chainId][0].contracts.TestToken.address' assets.json)
+  export ASSET_ADDRESS_2=$(jq -r --arg chainId "$GETH_CHAIN_ID" '.[$chainId][0].contracts.TestToken2.address' assets.json)
+
+  # Check balance of eth account
+  curl -X POST $GETH_CHAIN_URL \
+  -H "Content-Type: application/json" \
+  -d '{
+    "jsonrpc":"2.0",
+    "method":"eth_getBalance",
+    "params":["'"$ACCOUNT_ADDRESS"'", "latest"],
+    "id":1
+  }'
+
+  # Check balance of first asset address
+  curl -X POST $GETH_CHAIN_URL \
+   -H "Content-Type: application/json" \
+   -d '{
+     "jsonrpc":"2.0",
+     "method":"eth_call",
+     "params":[{
+       "to": "'"$ASSET_ADDRESS_1"'",
+       "data": "0x70a08231000000000000000000000000'"$ACCOUNT_ADDRESS"'"
+     }, "latest"],
+     "id":1
+   }'
+
+  # Check balance of second asset address
+  curl -X POST $GETH_CHAIN_URL \
+   -H "Content-Type: application/json" \
+   -d '{
+     "jsonrpc":"2.0",
+     "method":"eth_call",
+     "params":[{
+       "to": "'"$ASSET_ADDRESS_2"'",
+       "data": "0x70a08231000000000000000000000000'"$ACCOUNT_ADDRESS"'"
+     }, "latest"],
+     "id":1
+   }'
+  ```
 
 * Edit `nitro-vars.yml` and add the following variables:
 
@@ -90,36 +117,27 @@
   nitro_l2_ext_multiaddr: ""
   ```
 
-* Update the target dir in `setup-vars.yml`:
+* Edit the `setup-vars.yml` to update the target directory:
 
   ```bash
-  # Set path to desired deployments dir (under your user)
-  DEPLOYMENTS_DIR=<path-to-deployments-dir>
+  # Set absolute path to desired deployments directory (under your user)
+  # Example: /home/dev/nitro-node-deployments
+  ...
+  nitro_directory: <path-to-deployments-dir>
+  ...
 
-  sed -i "s|^nitro_directory:.*|nitro_directory: $DEPLOYMENTS_DIR/nitro-node|" setup-vars.yml
-
-  # Will create deployments at $DEPLOYMENTS_DIR/nitro-node/l1-nitro-deployment and $DEPLOYMENTS_DIR/nitro-node/l2-nitro-deployment
+  # Will create deployments at <path-to-deployments-dir>/l1-nitro-deployment and <path-to-deployments-dir>/l2-nitro-deployment
   ```
 
 ## Run Nitro Nodes
 
-Nitro nodes can be run using Ansible either locally or on a remote machine; follow corresponding steps for your setup
-
-### On Local Host
-
-* Setup and run a Nitro node (L1+L2) by executing the `run-nitro-nodes.yml` Ansible playbook:
-
-  ```bash
-  LANG=en_US.utf8 ansible-playbook -i localhost, --connection=local run-nitro-nodes.yml --extra-vars='{ "target_host": "localhost"}' --user $USER
-  ```
-
-### On Remote Host
+Nitro nodes can be set up on a target machine using Ansible:
 
 * In `testnet-ops/nitro-nodes-setup`, create a new `hosts.ini` file:
 
-   ```bash
-   cp ../hosts.example.ini hosts.ini
-   ```
+  ```bash
+  cp ../hosts.example.ini hosts.ini
+  ```
 
 * Edit the [`hosts.ini`](./hosts.ini) file to run the playbook on a remote machine:
 
@@ -131,12 +149,12 @@ Nitro nodes can be run using Ansible either locally or on a remote machine; foll
   * Replace `<deployment_host>` with `nitro_host`
   * Replace `<host_name>` with the alias of your choice
   * Replace `<target_ip>` with the IP address or hostname of the target machine
-  * Replace `<ssh_user>` with the SSH username (e.g., dev, ubuntu)
+  * Replace `<ssh_user>` with the username of the user that you set up on target machine (e.g. dev, ubuntu)
 
 * Verify that you are able to connect to the host using the following command
 
   ```bash
-  ansible all -m ping -i hosts.ini -k
+  ansible all -m ping -i hosts.ini
 
   # If using password based authentication, enter the ssh password on prompt; otherwise, leave it blank
 
@@ -151,13 +169,10 @@ Nitro nodes can be run using Ansible either locally or on a remote machine; foll
   # }
   ```
 
-* Execute the `run-nitro-nodes.yml` Ansible playbook for remote deployment:
+* Execute the `run-nitro-nodes.yml` Ansible playbook to setup and run a Nitro node (L1+L2):
 
   ```bash
-  LANG=en_US.utf8 ansible-playbook -i hosts.ini run-nitro-nodes.yml --extra-vars='{ "target_host": "nitro_host"}' --user $USER -kK
-
-  # If using password based authentication, enter the ssh password on prompt; otherwise, leave it blank
-  # Enter the sudo password as "BECOME password" on prompt
+  LANG=en_US.utf8 ansible-playbook -i hosts.ini run-nitro-nodes.yml --extra-vars='{ "target_host": "nitro_host"}' --user $USER
   ```
 
 ### Check Deployment Status
@@ -165,9 +180,7 @@ Nitro nodes can be run using Ansible either locally or on a remote machine; foll
 * Run the following commands on deployment machine:
 
   ```bash
-  DEPLOYMENTS_DIR=<path-to-deployments-dir>
-
-  cd $DEPLOYMENTS_DIR/nitro-node
+  cd <path-to-deployments-dir>
 
   # Check the logs, ensure that the nodes are running
   laconic-so deployment --dir l1-nitro-deployment logs nitro-node -f
@@ -182,7 +195,7 @@ Nitro nodes can be run using Ansible either locally or on a remote machine; foll
 * Get your Nitro node's info:
 
   ```bash
-  laconic-so deployment --dir l1-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-node-info -p 4005 -h nitro-node"
+  laconic-so deployment --dir l2-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-node-info -p 4005 -h nitro-node"
 
   # Expected output:
   # {
@@ -202,18 +215,18 @@ Create a ledger channel with the bridge on L1 which is mirrored on L2
 * Set required variables:
 
   ```bash
-  DEPLOYMENTS_DIR=<path-to-deployments-dir>
-
-  cd $DEPLOYMENTS_DIR/nitro-node
+  cd <path-to-deployments-dir>
 
   export BRIDGE_NITRO_ADDRESS=$(yq eval '.bridge_nitro_address' nitro-node-config.yml)
 
+  export GETH_CHAIN_ID="1212"
+
   # Get asset addresses from assets.json file
-  export ASSET_ADDRESS_1=$(jq -r --arg chainId "$CHAIN_ID" '.[$chainId][0].contracts.TestToken.address' assets.json)
-  export ASSET_ADDRESS_2=$(jq -r --arg chainId "$CHAIN_ID" '.[$chainId][0].contracts.TestToken2.address' assets.json)
+  export ASSET_ADDRESS_1=$(jq -r --arg chainId "$GETH_CHAIN_ID" '.[$chainId][0].contracts.TestToken.address' assets.json)
+  export ASSET_ADDRESS_2=$(jq -r --arg chainId "$GETH_CHAIN_ID" '.[$chainId][0].contracts.TestToken2.address' assets.json)
   ```
 
-* Check that check that you have no existing channels on L1 or L2:
+* Check that you have no existing channels on L1 or L2:
 
   ```bash
   laconic-so deployment --dir l1-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-all-ledger-channels -p 4005 -h nitro-node"
@@ -223,6 +236,8 @@ Create a ledger channel with the bridge on L1 which is mirrored on L2
   # []
   ```
 
+* Ensure that your account has enough balance of tokens from `assets.json`
+
 * Create a ledger channel between your L1 Nitro node and Bridge with custom asset:
 
   ```bash
@@ -325,9 +340,7 @@ Perform payments using a virtual payment channel created with another Nitro node
 * Switch to the `nitro-node` directory:
 
   ```bash
-  DEPLOYMENTS_DIR=<path-to-deployments-dir>
-
-  cd $DEPLOYMENTS_DIR/nitro-node
+  cd <path-to-deployments-dir>
   ```
 
 * Check status of the mirrored channel on L2:
@@ -366,9 +379,6 @@ Perform payments using a virtual payment channel created with another Nitro node
   ```bash
   export BRIDGE_NITRO_ADDRESS=$(yq eval '.bridge_nitro_address' nitro-node-config.yml)
 
-  # Counterparty to create the payment channel with
-  export COUNTER_PARTY_ADDRESS=<counterparty-nitro-address>
-
   # Mirrored channel on L2
   export L2_CHANNEL_ID=<l2-channel-id>
 
@@ -376,6 +386,21 @@ Perform payments using a virtual payment channel created with another Nitro node
   export PAYMENT_CHANNEL_AMOUNT=500
   ```
 
+* Set counterparty address
+
+  ```bash
+  export COUNTER_PARTY_ADDRESS=<counterparty-nitro-address>
+  ```
+
+  * Get the nitro address of the counterparty's node with whom you want create payment channel
+
+  * To get the nitro address of the your node:
+
+    ```bash
+    laconic-so deployment --dir l2-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-node-info -p 4005 -h nitro-node"
+    # `SCAddress` -> nitro address
+    ```
+
 * Check for existing payment channels for the L2 channel:
 
   ```bash
@@ -447,6 +472,8 @@ Perform payments using a virtual payment channel created with another Nitro node
 
 * Check L2 mirrored channel's status after the virtual payment channel is closed:
 
+  * This can be checked by both nodes
+
   ```bash
   laconic-so deployment --dir l2-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-all-ledger-channels -p 4005 -h nitro-node"
 
@@ -489,9 +516,7 @@ Perform swaps using a swap channel created with another Nitro node over the mirr
 * Switch to the `nitro-node` directory:
 
   ```bash
-  DEPLOYMENTS_DIR=<path-to-deployments-dir>
-
-  cd $DEPLOYMENTS_DIR/nitro-node
+  cd <path-to-deployments-dir>
   ```
 
 * Check status of the mirrored channel on L2:
@@ -530,14 +555,28 @@ Perform swaps using a swap channel created with another Nitro node over the mirr
   ```bash
   export BRIDGE_NITRO_ADDRESS=$(yq eval '.bridge_nitro_address' nitro-node-config.yml)
 
-  # Counterparty to create the swap channel with
-  export COUNTER_PARTY_ADDRESS=<counterparty-nitro-address>
+  export GETH_CHAIN_ID="1212"
 
   # Get asset addresses from assets.json file
-  export ASSET_ADDRESS_1=$(jq -r --arg chainId "$CHAIN_ID" '.[$chainId][0].contracts.TestToken.address' assets.json)
-  export ASSET_ADDRESS_2=$(jq -r --arg chainId "$CHAIN_ID" '.[$chainId][0].contracts.TestToken2.address' assets.json)
+  export ASSET_ADDRESS_1=$(jq -r --arg chainId "$GETH_CHAIN_ID" '.[$chainId][0].contracts.TestToken.address' assets.json)
+  export ASSET_ADDRESS_2=$(jq -r --arg chainId "$GETH_CHAIN_ID" '.[$chainId][0].contracts.TestToken2.address' assets.json)
   ```
 
+* Set counterparty address
+
+  ```bash
+  export COUNTER_PARTY_ADDRESS=<counterparty-nitro-address>
+  ```
+
+  * Get the nitro address of the counterparty's node with whom you want create swap channel
+
+  * To get the nitro address of the your node:
+
+    ```bash
+    laconic-so deployment --dir l2-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-node-info -p 4005 -h nitro-node"
+    # `SCAddress` -> nitro address
+    ```
+
 * Create swap channel:
 
   ```bash
@@ -584,6 +623,90 @@ Perform swaps using a swap channel created with another Nitro node over the mirr
 
 ### Performing swaps
 
+* Ensure that environment variables for asset addresses are set (should be done by both parties):
+
+  ```bash
+  export GETH_CHAIN_ID="1212"
+
+  # Get asset addresses from assets.json file
+  export ASSET_ADDRESS_1=$(jq -r --arg chainId "$GETH_CHAIN_ID" '.[$chainId][0].contracts.TestToken.address' assets.json)
+  export ASSET_ADDRESS_2=$(jq -r --arg chainId "$GETH_CHAIN_ID" '.[$chainId][0].contracts.TestToken2.address' assets.json)
+  ```
+
+* Get all active swap channels for a specific mirrored ledger channel (should be done by both parties)
+
+  * To get mirrored ledger channels:
+
+    ```bash
+    laconic-so deployment --dir l2-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-all-ledger-channels -p 4005 -h nitro-node"
+
+    # Example output:
+    # [
+    #   {
+    #     "ID": "0xb34210b763d4fdd534190ba11886ad1daa1e411c87be6fd20cff74cd25077c46",
+    #     "Status": "Open",
+    #     "Balances": [
+    #       {
+    #         "AssetAddress": "0xa4351114dae1abeb2d552d441c9733c72682a45d",
+    #         "Me": "0x075400039e303b3fb46c0cff0404c5fa61947c05",
+    #         "Them": "0xf0e6a85c6d23aca9ff1b83477d426ed26f218185",
+    #         "MyBalance": 1000n,
+    #         "TheirBalance": 1000n
+    #       },
+    #       {
+    #         "AssetAddress": "0x314e43f9825b10961859c2a62c2de6a765c1c1f1",
+    #         "Me": "0x075400039e303b3fb46c0cff0404c5fa61947c05",
+    #         "Them": "0xf0e6a85c6d23aca9ff1b83477d426ed26f218185",
+    #         "MyBalance": 1000n,
+    #         "TheirBalance": 1000n
+    #       }
+    #     ],
+    #     "ChannelMode": "Open"
+    #   }
+    # ]
+    ```
+
+  * Export ledger channel ID:
+
+    ```bash
+      export LEDGER_CHANNEL_ID=
+    ```
+
+  * To get swap channels for a ledger channel:
+
+    ```bash
+    laconic-so deployment --dir l2-nitro-deployment exec nitro-rpc-client "nitro-rpc-client get-swap-channels-by-ledger $LEDGER_CHANNEL_ID -p 4005 -h nitro-node"
+    # Example Output:
+    # [
+    #   {
+    #     ID: '0x1dbd58d314f123f4b0f4147eee7fd92fa523ba7082d8a75b846f6d1189e2f0e9',
+    #     Status: 'Open',
+    #     Balances: [
+    #       {
+    #         AssetAddress: '0xa4351114dae1abeb2d552d441c9733c72682a45d',
+    #         Me: '0x075400039e303b3fb46c0cff0404c5fa61947c05',
+    #         Them: '0xd0ea8b27591b1d070cccd4d30b8d408fe794fdfc',
+    #         MyBalance: 100,
+    #         TheirBalance: 100n
+    #       },
+    #       {
+    #         AssetAddress: '0x314e43f9825b10961859c2a62c2de6a765c1c1f1',
+    #         Me: '0x075400039e303b3fb46c0cff0404c5fa61947c05',
+    #         Them: '0xd0ea8b27591b1d070cccd4d30b8d408fe794fdfc',
+    #         MyBalance: 100,
+    #         TheirBalance: 100
+    #       }
+    #     ]
+    #   }
+    # ]
+    ```
+
+  * Export swap channel ID:
+
+    ```bash
+    export SWAP_CHANNEL_ID=
+    ```
+
 * One of the participants can initiate the swap and other one will either accept it or reject it
 
 * For initiating the swap:
@@ -733,7 +856,7 @@ Perform swaps using a swap channel created with another Nitro node over the mirr
 * Switch to deployments dir:
 
   ```bash
-  cd $DEPLOYMENTS_DIR/nitro-node
+  cd <path-to-deployments-dir>
   ```
 
 * Stop all Nitro services running in the background:
@@ -775,7 +898,7 @@ Perform swaps using a swap channel created with another Nitro node over the mirr
   * Stop the deployment:
 
     ```bash
-    cd $DEPLOYMENTS_DIR/nitro-node
+    cd <path-to-deployments-dir>
 
     laconic-so deployment --dir l1-nitro-deployment stop
     ```

testnet-onboarding-validator.md

@@ -63,6 +63,8 @@
 
   ```bash
   laconic-so fetch-stack git.vdb.to/cerc-io/testnet-laconicd-stack
+
+  # See stack documentation stack-orchestrator/stacks/testnet-laconicd/README.md for more details
   ```
 
 * Clone required repositories:
@@ -126,6 +128,8 @@
 * Inside the `testnet-laconicd-deployment` deployment directory, open `config.env` file and set following env variables:
 
   ```bash
+  CERC_CHAIN_ID=laconic_9000-1
+
   # Comma separated list of nodes to keep persistent connections to
   # Example: "node-1-id@laconicd.laconic.com:26656"
   # Use the provided node id
@@ -197,12 +201,15 @@ laconic-so deployment --dir testnet-laconicd-deployment start
 
     * From wallet, approve and send transaction to stage1 laconicd chain
 
+<a name="create-validator-using-cli"></a>
+
 * Alternatively, create a validator using the laconicd CLI:
 
   * Import a key pair:
 
     ```bash
     KEY_NAME=alice
+    CHAIN_ID=laconic_9000-1
 
     # Restore existing key with mnemonic seed phrase
     # You will be prompted to enter mnemonic seed
@@ -243,7 +250,7 @@ laconic-so deployment --dir testnet-laconicd-deployment start
     ```bash
     laconic-so deployment --dir testnet-laconicd-deployment exec laconicd "laconicd tx staking create-validator my-validator.json \
     --fees 500000alnt \
-    --chain-id=laconic_9000-1 \
+    --chain-id=$CHAIN_ID \
     --from $KEY_NAME"
     ```
 
@@ -280,6 +287,109 @@ laconic-so deployment --dir testnet-laconicd-deployment start
   sudo rm -r testnet-laconicd-deployment
   ```
 
+## Upgrade to SAPO testnet
+
+### Prerequisites
+
+* SAPO testnet (testnet2) genesis file and peer node address
+
+* A testnet stage1 node
+
+  * For setting up a fresh testnet2 node, follow [Join as a validator](#join-as-a-validator-on-stage1) instead, but use testnet2 chain id (`laconic-testnet-2`)
+
+### Setup
+
+* Stop the stage1 node:
+
+  ```bash
+  # In dir where stage1 node deployment (`testnet-laconicd-deployment`) exists
+
+  TESTNET_DEPLOYMENT=$(pwd)/testnet-laconicd-deployment
+
+  laconic-so deployment --dir testnet-laconicd-deployment stop --delete-volumes
+  ```
+
+* Clone / pull the stack repo:
+
+  ```bash
+  laconic-so fetch-stack git.vdb.to/cerc-io/testnet-laconicd-stack --pull
+  ```
+
+* Clone / pull the required repositories:
+
+  ```bash
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/testnet-laconicd setup-repositories --pull
+
+  # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories and re-run the command
+  ```
+
+  Note: Make sure the latest `cerc-io/laconicd` changes have been pulled
+
+* Build the container images:
+
+  ```bash
+  laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/testnet-laconicd build-containers --force-rebuild
+  ```
+
+  This should create the following docker images locally with latest changes:
+
+  * `cerc/laconicd`
+
+### Create a deployment
+
+* The existing stage1 deployment can be used for testnet2
+
+* Copy over the published testnet2 genesis file (`.json`) to data directory in deployment (`testnet-laconicd-deployment/data/laconicd-data/tmp-testnet2`):
+
+  ```bash
+  # Example
+  mkdir -p $TESTNET_DEPLOYMENT/data/laconicd-data/tmp-testnet2
+  cp genesis.json $TESTNET_DEPLOYMENT/data/laconicd-data/tmp-testnet2/genesis.json
+  ```
+
+* Run script to reset node data and upgrade for testnet2:
+
+  ```bash
+  cd ~/cerc/testnet-laconicd-stack
+
+  docker run -it \
+    -v $TESTNET_DEPLOYMENT/data/laconicd-data:/root/.laconicd \
+    -v ./ops/stage2:/scripts \
+    cerc/laconicd:local bash -c "/scripts/upgrade-node-to-testnet2.sh"
+
+  cd -
+  ```
+
+### Configuration
+
+* Inside the `testnet-laconicd-deployment` deployment directory, open `config.env` file and set following env variables:
+
+  ```bash
+  CERC_CHAIN_ID=laconic-testnet-2
+
+  # Comma separated list of nodes to keep persistent connections to
+  # Example: "node-1-id@laconicd-sapo.laconic.com:36656"
+  # Use the provided node id
+  CERC_PEERS=""
+
+  # A custom human readable name for this node
+  CERC_MONIKER=
+  ```
+
+### Start the deployment
+
+```bash
+laconic-so deployment --dir testnet-laconicd-deployment start
+```
+
+See [Check status](#check-status) to follow sync status of your node
+
+See [Join as testnet validator](#create-validator-using-cli) to join as a validator using laconicd CLI (use chain id `laconic-testnet-2`)
+
+### Clean up
+
+* Same as [Clean up](#clean-up)
+
 ## Troubleshooting
 
 * If you face any issues in the onboarding app or the web-wallet, clear your browser cache and reload