feat: add chainName to config; throw error when found S3 key in utils

aura-nw · Feb 5, 2024 · 5666f07 · 5666f07
1 parent 7eda6d7
commit 5666f07
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/ci/config.json.ci b/ci/config.json.ci
@@ -1,5 +1,6 @@
 {
   "chainId": "aura-testnet-2",
+  "chainName": "aura",
   "networkPrefixAddress": "aura",
   "consensusPrefixAddress": "valcons",
   "validatorPrefixAddress": "valoper",
@@ -281,7 +282,8 @@
   "uploadBlockRawLogToS3": {
     "key": "uploadBlockRawLogToS3",
     "millisecondCrawl": 1000,
-    "blocksPerCall": 100
+    "blocksPerCall": 100,
+    "overwriteS3IfFound": true
   },
   "uploadTransactionRawLogToS3": {
     "key": "uploadTransactionRawLogToS3",

diff --git a/config.json b/config.json
@@ -1,5 +1,6 @@
 {
   "chainId": "aura-testnet",
+  "chainName": "aura",
   "networkPrefixAddress": "aura",
   "consensusPrefixAddress": "valcons",
   "validatorPrefixAddress": "valoper",
@@ -284,7 +285,8 @@
   "uploadBlockRawLogToS3": {
     "key": "uploadBlockRawLogToS3",
     "millisecondCrawl": 1000,
-    "blocksPerCall": 100
+    "blocksPerCall": 100,
+    "overwriteS3IfFound": true
   },
   "uploadTransactionRawLogToS3": {
     "key": "uploadTransactionRawLogToS3",

diff --git a/src/common/utils/utils.ts b/src/common/utils/utils.ts
@@ -240,9 +240,12 @@ export default class Utils {
         console.error(err);
         return err;
       });
-    if (foundS3Object && !overwrite) {
-      console.warn(`This S3 key is found in S3: ${fileName}`);
-      return;
+    if (foundS3Object) {
+      const err = `This S3 key is found in S3: ${fileName}`;
+      console.warn(err);
+      if (!overwrite) {
+        throw new Error(err);
+      }
     }
 
     // eslint-disable-next-line consistent-return

diff --git a/src/services/crawl-block/upload_block_raw_log_to_s3.service.ts b/src/services/crawl-block/upload_block_raw_log_to_s3.service.ts
@@ -44,15 +44,18 @@ export default class UploadBlockRawLogToS3 extends BullableService {
           Utils.uploadDataToS3(
             block.height.toString(),
             s3Client,
-            `rawlog/${config.chainId}/block/${block.height}`,
+            `rawlog/${config.chainName}/${config.chainId}/block/${block.height}`,
             'application/json',
             Buffer.from(JSON.stringify(block.data)),
             Config.BUCKET,
             Config.S3_GATEWAY,
-            false
+            config.uploadBlockRawLogToS3.overwriteS3IfFound
           )
         )
-      )
+      ).catch((err) => {
+        this.logger.error(err);
+        throw err;
+      })
     ).filter((e) => e !== undefined);
 
     const stringListUpdate = resultUploadS3.map(