From f0ffaf495b286f940cc11ca118e26baaf3347380 Mon Sep 17 00:00:00 2001
From: Luca Joss <43531661+ljoss17@users.noreply.github.com>
Date: Mon, 10 Jun 2024 15:51:23 +0200
Subject: [PATCH] Update Gaia used in CI to v17 (#4032)

* Use Gaia v17.2.0 instead of v15.2.0

* Add changelog entry

* Add missing fields to consumer chain gov proposal
---
 .../4023-update-gaia-to-v17.md                |  2 ++
 .github/workflows/integration.yaml            | 12 +++++-----
 .github/workflows/misbehaviour.yml            |  2 +-
 .github/workflows/multi-chains.yaml           |  2 +-
 flake.lock                                    | 24 ++++++++++++++++---
 flake.nix                                     |  2 +-
 .../test-framework/src/chain/ext/bootstrap.rs |  7 +++++-
 7 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 .changelog/unreleased/improvements/ibc-integration-test/4023-update-gaia-to-v17.md

diff --git a/.changelog/unreleased/improvements/ibc-integration-test/4023-update-gaia-to-v17.md b/.changelog/unreleased/improvements/ibc-integration-test/4023-update-gaia-to-v17.md
new file mode 100644
index 0000000000..4d833215f5
--- /dev/null
+++ b/.changelog/unreleased/improvements/ibc-integration-test/4023-update-gaia-to-v17.md
@@ -0,0 +1,2 @@
+- Update the version of Gaia running the integration tests in the CI from `v15.2.0`
+  to `v17.2.0` ([\#4023](https://github.com/informalsystems/hermes/issues/4023))
\ No newline at end of file
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 8fc11af9bd..f17dae894f 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -45,11 +45,11 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia15
+          - package: gaia17
             command: gaiad
             account_prefix: cosmos
             native_token: stake
-            features: forward-packet,clean-workers
+            features: forward-packet,clean-workers,ica,ics29-fee
           - package: ibc-go-v6-simapp
             command: simd
             account_prefix: cosmos
@@ -171,10 +171,10 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: .#gaia15 .#stride
+          - package: .#gaia17 .#stride
             command: gaiad,strided
             account_prefix: cosmos,stride
-          - package: .#gaia15 .#neutron
+          - package: .#gaia17 .#neutron
             command: gaiad,neutrond
             account_prefix: cosmos,neutron
     steps:
@@ -216,7 +216,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: .#gaia15 .#stride-no-admin
+          - package: .#gaia17 .#stride-no-admin
             command: gaiad,strided
             account_prefix: cosmos,stride
     steps:
@@ -257,7 +257,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: .#celestia .#gaia15
+          - package: .#celestia .#gaia17
             command: celestia-appd,gaiad
             account_prefix: celestia,cosmos
             native_token: utia,stake
diff --git a/.github/workflows/misbehaviour.yml b/.github/workflows/misbehaviour.yml
index 77016f5354..abede42602 100644
--- a/.github/workflows/misbehaviour.yml
+++ b/.github/workflows/misbehaviour.yml
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia15
+          - package: gaia17
             command: gaiad
             account_prefix: cosmos
     steps:
diff --git a/.github/workflows/multi-chains.yaml b/.github/workflows/multi-chains.yaml
index 9e23d3a5a2..5d74e8fe02 100644
--- a/.github/workflows/multi-chains.yaml
+++ b/.github/workflows/multi-chains.yaml
@@ -58,7 +58,7 @@ jobs:
       fail-fast: false
       matrix:
         first-package:
-          - package: gaia15
+          - package: gaia17
             command: gaiad
             account_prefix: cosmos
           - package: ibc-go-v7-simapp
diff --git a/flake.lock b/flake.lock
index 20080b0b97..75422a6cc2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -153,6 +153,7 @@
         "gaia13-src": "gaia13-src",
         "gaia14-src": "gaia14-src",
         "gaia15-src": "gaia15-src",
+        "gaia17-src": "gaia17-src",
         "gaia5-src": "gaia5-src",
         "gaia6-ordered-src": "gaia6-ordered-src",
         "gaia6-src": "gaia6-src",
@@ -212,11 +213,11 @@
         "wasmvm_1_beta7-src": "wasmvm_1_beta7-src"
       },
       "locked": {
-        "lastModified": 1718011615,
-        "narHash": "sha256-VluMd6vAPEP//hepHfE+/CDJKU8AfRRE/Sxo7cqIx3Y=",
+        "lastModified": 1718014032,
+        "narHash": "sha256-ModvnRvQj9NsbNF1N01Q+xMqm421/dr2Pd1EfyOV53E=",
         "owner": "informalsystems",
         "repo": "cosmos.nix",
-        "rev": "eaf5f4da4b35d8138b2c42aa39bc314b9be89958",
+        "rev": "4f354f4c042519a2681cc2fefd6b276ee88815f9",
         "type": "github"
       },
       "original": {
@@ -608,6 +609,23 @@
         "type": "github"
       }
     },
+    "gaia17-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717626378,
+        "narHash": "sha256-FiCnGz5ZQQv2NyPW/Z7puZw6oFKcdoNsspSCK8Nkc44=",
+        "owner": "cosmos",
+        "repo": "gaia",
+        "rev": "17f2ba0b90d1d2884f7b67518ec08dfd37f001a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cosmos",
+        "ref": "v17.2.0",
+        "repo": "gaia",
+        "type": "github"
+      }
+    },
     "gaia5-src": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 9fd05f9ce9..fd4d4f6fee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,7 @@
           cometbft
           evmos
           gaia6-ordered
-          gaia15
+          gaia17
           ibc-go-v2-simapp
           ibc-go-v3-simapp
           ibc-go-v4-simapp
diff --git a/tools/test-framework/src/chain/ext/bootstrap.rs b/tools/test-framework/src/chain/ext/bootstrap.rs
index 37313be246..a7344fdb5c 100644
--- a/tools/test-framework/src/chain/ext/bootstrap.rs
+++ b/tools/test-framework/src/chain/ext/bootstrap.rs
@@ -309,7 +309,12 @@ impl ChainBootstrapMethodsExt for ChainDriver {
             "transfer_timeout_period": 100000000000,
             "ccv_timeout_period": 100000000000,
             "unbonding_period": 100000000000,
-            "deposit": "10000001stake"
+            "deposit": "10000001stake",
+            "top_N": 95,
+            "validators_power_cap": 0,
+            "validator_set_cap": 0,
+            "allowlist": [],
+            "denylist": []
         }"#;
 
         let proposal = raw_proposal.replace("{consumer_chain_id}", consumer_chain_id);