From d230c79b1c7f969fdd112003395566d30e0d56a8 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Mon, 2 Sep 2024 16:47:44 +0200 Subject: [PATCH 1/3] remove extra replaces --- client/v2/go.mod | 1 - go.mod | 1 - server/v2/cometbft/go.mod | 1 - x/auth/go.mod | 1 - x/authz/go.mod | 1 - x/bank/go.mod | 1 - x/circuit/go.mod | 1 - x/consensus/go.mod | 1 - x/distribution/go.mod | 1 - x/epochs/go.mod | 1 - x/evidence/go.mod | 1 - x/feegrant/go.mod | 1 - x/gov/go.mod | 1 - x/group/go.mod | 5 ----- x/group/go.sum | 2 ++ x/mint/go.mod | 1 - x/nft/go.mod | 1 - x/params/go.mod | 1 - x/protocolpool/go.mod | 1 - x/slashing/go.mod | 1 - x/staking/go.mod | 1 - x/upgrade/go.mod | 1 - 22 files changed, 2 insertions(+), 25 deletions(-) diff --git a/client/v2/go.mod b/client/v2/go.mod index fdabf7c9f55e..9a7b3ff93783 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -183,7 +183,6 @@ replace ( cosmossdk.io/core => ./../../core cosmossdk.io/core/testing => ../../core/testing cosmossdk.io/store => ./../../store - cosmossdk.io/x/accounts => ./../../x/accounts cosmossdk.io/x/auth => ./../../x/auth cosmossdk.io/x/bank => ./../../x/bank cosmossdk.io/x/consensus => ./../../x/consensus diff --git a/go.mod b/go.mod index b27713afdefa..a2c4d2fc19d0 100644 --- a/go.mod +++ b/go.mod @@ -189,7 +189,6 @@ replace ( cosmossdk.io/core => ./core cosmossdk.io/core/testing => ./core/testing cosmossdk.io/store => ./store - cosmossdk.io/x/accounts => ./x/accounts cosmossdk.io/x/auth => ./x/auth cosmossdk.io/x/bank => ./x/bank cosmossdk.io/x/consensus => ./x/consensus diff --git a/server/v2/cometbft/go.mod b/server/v2/cometbft/go.mod index ed93bebdc3a1..53aa27337603 100644 --- a/server/v2/cometbft/go.mod +++ b/server/v2/cometbft/go.mod @@ -10,7 +10,6 @@ replace ( cosmossdk.io/server/v2/appmanager => ../appmanager cosmossdk.io/store => ../../../store cosmossdk.io/store/v2 => ../../../store/v2 - cosmossdk.io/x/accounts => ../../../x/accounts cosmossdk.io/x/auth => ../../../x/auth cosmossdk.io/x/bank => ../../../x/bank cosmossdk.io/x/consensus => ../../../x/consensus diff --git a/x/auth/go.mod b/x/auth/go.mod index 3ad1fb579f50..0dd2b33627e0 100644 --- a/x/auth/go.mod +++ b/x/auth/go.mod @@ -177,7 +177,6 @@ replace ( cosmossdk.io/collections => ../../collections cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus cosmossdk.io/x/staking => ../staking diff --git a/x/authz/go.mod b/x/authz/go.mod index cce574f76d25..5858f72532e8 100644 --- a/x/authz/go.mod +++ b/x/authz/go.mod @@ -183,7 +183,6 @@ replace ( cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing cosmossdk.io/store => ../../store - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/bank/go.mod b/x/bank/go.mod index 83b303ffa37a..e2ac537c5e79 100644 --- a/x/bank/go.mod +++ b/x/bank/go.mod @@ -181,7 +181,6 @@ replace ( cosmossdk.io/collections => ../../collections cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/consensus => ../consensus cosmossdk.io/x/staking => ../staking diff --git a/x/circuit/go.mod b/x/circuit/go.mod index bccac9f50e7a..138eeca74328 100644 --- a/x/circuit/go.mod +++ b/x/circuit/go.mod @@ -177,7 +177,6 @@ replace ( cosmossdk.io/api => ../../api cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/consensus/go.mod b/x/consensus/go.mod index b9b206b92d9c..721bf511a136 100644 --- a/x/consensus/go.mod +++ b/x/consensus/go.mod @@ -174,7 +174,6 @@ replace ( cosmossdk.io/api => ../../api cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/staking => ../staking diff --git a/x/distribution/go.mod b/x/distribution/go.mod index a2d366dd9231..7dcac3a9178d 100644 --- a/x/distribution/go.mod +++ b/x/distribution/go.mod @@ -182,7 +182,6 @@ replace ( cosmossdk.io/collections => ../../collections cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/epochs/go.mod b/x/epochs/go.mod index de2df262fa01..15cef84357b7 100644 --- a/x/epochs/go.mod +++ b/x/epochs/go.mod @@ -179,7 +179,6 @@ replace ( cosmossdk.io/api => ../../api cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/evidence/go.mod b/x/evidence/go.mod index c257546f23a6..0b4f12ba5aef 100644 --- a/x/evidence/go.mod +++ b/x/evidence/go.mod @@ -177,7 +177,6 @@ replace ( cosmossdk.io/api => ../../api cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/feegrant/go.mod b/x/feegrant/go.mod index a61e4b85f025..4f280925a584 100644 --- a/x/feegrant/go.mod +++ b/x/feegrant/go.mod @@ -182,7 +182,6 @@ replace ( cosmossdk.io/collections => ../../collections cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/gov/go.mod b/x/gov/go.mod index 28324063893b..6ad81d261ab7 100644 --- a/x/gov/go.mod +++ b/x/gov/go.mod @@ -181,7 +181,6 @@ replace ( cosmossdk.io/collections => ../../collections cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/group/go.mod b/x/group/go.mod index 78dd26419473..52c7d535d663 100644 --- a/x/group/go.mod +++ b/x/group/go.mod @@ -41,11 +41,7 @@ require ( buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect cosmossdk.io/collections v0.4.0 // indirect - cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect cosmossdk.io/schema v0.1.1 // indirect - cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5 // indirect - cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000 // indirect - cosmossdk.io/x/distribution v0.0.0-00010101000000-000000000000 // indirect cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 // indirect cosmossdk.io/x/tx v0.13.3 // indirect filippo.io/edwards25519 v1.1.0 // indirect @@ -189,7 +185,6 @@ replace ( cosmossdk.io/collections => ../../collections cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/accounts/defaults/lockup => ../accounts/defaults/lockup cosmossdk.io/x/accounts/defaults/multisig => ../accounts/defaults/multisig cosmossdk.io/x/auth => ../auth diff --git a/x/group/go.sum b/x/group/go.sum index ae3d1158844a..6187552f290d 100644 --- a/x/group/go.sum +++ b/x/group/go.sum @@ -16,6 +16,8 @@ cosmossdk.io/schema v0.1.1 h1:I0M6pgI7R10nq+/HCQfbO6BsGBZA8sQy+duR1Y3aKcA= cosmossdk.io/schema v0.1.1/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc h1:R9O9d75e0qZYUsVV0zzi+D7cNLnX2JrUOQNoIPaF0Bg= cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc/go.mod h1:amTTatOUV3u1PsKmNb87z6/galCxrRbz9kRdJkL0DyU= +cosmossdk.io/x/accounts v0.0.0-20240226161501-23359a0b6d91 h1:1mKq8msDL92zDq0CZ77ZsCmgChKaF1Rs93C+TIm3fKw= +cosmossdk.io/x/accounts v0.0.0-20240226161501-23359a0b6d91/go.mod h1:S9DBfhkvqzOzflam/Byh81E9LYj6x82HnTouU0zbkJ4= cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 h1:GuBrfHsK3RD5vlD4DuBz3DXslR6VlnzrYmHOC3L679Q= cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337/go.mod h1:PhLn1pMBilyRC4GfRkoYhm+XVAYhF4adVrzut8AdpJI= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= diff --git a/x/mint/go.mod b/x/mint/go.mod index 15fd37a8cb41..c41a9de43a24 100644 --- a/x/mint/go.mod +++ b/x/mint/go.mod @@ -181,7 +181,6 @@ replace ( cosmossdk.io/api => ../../api cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/nft/go.mod b/x/nft/go.mod index cbc638aaafe3..cccda490ec36 100644 --- a/x/nft/go.mod +++ b/x/nft/go.mod @@ -176,7 +176,6 @@ replace ( cosmossdk.io/api => ../../api cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/params/go.mod b/x/params/go.mod index 2568d3069c6a..b59364dd5166 100644 --- a/x/params/go.mod +++ b/x/params/go.mod @@ -177,7 +177,6 @@ replace ( cosmossdk.io/api => ../../api cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/protocolpool/go.mod b/x/protocolpool/go.mod index 622cda62c0b1..577a4129bef7 100644 --- a/x/protocolpool/go.mod +++ b/x/protocolpool/go.mod @@ -177,7 +177,6 @@ replace ( cosmossdk.io/api => ../../api cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/slashing/go.mod b/x/slashing/go.mod index 1d5038a6ffe5..170497152a07 100644 --- a/x/slashing/go.mod +++ b/x/slashing/go.mod @@ -178,7 +178,6 @@ replace ( cosmossdk.io/api => ../../api cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/staking/go.mod b/x/staking/go.mod index 3127bfdb3120..19587948221f 100644 --- a/x/staking/go.mod +++ b/x/staking/go.mod @@ -183,7 +183,6 @@ replace ( cosmossdk.io/collections => ../../collections cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod index 41f6229dfe80..940b118e7131 100644 --- a/x/upgrade/go.mod +++ b/x/upgrade/go.mod @@ -209,7 +209,6 @@ replace ( cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing cosmossdk.io/store => ../../store - cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/auth => ../auth cosmossdk.io/x/bank => ../bank cosmossdk.io/x/consensus => ../consensus From 2de599624b3c426fc4e4bc759527edcd43d2af80 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Mon, 2 Sep 2024 17:54:44 +0200 Subject: [PATCH 2/3] add accounts back to groups --- x/group/go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/x/group/go.mod b/x/group/go.mod index 5843fe630ebf..0d1ff04bb55b 100644 --- a/x/group/go.mod +++ b/x/group/go.mod @@ -188,6 +188,7 @@ replace ( cosmossdk.io/core => ../../core cosmossdk.io/core/testing => ../../core/testing cosmossdk.io/store => ../../store + cosmossdk.io/x/accounts => ../accounts cosmossdk.io/x/accounts/defaults/lockup => ../accounts/defaults/lockup cosmossdk.io/x/accounts/defaults/multisig => ../accounts/defaults/multisig cosmossdk.io/x/auth => ../auth From 5a9ac3f9213db69301fadbee18a286c8fa8b1abd Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Mon, 2 Sep 2024 21:42:45 +0200 Subject: [PATCH 3/3] go mod tidy groups --- x/group/go.mod | 4 ++++ x/group/go.sum | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/x/group/go.mod b/x/group/go.mod index 0d1ff04bb55b..937fe67b53d8 100644 --- a/x/group/go.mod +++ b/x/group/go.mod @@ -41,7 +41,11 @@ require ( buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect cosmossdk.io/collections v0.4.0 // indirect + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect cosmossdk.io/schema v0.2.0 // indirect + cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5 // indirect + cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000 // indirect + cosmossdk.io/x/distribution v0.0.0-00010101000000-000000000000 // indirect cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 // indirect cosmossdk.io/x/tx v0.13.3 // indirect filippo.io/edwards25519 v1.1.0 // indirect diff --git a/x/group/go.sum b/x/group/go.sum index c988bb198974..e13cd6ac76b8 100644 --- a/x/group/go.sum +++ b/x/group/go.sum @@ -14,8 +14,6 @@ cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= cosmossdk.io/schema v0.2.0 h1:UH5CR1DqUq8yP+5Np8PbvG4YX0zAUsTN2Qk6yThmfMk= cosmossdk.io/schema v0.2.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= -cosmossdk.io/x/accounts v0.0.0-20240226161501-23359a0b6d91 h1:1mKq8msDL92zDq0CZ77ZsCmgChKaF1Rs93C+TIm3fKw= -cosmossdk.io/x/accounts v0.0.0-20240226161501-23359a0b6d91/go.mod h1:S9DBfhkvqzOzflam/Byh81E9LYj6x82HnTouU0zbkJ4= cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 h1:GuBrfHsK3RD5vlD4DuBz3DXslR6VlnzrYmHOC3L679Q= cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337/go.mod h1:PhLn1pMBilyRC4GfRkoYhm+XVAYhF4adVrzut8AdpJI= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=