Problem: slashing fix not applied on mainnet (#1040)

* Problem: slashing fix not applied on mainnet Solution: - add mainnet softfork height * fix workflow
crypto-org-chain · Mar 29, 2024 · 5d52377 · 5d52377
1 parent 1df9b2a
commit 5d52377
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -53,8 +53,7 @@ jobs:
         run: make nix-integration-test
       - name: Convert coverage data
         run: |
-           nix profile install nixpkgs#go_1_20
-           go tool covdata textfmt -i=coverage -o profile.txt
+           nix develop -c go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:
@@ -118,8 +117,7 @@ jobs:
         run: make nix-integration-test-upgrade
       - name: Convert coverage data
         run: |
-           nix profile install nixpkgs#go_1_20
-           go tool covdata textfmt -i=coverage -o profile.txt
+           nix develop -c go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:
@@ -156,8 +154,7 @@ jobs:
         run: make nix-integration-test-ledger
       - name: Convert coverage data
         run: |
-           nix profile install nixpkgs#go_1_20
-           go tool covdata textfmt -i=coverage -o profile.txt
+           nix develop -c go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:
@@ -194,8 +191,7 @@ jobs:
         run: make nix-integration-test-solomachine
       - name: Convert coverage data
         run: |
-           nix profile install nixpkgs#go_1_20
-           go tool covdata textfmt -i=coverage -o profile.txt
+           nix develop -c go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:
@@ -232,8 +228,7 @@ jobs:
         run: make nix-integration-test-slow
       - name: Convert coverage data
         run: |
-           nix profile install nixpkgs#go_1_20
-           go tool covdata textfmt -i=coverage -o profile.txt
+           nix develop -c go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:
@@ -270,8 +265,7 @@ jobs:
         run: make nix-integration-test-ibc
       - name: Convert coverage data
         run: |
-           nix profile install nixpkgs#go_1_20
-           go tool covdata textfmt -i=coverage -o profile.txt
+           nix develop -c go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:
@@ -308,8 +302,7 @@ jobs:
         run: make nix-integration-test-byzantine
       - name: Convert coverage data
         run: |
-           nix profile install nixpkgs#go_1_20
-           go tool covdata textfmt -i=coverage -o profile.txt
+           nix develop -c go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:
@@ -346,8 +339,7 @@ jobs:
         run: make nix-integration-test-gov
       - name: Convert coverage data
         run: |
-           nix profile install nixpkgs#go_1_20
-           go tool covdata textfmt -i=coverage -o profile.txt
+           nix develop -c go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:
@@ -385,8 +377,7 @@ jobs:
         run: make nix-integration-test-grpc
       - name: Convert coverage data
         run: |
-           nix profile install nixpkgs#go_1_20
-           go tool covdata textfmt -i=coverage -o profile.txt
+           nix develop -c go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-*Mar 1, 2024*
+*Mar 29, 2024*
 
 ## v4.2.9
 

diff --git a/app/forks.go b/app/forks.go
@@ -7,6 +7,7 @@ import (
 var SlashingForkHeights = map[string]int64{
 	"testnet-croeseid-4":                    14857500,
 	"tempcrypto-org-chain-mainnet-dryrun-1": 6782000,
+	"crypto-org-chain-mainnet-1":            16978800,
 }
 
 func SlashingForkEnabled(ctx sdk.Context) bool {