Merge branch 'main' into simple-fees-token-service

# Conflicts:
#	hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java
#	hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/TokenServiceImpl.java

Author: joshmarinacci

.github/workflows/docs/citr-test-config.md

@@ -13,7 +13,8 @@ There are several test suites that are run in the CITR environment, each with it
 | SDCT        | Single Day Canonical Tests    | More comprehensive tests that focus on load, throughput and E2E latency                | X         |
 | SDLT        | Single Day Longevity Tests    | Longevity tests to ensure stability over extended periods                              | X         |
 | SDPT        | Single Day Performance Tests  | Performance-focused tests to evaluate system responsiveness                            | X         |
-| MDLT        | Multi Day Longevity Tests     | Extended longevity tests over multiple days                                            |           |
+| MDLT        | Multi Day Longevity Tests     | Extended longevity tests over multiple days                                            | X         |
+| MQLT        | Merge Queue Longevity Tests   | Combined performance, verification and longevity tests for use in Merge Queues         | X         |
 | Shortgevity | Short Longevity Tests         | Short-term longevity tests for checking performance against a mainnet-like environment |           |
 
 ## MATS

hapi/hedera-protobuf-java-api/src/main/proto/fees/fee_schedule.proto

@@ -93,6 +93,7 @@ enum Extra {
     GAS=13;
     ALLOWANCES=14;
     AIRDROPS=15;
+    HOOKS=16;
 }
 
 /**

hedera-node/docs/design/app/blocks/BlockNodeConnection.md

@@ -65,10 +65,8 @@ sending requests to the block node. The worker operates in a loop, sleeping for
 the configuration property `blockNode.connectionWorkerSleepDuration`. When not sleeping, the worker will first check if
 the current streaming block needs to be updated. If this is the first time the worker has performed this check, one of
 the following will happen:
-- If the connection with initialized with an explicit block to start with, then that block will be loaded from the block buffer.
-- If the connection wasn't initialized with an explicit block, then the earliest, unacknowledged block in the block buffer
-will be selected as the starting point.
-- If no blocks in the block buffer have been acknowledged, then the earliest block in the buffer will be selected.
+- If the connection was initialized with an explicit block to start with, then that block will be loaded from the block buffer.
+- If the connection wasn't initialized with an explicit block, then the most recent block produced is chosen as the block to start streaming.
 - If at any point during the lifespan of the connection a `SkipBlock` or `ResendBlock` response is received, then the
 worker will detect this and switch to that block.
 

hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/streaming/BlockNodeConnection.java

@@ -1429,16 +1429,14 @@ private boolean trySendPendingRequest() {
          * used block. This will also determine which block to initialize with.
          */
         private void switchBlockIfNeeded() {
-            final long activeBlockNum = streamingBlockNumber.get();
-            if (activeBlockNum == -1) {
-                final long highestAckedBlock = blockBufferService.getHighestAckedBlockNumber();
-                if (highestAckedBlock != -1) {
-                    // Set to the next block that isn't acked
-                    streamingBlockNumber.compareAndSet(activeBlockNum, highestAckedBlock + 1);
-                } else {
-                    // If no blocks are acked, start with the earliest block in the buffer
-                    final long earliestBlock = blockBufferService.getEarliestAvailableBlockNumber();
-                    streamingBlockNumber.compareAndSet(activeBlockNum, earliestBlock);
+            if (streamingBlockNumber.get() == -1) {
+                final long latestBlock = blockBufferService.getLastBlockNumberProduced();
+
+                if (streamingBlockNumber.compareAndSet(-1L, latestBlock)) {
+                    logger.info(
+                            "{} Connection was not initialized with a starting block; defaulting to latest block produced ({})",
+                            BlockNodeConnection.this,
+                            latestBlock);
                 }
             }
 

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/dispatcher/TransactionDispatcher.java

@@ -138,7 +138,12 @@ private boolean shouldUseSimpleFees(FeeContext feeContext) {
         return switch (feeContext.body().data().kind()) {
             case CONSENSUS_CREATE_TOPIC, CONSENSUS_DELETE_TOPIC, CONSENSUS_SUBMIT_MESSAGE, CONSENSUS_UPDATE_TOPIC ->
                 true;
-            case CRYPTO_DELETE, CRYPTO_CREATE_ACCOUNT, SCHEDULE_CREATE, SCHEDULE_SIGN, SCHEDULE_DELETE -> true;
+            case CRYPTO_DELETE,
+                    CRYPTO_CREATE_ACCOUNT,
+                    CRYPTO_UPDATE_ACCOUNT,
+                    SCHEDULE_CREATE,
+                    SCHEDULE_SIGN,
+                    SCHEDULE_DELETE -> true;
             case TOKEN_CREATION,
                     TOKEN_MINT,
                     TOKEN_BURN,