[Disk Utilization] Flatten remaining events

proto/pocket/application/event.proto

@@ -19,27 +19,48 @@ enum ApplicationUnbondingReason {
 
 // EventApplicationStaked is emitted when an application is staked or up-staked.
 message EventApplicationStaked {
-  pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  // Next index: 5
+
+  // pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  reserved 1;
+
   // The end height of the session in which the application was staked.
   int64 session_end_height = 2 [(gogoproto.jsontag) = "session_end_height"];
+  // The address of the application that was staked.
+  string application_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  // The amount of stake.
+  string stake = 4 [(gogoproto.jsontag) = "stake"];
 }
 
 // EventRedelegation is an event emitted whenever an application changes its
 // delegatee gateways on chain. This is in response to both a DelegateToGateway
 // and UndelegateFromGateway message.
 message EventRedelegation {
-  // The application which was redelegated.
-  pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  // Next index: 4
+
+  // pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  reserved 1;
+
   // The end height of the session in which the redelegation was committed.
   int64 session_end_height = 2 [(gogoproto.jsontag) = "session_end_height"];
+  // The address of the application that was redelegated.
+  string application_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 // EventTransferBegin is emitted whenever an application begins a transfer. It
 // includes the source application state immediately after the transfer began.
 message EventTransferBegin {
+  // Next index: 6
+
+  // pocket.application.Application source_application = 3;
+  reserved 3;
+
+  // The address of the application from which the transfer is being made.
   string source_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+
+  // The address of the new application to which the transfer is being made.
   string destination_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  pocket.application.Application source_application = 3;
+
   // The end height of the session in which the transfer began.
   int64 session_end_height = 4 [(gogoproto.jsontag) = "session_end_height"];
   // The height at which the transfer will complete.
@@ -51,11 +72,17 @@ message EventTransferBegin {
 // Either EventTransferEnd or EventTransferError will be emitted corresponding to
 // any given EventTransferBegin event.
 message EventTransferEnd {
+  // Next index: 6
+
+  // pocket.application.Application destination_application = 3;
+  reserved 3;
+
   string source_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   string destination_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  pocket.application.Application destination_application = 3;
+
   // The end height of the session in which the transfer ended.
   int64 session_end_height = 4 [(gogoproto.jsontag) = "session_end_height"];
+
   // The height at which the transfer completed.
   int64 transfer_end_height = 5 [(gogoproto.jsontag) = "transfer_end_height"];
 }
@@ -66,9 +93,14 @@ message EventTransferEnd {
 // Either EventTransferEnd or EventTransferError will be emitted corresponding to
 // any given EventTransferBegin event.
 message EventTransferError {
+  // Next index: 6
+
+  // pocket.application.Application source_application = 3;
+  reserved 3;
+
   string source_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   string destination_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-  pocket.application.Application source_application = 3;
+
   // The end height of the session in which the transfer failed.
   int64 session_end_height = 4 [(gogoproto.jsontag) = "session_end_height"];
   string error = 5;
@@ -80,31 +112,55 @@ message EventTransferError {
 // unbonding. The unbonding period is determined by the shared param,
 // application_unbonding_period_sessions.
 message EventApplicationUnbondingBegin {
-  pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  // Next index: 6
+
+  // pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  reserved 1;
+
+  // The reason for the unbonding (elective, below min stake, or migration).
   ApplicationUnbondingReason reason = 2 [(gogoproto.jsontag) = "reason"];
   // The end height of the session in which the unbonding began.
+
   int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
   // The height at which application unbonding will end.
+
   int64 unbonding_end_height = 4 [(gogoproto.jsontag) = "unbonding_height"];
+  // The address of the application that began unbonding.
+  string application_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 // EventApplicationUnbondingEnd is emitted when an application has completed
 // unbonding. The unbonding period is determined by the shared param,
 // application_unbonding_period_sessions.
 message EventApplicationUnbondingEnd {
-  pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  // Next index: 6
+
+  // pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  reserved 1;
+
+  // The reason for the unbonding (elective, below min stake, or migration).
   ApplicationUnbondingReason reason = 2 [(gogoproto.jsontag) = "reason"];
+
   // The end height of the session in which the unbonding ended.
   int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
+
   // The height at which application unbonding ended.
   int64 unbonding_end_height = 4 [(gogoproto.jsontag) = "unbonding_height"];
+  // The address of the application that completed unbonding.
+  string application_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 // EventApplicationUnbondingCanceled is emitted when an application which was unbonding
 // successfully (re-)stakes before the unbonding period has elapsed. An EventApplicationStaked
 // event will also be emitted immediately after this event.
 message EventApplicationUnbondingCanceled {
-  pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  // Next index: 4
+
+  // pocket.application.Application application = 1 [(gogoproto.jsontag) = "application"];
+  reserved 1;
+
   // The end height of the session in which the unbonding was canceled.
   int64 session_end_height = 2 [(gogoproto.jsontag) = "session_end_height"];
+  // The address of the application that canceled unbonding.
+  string application_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }

proto/pocket/gateway/event.proto

@@ -11,40 +11,70 @@ import "pocket/gateway/types.proto";
 
 // EventGatewayStaked is emitted when a gateway is staked or up-staked.
 message EventGatewayStaked {
-  // The gateway that has been staked.
-  Gateway gateway = 1 [(gogoproto.jsontag) = "gateway"];
+  // Next index: 5
+
+  // Gateway gateway = 1 [(gogoproto.jsontag) = "gateway"];
+  reserved 1;
+
   // The end height of the session in which gateway was staked.
   int64 session_end_height = 2 [(gogoproto.jsontag) = "session_end_height"];
+
+  // The address of the gateway that has been staked.
+  string gateway_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+
+  // The amount of stake.
+  string stake = 4 [(gogoproto.jsontag) = "stake"];
 }
 
 // EventGatewayUnbondingBegin is emitted when a gateway begins unbonding.
 // It is triggered by the commitment of an unstake gateway message.
 // This event signals that a gateway has begun unbonding.
 // The unbonding period is determined by the shared param gateway_unbonding_period_sessions.
 message EventGatewayUnbondingBegin {
-  pocket.gateway.Gateway gateway = 1 [(gogoproto.jsontag) = "gateway"];
+  // Next index: 6
+
+  // pocket.gateway.Gateway gateway = 1 [(gogoproto.jsontag) = "gateway"];
+  reserved 1;
+
   // The end height of the session in which the unbonding began.
   int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
+
   // The height at which gateway unbonding will end.
   int64 unbonding_end_height = 4 [(gogoproto.jsontag) = "unbonding_height"];
+
+  // The address of the gateway that began unbonding.
+  string gateway_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 // EventGatewayUnbondingEnd is emitted when a gateway has completed unbonding.
 // The unbonding period is determined by the shared param gateway_unbonding_period_sessions.
 message EventGatewayUnbondingEnd {
-  // The gateway that has completed unbonding.
-  pocket.gateway.Gateway gateway = 1 [(gogoproto.jsontag) = "gateway"];
+  // Next index: 6
+
+  // pocket.gateway.Gateway gateway = 1 [(gogoproto.jsontag) = "gateway"];
+  reserved 1;
+
   // The end height of the session in which the unbonding began.
   int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
+
   // The height at which gateway unbonding will end.
   int64 unbonding_end_height = 4 [(gogoproto.jsontag) = "unbonding_height"];
+
+  // The address of the gateway that completed unbonding.
+  string gateway_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 // EventGatewayUnbondingCanceled is emitted when a gateway which was unbonding
 // successfully (re-)stakes before the unbonding period has elapsed.
 // An EventGatewayStaked event will also be emitted immediately after this event.
 message EventGatewayUnbondingCanceled {
-  pocket.gateway.Gateway gateway = 1 [(gogoproto.jsontag) = "gateway"];
+  // Next index: 4
+
+  // pocket.gateway.Gateway gateway = 1 [(gogoproto.jsontag) = "gateway"];
+  reserved 1;
+
   // The end height of the session in which the unbonding was canceled.
   int64 session_end_height = 2 [(gogoproto.jsontag) = "session_end_height"];
+  // The address of the gateway that canceled unbonding.
+  string gateway_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }

proto/pocket/migration/event.proto

@@ -51,7 +51,7 @@ message EventMorseAccountClaimed {
 // EventMorseApplicationClaimed
 // - Emitted when a MorseAccount is claimed on-chain as a staked application
 message EventMorseApplicationClaimed {
-  // Next index: 8
+  // Next index: 9
 
   reserved 2; // cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
   reserved 4; // cosmos.base.v1beta1.Coin claimed_application_stake = 4 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "claimed_application_stake"];
@@ -62,9 +62,11 @@ message EventMorseApplicationClaimed {
   // Hex-encoded Morse account address whose balance was claimed
   string morse_src_address = 3 [(gogoproto.jsontag) = "morse_src_address"];
 
-  // Application staked as a result of the claim
-  // - Mirrors Morse application stake
-  application.Application application = 5 [(gogoproto.jsontag) = "application"];
+  // pocket.application.Application application = 5 [(gogoproto.jsontag) = "application"];
+  reserved 5;
+
+  // Application address staked as a result of the claim
+  string application_address = 8 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
   // Unstaked balance claimed from Morse
   string claimed_balance = 6 [(gogoproto.jsontag) = "claimed_balance"];
@@ -77,7 +79,7 @@ message EventMorseApplicationClaimed {
 // EventMorseSupplierClaimed
 // - Emitted when a MorseAccount is claimed on-chain as a staked Supplier
 message EventMorseSupplierClaimed {
-  // Next index: 11
+  // Next index: 13
 
   // cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
   // cosmos.base.v1beta1.Coin claimed_supplier_stake = 4 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "claimed_supplier_stake"];
@@ -116,9 +118,14 @@ message EventMorseSupplierClaimed {
   // - Equivalent to Morse supplier staked amount
   string claimed_supplier_stake = 10 [(gogoproto.jsontag) = "claimed_supplier_stake"];
 
-  // Supplier staked as a result of the claim
-  // - Mirrors Morse supplier stake
-  shared.Supplier supplier = 5 [(gogoproto.jsontag) = "supplier"];
+  // shared.Supplier supplier = 5 [(gogoproto.jsontag) = "supplier"];
+  reserved 5;
+
+  // The operator address of the supplier.
+  string supplier_operator_address = 11 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+
+  // The owner address of the supplier.
+  string supplier_owner_address = 12 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 // EventMorseAccountRecovered

proto/pocket/supplier/event.proto

@@ -33,35 +33,66 @@ message EventSupplierStaked {
 // EventSupplierUnbondingBegin is emitted when an application unstake message
 // is committed onchain, indicating that the supplier will now begin unbonding.
 message EventSupplierUnbondingBegin {
-  pocket.shared.Supplier supplier = 1 [(gogoproto.jsontag) = "supplier"];
+  // Next index: 7
+
+  // pocket.shared.Supplier supplier = 1 [(gogoproto.jsontag) = "supplier"];
+  reserved 1;
+
   SupplierUnbondingReason reason = 2 [(gogoproto.jsontag) = "reason"];
   // The session end height of the last session in which the supplier unbonding began.
   int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
   // The height at which supplier unbonding will end.
   int64 unbonding_end_height = 4 [(gogoproto.jsontag) = "unbonding_end_height"];
+
+  // The operator address of the supplier.
+  string operator_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+
+  // The owner address of the supplier.
+  string owner_address = 6 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 // EventSupplierUnbondingEnd is emitted when an supplier has completed
 // unbonding. The unbonding period is determined by the shared param,
 // supplier_unbonding_period_sessions.
 message EventSupplierUnbondingEnd {
-  pocket.shared.Supplier supplier = 1 [(gogoproto.jsontag) = "supplier"];
+  // Next index: 7
+
+  // pocket.shared.Supplier supplier = 1 [(gogoproto.jsontag) = "supplier"];
+  reserved 1;
+
   SupplierUnbondingReason reason = 2 [(gogoproto.jsontag) = "reason"];
   // The session end height of the session in which the supplier unbonding endeded.
   int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
   // The height at which supplier unbonding will end.
   int64 unbonding_end_height = 4 [(gogoproto.jsontag) = "unbonding_end_height"];
+
+  // The operator address of the supplier.
+  string operator_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+
+  // The owner address of the supplier.
+  string owner_address = 6 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 // EventSupplierUnbondingCanceled is emitted when an supplier which was unbonding
 // successfully (re-)stakes before the unbonding period has elapsed. An EventSupplierStaked
 // event will also be emitted immediately after this event.
 message EventSupplierUnbondingCanceled {
-  pocket.shared.Supplier supplier = 1 [(gogoproto.jsontag) = "supplier"];
-  // The exact height at which the supplier unbonding was canceled.
-  int64 height = 3 [(gogoproto.jsontag) = "height"];
+  // Next index: 6
+
+  // pocket.shared.Supplier supplier = 1 [(gogoproto.jsontag) = "supplier"];
+  reserved 1;
+
   // The session end height of the session in which the supplier unbonding was canceled.
+
   int64 session_end_height = 2 [(gogoproto.jsontag) = "session_end_height"];
+  // The exact height at which the supplier unbonding was canceled.
+  int64 height = 3 [(gogoproto.jsontag) = "height"];
+
+  // The operator address of the supplier.
+  string operator_address = 4 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+
+  // The owner address of the supplier.
+  string owner_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 }
 
 // EventSupplierServiceConfigActivated is emitted when a supplier service configuration

tests/integration/application/application_transfer_test.go

@@ -438,15 +438,6 @@ func (s *appTransferTestSuite) shouldObserveTransferBeginEvent(
 	evtDstAddr, hasDstAddr := events.GetAttributeValue(targetTransferBeginEvent, "destination_address")
 	require.True(s.T(), hasDstAddr)
 	require.Equal(s.T(), expectedDstAppBech32, evtDstAddr)
-
-	evtSrcApp := new(apptypes.Application)
-	evtSrcAppStr, hasSrcApp := events.GetAttributeValue(targetTransferBeginEvent, "source_application")
-	require.True(s.T(), hasSrcApp)
-
-	evtSrcAppBz := []byte(evtSrcAppStr)
-	err := s.GetApp().GetCodec().UnmarshalJSON(evtSrcAppBz, evtSrcApp)
-	require.NoError(s.T(), err)
-	require.EqualValues(s.T(), expectedSrcApp.GetPendingTransfer(), evtSrcApp.GetPendingTransfer())
 }
 
 // shouldObserveTransferEndEvent asserts that the transfer end event from
@@ -480,13 +471,4 @@ func (s *appTransferTestSuite) shouldObserveTransferEndEvent(
 	evtDstAddr, hasDstAddrAttr := events.GetAttributeValue(targetTransferEndEvent, "destination_address")
 	require.True(s.T(), hasDstAddrAttr)
 	require.Equal(s.T(), expectedDstApp.GetAddress(), evtDstAddr)
-
-	evtDstApp := new(apptypes.Application)
-	evtDstAppStr, hasDstAppAttr := events.GetAttributeValue(targetTransferEndEvent, "destination_application")
-	require.True(s.T(), hasDstAppAttr)
-
-	evtDstAppBz := []byte(evtDstAppStr)
-	err := s.GetApp().GetCodec().UnmarshalJSON(evtDstAppBz, evtDstApp)
-	require.NoError(s.T(), err)
-	require.EqualValues(s.T(), expectedDstApp.GetPendingTransfer(), evtDstApp.GetPendingTransfer())
 }

tests/integration/application/min_stake_test.go

@@ -291,7 +291,7 @@ func (s *applicationMinStakeTestSuite) assertUnbondingBeginEventObserved(expecte
 	unbondingEndHeight := apptypes.GetApplicationUnbondingHeight(&sharedParams, expectedApp)
 	sessionEndHeight := s.keepers.GetSessionEndHeight(s.ctx, s.getCurrentHeight())
 	expectedAppUnbondingBeginEvent := &apptypes.EventApplicationUnbondingBegin{
-		Application:        expectedApp,
+		ApplicationAddress: expectedApp.Address,
 		Reason:             apptypes.ApplicationUnbondingReason_APPLICATION_UNBONDING_REASON_BELOW_MIN_STAKE,
 		SessionEndHeight:   sessionEndHeight,
 		UnbondingEndHeight: unbondingEndHeight,
@@ -312,7 +312,7 @@ func (s *applicationMinStakeTestSuite) assertUnbondingEndEventObserved(expectedA
 	unbondingEndHeight := apptypes.GetApplicationUnbondingHeight(&sharedParams, expectedApp)
 	unbondingSessionEndHeight := apptypes.GetApplicationUnbondingHeight(&sharedParams, expectedApp)
 	expectedAppUnbondingEndEvent := &apptypes.EventApplicationUnbondingEnd{
-		Application:        expectedApp,
+		ApplicationAddress: expectedApp.Address,
 		Reason:             apptypes.ApplicationUnbondingReason_APPLICATION_UNBONDING_REASON_BELOW_MIN_STAKE,
 		SessionEndHeight:   unbondingSessionEndHeight,
 		UnbondingEndHeight: unbondingEndHeight,