From 9d5528887e3256e9533c948f9cb5875f6b601474 Mon Sep 17 00:00:00 2001
From: Srinivas Baride <srini@exidio.co>
Date: Mon, 13 Nov 2023 23:51:42 +0530
Subject: [PATCH 1/5] Fix deletion of subscription in node-based subscriptions

---
 app/ante/{ante.go => handler.go} |  0
 x/subscription/keeper/abci.go    | 29 ++++++++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)
 rename app/ante/{ante.go => handler.go} (100%)

diff --git a/app/ante/ante.go b/app/ante/handler.go
similarity index 100%
rename from app/ante/ante.go
rename to app/ante/handler.go
diff --git a/x/subscription/keeper/abci.go b/x/subscription/keeper/abci.go
index 2dd19830..487a4951 100644
--- a/x/subscription/keeper/abci.go
+++ b/x/subscription/keeper/abci.go
@@ -213,23 +213,34 @@ func (k *Keeper) EndBlock(ctx sdk.Context) []abcitypes.ValidatorUpdate {
 			}
 		}
 
-		// Iterate over all allocations associated with the subscription and delete them from the store.
-		k.IterateAllocationsForSubscription(ctx, item.GetID(), func(_ int, alloc types.Allocation) bool {
-			accAddr := alloc.GetAddress()
-			k.DeleteAllocation(ctx, item.GetID(), accAddr)
-			k.DeleteSubscriptionForAccount(ctx, accAddr, item.GetID())
-
-			return false
-		})
-
 		// Based on the subscription type, perform additional cleanup actions.
 		switch s := item.(type) {
 		case *types.NodeSubscription:
 			// For node-level subscriptions, delete the subscription from the NodeAddress index.
 			k.DeleteSubscriptionForNode(ctx, s.GetNodeAddress(), s.GetID())
+
+			// Delete the allocation associated with the node-level subscription.
+			accAddr := s.GetAddress()
+			k.DeleteAllocation(ctx, s.GetID(), accAddr)
+
+			// Delete the node-level subscription from the Account index.
+			k.DeleteSubscriptionForAccount(ctx, accAddr, s.GetID())
 		case *types.PlanSubscription:
 			// For plan-level subscriptions, delete the subscription from the PlanID index.
 			k.DeleteSubscriptionForPlan(ctx, s.PlanID, s.GetID())
+
+			// Iterate over all allocations associated with the plan-level subscription and delete them from the store.
+			k.IterateAllocationsForSubscription(ctx, s.GetID(), func(_ int, alloc types.Allocation) bool {
+				accAddr := alloc.GetAddress()
+
+				// Delete the allocation associated with the plan-level subscription.
+				k.DeleteAllocation(ctx, s.GetID(), accAddr)
+
+				// Delete the plan-level subscription from the Account index.
+				k.DeleteSubscriptionForAccount(ctx, accAddr, s.GetID())
+
+				return false
+			})
 		default:
 			// If the subscription type is not recognized, panic with an error indicating an invalid subscription type.
 			panic(fmt.Errorf("invalid subscription %d with type %T", item.GetID(), item))

From f04bbaca3307592a16ea5de9e3e1bbca50289e44 Mon Sep 17 00:00:00 2001
From: Srinivas Baride <srini@exidio.co>
Date: Mon, 13 Nov 2023 23:53:41 +0530
Subject: [PATCH 2/5] Revert the temporary fix of method
 QuerySubscriptionsForAccount

---
 x/subscription/keeper/query_server.go | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/x/subscription/keeper/query_server.go b/x/subscription/keeper/query_server.go
index 9642046e..c74d0047 100644
--- a/x/subscription/keeper/query_server.go
+++ b/x/subscription/keeper/query_server.go
@@ -96,23 +96,19 @@ func (q *queryServer) QuerySubscriptionsForAccount(c context.Context, req *types
 		store = prefix.NewStore(q.Store(ctx), types.GetSubscriptionForAccountKeyPrefix(addr))
 	)
 
-	pagination, err := query.FilteredPaginate(store, req.Pagination, func(key, _ []byte, accumulate bool) (bool, error) {
-		if !accumulate {
-			return false, nil
-		}
-
+	pagination, err := query.Paginate(store, req.Pagination, func(key, _ []byte) error {
 		v, found := q.GetSubscription(ctx, sdk.BigEndianToUint64(key))
 		if !found {
-			return false, nil
+			return fmt.Errorf("subscription for key %X does not exist", key)
 		}
 
 		item, err := codectypes.NewAnyWithValue(v)
 		if err != nil {
-			return false, err
+			return err
 		}
 
 		items = append(items, item)
-		return true, nil
+		return nil
 	})
 
 	if err != nil {

From b96dfa706b91f34e025492b37f4db1182f073c5f Mon Sep 17 00:00:00 2001
From: Srinivas Baride <srini@exidio.co>
Date: Tue, 14 Nov 2023 13:30:55 +0530
Subject: [PATCH 3/5] Added updation of the commission rate for validators

---
 app/upgrade.go | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/upgrade.go b/app/upgrade.go
index 4f4cee49..bb706fa6 100644
--- a/app/upgrade.go
+++ b/app/upgrade.go
@@ -102,6 +102,32 @@ func UpgradeHandler(
 			return nil, err
 		}
 
+		validators := keepers.StakingKeeper.GetAllValidators(ctx)
+		for _, validator := range validators {
+			if validator.Commission.Rate.GTE(stakingParams.MinCommissionRate) {
+				continue
+			}
+
+			validator.Commission.Rate = stakingParams.MinCommissionRate
+			validator.Commission.UpdateTime = ctx.BlockTime()
+			if validator.Commission.MaxRate.LT(validator.Commission.Rate) {
+				validator.Commission.MaxRate = validator.Commission.Rate
+			}
+
+			if err := keepers.StakingKeeper.Hooks().BeforeValidatorModified(ctx, validator.GetOperator()); err != nil {
+				return nil, err
+			}
+
+			keepers.StakingKeeper.SetValidator(ctx, validator)
+			ctx.EventManager().EmitEvents(sdk.Events{
+				sdk.NewEvent(
+					stakingtypes.EventTypeEditValidator,
+					sdk.NewAttribute(stakingtypes.AttributeKeyCommissionRate, validator.Commission.String()),
+					sdk.NewAttribute(stakingtypes.AttributeKeyMinSelfDelegation, validator.MinSelfDelegation.String()),
+				),
+			})
+		}
+
 		ibcClientParams := keepers.IBCKeeper.ClientKeeper.GetParams(ctx)
 		ibcClientParams.AllowedClients = append(ibcClientParams.AllowedClients, exported.Localhost)
 		keepers.IBCKeeper.ClientKeeper.SetParams(ctx, ibcClientParams)

From cbc586d666c4347f374d6b92e36fe6ac71fa846f Mon Sep 17 00:00:00 2001
From: Srinivas Baride <srini@exidio.co>
Date: Tue, 14 Nov 2023 13:36:29 +0530
Subject: [PATCH 4/5] Removed duplicate ibctm.AppModuleBasic

---
 app/module.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/module.go b/app/module.go
index 406c33af..778c6ac3 100644
--- a/app/module.go
+++ b/app/module.go
@@ -105,7 +105,6 @@ var (
 		// Cosmos IBC module basics
 		ibc.AppModuleBasic{},
 		ibcsolomachine.AppModuleBasic{},
-		ibctm.AppModuleBasic{},
 		ibcfee.AppModuleBasic{},
 		ibcica.AppModuleBasic{},
 		ibctm.AppModuleBasic{},

From 70a337077e77cb613fef7926909c329ea3c512ab Mon Sep 17 00:00:00 2001
From: Srinivas Baride <srini@exidio.co>
Date: Tue, 14 Nov 2023 14:28:42 +0530
Subject: [PATCH 5/5] Using cosmossdk.io/math package for Int and Dec in proto
 files

---
 proto/sentinel/mint/v1/inflation.proto        | 12 +--
 proto/sentinel/node/v2/params.proto           |  4 +-
 proto/sentinel/provider/v2/params.proto       |  4 +-
 .../sentinel/subscription/v2/allocation.proto |  4 +-
 proto/sentinel/subscription/v2/events.proto   |  4 +-
 proto/sentinel/subscription/v2/msg.proto      |  2 +-
 proto/sentinel/swap/v1/msg.proto              |  2 +-
 proto/sentinel/types/v1/bandwidth.proto       | 14 +--
 types/bandwidth.pb.go                         | 38 ++++----
 x/mint/types/inflation.pb.go                  | 60 ++++++------
 x/node/types/params.pb.go                     | 73 +++++++-------
 x/provider/types/params.pb.go                 | 46 ++++-----
 x/subscription/types/allocation.pb.go         | 46 ++++-----
 x/subscription/types/events.pb.go             | 96 +++++++++----------
 x/subscription/types/msg.pb.go                | 54 +++++------
 x/swap/types/msg.pb.go                        | 54 +++++------
 16 files changed, 259 insertions(+), 254 deletions(-)

diff --git a/proto/sentinel/mint/v1/inflation.proto b/proto/sentinel/mint/v1/inflation.proto
index e01ee4be..01ec58ba 100644
--- a/proto/sentinel/mint/v1/inflation.proto
+++ b/proto/sentinel/mint/v1/inflation.proto
@@ -11,34 +11,34 @@ option (gogoproto.goproto_getters_all) = false;
 // Inflation represents a message for handling inflation parameters.
 message Inflation {
   // Field 1: Maximum inflation rate.
-  // - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+  // - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
   //   Custom type definition for the field.
   // - (gogoproto.moretags) = "yaml:\"max\"": YAML tag for better representation.
   // - (gogoproto.nullable) = false: Field is not nullable.
   string max = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"max\"",
     (gogoproto.nullable) = false
   ];
 
   // Field 2: Minimum inflation rate.
-  // - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+  // - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
   //   Custom type definition for the field.
   // - (gogoproto.moretags) = "yaml:\"min\"": YAML tag for better representation.
   // - (gogoproto.nullable) = false: Field is not nullable.
   string min = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"min\"",
     (gogoproto.nullable) = false
   ];
 
   // Field 3: Rate of change of inflation.
-  // - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+  // - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
   //   Custom type definition for the field.
   // - (gogoproto.moretags) = "yaml:\"rate_change\"": YAML tag for better representation.
   // - (gogoproto.nullable) = false: Field is not nullable.
   string rate_change = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.moretags) = "yaml:\"rate_change\"",
     (gogoproto.nullable) = false
   ];
diff --git a/proto/sentinel/node/v2/params.proto b/proto/sentinel/node/v2/params.proto
index 8c590510..ef92a078 100644
--- a/proto/sentinel/node/v2/params.proto
+++ b/proto/sentinel/node/v2/params.proto
@@ -72,11 +72,11 @@ message Params {
   int64 min_subscription_hours = 10;
 
   // Field 11: Staking share required for a node.
-  // - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+  // - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
   //   Custom type definition for the field.
   // - (gogoproto.nullable) = false: Field is not nullable.
   string staking_share = 11 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/sentinel/provider/v2/params.proto b/proto/sentinel/provider/v2/params.proto
index 88dfd595..d9413794 100644
--- a/proto/sentinel/provider/v2/params.proto
+++ b/proto/sentinel/provider/v2/params.proto
@@ -15,11 +15,11 @@ message Params {
   cosmos.base.v1beta1.Coin deposit = 1 [(gogoproto.nullable) = false];
 
   // Field 2: Staking share associated with the providers.
-  // - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+  // - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
   //   Custom type definition for the field.
   // - (gogoproto.nullable) = false: Field is not nullable.
   string staking_share = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/sentinel/subscription/v2/allocation.proto b/proto/sentinel/subscription/v2/allocation.proto
index 9196fd25..75433b1a 100644
--- a/proto/sentinel/subscription/v2/allocation.proto
+++ b/proto/sentinel/subscription/v2/allocation.proto
@@ -17,13 +17,13 @@ message Allocation {
 
   // Field 3: Granted bytes.
   string granted_bytes = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 
   // Field 4: Utilized bytes.
   string utilised_bytes = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/sentinel/subscription/v2/events.proto b/proto/sentinel/subscription/v2/events.proto
index 0514d6a2..676a13ba 100644
--- a/proto/sentinel/subscription/v2/events.proto
+++ b/proto/sentinel/subscription/v2/events.proto
@@ -36,13 +36,13 @@ message EventAllocate {
 
   // Field 2: Granted bytes in the allocation.
   string granted_bytes = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 
   // Field 3: Utilized bytes in the allocation.
   string utilised_bytes = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 
diff --git a/proto/sentinel/subscription/v2/msg.proto b/proto/sentinel/subscription/v2/msg.proto
index 858820ed..3df0bf6d 100644
--- a/proto/sentinel/subscription/v2/msg.proto
+++ b/proto/sentinel/subscription/v2/msg.proto
@@ -29,7 +29,7 @@ message MsgAllocateRequest {
 
   // Field 4: Number of bytes to allocate.
   string bytes = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/sentinel/swap/v1/msg.proto b/proto/sentinel/swap/v1/msg.proto
index b32fddf2..5fa2382c 100644
--- a/proto/sentinel/swap/v1/msg.proto
+++ b/proto/sentinel/swap/v1/msg.proto
@@ -14,7 +14,7 @@ message MsgSwapRequest {
   bytes tx_hash = 2;
   string receiver = 3;
   string amount = 4 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/proto/sentinel/types/v1/bandwidth.proto b/proto/sentinel/types/v1/bandwidth.proto
index f43f2ffa..5dc5f1e2 100644
--- a/proto/sentinel/types/v1/bandwidth.proto
+++ b/proto/sentinel/types/v1/bandwidth.proto
@@ -9,17 +9,19 @@ option (gogoproto.goproto_getters_all) = false;
 
 // Bandwidth represents information about upload and download bandwidth.
 message Bandwidth {
-  // Field 1: Upload bandwidth, represented as a Cosmos SDK Int type.
-  // This field is not nullable.
+  // Upload bandwidth value represented as a string.
+  // It uses a custom type "cosmossdk.io/math.Int".
+  // The value is not nullable, as indicated by "(gogoproto.nullable) = false".
   string upload = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 
-  // Field 2: Download bandwidth, represented as a Cosmos SDK Int type.
-  // This field is not nullable.
+  // Download bandwidth value represented as a string.
+  // It uses a custom type "cosmossdk.io/math.Int".
+  // The value is not nullable, as indicated by "(gogoproto.nullable) = false".
   string download = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
     (gogoproto.nullable) = false
   ];
 }
diff --git a/types/bandwidth.pb.go b/types/bandwidth.pb.go
index dd71e5de..1748e56d 100644
--- a/types/bandwidth.pb.go
+++ b/types/bandwidth.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
@@ -26,12 +26,14 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 // Bandwidth represents information about upload and download bandwidth.
 type Bandwidth struct {
-	// Field 1: Upload bandwidth, represented as a Cosmos SDK Int type.
-	// This field is not nullable.
-	Upload github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=upload,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"upload"`
-	// Field 2: Download bandwidth, represented as a Cosmos SDK Int type.
-	// This field is not nullable.
-	Download github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=download,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"download"`
+	// Upload bandwidth value represented as a string.
+	// It uses a custom type "cosmossdk.io/math.Int".
+	// The value is not nullable, as indicated by "(gogoproto.nullable) = false".
+	Upload cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=upload,proto3,customtype=cosmossdk.io/math.Int" json:"upload"`
+	// Download bandwidth value represented as a string.
+	// It uses a custom type "cosmossdk.io/math.Int".
+	// The value is not nullable, as indicated by "(gogoproto.nullable) = false".
+	Download cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=download,proto3,customtype=cosmossdk.io/math.Int" json:"download"`
 }
 
 func (m *Bandwidth) Reset()         { *m = Bandwidth{} }
@@ -79,17 +81,17 @@ var fileDescriptor_ed82d6e988b8939b = []byte{
 	0xc9, 0xcc, 0x4b, 0xcd, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2f, 0x33, 0xd4, 0x4f, 0x4a,
 	0xcc, 0x4b, 0x29, 0xcf, 0x4c, 0x29, 0xc9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x84,
 	0x29, 0xd1, 0x03, 0x2b, 0xd1, 0x2b, 0x33, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xea,
-	0x83, 0x58, 0x10, 0x85, 0x4a, 0xf3, 0x19, 0xb9, 0x38, 0x9d, 0x60, 0x9a, 0x85, 0xdc, 0xb8, 0xd8,
-	0x4a, 0x0b, 0x72, 0xf2, 0x13, 0x53, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0xf4, 0x4e, 0xdc,
-	0x93, 0x67, 0xb8, 0x75, 0x4f, 0x5e, 0x2d, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f,
-	0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0x43, 0x5c, 0xa1,
-	0xe7, 0x99, 0x57, 0x12, 0x04, 0xd5, 0x2d, 0xe4, 0xc5, 0xc5, 0x91, 0x92, 0x5f, 0x9e, 0x07, 0x36,
-	0x89, 0x89, 0x2c, 0x93, 0xe0, 0xfa, 0x9d, 0xbc, 0x4f, 0x3c, 0x94, 0x63, 0x58, 0xf1, 0x48, 0x8e,
-	0xe1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58,
-	0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x34, 0x91, 0xcc, 0x84, 0xf9,
-	0x5b, 0x37, 0x3f, 0x2d, 0x2d, 0x33, 0x39, 0x33, 0x31, 0x47, 0x3f, 0xa3, 0x34, 0x09, 0x14, 0x42,
-	0x60, 0xa3, 0x93, 0xd8, 0xc0, 0xbe, 0x36, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x65, 0x91, 0xb5,
-	0x8e, 0x43, 0x01, 0x00, 0x00,
+	0x83, 0x58, 0x10, 0x85, 0x4a, 0xb5, 0x5c, 0x9c, 0x4e, 0x30, 0xbd, 0x42, 0xa6, 0x5c, 0x6c, 0xa5,
+	0x05, 0x39, 0xf9, 0x89, 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x4e, 0xb2, 0x27, 0xee, 0xc9,
+	0x33, 0xdc, 0xba, 0x27, 0x2f, 0x9a, 0x9c, 0x5f, 0x9c, 0x9b, 0x5f, 0x5c, 0x9c, 0x92, 0xad, 0x97,
+	0x99, 0xaf, 0x9f, 0x9b, 0x58, 0x92, 0xa1, 0xe7, 0x99, 0x57, 0x12, 0x04, 0x55, 0x2c, 0x64, 0xc9,
+	0xc5, 0x91, 0x92, 0x5f, 0x9e, 0x07, 0xd6, 0xc8, 0x44, 0x8c, 0x46, 0xb8, 0x72, 0x27, 0xef, 0x13,
+	0x0f, 0xe5, 0x18, 0x56, 0x3c, 0x92, 0x63, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6,
+	0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39,
+	0x86, 0x28, 0xcd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x98, 0xa7,
+	0x74, 0xf3, 0xd3, 0xd2, 0x32, 0x93, 0x33, 0x13, 0x73, 0xf4, 0x33, 0x4a, 0x93, 0x40, 0xde, 0x07,
+	0x7b, 0x32, 0x89, 0x0d, 0xec, 0x25, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xe9, 0xa8,
+	0xd5, 0x20, 0x01, 0x00, 0x00,
 }
 
 func (m *Bandwidth) Marshal() (dAtA []byte, err error) {
diff --git a/x/mint/types/inflation.pb.go b/x/mint/types/inflation.pb.go
index 2c15fc05..766a4c88 100644
--- a/x/mint/types/inflation.pb.go
+++ b/x/mint/types/inflation.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types"
@@ -31,23 +31,23 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // Inflation represents a message for handling inflation parameters.
 type Inflation struct {
 	// Field 1: Maximum inflation rate.
-	// - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+	// - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
 	//   Custom type definition for the field.
 	// - (gogoproto.moretags) = "yaml:\"max\"": YAML tag for better representation.
 	// - (gogoproto.nullable) = false: Field is not nullable.
-	Max github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=max,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max" yaml:"max"`
+	Max cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=max,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"max" yaml:"max"`
 	// Field 2: Minimum inflation rate.
-	// - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+	// - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
 	//   Custom type definition for the field.
 	// - (gogoproto.moretags) = "yaml:\"min\"": YAML tag for better representation.
 	// - (gogoproto.nullable) = false: Field is not nullable.
-	Min github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=min,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min" yaml:"min"`
+	Min cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=min,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"min" yaml:"min"`
 	// Field 3: Rate of change of inflation.
-	// - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+	// - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
 	//   Custom type definition for the field.
 	// - (gogoproto.moretags) = "yaml:\"rate_change\"": YAML tag for better representation.
 	// - (gogoproto.nullable) = false: Field is not nullable.
-	RateChange github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=rate_change,json=rateChange,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"rate_change" yaml:"rate_change"`
+	RateChange cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=rate_change,json=rateChange,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"rate_change" yaml:"rate_change"`
 	// Field 4: Timestamp indicating when the inflation parameters were set.
 	// - (gogoproto.moretags) = "yaml:\"timestamp\"": YAML tag for better representation.
 	// - (gogoproto.nullable) = false: Field is not nullable.
@@ -95,29 +95,29 @@ func init() {
 func init() { proto.RegisterFile("sentinel/mint/v1/inflation.proto", fileDescriptor_00e0e2355d878ebb) }
 
 var fileDescriptor_00e0e2355d878ebb = []byte{
-	// 349 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xb1, 0x6e, 0xea, 0x30,
-	0x14, 0x86, 0x63, 0xb8, 0xba, 0x12, 0x66, 0x41, 0xd1, 0x1d, 0x22, 0x74, 0xe5, 0xa0, 0x0c, 0x57,
-	0x2c, 0xd8, 0x97, 0x76, 0xab, 0x3a, 0x51, 0x96, 0x2e, 0x1d, 0xa2, 0xaa, 0x43, 0x97, 0xca, 0x49,
-	0x9d, 0x60, 0x35, 0xb6, 0x11, 0x31, 0x08, 0xde, 0x82, 0xc7, 0xe8, 0xa3, 0x30, 0x32, 0x56, 0x1d,
-	0xd2, 0x36, 0x6c, 0x1d, 0x79, 0x82, 0xca, 0x4e, 0x43, 0x59, 0xab, 0x4e, 0xf6, 0x2f, 0xff, 0xfe,
-	0x74, 0xce, 0x7f, 0x0e, 0xec, 0xe5, 0x4c, 0x6a, 0x2e, 0x59, 0x46, 0x04, 0x97, 0x9a, 0x2c, 0x86,
-	0x84, 0xcb, 0x24, 0xa3, 0x9a, 0x2b, 0x89, 0xa7, 0x33, 0xa5, 0x95, 0xdb, 0xa9, 0x1d, 0xd8, 0x38,
-	0xf0, 0x62, 0xd8, 0xfd, 0x93, 0xaa, 0x54, 0xd9, 0x47, 0x62, 0x6e, 0x95, 0xaf, 0xeb, 0xa7, 0x4a,
-	0xa5, 0x19, 0x23, 0x56, 0x45, 0xf3, 0x84, 0x68, 0x2e, 0x58, 0xae, 0xa9, 0x98, 0x56, 0x86, 0xe0,
-	0xbd, 0x01, 0x5b, 0x97, 0x35, 0xdc, 0xbd, 0x82, 0x4d, 0x41, 0x97, 0x1e, 0xe8, 0x81, 0x7e, 0x6b,
-	0x74, 0xbe, 0x29, 0x7c, 0xe7, 0xb9, 0xf0, 0xff, 0xa5, 0x5c, 0x4f, 0xe6, 0x11, 0x8e, 0x95, 0x20,
-	0xb1, 0xca, 0x85, 0xca, 0x3f, 0x8f, 0x41, 0x7e, 0xff, 0x40, 0xf4, 0x6a, 0xca, 0x72, 0x3c, 0x66,
-	0xf1, 0xbe, 0xf0, 0xe1, 0x8a, 0x8a, 0xec, 0x2c, 0x10, 0x74, 0x19, 0x84, 0x06, 0x64, 0x79, 0x5c,
-	0x7a, 0x8d, 0x1f, 0xf2, 0xb8, 0x34, 0x3c, 0x2e, 0x5d, 0x06, 0xdb, 0x33, 0xaa, 0xd9, 0x5d, 0x3c,
-	0xa1, 0x32, 0x65, 0x5e, 0xd3, 0x72, 0xc7, 0xdf, 0xe6, 0xba, 0x15, 0xf7, 0x08, 0x15, 0x84, 0xd0,
-	0xa8, 0x0b, 0x2b, 0xdc, 0x1b, 0xd8, 0x3a, 0xe4, 0xe4, 0xfd, 0xea, 0x81, 0x7e, 0xfb, 0xa4, 0x8b,
-	0xab, 0x24, 0x71, 0x9d, 0x24, 0xbe, 0xae, 0x1d, 0xa3, 0xbf, 0xa6, 0x80, 0x7d, 0xe1, 0x77, 0x2a,
-	0xec, 0xe1, 0x6b, 0xb0, 0x7e, 0xf1, 0x41, 0xf8, 0x85, 0x1a, 0x85, 0x9b, 0x37, 0xe4, 0x3c, 0x96,
-	0xc8, 0xd9, 0x94, 0x08, 0x6c, 0x4b, 0x04, 0x5e, 0x4b, 0x04, 0xd6, 0x3b, 0xe4, 0x6c, 0x77, 0xc8,
-	0x79, 0xda, 0x21, 0xe7, 0xf6, 0xff, 0x51, 0x0f, 0xf5, 0x88, 0x07, 0x2a, 0x49, 0x78, 0xcc, 0x69,
-	0x46, 0x26, 0xf3, 0xc8, 0x2c, 0xc3, 0xb2, 0x5a, 0x0b, 0xdb, 0x51, 0xf4, 0xdb, 0x16, 0x74, 0xfa,
-	0x11, 0x00, 0x00, 0xff, 0xff, 0x42, 0x52, 0xc3, 0x05, 0x34, 0x02, 0x00, 0x00,
+	// 348 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0xb1, 0x4e, 0xe3, 0x30,
+	0x00, 0x86, 0xe3, 0xf6, 0x74, 0x52, 0xdd, 0xa5, 0x8a, 0x6e, 0x88, 0x7a, 0x27, 0xa7, 0xca, 0xd4,
+	0xe5, 0x6c, 0x0a, 0x13, 0x8c, 0x2d, 0x0b, 0x12, 0x53, 0x84, 0x18, 0xba, 0x20, 0x27, 0x38, 0x8e,
+	0x45, 0x6c, 0x57, 0x8d, 0x5b, 0xb5, 0x6f, 0xd1, 0xc7, 0xe0, 0x51, 0xca, 0xd6, 0x11, 0x31, 0x04,
+	0x48, 0xdf, 0xa0, 0x4f, 0x80, 0x9c, 0x28, 0x85, 0x11, 0xb1, 0xf9, 0x97, 0xff, 0xff, 0xb3, 0xf5,
+	0xff, 0x70, 0x90, 0x33, 0x65, 0x84, 0x62, 0x19, 0x91, 0x42, 0x19, 0xb2, 0x1c, 0x11, 0xa1, 0x92,
+	0x8c, 0x1a, 0xa1, 0x15, 0x9e, 0xcd, 0xb5, 0xd1, 0x6e, 0xaf, 0x71, 0x60, 0xeb, 0xc0, 0xcb, 0x51,
+	0xff, 0x0f, 0xd7, 0x5c, 0x57, 0x97, 0xc4, 0x9e, 0x6a, 0x5f, 0xdf, 0xe7, 0x5a, 0xf3, 0x8c, 0x91,
+	0x4a, 0x45, 0x8b, 0x84, 0x18, 0x21, 0x59, 0x6e, 0xa8, 0x9c, 0xd5, 0x86, 0xe0, 0xa9, 0x05, 0x3b,
+	0x57, 0x0d, 0xdc, 0x9d, 0xc0, 0xb6, 0xa4, 0x2b, 0x0f, 0x0c, 0xc0, 0xb0, 0x33, 0x1e, 0x6d, 0x0b,
+	0xdf, 0x79, 0x29, 0xfc, 0xbf, 0xb1, 0xce, 0xa5, 0xce, 0xf3, 0xfb, 0x07, 0x2c, 0x34, 0x91, 0xd4,
+	0xa4, 0xf8, 0x9a, 0x71, 0x1a, 0xaf, 0x2f, 0x59, 0x7c, 0x28, 0x7c, 0xb8, 0xa6, 0x32, 0xbb, 0x08,
+	0x24, 0x5d, 0x05, 0xa1, 0x4d, 0x57, 0x10, 0xa1, 0xbc, 0xd6, 0x4f, 0x20, 0x42, 0x59, 0x88, 0x50,
+	0xee, 0x14, 0x76, 0xe7, 0xd4, 0xb0, 0xbb, 0x38, 0xa5, 0x8a, 0x33, 0xaf, 0x5d, 0xc1, 0xce, 0xbf,
+	0x07, 0x73, 0x6b, 0xd8, 0x97, 0x7c, 0x10, 0x42, 0xab, 0x26, 0x95, 0x70, 0x6f, 0x61, 0xe7, 0x58,
+	0x83, 0xf7, 0x6b, 0x00, 0x86, 0xdd, 0xd3, 0x3e, 0xae, 0x8b, 0xc2, 0x4d, 0x51, 0xf8, 0xa6, 0x71,
+	0x8c, 0xff, 0xd9, 0x57, 0x0f, 0x85, 0xdf, 0xab, 0xb1, 0xc7, 0x68, 0xb0, 0x79, 0xf5, 0x41, 0xf8,
+	0x89, 0x1a, 0x87, 0xdb, 0x77, 0xe4, 0x3c, 0x96, 0xc8, 0xd9, 0x96, 0x08, 0xec, 0x4a, 0x04, 0xde,
+	0x4a, 0x04, 0x36, 0x7b, 0xe4, 0xec, 0xf6, 0xc8, 0x79, 0xde, 0x23, 0x67, 0x7a, 0xc2, 0x85, 0x49,
+	0x17, 0x11, 0x8e, 0xb5, 0x24, 0xcd, 0x82, 0xff, 0x75, 0x92, 0x88, 0x58, 0xd0, 0x8c, 0xa4, 0x8b,
+	0xc8, 0x6e, 0xbd, 0xaa, 0x57, 0x37, 0xeb, 0x19, 0xcb, 0xa3, 0xdf, 0xd5, 0x87, 0xce, 0x3e, 0x02,
+	0x00, 0x00, 0xff, 0xff, 0xe7, 0x19, 0x4f, 0x2c, 0x13, 0x02, 0x00, 0x00,
 }
 
 func (m *Inflation) Marshal() (dAtA []byte, err error) {
diff --git a/x/node/types/params.pb.go b/x/node/types/params.pb.go
index 5e5920e5..cc6b688b 100644
--- a/x/node/types/params.pb.go
+++ b/x/node/types/params.pb.go
@@ -4,6 +4,7 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
@@ -67,10 +68,10 @@ type Params struct {
 	// Field 10: Minimum hours required for a subscription.
 	MinSubscriptionHours int64 `protobuf:"varint,10,opt,name=min_subscription_hours,json=minSubscriptionHours,proto3" json:"min_subscription_hours,omitempty"`
 	// Field 11: Staking share required for a node.
-	// - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+	// - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
 	//   Custom type definition for the field.
 	// - (gogoproto.nullable) = false: Field is not nullable.
-	StakingShare github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,11,opt,name=staking_share,json=stakingShare,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"staking_share"`
+	StakingShare cosmossdk_io_math.LegacyDec `protobuf:"bytes,11,opt,name=staking_share,json=stakingShare,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"staking_share"`
 }
 
 func (m *Params) Reset()         { *m = Params{} }
@@ -113,40 +114,40 @@ func init() {
 func init() { proto.RegisterFile("sentinel/node/v2/params.proto", fileDescriptor_02f1279255e9f358) }
 
 var fileDescriptor_02f1279255e9f358 = []byte{
-	// 514 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xd3, 0x30,
-	0x00, 0xc6, 0x13, 0x36, 0xda, 0xcd, 0x03, 0x06, 0x65, 0x42, 0xa1, 0x12, 0x6e, 0xc5, 0x01, 0xf5,
-	0x32, 0x7b, 0x2d, 0x5c, 0x90, 0x38, 0x95, 0x49, 0x70, 0xe0, 0x30, 0xa5, 0x37, 0x2e, 0x95, 0x93,
-	0xba, 0xa9, 0xb5, 0xc6, 0x8e, 0x62, 0xa7, 0xa4, 0xe2, 0x25, 0x38, 0xf2, 0x08, 0x88, 0x47, 0xe0,
-	0x09, 0x7a, 0xdc, 0x11, 0x71, 0xd8, 0xa0, 0x7d, 0x11, 0xe4, 0x3f, 0x41, 0x5d, 0x07, 0x88, 0x03,
-	0x3b, 0xc5, 0x89, 0xfd, 0xfb, 0x7e, 0xce, 0x17, 0xc5, 0xe0, 0x91, 0xa4, 0x5c, 0x31, 0x4e, 0xa7,
-	0x98, 0x8b, 0x11, 0xc5, 0xb3, 0x1e, 0xce, 0x48, 0x4e, 0x52, 0x89, 0xb2, 0x5c, 0x28, 0xd1, 0xb8,
-	0x5b, 0x4d, 0x23, 0x3d, 0x8d, 0x66, 0xbd, 0x26, 0x8c, 0x85, 0x4c, 0x85, 0xc4, 0x11, 0x91, 0x14,
-	0xcf, 0xba, 0x11, 0x55, 0xa4, 0x8b, 0x63, 0xc1, 0xb8, 0x25, 0x9a, 0x07, 0x89, 0x48, 0x84, 0x19,
-	0x62, 0x3d, 0x72, 0x4f, 0x61, 0x22, 0x44, 0x32, 0xa5, 0xd8, 0xdc, 0x45, 0xc5, 0x18, 0x8f, 0x8a,
-	0x9c, 0x28, 0x26, 0x1c, 0xf5, 0xf8, 0x4b, 0x1d, 0xd4, 0x4e, 0x8c, 0xb8, 0xf1, 0x1c, 0xd4, 0x47,
-	0x34, 0x13, 0x92, 0xa9, 0xc0, 0x6f, 0xfb, 0x9d, 0xbd, 0xde, 0x43, 0x64, 0x95, 0x48, 0x2b, 0x91,
-	0x53, 0xa2, 0x97, 0x82, 0xf1, 0xfe, 0xf6, 0xe2, 0xbc, 0xe5, 0x85, 0xd5, 0xfa, 0xc6, 0x1b, 0xb0,
-	0x4f, 0x62, 0xc5, 0x66, 0x74, 0x58, 0xc5, 0x07, 0x37, 0x5c, 0x84, 0xf5, 0xa3, 0xca, 0x8f, 0x8e,
-	0xdd, 0x82, 0xfe, 0x8e, 0x8e, 0xf8, 0x78, 0xd1, 0xf2, 0xc3, 0x3b, 0x96, 0xad, 0x66, 0x1a, 0xef,
-	0xc1, 0xfd, 0x94, 0x94, 0xc3, 0x84, 0x25, 0x24, 0x9a, 0x2b, 0x3a, 0xcc, 0x72, 0x16, 0x53, 0x19,
-	0x6c, 0xb5, 0xb7, 0xfe, 0xbe, 0xa9, 0x23, 0x9d, 0xf8, 0xf9, 0xa2, 0xd5, 0x49, 0x98, 0x9a, 0x14,
-	0x11, 0x8a, 0x45, 0x8a, 0x5d, 0x69, 0xf6, 0x72, 0x28, 0x47, 0xa7, 0x58, 0xcd, 0x33, 0x2a, 0x0d,
-	0x20, 0xc3, 0x7b, 0x29, 0x29, 0x5f, 0x39, 0xcd, 0x89, 0xb1, 0x18, 0x39, 0xe3, 0x57, 0xe4, 0xdb,
-	0xd7, 0x21, 0x67, 0x7c, 0x43, 0xfe, 0x0e, 0xe8, 0x1d, 0x0d, 0x27, 0xa2, 0xc8, 0xa7, 0xf3, 0x4a,
-	0x7d, 0xf3, 0xff, 0xab, 0xf7, 0x53, 0x52, 0xbe, 0x36, 0x92, 0x35, 0x31, 0xe3, 0x1b, 0xe2, 0xda,
-	0x75, 0x88, 0x19, 0xbf, 0x24, 0x7e, 0x01, 0x9a, 0xfa, 0x8d, 0x65, 0x11, 0xc9, 0x38, 0x67, 0x99,
-	0xfe, 0xfe, 0xbf, 0xba, 0x97, 0x41, 0xbd, 0xed, 0x77, 0xb6, 0xc2, 0x20, 0x25, 0xe5, 0x60, 0x6d,
-	0x41, 0x55, 0x9a, 0xa5, 0x19, 0xff, 0x13, 0xbd, 0xe3, 0x68, 0xc6, 0x7f, 0x4f, 0x3f, 0x03, 0x0f,
-	0xae, 0xb8, 0x75, 0x03, 0x32, 0xd8, 0x35, 0xe4, 0xc1, 0x86, 0x57, 0x6f, 0xdc, 0x52, 0x9b, 0x4e,
-	0x4b, 0x01, 0x47, 0x5d, 0xf6, 0x59, 0x6a, 0x00, 0x6e, 0x4b, 0x45, 0x4e, 0x19, 0x4f, 0x86, 0x72,
-	0x42, 0x72, 0x1a, 0xec, 0xb5, 0xfd, 0xce, 0x6e, 0x1f, 0xe9, 0x06, 0xbf, 0x9d, 0xb7, 0x9e, 0xfc,
-	0x43, 0x83, 0xc7, 0x34, 0x0e, 0x6f, 0xb9, 0x90, 0x81, 0xce, 0xe8, 0x87, 0x8b, 0x1f, 0xd0, 0xfb,
-	0xb4, 0x84, 0xde, 0x62, 0x09, 0xfd, 0xb3, 0x25, 0xf4, 0xbf, 0x2f, 0xa1, 0xff, 0x61, 0x05, 0xbd,
-	0xb3, 0x15, 0xf4, 0xbe, 0xae, 0xa0, 0xf7, 0xf6, 0x68, 0x2d, 0xb7, 0x3a, 0x51, 0x0e, 0xc5, 0x78,
-	0xcc, 0x62, 0x46, 0xa6, 0x78, 0x52, 0x44, 0x78, 0xd6, 0xc5, 0xa5, 0x3d, 0x82, 0x8c, 0x25, 0xaa,
-	0x99, 0x3f, 0xf5, 0xe9, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xbd, 0xec, 0x1a, 0xa0, 0x04,
-	0x00, 0x00,
+	// 527 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x3f, 0x6f, 0xd3, 0x40,
+	0x18, 0x87, 0x6d, 0x52, 0x92, 0xd6, 0x05, 0x0a, 0xa1, 0x42, 0x26, 0x08, 0x27, 0x82, 0x25, 0x4b,
+	0xef, 0x9a, 0xc0, 0x82, 0xc4, 0x14, 0x2a, 0xd1, 0xa1, 0x43, 0xe5, 0x6e, 0x2c, 0xd1, 0xd9, 0xb9,
+	0x38, 0xaf, 0x12, 0xdf, 0x59, 0xbe, 0x73, 0x48, 0xc4, 0x97, 0x60, 0xe4, 0x23, 0x20, 0x16, 0xbe,
+	0x46, 0xc6, 0x8e, 0x88, 0xa1, 0x85, 0xe4, 0x8b, 0xa0, 0xfb, 0x63, 0x94, 0xa6, 0xc0, 0x44, 0xa7,
+	0x5c, 0x7c, 0xf7, 0xbc, 0xcf, 0xeb, 0xdf, 0x2b, 0x9f, 0xf7, 0x54, 0x50, 0x26, 0x81, 0xd1, 0x09,
+	0x66, 0x7c, 0x40, 0xf1, 0xb4, 0x8b, 0x33, 0x92, 0x93, 0x54, 0xa0, 0x2c, 0xe7, 0x92, 0xd7, 0xef,
+	0x97, 0xdb, 0x48, 0x6d, 0xa3, 0x69, 0xb7, 0x11, 0xc4, 0x5c, 0xa4, 0x5c, 0xe0, 0x88, 0x08, 0x8a,
+	0xa7, 0x9d, 0x88, 0x4a, 0xd2, 0xc1, 0x31, 0x07, 0x66, 0x88, 0xc6, 0x7e, 0xc2, 0x13, 0xae, 0x97,
+	0x58, 0xad, 0xec, 0xd3, 0x20, 0xe1, 0x3c, 0x99, 0x50, 0xac, 0xff, 0x45, 0xc5, 0x10, 0x0f, 0x8a,
+	0x9c, 0x48, 0xe0, 0x96, 0x7a, 0xf6, 0xb5, 0xe6, 0x55, 0x4f, 0xb5, 0xb8, 0xfe, 0xca, 0xab, 0x0d,
+	0x68, 0xc6, 0x05, 0x48, 0xdf, 0x6d, 0xb9, 0xed, 0xdd, 0xee, 0x63, 0x64, 0x94, 0x48, 0x29, 0x91,
+	0x55, 0xa2, 0x37, 0x1c, 0x58, 0x6f, 0x6b, 0x71, 0xd1, 0x74, 0xc2, 0xf2, 0x7c, 0xfd, 0xc4, 0xdb,
+	0x23, 0xb1, 0x84, 0x29, 0xed, 0x97, 0xe5, 0xfd, 0x5b, 0xb6, 0x84, 0xf1, 0xa3, 0xd2, 0x8f, 0x8e,
+	0xec, 0x81, 0xde, 0xb6, 0x2a, 0xf1, 0xe9, 0xb2, 0xe9, 0x86, 0xf7, 0x0c, 0x5b, 0xee, 0xd4, 0x3f,
+	0x78, 0x0f, 0x53, 0x32, 0xeb, 0x27, 0x90, 0x90, 0x68, 0x2e, 0x69, 0x3f, 0xcb, 0x21, 0xa6, 0xc2,
+	0xaf, 0xb4, 0x2a, 0xff, 0x6e, 0xea, 0x50, 0x55, 0xfc, 0x72, 0xd9, 0x6c, 0x27, 0x20, 0x47, 0x45,
+	0x84, 0x62, 0x9e, 0x62, 0x1b, 0x9a, 0xf9, 0x39, 0x10, 0x83, 0x31, 0x96, 0xf3, 0x8c, 0x0a, 0x0d,
+	0x88, 0xf0, 0x41, 0x4a, 0x66, 0x6f, 0xad, 0xe6, 0x54, 0x5b, 0xb4, 0x1c, 0xd8, 0x35, 0xf9, 0xd6,
+	0x4d, 0xc8, 0x81, 0x6d, 0xc8, 0xdf, 0x7b, 0xaa, 0xa3, 0xfe, 0x88, 0x17, 0xf9, 0x64, 0x5e, 0xaa,
+	0x6f, 0xff, 0x7f, 0xf5, 0x5e, 0x4a, 0x66, 0xc7, 0x5a, 0xb2, 0x26, 0x06, 0xb6, 0x21, 0xae, 0xde,
+	0x84, 0x18, 0xd8, 0x15, 0xf1, 0x6b, 0xaf, 0xa1, 0xde, 0x58, 0x14, 0x91, 0x88, 0x73, 0xc8, 0xd4,
+	0xfc, 0x7f, 0x67, 0x2f, 0xfc, 0x5a, 0xcb, 0x6d, 0x57, 0x42, 0x3f, 0x25, 0xb3, 0xb3, 0xb5, 0x03,
+	0x65, 0x68, 0x86, 0x06, 0xf6, 0x37, 0x7a, 0xdb, 0xd2, 0xc0, 0xfe, 0x4c, 0xbf, 0xf4, 0x1e, 0x5d,
+	0x73, 0xab, 0x04, 0x84, 0xbf, 0xa3, 0xc9, 0xfd, 0x0d, 0xaf, 0x6a, 0xdc, 0x50, 0x9b, 0x4e, 0x43,
+	0x79, 0x96, 0xba, 0xea, 0x33, 0xd4, 0xb1, 0x77, 0x57, 0x48, 0x32, 0x06, 0x96, 0xf4, 0xc5, 0x88,
+	0xe4, 0xd4, 0xdf, 0x6d, 0xb9, 0xed, 0x9d, 0xde, 0x73, 0x95, 0xe0, 0xf7, 0x8b, 0xe6, 0x13, 0x93,
+	0x97, 0x18, 0x8c, 0x11, 0x70, 0x9c, 0x12, 0x39, 0x42, 0x27, 0x34, 0x21, 0xf1, 0xfc, 0x88, 0xc6,
+	0xe1, 0x1d, 0x4b, 0x9e, 0x29, 0xb0, 0x17, 0x2e, 0x7e, 0x06, 0xce, 0xe7, 0x65, 0xe0, 0x2c, 0x96,
+	0x81, 0x7b, 0xbe, 0x0c, 0xdc, 0x1f, 0xcb, 0xc0, 0xfd, 0xb8, 0x0a, 0x9c, 0xf3, 0x55, 0xe0, 0x7c,
+	0x5b, 0x05, 0xce, 0xbb, 0xc3, 0xb5, 0x71, 0x94, 0xd7, 0xc8, 0x01, 0x1f, 0x0e, 0x21, 0x06, 0x32,
+	0xc1, 0xa3, 0x22, 0xc2, 0xd3, 0x0e, 0x9e, 0x99, 0x7b, 0x47, 0x0f, 0x27, 0xaa, 0xea, 0xcf, 0xf3,
+	0xc5, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4d, 0xf6, 0x78, 0xa8, 0x95, 0x04, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/provider/types/params.pb.go b/x/provider/types/params.pb.go
index 3a153cc5..57d8c2c6 100644
--- a/x/provider/types/params.pb.go
+++ b/x/provider/types/params.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
@@ -31,10 +31,10 @@ type Params struct {
 	// - (gogoproto.nullable) = false: Field is not nullable.
 	Deposit types.Coin `protobuf:"bytes,1,opt,name=deposit,proto3" json:"deposit"`
 	// Field 2: Staking share associated with the providers.
-	// - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec":
+	// - (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec":
 	//   Custom type definition for the field.
 	// - (gogoproto.nullable) = false: Field is not nullable.
-	StakingShare github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=staking_share,json=stakingShare,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"staking_share"`
+	StakingShare cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=staking_share,json=stakingShare,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"staking_share"`
 }
 
 func (m *Params) Reset()         { *m = Params{} }
@@ -77,26 +77,26 @@ func init() {
 func init() { proto.RegisterFile("sentinel/provider/v2/params.proto", fileDescriptor_1837edabb8dc987e) }
 
 var fileDescriptor_1837edabb8dc987e = []byte{
-	// 293 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0x3f, 0x4e, 0xc3, 0x30,
-	0x14, 0xc6, 0x6d, 0x84, 0x8a, 0x08, 0xb0, 0x54, 0x1d, 0x4a, 0x07, 0xb7, 0x30, 0xa0, 0x2e, 0xf5,
-	0x53, 0x03, 0x0b, 0x6b, 0xe0, 0x00, 0xa8, 0x95, 0x18, 0x58, 0x90, 0x93, 0xb8, 0x89, 0xd5, 0x26,
-	0x2f, 0x8a, 0xdd, 0x08, 0x6e, 0xc1, 0xc8, 0x11, 0x38, 0x4a, 0xc6, 0x8e, 0x88, 0xa1, 0x82, 0xe4,
-	0x22, 0x28, 0xff, 0x04, 0x93, 0x3f, 0x59, 0x3f, 0xff, 0xfc, 0xde, 0x67, 0x5d, 0x68, 0x19, 0x1b,
-	0x15, 0xcb, 0x0d, 0x24, 0x29, 0x66, 0xca, 0x97, 0x29, 0x64, 0x36, 0x24, 0x22, 0x15, 0x91, 0xe6,
-	0x49, 0x8a, 0x06, 0xfb, 0x83, 0x0e, 0xe1, 0x1d, 0xc2, 0x33, 0x7b, 0xc4, 0x3c, 0xd4, 0x11, 0x6a,
-	0x70, 0x85, 0x96, 0x90, 0xcd, 0x5d, 0x69, 0xc4, 0x1c, 0x3c, 0x54, 0x71, 0xf3, 0x6a, 0x34, 0x08,
-	0x30, 0xc0, 0x3a, 0x42, 0x95, 0x9a, 0xdb, 0xcb, 0x77, 0x6a, 0xf5, 0x1e, 0x6a, 0x79, 0xff, 0xd6,
-	0x3a, 0xf2, 0x65, 0x82, 0x5a, 0x99, 0x21, 0x9d, 0xd0, 0xe9, 0x89, 0x7d, 0xce, 0x1b, 0x25, 0xaf,
-	0x94, 0xbc, 0x55, 0xf2, 0x3b, 0x54, 0xb1, 0x73, 0x98, 0xef, 0xc7, 0x64, 0xd1, 0xf1, 0xfd, 0xa5,
-	0x75, 0xa6, 0x8d, 0x58, 0xab, 0x38, 0x78, 0xd6, 0xa1, 0x48, 0xe5, 0xf0, 0x60, 0x42, 0xa7, 0xc7,
-	0x0e, 0xaf, 0xa8, 0xaf, 0xfd, 0xf8, 0x2a, 0x50, 0x26, 0xdc, 0xba, 0xdc, 0xc3, 0x08, 0xda, 0x29,
-	0x9b, 0x63, 0xa6, 0xfd, 0x35, 0x98, 0xd7, 0x44, 0x6a, 0x7e, 0x2f, 0xbd, 0xc5, 0x69, 0x2b, 0x59,
-	0x56, 0x0e, 0xe7, 0x31, 0xff, 0x61, 0xe4, 0xa3, 0x60, 0x24, 0x2f, 0x18, 0xdd, 0x15, 0x8c, 0x7e,
-	0x17, 0x8c, 0xbe, 0x95, 0x8c, 0xec, 0x4a, 0x46, 0x3e, 0x4b, 0x46, 0x9e, 0x6e, 0xfe, 0x79, 0xbb,
-	0x4e, 0x66, 0xb8, 0x5a, 0x29, 0x4f, 0x89, 0x0d, 0x84, 0x5b, 0x17, 0xb2, 0x39, 0xbc, 0xfc, 0x15,
-	0x59, 0xff, 0xe4, 0xf6, 0xea, 0xcd, 0xaf, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x4f, 0x57,
-	0x52, 0x6a, 0x01, 0x00, 0x00,
+	// 298 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x90, 0xb1, 0x4e, 0xf3, 0x30,
+	0x14, 0x85, 0xed, 0x5f, 0xbf, 0x8a, 0x08, 0xb0, 0x54, 0x1d, 0x4a, 0x91, 0xdc, 0x02, 0x4b, 0x17,
+	0x7c, 0xd5, 0xc2, 0xc2, 0x1a, 0x18, 0x18, 0x18, 0x50, 0x91, 0x18, 0x58, 0x90, 0xe3, 0xb8, 0x89,
+	0xd5, 0x26, 0x37, 0x8a, 0xdd, 0x88, 0x3e, 0x04, 0x12, 0x8f, 0xc1, 0xa3, 0x64, 0xec, 0x88, 0x18,
+	0x2a, 0x48, 0x5e, 0x04, 0x25, 0x69, 0xc4, 0x76, 0x74, 0xf5, 0x9d, 0x4f, 0xba, 0xc7, 0x39, 0x35,
+	0x2a, 0xb6, 0x3a, 0x56, 0x4b, 0x48, 0x52, 0xcc, 0xb4, 0xaf, 0x52, 0xc8, 0xa6, 0x90, 0x88, 0x54,
+	0x44, 0x86, 0x27, 0x29, 0x5a, 0xec, 0xf6, 0x5a, 0x84, 0xb7, 0x08, 0xcf, 0xa6, 0x03, 0x26, 0xd1,
+	0x44, 0x68, 0xc0, 0x13, 0x46, 0x41, 0x36, 0xf1, 0x94, 0x15, 0x13, 0x90, 0xa8, 0xe3, 0xa6, 0x35,
+	0xe8, 0x05, 0x18, 0x60, 0x1d, 0xa1, 0x4a, 0xcd, 0xf5, 0xec, 0x8d, 0x3a, 0x9d, 0x87, 0x5a, 0xde,
+	0xbd, 0x76, 0xf6, 0x7c, 0x95, 0xa0, 0xd1, 0xb6, 0x4f, 0x47, 0x74, 0x7c, 0x30, 0x3d, 0xe6, 0x8d,
+	0x92, 0x57, 0x4a, 0xbe, 0x53, 0xf2, 0x1b, 0xd4, 0xb1, 0xfb, 0x3f, 0xdf, 0x0e, 0xc9, 0xac, 0xe5,
+	0xbb, 0x77, 0xce, 0x91, 0xb1, 0x62, 0xa1, 0xe3, 0xe0, 0xc5, 0x84, 0x22, 0x55, 0xfd, 0x7f, 0x23,
+	0x3a, 0xde, 0x77, 0xcf, 0x2b, 0xea, 0x6b, 0x3b, 0x3c, 0x69, 0x3c, 0xc6, 0x5f, 0x70, 0x8d, 0x10,
+	0x09, 0x1b, 0xf2, 0x7b, 0x15, 0x08, 0xb9, 0xbe, 0x55, 0x72, 0x76, 0xb8, 0x6b, 0x3e, 0x56, 0x45,
+	0xf7, 0x29, 0xff, 0x61, 0xe4, 0xa3, 0x60, 0x24, 0x2f, 0x18, 0xdd, 0x14, 0x8c, 0x7e, 0x17, 0x8c,
+	0xbe, 0x97, 0x8c, 0x6c, 0x4a, 0x46, 0x3e, 0x4b, 0x46, 0x9e, 0xaf, 0x02, 0x6d, 0xc3, 0x95, 0xc7,
+	0x25, 0x46, 0xd0, 0x0e, 0x71, 0x81, 0xf3, 0xb9, 0x96, 0x5a, 0x2c, 0x21, 0x5c, 0x79, 0x90, 0x4d,
+	0xe0, 0xf5, 0x6f, 0x3d, 0xbb, 0x4e, 0x94, 0xf1, 0x3a, 0xf5, 0xbb, 0x97, 0xbf, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0x2b, 0x93, 0x97, 0x07, 0x5f, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/subscription/types/allocation.pb.go b/x/subscription/types/allocation.pb.go
index 055f67f8..95465974 100644
--- a/x/subscription/types/allocation.pb.go
+++ b/x/subscription/types/allocation.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
@@ -31,9 +31,9 @@ type Allocation struct {
 	// Field 2: Account address.
 	Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
 	// Field 3: Granted bytes.
-	GrantedBytes github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=granted_bytes,json=grantedBytes,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"granted_bytes"`
+	GrantedBytes cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=granted_bytes,json=grantedBytes,proto3,customtype=cosmossdk.io/math.Int" json:"granted_bytes"`
 	// Field 4: Utilized bytes.
-	UtilisedBytes github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=utilised_bytes,json=utilisedBytes,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"utilised_bytes"`
+	UtilisedBytes cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=utilised_bytes,json=utilisedBytes,proto3,customtype=cosmossdk.io/math.Int" json:"utilised_bytes"`
 }
 
 func (m *Allocation) Reset()         { *m = Allocation{} }
@@ -78,26 +78,26 @@ func init() {
 }
 
 var fileDescriptor_7569ae9a6faa5372 = []byte{
-	// 301 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0xd1, 0x31, 0x4e, 0xc3, 0x30,
-	0x14, 0x06, 0x60, 0x3b, 0x54, 0x45, 0x58, 0x94, 0x21, 0x42, 0x28, 0x62, 0x70, 0x2b, 0x06, 0x54,
-	0x86, 0xda, 0xa2, 0x2c, 0xac, 0x44, 0x2c, 0x5d, 0x8b, 0x58, 0xba, 0xa0, 0x24, 0x76, 0x53, 0x8b,
-	0x34, 0xae, 0xf2, 0x9c, 0x88, 0xde, 0x82, 0x63, 0x70, 0x94, 0x8c, 0x1d, 0x11, 0x43, 0x04, 0xc9,
-	0xc6, 0x29, 0x50, 0x42, 0x53, 0x95, 0x95, 0xc9, 0x7e, 0xf2, 0xaf, 0xcf, 0xd2, 0xff, 0xc8, 0x15,
-	0xc8, 0xd8, 0xa8, 0x58, 0x46, 0x1c, 0x52, 0x1f, 0x82, 0x44, 0xad, 0x8c, 0xd2, 0x31, 0xcf, 0xc6,
-	0xdc, 0x8b, 0x22, 0x1d, 0x78, 0xf5, 0xc4, 0x56, 0x89, 0x36, 0xda, 0x76, 0xda, 0x28, 0xdb, 0x8f,
-	0xb2, 0x6c, 0x7c, 0x7e, 0x1a, 0xea, 0x50, 0x37, 0x21, 0x5e, 0xdf, 0x7e, 0xf3, 0x17, 0xdf, 0x98,
-	0x90, 0xbb, 0x1d, 0x62, 0x9f, 0x11, 0x4b, 0x09, 0x07, 0x0f, 0xf0, 0xb0, 0xe3, 0x76, 0xcb, 0xa2,
-	0x6f, 0x4d, 0xee, 0xa7, 0x96, 0x12, 0xb6, 0x43, 0x0e, 0x3d, 0x21, 0x12, 0x09, 0xe0, 0x58, 0x03,
-	0x3c, 0x3c, 0x9a, 0xb6, 0xa3, 0xfd, 0x40, 0x7a, 0x61, 0xe2, 0xc5, 0x46, 0x8a, 0x27, 0x7f, 0x6d,
-	0x24, 0x38, 0x07, 0xf5, 0xbb, 0xcb, 0xf2, 0xa2, 0x8f, 0x3e, 0x8a, 0xfe, 0x65, 0xa8, 0xcc, 0x22,
-	0xf5, 0x59, 0xa0, 0x97, 0x3c, 0xd0, 0xb0, 0xd4, 0xb0, 0x3d, 0x46, 0x20, 0x9e, 0xb9, 0x59, 0xaf,
-	0x24, 0xb0, 0x49, 0x6c, 0xa6, 0xc7, 0x5b, 0xc4, 0xad, 0x0d, 0xfb, 0x91, 0x9c, 0xa4, 0x46, 0x45,
-	0x0a, 0x76, 0x6a, 0xe7, 0x5f, 0x6a, 0xaf, 0x55, 0x1a, 0xd6, 0x9d, 0xe5, 0x5f, 0x14, 0xbd, 0x95,
-	0x14, 0xe5, 0x25, 0xc5, 0x9b, 0x92, 0xe2, 0xcf, 0x92, 0xe2, 0xd7, 0x8a, 0xa2, 0x4d, 0x45, 0xd1,
-	0x7b, 0x45, 0xd1, 0xec, 0x76, 0x0f, 0x6e, 0x9b, 0x1c, 0xe9, 0xf9, 0x5c, 0x05, 0xca, 0x8b, 0xf8,
-	0x22, 0xf5, 0x79, 0x76, 0xcd, 0x5f, 0xfe, 0xae, 0xa1, 0xf9, 0xce, 0xef, 0x36, 0x7d, 0xde, 0xfc,
-	0x04, 0x00, 0x00, 0xff, 0xff, 0x94, 0xf0, 0x98, 0x3b, 0xac, 0x01, 0x00, 0x00,
+	// 295 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x31, 0x4e, 0xc3, 0x30,
+	0x18, 0x85, 0xed, 0x50, 0x15, 0x61, 0x51, 0x86, 0x08, 0x50, 0x84, 0x84, 0x5b, 0x31, 0x95, 0x01,
+	0x5b, 0x94, 0x85, 0x95, 0xa8, 0x4b, 0xd7, 0x8c, 0x5d, 0x90, 0x13, 0xbb, 0x89, 0x45, 0x12, 0x47,
+	0xb1, 0x13, 0xd1, 0x5b, 0x70, 0x0c, 0x8e, 0x92, 0xb1, 0x23, 0x62, 0x88, 0x20, 0xb9, 0x08, 0x4a,
+	0x20, 0x15, 0x6c, 0x6c, 0xff, 0xd3, 0xff, 0xbd, 0x6f, 0x78, 0xe8, 0x5a, 0x8b, 0xd4, 0xc8, 0x54,
+	0xc4, 0x54, 0x17, 0xbe, 0x0e, 0x72, 0x99, 0x19, 0xa9, 0x52, 0x5a, 0x2e, 0x28, 0x8b, 0x63, 0x15,
+	0xb0, 0x2e, 0x91, 0x2c, 0x57, 0x46, 0xd9, 0xce, 0x80, 0x92, 0xdf, 0x28, 0x29, 0x17, 0x17, 0xa7,
+	0xa1, 0x0a, 0x55, 0x0f, 0xd1, 0xee, 0xfa, 0xe6, 0xaf, 0x2a, 0x88, 0xd0, 0xc3, 0x5e, 0x62, 0x9f,
+	0x23, 0x4b, 0x72, 0x07, 0xce, 0xe0, 0x7c, 0xe4, 0x8e, 0x9b, 0x7a, 0x6a, 0xad, 0x96, 0x9e, 0x25,
+	0xb9, 0xed, 0xa0, 0x43, 0xc6, 0x79, 0x2e, 0xb4, 0x76, 0xac, 0x19, 0x9c, 0x1f, 0x79, 0x43, 0xb4,
+	0x5d, 0x34, 0x09, 0x73, 0x96, 0x1a, 0xc1, 0x1f, 0xfd, 0xad, 0x11, 0xda, 0x39, 0xe8, 0xfe, 0xee,
+	0x65, 0x55, 0x4f, 0xc1, 0x7b, 0x3d, 0x3d, 0x0b, 0x94, 0x4e, 0x94, 0xd6, 0xfc, 0x89, 0x48, 0x45,
+	0x13, 0x66, 0x22, 0xb2, 0x4a, 0x8d, 0x77, 0xfc, 0xd3, 0x71, 0xbb, 0x8a, 0xbd, 0x44, 0x27, 0x85,
+	0x91, 0xb1, 0xd4, 0x7b, 0xc9, 0xe8, 0x3f, 0x92, 0xc9, 0x50, 0xea, 0x2d, 0xee, 0xba, 0xfa, 0xc4,
+	0xe0, 0xb5, 0xc1, 0xa0, 0x6a, 0x30, 0xdc, 0x35, 0x18, 0x7e, 0x34, 0x18, 0xbe, 0xb4, 0x18, 0xec,
+	0x5a, 0x0c, 0xde, 0x5a, 0x0c, 0xd6, 0xf7, 0xa1, 0x34, 0x51, 0xe1, 0x93, 0x40, 0x25, 0x74, 0xd8,
+	0xe9, 0x46, 0x6d, 0x36, 0x32, 0x90, 0x2c, 0xa6, 0x51, 0xe1, 0xd3, 0xf2, 0x96, 0x3e, 0xff, 0x1d,
+	0xd9, 0x6c, 0x33, 0xa1, 0xfd, 0x71, 0xbf, 0xd6, 0xdd, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc2,
+	0x95, 0x1a, 0xb6, 0x8a, 0x01, 0x00, 0x00,
 }
 
 func (m *Allocation) Marshal() (dAtA []byte, err error) {
diff --git a/x/subscription/types/events.pb.go b/x/subscription/types/events.pb.go
index 4f708c76..7f7a3cd9 100644
--- a/x/subscription/types/events.pb.go
+++ b/x/subscription/types/events.pb.go
@@ -4,8 +4,8 @@
 package types
 
 import (
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	types "github.com/sentinel-official/hub/v1/types"
@@ -75,9 +75,9 @@ type EventAllocate struct {
 	// Field 1: Address associated with the allocation.
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty" yaml:"address"`
 	// Field 2: Granted bytes in the allocation.
-	GrantedBytes github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=granted_bytes,json=grantedBytes,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"granted_bytes"`
+	GrantedBytes cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=granted_bytes,json=grantedBytes,proto3,customtype=cosmossdk.io/math.Int" json:"granted_bytes"`
 	// Field 3: Utilized bytes in the allocation.
-	UtilisedBytes github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=utilised_bytes,json=utilisedBytes,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"utilised_bytes"`
+	UtilisedBytes cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=utilised_bytes,json=utilisedBytes,proto3,customtype=cosmossdk.io/math.Int" json:"utilised_bytes"`
 	// Field 4: Unique identifier for the allocation.
 	ID uint64 `protobuf:"varint,4,opt,name=id,proto3" json:"id,omitempty" yaml:"id"`
 }
@@ -359,51 +359,51 @@ func init() {
 }
 
 var fileDescriptor_873efd8554329ba2 = []byte{
-	// 704 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x55, 0xc1, 0x4e, 0xdb, 0x4c,
-	0x10, 0x8e, 0x0d, 0x7f, 0x50, 0x16, 0x12, 0x7e, 0xcc, 0xff, 0x97, 0x40, 0x2b, 0x1b, 0x6d, 0xd5,
-	0x8a, 0x4a, 0x60, 0x0b, 0xaa, 0x4a, 0x15, 0xa7, 0x92, 0x52, 0xa4, 0xdc, 0x90, 0x23, 0x2e, 0x5c,
-	0xa2, 0x4d, 0x76, 0x09, 0x2b, 0x9c, 0xdd, 0xc8, 0xbb, 0x4e, 0x9b, 0x37, 0xa8, 0x54, 0xa9, 0xaa,
-	0x7a, 0xee, 0xa9, 0xa7, 0x3e, 0x0a, 0x47, 0x8e, 0x55, 0x0f, 0x56, 0xeb, 0xbc, 0x41, 0x9e, 0xa0,
-	0x8a, 0x77, 0x6d, 0x99, 0x1e, 0xa0, 0xe9, 0x81, 0x43, 0x4f, 0xde, 0x9d, 0xf9, 0xe6, 0xdb, 0x99,
-	0x6f, 0xd6, 0x3b, 0xe0, 0x91, 0x20, 0x4c, 0x52, 0x46, 0x02, 0x4f, 0x44, 0x1d, 0xd1, 0x0d, 0xe9,
-	0x40, 0x52, 0xce, 0xbc, 0xe1, 0x9e, 0x47, 0x86, 0x84, 0x49, 0xe1, 0x0e, 0x42, 0x2e, 0xb9, 0x55,
-	0xcf, 0x60, 0x6e, 0x11, 0xe6, 0x0e, 0xf7, 0x36, 0xfe, 0xeb, 0xf1, 0x1e, 0x4f, 0x41, 0xde, 0x74,
-	0xa5, 0xf0, 0x1b, 0x76, 0x4e, 0x2b, 0x47, 0x03, 0x22, 0xbc, 0xe1, 0xae, 0x27, 0x24, 0x92, 0x91,
-	0xe6, 0x83, 0x63, 0x03, 0xac, 0xbc, 0x9a, 0x1e, 0x70, 0x32, 0xc0, 0x48, 0x92, 0x56, 0xea, 0xb3,
-	0x0e, 0x41, 0x59, 0xa1, 0xea, 0xc6, 0xa6, 0xb1, 0x55, 0xdb, 0x5b, 0x77, 0xf3, 0x63, 0x53, 0x1a,
-	0x77, 0xb8, 0xeb, 0x2a, 0x68, 0x63, 0x65, 0x12, 0x3b, 0xd5, 0x11, 0xea, 0x07, 0xfb, 0x50, 0x85,
-	0x40, 0x5f, 0xc7, 0x5a, 0xdb, 0x60, 0x01, 0x61, 0x1c, 0x12, 0x21, 0xea, 0xe6, 0xa6, 0xb1, 0x55,
-	0x69, 0x58, 0x93, 0xd8, 0xa9, 0x29, 0xac, 0x76, 0x40, 0x3f, 0x83, 0x58, 0x0f, 0x81, 0x49, 0x71,
-	0x7d, 0x6e, 0xd3, 0xd8, 0x9a, 0x6f, 0xac, 0x26, 0xb1, 0x63, 0x36, 0x0f, 0x27, 0xb1, 0x53, 0x51,
-	0x70, 0x8a, 0xa1, 0x6f, 0x52, 0x6c, 0x3d, 0x03, 0x0b, 0x83, 0x00, 0xb1, 0x36, 0xc5, 0xf5, 0xf9,
-	0x14, 0xf9, 0x20, 0x89, 0x9d, 0xf2, 0x71, 0x80, 0x58, 0x8a, 0xd6, 0xe4, 0x1a, 0x02, 0xfd, 0xf2,
-	0x74, 0xd5, 0xc4, 0xf0, 0xbd, 0x09, 0xaa, 0x69, 0x95, 0x07, 0x41, 0xc0, 0xbb, 0x48, 0x92, 0x62,
-	0x6e, 0xc6, 0xed, 0xb9, 0xb5, 0x40, 0xb5, 0x17, 0x22, 0x26, 0x09, 0x6e, 0x77, 0x46, 0x92, 0x64,
-	0xf5, 0xb8, 0x97, 0xb1, 0x53, 0xfa, 0x16, 0x3b, 0x8f, 0x7b, 0x54, 0x9e, 0x47, 0x1d, 0xb7, 0xcb,
-	0xfb, 0x5e, 0x97, 0x8b, 0x3e, 0x17, 0xfa, 0xb3, 0x23, 0xf0, 0x85, 0x12, 0xde, 0x6d, 0x32, 0xe9,
-	0x2f, 0x69, 0x92, 0xc6, 0x94, 0xc3, 0x3a, 0x01, 0xb5, 0x48, 0xd2, 0x80, 0x8a, 0x9c, 0x75, 0xee,
-	0x8f, 0x58, 0xab, 0x19, 0x8b, 0xa2, 0x55, 0x3a, 0xce, 0xdf, 0xa8, 0x23, 0xfc, 0x9c, 0xb5, 0xfd,
-	0x65, 0x48, 0x90, 0x24, 0xc7, 0x68, 0xc4, 0x23, 0x39, 0xa3, 0x28, 0xfb, 0x60, 0x89, 0x71, 0x4c,
-	0xda, 0xd7, 0x7b, 0xbc, 0x36, 0x89, 0x9d, 0x55, 0x15, 0x52, 0xf4, 0x42, 0x7f, 0x71, 0xba, 0x3d,
-	0x98, 0xa1, 0xd9, 0xf0, 0xa3, 0xa9, 0x93, 0x3c, 0x46, 0xa3, 0x23, 0x1e, 0xde, 0x79, 0x92, 0xdb,
-	0x60, 0x61, 0x80, 0x46, 0x7d, 0xc2, 0xa4, 0xee, 0x4c, 0xe1, 0x24, 0xed, 0x80, 0x7e, 0x06, 0xb1,
-	0x5e, 0x80, 0x9a, 0x90, 0xe8, 0x82, 0xb2, 0x5e, 0x3b, 0x24, 0xaf, 0x51, 0xa8, 0x7a, 0x50, 0x69,
-	0xac, 0x4f, 0x62, 0xe7, 0xff, 0xfc, 0x07, 0x29, 0xf8, 0xa1, 0x5f, 0xd5, 0x06, 0x3f, 0xdd, 0x6b,
-	0x51, 0xfe, 0xb9, 0x59, 0x94, 0x4f, 0x26, 0x58, 0x2e, 0x8a, 0x12, 0x20, 0x36, 0xa3, 0x24, 0x85,
-	0xb2, 0xcc, 0xdb, 0xcb, 0x3a, 0x02, 0xff, 0x0e, 0x42, 0x3e, 0xa4, 0x98, 0x84, 0xb9, 0x88, 0x4a,
-	0x8d, 0xfb, 0x93, 0xd8, 0x59, 0xd3, 0x61, 0xbf, 0x20, 0xa0, 0xbf, 0x9c, 0x99, 0x32, 0x31, 0xef,
-	0x48, 0x9e, 0xb7, 0x73, 0xc0, 0x2a, 0xc8, 0xd3, 0x22, 0x42, 0x50, 0xce, 0xfe, 0xe2, 0x4b, 0x73,
-	0x00, 0x80, 0x50, 0x45, 0xb6, 0x73, 0x75, 0x60, 0x12, 0x3b, 0x15, 0x5d, 0x7a, 0x2a, 0xd2, 0x8a,
-	0xa6, 0xca, 0x81, 0xd0, 0xaf, 0xe8, 0x4d, 0x13, 0x5b, 0x27, 0x60, 0xb9, 0x38, 0x4c, 0xa6, 0x3c,
-	0xe5, 0x94, 0x67, 0x3b, 0x89, 0x9d, 0x5a, 0xab, 0xe0, 0x4a, 0xc9, 0xee, 0x69, 0xb2, 0xeb, 0x21,
-	0xd0, 0xaf, 0x15, 0x2d, 0x4d, 0x0c, 0xdf, 0x19, 0x60, 0x31, 0x6d, 0x85, 0x4f, 0xce, 0x22, 0x86,
-	0x67, 0xec, 0xc1, 0x13, 0x50, 0x46, 0x7d, 0x1e, 0xe5, 0x97, 0xb4, 0x30, 0x67, 0x94, 0x1d, 0xfa,
-	0x1a, 0xf0, 0x5b, 0x8f, 0x49, 0xe3, 0xf4, 0xf2, 0x87, 0x5d, 0xfa, 0x92, 0xd8, 0xa5, 0xcb, 0xc4,
-	0x36, 0xae, 0x12, 0xdb, 0xf8, 0x9e, 0xd8, 0xc6, 0x87, 0xb1, 0x5d, 0xba, 0x1a, 0xdb, 0xa5, 0xaf,
-	0x63, 0xbb, 0x74, 0xfa, 0xbc, 0xf0, 0xde, 0x66, 0xe3, 0x6e, 0x87, 0x9f, 0x9d, 0xd1, 0x2e, 0x45,
-	0x81, 0x77, 0x1e, 0x75, 0xa6, 0xc3, 0xf3, 0xcd, 0xf5, 0xf1, 0x9c, 0xbe, 0xc2, 0x9d, 0x72, 0x3a,
-	0x4b, 0x9f, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xae, 0x9f, 0x60, 0xc4, 0x07, 0x00, 0x00,
+	// 699 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x95, 0x31, 0x4f, 0xdb, 0x40,
+	0x14, 0xc7, 0xe3, 0x40, 0x83, 0x72, 0x90, 0x50, 0x4c, 0x29, 0x81, 0xb6, 0x36, 0xba, 0xaa, 0x12,
+	0x95, 0xa8, 0x2d, 0xa8, 0x2a, 0x55, 0x4c, 0x25, 0xa5, 0x48, 0xd9, 0xd0, 0x21, 0x16, 0x96, 0xe8,
+	0x92, 0x3b, 0xc2, 0x09, 0xe7, 0x2e, 0xf2, 0x9d, 0xd3, 0xe6, 0x1b, 0x54, 0xea, 0x52, 0x75, 0xee,
+	0xd4, 0xa9, 0x1f, 0x85, 0x91, 0xb1, 0xea, 0x60, 0xb5, 0xce, 0xda, 0x29, 0x9f, 0xa0, 0xb2, 0x7d,
+	0xb6, 0x4c, 0x07, 0x20, 0x0b, 0x43, 0x37, 0xdf, 0xbd, 0xdf, 0xfb, 0xdf, 0xbd, 0xff, 0x3b, 0xf9,
+	0x81, 0x67, 0x92, 0x72, 0xc5, 0x38, 0xf5, 0x5c, 0x19, 0x74, 0x64, 0xd7, 0x67, 0x03, 0xc5, 0x04,
+	0x77, 0x87, 0x3b, 0x2e, 0x1d, 0x52, 0xae, 0xa4, 0x33, 0xf0, 0x85, 0x12, 0x66, 0x23, 0xc3, 0x9c,
+	0x22, 0xe6, 0x0c, 0x77, 0xd6, 0x1f, 0xf4, 0x44, 0x4f, 0x24, 0x90, 0x1b, 0x7f, 0xa5, 0xfc, 0xba,
+	0x95, 0xcb, 0xaa, 0xd1, 0x80, 0x4a, 0x77, 0xb8, 0xed, 0x4a, 0x85, 0x55, 0xa0, 0xf5, 0xe0, 0xd8,
+	0x00, 0x4b, 0xef, 0xe2, 0x03, 0x8e, 0x07, 0x04, 0x2b, 0x7a, 0x94, 0xc4, 0xcc, 0x7d, 0x50, 0x49,
+	0xa9, 0x86, 0xb1, 0x61, 0x6c, 0xd6, 0x77, 0xd6, 0x9c, 0xfc, 0xd8, 0x44, 0xc6, 0x19, 0x6e, 0x3b,
+	0x29, 0xda, 0x5c, 0x9a, 0x84, 0x76, 0x6d, 0x84, 0xfb, 0xde, 0x2e, 0x4c, 0x53, 0x20, 0xd2, 0xb9,
+	0xe6, 0x16, 0x98, 0xc3, 0x84, 0xf8, 0x54, 0xca, 0x46, 0x79, 0xc3, 0xd8, 0xac, 0x36, 0xcd, 0x49,
+	0x68, 0xd7, 0x53, 0x56, 0x07, 0x20, 0xca, 0x10, 0xf3, 0x29, 0x28, 0x33, 0xd2, 0x98, 0xd9, 0x30,
+	0x36, 0x67, 0x9b, 0xcb, 0x51, 0x68, 0x97, 0x5b, 0xfb, 0x93, 0xd0, 0xae, 0xa6, 0x38, 0x23, 0x10,
+	0x95, 0x19, 0x31, 0x5f, 0x81, 0xb9, 0x81, 0x87, 0x79, 0x9b, 0x91, 0xc6, 0x6c, 0x42, 0x3e, 0x8e,
+	0x42, 0xbb, 0x72, 0xe8, 0x61, 0x9e, 0xd0, 0x5a, 0x5c, 0x23, 0x10, 0x55, 0xe2, 0xaf, 0x16, 0x81,
+	0x7f, 0x0c, 0x50, 0x4b, 0xaa, 0xdc, 0xf3, 0x3c, 0xd1, 0xc5, 0x8a, 0x16, 0xef, 0x66, 0xdc, 0x7c,
+	0xb7, 0x26, 0xa8, 0xf5, 0x7c, 0xcc, 0x15, 0x25, 0xed, 0xce, 0x48, 0xd1, 0xac, 0x9e, 0x27, 0x17,
+	0xa1, 0x5d, 0xfa, 0x19, 0xda, 0x2b, 0x5d, 0x21, 0xfb, 0x42, 0x4a, 0x72, 0xee, 0x30, 0xe1, 0xf6,
+	0xb1, 0x3a, 0x73, 0x5a, 0x5c, 0xa1, 0x05, 0x9d, 0xd3, 0x8c, 0x53, 0xcc, 0x7d, 0x50, 0x0f, 0x14,
+	0xf3, 0x98, 0xcc, 0x45, 0x66, 0x6e, 0x23, 0x52, 0xcb, 0x92, 0x52, 0x95, 0xd4, 0xa5, 0xd9, 0x6b,
+	0x5d, 0x82, 0xdf, 0xb2, 0xa6, 0xbe, 0xf5, 0x29, 0x56, 0xf4, 0x10, 0x8f, 0x44, 0xa0, 0xa6, 0x2c,
+	0x79, 0x17, 0x2c, 0x70, 0x41, 0x68, 0xfb, 0x6a, 0x07, 0x57, 0x27, 0xa1, 0xbd, 0x9c, 0xa6, 0x14,
+	0xa3, 0x10, 0xcd, 0xc7, 0xcb, 0xbd, 0x29, 0x5a, 0x09, 0xbf, 0x94, 0xf5, 0x25, 0x0f, 0xf1, 0xe8,
+	0x40, 0xf8, 0x77, 0x7e, 0xc9, 0x2d, 0x30, 0x37, 0xc0, 0xa3, 0x3e, 0xe5, 0x4a, 0x37, 0xa2, 0x70,
+	0x92, 0x0e, 0x40, 0x94, 0x21, 0xe6, 0x1b, 0x50, 0x97, 0x0a, 0x9f, 0x33, 0xde, 0x6b, 0xfb, 0xf4,
+	0x3d, 0xf6, 0xd3, 0x1e, 0x54, 0x9b, 0x6b, 0x93, 0xd0, 0x5e, 0xc9, 0x9f, 0x7f, 0x21, 0x0e, 0x51,
+	0x4d, 0x6f, 0xa0, 0x64, 0xad, 0x4d, 0xb9, 0x77, 0xbd, 0x29, 0x5f, 0xcb, 0x60, 0xb1, 0x68, 0x8a,
+	0x87, 0xf9, 0x94, 0x96, 0x14, 0xca, 0x2a, 0xdf, 0x5c, 0xd6, 0x01, 0xb8, 0x3f, 0xf0, 0xc5, 0x90,
+	0x11, 0xea, 0xe7, 0x26, 0xa6, 0x6e, 0x3c, 0x9a, 0x84, 0xf6, 0xaa, 0x4e, 0xfb, 0x87, 0x80, 0x68,
+	0x31, 0xdb, 0xca, 0xcc, 0xbc, 0x23, 0x7b, 0x3e, 0xce, 0x00, 0xb3, 0x60, 0xcf, 0x11, 0x95, 0x92,
+	0x09, 0xfe, 0x1f, 0x3f, 0x9a, 0x3d, 0x00, 0x64, 0x5a, 0x64, 0x3b, 0x77, 0x07, 0x46, 0xa1, 0x5d,
+	0xd5, 0xa5, 0x27, 0x26, 0x2d, 0x69, 0xa9, 0x1c, 0x84, 0xa8, 0xaa, 0x17, 0x2d, 0x62, 0x1e, 0x83,
+	0xc5, 0xe2, 0xa8, 0x88, 0x75, 0x2a, 0x89, 0xce, 0x56, 0x14, 0xda, 0xf5, 0xa3, 0x42, 0x28, 0x11,
+	0x7b, 0xa8, 0xc5, 0xae, 0xa6, 0x40, 0x54, 0x2f, 0xee, 0xb4, 0x08, 0xfc, 0x64, 0x80, 0xf9, 0xa4,
+	0x15, 0x88, 0x9e, 0x06, 0x9c, 0x4c, 0xd9, 0x83, 0xe7, 0xa0, 0x82, 0xfb, 0x22, 0xc8, 0x1f, 0x69,
+	0x61, 0x8a, 0xa4, 0xfb, 0x10, 0x69, 0xe0, 0x56, 0x3f, 0x93, 0xe6, 0xc9, 0xc5, 0x6f, 0xab, 0xf4,
+	0x3d, 0xb2, 0x4a, 0x17, 0x91, 0x65, 0x5c, 0x46, 0x96, 0xf1, 0x2b, 0xb2, 0x8c, 0xcf, 0x63, 0xab,
+	0x74, 0x39, 0xb6, 0x4a, 0x3f, 0xc6, 0x56, 0xe9, 0xe4, 0x75, 0x8f, 0xa9, 0xb3, 0xa0, 0xe3, 0x74,
+	0x45, 0xdf, 0xcd, 0x86, 0xd9, 0x0b, 0x71, 0x7a, 0xca, 0xba, 0x0c, 0x7b, 0xee, 0x59, 0xd0, 0x89,
+	0x47, 0xe3, 0x87, 0xab, 0xc3, 0x37, 0x99, 0x75, 0x9d, 0x4a, 0x32, 0x29, 0x5f, 0xfe, 0x0d, 0x00,
+	0x00, 0xff, 0xff, 0xb5, 0x66, 0x3b, 0x56, 0xa2, 0x07, 0x00, 0x00,
 }
 
 func (m *EventUpdateStatus) Marshal() (dAtA []byte, err error) {
diff --git a/x/subscription/types/msg.pb.go b/x/subscription/types/msg.pb.go
index b024ea22..e9d530ad 100644
--- a/x/subscription/types/msg.pb.go
+++ b/x/subscription/types/msg.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
@@ -79,7 +79,7 @@ type MsgAllocateRequest struct {
 	// Field 3: Address for which bytes are allocated.
 	Address string `protobuf:"bytes,3,opt,name=address,proto3" json:"address,omitempty"`
 	// Field 4: Number of bytes to allocate.
-	Bytes github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=bytes,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"bytes"`
+	Bytes cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=bytes,proto3,customtype=cosmossdk.io/math.Int" json:"bytes"`
 }
 
 func (m *MsgAllocateRequest) Reset()         { *m = MsgAllocateRequest{} }
@@ -201,31 +201,31 @@ func init() {
 }
 
 var fileDescriptor_4cb96050c6471ce0 = []byte{
-	// 377 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xbd, 0xae, 0xd3, 0x30,
-	0x14, 0xc7, 0xe3, 0x50, 0x8a, 0x6a, 0x16, 0x70, 0x01, 0x45, 0x1d, 0xdc, 0x2a, 0x03, 0xaa, 0x80,
-	0xda, 0xa2, 0x2c, 0x4c, 0x48, 0x94, 0x2e, 0x1d, 0xba, 0x84, 0xad, 0x5b, 0x3e, 0xdc, 0xd4, 0x90,
-	0xc4, 0x21, 0xc7, 0x89, 0xe8, 0x5b, 0xf0, 0x08, 0x8c, 0x3c, 0x4a, 0xc7, 0x8e, 0x88, 0x21, 0x82,
-	0xf4, 0x45, 0x50, 0x13, 0x8a, 0xd2, 0x4a, 0xf7, 0xaa, 0xba, 0x93, 0x8f, 0x8f, 0x7e, 0xff, 0xf3,
-	0xf1, 0xd7, 0xc1, 0x36, 0x88, 0x44, 0xcb, 0x44, 0x44, 0x1c, 0x72, 0x0f, 0xfc, 0x4c, 0xa6, 0x5a,
-	0xaa, 0x84, 0x17, 0x53, 0x1e, 0x43, 0xc8, 0xd2, 0x4c, 0x69, 0x45, 0xac, 0x13, 0xc3, 0xda, 0x0c,
-	0x2b, 0xa6, 0x83, 0x27, 0xa1, 0x0a, 0x55, 0x0d, 0xf1, 0x63, 0xd4, 0xf0, 0xf6, 0x3b, 0xfc, 0x68,
-	0x09, 0xe1, 0x07, 0x37, 0xf1, 0x45, 0xe4, 0x88, 0x2f, 0xb9, 0x00, 0x4d, 0x08, 0xee, 0xac, 0x33,
-	0x15, 0x5b, 0x68, 0x84, 0xc6, 0x3d, 0xa7, 0x8e, 0xc9, 0x33, 0x6c, 0xca, 0xc0, 0x32, 0x47, 0x68,
-	0xdc, 0x99, 0x75, 0xab, 0x72, 0x68, 0x2e, 0xe6, 0x8e, 0x29, 0x03, 0xfb, 0x3b, 0xc2, 0x64, 0x09,
-	0xe1, 0xfb, 0x28, 0x52, 0xbe, 0xab, 0xc5, 0x1d, 0x4a, 0x10, 0x0b, 0x3f, 0x70, 0x83, 0x20, 0x13,
-	0x00, 0xd6, 0xbd, 0x1a, 0x3f, 0x7d, 0xc9, 0x1c, 0xdf, 0xf7, 0xb6, 0x5a, 0x80, 0xd5, 0x39, 0xe6,
-	0x67, 0x6c, 0x57, 0x0e, 0x8d, 0x5f, 0xe5, 0xf0, 0x79, 0x28, 0xf5, 0x26, 0xf7, 0x98, 0xaf, 0x62,
-	0xee, 0x2b, 0x88, 0x15, 0xfc, 0x7b, 0x26, 0x10, 0x7c, 0xe6, 0x7a, 0x9b, 0x0a, 0x60, 0x8b, 0x44,
-	0x3b, 0x8d, 0xd8, 0xee, 0xe3, 0xc7, 0xad, 0x15, 0x21, 0x55, 0x09, 0x08, 0xfb, 0x29, 0xee, 0x9f,
-	0x8d, 0xdd, 0xa4, 0xa7, 0x25, 0xc2, 0x78, 0x09, 0xe1, 0x47, 0x91, 0x15, 0xd2, 0x17, 0x24, 0xc0,
-	0xbd, 0xff, 0x52, 0xf2, 0x82, 0xdd, 0xe4, 0x2d, 0xbb, 0xb4, 0x70, 0xf0, 0xf2, 0x2a, 0xb6, 0x69,
-	0x4a, 0x3e, 0xe1, 0x87, 0xad, 0x59, 0xc8, 0xab, 0x5b, 0xb5, 0x17, 0x4e, 0x0f, 0x26, 0x57, 0xd2,
-	0x4d, 0xaf, 0xd9, 0x6a, 0xf7, 0x87, 0x1a, 0x3f, 0x2a, 0x6a, 0xec, 0x2a, 0x8a, 0xf6, 0x15, 0x45,
-	0xbf, 0x2b, 0x8a, 0xbe, 0x1d, 0xa8, 0xb1, 0x3f, 0x50, 0xe3, 0xe7, 0x81, 0x1a, 0xab, 0xb7, 0x2d,
-	0x77, 0x4f, 0xa5, 0x27, 0x6a, 0xbd, 0x96, 0xbe, 0x74, 0x23, 0xbe, 0xc9, 0x3d, 0x5e, 0xbc, 0xe6,
-	0x5f, 0xcf, 0x4f, 0xb0, 0xf6, 0xdc, 0xeb, 0xd6, 0x27, 0xf5, 0xe6, 0x6f, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x6d, 0xd8, 0x68, 0x02, 0xa8, 0x02, 0x00, 0x00,
+	// 374 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0xae, 0xd2, 0x40,
+	0x14, 0xc6, 0x3b, 0x15, 0x31, 0x8c, 0x1b, 0x1d, 0xc4, 0x34, 0x24, 0x0e, 0xa4, 0x2b, 0xa2, 0x32,
+	0x13, 0x61, 0xe3, 0xca, 0x44, 0x74, 0xc3, 0x82, 0x4d, 0xdd, 0xb1, 0xeb, 0x9f, 0xa1, 0x8c, 0xb6,
+	0x9d, 0xda, 0x33, 0x6d, 0xe4, 0x29, 0xf4, 0x31, 0x7c, 0x14, 0x96, 0x2c, 0x8d, 0x8b, 0x46, 0xcb,
+	0x8b, 0xdc, 0xd0, 0x86, 0x1b, 0x20, 0xb9, 0x37, 0xe4, 0xee, 0xce, 0x9c, 0xfc, 0xce, 0x39, 0xdf,
+	0x7c, 0xf9, 0xb0, 0x0d, 0x22, 0xd1, 0x32, 0x11, 0x11, 0x87, 0xdc, 0x03, 0x3f, 0x93, 0xa9, 0x96,
+	0x2a, 0xe1, 0xc5, 0x84, 0xc7, 0x10, 0xb2, 0x34, 0x53, 0x5a, 0x11, 0xeb, 0xc8, 0xb0, 0x53, 0x86,
+	0x15, 0x93, 0xfe, 0x8b, 0x50, 0x85, 0xaa, 0x86, 0xf8, 0xa1, 0x6a, 0x78, 0xfb, 0x03, 0x7e, 0xb6,
+	0x80, 0xf0, 0x93, 0x9b, 0xf8, 0x22, 0x72, 0xc4, 0xf7, 0x5c, 0x80, 0x26, 0x04, 0xb7, 0x56, 0x99,
+	0x8a, 0x2d, 0x34, 0x44, 0xa3, 0x8e, 0x53, 0xd7, 0xe4, 0x25, 0x36, 0x65, 0x60, 0x99, 0x43, 0x34,
+	0x6a, 0xcd, 0xda, 0x55, 0x39, 0x30, 0xe7, 0x9f, 0x1d, 0x53, 0x06, 0xf6, 0x4f, 0x84, 0xc9, 0x02,
+	0xc2, 0x8f, 0x51, 0xa4, 0x7c, 0x57, 0x8b, 0x07, 0xac, 0x20, 0x16, 0x7e, 0xe2, 0x06, 0x41, 0x26,
+	0x00, 0xac, 0x47, 0x35, 0x7e, 0x7c, 0x92, 0x29, 0x7e, 0xec, 0x6d, 0xb4, 0x00, 0xab, 0x75, 0xe8,
+	0xcf, 0x5e, 0x6d, 0xcb, 0x81, 0xf1, 0xb7, 0x1c, 0xf4, 0x7c, 0x05, 0xb1, 0x02, 0x08, 0xbe, 0x31,
+	0xa9, 0x78, 0xec, 0xea, 0x35, 0x9b, 0x27, 0xda, 0x69, 0x58, 0xbb, 0x8b, 0x9f, 0x9f, 0xfc, 0x08,
+	0x52, 0x95, 0x80, 0xb0, 0x7b, 0xb8, 0x7b, 0xa6, 0xb2, 0x69, 0x4f, 0x4a, 0x84, 0xf1, 0x02, 0xc2,
+	0x2f, 0x22, 0x2b, 0xa4, 0x2f, 0x48, 0x80, 0x3b, 0xb7, 0xa3, 0xe4, 0x35, 0xbb, 0xcb, 0x4a, 0x76,
+	0xe9, 0x58, 0xff, 0xcd, 0x55, 0x6c, 0x73, 0x94, 0x7c, 0xc5, 0x4f, 0x4f, 0xb4, 0x90, 0xb7, 0xf7,
+	0xce, 0x5e, 0x18, 0xdb, 0x1f, 0x5f, 0x49, 0x37, 0xb7, 0x66, 0xcb, 0xed, 0x7f, 0x6a, 0xfc, 0xae,
+	0xa8, 0xb1, 0xad, 0x28, 0xda, 0x55, 0x14, 0xfd, 0xab, 0x28, 0xfa, 0xb5, 0xa7, 0xc6, 0x6e, 0x4f,
+	0x8d, 0x3f, 0x7b, 0x6a, 0x2c, 0xdf, 0x87, 0x52, 0xaf, 0x73, 0x8f, 0xf9, 0x2a, 0xe6, 0xc7, 0xd5,
+	0x63, 0xb5, 0x5a, 0x49, 0x5f, 0xba, 0x11, 0x5f, 0xe7, 0x1e, 0x2f, 0xde, 0xf1, 0x1f, 0xe7, 0x89,
+	0xd3, 0x9b, 0x54, 0x80, 0xd7, 0xae, 0x13, 0x34, 0xbd, 0x09, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x58,
+	0x16, 0x34, 0x97, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/swap/types/msg.pb.go b/x/swap/types/msg.pb.go
index ec21a18b..e002a8af 100644
--- a/x/swap/types/msg.pb.go
+++ b/x/swap/types/msg.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	context "context"
+	cosmossdk_io_math "cosmossdk.io/math"
 	fmt "fmt"
-	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
@@ -32,10 +32,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // MsgSwapRequest defines the SDK message for swapping an ERC-20 token to the
 // native coin
 type MsgSwapRequest struct {
-	From     string                                 `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
-	TxHash   []byte                                 `protobuf:"bytes,2,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"`
-	Receiver string                                 `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
-	Amount   github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount"`
+	From     string                `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	TxHash   []byte                `protobuf:"bytes,2,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"`
+	Receiver string                `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
+	Amount   cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=amount,proto3,customtype=cosmossdk.io/math.Int" json:"amount"`
 }
 
 func (m *MsgSwapRequest) Reset()         { *m = MsgSwapRequest{} }
@@ -116,28 +116,28 @@ func init() {
 func init() { proto.RegisterFile("sentinel/swap/v1/msg.proto", fileDescriptor_2007fffb242cd53c) }
 
 var fileDescriptor_2007fffb242cd53c = []byte{
-	// 326 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xbf, 0x4e, 0xf3, 0x30,
-	0x14, 0xc5, 0xe3, 0xef, 0xab, 0x5a, 0xb0, 0x10, 0x7f, 0x2c, 0x24, 0xa2, 0x0c, 0x6e, 0xe9, 0x80,
-	0xba, 0xd4, 0xa6, 0xf0, 0x06, 0x1d, 0x10, 0x0c, 0x30, 0x84, 0x0d, 0x21, 0x21, 0x37, 0xb8, 0x89,
-	0x45, 0x13, 0x87, 0x5c, 0x27, 0x2d, 0x6f, 0xc1, 0x2b, 0xb0, 0xf1, 0x28, 0x1d, 0x3b, 0x22, 0x86,
-	0x0a, 0xd2, 0x17, 0x41, 0x49, 0xd3, 0x0a, 0x18, 0x98, 0x7c, 0xed, 0x73, 0xee, 0x95, 0x7f, 0xf7,
-	0x60, 0x07, 0x64, 0x64, 0x54, 0x24, 0x47, 0x1c, 0xc6, 0x22, 0xe6, 0x59, 0x8f, 0x87, 0xe0, 0xb3,
-	0x38, 0xd1, 0x46, 0x93, 0xdd, 0x95, 0xc6, 0x0a, 0x8d, 0x65, 0x3d, 0x67, 0xdf, 0xd7, 0xbe, 0x2e,
-	0x45, 0x5e, 0x54, 0x4b, 0x5f, 0xfb, 0x05, 0xe1, 0xed, 0x4b, 0xf0, 0xaf, 0xc7, 0x22, 0x76, 0xe5,
-	0x63, 0x2a, 0xc1, 0x10, 0x82, 0x6b, 0xc3, 0x44, 0x87, 0x36, 0x6a, 0xa1, 0xce, 0xa6, 0x5b, 0xd6,
-	0xe4, 0x00, 0x37, 0xcc, 0xe4, 0x2e, 0x10, 0x10, 0xd8, 0xff, 0x5a, 0xa8, 0xb3, 0xe5, 0xd6, 0xcd,
-	0xe4, 0x5c, 0x40, 0x40, 0x1c, 0xbc, 0x91, 0x48, 0x4f, 0xaa, 0x4c, 0x26, 0xf6, 0xff, 0xb2, 0x61,
-	0x7d, 0x27, 0x67, 0xb8, 0x2e, 0x42, 0x9d, 0x46, 0xc6, 0xae, 0x15, 0x4a, 0x9f, 0x4d, 0xe7, 0x4d,
-	0xeb, 0x7d, 0xde, 0x3c, 0xf2, 0x95, 0x09, 0xd2, 0x01, 0xf3, 0x74, 0xc8, 0x3d, 0x0d, 0xa1, 0x86,
-	0xea, 0xe8, 0xc2, 0xfd, 0x03, 0x37, 0x4f, 0xb1, 0x04, 0x76, 0x11, 0x19, 0xb7, 0xea, 0x6e, 0xef,
-	0xe1, 0x9d, 0xf5, 0x17, 0x21, 0xd6, 0x11, 0xc8, 0x93, 0x5b, 0x8c, 0x8b, 0x27, 0x99, 0x64, 0xca,
-	0x93, 0xe4, 0x0a, 0x37, 0x2a, 0x03, 0x69, 0xb1, 0xdf, 0xe0, 0xec, 0x27, 0x9e, 0x73, 0xf8, 0x87,
-	0x63, 0x39, 0xbd, 0xef, 0x4e, 0x3f, 0xa9, 0xf5, 0x9a, 0x53, 0x6b, 0x9a, 0x53, 0x34, 0xcb, 0x29,
-	0xfa, 0xc8, 0x29, 0x7a, 0x5e, 0x50, 0x6b, 0xb6, 0xa0, 0xd6, 0xdb, 0x82, 0x5a, 0x37, 0xc7, 0xdf,
-	0x10, 0x56, 0xe3, 0xba, 0x7a, 0x38, 0x54, 0x9e, 0x12, 0x23, 0x1e, 0xa4, 0x83, 0x22, 0x8d, 0xc9,
-	0x32, 0x97, 0x12, 0x68, 0x50, 0x2f, 0xf7, 0x7d, 0xfa, 0x15, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x07,
-	0x95, 0x31, 0xb5, 0x01, 0x00, 0x00,
+	// 321 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x3f, 0x4e, 0xc3, 0x30,
+	0x14, 0x87, 0x63, 0xa8, 0x5a, 0xb0, 0x10, 0x7f, 0x2c, 0x10, 0x51, 0x24, 0xdc, 0xd2, 0xa9, 0x0b,
+	0x36, 0x05, 0x71, 0x81, 0x4e, 0x30, 0xc0, 0x10, 0x36, 0x84, 0x84, 0xdc, 0xe0, 0x26, 0x16, 0x4d,
+	0x1c, 0xf2, 0x9c, 0xb4, 0xdc, 0xa2, 0xc7, 0xe0, 0x28, 0x1d, 0x3b, 0x22, 0x86, 0x0a, 0xd2, 0x8b,
+	0xa0, 0x24, 0x6d, 0x25, 0x18, 0xd8, 0x9e, 0xfd, 0x7d, 0x7e, 0xf2, 0xfb, 0x3d, 0xec, 0x80, 0x8c,
+	0x8c, 0x8a, 0xe4, 0x90, 0xc3, 0x48, 0xc4, 0x3c, 0xeb, 0xf2, 0x10, 0x7c, 0x16, 0x27, 0xda, 0x68,
+	0xb2, 0xbf, 0x62, 0xac, 0x60, 0x2c, 0xeb, 0x3a, 0x87, 0xbe, 0xf6, 0x75, 0x09, 0x79, 0x51, 0x55,
+	0x5e, 0x7b, 0x82, 0xf0, 0xee, 0x2d, 0xf8, 0xf7, 0x23, 0x11, 0xbb, 0xf2, 0x35, 0x95, 0x60, 0x08,
+	0xc1, 0xb5, 0x41, 0xa2, 0x43, 0x1b, 0xb5, 0x50, 0x67, 0xdb, 0x2d, 0x6b, 0x72, 0x8c, 0x1b, 0x66,
+	0xfc, 0x14, 0x08, 0x08, 0xec, 0x8d, 0x16, 0xea, 0xec, 0xb8, 0x75, 0x33, 0xbe, 0x16, 0x10, 0x10,
+	0x07, 0x6f, 0x25, 0xd2, 0x93, 0x2a, 0x93, 0x89, 0xbd, 0x59, 0x3e, 0x58, 0x9f, 0xc9, 0x15, 0xae,
+	0x8b, 0x50, 0xa7, 0x91, 0xb1, 0x6b, 0x05, 0xe9, 0x9d, 0x4c, 0xe7, 0x4d, 0xeb, 0x73, 0xde, 0x3c,
+	0xf2, 0x34, 0x84, 0x1a, 0xe0, 0xf9, 0x85, 0x29, 0xcd, 0x43, 0x61, 0x02, 0x76, 0x13, 0x19, 0x77,
+	0x29, 0xb7, 0x0f, 0xf0, 0xde, 0xfa, 0x47, 0x10, 0xeb, 0x08, 0xe4, 0xc5, 0x23, 0xc6, 0xc5, 0x95,
+	0x4c, 0x32, 0xe5, 0x49, 0x72, 0x87, 0x1b, 0x4b, 0x81, 0xb4, 0xd8, 0xdf, 0x39, 0xd9, 0xef, 0x69,
+	0x9c, 0xd3, 0x7f, 0x8c, 0xaa, 0x7b, 0xcf, 0x9d, 0x7e, 0x53, 0xeb, 0x3d, 0xa7, 0xd6, 0x34, 0xa7,
+	0x68, 0x96, 0x53, 0xf4, 0x95, 0x53, 0x34, 0x59, 0x50, 0x6b, 0xb6, 0xa0, 0xd6, 0xc7, 0x82, 0x5a,
+	0x0f, 0xe7, 0xbe, 0x32, 0x41, 0xda, 0x67, 0x9e, 0x0e, 0xf9, 0xaa, 0xdd, 0x99, 0x1e, 0x0c, 0x94,
+	0xa7, 0xc4, 0x90, 0x07, 0x69, 0xbf, 0x08, 0x7f, 0x5c, 0xad, 0xc1, 0xbc, 0xc5, 0x12, 0xfa, 0xf5,
+	0x32, 0xde, 0xcb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5e, 0xa2, 0xe4, 0x49, 0xa4, 0x01, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.