Merge branch 'master' into adi/ibc-go-1-proto

.changelog/unreleased/features/1175-update-ci.md

@@ -0,0 +1,4 @@
+- Update CI to test with gaiad v5.0.5 ([#1175])
+
+
+[#1175]: https://github.com/informalsystems/ibc-rs/issues/1175

.changelog/unreleased/features/843-rest-api.md

@@ -0,0 +1,3 @@
+- Expose the Hermes config and internal state over a REST API ([#843])
+
+[#843]: https://github.com/informalsystems/ibc-rs/issues/843

.changelog/unreleased/features/901-conditionally-spawn-worker.md

@@ -0,0 +1,3 @@
+- Spawn packet workers only when there are outstanding packets or acknowledgements to relay ([#901])
+
+[#901]: https://github.com/informalsystems/ibc-rs/issues/901

.changelog/unreleased/improvements/1132-query-channels-filter.md

@@ -0,0 +1,4 @@
+- Add optional destination chain and `--verbose` options for `query channels` CLI ([#1132])
+
+[#1132]: https://github.com/informalsystems/ibc-rs/issues/1132
+

CHANGELOG.md

@@ -36,6 +36,7 @@ handle errors ([#1158])
 
 [#1245]: https://github.com/informalsystems/ibc-rs/issues/1245
 
+
 ## v0.6.1
 *July 22nd, 2021*
 

Cargo.toml

@@ -4,6 +4,7 @@ members = [
     "modules",
     "relayer",
     "relayer-cli",
+    "relayer-rest",
     "telemetry",
     "proto",
 ]

ci/README.md

@@ -163,7 +163,10 @@ Removing network ibc-rs_relaynet
 
 ### [Upgrading the gaia chains release and generating new container images](#upgrading-chains)
 
-The repository stores the files used to configure and build the chains for the containers. For example, the files for a `gaia` chain release `v3.0.0` can be seen [here](./chains/gaia)
+The repository stores the files used to configure and build the chains for the containers. For example, the files for a `gaia` chain release `v5.0.0` can be seen [here](./chains/gaia)
+
+> Note: Please ensure you have gaiad installed on your machine and it matches the version that you're trying to upgrade.
+> You can check but running `gaiad version` in your machine
 
 If you need to generate configuration files for a new gaia release and new containers, please follow the steps below:
 
@@ -172,8 +175,8 @@ If you need to generate configuration files for a new gaia release and new conta
     `cd ci`
 
 
-2. Open the `build-ibc-chains.sh` file and change the release. Just replace the value for the `GAIA_BRANCH` parameter. For example to set it to release `v3.0.0` use:
-    `GAIA_BRANCH="v3.0.0"`
+2. Open the `build-ibc-chains.sh` file and change the release. Just replace the value for the `GAIA_BRANCH` parameter. For example to set it to release `v5.0.0` use:
+    `GAIA_BRANCH="v5.0.0"`
 
 
 3. Run the `build-ibc-chains.sh` script:
@@ -187,17 +190,17 @@ __Note__: This will generate the files for the chains in the `/ci/chains/gaia` f
 4. Committing the release files. **You have to** add the new chain files generated to the ibc-rs repository, just `git commit` the files, otherwise the CI might fail because private keys don't match.
 
 
-5. Update the release for Docker Compose. If this new release should be the default release for running the end to end (e2e) test you need to update the release version in the `docker-compose.yml` file in the `ci` folder of the repository. Open the file and change the release version in all the places required (image name and RELEASE variables. For example, if current release is `v3.0.0` and the new one is `v4.0.0` just do a find and replace with these two values.
+5. Update the release for Docker Compose. If this new release should be the default release for running the end to end (e2e) test you need to update the release version in the `docker-compose.yml` file in the `ci` folder of the repository. Open the file and change the release version in all the places required (image name and RELEASE variables. For example, if current release is `v4.0.0` and the new one is `v5.0.0` just do a find and replace with these two values.
 
 Change the version in the image for ibc-0 and ibc-1 services:
 
    ```
-   image: "informaldev/ibc-0:v4.1.0"
+   image: "informaldev/ibc-0:v4.0.0"
    ```
 
 And in the relayer service:
 
    ```
       args:
-        RELEASE: v4.1.0
+        RELEASE: v4.0.0
    ```

ci/build-ibc-chains.sh

@@ -8,7 +8,23 @@ set -eou pipefail
 ## After updating the gaia version below, double-check the following (see readme.md also):
 ##   - the new version made it to docker hub, and is available for download, e.g. `docker pull informaldev/ibc-1:v4.0.0`
 ##   - the image versions and the relayer release in `docker-compose.yml` are consistent with the new version
-GAIA_BRANCH="v4.2.0" # Requires a version with the `--keyring-backend` option. v2.1 and above.
+GAIA_BRANCH="v5.0.5" # Requires a version with the `--keyring-backend` option. v2.1 and above.
+
+# Check if gaiad is installed and if the versions match
+if ! [ -x "$(command -v gaiad)" ]; then
+  echo 'Error: gaiad is not installed.' >&2
+  exit 1
+fi
+
+CURRENT_GAIA="$(gaiad version)"
+echo "Current Gaia Version: $CURRENT_GAIA"
+
+if [ "$GAIA_BRANCH" != "$CURRENT_GAIA" ]; then
+  echo "Error: gaiad installed is different than target gaiad ($CURRENT_GAIA != $GAIA_BRANCH)"
+  exit 1
+else
+  echo "Gaiad installed matches desired version ($CURRENT_GAIA = $GAIA_BRANCH)"
+fi
 
 BASE_DIR="$(dirname $0)"
 ONE_CHAIN="$BASE_DIR/../scripts/one-chain"

ci/chains/gaia/v5.0.5/ibc-0/config/addrbook.json

@@ -0,0 +1,4 @@
+{
+	"key": "d551bab9ec950b3c71733c80",
+	"addrs": []
+}