Remove unused mauth module

scrtlabs · Aug 16, 2024 · 5ac4577 · 5ac4577
1 parent 5fb0161
commit 5ac4577
Show file tree

Hide file tree

Showing 30 changed files with 0 additions and 3,458 deletions.
diff --git a/app/app.go b/app/app.go
@@ -59,8 +59,6 @@ import (
 	v1_7 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.7"
 	v1_8 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.8"
 
-	icaauthtypes "github.com/scrtlabs/SecretNetwork/x/mauth/types"
-
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 
@@ -563,7 +561,6 @@ func SetOrderBeginBlockers(app *SecretNetworkApp) {
 		authz.ModuleName,
 		paramstypes.ModuleName,
 		icatypes.ModuleName,
-		icaauthtypes.ModuleName,
 		packetforwardtypes.ModuleName,
 		ibcfeetypes.ModuleName,
 		// custom modules
@@ -591,7 +588,6 @@ func SetOrderInitGenesis(app *SecretNetworkApp) {
 		ibcswitchtypes.ModuleName,
 
 		icatypes.ModuleName,
-		icaauthtypes.ModuleName,
 
 		authz.ModuleName,
 		minttypes.ModuleName,
@@ -628,7 +624,6 @@ func SetOrderEndBlockers(app *SecretNetworkApp) {
 		ibcexported.ModuleName,
 		ibctransfertypes.ModuleName,
 		icatypes.ModuleName,
-		icaauthtypes.ModuleName,
 		ibcfeetypes.ModuleName,
 		packetforwardtypes.ModuleName,
 		compute.ModuleName,

diff --git a/app/config.go b/app/config.go
@@ -41,7 +41,6 @@ import (
 	packetforwardrouter "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward"
 	scrt "github.com/scrtlabs/SecretNetwork/types"
 	"github.com/scrtlabs/SecretNetwork/x/compute"
-	icaauth "github.com/scrtlabs/SecretNetwork/x/mauth"
 	"github.com/scrtlabs/SecretNetwork/x/registration"
 )
 
@@ -87,7 +86,6 @@ func customModuleBasics() []module.AppModuleBasic {
 	return []module.AppModuleBasic{
 		compute.AppModuleBasic{},
 		registration.AppModuleBasic{},
-		icaauth.AppModuleBasic{},
 		ibcswitch.AppModuleBasic{},
 	}
 }

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -41,7 +41,6 @@ import (
 	ibcpacketforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward"
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
 	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
-	icacontroller "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller"
 	icacontrollerkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/keeper"
 	icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types"
 	icahost "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host"
@@ -55,9 +54,6 @@ import (
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	"github.com/scrtlabs/SecretNetwork/x/compute"
-	icaauth "github.com/scrtlabs/SecretNetwork/x/mauth"
-	icaauthkeeper "github.com/scrtlabs/SecretNetwork/x/mauth/keeper"
-	icaauthtypes "github.com/scrtlabs/SecretNetwork/x/mauth/types"
 	reg "github.com/scrtlabs/SecretNetwork/x/registration"
 
 	ibcpacketforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper"
@@ -106,15 +102,13 @@ type SecretAppKeepers struct {
 
 	ICAControllerKeeper *icacontrollerkeeper.Keeper
 	ICAHostKeeper       *icahostkeeper.Keeper
-	ICAAuthKeeper       *icaauthkeeper.Keeper
 
 	// make scoped keepers public for test purposes
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
 	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
 
 	ScopedICAControllerKeeper capabilitykeeper.ScopedKeeper
 	ScopedICAHostKeeper       capabilitykeeper.ScopedKeeper
-	ScopedICAAuthKeeper       capabilitykeeper.ScopedKeeper
 
 	ScopedComputeKeeper capabilitykeeper.ScopedKeeper
 
@@ -339,7 +333,6 @@ func (ak *SecretAppKeepers) CreateScopedKeepers() {
 	ak.ScopedTransferKeeper = ak.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
 	ak.ScopedICAControllerKeeper = ak.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)
 	ak.ScopedICAHostKeeper = ak.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
-	ak.ScopedICAAuthKeeper = ak.CapabilityKeeper.ScopeToModule(icaauthtypes.ModuleName)
 	ak.ScopedComputeKeeper = ak.CapabilityKeeper.ScopeToModule(compute.ModuleName)
 
 	// Applications that wish to enforce statically created ScopedKeepers should call `Seal` after creating
@@ -472,16 +465,6 @@ func (ak *SecretAppKeepers) InitCustomKeepers(
 	)
 	ak.ICAHostKeeper = &icaHostKeeper
 
-	icaAuthKeeper := icaauthkeeper.NewKeeper(
-		appCodec,
-		runtime.NewKVStoreService(ak.keys[icaauthtypes.StoreKey]),
-		*ak.ICAControllerKeeper,
-		ak.ScopedICAAuthKeeper,
-	)
-	ak.ICAAuthKeeper = &icaAuthKeeper
-
-	icaAuthIBCModule := icaauth.NewIBCModule(*ak.ICAAuthKeeper)
-
 	icaHostIBCModule := icahost.NewIBCModule(*ak.ICAHostKeeper)
 
 	// Create Transfer Keepers
@@ -521,7 +504,6 @@ func (ak *SecretAppKeepers) InitCustomKeepers(
 
 	// initialize ICA module with mock module as the authentication module on the controller side
 	var icaControllerStack porttypes.IBCModule
-	icaControllerStack = icacontroller.NewIBCMiddleware(icaAuthIBCModule, *ak.ICAControllerKeeper)
 	icaControllerStack = ibcfee.NewIBCMiddleware(icaControllerStack, ak.IbcFeeKeeper)
 	icaControllerStack = ibcswitch.NewIBCMiddleware(icaControllerStack, ak.IbcSwitchKeeper)
 

diff --git a/app/modules.go b/app/modules.go
@@ -40,7 +40,6 @@ import (
 	ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 	"github.com/scrtlabs/SecretNetwork/x/compute"
 	ibcswitch "github.com/scrtlabs/SecretNetwork/x/emergencybutton"
-	icaauth "github.com/scrtlabs/SecretNetwork/x/mauth"
 	reg "github.com/scrtlabs/SecretNetwork/x/registration"
 )
 
@@ -89,6 +88,5 @@ func Modules(
 		packetforward.NewAppModule(app.AppKeepers.PacketForwardKeeper, app.AppKeepers.GetSubspace(packetforwardtypes.ModuleName)),
 		ibcfee.NewAppModule(app.AppKeepers.IbcFeeKeeper),
 		ibcswitch.NewAppModule(app.AppKeepers.IbcSwitchKeeper),
-		icaauth.NewAppModule(appCodec, *app.AppKeepers.ICAAuthKeeper),
 	}
 }
diff --git a/client/docs/config.json b/client/docs/config.json
@@ -776,28 +776,6 @@
         }
       }
     },
-    {
-      "url": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.json",
-      "operationIds": {
-        "rename": {
-          "Params": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonParams",
-          "Pool": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonPool",
-          "DelegatorValidators": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonDelegatorValidators",
-          "UpgradedConsensusState": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonUpgradedConsensusState",
-          "Accounts": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonAccounts",
-          "Account": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonAccount",
-          "Proposal": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonProposal",
-          "Proposals": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonProposals",
-          "Deposits": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonDeposits",
-          "Deposit": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonDeposit",
-          "TallyResult": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonTallyResult",
-          "Votes": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonVotes",
-          "Vote": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonVote",
-          "Balance": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonBalance",
-          "Code": "../../tmp-swagger-gen/secret/intertx/v1beta1/query.swagger.jsonCode"
-        }
-      }
-    },
     {
       "url": "../../tmp-swagger-gen/secret/registration/v1beta1/query.swagger.json",
       "operationIds": {

diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml
@@ -63038,60 +63038,6 @@ paths:
                       format: byte
       tags:
         - gRPC Gateway API
-  /mauth/interchain_account/owner/{owner}/connection/{connection_id}:
-    get:
-      summary: >-
-        QueryInterchainAccountFromAddress returns the interchain account for
-        given
-
-        owner address on a given connection pair
-      operationId: InterchainAccountFromAddress
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            properties:
-              interchain_account_address:
-                type: string
-            title: >-
-              QueryInterchainAccountFromAddressResponse the response type for
-              the
-
-              Query/InterchainAccountAddress RPC
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              error:
-                type: string
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    type_url:
-                      type: string
-                    value:
-                      type: string
-                      format: byte
-      parameters:
-        - name: owner
-          in: path
-          required: true
-          type: string
-        - name: connection_id
-          in: path
-          required: true
-          type: string
-      tags:
-        - gRPC Gateway API
   /registration/v1beta1/encrypted-seed/{pub_key}:
     get:
       summary: Returns the encrypted seed for a registered node by public key
@@ -111154,14 +111100,6 @@ definitions:
           pauser_address:
             type: string
     description: ParamsResponse is the response type for the Query/Params RPC method.
-  secret.intertx.v1beta1.QueryInterchainAccountFromAddressResponse:
-    type: object
-    properties:
-      interchain_account_address:
-        type: string
-    title: |-
-      QueryInterchainAccountFromAddressResponse the response type for the
-      Query/InterchainAccountAddress RPC
   secret.registration.v1beta1.Key:
     type: object
     properties:

diff --git a/go.mod b/go.mod
@@ -73,7 +73,6 @@ require (
 	cloud.google.com/go/iam v1.1.6 // indirect
 	cloud.google.com/go/storage v1.36.0 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
-	cosmossdk.io/x/circuit v0.1.0 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.1 // indirect

diff --git a/proto/secret/intertx/v1beta1/query.proto b/proto/secret/intertx/v1beta1/query.proto
diff --git a/proto/secret/intertx/v1beta1/tx.proto b/proto/secret/intertx/v1beta1/tx.proto
diff --git a/x/mauth/alias.go b/x/mauth/alias.go
diff --git a/x/mauth/client/cli/flags.go b/x/mauth/client/cli/flags.go