ATL-6668: Address review comments

This commit deletes references to legacy VC code in protobuf and sql
definitions

Author: EzequielPostan

node/src/main/protobuf/common_models.proto

@@ -21,44 +21,6 @@ message HealthCheckRequest {}
  */
 message HealthCheckResponse {}
 
-/**
- * Represents a date by its parts (day, month, year).
- */
-message Date {
-    int32 year = 1; // A positive value.
-    int32 month = 2; // A value in the [1, 12] range.
-    int32 day = 3; // A value in the [1, 31] range (depending on the month, the maximum value might be 28).
-}
-
-/**
- * Represents a time interval between two given timestamps.
- * The message represents a closed interval (i.e. both ends are inclusive and mandatory).
- */
-message TimeInterval {
-    /**
-     * The starting timestamp.
-     * start_timestamp must be before or equal to end_timestamp.
-     */
-    google.protobuf.Timestamp start_timestamp = 1;
-    /**
-     * The ending timestamp.
-     * end_timestamp must be after or equal to start_timestamp.
-     */
-    google.protobuf.Timestamp end_timestamp = 2;
-}
-
-/**
- * This enum provides a way for some RPC requests to specify the direction so that the response values are sorted
- * the way you want them to.
- * Note that it specifies the direction only and doesn't say anything about a comparator
- * (e.g. natural order, some RPC-specific order etc).
- */
-enum SortByDirection {
-    SORT_BY_DIRECTION_UNKNOWN = 0; // Nothing provided, each API can define whether to fail or take a default value (commonly ASCENDING).
-    SORT_BY_DIRECTION_ASCENDING = 1; // Sort the results in ascending order.
-    SORT_BY_DIRECTION_DESCENDING = 2; // Sort the results in descending order.
-}
-
 /**
  * The supported ledger types. Specifies which chain is used for storing transactions.
  */

node/src/main/protobuf/node_api.proto

@@ -12,7 +12,7 @@ import "google/protobuf/timestamp.proto";
 
 /**
  * Service for PRISM Node API. Provides a way to store, retrieve and update
- * Decentralized identifiers (DIDs), and Credentials' commitments into/from the underlying blockchain.
+ * Decentralized identifiers (DIDs) into/from the underlying blockchain.
  */
 service NodeService {
     /**
@@ -187,69 +187,6 @@ message GetNodeNetworkProtocolInfoResponse {
     ProtocolVersion current_network_protocol_version = 6; // Current network protocol version number.
 }
 
-/**
- * Request to get the credential's batch state.
- * See NodeService.GetBatchState for more information.
- */
-message GetBatchStateRequest {
-    string batch_id = 1; // The batch ID.
-}
-/**
- * Response with the credential's batch state.
- * See NodeService.GetBatchState for more information.
- */
-message GetBatchStateResponse {
-    /**
-     * DID suffix used to sign the IssueCredentialBatch operation.
-     */
-    string issuer_did = 1;
-
-    /**
-     * The Merkle root used for the IssueCredential operation.
-     */
-    bytes merkle_root = 2;
-
-    /**
-     * Underlying blockchain data that refers to the transaction that
-     * contains the IssueCredential operation associated with the credential.
-     */
-    LedgerData publication_ledger_data = 3;
-
-    /**
-     * Underlying blockchain data that refers to the transaction that
-     * contains the RevokeCredential operation associated with the credential.
-     * This is optional.
-     */
-    LedgerData revocation_ledger_data = 4;
-
-    /**
-     * Timestamp of the latest synchronized block.
-     */
-    google.protobuf.Timestamp last_synced_block_timestamp = 5;
-
-    /**
-     * The hash of the credential to query about.
-     */
-    bytes issuance_hash = 6;
-}
-
-/**
- * Request to get the credential's revocation time.
- * See NodeService.GetCredentialRevocationTime for more information.
- */
-message GetCredentialRevocationTimeRequest {
-    string batch_id = 1; // The ID corresponding to the credential to query about.
-    bytes credential_hash = 2; // The hash of the credential to query about.
-}
-/**
- * Response with the credential's revocation time.
- * See NodeService.GetCredentialRevocationTime for more information.
- */
-message GetCredentialRevocationTimeResponse {
-    LedgerData revocation_ledger_data = 1; // The ledger data when the credential was revoked. This is optional.
-    google.protobuf.Timestamp last_synced_block_timestamp = 2; // Timestamp of the latest synchronized block.
-}
-
 /**
  * Request to get the operation status.
  * See NodeService.GetOperationInfo for more information.
@@ -318,8 +255,6 @@ message GetScheduledOperationsRequest {
         AnyOperationType = 0; // Any operation
         CreateDidOperationOperationType = 1;
         UpdateDidOperationOperationType = 2;
-        IssueCredentialBatchOperationType = 3;
-        RevokeCredentialsOperationType = 4;
         ProtocolVersionUpdateOperationType = 5;
     }
 }
@@ -352,3 +287,27 @@ message GetWalletBalanceRequest {
 message GetWalletBalanceResponse {
     bytes balance = 1;
 }
+
+// Used to encode the responses of the operations issued in an AtalaBlock.
+message OperationOutput {
+    oneof result {
+        // Represents the response provided by IssueCredentialBatchOperation.
+        CreateDIDOutput create_did_output = 2;
+        // Represents the response provided by UpdateDIDOperation.
+        UpdateDIDOutput update_did_output = 3;
+        // Represents the response provided by ProtocolVersionUpdateOperation.
+        ProtocolVersionUpdateOutput protocol_version_update_output = 7;
+        DeactivateDIDOutput deactivate_did_output = 8;
+    }
+    oneof operation_maybe {
+        bytes operation_id = 5; // Operation identifier.
+        string error = 6; // Error description if PRISM Node service haven't scheduled the operation.
+    }
+}
+
+message CreateDIDOutput {
+    string did_suffix = 1;
+}
+message UpdateDIDOutput {}
+message ProtocolVersionUpdateOutput {}
+message DeactivateDIDOutput {}

node/src/main/protobuf/node_internal.proto

@@ -158,26 +158,6 @@ message UpdateDIDOperation {
     repeated UpdateDIDAction actions = 3; // The actual updates to perform on the DID.
 }
 
-// Represents a credential's batch.
-//
-// Check the protocol docs to understand it.
-message CredentialBatchData {
-    string issuer_did = 1; // The DID suffix that issues the credential's batch.
-    bytes merkle_root = 2; // The Merkle root for the credential's batch.
-}
-
-// Specifies the data to issue a credential batch.
-message IssueCredentialBatchOperation {
-    CredentialBatchData credential_batch_data = 1; // The actual credential batch data.
-}
-
-// Specifies the credentials to revoke (the whole batch, or just a subset of it).
-message RevokeCredentialsOperation {
-    bytes previous_operation_hash = 1; // The hash of the operation that issued the batch.
-    string credential_batch_id = 2; // The corresponding batch ID, as returned in IssueCredentialBatchResponse.
-    repeated bytes credentials_to_revoke = 3; // The hashes of the credentials to revoke. If empty, the full batch is revoked.
-}
-
 // Specifies the protocol version update
 message ProtocolVersionUpdateOperation {
     string proposer_did = 1; // The DID suffix that proposes the protocol update.
@@ -219,12 +199,6 @@ message AtalaOperation {
         // Used to update an existing public DID.
         UpdateDIDOperation update_did = 2;
 
-        // Used to issue a batch of credentials.
-        IssueCredentialBatchOperation issue_credential_batch = 3;
-
-        // Used to revoke a credential batch.
-        RevokeCredentialsOperation revoke_credentials = 4;
-
         // Used to announce new protocol update
         ProtocolVersionUpdateOperation protocol_version_update = 5;
 
@@ -249,38 +223,6 @@ message LedgerData {
     TimestampInfo timestamp_info = 3; // The timestamp of the protocol event.
 }
 
-// Used to encode the responses of the operations issued in an AtalaBlock.
-message OperationOutput {
-    oneof result {
-        // Represents the response provided by IssueCredentialBatchOperation.
-        IssueCredentialBatchOutput batch_output = 1;
-        // Represents the response provided by CreateDIDOperation.
-        CreateDIDOutput create_did_output = 2;
-        // Represents the response provided by UpdateDIDOperation.
-        UpdateDIDOutput update_did_output = 3;
-        // Represents the response provided by RevokeCredentialOperation.
-        RevokeCredentialsOutput revoke_credentials_output = 4;
-        // Represents the response provided by ProtocolVersionUpdateOperation.
-        ProtocolVersionUpdateOutput protocol_version_update_output = 7;
-        DeactivateDIDOutput deactivate_did_output = 8;
-    }
-    oneof operation_maybe {
-        bytes operation_id = 5; // Operation identifier.
-        string error = 6; // Error description if PRISM Node service haven't scheduled the operation.
-    }
-}
-
-message IssueCredentialBatchOutput {
-    string batch_id = 1;
-}
-message CreateDIDOutput {
-    string did_suffix = 1;
-}
-message UpdateDIDOutput {}
-message RevokeCredentialsOutput {}
-message ProtocolVersionUpdateOutput {}
-message DeactivateDIDOutput {}
-
 message Service {
     string id = 1;
     string type = 2;
@@ -289,3 +231,22 @@ message Service {
     LedgerData added_on = 4; // (when present) The ledger details related to the event that added the service.
     LedgerData deleted_on = 5; // (when present) The ledger details related to the event that revoked the service.
 }
+
+/**
+ * Represent a block that holds operations.
+ * @exclude Intended for internal usage inside. Not publicly accessible from gRPC.
+ */
+message AtalaBlock {
+  reserved 1; // Represents the version of the block. Deprecated
+  repeated SignedAtalaOperation operations = 2; // A signed operation, necessary to post anything on the blockchain.
+}
+
+/**
+ * Wraps an AtalaBlock and its metadata.
+ * @exclude Intended for internal usage inside. Not publicly accessible from gRPC.
+ */
+message AtalaObject {
+  reserved 1, 2, 3; // Removed block_hash field.
+  reserved "block_hash", "block_operation_count", "block_byte_length";
+  AtalaBlock block_content = 4; // The block content.
+}

node/src/main/protobuf/node_models.proto

@@ -37,9 +37,6 @@ CREATE DOMAIN public.id_type AS text COLLATE "default" CONSTRAINT id_type_check
 CREATE TYPE public.key_usage AS ENUM ('MASTER_KEY', 'ISSUING_KEY', 'KEY_AGREEMENT_KEY', 'AUTHENTICATION_KEY', 'REVOCATION_KEY', 'CAPABILITY_INVOCATION_KEY', 'CAPABILITY_DELEGATION_KEY');
 
 
-CREATE DOMAIN public.merkle_root AS BYTEA CONSTRAINT merkle_root_check CHECK (length(VALUE) = 32);
-
-
 CREATE DOMAIN public.non_negative_int_type AS integer CONSTRAINT non_negative_int_type_check CHECK (VALUE >= 0);
 
 

node/src/main/resources/db/migration/V1__create_tables.sql

@@ -5,14 +5,14 @@ import derevo.tagless.applyK
 import io.iohk.atala.prism.node.models._
 import io.iohk.atala.prism.node.cardano.models.CardanoWalletError
 import io.iohk.atala.prism.node.models.Balance
-import io.iohk.atala.prism.protos.node_internal
+import io.iohk.atala.prism.protos.node_models
 
 @derive(applyK)
 trait UnderlyingLedger[F[_]] {
   def getType: Ledger
 
   def publish(
-      obj: node_internal.AtalaObject
+      obj: node_models.AtalaObject
   ): F[Either[CardanoWalletError, PublicationInfo]]
 
   def getTransactionDetails(

node/src/main/scala/io/iohk/atala/prism/node/UnderlyingLedger.scala

@@ -1,7 +1,7 @@
 package io.iohk.atala.prism.node.cardano.models
 
 import io.circe.{ACursor, Json}
-import io.iohk.atala.prism.protos.node_internal
+import io.iohk.atala.prism.protos.node_models
 import io.iohk.atala.prism.node.utils.BytesOps
 
 import scala.util.Try
@@ -29,7 +29,7 @@ object AtalaObjectMetadata {
 
   def fromTransactionMetadata(
       metadata: TransactionMetadata
-  ): Option[node_internal.AtalaObject] = {
+  ): Option[node_models.AtalaObject] = {
     val prismMetadata = metadata.json.hcursor
       .downField(METADATA_PRISM_INDEX.toString)
 
@@ -44,7 +44,7 @@ object AtalaObjectMetadata {
 
   private def fromTransactionMetadataV1(
       prismMetadata: ACursor
-  ): Option[node_internal.AtalaObject] = {
+  ): Option[node_models.AtalaObject] = {
     val bytes = prismMetadata
       .downField(CONTENT_KEY)
       .focus
@@ -56,7 +56,7 @@ object AtalaObjectMetadata {
       // Either the content does not exist, is not the right type, or is truly empty
       None
     } else {
-      node_internal.AtalaObject.validate(bytes).toOption
+      node_models.AtalaObject.validate(bytes).toOption
     }
   }
 
@@ -68,7 +68,7 @@ object AtalaObjectMetadata {
   }
 
   def toTransactionMetadata(
-      atalaObject: node_internal.AtalaObject
+      atalaObject: node_models.AtalaObject
   ): TransactionMetadata = {
     TransactionMetadata(
       Json.obj(
@@ -101,7 +101,7 @@ object AtalaObjectMetadata {
     )
   }
 
-  def estimateTxMetadataSize(atalaObject: node_internal.AtalaObject): Int = {
+  def estimateTxMetadataSize(atalaObject: node_models.AtalaObject): Int = {
     toTransactionMetadata(atalaObject).json.noSpaces.length
   }
 }

node/src/main/scala/io/iohk/atala/prism/node/cardano/models/AtalaObjectMetadata.scala

@@ -28,9 +28,7 @@ object OperationsCounters {
 
   // Values for operations tags
   private val EMPTY_OPERATION_TAG_VALUE = "empty"
-  private val REVOKE_CREDENTIALS_TAG_VALUE = "revoke-credentials"
   private val CREATE_DID_TAG_VALUE = "create-did"
-  private val ISSUE_CREDENTIAL_BATCH_TAG_VALUE = "issue-credential-batch"
   private val PROTOCOL_VERSION_UPDATE_OPERATION_VALUE = "protocol-version-update"
   private val UPDATE_DID_OPERATION_TAG_VALUE = "did-update"
   private val DEACTIVATE_DID_TAG_VALUE = "deactivate-did"
@@ -172,13 +170,9 @@ object OperationsCounters {
 
   private def atalaOperationToTagString: PartialFunction[AtalaOperation.Operation, String] = {
     case AtalaOperation.Operation.Empty => EMPTY_OPERATION_TAG_VALUE
-    case AtalaOperation.Operation.RevokeCredentials(_) =>
-      REVOKE_CREDENTIALS_TAG_VALUE
     case AtalaOperation.Operation.CreateDid(_) => CREATE_DID_TAG_VALUE
     case AtalaOperation.Operation.DeactivateDid(_) => DEACTIVATE_DID_TAG_VALUE
     case AtalaOperation.Operation.ProtocolVersionUpdate(_) => PROTOCOL_VERSION_UPDATE_OPERATION_VALUE
-    case AtalaOperation.Operation.IssueCredentialBatch(_) =>
-      ISSUE_CREDENTIAL_BATCH_TAG_VALUE
     // Just in case, must be impossible
     case AtalaOperation.Operation.UpdateDid(_) => UPDATE_DID_OPERATION_TAG_VALUE
   }