Merge pull request #352 from neutron-org/feat/enhance-contract-failur…

…e-with-error [NTRN-142] feat: enhance contract failure with error
neutron-org · Nov 14, 2023 · bba6d31 · bba6d31
2 parents bb17f3b + ec21cfa
commit bba6d31
Show file tree

Hide file tree

Showing 20 changed files with 584 additions and 135 deletions.
diff --git a/proto/neutron/contractmanager/failure.proto b/proto/neutron/contractmanager/failure.proto
@@ -15,4 +15,6 @@ message Failure {
   uint64 id = 2;
   // Serialized MessageSudoCallback with Packet and Ack(if exists)
   bytes sudo_payload = 3;
+  // Redacted error response of the sudo call. Full error is emitted as an event
+  string error = 4;
 }
diff --git a/proto/neutron/contractmanager/query.proto b/proto/neutron/contractmanager/query.proto
@@ -16,13 +16,19 @@ service Query {
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
     option (google.api.http).get = "/neutron/contractmanager/params";
   }
-  // Queries a Failure by address.
+
+  // Queries a Failure by contract address and failure ID.
+  rpc AddressFailure(QueryFailuresRequest) returns (QueryFailuresResponse) {
+    option (google.api.http).get = "/neutron/contractmanager/failures/{address}/{failure_id}";
+  }
+
+  // Queries Failures by contract address.
   rpc AddressFailures(QueryFailuresRequest) returns (QueryFailuresResponse) {
     option (google.api.http).get =
         "/neutron/contractmanager/failures/{address}";
   }
 
-  // Queries a list of Failure items.
+  // Queries a list of Failures occurred on the network.
   rpc Failures(QueryFailuresRequest) returns (QueryFailuresResponse) {
     option (google.api.http).get = "/neutron/contractmanager/failures";
   }
@@ -39,11 +45,16 @@ message QueryParamsResponse {
   Params params = 1 [ (gogoproto.nullable) = false ];
 }
 
+// QueryFailuresRequest is request type for the Query/Failures RPC method.
 message QueryFailuresRequest {
+  // address of the contract which Sudo call failed.
   string address = 1;
-  cosmos.base.query.v1beta1.PageRequest pagination = 2;
+  // ID of the failure for the given contract.
+  uint64 failure_id = 2;
+  cosmos.base.query.v1beta1.PageRequest pagination = 3;
 }
 
+// QueryFailuresResponse is response type for the Query/Failures RPC method.
 message QueryFailuresResponse {
   repeated Failure failures = 1 [ (gogoproto.nullable) = false ];
   cosmos.base.query.v1beta1.PageResponse pagination = 2;

diff --git a/testutil/mocks/contractmanager/types/expected_keepers.go b/testutil/mocks/contractmanager/types/expected_keepers.go
diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go
diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go
@@ -637,7 +637,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() {
 	payload, err := keeper2.PrepareSudoCallbackMessage(packet, &ack)
 	require.NoError(suite.T(), err)
 	failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String())
-	suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload)
+	suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload, "test error")
 
 	// Craft message
 	msg, err := json.Marshal(bindings.NeutronMsg{
@@ -669,7 +669,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureTimeout() {
 	payload, err := keeper2.PrepareSudoCallbackMessage(packet, nil)
 	require.NoError(suite.T(), err)
 	failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, suite.contractAddress.String())
-	suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload)
+	suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, suite.contractAddress.String(), payload, "test error")
 
 	// Craft message
 	msg, err := json.Marshal(bindings.NeutronMsg{
@@ -704,7 +704,7 @@ func (suite *CustomMessengerTestSuite) TestResubmitFailureFromDifferentContract(
 	failureID := suite.messenger.ContractmanagerKeeper.GetNextFailureIDKey(suite.ctx, testutil.TestOwnerAddress)
 	payload, err := keeper2.PrepareSudoCallbackMessage(packet, &ack)
 	require.NoError(suite.T(), err)
-	suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, testutil.TestOwnerAddress, payload)
+	suite.messenger.ContractmanagerKeeper.AddContractFailure(suite.ctx, testutil.TestOwnerAddress, payload, "test error")
 
 	// Craft message
 	msg, err := json.Marshal(bindings.NeutronMsg{

diff --git a/x/contractmanager/client/cli/query.go b/x/contractmanager/client/cli/query.go
@@ -24,6 +24,7 @@ func GetQueryCmd(_ string) *cobra.Command {
 
 	cmd.AddCommand(CmdQueryParams())
 	cmd.AddCommand(CmdFailures())
+	cmd.AddCommand(CmdFailureDetails())
 	// this line is used by starport scaffolding # 1
 
 	return cmd