informalsystems · romac · Apr 14, 2021 · Apr 1, 2021 · Apr 6, 2021 · Apr 6, 2021
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/e2e/e2e/packet.py b/e2e/e2e/packet.py
@@ -23,13 +23,13 @@ class TxPacketSendRes:
 @cmd("tx raw ft-transfer")
 @dataclass
 class TxPacketSend(Cmd[TxPacketSendRes]):
-    src_chain_id: ChainId
     dst_chain_id: ChainId
+    src_chain_id: ChainId
     src_port: PortId
     src_channel: ChannelId
 
     def args(self) -> List[str]:
-        return [self.src_chain_id, self.dst_chain_id, self.src_port, self.src_channel, "9999", "1000"]
+        return [self.dst_chain_id, self.src_chain_id, self.src_port, self.src_channel, "9999", "1000"]
 
     def process(self, result: Any) -> TxPacketSendRes:
         entry = find_entry(result, 'SendPacket')
@@ -90,7 +90,7 @@ def process(self, result: Any) -> TxPacketAckRes:
 
 
 def packet_send(c: Config, src: ChainId, dst: ChainId, src_port: PortId, src_channel: ChannelId) -> Packet:
-    cmd = TxPacketSend(src_chain_id=src, dst_chain_id=dst,
+    cmd = TxPacketSend(dst_chain_id=dst, src_chain_id=src,
                        src_port=src_port, src_channel=src_channel)
 
     res = cmd.run(c).success()

diff --git a/guide/book.toml b/guide/book.toml
@@ -14,3 +14,6 @@ renderer = ["html"]
 
 [output.html]
 additional-js = ["mermaid.min.js", "mermaid-init.js"]
+
+# Uncomment to trigger the link check
+# [output.linkcheck]
diff --git a/guide/src/SUMMARY.md b/guide/src/SUMMARY.md
@@ -6,41 +6,48 @@
 - [Introduction](./index.md)
     - [What is Hermes?](./relayer.md)
 - [Features](./features.md)
-    - [Feature matrix](./feature_matrix.md)
+    - [Feature matrix](./features/matrix.md)
 - [Getting Started](./getting_started.md)
    - [Pre-requisites](./pre_requisites.md)
    - [Installation](./installation.md)
    - [Configuration](./config.md)
-- [Tutorials](./tutorials.md)
-   - [Two local chains](./two_chains.md)
-     - [Install Gaia](./gaia.md)
-     - [Start the local chains](./local_chains.md)
-     - [Connect the chains using raw transactions](./tutorial_raw.md)
-       - [Configure clients](./tutorial_client_raw.md)
-       - [Connection handshake](./tutorial_conn_raw.md)
-       - [Channel handshake](./tutorial_chan_open_raw.md)
-       - [Relay packets](./tutorial_packet_raw.md)
-     - [Connect the chains using relay paths](./tutorial_relay_paths.md)
-       - [New path](./tutorial_set_new_path.md)
-       - [Packet relaying on existing path](./tutorial_relay_existing_path.md)
-       - [Packet relaying on new path](./tutorial_relay_new_path.md)
-       - [Concurrent packet relaying on multiple paths](./tutorial_relay_two_paths.md)
-- [Commands Reference](./commands.md)
-   - [Keys](./keys.md)
-   - [Light clients](./light_clients.md)
-   - [Path setup and streaming](./relayer_loop.md)
-   - [Raw transactions](./transactions.md)
-     - [Client](./tx_client.md)
-     - [Connection](./tx_connection.md)
-     - [Channel Open](./tx_channel_open.md)
-     - [Channel Close](./tx_channel_close.md)
-     - [Packet](./tx_packet.md)
-   - [Queries](./queries.md)
-     - [Client](./query_client.md)
-     - [Connection](./query_connection.md)
-     - [Channel](./query_channel.md)
-     - [Packet](./query_packet.md)
-   - [Listen mode](./listen.md)
-- [Help](help.md)
+- [Tutorials](./tutorials/index.md)
+   - [Local chains](./tutorials/local-chains/index.md)
+     - [Install Gaia](./tutorials/local-chains/gaia.md)
+     - [Start the local chains](./tutorials/local-chains/start.md)
+     - [Connect the chains using relay paths](./tutorials/local-chains/relay-paths/index.md)
+       - [Create a new path](./tutorials/local-chains/relay-paths/create-new-path.md)
+       - [Packet relaying on existing path](./tutorials/local-chains/relay-paths/existing-path.md)
+       - [Packet relaying on new path](./tutorials/local-chains/relay-paths/new-path.md)
+       - [Concurrent packet relaying on multiple paths](./tutorials/local-chains/relay-paths/multiple-paths.md)
+     - [Connect the chains using raw transactions](./tutorials/local-chains/raw/index.md)
+       - [Configure clients](./tutorials/local-chains/raw/client.md)
+       - [Connection handshake](./tutorials/local-chains/raw/connection.md)
+       - [Channel handshake](./tutorials/local-chains/raw/channel.md)
+       - [Relay packets](./tutorials/local-chains/raw/packet.md)
+- [Commands Reference](./commands/index.md)
+   - [Global options and JSON output](./commands/global.md)
+   - [Keys](./commands/keys/index.md)
+   - [Path setup and streaming](./commands/setup-and-relaying/index.md)
+     - [Clients](./commands/setup-and-relaying/clients.md)
+     - [Connections](./commands/setup-and-relaying/connections.md)
+     - [Channels](./commands/setup-and-relaying/channels.md)
+     - [Packet relaying](./commands/setup-and-relaying/packets.md)
+   - [Listen mode](./commands/listen/index.md)
+   - [Client upgrade](./commands/upgrade/index.md)
+     - [Testing client upgrade](./commands/upgrade/test.md)
+   - [Misbehaviour](./commands/misbehaviour/index.md)
+   - [Queries](./commands/queries/index.md)
+     - [Client](./commands/queries/client.md)
+     - [Connection](./commands/queries/connection.md)
+     - [Channel](./commands/queries/channel.md)
+     - [Packet](./commands/queries/packet.md)
+   - [Raw transactions](./commands/raw/index.md)
+     - [Client](./commands/raw/client.md)
+     - [Connection](./commands/raw/connection.md)
+     - [Channel Open](./commands/raw/channel-open.md)
+     - [Channel Close](./commands/raw/channel-close.md)
+     - [Packet](./commands/raw/packet.md)
+- [Help](./help.md)
 - [Glossary](./glossary.md)
 ---
diff --git a/guide/src/commands.md b/guide/src/commands.md
diff --git a/guide/src/commands/global.md b/guide/src/commands/global.md
@@ -0,0 +1,113 @@
+# Global options
+
+The Hermes accepts global options which affect all commands.
+
+```shell
+hermes 0.1.1
+Informal Systems <[email protected]>
+Implementation of `hermes`, an IBC Relayer developed in Rust.
+
+FLAGS:
+    -c, --config CONFIG       path to configuration file
+    -h, --help                print help message
+    -j, --json                enable JSON output
+```
+
+The flags must be specified right after the `hermes` command and before any subcommand.
+
+__Example__
+
+To start the relayer using the configuration file at `/home/my_chain.toml` and enable JSON output:
+
+```shell
+hermes -c /home/my_chain.toml --json start ibc-0 ibc-1
+```
+
+## JSON output
+
+If the `--json` option is supplied, all relayer commands will output single-line JSON values instead of plain text.
+
+Intermediate log messages will be written to `stderr`, while the final result will be written to `stdout`.
+This allows processing only the final output using [`jq`](https://stedolan.github.io/jq/).
+To process all the output using `jq`, one can redirect `stderr` to `stdout` with `hermes --json COMMAND 2>&1 | jq`.
+
+__Example__
+
+```shell
+hermes -c /home/my_chain.toml --json create client ibc-0 ibc-1
+```
+
+```json
+{"timestamp":"Apr 13 20:46:31.921","level":"INFO","fields":{"message":"Using default configuration from: '.hermes/config.toml'"},"target":"ibc_relayer_cli::commands"}
+{"timestamp":"Apr 13 20:46:31.961","level":"INFO","fields":{"message":"running listener","chain.id":"ibc-1"},"target":"ibc_relayer::event::monitor"}
+{"timestamp":"Apr 13 20:46:31.989","level":"INFO","fields":{"message":"running listener","chain.id":"ibc-0"},"target":"ibc_relayer::event::monitor"}
+{"result":{"CreateClient":{"client_id":"07-tendermint-1","client_type":"Tendermint","consensus_height":{"revision_height":10060,"revision_number":1},"height":{"revision_height":10072,"revision_number":0}}},"status":"success"}
+```
+
+The first three lines are printed to `stderr`, while the last line with a `"result"` key is printed to `stdout`.
+
+__Example__
+
+To improve the readability, pipe all of the output to `jq`:
+
+```
+hermes -c /home/my_chain.toml --json create client ibc-0 ibc-1 2>&1 | jq
+```
+
+```json
+{
+  "timestamp": "Apr 13 20:52:26.060",
+  "level": "INFO",
+  "fields": {
+    "message": "Using default configuration from: '.hermes/config.toml'"
+  },
+  "target": "ibc_relayer_cli::commands"
+}
+{
+  "timestamp": "Apr 13 20:52:26.082",
+  "level": "INFO",
+  "fields": {
+    "message": "running listener",
+    "chain.id": "ibc-1"
+  },
+  "target": "ibc_relayer::event::monitor"
+}
+{
+  "timestamp": "Apr 13 20:52:26.088",
+  "level": "INFO",
+  "fields": {
+    "message": "running listener",
+    "chain.id": "ibc-0"
+  },
+  "target": "ibc_relayer::event::monitor"
+}
+{
+  "result": {
+    "CreateClient": {
+      "client_id": "07-tendermint-5",
+      "client_type": "Tendermint",
+      "consensus_height": {
+        "revision_height": 10364,
+        "revision_number": 1
+      },
+      "height": {
+        "revision_height": 10375,
+        "revision_number": 0
+      }
+    }
+  },
+  "status": "success"
+}
+```
+
+__Example__
+
+To extract the identifer of the newly created client above:
+
+```
+hermes -c /home/my_chain.toml --json create client ibc-0 ibc-1 | jq '.result.CreateClient.client_id'
+```
+
+```
+"07-tendermint-2"
+```
diff --git a/guide/src/commands/index.md b/guide/src/commands/index.md
@@ -0,0 +1,33 @@
+# Commands
+
+The `Commands` section presents the commands current available in Hermes
+
+## Sections
+
+**[Keys](./keys/index.md)**
+
+Commands to manage keys (private keys) for each chain.
+
+**[Path Setup and Streaming](./setup-and-relaying/index.md)**
+
+Commands to manage clients, connections, channels and performing packet relaying
+
+**[Listen Mode](./listen/index.md)**
+
+Commands to listen for IBC events
+
+**[Upgrade](./upgrade/index.md)**
+
+Commands to perform client upgrade
+
+**[Monitor](./misbehaviour/index.md)**
+
+Commands to monitor clients and submit evidence of misbehaviour
+
+**[Queries](./queries/index.md)**
+
+Commands to execute queries on configured chains
+
+**[Raw Transactions](./raw/index.md)**
+
+Commands to submit individual transactions to configured chains