informalsystems · romac · Oct 19, 2023 · Oct 16, 2023 · Oct 16, 2023 · Oct 16, 2023
diff --git a/config.toml b/config.toml
@@ -154,7 +154,7 @@ grpc_addr = 'http://127.0.0.1:9090'
 #
 # This setting can take two types of values, as an inline table:
 # 
-# a) Push: for receiving IBC events over WebSocket
+# a) Push: for receiving IBC events over WebSocket.
 #
 #      `{ mode = 'push', url = 'ws://127.0.0.1:26657/websocket', batch_delay = '500ms' }`
 #
@@ -169,14 +169,19 @@ grpc_addr = 'http://127.0.0.1:9090'
 #      processing, increasing the latency of Hermes, but are more likely to batch events together.
 #      The default value provides good latency while minimizing the number of client updates needed.
 
-# b) Pull: for polling for IBC events via the `/block_results` RPC endpoint
+# b) Pull: for polling for IBC events via the `/block_results` RPC endpoint.
 #
 #     `{ mode = 'pull', interval = '1s' }`
 #
 #    where
 #
 #    - `interval` is the interval at which to poll for blocks. Default: 1s
 #
+#    This mode should only be used in situations where Hermes misses events that it should be
+#    receiving, such as when relaying for CosmWasm-enabled chains which emit IBC events without
+#    the `message` attribute. Without this attribute, the WebSocket is not able to catch these
+#    events, so the `/block_results` RPC must be used instead.
+#
 event_source = { mode = 'push', url = 'ws://127.0.0.1:26657/websocket', batch_delay = '500ms' }
 
 # Specify the maximum amount of time (duration) that the RPC requests should

diff --git a/crates/relayer-cli/src/commands/fee/register_counterparty_payee.rs b/crates/relayer-cli/src/commands/fee/register_counterparty_payee.rs
@@ -47,7 +47,11 @@ pub struct RegisterCounterpartyPayeeCmd {
         required = true,
         value_name = "COUNTERPARTY_PAYEE_ADDRESS",
         help_heading = "FLAGS",
-        help = "Address of the counterparty payee"
+        help = "Address of the counterparty payee.\n\nNote that there exists a configuration \
+        parameter `auto_register_counterparty_payee` that can be enabled in order to have \
+        Hermes automatically register the counterparty payee on the destination chain to the \
+        relayer's address on the source chain. This option can be used for simple configuration \
+        of the relayer to receive fees for relaying RecvPackets on fee-enabled channels."
     )]
     counterparty_payee_address: String,
 }

diff --git a/guide/src/documentation/configuration/configure-hermes.md b/guide/src/documentation/configuration/configure-hermes.md
@@ -162,14 +162,15 @@ event_source = { mode = 'push', url = 'wss://hello:world@mydomain.com:26657/webs
 
 As of version 1.6.0, Hermes supports the relaying of wasm messages natively. This is facilitated by configuring
 Hermes to use pull-based relaying by polling for IBC events via the `/block_results` RPC endpoint. Set
-the `event_source` parameter to pull mode in `config.toml`:
+the `event_source` parameter to pull mode in `config.toml` like so:
 
 ```toml
-event_source = 'poll'
+# When specified like this, Hermes defaults to a poll interval of 1 second
+event_source = { mode = 'pull' }
 ```
 
 The default interval at which Hermes polls the RPC endpoint is 1 second. If you need to change the interval,
-you can do so like this:
+you can specify it like so:
 
 ```toml
 event_source = { mode = 'pull', interval = '2s' }

diff --git a/guide/src/templates/commands/hermes/clear/packets_1.md b/guide/src/templates/commands/hermes/clear/packets_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] clear packets[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] clear packets[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/clear_1.md b/guide/src/templates/commands/hermes/clear_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] clear [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] clear [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/completions_1.md b/guide/src/templates/commands/hermes/completions_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] completions --shell [[#SHELL]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] completions --shell [[#SHELL]]
diff --git a/guide/src/templates/commands/hermes/config/auto_1.md b/guide/src/templates/commands/hermes/config/auto_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] config auto[[#OPTIONS]] --output [[#PATH]] --chains [[#CHAIN_NAME:OPTIONAL_KEY_NAME]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] config auto[[#OPTIONS]] --output [[#PATH]] --chains [[#CHAIN_NAME:OPTIONAL_KEY_NAME]]
diff --git a/guide/src/templates/commands/hermes/config/validate_1.md b/guide/src/templates/commands/hermes/config/validate_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] config validate
+[[#BINARY hermes]][[#GLOBALOPTIONS]] config validate
diff --git a/guide/src/templates/commands/hermes/config_1.md b/guide/src/templates/commands/hermes/config_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] config [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] config [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/create/channel_1.md b/guide/src/templates/commands/hermes/create/channel_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create channel[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --a-connection [[#A_CONNECTION_ID]] --a-port [[#A_PORT_ID]] --b-port [[#B_PORT_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create channel[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --a-connection [[#A_CONNECTION_ID]] --a-port [[#A_PORT_ID]] --b-port [[#B_PORT_ID]]
diff --git a/guide/src/templates/commands/hermes/create/channel_2.md b/guide/src/templates/commands/hermes/create/channel_2.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create channel[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --b-chain [[#B_CHAIN_ID]] --a-port [[#A_PORT_ID]] --b-port [[#B_PORT_ID]] --new-client-connection
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create channel[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --b-chain [[#B_CHAIN_ID]] --a-port [[#A_PORT_ID]] --b-port [[#B_PORT_ID]] --new-client-connection
diff --git a/guide/src/templates/commands/hermes/create/client_1.md b/guide/src/templates/commands/hermes/create/client_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create client[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]] --reference-chain [[#REFERENCE_CHAIN_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create client[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]] --reference-chain [[#REFERENCE_CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/create/connection_1.md b/guide/src/templates/commands/hermes/create/connection_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create connection[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --b-chain [[#B_CHAIN_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create connection[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --b-chain [[#B_CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/create/connection_2.md b/guide/src/templates/commands/hermes/create/connection_2.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create connection[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --a-client [[#A_CLIENT_ID]] --b-client [[#B_CLIENT_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create connection[[#OPTIONS]] --a-chain [[#A_CHAIN_ID]] --a-client [[#A_CLIENT_ID]] --b-client [[#B_CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/create_1.md b/guide/src/templates/commands/hermes/create_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] create [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] create [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/fee/register-counterparty-payee_1.md b/guide/src/templates/commands/hermes/fee/register-counterparty-payee_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] fee register-counterparty-payee --chain [[#CHAIN_ID]] --channel [[#CHANNEL_ID]] --port [[#PORT_ID]] --counterparty-payee [[#COUNTERPARTY_PAYEE_ADDRESS]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] fee register-counterparty-payee --chain [[#CHAIN_ID]] --channel [[#CHANNEL_ID]] --port [[#PORT_ID]] --counterparty-payee [[#COUNTERPARTY_PAYEE_ADDRESS]]
diff --git a/guide/src/templates/commands/hermes/fee/register-payee_1.md b/guide/src/templates/commands/hermes/fee/register-payee_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] fee register-payee --chain [[#CHAIN_ID]] --channel [[#CHANNEL_ID]] --port [[#PORT_ID]] --payee [[#PAYEE_ADDRESS]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] fee register-payee --chain [[#CHAIN_ID]] --channel [[#CHANNEL_ID]] --port [[#PORT_ID]] --payee [[#PAYEE_ADDRESS]]
diff --git a/guide/src/templates/commands/hermes/fee/transfer_1.md b/guide/src/templates/commands/hermes/fee/transfer_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] fee transfer[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]] --amount [[#AMOUNT]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] fee transfer[[#OPTIONS]] --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --src-port [[#SRC_PORT_ID]] --src-channel [[#SRC_CHANNEL_ID]] --amount [[#AMOUNT]]
diff --git a/guide/src/templates/commands/hermes/fee_1.md b/guide/src/templates/commands/hermes/fee_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] fee [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] fee [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/health-check_1.md b/guide/src/templates/commands/hermes/health-check_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] health-check
+[[#BINARY hermes]][[#GLOBALOPTIONS]] health-check
diff --git a/guide/src/templates/commands/hermes/help_1.md b/guide/src/templates/commands/hermes/help_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]][[#OPTIONS]][[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]][[#OPTIONS]][[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/keys/add_1.md b/guide/src/templates/commands/hermes/keys/add_1.md
@@ -1 +1 @@
-Add a key from a Comet keyring file:
+Add a key from a Comet keyring file:
diff --git a/guide/src/templates/commands/hermes/keys/add_2.md b/guide/src/templates/commands/hermes/keys/add_2.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys add[[#OPTIONS]] --chain [[#CHAIN_ID]] --key-file [[#KEY_FILE]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys add[[#OPTIONS]] --chain [[#CHAIN_ID]] --key-file [[#KEY_FILE]]
diff --git a/guide/src/templates/commands/hermes/keys/add_3.md b/guide/src/templates/commands/hermes/keys/add_3.md
@@ -1 +1 @@
-Add a key from a file containing its mnemonic:
+Add a key from a file containing its mnemonic:
diff --git a/guide/src/templates/commands/hermes/keys/add_4.md b/guide/src/templates/commands/hermes/keys/add_4.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys add[[#OPTIONS]] --chain [[#CHAIN_ID]] --mnemonic-file [[#MNEMONIC_FILE]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys add[[#OPTIONS]] --chain [[#CHAIN_ID]] --mnemonic-file [[#MNEMONIC_FILE]]
diff --git a/guide/src/templates/commands/hermes/keys/add_5.md b/guide/src/templates/commands/hermes/keys/add_5.md
@@ -1 +1 @@
-On flake.nix platforms, both flags also accept `/dev/stdin` as a value, which will read the key or the mnemonic from stdin.
+On flake.nix platforms, both flags also accept `/dev/stdin` as a value, which will read the key or the mnemonic from stdin.
diff --git a/guide/src/templates/commands/hermes/keys/balance_1.md b/guide/src/templates/commands/hermes/keys/balance_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys balance[[#OPTIONS]] --chain [[#CHAIN_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys balance[[#OPTIONS]] --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/keys/delete_1.md b/guide/src/templates/commands/hermes/keys/delete_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys delete --chain [[#CHAIN_ID]] --key-name [[#KEY_NAME]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys delete --chain [[#CHAIN_ID]] --key-name [[#KEY_NAME]]
diff --git a/guide/src/templates/commands/hermes/keys/delete_2.md b/guide/src/templates/commands/hermes/keys/delete_2.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys delete --chain [[#CHAIN_ID]] --all
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys delete --chain [[#CHAIN_ID]] --all
diff --git a/guide/src/templates/commands/hermes/keys/list_1.md b/guide/src/templates/commands/hermes/keys/list_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys list --chain [[#CHAIN_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys list --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/keys_1.md b/guide/src/templates/commands/hermes/keys_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] keys [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] keys [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/listen_1.md b/guide/src/templates/commands/hermes/listen_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] listen[[#OPTIONS]] --chain [[#CHAIN_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] listen[[#OPTIONS]] --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/logs/reset_1.md b/guide/src/templates/commands/hermes/logs/reset_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] logs reset
+[[#BINARY hermes]][[#GLOBALOPTIONS]] logs reset
diff --git a/guide/src/templates/commands/hermes/logs/set-log-level_1.md b/guide/src/templates/commands/hermes/logs/set-log-level_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] logs set-log-level[[#OPTIONS]] --log-level [[#LOG_LEVEL]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] logs set-log-level[[#OPTIONS]] --log-level [[#LOG_LEVEL]]
diff --git a/guide/src/templates/commands/hermes/logs/set-raw-filter_1.md b/guide/src/templates/commands/hermes/logs/set-raw-filter_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] logs set-raw-filter --raw-filter [[#RAW_FILTER]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] logs set-raw-filter --raw-filter [[#RAW_FILTER]]
diff --git a/guide/src/templates/commands/hermes/logs_1.md b/guide/src/templates/commands/hermes/logs_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] logs [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] logs [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/misbehaviour_1.md b/guide/src/templates/commands/hermes/misbehaviour_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] misbehaviour --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] misbehaviour --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/channel/client_1.md b/guide/src/templates/commands/hermes/query/channel/client_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel client --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel client --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/channel/end_1.md b/guide/src/templates/commands/hermes/query/channel/end_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel end[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel end[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/channel/ends_1.md b/guide/src/templates/commands/hermes/query/channel/ends_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel ends[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel ends[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/channel_1.md b/guide/src/templates/commands/hermes/query/channel_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channel [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/channels_1.md b/guide/src/templates/commands/hermes/query/channels_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query channels[[#OPTIONS]] --chain [[#CHAIN_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query channels[[#OPTIONS]] --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client/connections_1.md b/guide/src/templates/commands/hermes/query/client/connections_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client connections[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client connections[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client/consensus_1.md b/guide/src/templates/commands/hermes/query/client/consensus_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client consensus[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client consensus[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client/header_1.md b/guide/src/templates/commands/hermes/query/client/header_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client header[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]] --consensus-height [[#CONSENSUS_HEIGHT]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client header[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]] --consensus-height [[#CONSENSUS_HEIGHT]]
diff --git a/guide/src/templates/commands/hermes/query/client/state_1.md b/guide/src/templates/commands/hermes/query/client/state_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client state[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client state[[#OPTIONS]] --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client/status_1.md b/guide/src/templates/commands/hermes/query/client/status_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client status --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client status --chain [[#CHAIN_ID]] --client [[#CLIENT_ID]]
diff --git a/guide/src/templates/commands/hermes/query/client_1.md b/guide/src/templates/commands/hermes/query/client_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query client [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query client [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/clients_1.md b/guide/src/templates/commands/hermes/query/clients_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query clients[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query clients[[#OPTIONS]] --host-chain [[#HOST_CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/query/connection/channels_1.md b/guide/src/templates/commands/hermes/query/connection/channels_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection channels --chain [[#CHAIN_ID]] --connection [[#CONNECTION_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection channels --chain [[#CHAIN_ID]] --connection [[#CONNECTION_ID]]
diff --git a/guide/src/templates/commands/hermes/query/connection/end_1.md b/guide/src/templates/commands/hermes/query/connection/end_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection end[[#OPTIONS]] --chain [[#CHAIN_ID]] --connection [[#CONNECTION_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection end[[#OPTIONS]] --chain [[#CHAIN_ID]] --connection [[#CONNECTION_ID]]
diff --git a/guide/src/templates/commands/hermes/query/connection_1.md b/guide/src/templates/commands/hermes/query/connection_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query connection [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/connections_1.md b/guide/src/templates/commands/hermes/query/connections_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query connections[[#OPTIONS]] --chain [[#CHAIN_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query connections[[#OPTIONS]] --chain [[#CHAIN_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/ack_1.md b/guide/src/templates/commands/hermes/query/packet/ack_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet ack[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]] --sequence [[#SEQUENCE]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet ack[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]] --sequence [[#SEQUENCE]]
diff --git a/guide/src/templates/commands/hermes/query/packet/acks_1.md b/guide/src/templates/commands/hermes/query/packet/acks_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet acks --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet acks --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/commitment_1.md b/guide/src/templates/commands/hermes/query/packet/commitment_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet commitment[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]] --sequence [[#SEQUENCE]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet commitment[[#OPTIONS]] --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]] --sequence [[#SEQUENCE]]
diff --git a/guide/src/templates/commands/hermes/query/packet/commitments_1.md b/guide/src/templates/commands/hermes/query/packet/commitments_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet commitments --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet commitments --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/pending-acks_1.md b/guide/src/templates/commands/hermes/query/packet/pending-acks_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending-acks --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending-acks --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/pending-sends_1.md b/guide/src/templates/commands/hermes/query/packet/pending-sends_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending-sends --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending-sends --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet/pending_1.md b/guide/src/templates/commands/hermes/query/packet/pending_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet pending --chain [[#CHAIN_ID]] --port [[#PORT_ID]] --channel [[#CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/query/packet_1.md b/guide/src/templates/commands/hermes/query/packet_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query packet [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/transfer/denom-trace_1.md b/guide/src/templates/commands/hermes/query/transfer/denom-trace_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query transfer denom-trace --chain [[#CHAIN_ID]] --hash [[#HASH]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query transfer denom-trace --chain [[#CHAIN_ID]] --hash [[#HASH]]
diff --git a/guide/src/templates/commands/hermes/query/transfer_1.md b/guide/src/templates/commands/hermes/query/transfer_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query transfer [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query transfer [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query/tx/events_1.md b/guide/src/templates/commands/hermes/query/tx/events_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query tx events --chain [[#CHAIN_ID]] --hash [[#HASH]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query tx events --chain [[#CHAIN_ID]] --hash [[#HASH]]
diff --git a/guide/src/templates/commands/hermes/query/tx_1.md b/guide/src/templates/commands/hermes/query/tx_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query tx [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query tx [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/query_1.md b/guide/src/templates/commands/hermes/query_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] query [[#SUBCOMMAND]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] query [[#SUBCOMMAND]]
diff --git a/guide/src/templates/commands/hermes/start_1.md b/guide/src/templates/commands/hermes/start_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] start[[#OPTIONS]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] start[[#OPTIONS]]
diff --git a/guide/src/templates/commands/hermes/tx/chan-close-confirm_1.md b/guide/src/templates/commands/hermes/tx/chan-close-confirm_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-close-confirm --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-close-confirm --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
diff --git a/guide/src/templates/commands/hermes/tx/chan-close-init_1.md b/guide/src/templates/commands/hermes/tx/chan-close-init_1.md
@@ -1 +1 @@
-[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-close-init --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]
+[[#BINARY hermes]][[#GLOBALOPTIONS]] tx chan-close-init --dst-chain [[#DST_CHAIN_ID]] --src-chain [[#SRC_CHAIN_ID]] --dst-connection [[#DST_CONNECTION_ID]] --dst-port [[#DST_PORT_ID]] --src-port [[#SRC_PORT_ID]] --dst-channel [[#DST_CHANNEL_ID]] --src-channel [[#SRC_CHANNEL_ID]]