Renumber fields, rename expiration_time->expiry, num->number, id fields

Signed-off-by: Kim Rader <kim.rader@swirldslabs.com>

services/state/blockrecords/block_info.proto

@@ -39,12 +39,12 @@ message BlockInfo {
   /**
    * The consensus time of the first transaction of the last block, this is the last completed immutable block.
    */
-  Timestamp first_cons_time_of_last_block = 2;
+  Timestamp first_cons_time_of_last_block = 3;
   /**
    * SHA384 48 byte hashes of the last 256 blocks in single byte array.
    * First 48 bytes is the oldest block.
    * Last 48 bytes is the newest block, which is the last fully completed immutable block.
    * If we are shortly after genesis and there are less than 256 blocks then this could contain less than 256 hashes.
    */
-  bytes block_hashes = 3;
+  bytes block_hashes = 2;
 }

services/state/consensus/topic.proto

@@ -29,7 +29,7 @@ option java_package = "com.hederahashgraph.api.proto.java";
 option java_multiple_files = true;
 
 /**
- * First-draft representation of a Hedera Consensus Service topic in the network Merkle tree. 
+ * Representation of a Hedera Consensus Service topic in the network Merkle tree.
  * 
  * As with all network entities, a topic has a unique entity number, which is usually given along 
  * with the network's shard and realm in the form of a shard.realm.number id.
@@ -51,9 +51,9 @@ option java_multiple_files = true;
  */
 message Topic {
     /**
-     * The topic's unique id number in the Merkle state.
+     * The topic's unique id in the Merkle state.
      */
-    TopicID id = 1;
+    TopicID topic_id = 7;
     /**
      * The number of messages sent to the topic.
      */
@@ -71,11 +71,11 @@ message Topic {
      * The id of the account (if any) that the network will attempt to charge for the
      * topic's auto-renewal upon expiration.
      */
-    AccountID auto_renew_account_id = 5;
+    AccountID auto_renew_account_id = 8;
     /**
      * Whether this topic is deleted.
      */
-    bool deleted = 6;
+    bool deleted = 1;
     /**
      * When a topic is created, its running hash is initialized to 48 bytes of binary zeros.
      * For each submitted message, the topic's running hash is then updated to the output
@@ -84,11 +84,11 @@ message Topic {
      * See the TransactionReceipt.proto documentation for an exact description of the
      * data included in the SHA-384 digest used for the update.
      */
-    bytes running_hash = 7;
+    bytes running_hash = 6;
     /**
      * An optional description of the topic with UTF-8 encoding up to 100 bytes.
      */
-    string memo = 8;
+    string memo = 5;
     /**
      * If present, enforces access control for updating or deleting the topic.
      * A topic without an admin key is immutable.

services/state/contract/storage_slot.proto

@@ -48,8 +48,8 @@ message SlotKey {
 /**
  * The value of a contract storage slot. For the EVM, this is a single word.
  * 
- * But because we need to be able to iterate through all the storage slots for an 
- * expired contract when purging it from state, our slot values also include the words 
+ * Because we iterate through all the storage slots for an expired contract
+ * when purging it from state, our slot values also include the words
  * of the previous and next keys in this contract's storage "list". 
  */
 message SlotValue {

services/state/file/file.proto

@@ -30,34 +30,34 @@ option java_package = "com.hederahashgraph.api.proto.java";
 option java_multiple_files = true;
 
 /**
- * First-draft representation of a Hedera Token Service file in the network Merkle tree.
+ * Representation of a Hedera Token Service file in the network Merkle tree.
  *
- * As with all network entities, a file has a unique entity number, which is usually given along
+ * As with all network entities, a file has a unique entity number, which is given along
  * with the network's shard and realm in the form of a shard.realm.number id.
  */
 message File {
     /**
      * The file's unique file identifier in the Merkle state.
      */
-    FileID file_id = 1;
+    FileID file_id = 5;
     /**
       * The file's consensus expiration time in seconds since the epoch.
       */
-    int64 expiration_time = 2;
+    int64 expiry = 2;
     /**
      * All keys at the top level of a key list must sign to create, modify and delete the file.
      */
-    KeyList keys = 3;
+    KeyList keys = 6;
     /**
      * The bytes that are the contents of the file
      */
     bytes contents = 4;
     /**
      * The memo associated with the file (UTF-8 encoding max 100 bytes)
      */
-    string memo = 5;
+    string memo = 3;
     /**
      * Whether this file is deleted.
      */
-    bool deleted = 6;
+    bool deleted = 1;
 }

services/state/schedule/schedule.proto

@@ -71,19 +71,19 @@ message Schedule {
     /**
      * This schedule's unique ID within the global network state.
      */
-    ScheduleID id = 5;
+    ScheduleID schedule_id = 5;
 
     /**
      * The schedule account for this schedule.  This is the account that submitted the original
      * ScheduleCreate transaction.
      */
-    AccountID scheduler_account = 6;
+    AccountID scheduler_account_id = 6;
 
     /**
      * The explicit payer account for the scheduled transaction.
      * This account is added to the accounts that must sign the schedule before it will execute.
      */
-    AccountID payer_account = 7;
+    AccountID payer_account_id = 7;
 
     /**
      * The admin key for this schedule.
@@ -100,7 +100,7 @@ message Schedule {
      * The requested expiration time of the schedule as provided by the user.
      * The actual calculated expiration time may be "earlier" than this, but will not be later.
      */
-    Timestamp expiration_time_provided = 10;
+    Timestamp expiry_provided = 10;
 
     /**
      * The calculated expiration time of the schedule.  This is calculated based on the requested
@@ -109,7 +109,7 @@ message Schedule {
      * The schedule will be removed from global network state after the network reaches a consensus
      * time greater than or equal to this value.
      */
-    Timestamp calculated_expiration_time = 11;
+    Timestamp calculated_expiry = 11;
 
     /**
      * The consensus timestamp of the transaction that executed or deleted this schedule.