Merge branch 'main' into strath/dyncom-fix

classic-terra · Mar 11, 2024 · 5a8ef97 · 5a8ef97
2 parents 89420a4 + 47a0a2b
commit 5a8ef97
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -29,7 +29,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       -
         name: Build e2e image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           file: ./tests/e2e/e2e.Dockerfile
           context: .

diff --git a/.github/workflows/interchain.yml b/.github/workflows/interchain.yml
@@ -24,7 +24,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - name: Build interchain image
         id: build_image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           file: ./ictest.Dockerfile
           context: .

diff --git a/.github/workflows/release-sims.yml b/.github/workflows/release-sims.yml
@@ -30,7 +30,7 @@ jobs:
       - name: install runsim
         run: |
           export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/[email protected]
-      - uses: actions/cache@v3.3.3
+      - uses: actions/cache@v4.0.1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -40,7 +40,7 @@ jobs:
     needs: [build, install-runsim]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/cache@v3.3.3
+      - uses: actions/cache@v4.0.1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary

diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
@@ -46,7 +46,7 @@ jobs:
         run: go version
       - name: Install runsim
         run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
-      - uses: actions/cache@v3.3.3
+      - uses: actions/cache@v4.0.1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -68,7 +68,7 @@ jobs:
             **/**.go
             go.mod
             go.sum
-      - uses: actions/cache@v3.3.3
+      - uses: actions/cache@v4.0.1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -97,7 +97,7 @@ jobs:
             go.sum
           SET_ENV_NAME_INSERTIONS: 1
           SET_ENV_NAME_LINES: 1
-      - uses: actions/cache@v3.3.3
+      - uses: actions/cache@v4.0.1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -126,7 +126,7 @@ jobs:
             go.sum
           SET_ENV_NAME_INSERTIONS: 1
           SET_ENV_NAME_LINES: 1
-      - uses: actions/cache@v3.3.3
+      - uses: actions/cache@v4.0.1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary
@@ -155,7 +155,7 @@ jobs:
             go.sum
           SET_ENV_NAME_INSERTIONS: 1
           SET_ENV_NAME_LINES: 1
-      - uses: actions/cache@v3.3.3
+      - uses: actions/cache@v4.0.1
         with:
           path: ~/go/bin
           key: ${{ runner.os }}-go-runsim-binary

diff --git a/custom/auth/ante/fee_test.go b/custom/auth/ante/fee_test.go
@@ -560,6 +560,20 @@ func (s *AnteTestSuite) TestTaxExemption() {
 			// tax this one hence burn amount is fee amount
 			minFeeAmount:   feeAmt,
 			expectProceeds: feeAmt,
+		}, {
+			name:      "MsgExec(MsgSend(normal -> normal))",
+			msgSigner: privs[2],
+			msgCreator: func() []sdk.Msg {
+				var msgs []sdk.Msg
+
+				msg1 := authz.NewMsgExec(addrs[1], []sdk.Msg{banktypes.NewMsgSend(addrs[2], addrs[3], sdk.NewCoins(sendCoin))})
+				msgs = append(msgs, &msg1)
+
+				return msgs
+			},
+			// tax this one hence burn amount is fee amount
+			minFeeAmount:   feeAmt,
+			expectProceeds: feeAmt,
 		}, {
 			name:      "MsgSend(exemption -> normal), MsgSend(exemption -> exemption)",
 			msgSigner: privs[0],