diff --git a/.changelog/unreleased/bug-fixes/2408-bump-cosmossdk-math.md b/.changelog/unreleased/bug-fixes/2408-bump-cosmossdk-math.md new file mode 100644 index 0000000000..1b9f837a47 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/2408-bump-cosmossdk-math.md @@ -0,0 +1,3 @@ +- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to + [v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0) + ([\#2408](https://github.com/cosmos/gaia/pull/2408)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/2408-bump-cosmossdk-math.md b/.changelog/unreleased/dependencies/2408-bump-cosmossdk-math.md new file mode 100644 index 0000000000..1b9f837a47 --- /dev/null +++ b/.changelog/unreleased/dependencies/2408-bump-cosmossdk-math.md @@ -0,0 +1,3 @@ +- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to + [v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0) + ([\#2408](https://github.com/cosmos/gaia/pull/2408)) \ No newline at end of file diff --git a/go.mod b/go.mod index 925bbbeea9..052c7130b9 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,17 @@ go 1.22.2 require ( cosmossdk.io/errors v1.0.1 +<<<<<<< HEAD cosmossdk.io/math v1.3.0 github.com/cometbft/cometbft v0.38.11 github.com/cometbft/cometbft-db v0.12.0 // indirect github.com/cosmos/cosmos-sdk v0.50.9 +======= + cosmossdk.io/math v1.4.0 + github.com/cometbft/cometbft v0.38.15 + github.com/cometbft/cometbft-db v0.14.1 // indirect + github.com/cosmos/cosmos-sdk v0.50.10 +>>>>>>> fb598fcb (build(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#2408)) github.com/cosmos/gogoproto v1.7.0 github.com/cosmos/ics23/go v0.11.0 github.com/golang/mock v1.6.0 diff --git a/go.sum b/go.sum index 6903be5801..f154eaf757 100644 --- a/go.sum +++ b/go.sum @@ -198,12 +198,21 @@ cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8= cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= +<<<<<<< HEAD cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= cosmossdk.io/store v1.1.0 h1:LnKwgYMc9BInn9PhpTFEQVbL9UK475G2H911CGGnWHk= cosmossdk.io/store v1.1.0/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= +======= +cosmossdk.io/log v1.5.0 h1:dVdzPJW9kMrnAYyMf1duqacoidB9uZIl+7c6z0mnq0g= +cosmossdk.io/log v1.5.0/go.mod h1:Tr46PUJjiUthlwQ+hxYtUtPn4D/oCZXAkYevBeh5+FI= +cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= +cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= +cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= +cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= +>>>>>>> fb598fcb (build(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#2408)) cosmossdk.io/tools/confix v0.1.2 h1:2hoM1oFCNisd0ltSAAZw2i4ponARPmlhuNu3yy0VwI4= cosmossdk.io/tools/confix v0.1.2/go.mod h1:7XfcbK9sC/KNgVGxgLM0BrFbVcR/+6Dg7MFfpx7duYo= cosmossdk.io/x/circuit v0.1.1 h1:KPJCnLChWrxD4jLwUiuQaf5mFD/1m7Omyo7oooefBVQ=