From 7ae90c27fa1864cecb39b2d1712c0fd91d4dbacd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Mar 2022 10:30:03 +0000
Subject: [PATCH 1/2] build(deps): bump actions/checkout from 2.4.0 to 3
(#1045)
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3.
Release notes
Sourced from actions/checkout's releases.
v3.0.0
- Update default runtime to node16
Changelog
Sourced from actions/checkout's changelog.
Changelog
v2.3.1
v2.3.0
v2.2.0
v2.1.1
v2.1.0
v2.0.0
v2 (beta)
- Improved fetch performance
- The default behavior now fetches only the SHA being checked-out
- Script authenticated git commands
- Persists
with.token
in the local git config
- Enables your scripts to run authenticated git commands
- Post-job cleanup removes the token
- Coming soon: Opt out by setting
with.persist-credentials
to false
- Creates a local branch
- No longer detached HEAD when checking out a branch
- A local branch is created with the corresponding upstream branch set
- Improved layout
... (truncated)
Commits
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=2.4.0&new-version=3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
---
.github/workflows/check-docs.yml | 2 +-
.github/workflows/link-check.yml | 2 +-
.github/workflows/release.yml | 2 +-
.github/workflows/test.yml | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml
index abcaa066e2d..0060623ba15 100644
--- a/.github/workflows/check-docs.yml
+++ b/.github/workflows/check-docs.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
- uses: actions/checkout@v2.4.0
+ uses: actions/checkout@v3
with:
persist-credentials: false
fetch-depth: 0
diff --git a/.github/workflows/link-check.yml b/.github/workflows/link-check.yml
index d40882e4fde..fdf8b184259 100644
--- a/.github/workflows/link-check.yml
+++ b/.github/workflows/link-check.yml
@@ -4,7 +4,7 @@ jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2.4.0
+ - uses: actions/checkout@v3
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
config-file: '.github/workflows/link-check-config.json'
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a1a1da8a340..ffffe3a4dae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v2.4.0
+ uses: actions/checkout@v3
with:
fetch-depth: 0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 585a3653270..fdcc086ae4f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
matrix:
go-arch: ["amd64", "arm", "arm64"]
steps:
- - uses: actions/checkout@v2.4.0
+ - uses: actions/checkout@v3
- uses: actions/setup-go@v2.1.5
with:
go-version: 1.17
@@ -54,7 +54,7 @@ jobs:
split-test-files:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2.4.0
+ - uses: actions/checkout@v3
- name: Create a file with all the pkgs
run: go list ./... > pkgs.txt
- name: Split pkgs into 4 files
@@ -85,7 +85,7 @@ jobs:
matrix:
part: ["00", "01", "02", "03"]
steps:
- - uses: actions/checkout@v2.4.0
+ - uses: actions/checkout@v3
- uses: actions/setup-go@v2.1.5
with:
go-version: 1.17
@@ -112,7 +112,7 @@ jobs:
runs-on: ubuntu-latest
needs: tests
steps:
- - uses: actions/checkout@v2.4.0
+ - uses: actions/checkout@v3
- uses: technote-space/get-diff-action@v6.0.1
with:
PATTERNS: |
From fc452ac42d06a0119d0035a524fe90dc8e4cd466 Mon Sep 17 00:00:00 2001
From: Joe Bowman
Date: Mon, 7 Mar 2022 13:23:01 +0000
Subject: [PATCH 2/2] call packet.GetSequence() rather than passing the func as
argument (#995)
---
CHANGELOG.md | 1 +
modules/core/04-channel/keeper/packet.go | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3644cbeb7f7..f9d669650a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (testing) [\#884](https://github.com/cosmos/ibc-go/pull/884) Add and use in simapp a custom ante handler that rejects redundant transactions
* (transfer) [\#978](https://github.com/cosmos/ibc-go/pull/978) Support base denoms with slashes in denom validation
* (client) [\#941](https://github.com/cosmos/ibc-go/pull/941) Classify client states without consensus states as expired
+* (modules/core/04-channel) [\#994](https://github.com/cosmos/ibc-go/pull/944) Call `packet.GetSequence()` rather than passing func in `AcknowledgePacket` log output
## [v2.0.2](https://github.com/cosmos/ibc-go/releases/tag/v2.0.2) - 2021-12-15
diff --git a/modules/core/04-channel/keeper/packet.go b/modules/core/04-channel/keeper/packet.go
index 5879c9ecb08..b54926b85e9 100644
--- a/modules/core/04-channel/keeper/packet.go
+++ b/modules/core/04-channel/keeper/packet.go
@@ -494,7 +494,7 @@ func (k Keeper) AcknowledgePacket(
// log that a packet has been acknowledged
k.Logger(ctx).Info(
"packet acknowledged",
- "sequence", packet.GetSequence,
+ "sequence", packet.GetSequence(),
"src_port", packet.GetSourcePort(),
"src_channel", packet.GetSourceChannel(),
"dst_port", packet.GetDestPort(),