fix: fix comments to the base branch 2

app/keepers/keepers.go

@@ -431,7 +431,7 @@ func (ak *AppKeepers) InitKeepers(
 		homePath,
 		wasmConfig,
 		WasmCapabilities(),
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		appparams.AccGov.String(),
 		wasmOpts...,
 	)
 
@@ -514,7 +514,7 @@ func (ak *AppKeepers) InitKeepers(
 		ak.BankKeeper,
 		ak.IBCKeeper.ClientKeeper,
 		ak.WasmKeeper,
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		appparams.AccGov.String(),
 	)
 
 	// set up BTC staking keeper
@@ -569,7 +569,7 @@ func (ak *AppKeepers) InitKeepers(
 		&ak.BTCStakingKeeper,
 		&ak.BTCStkConsumerKeeper,
 		scopedZoneConciergeKeeper,
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		appparams.AccGov.String(),
 	)
 
 	// add msgServiceRouter so that the epoching module can forward unwrapped messages to the staking module

client/docs/config.json

@@ -15,28 +15,76 @@
       }
     },
     {
-      "url":  "./tmp-swagger-gen/babylon/btclightclient/v1/query.swagger.json",
+      "url": "./tmp-swagger-gen/babylon/btclightclient/v1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "BtcLightClientParams"
         }
       }
     },
     {
-      "url":  "./tmp-swagger-gen/babylon/epoching/v1/query.swagger.json",
+      "url": "./tmp-swagger-gen/babylon/epoching/v1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "EpochingParams"
         }
       }
     },
     {
-      "url":  "./tmp-swagger-gen/babylon/checkpointing/v1/query.swagger.json",
+      "url": "./tmp-swagger-gen/babylon/checkpointing/v1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "CheckpointingParams"
         }
       }
+    },
+    {
+      "url": "./tmp-swagger-gen/babylon/btcstaking/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "BtcStakingParams"
+        }
+      }
+    },
+    {
+      "url": "./tmp-swagger-gen/babylon/btcstkconsumer/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "BtcStkConsumerParams"
+        }
+      }
+    },
+    {
+      "url": "./tmp-swagger-gen/babylon/finality/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "FinalityParams"
+        }
+      }
+    },
+    {
+      "url": "./tmp-swagger-gen/babylon/incentive/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "IncentiveParams"
+        }
+      }
+    },
+    {
+      "url": "./tmp-swagger-gen/babylon/monitor/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "MonitorParams"
+        }
+      }
+    },
+    {
+      "url": "./tmp-swagger-gen/babylon/zoneconcierge/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "ZoneConciergeParams"
+        }
+      }
     }
   ]
-}
+}

contrib/images/Makefile

@@ -29,4 +29,4 @@ cosmos-relayer: cosmos-relayer-rmi
 cosmos-relayer-rmi:
 	docker rmi babylonlabs-io/cosmos-relayer 2>/dev/null; true
 
-.PHONY: all babylond babylond-before-upgrade cosmos-relayer e2e-init-chain babylond-rmi babylond-rmi-upgrade cosmos-relayer-rmi 
+.PHONY: all babylond cosmos-relayer e2e-init-chain babylond-rmi cosmos-relayer-rmi 

proto/babylon/finality/v1/tx.proto

@@ -17,7 +17,6 @@ service Msg {
     rpc CommitPubRandList(MsgCommitPubRandList) returns (MsgCommitPubRandListResponse);
     // AddFinalitySig adds a finality signature to a given block
     rpc AddFinalitySig(MsgAddFinalitySig) returns (MsgAddFinalitySigResponse);
-    // TODO: msg for evidence of equivocation. this is not specified yet
     // UpdateParams updates the finality module parameters.
     rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
     // UnjailFinalityProvider defines a method for unjailing a jailed

test/e2e/configurer/chain/commands_btcstaking.go

@@ -129,7 +129,7 @@ func (n *NodeConfig) CreateBTCDelegation(
 		// broadcast stuff
 		cmd = append(cmd, "-b=sync", "--yes")
 	}
-	// cmd = append(cmd, fmt.Sprintf("--chain-id=%s", n.chainId), "-b=sync", "--yes", "--keyring-backend=test", "--log_format=json", "--home=/home/babylon/babylondata")
+
 	cmd = append(cmd, fmt.Sprintf("--chain-id=%s", n.chainId), "-b=sync", "--yes")
 	outBuff, _, err := n.containerManager.ExecCmd(n.t, n.Name, append(cmd, overallFlags...), "")
 

test/e2e/containers/containers.go

@@ -272,7 +272,7 @@ func (m *Manager) RunNodeResource(chainId string, containerName, valCondifDir st
 		Entrypoint: []string{
 			"sh",
 			"-c",
-			"babylond start " + FlagHome + " --log_level trace --trace",
+			"babylond start " + FlagHome,
 		},
 		ExposedPorts: []string{"26656", "26657", "1317", "9090"},
 		Mounts: []string{

testutil/btcstaking-helper/keeper.go

@@ -37,8 +37,6 @@ var (
 	timestampedEpoch = uint64(10)
 )
 
-// TODO: move this to keeper package rather than keeper_test so that
-// it can be inherited to test other modules?
 type Helper struct {
 	t testing.TB