From df3df2f14646b3f95fd976754ed705686d7313f7 Mon Sep 17 00:00:00 2001 From: zemyblue Date: Wed, 25 Jan 2023 19:20:55 +0900 Subject: [PATCH 1/4] fix!: Fix foundation amino codec (#833) (#862) * Add foundation amino codec * Update CHANGELOG.md Co-authored-by: Youngtaek Yoon --- CHANGELOG.md | 2 ++ x/auth/types/codec.go | 2 ++ x/auth/vesting/types/codec.go | 2 ++ x/authz/codec.go | 2 ++ x/bank/types/codec.go | 2 ++ x/collection/codec.go | 2 ++ x/crisis/types/codec.go | 2 ++ x/distribution/types/codec.go | 2 ++ x/evidence/types/codec.go | 2 ++ x/feegrant/codec.go | 2 ++ x/foundation/codec.go | 12 ++---------- x/foundation/codec/cdc.go | 18 ++++++++++++++++++ x/foundation/keeper/keeper.go | 1 - x/foundation/msgs.go | 25 +++++++++++++------------ x/gov/types/codec.go | 2 ++ x/slashing/types/codec.go | 2 ++ x/staking/types/codec.go | 2 ++ x/stakingplus/codec.go | 4 ++-- x/token/codec.go | 2 ++ x/upgrade/types/codec.go | 2 ++ 20 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 x/foundation/codec/cdc.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bb5fa536d..ebc4d34b8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,6 +60,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Breaking Changes * (rest) [\#807](https://github.com/line/lbm-sdk/pull/807) remove legacy REST API +* (codec) [#833](https://github.com/line/lbm-sdk/pull/833) Fix foundation amino codec + ### Build, CI * (ci) [\#829](https://github.com/line/lbm-sdk/pull/829) automate release process diff --git a/x/auth/types/codec.go b/x/auth/types/codec.go index 540e86c054..edd9984d3d 100644 --- a/x/auth/types/codec.go +++ b/x/auth/types/codec.go @@ -7,6 +7,7 @@ import ( sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/x/auth/legacy/legacytx" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -54,4 +55,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/auth/vesting/types/codec.go b/x/auth/vesting/types/codec.go index 0e0e05c04f..f8571fc1d5 100644 --- a/x/auth/vesting/types/codec.go +++ b/x/auth/vesting/types/codec.go @@ -10,6 +10,7 @@ import ( authtypes "github.com/line/lbm-sdk/x/auth/types" "github.com/line/lbm-sdk/x/auth/vesting/exported" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -77,4 +78,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/authz/codec.go b/x/authz/codec.go index e8df8d6aea..f042ee66d3 100644 --- a/x/authz/codec.go +++ b/x/authz/codec.go @@ -7,6 +7,7 @@ import ( sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -42,4 +43,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/bank/types/codec.go b/x/bank/types/codec.go index afd79d9af0..1b9616db84 100644 --- a/x/bank/types/codec.go +++ b/x/bank/types/codec.go @@ -9,6 +9,7 @@ import ( "github.com/line/lbm-sdk/types/msgservice" "github.com/line/lbm-sdk/x/authz" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -47,4 +48,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/collection/codec.go b/x/collection/codec.go index f43051747b..ae47cd28d7 100644 --- a/x/collection/codec.go +++ b/x/collection/codec.go @@ -8,6 +8,7 @@ import ( sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -94,4 +95,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/crisis/types/codec.go b/x/crisis/types/codec.go index 500b22fa45..8a456a83ee 100644 --- a/x/crisis/types/codec.go +++ b/x/crisis/types/codec.go @@ -8,6 +8,7 @@ import ( sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -39,4 +40,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/distribution/types/codec.go b/x/distribution/types/codec.go index 4c326872d8..0f881ccd95 100644 --- a/x/distribution/types/codec.go +++ b/x/distribution/types/codec.go @@ -8,6 +8,7 @@ import ( sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" govtypes "github.com/line/lbm-sdk/x/gov/types" ) @@ -53,4 +54,5 @@ func init() { // instances. RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/evidence/types/codec.go b/x/evidence/types/codec.go index f7abd556df..9e66cc0884 100644 --- a/x/evidence/types/codec.go +++ b/x/evidence/types/codec.go @@ -9,6 +9,7 @@ import ( "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" "github.com/line/lbm-sdk/x/evidence/exported" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -45,4 +46,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/feegrant/codec.go b/x/feegrant/codec.go index fc1868f31e..a22b64908b 100644 --- a/x/feegrant/codec.go +++ b/x/feegrant/codec.go @@ -8,6 +8,7 @@ import ( sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -62,4 +63,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/foundation/codec.go b/x/foundation/codec.go index 8416acc137..8993f76116 100644 --- a/x/foundation/codec.go +++ b/x/foundation/codec.go @@ -4,10 +4,10 @@ import ( "github.com/line/lbm-sdk/codec" "github.com/line/lbm-sdk/codec/legacy" "github.com/line/lbm-sdk/codec/types" - cryptocodec "github.com/line/lbm-sdk/crypto/codec" sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -67,18 +67,10 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { ) } -var ( - Amino = codec.NewLegacyAmino() - ModuleCdc = codec.NewAminoCodec(Amino) -) - func init() { - RegisterLegacyAminoCodec(Amino) - cryptocodec.RegisterCrypto(Amino) - sdk.RegisterLegacyAminoCodec(Amino) - // Register all Amino interfaces and concrete types on the authz and gov Amino codec so that this can later be // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/foundation/codec/cdc.go b/x/foundation/codec/cdc.go new file mode 100644 index 0000000000..ba6fa1ed87 --- /dev/null +++ b/x/foundation/codec/cdc.go @@ -0,0 +1,18 @@ +package codec + +import ( + "github.com/line/lbm-sdk/codec" + cryptocodec "github.com/line/lbm-sdk/crypto/codec" + sdk "github.com/line/lbm-sdk/types" +) + +var ( + Amino = codec.NewLegacyAmino() + ModuleCdc = codec.NewAminoCodec(Amino) +) + +func init() { + cryptocodec.RegisterCrypto(Amino) + codec.RegisterEvidences(Amino) + sdk.RegisterLegacyAminoCodec(Amino) +} diff --git a/x/foundation/keeper/keeper.go b/x/foundation/keeper/keeper.go index 18fff03b39..fbff2ef548 100644 --- a/x/foundation/keeper/keeper.go +++ b/x/foundation/keeper/keeper.go @@ -34,7 +34,6 @@ type Keeper struct { // - MsgGrant // - MsgRevoke // - MsgWithdrawFromTreasury - // - MsgGovMint // // Typically, this should be the x/foundation module account. authority string diff --git a/x/foundation/msgs.go b/x/foundation/msgs.go index c6b27ab700..5d7c334300 100644 --- a/x/foundation/msgs.go +++ b/x/foundation/msgs.go @@ -6,6 +6,7 @@ import ( codectypes "github.com/line/lbm-sdk/codec/types" sdk "github.com/line/lbm-sdk/types" sdkerrors "github.com/line/lbm-sdk/types/errors" + "github.com/line/lbm-sdk/x/foundation/codec" ) var _ sdk.Msg = (*MsgUpdateParams)(nil) @@ -41,7 +42,7 @@ func (m MsgUpdateParams) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgUpdateParams) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgFundTreasury)(nil) @@ -77,7 +78,7 @@ func (m MsgFundTreasury) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgFundTreasury) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgWithdrawFromTreasury)(nil) @@ -117,7 +118,7 @@ func (m MsgWithdrawFromTreasury) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgWithdrawFromTreasury) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgUpdateMembers)(nil) @@ -157,7 +158,7 @@ func (m MsgUpdateMembers) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgUpdateMembers) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgUpdateDecisionPolicy)(nil) @@ -196,7 +197,7 @@ func (m MsgUpdateDecisionPolicy) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgUpdateDecisionPolicy) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } func (m MsgUpdateDecisionPolicy) GetDecisionPolicy() DecisionPolicy { @@ -293,7 +294,7 @@ func (m MsgSubmitProposal) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgSubmitProposal) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgWithdrawProposal)(nil) @@ -329,7 +330,7 @@ func (m MsgWithdrawProposal) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgWithdrawProposal) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgVote)(nil) @@ -373,7 +374,7 @@ func (m MsgVote) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgVote) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgExec)(nil) @@ -409,7 +410,7 @@ func (m MsgExec) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgExec) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgLeaveFoundation)(nil) @@ -441,7 +442,7 @@ func (m MsgLeaveFoundation) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgLeaveFoundation) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgGrant)(nil) @@ -512,7 +513,7 @@ func (m MsgGrant) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgGrant) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } var _ sdk.Msg = (*MsgRevoke)(nil) @@ -552,5 +553,5 @@ func (m MsgRevoke) Route() string { // GetSignBytes implements the LegacyMsg.GetSignBytes method. func (m MsgRevoke) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) + return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m)) } diff --git a/x/gov/types/codec.go b/x/gov/types/codec.go index 5a38d0946f..c20087bcf3 100644 --- a/x/gov/types/codec.go +++ b/x/gov/types/codec.go @@ -7,6 +7,7 @@ import ( sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -42,4 +43,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/slashing/types/codec.go b/x/slashing/types/codec.go index 17ea68c315..768f9a6b31 100644 --- a/x/slashing/types/codec.go +++ b/x/slashing/types/codec.go @@ -8,6 +8,7 @@ import ( sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -38,4 +39,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/staking/types/codec.go b/x/staking/types/codec.go index deeea4740c..2f3ec9d1c0 100644 --- a/x/staking/types/codec.go +++ b/x/staking/types/codec.go @@ -9,6 +9,7 @@ import ( "github.com/line/lbm-sdk/types/msgservice" "github.com/line/lbm-sdk/x/authz" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -58,4 +59,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/stakingplus/codec.go b/x/stakingplus/codec.go index a92b98fa22..05e7b2e8ed 100644 --- a/x/stakingplus/codec.go +++ b/x/stakingplus/codec.go @@ -5,6 +5,7 @@ import ( "github.com/line/lbm-sdk/codec/types" authzcodec "github.com/line/lbm-sdk/x/authz/codec" "github.com/line/lbm-sdk/x/foundation" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -26,6 +27,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) - - RegisterLegacyAminoCodec(foundation.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/token/codec.go b/x/token/codec.go index 6ef0c06e69..6ed9b6d189 100644 --- a/x/token/codec.go +++ b/x/token/codec.go @@ -8,6 +8,7 @@ import ( sdk "github.com/line/lbm-sdk/types" "github.com/line/lbm-sdk/types/msgservice" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" ) @@ -58,4 +59,5 @@ func init() { // used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } diff --git a/x/upgrade/types/codec.go b/x/upgrade/types/codec.go index a888019cb9..8637104a63 100644 --- a/x/upgrade/types/codec.go +++ b/x/upgrade/types/codec.go @@ -6,6 +6,7 @@ import ( cryptocodec "github.com/line/lbm-sdk/crypto/codec" sdk "github.com/line/lbm-sdk/types" authzcodec "github.com/line/lbm-sdk/x/authz/codec" + fdncodec "github.com/line/lbm-sdk/x/foundation/codec" govcodec "github.com/line/lbm-sdk/x/gov/codec" govtypes "github.com/line/lbm-sdk/x/gov/types" ) @@ -40,4 +41,5 @@ func init() { // instances. RegisterLegacyAminoCodec(authzcodec.Amino) RegisterLegacyAminoCodec(govcodec.Amino) + RegisterLegacyAminoCodec(fdncodec.Amino) } From d2b6f3f70806b95f7380153df63596dadd74a53e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Jan 2023 18:13:56 +0900 Subject: [PATCH 2/4] chore(deps): Bump actions/cache from 3.2.3 to 3.2.4 (#873) Bumps [actions/cache](https://github.com/actions/cache) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.2.3...v3.2.4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-sims.yml | 8 ++++---- .github/workflows/sims.yml | 10 +++++----- .github/workflows/sims_normal.yml | 8 ++++---- .github/workflows/test.yml | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release-sims.yml b/.github/workflows/release-sims.yml index 0e5fc11542..ac5159f133 100644 --- a/.github/workflows/release-sims.yml +++ b/.github/workflows/release-sims.yml @@ -43,7 +43,7 @@ jobs: - name: install runsim run: | export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -56,7 +56,7 @@ jobs: - uses: actions/setup-go@v3.5.0 with: go-version: 1.18 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -76,7 +76,7 @@ jobs: - uses: actions/setup-go@v3.5.0 with: go-version: 1.18 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -96,7 +96,7 @@ jobs: - uses: actions/setup-go@v3.5.0 with: go-version: 1.18 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml index 73de8552d8..3009c1a322 100644 --- a/.github/workflows/sims.yml +++ b/.github/workflows/sims.yml @@ -42,7 +42,7 @@ jobs: run: go version - name: Install runsim run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -64,7 +64,7 @@ jobs: !**/**_test.go go.mod go.sum - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -93,7 +93,7 @@ jobs: go.sum SET_ENV_NAME_INSERTIONS: 1 SET_ENV_NAME_LINES: 1 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -122,7 +122,7 @@ jobs: go.sum SET_ENV_NAME_INSERTIONS: 1 SET_ENV_NAME_LINES: 1 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -151,7 +151,7 @@ jobs: go.sum SET_ENV_NAME_INSERTIONS: 1 SET_ENV_NAME_LINES: 1 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary diff --git a/.github/workflows/sims_normal.yml b/.github/workflows/sims_normal.yml index 186fb0b5bc..f2e440660c 100644 --- a/.github/workflows/sims_normal.yml +++ b/.github/workflows/sims_normal.yml @@ -29,7 +29,7 @@ jobs: run: go version - name: Install runsim run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -44,7 +44,7 @@ jobs: go-version: 1.18 - name: Display go version run: go version - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -62,7 +62,7 @@ jobs: go-version: 1.18 - name: Display go version run: go version - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -80,7 +80,7 @@ jobs: go-version: 1.18 - name: Display go version run: go version - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ba5e4908f6..1f9999536a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - name: install tparse run: | go install github.com/mfridman/tparse@v0.8.3 - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/go/bin key: ${{ runner.os }}-go-tparse-binary From 611b286b0c30c56328b959d4a172e1059ac70d02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Jan 2023 18:14:49 +0900 Subject: [PATCH 3/4] chore(deps): Bump github.com/spf13/viper from 1.14.0 to 1.15.0 (#867) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 13 ++++++------- go.sum | 21 ++++++++++----------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 4ac9486c88..8133749cb6 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/spf13/cast v1.5.0 github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.14.0 + github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.8.1 github.com/tendermint/btcd v0.1.1 github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 @@ -48,8 +48,8 @@ require ( github.com/tendermint/tm-db v0.6.7 golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e - google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e - google.golang.org/grpc v1.50.1 + google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef + google.golang.org/grpc v1.52.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 ) @@ -102,8 +102,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/onsi/gomega v1.20.0 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect @@ -113,9 +112,9 @@ require ( github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/afero v1.9.3 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca // indirect github.com/tendermint/tendermint v0.34.20 // indirect github.com/zondax/hid v0.9.0 // indirect diff --git a/go.sum b/go.sum index d65f789452..452fa1bf65 100644 --- a/go.sum +++ b/go.sum @@ -910,14 +910,13 @@ github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwp github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/pelletier/go-toml/v2 v2.0.0/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= @@ -1074,8 +1073,8 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= -github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= +github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= @@ -1098,8 +1097,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= -github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= -github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= +github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= +github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1129,8 +1128,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= -github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/sylvia7788/contextcheck v1.0.4/go.mod h1:vuPKJMQ7MQ91ZTqfdyreNKwZjyUg6KO+IebVyQDedZQ= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca h1:Ld/zXl5t4+D69SiV4JoN7kkfvJdOWlPpfxrzxpLMoUk= @@ -1839,8 +1838,8 @@ google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y= -google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= +google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef h1:uQ2vjV/sHTsWSqdKeLqmwitzgvjMl7o4IdtHwUDXSJY= +google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= From 6076052d1032e7b59676aa22fa8c8a0e1577088a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Jan 2023 18:15:36 +0900 Subject: [PATCH 4/4] chore(deps): Bump docker/build-push-action from 3 to 4 (#874) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b63ebd02a9..930551b8be 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,7 +33,7 @@ jobs: tags: | type=semver,pattern={{version}} - name: docker build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: push: ${{github.event_name != 'pull_request'}} build-args: ARCH=x86_64