From 933d7cb0c99edbae491094989e82fd33499ffac7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 18:57:54 +0000 Subject: [PATCH 1/2] chore(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#4416) * chore(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 Bumps [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/cosmos/cosmos-sdk/releases) - [Changelog](https://github.com/cosmos/cosmos-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/cosmos/cosmos-sdk/compare/log/v1.3.0...log/v1.4.0) --- updated-dependencies: - dependency-name: cosmossdk.io/math dependency-type: direct:production ... Signed-off-by: dependabot[bot] * bump in template --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Julien Robert (cherry picked from commit 29b8145303b88820d56c90fbc7a815bcd52f81f3) # Conflicts: # go.mod # go.sum # ignite/templates/app/files/go.mod.plush --- go.mod | 7 +++++++ go.sum | 15 +++++++++++++++ ignite/templates/app/files/go.mod.plush | 5 +++++ 3 files changed, 27 insertions(+) diff --git a/go.mod b/go.mod index a18ec491e7..b443e91ab8 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,14 @@ replace ( ) require ( +<<<<<<< HEAD cosmossdk.io/math v1.3.0 +======= + cosmossdk.io/core v1.0.0 + cosmossdk.io/math v1.4.0 + cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 + cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 +>>>>>>> 29b81453 (chore(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#4416)) github.com/99designs/keyring v1.2.2 github.com/AlecAivazis/survey/v2 v2.3.7 github.com/DATA-DOG/go-sqlmock v1.5.2 diff --git a/go.sum b/go.sum index f42b8385d2..3606119556 100644 --- a/go.sum +++ b/go.sum @@ -57,12 +57,27 @@ cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= +<<<<<<< HEAD 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.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= cosmossdk.io/x/tx v0.13.4 h1:Eg0PbJgeO0gM8p5wx6xa0fKR7hIV6+8lC56UrsvSo0Y= cosmossdk.io/x/tx v0.13.4/go.mod h1:BkFqrnGGgW50Y6cwTy+JvgAhiffbGEKW6KF9ufcDpvk= +======= +cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= +cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= +cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 h1:DmOoS/1PeY6Ih0hAVlJ69kLMUrLV+TCbfICrZtB1vdU= +cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= +cosmossdk.io/store v1.0.0-rc.0.0.20241106232657-2290c5ee5582 h1:PVMvSrFMaMNy9fJ1D/bvCSS8DepswqJI/VoMuYDeYdA= +cosmossdk.io/store v1.0.0-rc.0.0.20241106232657-2290c5ee5582/go.mod h1:uaysXSQHWUykekFPvS1JqQ7HM58Zuqcby1DNlLQPWSg= +cosmossdk.io/x/bank v0.0.0-20241106211233-535aa2f3508e h1:DCULJVM+ztgWJpvRIqZNnSfQNRnyJ/hovP9xBwnGM0E= +cosmossdk.io/x/bank v0.0.0-20241106211233-535aa2f3508e/go.mod h1:OmcHhLWT30nMpN5kYEQtS7vmLIFXNFFyU2XTaVSpR/s= +cosmossdk.io/x/staking v0.0.0-20241106211233-535aa2f3508e h1:vdeJrlIqDSMQjS0dSpRWLv6skq2IzX851NjGwQJzZMk= +cosmossdk.io/x/staking v0.0.0-20241106211233-535aa2f3508e/go.mod h1:ngo+eiaYADHDVslXihZf6ZgA2nWrloHOsiOCRxHVkTY= +cosmossdk.io/x/tx v1.0.0-alpha.1 h1:5w61etWMQbdCSR7uveWXCnGnD5eQ/64B2vzIhqA80yo= +cosmossdk.io/x/tx v1.0.0-alpha.1/go.mod h1:xlJjZV1wxZBTCP+ygZx9pNT/XxsfHDPf1H0VhHaUp5w= +>>>>>>> 29b81453 (chore(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#4416)) dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= diff --git a/ignite/templates/app/files/go.mod.plush b/ignite/templates/app/files/go.mod.plush index 90ab2b426b..235dd9d1fc 100644 --- a/ignite/templates/app/files/go.mod.plush +++ b/ignite/templates/app/files/go.mod.plush @@ -16,8 +16,13 @@ require ( cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.1 +<<<<<<< HEAD cosmossdk.io/math v1.3.0 cosmossdk.io/store v1.1.1 +======= + cosmossdk.io/math v1.4.0 + cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6 +>>>>>>> 29b81453 (chore(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#4416)) cosmossdk.io/tools/confix v0.1.2 cosmossdk.io/x/circuit v0.1.1 cosmossdk.io/x/evidence v0.1.1 From bbddc9a730b22beaf754af0a9e0b1227535e09dd Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 20 Nov 2024 20:33:11 +0100 Subject: [PATCH 2/2] fix conflicts --- go.mod | 7 ------- go.sum | 19 ++----------------- ignite/templates/app/files/go.mod.plush | 7 +------ 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/go.mod b/go.mod index b443e91ab8..f7527f9b8e 100644 --- a/go.mod +++ b/go.mod @@ -15,14 +15,7 @@ replace ( ) require ( -<<<<<<< HEAD - cosmossdk.io/math v1.3.0 -======= - cosmossdk.io/core v1.0.0 cosmossdk.io/math v1.4.0 - cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 - cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000 ->>>>>>> 29b81453 (chore(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#4416)) github.com/99designs/keyring v1.2.2 github.com/AlecAivazis/survey/v2 v2.3.7 github.com/DATA-DOG/go-sqlmock v1.5.2 diff --git a/go.sum b/go.sum index 3606119556..438d4c3002 100644 --- a/go.sum +++ b/go.sum @@ -57,27 +57,12 @@ cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= -<<<<<<< HEAD -cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= -cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= +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= cosmossdk.io/x/tx v0.13.4 h1:Eg0PbJgeO0gM8p5wx6xa0fKR7hIV6+8lC56UrsvSo0Y= cosmossdk.io/x/tx v0.13.4/go.mod h1:BkFqrnGGgW50Y6cwTy+JvgAhiffbGEKW6KF9ufcDpvk= -======= -cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= -cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= -cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 h1:DmOoS/1PeY6Ih0hAVlJ69kLMUrLV+TCbfICrZtB1vdU= -cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= -cosmossdk.io/store v1.0.0-rc.0.0.20241106232657-2290c5ee5582 h1:PVMvSrFMaMNy9fJ1D/bvCSS8DepswqJI/VoMuYDeYdA= -cosmossdk.io/store v1.0.0-rc.0.0.20241106232657-2290c5ee5582/go.mod h1:uaysXSQHWUykekFPvS1JqQ7HM58Zuqcby1DNlLQPWSg= -cosmossdk.io/x/bank v0.0.0-20241106211233-535aa2f3508e h1:DCULJVM+ztgWJpvRIqZNnSfQNRnyJ/hovP9xBwnGM0E= -cosmossdk.io/x/bank v0.0.0-20241106211233-535aa2f3508e/go.mod h1:OmcHhLWT30nMpN5kYEQtS7vmLIFXNFFyU2XTaVSpR/s= -cosmossdk.io/x/staking v0.0.0-20241106211233-535aa2f3508e h1:vdeJrlIqDSMQjS0dSpRWLv6skq2IzX851NjGwQJzZMk= -cosmossdk.io/x/staking v0.0.0-20241106211233-535aa2f3508e/go.mod h1:ngo+eiaYADHDVslXihZf6ZgA2nWrloHOsiOCRxHVkTY= -cosmossdk.io/x/tx v1.0.0-alpha.1 h1:5w61etWMQbdCSR7uveWXCnGnD5eQ/64B2vzIhqA80yo= -cosmossdk.io/x/tx v1.0.0-alpha.1/go.mod h1:xlJjZV1wxZBTCP+ygZx9pNT/XxsfHDPf1H0VhHaUp5w= ->>>>>>> 29b81453 (chore(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#4416)) dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= diff --git a/ignite/templates/app/files/go.mod.plush b/ignite/templates/app/files/go.mod.plush index 235dd9d1fc..6bac2618cc 100644 --- a/ignite/templates/app/files/go.mod.plush +++ b/ignite/templates/app/files/go.mod.plush @@ -16,13 +16,8 @@ require ( cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.1 -<<<<<<< HEAD - cosmossdk.io/math v1.3.0 - cosmossdk.io/store v1.1.1 -======= cosmossdk.io/math v1.4.0 - cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6 ->>>>>>> 29b81453 (chore(deps): bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#4416)) + cosmossdk.io/store v1.1.1 cosmossdk.io/tools/confix v0.1.2 cosmossdk.io/x/circuit v0.1.1 cosmossdk.io/x/evidence v0.1.1