Skip to content

Commit

Permalink
chore: remove accounts replaces (#21504)
Browse files Browse the repository at this point in the history 
(cherry picked from commit 9197f54)

# Conflicts:
#	client/v2/go.mod
#	go.mod
#	server/v2/cometbft/go.mod
#	x/auth/go.mod
#	x/authz/go.mod
#	x/bank/go.mod
#	x/circuit/go.mod
#	x/consensus/go.mod
#	x/distribution/go.mod
#	x/epochs/go.mod
#	x/evidence/go.mod
#	x/feegrant/go.mod
#	x/gov/go.mod
#	x/mint/go.mod
#	x/nft/go.mod
#	x/params/go.mod
#	x/protocolpool/go.mod
#	x/slashing/go.mod
#	x/staking/go.mod
#	x/upgrade/go.mod
  • Loading branch information
@tac0turtle @mergify
tac0turtle authored and mergify[bot] committed Sep 2, 2024
1 parent 52e4b33 commit f4b5672
Show file tree
Hide file tree
Showing 20 changed files with 151 additions and 0 deletions.
7 changes: 7 additions & 0 deletions client/v2/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,20 @@ replace github.com/cosmos/cosmos-sdk => ./../../

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ./../../x/accounts
=======
cosmossdk.io/api => ./../../api
cosmossdk.io/core => ./../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ./../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ./../../x/auth
cosmossdk.io/x/bank => ./../../x/bank
cosmossdk.io/x/consensus => ./../../x/consensus
Expand Down
8 changes: 8 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,21 @@ require (
// )
// TODO remove after all modules have their own go.mods
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ./x/accounts
=======
cosmossdk.io/api => ./api
cosmossdk.io/collections => ./collections
cosmossdk.io/core => ./core
cosmossdk.io/core/testing => ./core/testing
cosmossdk.io/store => ./store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ./x/auth
cosmossdk.io/x/bank => ./x/bank
cosmossdk.io/x/consensus => ./x/consensus
Expand Down
10 changes: 10 additions & 0 deletions server/v2/cometbft/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,23 @@ module cosmossdk.io/server/v2/cometbft
go 1.23

replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../../../x/accounts
=======
cosmossdk.io/api => ../../../api
cosmossdk.io/core => ../../../core
cosmossdk.io/core/testing => ../../../core/testing
cosmossdk.io/server/v2 => ../
cosmossdk.io/server/v2/appmanager => ../appmanager
cosmossdk.io/store => ../../../store
cosmossdk.io/store/v2 => ../../../store/v2
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../../../x/auth
cosmossdk.io/x/bank => ../../../x/bank
cosmossdk.io/x/consensus => ../../../x/consensus
Expand Down
8 changes: 8 additions & 0 deletions x/auth/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,21 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/collections => ../../collections
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
cosmossdk.io/x/staking => ../staking
Expand Down
8 changes: 8 additions & 0 deletions x/authz/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,21 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/collections => ../../collections
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
8 changes: 8 additions & 0 deletions x/bank/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,21 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/collections => ../../collections
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/consensus => ../consensus
cosmossdk.io/x/staking => ../staking
Expand Down
7 changes: 7 additions & 0 deletions x/circuit/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,20 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
7 changes: 7 additions & 0 deletions x/consensus/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,20 @@ require (
replace github.com/cosmos/cosmos-sdk => ../../.

replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/staking => ../staking
Expand Down
8 changes: 8 additions & 0 deletions x/distribution/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,21 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/collections => ../../collections
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
7 changes: 7 additions & 0 deletions x/epochs/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,20 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
7 changes: 7 additions & 0 deletions x/evidence/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,20 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
8 changes: 8 additions & 0 deletions x/feegrant/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,21 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/collections => ../../collections
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
8 changes: 8 additions & 0 deletions x/gov/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,21 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/collections => ../../collections
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
7 changes: 7 additions & 0 deletions x/mint/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,20 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
7 changes: 7 additions & 0 deletions x/nft/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,20 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
7 changes: 7 additions & 0 deletions x/params/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,20 @@ replace github.com/cosmos/cosmos-sdk => ../..

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
7 changes: 7 additions & 0 deletions x/protocolpool/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,20 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
7 changes: 7 additions & 0 deletions x/slashing/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,20 @@ replace github.com/cosmos/cosmos-sdk => ../../.

// TODO remove post spinning out all modules
replace (
<<<<<<< HEAD
// pseudo version lower than the latest tag
cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main
// pseudo version lower than the latest tag
cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240829151633-41a9af76e071 // main
// pseudo version lower than the latest tag
cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main
cosmossdk.io/x/accounts => ../accounts
=======
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/store => ../../store
>>>>>>> 9197f541e (chore: remove accounts replaces (#21504))
cosmossdk.io/x/auth => ../auth
cosmossdk.io/x/bank => ../bank
cosmossdk.io/x/consensus => ../consensus
Expand Down
Loading

0 comments on commit f4b5672

Please sign in to comment.