Optimize balance handling, fix indexing, and update to poktroll events (#60)

- Refactor balance change handling to improve speed
- Fix claim indexing
- Remove `NativeBalanceChange` since was not used and slowing down the
entire process
- Updated code to match the changes made to poktroll events:
  - pokt-network/poktroll#1682
  - pokt-network/poktroll#1673
  - pokt-network/poktroll#1672

Author: jorgecuesta

proto/pocket/application/module/module.proto

@@ -6,6 +6,8 @@ option (gogoproto.stable_marshaler_all) = true;
 import "cosmos/app/v1alpha1/module.proto";
 import "gogoproto/gogo.proto";
 
+option go_package = "github.com/pokt-network/poktroll/x/application/types";
+
 // Module is the config object for the module.
 message Module {
   option (cosmos.app.v1alpha1.module) = {

proto/pocket/application/tx.proto

@@ -61,7 +61,8 @@ message MsgStakeApplication {
 }
 
 message MsgStakeApplicationResponse {
-  pocket.application.Application application = 1;
+  // pocket.application.Application application = 1;
+  reserved 1;
 }
 
 message MsgUnstakeApplication {
@@ -70,7 +71,8 @@ message MsgUnstakeApplication {
 }
 
 message MsgUnstakeApplicationResponse {
-  pocket.application.Application application = 1;
+  // pocket.application.Application application = 1;
+  reserved 1;
 }
 
 message MsgDelegateToGateway {
@@ -80,7 +82,8 @@ message MsgDelegateToGateway {
 }
 
 message MsgDelegateToGatewayResponse {
-  pocket.application.Application application = 1;
+  // pocket.application.Application application = 1;
+  reserved 1;
 }
 
 message MsgUndelegateFromGateway {
@@ -90,7 +93,8 @@ message MsgUndelegateFromGateway {
 }
 
 message MsgUndelegateFromGatewayResponse {
-  pocket.application.Application application = 1;
+  // pocket.application.Application application = 1;
+  reserved 1;
 }
 
 message MsgTransferApplication {
@@ -100,7 +104,8 @@ message MsgTransferApplication {
 }
 
 message MsgTransferApplicationResponse {
-  pocket.application.Application application = 1;
+  // pocket.application.Application application = 1;
+  reserved 1;
 }
 
 message MsgUpdateParam {
@@ -117,6 +122,7 @@ message MsgUpdateParam {
 }
 
 message MsgUpdateParamResponse {
-  Params params = 1;
+  // Params params = 1;
+  reserved 1;
 }
 

proto/pocket/application/types.proto

@@ -1,7 +1,3 @@
-// TODO_AUTOMATE: Add a CI workflow that automatically detects .proto files with names incompatible with the package name (e.g., files named exactly as the package, like "application.proto").
-// NB: This file CANNOT be named "application.proto" due to an unresolved issue in how cosmos-proto generates the pulsar plugin output Go source code.
-// See: https://github.com/pokt-network/poktroll/issues/XXX for tracking and future resolution.
-
 syntax = "proto3";
 package pocket.application;
 

proto/pocket/gateway/module/module.proto

@@ -6,6 +6,8 @@ option (gogoproto.stable_marshaler_all) = true;
 import "cosmos/app/v1alpha1/module.proto";
 import "gogoproto/gogo.proto";
 
+option go_package = "github.com/pokt-network/poktroll/x/gateway/types";
+
 // Module is the config object for the module.
 message Module {
   option (cosmos.app.v1alpha1.module) = {

proto/pocket/gateway/tx.proto

@@ -52,7 +52,8 @@ message MsgStakeGateway {
 }
 
 message MsgStakeGatewayResponse {
-  pocket.gateway.Gateway gateway = 1;
+  // pocket.gateway.Gateway gateway = 1;
+  reserved 1;
 }
 
 message MsgUnstakeGateway {
@@ -61,7 +62,8 @@ message MsgUnstakeGateway {
 }
 
 message MsgUnstakeGatewayResponse {
-  pocket.gateway.Gateway gateway = 1;
+  // pocket.gateway.Gateway gateway = 1;
+  reserved 1;
 }
 
 // MsgUpdateParam is the Msg/UpdateParam request type to update a single param.
@@ -78,6 +80,7 @@ message MsgUpdateParam {
 }
 
 message MsgUpdateParamResponse {
-  Params params = 1;
+  // Params params = 1;
+  reserved 1;
 }
 

proto/pocket/gateway/types.proto

@@ -1,7 +1,3 @@
-// TODO_AUTOMATE: Add a CI workflow which detects .proto files with incompatible names (i.e. same as the package).
-// NB: This file CANNOT be named "application.proto" due to an as of yet unidentified
-// issue in how cosmos-proto generates the pulsar plugin output go source code.
-
 syntax = "proto3";
 package pocket.gateway;
 

proto/pocket/migration/event.proto

@@ -6,7 +6,6 @@ option (gogoproto.stable_marshaler_all) = true;
 
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
-import "cosmos/base/v1beta1/coin.proto";
 
 import "pocket/shared/service.proto";
 import "pocket/migration/morse_onchain.proto";
@@ -32,51 +31,63 @@ message EventImportMorseClaimableAccounts {
 // EventMorseAccountClaimed
 // - Emitted when a MorseAccount is claimed on-chain
 message EventMorseAccountClaimed {
+  // Next index: 6
+
+  reserved 2; // cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
+
   // Shannon session end height in which the claim was committed
   int64 session_end_height = 1 [(gogoproto.jsontag) = "session_end_height"];
 
-  // Unstaked balance claimed from Morse
-  cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
-
   // bech32-encoded Shannon address to mint claimed balance
   string shannon_dest_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_dest_address"];
 
   // Hex-encoded Morse account address whose balance was claimed
   string morse_src_address = 4 [(gogoproto.jsontag) = "morse_src_address"];
+
+  // Unstaked balance claimed from Morse
+  string claimed_balance = 5 [(gogoproto.jsontag) = "claimed_balance"];
 }
 
 // EventMorseApplicationClaimed
 // - Emitted when a MorseAccount is claimed on-chain as a staked application
 message EventMorseApplicationClaimed {
+  // Next index: 8
+
+  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"];
+
   // Shannon session end height in which the claim was committed
   int64 session_end_height = 1 [(gogoproto.jsontag) = "session_end_height"];
 
-  // Unstaked balance claimed from Morse
-  cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
-
   // Hex-encoded Morse account address whose balance was claimed
   string morse_src_address = 3 [(gogoproto.jsontag) = "morse_src_address"];
 
-  // Application stake claimed as a result of the claim
-  // - Equivalent to Morse application staked amount
-  cosmos.base.v1beta1.Coin claimed_application_stake = 4 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "claimed_application_stake"];
-
   // Application staked as a result of the claim
   // - Mirrors Morse application stake
   application.Application application = 5 [(gogoproto.jsontag) = "application"];
+
+  // Unstaked balance claimed from Morse
+  string claimed_balance = 6 [(gogoproto.jsontag) = "claimed_balance"];
+
+  // Application stake claimed as a result of the claim
+  // - Equivalent to Morse application staked amount
+  string claimed_application_stake = 7 [(gogoproto.jsontag) = "claimed_application_stake"];
 }
 
 // EventMorseSupplierClaimed
 // - Emitted when a MorseAccount is claimed on-chain as a staked Supplier
 message EventMorseSupplierClaimed {
-  // Next free index: 9
-  reserved 3;
+  // Next index: 11
+
+  // 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"];
+  reserved 2, 3, 4;
 
   // Shannon session end height in which the claim was committed
   int64 session_end_height = 1 [(gogoproto.jsontag) = "session_end_height"];
 
   // Unstaked balance claimed from Morse
-  cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
+  string claimed_balance = 9 [(gogoproto.jsontag) = "claimed_balance"];
 
   // The hex-encoded address of the Morse non-custodial (i.e. operator) account.
   // - Unstaked balance was migrated 1:1
@@ -103,7 +114,7 @@ message EventMorseSupplierClaimed {
 
   // Supplier stake claimed as a result of the claim
   // - Equivalent to Morse supplier staked amount
-  cosmos.base.v1beta1.Coin claimed_supplier_stake = 4 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "claimed_supplier_stake"];
+  string claimed_supplier_stake = 10 [(gogoproto.jsontag) = "claimed_supplier_stake"];
 
   // Supplier staked as a result of the claim
   // - Mirrors Morse supplier stake
@@ -113,13 +124,18 @@ message EventMorseSupplierClaimed {
 // EventMorseAccountRecovered
 // - Emitted when a Morse account is recovered on-chain
 message EventMorseAccountRecovered {
+  // Next index: 6
+
+  // cosmos.base.v1beta1.Coin recovered_balance = 2 [(gogoproto.jsontag) = "recovered_balance", (gogoproto.nullable) = false];
+  reserved 2;
+
   // The session end height (on Shannon) in which the recovery was committed (i.e. claimed).
   int64 session_end_height = 1 [(gogoproto.jsontag) = "session_end_height"];
 
   // The total balance which was recovered:
   // - Includes both unstaked and staked balances (consolidated)
   // - Auto-liquidates both unstaked and staked balances at once
-  cosmos.base.v1beta1.Coin recovered_balance = 2 [(gogoproto.jsontag) = "recovered_balance", (gogoproto.nullable) = false];
+  string recovered_balance = 5 [(gogoproto.jsontag) = "recovered_balance"];
 
   // The bech32-encoded address of the Shannon account to which the recovered balance was minted.
   string shannon_dest_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_dest_address"];

proto/pocket/migration/module/module.proto

@@ -6,6 +6,8 @@ option (gogoproto.stable_marshaler_all) = true;
 import "cosmos/app/v1alpha1/module.proto";
 import "gogoproto/gogo.proto";
 
+option go_package = "github.com/pokt-network/poktroll/x/migration/types";
+
 // Module is the config object for the module.
 message Module {
   option (cosmos.app.v1alpha1.module) = {

proto/pocket/migration/tx.proto

@@ -90,11 +90,9 @@ message MsgImportMorseClaimableAccounts {
 message MsgImportMorseClaimableAccountsResponse {
   // Next free index: 3
 
-  // On-chain computed sha256 hash of the morse_account_state provided in the corresponding MsgCreateMorseAccountState.
-  bytes state_hash = 1 [(gogoproto.jsontag) = "state_hash"];
-
-  // Number of claimable accounts (EOAs) collected from Morse state export.
-  uint64 num_accounts = 2 [(gogoproto.jsontag) = "num_accounts"];
+  // bytes state_hash = 1 [(gogoproto.jsontag) = "state_hash"];
+  // uint64 num_accounts = 2 [(gogoproto.jsontag) = "num_accounts"];
+  reserved 1, 2;
 }
 
 // MsgClaimMorseAccount is used to:
@@ -136,15 +134,10 @@ message MsgClaimMorseAccount {
 message MsgClaimMorseAccountResponse {
   // Next free index: 4
 
-  // The hex-encoded address of the Morse account whose balance will be claimed.
-  // E.g.: 00f9900606fa3d5c9179fc0c8513078a53a2073e
-  string morse_src_address = 1 [(gogoproto.jsontag) = "morse_src_address"];
-
-  // The balance which was claimed.
-  cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
-
-  // The session end height (on Shannon) in which the claim was committed (i.e. claimed).
-  int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
+  // string morse_src_address = 1 [(gogoproto.jsontag) = "morse_src_address"];
+  // cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
+  // int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
+  reserved 1, 2, 3;
 }
 
 // MsgClaimMorseApplication is used to:
@@ -190,21 +183,12 @@ message MsgClaimMorseApplication {
 message MsgClaimMorseApplicationResponse {
   // Next free index: 6
 
-  // The hex-encoded address of the Morse account whose balance will be claimed.
-  string morse_src_address = 1 [(gogoproto.jsontag) = "morse_src_address"];
-
-  // The unstaked balance which was claimed.
-  cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
-
-  // The stake of the application which was staked as a result of the claim.
-  // If the application was already staked, this amount does not include the initial stake (i.e. only the portion which was "claimed").
-  cosmos.base.v1beta1.Coin claimedApplicationStake = 3 [(gogoproto.jsontag) = "claimed_application_stake", (gogoproto.nullable) = false];
-
-  // The session end height (on Shannon) in which the claim was committed (i.e. claimed).
-  int64 session_end_height = 4 [(gogoproto.jsontag) = "session_end_height"];
-
-  // The application which was staked as a result of the claim.
-  application.Application application = 5 [(gogoproto.jsontag) = "application"];
+  // string morse_src_address = 1 [(gogoproto.jsontag) = "morse_src_address"];
+  // cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.jsontag) = "claimed_balance", (gogoproto.nullable) = false];
+  // cosmos.base.v1beta1.Coin claimedApplicationStake = 3 [(gogoproto.jsontag) = "claimed_application_stake", (gogoproto.nullable) = false];
+  // int64 session_end_height = 4 [(gogoproto.jsontag) = "session_end_height"];
+  // application.Application application = 5 [(gogoproto.jsontag) = "application"];
+  reserved 1, 2, 3, 4, 5;
 }
 
 // MsgClaimMorseSupplier is used to:
@@ -279,39 +263,14 @@ message MsgClaimMorseSupplier {
 message MsgClaimMorseSupplierResponse {
   // Next free index: 10
 
-  reserved 1;
-
-  // The hex-encoded address of the Morse non-custodial (i.e. operator) account.
-  // - Unstaked balance will be migrated 1:1
-  // - Stake will be migrated 1:1 from morse_node_address to shannon_operator_address
-  // - Morse non-custodial (i.e. operator) address.
-  // If morse_output_address is not set, this is the custodial address.
-  // - See 'pocket nodes --help' for more information. Note that this refers to the Morse CLI.
-  // E.g.: 00f9900606fa3d5c9179fc0c8513078a53a2073e
-  string morse_node_address = 9 [(gogoproto.jsontag) = "morse_node_address"];
-
-  // Hex-encoded address of the Morse output account/wallet associated with the Morse node/supplier.
-  // - E.g.: 00f9900606fa3d5c9179fc0c8513078a53a2073e
-  // - Morse custodial (i.e. owner) address, which owns the staked tokens of the operator.
-  //   See 'pocket nodes --help' for more information. Note that this refers to the Morse CLI.
-  string morse_output_address = 8 [(gogoproto.jsontag) = "morse_output_address"];
-
-  // The type of supplier claim signer, indicating which actor executed the claim
-  // and whether it was a custodial or non-custodial claim.
-  // - MORSE_SUPPLIER_CLAIM_SIGNER_TYPE_NON_CUSTODIAL_SIGNED_BY_ADDR
-  // - MORSE_SUPPLIER_CLAIM_SIGNER_TYPE_CUSTODIAL_SIGNED_BY_OPERATOR
-  // - MORSE_SUPPLIER_CLAIM_SIGNER_TYPE_CUSTODIAL_SIGNED_BY_OWNER
-  MorseSupplierClaimSignerType claim_signer_type = 7 [(gogoproto.jsontag) = "claim_signer_type"];
-
-  // The unstaked balance which was claimed.
-  cosmos.base.v1beta1.Coin claimed_balance        = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "claimed_balance"       ];
-  cosmos.base.v1beta1.Coin claimed_supplier_stake = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "claimed_supplier_stake"];
-
-  // The session end height (on Shannon) in which the claim was committed (i.e. claimed).
-  int64 session_end_height = 4 [(gogoproto.jsontag) = "session_end_height"];
-
-  // The supplier which was staked as a result of the claim.
-  shared.Supplier supplier = 5 [(gogoproto.jsontag) = "supplier"];
+  // string morse_node_address = 9 [(gogoproto.jsontag) = "morse_node_address"];
+  // string morse_output_address = 8 [(gogoproto.jsontag) = "morse_output_address"];
+  // MorseSupplierClaimSignerType claim_signer_type = 7 [(gogoproto.jsontag) = "claim_signer_type"];
+  // cosmos.base.v1beta1.Coin claimed_balance = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "claimed_balance"];
+  // cosmos.base.v1beta1.Coin claimed_supplier_stake = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "claimed_supplier_stake"];
+  // int64 session_end_height = 4 [(gogoproto.jsontag) = "session_end_height"];
+  // shared.Supplier supplier = 5 [(gogoproto.jsontag) = "supplier"];
+  reserved 1, 2, 3, 4, 5, 7, 8, 9;
 }
 
 // MsgRecoverMorseAccount is used to:
@@ -353,23 +312,11 @@ message MsgRecoverMorseAccount {
 message MsgRecoverMorseAccountResponse {
   // Next free index: 5
 
-  // EITHER:
-  // - The hex-encoded address of the Morse account whose stake(s) and/or balances were recovered.
-  //   This address MAY be invalid but NEVER empty.
-  //   E.g.: 00f9900606fa3d5c9179fc0c8513078a53a2073e
-  // - The name of a Morse module account whose balance was recovered.
-  //   E.g. "dao" or "fee-collector"
-  string morse_src_address = 1 [(gogoproto.jsontag) = "morse_src_address"];
-
-  // The sum of any unstaked and staked balances which were recovered.
-  cosmos.base.v1beta1.Coin recovered_balance = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "recovered_balance"];
-
-  // The session end height (on Shannon) in which the recovery was committed (i.e. recovered).
-  int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
-
-  // The bech32-encoded address of the Shannon account to which the Morse account's stake(s) and/or
-  // balance(s) were recovered.
-  string shannon_dest_address = 4 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_dest_address"];
+  // string morse_src_address = 1 [(gogoproto.jsontag) = "morse_src_address"];
+  // cosmos.base.v1beta1.Coin recovered_balance = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "recovered_balance"];
+  // int64 session_end_height = 3 [(gogoproto.jsontag) = "session_end_height"];
+  // string shannon_dest_address = 4 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_dest_address"];
+  reserved 1, 2, 3, 4;
 
   // TODO_MAINNET_MIGRATION(@bryanchriswhite): Add shannon_dest_address to MsgRecoverMorseAccountResponse.
 }