diff --git a/CHANGELOG.md b/CHANGELOG.md index da2b6842568..c655e03c18e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,7 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### State Breaking -* [#7272](https://github.com/osmosis-labs/osmosis/pull/7272 Upgrade go 1.20 -> 1.21 +* [#7272](https://github.com/osmosis-labs/osmosis/pull/7272) Upgrade go 1.20 -> 1.21 ### API @@ -68,6 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * [#7259](https://github.com/osmosis-labs/osmosis/pull/7259) Lower gas and CPU overhead of chargeTakerFee (in every swap) * [#7253](https://github.com/osmosis-labs/osmosis/pull/7253) Extended app hash logs (includes module hashes for easier debugging) * [#7258](https://github.com/osmosis-labs/osmosis/pull/7258) Remove an iterator call in CL swaps and spot price calls. +* [#7282](https://github.com/osmosis-labs/osmosis/pull/7282) Update sdk fork to no longer utilize reverse denom mapping, reducing gas costs. ### Bug Fixes diff --git a/go.mod b/go.mod index 299902549a6..81355035f44 100644 --- a/go.mod +++ b/go.mod @@ -26,10 +26,10 @@ require ( github.com/mattn/go-sqlite3 v1.14.17 github.com/ory/dockertest/v3 v3.10.0 github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 - github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403 - github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403 - github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20240109211933-17cb7c095403 - github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109211933-17cb7c095403 + github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c + github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c + github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20240109214800-856d6ce64d0c + github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109214800-856d6ce64d0c github.com/osmosis-labs/sqs v0.0.0-20240108192026-6ccc0a29f77d github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240108192026-6ccc0a29f77d github.com/pkg/errors v0.9.1 @@ -385,9 +385,9 @@ replace ( // v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2 github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2 - // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/65d7acfdc2a94cc49837bb9abec462f129029540 - // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v21-osmo-6 - github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 + // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v22/v0.47.5, current branch: osmo-v22/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/bfa713aa3097abef67ebf3fc4b654dafc0a2ab8d + // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v22-osmo-1 + github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/go.sum b/go.sum index 1a54f373029..e491eac30b8 100644 --- a/go.sum +++ b/go.sum @@ -1499,18 +1499,18 @@ github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4a github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg= github.com/osmosis-labs/cometbft v0.37.2-v21-osmo-1 h1:dAPp/n4+qqbJgPkMXcU+M0xUWWywHiOrW9RF3zLBbsI= github.com/osmosis-labs/cometbft v0.37.2-v21-osmo-1/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 h1:80nco4oGzcrS5XGdg6UoAKn961Ra9UpE+W9YvBJ2h2E= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 h1:w9+2/qQx3qBZKvkLEzP5OWEPz/CPllYLVK0yxvbCDmo= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 h1:YlmchqTmlwdWSmrRmXKR+PcU96ntOd8u10vTaTZdcNY= github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI= -github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403 h1:W7MrdlDaTerE4Me2FJzkBgRpRgeTtz3fWphCvhosZrQ= -github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403/go.mod h1:WVI8bFbAXhiNr2nUkKGUCqZGVE3dEpSxRLQ7lWJppm8= -github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403 h1:SS50/mI1rYZzVhKiUjXXmGfokPpnyEZBif1Na3KS6Fo= -github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403/go.mod h1:nlJvDKEyuZRhsSEBG7/58mxmQqt+SHhZ21su13N2Vt4= -github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20240109211933-17cb7c095403 h1:ZKiD3QsPsNAHd1ljO4+xMEcV8pIIEjWTsbKKltb1Isc= -github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20240109211933-17cb7c095403/go.mod h1:yhkqP7gCFx7g8U2NSPVZO9t5BHGpsK2EKuEBdrsleJA= -github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109211933-17cb7c095403 h1:9FOb9eQ7vgOD/0yY644DTq5fBC8vXsFYpKML19maPMw= -github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109211933-17cb7c095403/go.mod h1:bjpoigyf4GzRUEwDrUP4bz/FrqkiCiEefNbgmqhYmLA= +github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c h1:GGQQ8rg29XXsBG4kpGUtq6xL7WVtnCGE2zuyjcuX9ek= +github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c/go.mod h1:jTk9RRqqZ+0bfNoEw9RWzPvTNiY2fhPhujFyN4HSWUk= +github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c h1:1eKNgQvwvdN6cdYfY1P7f5K0aM7VKMH7mKfSLyNLFvA= +github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c/go.mod h1:bXo60DGuT/zqY3SQOjO+scp+pM/mEWxruNftNwP3eg0= +github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20240109214800-856d6ce64d0c h1:VsXypm0NhrzIk/m8jRy7ZrH3txfjfldrZ0SyYzsClGo= +github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20240109214800-856d6ce64d0c/go.mod h1:qsjZ6MKKxdv44DNzLK9TNtx0tHYOfkQD0wj5cTnEwYM= +github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109214800-856d6ce64d0c h1:pcKgAGhZVQGhoJY0rSYH+QLKOjvc5OkiPCJSv6tthSs= +github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109214800-856d6ce64d0c/go.mod h1:d+K7n5HJaY55T5EA1ITxszo7aI6DkYuGuG+8pyHHvVo= github.com/osmosis-labs/sqs v0.0.0-20240108192026-6ccc0a29f77d h1:J650EirkcVLQuc6B2fiVmM4kNQqntYioxd6v/D0RfLw= github.com/osmosis-labs/sqs v0.0.0-20240108192026-6ccc0a29f77d/go.mod h1:mWCacHuCAOXS9TqOuGtSPVcO8rsfieHCaQjDE/wijZY= github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240108192026-6ccc0a29f77d h1:udZMOAqOYdBaYdkFMmylbuOGJBlCG70qehW9QR3cOdQ= diff --git a/osmomath/go.mod b/osmomath/go.mod index 19705965c19..97ebd25386b 100644 --- a/osmomath/go.mod +++ b/osmomath/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( cosmossdk.io/math v1.1.3-rc.1 github.com/cosmos/cosmos-sdk v0.47.5 - github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403 + github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c github.com/stretchr/testify v1.8.4 gopkg.in/yaml.v2 v2.4.0 @@ -91,9 +91,9 @@ replace ( // v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2 github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2 - // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/65d7acfdc2a94cc49837bb9abec462f129029540 - // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v21-osmo-6 - github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 + // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v22/v0.47.5, current branch: osmo-v22/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/bfa713aa3097abef67ebf3fc4b654dafc0a2ab8d + // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v22-osmo-1 + github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/osmomath/go.sum b/osmomath/go.sum index f3cd3ea81c9..85de55f0da9 100644 --- a/osmomath/go.sum +++ b/osmomath/go.sum @@ -241,10 +241,10 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 h1:80nco4oGzcrS5XGdg6UoAKn961Ra9UpE+W9YvBJ2h2E= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= -github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403 h1:SS50/mI1rYZzVhKiUjXXmGfokPpnyEZBif1Na3KS6Fo= -github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403/go.mod h1:nlJvDKEyuZRhsSEBG7/58mxmQqt+SHhZ21su13N2Vt4= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 h1:w9+2/qQx3qBZKvkLEzP5OWEPz/CPllYLVK0yxvbCDmo= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= +github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c h1:1eKNgQvwvdN6cdYfY1P7f5K0aM7VKMH7mKfSLyNLFvA= +github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c/go.mod h1:bXo60DGuT/zqY3SQOjO+scp+pM/mEWxruNftNwP3eg0= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= diff --git a/osmoutils/go.mod b/osmoutils/go.mod index 28b15f2c805..74ad957d909 100644 --- a/osmoutils/go.mod +++ b/osmoutils/go.mod @@ -11,7 +11,7 @@ require ( github.com/cosmos/gogoproto v1.4.11 github.com/cosmos/iavl v0.20.1 github.com/cosmos/ibc-go/v7 v7.3.1 - github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403 + github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c github.com/osmosis-labs/osmosis/v21 v21.2.1 github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 @@ -168,9 +168,9 @@ replace ( // v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2 github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2 - // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/65d7acfdc2a94cc49837bb9abec462f129029540 - // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v21-osmo-6 - github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 + // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v22/v0.47.5, current branch: osmo-v22/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/bfa713aa3097abef67ebf3fc4b654dafc0a2ab8d + // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v22-osmo-1 + github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/osmoutils/go.sum b/osmoutils/go.sum index 2ba72472ac0..8a8098163e4 100644 --- a/osmoutils/go.sum +++ b/osmoutils/go.sum @@ -1227,10 +1227,10 @@ github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/osmosis-labs/cometbft v0.37.2-v21-osmo-1 h1:dAPp/n4+qqbJgPkMXcU+M0xUWWywHiOrW9RF3zLBbsI= github.com/osmosis-labs/cometbft v0.37.2-v21-osmo-1/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 h1:80nco4oGzcrS5XGdg6UoAKn961Ra9UpE+W9YvBJ2h2E= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= -github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403 h1:W7MrdlDaTerE4Me2FJzkBgRpRgeTtz3fWphCvhosZrQ= -github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403/go.mod h1:WVI8bFbAXhiNr2nUkKGUCqZGVE3dEpSxRLQ7lWJppm8= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 h1:w9+2/qQx3qBZKvkLEzP5OWEPz/CPllYLVK0yxvbCDmo= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= +github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c h1:GGQQ8rg29XXsBG4kpGUtq6xL7WVtnCGE2zuyjcuX9ek= +github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c/go.mod h1:jTk9RRqqZ+0bfNoEw9RWzPvTNiY2fhPhujFyN4HSWUk= github.com/osmosis-labs/osmosis/v21 v21.2.1 h1:C6bNyfhhwGmHtrb0ZzzwN8VdbV3zrgkiYwmiEg/a+QY= github.com/osmosis-labs/osmosis/v21 v21.2.1/go.mod h1:Tnl0TMjv9U7CfIx2ikXYyv986bSgEu6wZL5TMxAz6rA= github.com/osmosis-labs/osmosis/x/epochs v0.0.3-0.20231220185444-78d2c6fefe94 h1:zMLkDwk0GkaeuA9WLV7YghfJ5GvV90ll4chOf7xzV6I= diff --git a/x/epochs/go.mod b/x/epochs/go.mod index 18ed06842b2..580b165d637 100644 --- a/x/epochs/go.mod +++ b/x/epochs/go.mod @@ -8,7 +8,7 @@ require ( github.com/cosmos/gogoproto v1.4.11 github.com/golang/protobuf v1.5.3 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403 + github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c github.com/osmosis-labs/osmosis/v21 v21.2.1 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.8.4 @@ -144,8 +144,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403 // indirect - github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109211933-17cb7c095403 // indirect + github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c // indirect + github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109214800-856d6ce64d0c // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -214,9 +214,9 @@ replace ( // v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2 github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2 - // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/65d7acfdc2a94cc49837bb9abec462f129029540 - // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v21-osmo-6 - github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 + // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v22/v0.47.5, current branch: osmo-v22/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/bfa713aa3097abef67ebf3fc4b654dafc0a2ab8d + // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v22-osmo-1 + github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/x/epochs/go.sum b/x/epochs/go.sum index 8638e352c5b..ad914975c13 100644 --- a/x/epochs/go.sum +++ b/x/epochs/go.sum @@ -1243,16 +1243,16 @@ github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/osmosis-labs/cometbft v0.37.2-v21-osmo-1 h1:dAPp/n4+qqbJgPkMXcU+M0xUWWywHiOrW9RF3zLBbsI= github.com/osmosis-labs/cometbft v0.37.2-v21-osmo-1/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 h1:80nco4oGzcrS5XGdg6UoAKn961Ra9UpE+W9YvBJ2h2E= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= -github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403 h1:W7MrdlDaTerE4Me2FJzkBgRpRgeTtz3fWphCvhosZrQ= -github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403/go.mod h1:WVI8bFbAXhiNr2nUkKGUCqZGVE3dEpSxRLQ7lWJppm8= -github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403 h1:SS50/mI1rYZzVhKiUjXXmGfokPpnyEZBif1Na3KS6Fo= -github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403/go.mod h1:nlJvDKEyuZRhsSEBG7/58mxmQqt+SHhZ21su13N2Vt4= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 h1:w9+2/qQx3qBZKvkLEzP5OWEPz/CPllYLVK0yxvbCDmo= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= +github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c h1:GGQQ8rg29XXsBG4kpGUtq6xL7WVtnCGE2zuyjcuX9ek= +github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c/go.mod h1:jTk9RRqqZ+0bfNoEw9RWzPvTNiY2fhPhujFyN4HSWUk= +github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c h1:1eKNgQvwvdN6cdYfY1P7f5K0aM7VKMH7mKfSLyNLFvA= +github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c/go.mod h1:bXo60DGuT/zqY3SQOjO+scp+pM/mEWxruNftNwP3eg0= github.com/osmosis-labs/osmosis/v21 v21.2.1 h1:C6bNyfhhwGmHtrb0ZzzwN8VdbV3zrgkiYwmiEg/a+QY= github.com/osmosis-labs/osmosis/v21 v21.2.1/go.mod h1:Tnl0TMjv9U7CfIx2ikXYyv986bSgEu6wZL5TMxAz6rA= -github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109211933-17cb7c095403 h1:9FOb9eQ7vgOD/0yY644DTq5fBC8vXsFYpKML19maPMw= -github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109211933-17cb7c095403/go.mod h1:bjpoigyf4GzRUEwDrUP4bz/FrqkiCiEefNbgmqhYmLA= +github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109214800-856d6ce64d0c h1:pcKgAGhZVQGhoJY0rSYH+QLKOjvc5OkiPCJSv6tthSs= +github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.9-0.20240109214800-856d6ce64d0c/go.mod h1:d+K7n5HJaY55T5EA1ITxszo7aI6DkYuGuG+8pyHHvVo= github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8= github.com/osmosis-labs/wasmd v0.45.0-osmo/go.mod h1:J6eRvwii5T1WxhetZkBg1kOJS3GTn1Bw2OLyZBb8EVU= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= diff --git a/x/ibc-hooks/go.mod b/x/ibc-hooks/go.mod index 5cc241c9140..092417223df 100644 --- a/x/ibc-hooks/go.mod +++ b/x/ibc-hooks/go.mod @@ -11,8 +11,8 @@ require ( github.com/cosmos/gogoproto v1.4.11 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403 - github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403 + github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c + github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c github.com/spf13/cobra v1.8.0 google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 @@ -202,9 +202,9 @@ replace ( // v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2 github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2 - // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/65d7acfdc2a94cc49837bb9abec462f129029540 - // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v21-osmo-6 - github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 + // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo-v22/v0.47.5, current branch: osmo-v22/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/bfa713aa3097abef67ebf3fc4b654dafc0a2ab8d + // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v22-osmo-1 + github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 diff --git a/x/ibc-hooks/go.sum b/x/ibc-hooks/go.sum index 20dbb202c97..9dd3a57c8a2 100644 --- a/x/ibc-hooks/go.sum +++ b/x/ibc-hooks/go.sum @@ -1236,12 +1236,12 @@ github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/osmosis-labs/cometbft v0.37.2-v21-osmo-1 h1:dAPp/n4+qqbJgPkMXcU+M0xUWWywHiOrW9RF3zLBbsI= github.com/osmosis-labs/cometbft v0.37.2-v21-osmo-1/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6 h1:80nco4oGzcrS5XGdg6UoAKn961Ra9UpE+W9YvBJ2h2E= -github.com/osmosis-labs/cosmos-sdk v0.47.5-v21-osmo-6/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= -github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403 h1:W7MrdlDaTerE4Me2FJzkBgRpRgeTtz3fWphCvhosZrQ= -github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109211933-17cb7c095403/go.mod h1:WVI8bFbAXhiNr2nUkKGUCqZGVE3dEpSxRLQ7lWJppm8= -github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403 h1:SS50/mI1rYZzVhKiUjXXmGfokPpnyEZBif1Na3KS6Fo= -github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109211933-17cb7c095403/go.mod h1:nlJvDKEyuZRhsSEBG7/58mxmQqt+SHhZ21su13N2Vt4= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1 h1:w9+2/qQx3qBZKvkLEzP5OWEPz/CPllYLVK0yxvbCDmo= +github.com/osmosis-labs/cosmos-sdk v0.47.5-v22-osmo-1/go.mod h1:4BNXIoS9XecywMSdPr/DIwCgH2/Qjyr2+qhrHu8YSEo= +github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c h1:GGQQ8rg29XXsBG4kpGUtq6xL7WVtnCGE2zuyjcuX9ek= +github.com/osmosis-labs/osmosis/osmomath v0.0.7-0.20240109214800-856d6ce64d0c/go.mod h1:jTk9RRqqZ+0bfNoEw9RWzPvTNiY2fhPhujFyN4HSWUk= +github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c h1:1eKNgQvwvdN6cdYfY1P7f5K0aM7VKMH7mKfSLyNLFvA= +github.com/osmosis-labs/osmosis/osmoutils v0.0.7-0.20240109214800-856d6ce64d0c/go.mod h1:bXo60DGuT/zqY3SQOjO+scp+pM/mEWxruNftNwP3eg0= github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8= github.com/osmosis-labs/wasmd v0.45.0-osmo/go.mod h1:J6eRvwii5T1WxhetZkBg1kOJS3GTn1Bw2OLyZBb8EVU= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=