Merge pull request #179 from 0xPolygon/mardizzone/configs-fixes

fix config related profiles and templates
0xPolygon · Feb 26, 2025 · 216d6b9 · 216d6b9
2 parents ad35930 + f902821
commit 216d6b9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/amoy_deb_profiles.yml b/.github/workflows/amoy_deb_profiles.yml
@@ -68,7 +68,7 @@ jobs:
           NODE: sentry
           NETWORK: amoy
       - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
+        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/app.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/app.toml
         env:
           ARCH: all
           NODE: sentry
@@ -79,6 +79,12 @@ jobs:
           ARCH: all
           NODE: sentry
           NETWORK: amoy
+      - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/client.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/client.toml
+        env:
+          ARCH: all
+          NODE: sentry
+          NETWORK: amoy
       - name: Copying postrm for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
         env:
@@ -124,7 +130,7 @@ jobs:
           NODE: sentry
           NETWORK: amoy
       - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
+        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/app.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/app.toml
         env:
           ARCH: all
           NODE: sentry

diff --git a/.github/workflows/mainnet_deb_profiles.yml b/.github/workflows/mainnet_deb_profiles.yml
@@ -68,7 +68,7 @@ jobs:
           NODE: sentry
           NETWORK: mainnet
       - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
+        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/app.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/app.toml
         env:
           ARCH: all
           NODE: sentry
@@ -130,7 +130,7 @@ jobs:
           NODE: sentry
           NETWORK: mainnet
       - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
+        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/app.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/app.toml
         env:
           ARCH: all
           NODE: sentry
@@ -141,6 +141,12 @@ jobs:
           ARCH: all
           NODE: sentry
           NETWORK: mainnet
+      - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+        run: cp -rp packaging/templates/config/${{ env.NETWORK }}/client.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/client.toml
+        env:
+          ARCH: all
+          NODE: sentry
+          NETWORK: mainnet
       - name: Copying the postrm for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
         env:

diff --git a/helper/config.go b/helper/config.go
@@ -491,13 +491,13 @@ func GetChainManagerAddressMigration(blockNum int64) (ChainManagerAddressMigrati
 	return result, found
 }
 
-// DecorateWithHeimdallFlags adds persistent flags for heimdall-config and bind flags with command
+// DecorateWithHeimdallFlags adds persistent flags for app configs and bind flags with command
 func DecorateWithHeimdallFlags(cmd *cobra.Command, v *viper.Viper, loggerInstance logger.Logger, caller string) {
-	// add with-heimdall-config flag
+	// add with-app-config flag
 	cmd.PersistentFlags().String(
 		WithHeimdallConfigFlag,
 		"",
-		"Override of Heimdall config file (default <home>/config/config.json)",
+		"Override of Heimdall app config file (default <home>/config/config.json)",
 	)
 
 	if err := v.BindPFlag(WithHeimdallConfigFlag, cmd.PersistentFlags().Lookup(WithHeimdallConfigFlag)); err != nil {

diff --git a/packaging/templates/package_scripts/postrm.profile b/packaging/templates/package_scripts/postrm.profile
@@ -3,6 +3,7 @@
 ###################
 # Remove heimdall profile installation
 ###################
-sudo rm /var/lib/heimdall/config/heimdall-config.toml
+sudo rm /var/lib/heimdall/config/app.toml
 sudo rm /var/lib/heimdall/config/config.toml
-sudo systemctl daemon-reload
+sudo rm /var/lib/heimdall/config/client.toml
+sudo systemctl daemon-reload