Problem: unreleased ibc-go dependency is used (#675)

Solution: bumped ibc-go to v2.0.0 plus adjust GH action for nix integration tests due to https://nixos.org/manual/nix/unstable/release-notes/rl-2.4.html#other-features
crypto-org-chain · Nov 10, 2021 · dc26c7b · dc26c7b
1 parent 8f0d083
commit dc26c7b
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 74 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -21,4 +21,4 @@ jobs:
       uses: sonatype-nexus-community/nancy-github-action@main
       # FIXME: https://github.com/crypto-com/chain-main/issues/25 remove exclusion when viper+tendermint are upgraded
       with:
-        nancyCommand: sleuth --exclude-vulnerability CVE-2020-15115,CVE-2020-15136,CVE-2020-15114
+        nancyCommand: sleuth --exclude-vulnerability CVE-2020-15115,CVE-2020-15136,CVE-2021-41173,CVE-2020-15114
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -15,8 +15,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
+      - uses: cachix/install-nix-action@v14
+      - uses: cachix/cachix-action@v10
         with:
           name: crypto-com
           skipPush: true
@@ -29,8 +29,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
+      - uses: cachix/install-nix-action@v14
+      - uses: cachix/cachix-action@v10
         with:
           name: crypto-com
           signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
@@ -61,8 +61,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
+      - uses: cachix/install-nix-action@v14
+      - uses: cachix/cachix-action@v10
         with:
           name: crypto-com
       - name: Run integration tests
@@ -83,8 +83,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
+      - uses: cachix/install-nix-action@v14
+      - uses: cachix/cachix-action@v10
         with:
           name: crypto-com
       - name: Run integration tests
@@ -105,8 +105,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
+      - uses: cachix/install-nix-action@v14
+      - uses: cachix/cachix-action@v10
         with:
           name: crypto-com
       - name: Run integration tests
@@ -127,8 +127,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
+      - uses: cachix/install-nix-action@v14
+      - uses: cachix/cachix-action@v10
         with:
           name: crypto-com
       - name: Run integration tests
@@ -149,8 +149,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
+      - uses: cachix/install-nix-action@v14
+      - uses: cachix/cachix-action@v10
         with:
           name: crypto-com
       - name: Run integration tests
@@ -171,8 +171,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
+      - uses: cachix/install-nix-action@v14
+      - uses: cachix/cachix-action@v10
         with:
           name: crypto-com
       - name: Run integration tests
@@ -194,8 +194,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: cachix/install-nix-action@v12
-      - uses: cachix/cachix-action@v8
+      - uses: cachix/install-nix-action@v14
+      - uses: cachix/cachix-action@v10
         with:
           name: crypto-com
       - name: Run integration tests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-*Unreleased*
+*November 10, 2021*
 
 ## v3.3.0
 This version is identical to v3.2.0, but ibc-go was upgraded to 2.0.0, Cosmos SDK to 0.44.3,

diff --git a/Makefile b/Makefile
@@ -89,7 +89,7 @@ lint:
 # golangci-lint is run in standalone job in ci
 lint-ci:
 	@echo "--> Running linter for CI"
-	@nix run -f ./. lint-env -c lint-ci
+	@nix shell -f ./. lint-env --extra-experimental-features nix-command --command lint-ci
 
 test-sim-nondeterminism: check-network
 	@echo "Running non-determinism test..."
@@ -153,31 +153,31 @@ make-proto:
 ###############################################################################
 # nix installation: https://nixos.org/download.html
 nix-integration-test: check-network make-proto
-	nix run -f ./default.nix run-integration-tests -c run-integration-tests
+	nix shell -f ./default.nix run-integration-tests --extra-experimental-features nix-command --command run-integration-tests
 
 nix-integration-test-upgrade: check-network
-	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v -m upgrade"	
+	nix shell -f ./default.nix run-integration-tests --extra-experimental-features nix-command --command run-integration-tests "pytest -v -m upgrade"	
 
 nix-integration-test-ledger: check-network 
-	nix run -f ./default.nix run-integration-tests-zemu -c run-integration-tests "pytest -v -m ledger"		
+	nix shell -f ./default.nix run-integration-tests-zemu --extra-experimental-features nix-command --command run-integration-tests "pytest -v -m ledger"		
 
 nix-integration-test-slow: check-network 
-	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v -m slow"
+	nix shell -f ./default.nix run-integration-tests --extra-experimental-features nix-command --command run-integration-tests "pytest -v -m slow"
 
 nix-integration-test-ibc: check-network 
-	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v -m ibc"
+	nix shell -f ./default.nix run-integration-tests --extra-experimental-features nix-command --command run-integration-tests "pytest -v -m ibc"
 
 nix-integration-test-byzantine: check-network
-	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v -m byzantine"
+	nix shell -f ./default.nix run-integration-tests --extra-experimental-features nix-command --command run-integration-tests "pytest -v -m byzantine"
 
 nix-integration-test-gov: check-network 
-	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v -m gov"
+	nix shell -f ./default.nix run-integration-tests --extra-experimental-features nix-command --command run-integration-tests "pytest -v -m gov"
 
 nix-integration-test-grpc: check-network make-proto
-	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v -m grpc"
+	nix shell -f ./default.nix run-integration-tests --extra-experimental-features nix-command --command run-integration-tests "pytest -v -m grpc"
 
 nix-integration-test-all: check-network make-proto
-	nix run -f ./default.nix run-integration-tests -c run-integration-tests "pytest -v"
+	nix shell -f ./default.nix run-integration-tests --extra-experimental-features nix-command --command run-integration-tests "pytest -v"
 
 
 nix-build-%: check-network check-os

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/confluentinc/bincover v0.1.0
 	github.com/cosmos/cosmos-sdk v0.44.3
-	github.com/cosmos/ibc-go/v2 v2.0.0-rc0
+	github.com/cosmos/ibc-go/v2 v2.0.0
 	github.com/cosmos/ledger-go v0.9.2 // indirect
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.5.2
@@ -38,7 +38,7 @@ replace github.com/99designs/keyring => github.com/crypto-org-chain/keyring v1.1
 
 replace github.com/dgrijalva/jwt-go => github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
 
-// TODO: remove when ibc-go upgrades cosmos-sdk
-replace github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.44.3
+replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
 
+// TODO: remove when ibc-go upgrades tendermint
 replace github.com/tendermint/tendermint => github.com/tendermint/tendermint v0.34.14