Merge pull request #12 from kryptokrauts/feat/v-1.0.15

feat: add Zulu to block timestamp, new param EOSIO_IRREVERSIBLE_BLOCK…
kryptokrauts · Apr 17, 2024 · deb1900 · deb1900
2 parents c959481 + b11eda4
commit deb1900
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.env_template b/.env_template
@@ -18,6 +18,8 @@ EOSIO_FETCH_TRACES=true
 EOSIO_FETCH_DELTAS=true
 # number of blocks until tx is final
 EOSIO_NUM_BLOCKS_TO_FINALITY=360
+# fetch irreversible blocks only true/false
+EOSIO_IRREVERSIBLE_BLOCKS_ONLY=false
 
 # unique client_id for interacting with Kafka
 KAFKA_CLIENT_ID=

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kryptokrauts/event-processor-node-lib",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Wrapper for ease listening on antelope blockchain based on @blockmatic/antelope-ship-reader",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/common/config.ts b/src/common/config.ts
@@ -17,6 +17,7 @@ export const EOSIO_CONFIG = {
   fetch_traces: process.env.EOSIO_FETCH_TRACES !== 'false',
   fetch_deltas: process.env.EOSIO_FETCH_DELTAS !== 'false',
   num_blocks_to_finality: Number(process.env.EOSIO_NUM_BLOCKS_TO_FINALITY || 360),
+  irreversible_blocks_only: process.env.EOSIO_IRREVERSIBLE_BLOCKS_ONLY === 'true',
 };
 
 export const KAFKA_CONFIG: KafkaConfig = {

diff --git a/src/common/types.ts b/src/common/types.ts
@@ -43,7 +43,6 @@ export interface ShipReaderWrapperConfig {
   message_header_prefix: string;
   table_rows_whitelist: () => EosioReaderTableRowFilter[];
   actions_whitelist: () => EosioReaderActionFilter[];
-  only_irreversible_blocks: boolean;
   emit_current_blocknum: boolean;
 }
 

diff --git a/src/eosio/ship-reader-wrapper.ts b/src/eosio/ship-reader-wrapper.ts
@@ -195,7 +195,7 @@ export class ShipReaderWrapper {
                 if (result && result.msg) {
                   const msg = JSON.stringify({
                     blocknum: block.block_num,
-                    timestamp: new Date(block.timestamp).getTime(),
+                    timestamp: new Date(block.timestamp + 'Z').getTime(),
                     type: action.name,
                     transaction_id: action.transaction_id,
                     data: result.msg,
@@ -257,7 +257,7 @@ export class ShipReaderWrapper {
    * @returns
    */
   private async getShipReader() {
-    if (this.config.only_irreversible_blocks) {
+    if (EOSIO_CONFIG.irreversible_blocks_only) {
       logger.info(`Configuration is set to fetch irreversible blocks only`);
     }
 
@@ -288,7 +288,7 @@ export class ShipReaderWrapper {
         end_block_num: 0xffffffff,
         max_messages_in_flight: EOSIO_CONFIG.max_messages_in_flight,
         have_positions: [],
-        irreversible_only: this.config.only_irreversible_blocks,
+        irreversible_only: EOSIO_CONFIG.irreversible_blocks_only,
         fetch_block: EOSIO_CONFIG.fetch_block,
         fetch_traces: EOSIO_CONFIG.fetch_traces,
         fetch_deltas: EOSIO_CONFIG.fetch_deltas,