refactor: remove unnecessary proxy config

x/did/keeper/controller.go

@@ -1,27 +0,0 @@
-package keeper
-
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/onsonr/crypto/mpc"
-	"github.com/onsonr/sonr/x/did/types"
-)
-
-func (k Keeper) NewController(ctx sdk.Context) (uint64, types.ControllerI, error) {
-	shares, err := mpc.GenerateKeyshares()
-	if err != nil {
-		return 0, nil, err
-	}
-	controller, err := types.NewController(shares)
-	if err != nil {
-		return 0, nil, err
-	}
-	entry, err := controller.GetTableEntry()
-	if err != nil {
-		return 0, nil, err
-	}
-	num, err := k.OrmDB.ControllerTable().InsertReturningNumber(ctx, entry)
-	if err != nil {
-		return 0, nil, err
-	}
-	return num, controller, nil
-}

x/did/keeper/keeper.go

@@ -1,18 +1,24 @@
 package keeper
 
 import (
+	"crypto/sha256"
+	"fmt"
+
 	"cosmossdk.io/collections"
 	storetypes "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/orm/model/ormdb"
 	nftkeeper "cosmossdk.io/x/nft/keeper"
 	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	"gopkg.in/macaroon.v2"
 
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	stakkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
+	"github.com/onsonr/crypto/mpc"
 	apiv1 "github.com/onsonr/sonr/api/did/v1"
 	"github.com/onsonr/sonr/x/did/types"
 )
@@ -86,3 +92,43 @@ func NewKeeper(
 	k.Schema = schema
 	return k
 }
+
+func (k Keeper) NewController(ctx sdk.Context) (uint64, types.ControllerI, error) {
+	shares, err := mpc.GenerateKeyshares()
+	if err != nil {
+		return 0, nil, err
+	}
+	controller, err := types.NewController(shares)
+	if err != nil {
+		return 0, nil, err
+	}
+	entry, err := controller.GetTableEntry()
+	if err != nil {
+		return 0, nil, err
+	}
+	num, err := k.OrmDB.ControllerTable().InsertReturningNumber(ctx, entry)
+	if err != nil {
+		return 0, nil, err
+	}
+	return num, controller, nil
+}
+
+// IssueMacaroon creates a macaroon with the specified parameters.
+func (k Keeper) IssueMacaroon(ctx sdk.Context, sharedMPCPubKey, location, id string, blockExpiry uint64) (*macaroon.Macaroon, error) {
+	// Derive the root key by hashing the shared MPC public key
+	rootKey := sha256.Sum256([]byte(sharedMPCPubKey))
+	// Create the macaroon
+	m, err := macaroon.New(rootKey[:], []byte(id), location, macaroon.LatestVersion)
+	if err != nil {
+		return nil, err
+	}
+
+	// Add the block expiry caveat
+	caveat := fmt.Sprintf("block-expiry=%d", blockExpiry)
+	err = m.AddFirstPartyCaveat([]byte(caveat))
+	if err != nil {
+		return nil, err
+	}
+
+	return m, nil
+}

x/did/keeper/macaroon.go

@@ -1,29 +0,0 @@
-package keeper
-
-import (
-	"crypto/sha256"
-	"fmt"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"gopkg.in/macaroon.v2"
-)
-
-// IssueMacaroon creates a macaroon with the specified parameters.
-func (k Keeper) IssueMacaroon(ctx sdk.Context, sharedMPCPubKey, location, id string, blockExpiry uint64) (*macaroon.Macaroon, error) {
-	// Derive the root key by hashing the shared MPC public key
-	rootKey := sha256.Sum256([]byte(sharedMPCPubKey))
-	// Create the macaroon
-	m, err := macaroon.New(rootKey[:], []byte(id), location, macaroon.LatestVersion)
-	if err != nil {
-		return nil, err
-	}
-
-	// Add the block expiry caveat
-	caveat := fmt.Sprintf("block-expiry=%d", blockExpiry)
-	err = m.AddFirstPartyCaveat([]byte(caveat))
-	if err != nil {
-		return nil, err
-	}
-
-	return m, nil
-}