Merge pull request #2758 from OriginTrail/v6/development-network

OriginTrail Testnet Prerelease v6.0.18
OriginTrail · Nov 3, 2023 · ca7c169 · ca7c169
2 parents be3e311 + d26c83c
commit ca7c169
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 46 deletions.
diff --git a/config/config.json b/config/config.json
@@ -131,7 +131,10 @@
                         "config": {
                             "networkId": "otp::testnet",
                             "hubContractAddress": "0x707233a55bD035C6Bc732196CA4dbffa63CbA169",
-                            "rpcEndpoints": ["https://lofar-tm-rpc.origin-trail.network"],
+                            "rpcEndpoints": [
+                                "https://lofar-tm-rpc.origin-trail.network",
+                                "https://lofar.origintrail.network/"
+                            ],
                             "initialStakeAmount": 50000,
                             "initialAskAmount": 2
                         }
@@ -585,7 +588,8 @@
                             "hubContractAddress": "0x5fA7916c48Fe6D5F1738d12Ad234b78c90B4cAdA",
                             "rpcEndpoints": [
                                 "https://astrosat-parachain-rpc.origin-trail.network",
-                                "https://astrosat.origintrail.network/"
+                                "https://astrosat.origintrail.network/",
+                                "https://astrosat-2.origintrail.network/"
                             ]
                         }
                     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "origintrail_node",
-    "version": "6.0.17",
+    "version": "6.0.18+hotfix.1",
     "description": "OTNode V6",
     "main": "index.js",
     "type": "module",

diff --git a/src/commands/protocols/common/submit-commit-command.js b/src/commands/protocols/common/submit-commit-command.js
@@ -52,7 +52,12 @@ class SubmitCommitCommand extends Command {
             const errorMessage = `Commit already submitted for blockchain: ${blockchain} agreement id: ${agreementId}, epoch: ${epoch}, state index: ${stateIndex}`;
             this.logger.trace(errorMessage);
 
-            await this.handleError(operationId, errorMessage, this.errorType, true);
+            this.operationIdService.emitChangeEvent(
+                OPERATION_ID_STATUS.COMMIT_PROOF.SUBMIT_COMMIT_END,
+                operationId,
+                agreementId,
+                epoch,
+            );
             return Command.empty();
         }
 
@@ -66,7 +71,10 @@ class SubmitCommitCommand extends Command {
                 epoch,
                 stateIndex,
                 (result) => {
-                    if (result?.error) {
+                    if (
+                        result?.error &&
+                        !result.error.message.includes('NodeAlreadySubmittedCommit')
+                    ) {
                         reject(result.error);
                     }
                     resolve();

diff --git a/src/commands/protocols/common/submit-proofs-command.js b/src/commands/protocols/common/submit-proofs-command.js
@@ -103,7 +103,12 @@ class SubmitProofsCommand extends Command {
             const errorMessage = `Proofs already submitted for blockchain: ${blockchain} agreement id: ${agreementId}, epoch: ${epoch}, state index: ${stateIndex}`;
             this.logger.trace(errorMessage);
 
-            await this.handleError(operationId, errorMessage, this.errorType, true);
+            this.operationIdService.emitChangeEvent(
+                OPERATION_ID_STATUS.COMMIT_PROOF.SUBMIT_PROOFS_END,
+                operationId,
+                agreementId,
+                epoch,
+            );
             return Command.empty();
         }
 
@@ -127,7 +132,7 @@ class SubmitProofsCommand extends Command {
                 leaf,
                 stateIndex,
                 (result) => {
-                    if (result?.error) {
+                    if (result?.error && !result.error.message.includes('NodeAlreadyRewarded')) {
                         reject(result.error);
                     }
                     resolve();

diff --git a/src/constants/constants.js b/src/constants/constants.js
@@ -1,5 +1,13 @@
 import { BigNumber } from 'ethers';
 
+export const WS_RPC_PROVIDER_PRIORITY = 2;
+
+export const HTTP_RPC_PROVIDER_PRIORITY = 1;
+
+export const FALLBACK_PROVIDER_QUORUM = 1;
+
+export const RPC_PROVIDER_STALL_TIMEOUT = 60 * 1000;
+
 export const UINT256_MAX_BN = BigNumber.from(2).pow(256).sub(1);
 
 export const UINT32_MAX_BN = BigNumber.from(2).pow(32).sub(1);

diff --git a/src/modules/blockchain/implementation/web3-service.js b/src/modules/blockchain/implementation/web3-service.js
@@ -15,6 +15,10 @@ import {
     TRANSACTION_POLLING_TIMEOUT_MILLIS,
     TRANSACTION_CONFIRMATIONS,
     BLOCK_TIME_MILLIS,
+    WS_RPC_PROVIDER_PRIORITY,
+    HTTP_RPC_PROVIDER_PRIORITY,
+    FALLBACK_PROVIDER_QUORUM,
+    RPC_PROVIDER_STALL_TIMEOUT,
 } from '../../../constants/constants.js';
 
 const require = createRequire(import.meta.url);
@@ -53,7 +57,6 @@ class Web3Service {
         this.config = config;
         this.logger = logger;
 
-        this.rpcNumber = 0;
         this.initializeTransactionQueue(TRANSACTION_QUEUE_CONCURRENCY);
         await this.initializeWeb3();
         this.startBlock = await this.getBlockNumber();
@@ -89,37 +92,44 @@ class Web3Service {
     }
 
     async initializeWeb3() {
-        let tries = 0;
-        let isRpcConnected = false;
-        while (!isRpcConnected) {
-            if (tries >= this.config.rpcEndpoints.length) {
-                throw Error('RPC initialization failed');
-            }
-
+        const rpcProviders = [];
+        for (const rpcEndpoint of this.config.rpcEndpoints) {
             try {
-                if (this.config.rpcEndpoints[this.rpcNumber].startsWith('ws')) {
-                    this.provider = new ethers.providers.WebSocketProvider(
-                        this.config.rpcEndpoints[this.rpcNumber],
-                    );
+                if (rpcEndpoint.startsWith('ws')) {
+                    rpcProviders.push({
+                        provider: new ethers.providers.WebSocketProvider(rpcEndpoint),
+                        priority: WS_RPC_PROVIDER_PRIORITY,
+                        weight: 1,
+                        stallTimeout: RPC_PROVIDER_STALL_TIMEOUT,
+                    });
                 } else {
-                    this.provider = new ethers.providers.JsonRpcProvider(
-                        this.config.rpcEndpoints[this.rpcNumber],
-                    );
+                    rpcProviders.push({
+                        provider: new ethers.providers.JsonRpcProvider(rpcEndpoint),
+                        priority: HTTP_RPC_PROVIDER_PRIORITY,
+                        weight: 1,
+                        stallTimeout: RPC_PROVIDER_STALL_TIMEOUT,
+                    });
                 }
-                // eslint-disable-next-line no-await-in-loop
-                await this.providerReady();
-                isRpcConnected = true;
+                this.logger.debug(`Connected to the blockchain RPC: ${rpcEndpoint}.`);
             } catch (e) {
-                this.logger.warn(
-                    `Unable to connect to blockchain rpc : ${
-                        this.config.rpcEndpoints[this.rpcNumber]
-                    }.`,
-                );
-                tries += 1;
-                this.rpcNumber = (this.rpcNumber + 1) % this.config.rpcEndpoints.length;
+                this.logger.warn(`Unable to connect to the blockchain RPC: ${rpcEndpoint}.`);
             }
         }
 
+        try {
+            this.provider = new ethers.providers.FallbackProvider(
+                rpcProviders,
+                FALLBACK_PROVIDER_QUORUM,
+            );
+        } catch (e) {
+            throw Error(
+                `RPC Fallback Provider initialization failed. Fallback Provider quorum: ${FALLBACK_PROVIDER_QUORUM}. Error: ${e.message}.`,
+            );
+        }
+
+        // eslint-disable-next-line no-await-in-loop
+        await this.providerReady();
+
         this.wallet = new ethers.Wallet(this.getPrivateKey(), this.provider);
     }
 
@@ -164,9 +174,6 @@ class Web3Service {
         });
 
         this.logger.info(`Contracts initialized`);
-        this.logger.debug(
-            `Connected to blockchain rpc : ${this.config.rpcEndpoints[this.rpcNumber]}.`,
-        );
 
         await this.logBalances();
     }
@@ -925,12 +932,6 @@ class Web3Service {
     }
 
     async restartService() {
-        this.rpcNumber = (this.rpcNumber + 1) % this.config.rpcEndpoints.length;
-        this.logger.warn(
-            `There was an issue with current blockchain rpc. Connecting to ${
-                this.config.rpcEndpoints[this.rpcNumber]
-            }`,
-        );
         await this.initializeWeb3();
         await this.initializeContracts();
     }
@@ -942,9 +943,7 @@ class Web3Service {
         } catch (rpcError) {
             isRpcError = true;
             this.logger.warn(
-                `Unable to execute smart contract function ${functionName} using blockchain rpc : ${
-                    this.config.rpcEndpoints[this.rpcNumber]
-                }.`,
+                `Unable to execute smart contract function ${functionName} using Fallback RPC Provider.`,
             );
             await this.restartService();
         }