Fix small issues

.example.env

@@ -1,24 +1,27 @@
 # Application Port - KOA server listens on this port (default 4000).
 RELAYER_PORT=4000
 
-# Environment
 NODE_ENV=development
 
 SUBNET_URL=https://devnetstats.apothem.network/subnet
-
 PARENTNET_URL=https://devnetstats.apothem.network/devnet
 
-CHECKPOINT_CONTRACT=0x16da2C7caf46D0d7270d68e590A992A90DfcF7ee
 
-PARENTNET_WALLET_PK=0x123
+CHECKPOINT_CONTRACT=0x1111111111111111111111111111111111111111
+PARENTNET_WALLET_PK=0x1111111111111111111111111111111111111111111111111111111111111111
+
+# # XDC-ZERO. It's optional. Don't uncomment it if not planning to enable it
+# PARENTNET_ZERO_CONTRACT=0x1111111111111111111111111111111111111111
+# SUBNET_ZERO_CONTRACT=0x1111111111111111111111111111111111111111
+# PARENTNET_ZERO_WALLET_PK=0x1111111111111111111111111111111111111111111111111111111111111111
 
-# XDC-ZERO. It's optional. Don't add it if not planning to enable it
-SUBNET_ZERO_CONTRACT=0x0000000
-PARENTNET_ZERO_CONTRACT=0x0000000
+# # Reverse-XDC-ZERO. optional.
+# REVERSE_CHECKPOINT_CONTRACT=0x1111111111111111111111111111111111111111
+# SUBNET_WALLET_PK=0x1111111111111111111111111111111111111111111111111111111111111111
+# SUBNET_ZERO_WALLET_PK=0x1111111111111111111111111111111111111111111111111111111111111111
 
-PARENTNET_WALLET_PK=0x123
 
-PARENTNET_ZERO_WALLET_PK=0x123
+MAX_FETCH_BLOCK_SIZE=120
 
 # Notification
 SLACK_WEBHOOK=https://hooks.slack.com/services/blablabla

.gitignore

@@ -1,5 +1,7 @@
 # API keys and secrets
 .env
+.env.devnet
+.env.testnet
 
 # Dependency directory
 node_modules

src/config.ts

@@ -25,6 +25,7 @@ export interface NotificationConfig {
 
 export interface XdcZeroConfig {
   isEnabled: boolean;
+  isReverseEnabled: boolean;
   subnetZeroContractAddress?: string;
   parentChainZeroContractAddress?: string;
   parentnetWalletPk?: string;
@@ -57,14 +58,37 @@ const environment = process.env.NODE_ENV || "production";
 export const devMode = environment != "production";
 
 const getZeroConfig = (): XdcZeroConfig => {
-  const isEnabled: boolean = "PARENTNET_ZERO_WALLET_PK" in process.env && "SUBNET_ZERO_WALLET_PK" in process.env && "SUBNET_ZERO_CONTRACT" in process.env && "PARENTNET_ZERO_CONTRACT" in process.env;
-  return isEnabled ? {
+  const reqXdcZero = [
+    "PARENTNET_ZERO_CONTRACT",
+    "SUBNET_ZERO_CONTRACT",
+    "PARENTNET_ZERO_WALLET_PK",
+    "CHECKPOINT_CONTRACT"
+  ];
+  const reqReverseXdcZero = [
+    "PARENTNET_ZERO_CONTRACT",
+    "SUBNET_ZERO_CONTRACT",
+    "SUBNET_ZERO_WALLET_PK",
+    "REVERSE_CHECKPOINT_CONTRACT"
+  ];
+  const isEnabled = reqXdcZero.every(envVar => envVar in process.env);
+  const isReverseEnabled = reqReverseXdcZero.every(envVar => envVar in process.env);
+
+  let parentnetWalletPk = "";
+  if (isEnabled){
+    parentnetWalletPk = process.env.PARENTNET_ZERO_WALLET_PK.startsWith("0x") ? process.env.PARENTNET_ZERO_WALLET_PK : `0x${process.env.PARENTNET_ZERO_WALLET_PK}`;
+  }
+  let subnetWalletPk = "";
+  if (isReverseEnabled){
+    subnetWalletPk = process.env.SUBNET_ZERO_WALLET_PK.startsWith("0x") ? process.env.SUBNET_ZERO_WALLET_PK : `0x${process.env.SUBNET_WALLET_PK}`;
+  }
+  return {
     isEnabled,
+    isReverseEnabled,
     subnetZeroContractAddress: process.env.SUBNET_ZERO_CONTRACT,
+    subnetWalletPk: subnetWalletPk,
     parentChainZeroContractAddress: process.env.PARENTNET_ZERO_CONTRACT,
-    parentnetWalletPk: process.env.PARENTNET_ZERO_WALLET_PK.startsWith("0x") ? process.env.PARENTNET_ZERO_WALLET_PK : `0x${process.env.PARENTNET_ZERO_WALLET_PK}`,
-    subnetWalletPk: process.env.SUBNET_WALLET_PK.startsWith("0x") ? process.env.SUBNET_WALLET_PK : `0x${process.env.SUBNET_WALLET_PK}`
-  }: { isEnabled: false };
+    parentnetWalletPk:  parentnetWalletPk,
+  };
 };
 
 const config: Config = {

src/processors/index.ts

@@ -125,6 +125,9 @@ export class Processors {
 
     if (config.xdcZero.isEnabled) {
       modes.push(Mode.ZERO);
+    }
+
+    if (config.xdcZero.isReverseEnabled){
       modes.push(Mode.REVERSE_ZERO);
     }
 

src/service/mainnet/index.ts

@@ -134,11 +134,9 @@ export class MainnetService {
     const blocksPerTx = [30, 15, 5, 1];
     //make 1 initial try, this is for when blocks are caught up
     if (results.length < blocksPerTx[0]){
-      try{
         this.logger.info("submitDynamic startblock", results[0].blockNum, "pushing", results.length, "blocks,",results.length, "remaining(inclusive) into PARENTNET");
         await this.submitTxs(results);
         return;
-      } catch (error){}
     }
 
     //loop while reducing tx size
@@ -147,16 +145,13 @@ export class MainnetService {
       while (i  < blocksPerTx.length){
         const val = blocksPerTx[i];
         if (results.length >= val){
-          try{
             this.logger.info("submitDynamic startblock", results[0].blockNum, "pushing", val, "blocks,",results.length, "remaining(inclusive) into PARENTNET");
             await this.submitTxs(results.slice(0, val));
             results = results.slice(val, results.length);
             break; //if push success, reset push size
-          } catch (error){}
-        }
-        if (i < blocksPerTx.length){
-          i++;
         }
+        i++;
+        await sleep(3000);
       }
     }
   }

src/service/subnet/index.ts

@@ -306,27 +306,22 @@ export class SubnetService {
     const blocksPerTx = [20, 10, 5, 1];
     //make 1 initial try, this is for when blocks are caught up
     if (results.length < blocksPerTx[0]){
-      try{
         this.logger.info("submitDynamic startblock", results[0].blockNum, "pushing", results.length, "blocks,",results.length, "remaining(inclusive) into SUBNET");
         await this.submitTxs(results);
         return;
-      } catch (error){}
     }
     while (results.length) {
       let i = 0;
       while (i < blocksPerTx.length){
         const val = blocksPerTx[i];
         if (results.length >= val){
-          try{
             this.logger.info("submitDynamic startblock", results[0].blockNum, "pushing", val, "blocks,", results.length, "remaining(inclusive) into SUBNET");
             await this.submitTxs(results.slice(0, val));
             results = results.slice(val, results.length);
             break; //if push success, reset push size
-          } catch (error){}
-        }
-        if (i < blocksPerTx.length){
-          i++;
         }
+        i++;
+        await sleep(3000);
       }
     }
   }

src/service/zero/index.ts

@@ -43,19 +43,23 @@ export class ZeroService {
       this.parentnetService = new MainnetService(config.subnet, logger);
       this.childnetUrl = config.mainnet.url;
       this.parentnetUrl = config.subnet.url;
-      this.parentnetCSCAddress = config.subnet.smartContractAddress;
-      this.subnetZeroAddress = config.xdcZero.parentChainZeroContractAddress;
-      this.parentnetZeroAddress = config.xdcZero.subnetZeroContractAddress;
-      this.parentnetWalletAccount = privateKeyToAccount(config.xdcZero.subnetWalletPk as Hex);
+      if (config.xdcZero.isReverseEnabled){
+        this.parentnetCSCAddress = config.subnet.smartContractAddress;
+        this.subnetZeroAddress = config.xdcZero.parentChainZeroContractAddress;
+        this.parentnetZeroAddress = config.xdcZero.subnetZeroContractAddress;
+        this.parentnetWalletAccount = privateKeyToAccount(config.xdcZero.subnetWalletPk as Hex);
+      }
     } else {
       this.childnetService = new SubnetService(config.subnet, logger);
       this.parentnetService = new MainnetService(config.mainnet, logger);
       this.childnetUrl = config.subnet.url;
       this.parentnetUrl = config.mainnet.url;
-      this.parentnetCSCAddress = config.mainnet.smartContractAddress;
-      this.subnetZeroAddress = config.xdcZero.subnetZeroContractAddress;
-      this.parentnetZeroAddress = config.xdcZero.parentChainZeroContractAddress;
-      this.parentnetWalletAccount = privateKeyToAccount(config.xdcZero.parentnetWalletPk as Hex);
+      if (config.xdcZero.isEnabled){
+        this.parentnetCSCAddress = config.mainnet.smartContractAddress;
+        this.subnetZeroAddress = config.xdcZero.subnetZeroContractAddress;
+        this.parentnetZeroAddress = config.xdcZero.parentChainZeroContractAddress;
+        this.parentnetWalletAccount = privateKeyToAccount(config.xdcZero.parentnetWalletPk as Hex);
+      }
     }
   }