Moved transactions under query config, updated account-id.json to inc…

…lude these transactions, and revised configuration.md. Signed-off-by: Harsh Sawarkar <[email protected]>
hashgraph · Nov 14, 2024 · a33790b · a33790b
1 parent 4b24793
commit a33790b
Show file tree

Hide file tree

Showing 5 changed files with 182 additions and 9 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -503,7 +503,7 @@ The following table lists the available properties along with their default valu
 value, it is recommended to only populate overridden properties in the custom `application.yml`.
 
 | Name                                                               | Default                 | Description                                                                                                                                                                                   |
-|--------------------------------------------------------------------| ----------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|--------------------------------------------------------------------|-------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `hedera.mirror.rest.cache.entityId.maxAge`                         | 1800                    | The number of seconds until the entityId cache entry expires                                                                                                                                  |
 | `hedera.mirror.rest.cache.entityId.maxSize`                        | 100000                  | The maximum number of entries in the entityId cache                                                                                                                                           |
 | `hedera.mirror.rest.cache.token.maxSize`                           | 100000                  | The maximum number of entries in the token cache                                                                                                                                              |
@@ -542,6 +542,7 @@ value, it is recommended to only populate overridden properties in the custom `a
 | `hedera.mirror.rest.query.maxTransactionsTimestampRange`           | 60d                     | The maximum timestamp range to list transactions.                                                                                                                                             |
 | `hedera.mirror.rest.query.strictTimestampParam`                    | true                    | Enables strict checking of timestamp query param (currently only effects /api/v1/accounts/{id}?timestamp={timestamp}                                                                          |
 | `hedera.mirror.rest.query.topicMessageLookup`                      | false                   | Enables topic message lookup querying                                                                                                                                                         |
+| 'hedera.mirror.rest.query.transactions.precedingTransactionTypes'  | [11, 15]                | An array of protoIds that specifies transactions to be prioritized for inclusion in the response                                                                                                             |
 | `hedera.mirror.rest.redis.commandTimeout`                          | 10000                   | The amount of time in milliseconds to wait before a Redis command will timeout                                                                                                                |
 | `hedera.mirror.rest.redis.connectTimeout`                          | 10000                   | The amount of time in milliseconds to wait for a connection to Redis                                                                                                                          |
 | `hedera.mirror.rest.redis.enabled`                                 | true                    | Whether Redis should be used as a caching layer for the database                                                                                                                              |

diff --git a/hedera-mirror-rest/__tests__/specs/transactions/account-id.json b/hedera-mirror-rest/__tests__/specs/transactions/account-id.json
@@ -32,6 +32,26 @@
         "type": "15",
         "entity_id": "0.0.8"
       },
+      {
+        "charged_tx_fee": 7,
+        "payerAccountId": "0.0.8",
+        "nodeAccountId": "0.0.3",
+        "consensus_timestamp": "1565779444711927002",
+        "name": "CRYPTOUPDATEACCOUNT",
+        "nonce": 1,
+        "type": "15",
+        "entity_id": "0.0.8"
+      },
+      {
+        "charged_tx_fee": 7,
+        "payerAccountId": "0.0.8",
+        "nodeAccountId": "0.0.3",
+        "consensus_timestamp": "1565779200711927001",
+        "name": "CRYPTOCREATEACCOUNT",
+        "nonce": 1,
+        "type": 11,
+        "entity_id": "0.0.900"
+      },
       {
         "charged_tx_fee": 0,
         "payerAccountId": "0.0.8",
@@ -150,6 +170,82 @@
             "valid_duration_seconds": "11",
             "valid_start_timestamp": "1565779444.711927000"
           },
+          {
+            "bytes": "Ynl0ZXM=",
+            "charged_tx_fee": 7,
+            "consensus_timestamp": "1565779444.711927002",
+            "entity_id": "0.0.8",
+            "max_fee": "33",
+            "memo_base64": null,
+            "name": "CRYPTOUPDATEACCOUNT",
+            "nft_transfers": [],
+            "node": "0.0.3",
+            "nonce": 1,
+            "parent_consensus_timestamp": null,
+            "result": "SUCCESS",
+            "scheduled": false,
+            "staking_reward_transfers": [],
+            "token_transfers": [],
+            "transaction_hash": "AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJSYnKCkqKywtLi8w",
+            "transaction_id": "0.0.8-1565779444-711927001",
+            "transfers": [
+              {
+                "account": "0.0.3",
+                "amount": 2,
+                "is_approval": false
+              },
+              {
+                "account": "0.0.8",
+                "amount": -3,
+                "is_approval": false
+              },
+              {
+                "account": "0.0.98",
+                "amount": 1,
+                "is_approval": false
+              }
+            ],
+            "valid_duration_seconds": "11",
+            "valid_start_timestamp": "1565779444.711927000"
+          },
+          {
+            "bytes": "Ynl0ZXM=",
+            "charged_tx_fee": 7,
+            "consensus_timestamp": "1565779200.711927001",
+            "entity_id": "0.0.900",
+            "max_fee": "33",
+            "memo_base64": null,
+            "name": "CRYPTOCREATEACCOUNT",
+            "nft_transfers": [],
+            "node": "0.0.3",
+            "nonce": 1,
+            "parent_consensus_timestamp": null,
+            "result": "SUCCESS",
+            "scheduled": false,
+            "staking_reward_transfers": [],
+            "token_transfers": [],
+            "transaction_hash": "AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJSYnKCkqKywtLi8w",
+            "transaction_id": "0.0.8-1565779200-711927000",
+            "transfers": [
+              {
+                "account": "0.0.3",
+                "amount": 2,
+                "is_approval": false
+              },
+              {
+                "account": "0.0.8",
+                "amount": -3,
+                "is_approval": false
+              },
+              {
+                "account": "0.0.98",
+                "amount": 1,
+                "is_approval": false
+              }
+            ],
+            "valid_duration_seconds": "11",
+            "valid_start_timestamp": "1565779444.711927000"
+          },
           {
             "bytes": "Ynl0ZXM=",
             "charged_tx_fee": 7,
@@ -365,6 +461,82 @@
             "valid_duration_seconds": "11",
             "valid_start_timestamp": "1565779444.711927000"
           },
+          {
+            "bytes": "Ynl0ZXM=",
+            "charged_tx_fee": 7,
+            "consensus_timestamp": "1565779444.711927002",
+            "entity_id": "0.0.8",
+            "max_fee": "33",
+            "memo_base64": null,
+            "name": "CRYPTOUPDATEACCOUNT",
+            "nft_transfers": [],
+            "node": "0.0.3",
+            "nonce": 1,
+            "parent_consensus_timestamp": null,
+            "result": "SUCCESS",
+            "scheduled": false,
+            "staking_reward_transfers": [],
+            "token_transfers": [],
+            "transaction_hash": "AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJSYnKCkqKywtLi8w",
+            "transaction_id": "0.0.8-1565779444-711927001",
+            "transfers": [
+              {
+                "account": "0.0.3",
+                "amount": 2,
+                "is_approval": false
+              },
+              {
+                "account": "0.0.8",
+                "amount": -3,
+                "is_approval": false
+              },
+              {
+                "account": "0.0.98",
+                "amount": 1,
+                "is_approval": false
+              }
+            ],
+            "valid_duration_seconds": "11",
+            "valid_start_timestamp": "1565779444.711927000"
+          },
+          {
+            "bytes": "Ynl0ZXM=",
+            "charged_tx_fee": 7,
+            "consensus_timestamp": "1565779200.711927001",
+            "entity_id": "0.0.900",
+            "max_fee": "33",
+            "memo_base64": null,
+            "name": "CRYPTOCREATEACCOUNT",
+            "nft_transfers": [],
+            "node": "0.0.3",
+            "nonce": 1,
+            "parent_consensus_timestamp": null,
+            "result": "SUCCESS",
+            "scheduled": false,
+            "staking_reward_transfers": [],
+            "token_transfers": [],
+            "transaction_hash": "AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiMkJSYnKCkqKywtLi8w",
+            "transaction_id": "0.0.8-1565779200-711927000",
+            "transfers": [
+              {
+                "account": "0.0.3",
+                "amount": 2,
+                "is_approval": false
+              },
+              {
+                "account": "0.0.8",
+                "amount": -3,
+                "is_approval": false
+              },
+              {
+                "account": "0.0.98",
+                "amount": 1,
+                "is_approval": false
+              }
+            ],
+            "valid_duration_seconds": "11",
+            "valid_start_timestamp": "1565779444.711927000"
+          },
           {
             "bytes": "Ynl0ZXM=",
             "charged_tx_fee": 7,

diff --git a/hedera-mirror-rest/config.js b/hedera-mirror-rest/config.js
@@ -189,9 +189,9 @@ const parseNetworkConfig = () => {
 };
 
 const parseTransactionConfig = () => {
-  const {transactions} = getConfig();
-  if (!Array.isArray(transactions.typesToInclude)) {
-    throw new InvalidConfigError(`Invalid or missing transactions.typesToInclude: ${transactions.typesToInclude}`);
+  const {precedingTransactionTypes} = getConfig().query.transactions;
+  if (!Array.isArray(precedingTransactionTypes) || precedingTransactionTypes.length === 0) {
+    throw new InvalidConfigError(`Invalid or missing query.transactions.precedingTransactionTypes: ${precedingTransactionTypes}`);
   }
 };
 

diff --git a/hedera-mirror-rest/config/application.yml b/hedera-mirror-rest/config/application.yml
@@ -41,10 +41,6 @@ hedera:
           username: metrics
           uriPath: "/swagger"
         ipMetrics: false
-      transactions:
-        typesToInclude:
-          - CRYPTOCREATEACCOUNT
-          - CRYPTOUPDATEACCOUNT
       network:
         unreleasedSupplyAccounts:
           - from: 0.0.2
@@ -76,6 +72,10 @@ hedera:
         maxTransactionsTimestampRange: 60d
         strictTimestampParam: true
         topicMessageLookup: false
+        transactions:
+          precedingTransactionTypes:
+            - 11 #CRYPTOCREATEACCOUNT
+            - 15 #CRYPTOUPDATEACCOUNT
       redis:
         commandTimeout: 10000
         connectTimeout: 10000

diff --git a/hedera-mirror-rest/transactions.js b/hedera-mirror-rest/transactions.js
@@ -346,7 +346,7 @@ const getTransferDistinctTimestampsQuery = (
 // the condition to exclude synthetic transactions attached to a user submitted transaction
 const transactionByPayerExcludeSyntheticCondition = `${Transaction.getFullName(Transaction.NONCE)} = 0 or
   ${Transaction.getFullName(Transaction.PARENT_CONSENSUS_TIMESTAMP)} is not null 
-  or ${Transaction.getFullName(Transaction.TYPE)} in (${typesToInclude.map((type) => `'${type}'`).join(', ')})`;
+   ${query.transactions.precedingTransactionTypes.length > 0 ? `or ${Transaction.getFullName(Transaction.TYPE)} in (${query.transactions.precedingTransactionTypes.join(', ')})` : ''}`;
 
 const getQueryWithEqualValues = (column, params, values) => {
   if (values.length === 0) {