From fe6a8b29d2b438ee8a7edd2e2a6b2aec48f98d8d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 16:55:18 +0200 Subject: [PATCH] deps!: use fixed cosmos-sdk/lsm (backport #3249) (#3250) * deps!: use fixed cosmos-sdk/lsm (#3249) * deps!: use fixed cosmos-sdk/lsm * use tagged version instead of commit hash (cherry picked from commit 19a8ea375c69ca97b7e5953beb0f5c4c7a85c19f) * changelogs * changelogs --------- Co-authored-by: MSalopek --- .../v19.0.0/dependencies/3207-bump-cosmos-sdk.md | 3 --- .../v19.0.0/dependencies/3249-bump-cosmos-sdk.md | 3 +++ .../v19.0.0/state-breaking/3207-bump-cosmos-sdk.md | 3 --- .../v19.0.0/state-breaking/3249-bump-cosmos-sdk.md | 3 +++ .changelog/v19.0.0/summary.md | 2 +- CHANGELOG.md | 14 +++++++------- contrib/single-node.sh | 2 ++ go.mod | 2 +- go.sum | 6 ++---- 9 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 .changelog/v19.0.0/dependencies/3207-bump-cosmos-sdk.md create mode 100644 .changelog/v19.0.0/dependencies/3249-bump-cosmos-sdk.md delete mode 100644 .changelog/v19.0.0/state-breaking/3207-bump-cosmos-sdk.md create mode 100644 .changelog/v19.0.0/state-breaking/3249-bump-cosmos-sdk.md diff --git a/.changelog/v19.0.0/dependencies/3207-bump-cosmos-sdk.md b/.changelog/v19.0.0/dependencies/3207-bump-cosmos-sdk.md deleted file mode 100644 index 504d2f9278b..00000000000 --- a/.changelog/v19.0.0/dependencies/3207-bump-cosmos-sdk.md +++ /dev/null @@ -1,3 +0,0 @@ -- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to - [v0.50.8-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8-lsm) - ([\#3207](https://github.com/cosmos/gaia/pull/3207)) \ No newline at end of file diff --git a/.changelog/v19.0.0/dependencies/3249-bump-cosmos-sdk.md b/.changelog/v19.0.0/dependencies/3249-bump-cosmos-sdk.md new file mode 100644 index 00000000000..63cfd9983a6 --- /dev/null +++ b/.changelog/v19.0.0/dependencies/3249-bump-cosmos-sdk.md @@ -0,0 +1,3 @@ +- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to + [v0.50.9-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.9-lsm) + ([\#3249](https://github.com/cosmos/gaia/pull/3249)) \ No newline at end of file diff --git a/.changelog/v19.0.0/state-breaking/3207-bump-cosmos-sdk.md b/.changelog/v19.0.0/state-breaking/3207-bump-cosmos-sdk.md deleted file mode 100644 index 504d2f9278b..00000000000 --- a/.changelog/v19.0.0/state-breaking/3207-bump-cosmos-sdk.md +++ /dev/null @@ -1,3 +0,0 @@ -- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to - [v0.50.8-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8-lsm) - ([\#3207](https://github.com/cosmos/gaia/pull/3207)) \ No newline at end of file diff --git a/.changelog/v19.0.0/state-breaking/3249-bump-cosmos-sdk.md b/.changelog/v19.0.0/state-breaking/3249-bump-cosmos-sdk.md new file mode 100644 index 00000000000..63cfd9983a6 --- /dev/null +++ b/.changelog/v19.0.0/state-breaking/3249-bump-cosmos-sdk.md @@ -0,0 +1,3 @@ +- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to + [v0.50.9-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.9-lsm) + ([\#3249](https://github.com/cosmos/gaia/pull/3249)) \ No newline at end of file diff --git a/.changelog/v19.0.0/summary.md b/.changelog/v19.0.0/summary.md index 249482b8ab7..cb47cbcb1c7 100644 --- a/.changelog/v19.0.0/summary.md +++ b/.changelog/v19.0.0/summary.md @@ -1 +1 @@ -*July 29th, 2024* +*August 1st, 2024* diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e51817ac35..69f05449c66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,16 +2,13 @@ ## v19.0.0 -*July 29th, 2024* +*August 1st, 2024* ### DEPENDENCIES - Bump [cometbft](https://github.com/cometbft/cometbft) to [v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9) ([\#3171](https://github.com/cosmos/gaia/pull/3171)) -- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to - [v0.50.8-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8-lsm) - ([\#3207](https://github.com/cosmos/gaia/pull/3207)) - Bump [feemarket](https://github.com/skip-mev/feemarket) to [v1.0.4](https://github.com/skip-mev/feemarket/releases/tag/v1.0.4) ([\#3221](https://github.com/cosmos/gaia/pull/3221)) @@ -27,6 +24,9 @@ - Bump [ICS](https://github.com/cosmos/interchain-security) to [v5.1.1](https://github.com/cosmos/interchain-security/releases/tag/v5.1.1) ([\#3237](https://github.com/cosmos/gaia/pull/3237)) +- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to + [v0.50.9-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.9-lsm) + ([\#3249](https://github.com/cosmos/gaia/pull/3249)) ### IMPROVEMENTS @@ -38,9 +38,6 @@ - Bump [cometbft](https://github.com/cometbft/cometbft) to [v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9) ([\#3171](https://github.com/cosmos/gaia/pull/3171)) -- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to - [v0.50.8-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8-lsm) - ([\#3207](https://github.com/cosmos/gaia/pull/3207)) - Bump [feemarket](https://github.com/skip-mev/feemarket) to [v1.0.4](https://github.com/skip-mev/feemarket/releases/tag/v1.0.4) ([\#3221](https://github.com/cosmos/gaia/pull/3221)) @@ -56,6 +53,9 @@ - Bump [ICS](https://github.com/cosmos/interchain-security) to [v5.1.1](https://github.com/cosmos/interchain-security/releases/tag/v5.1.1) ([\#3237](https://github.com/cosmos/gaia/pull/3237)) +- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to + [v0.50.9-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.9-lsm) + ([\#3249](https://github.com/cosmos/gaia/pull/3249)) ## Previous Versions diff --git a/contrib/single-node.sh b/contrib/single-node.sh index 92d9cebed85..68cd0e0a288 100755 --- a/contrib/single-node.sh +++ b/contrib/single-node.sh @@ -20,7 +20,9 @@ jq ".app_state.gov.params.voting_period = \"20s\" | .app_state.gov.params.expedi "${HOME_DIR}/edited_genesis.json" && mv "${HOME_DIR}/edited_genesis.json" "${HOME_DIR}/.gaia/config/genesis.json" $GAIAD keys add validator --keyring-backend="test" +$GAIAD keys add user --keyring-backend="test" $GAIAD genesis add-genesis-account $("${GAIAD}" keys show validator -a --keyring-backend="test") $USER_COINS +$GAIAD genesis add-genesis-account $("${GAIAD}" keys show user -a --keyring-backend="test") $USER_COINS $GAIAD genesis gentx validator $STAKE --keyring-backend="test" --chain-id $CHAINID $GAIAD genesis collect-gentxs diff --git a/go.mod b/go.mod index 53a84481470..fe1b33922da 100644 --- a/go.mod +++ b/go.mod @@ -249,7 +249,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // Use special SDK v0.50.x release with support for both ICS and LSM - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.8-lsm + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.9-lsm // TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 diff --git a/go.sum b/go.sum index fe711e4a40a..9601e6c01d6 100644 --- a/go.sum +++ b/go.sum @@ -418,8 +418,8 @@ github.com/cosmos/cosmos-db v1.0.2 h1:hwMjozuY1OlJs/uh6vddqnk9j7VamLv+0DBlbEXbAK github.com/cosmos/cosmos-db v1.0.2/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= -github.com/cosmos/cosmos-sdk v0.50.8-lsm h1:Io2y/9wbW9mjXh5FgDXQtGwIF8dtb0GzpczjKsM1U58= -github.com/cosmos/cosmos-sdk v0.50.8-lsm/go.mod h1:efdTFdUndXfLpSMkE1Kv/ra8pux9l1glcojMIhNreiA= +github.com/cosmos/cosmos-sdk v0.50.9-lsm h1:nYQVX0YinJ3Zu3PHEee36OeZ8yAw42ctE52S2K3MleM= +github.com/cosmos/cosmos-sdk v0.50.9-lsm/go.mod h1:efdTFdUndXfLpSMkE1Kv/ra8pux9l1glcojMIhNreiA= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= @@ -439,8 +439,6 @@ github.com/cosmos/ibc-go/v8 v8.4.0 h1:K2PfX0AZ+1XKZytHGEMuSjQXG/MZshPb83RSTQt2+c github.com/cosmos/ibc-go/v8 v8.4.0/go.mod h1:zh6x1osR0hNvEcFrC/lhGD08sMfQmr9wHVvZ/mRWMCs= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= -github.com/cosmos/interchain-security/v5 v5.1.0 h1:87y+7q0udGoLto3U3y5q6YTQ5ezDD/PlgJbNW7ba/Sc= -github.com/cosmos/interchain-security/v5 v5.1.0/go.mod h1:vmeTcTxFCl1eV0o6xpl/IRT7Basz0szVVGzbppnInMg= github.com/cosmos/interchain-security/v5 v5.1.1 h1:xmRRMeE4xoc+JAZUh0XzXFYWaGBtzFFj5SETuOgnEnY= github.com/cosmos/interchain-security/v5 v5.1.1/go.mod h1:vmeTcTxFCl1eV0o6xpl/IRT7Basz0szVVGzbppnInMg= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=