Signatures rework

ot-node.js

@@ -54,7 +54,6 @@ class OTNode {
 
         await this.initializeRouters();
         await this.startNetworkModule();
-        await this.initializeBLSService();
         this.resumeCommandExecutor();
         this.logger.info('Node is up and running!');
     }
@@ -385,18 +384,6 @@ class OTNode {
         tripleStoreService.initializeRepositories();
     }
 
-    async initializeBLSService() {
-        try {
-            const blsService = this.container.resolve('blsService');
-            await blsService.initialize();
-        } catch (error) {
-            this.logger.error(
-                `Unable to initialize BLS Service. Error message: ${error.message} OT-node shutting down...`,
-            );
-            this.stop(1);
-        }
-    }
-
     stop(code = 0) {
         this.logger.info('Stopping node...');
         process.exit(code);

package.json

@@ -68,7 +68,6 @@
         "@ethersproject/bytes": "^5.7.0",
         "@ethersproject/hash": "^5.7.0",
         "@ethersproject/wallet": "^5.7.0",
-        "@questdb/nodejs-client": "^3.0.0",
         "@polkadot/api": "^9.3.2",
         "@polkadot/keyring": "^10.1.7",
         "@polkadot/util": "^10.1.7",
@@ -102,6 +101,7 @@
         "libp2p-mplex": "^0.10.7",
         "libp2p-noise": "^4.0.0",
         "libp2p-tcp": "^0.17.2",
+        "mcl-wasm": "^1.7.0",
         "minimist": "^1.2.7",
         "ms": "^2.1.3",
         "mysql2": "^3.3.0",

src/commands/local-store/local-store-command.js

@@ -21,8 +21,7 @@ class LocalStoreCommand extends Command {
         this.blockchainModuleManager = ctx.blockchainModuleManager;
         this.commandExecutor = ctx.commandExecutor;
         this.repositoryModuleManager = ctx.repositoryModuleManager;
-        this.blsService = ctx.blsService;
-        this.signatureStorageService = ctx.signatureStorageService;
+        this.signatureService = ctx.signatureService;
 
         this.errorType = ERROR_TYPE.LOCAL_STORE.LOCAL_STORE_ERROR;
     }
@@ -63,23 +62,29 @@ class LocalStoreCommand extends Command {
                 );
 
                 const identityId = await this.blockchainModuleManager.getIdentityId(blockchain);
-                const signature = await this.blsService.sign(datasetRoot);
+                const { signer, v, r, s, vs } = await this.signatureService.signMessage(
+                    blockchain,
+                    datasetRoot,
+                );
 
-                await this.signatureStorageService.addSignatureToStorage(
+                await this.signatureService.addSignatureToStorage(
                     operationId,
                     identityId,
-                    signature,
+                    signer,
+                    v,
+                    r,
+                    s,
+                    vs,
                 );
 
                 await this.operationService.processResponse(
                     command,
                     OPERATION_REQUEST_STATUS.COMPLETED,
                     {
                         messageType: NETWORK_MESSAGE_TYPES.RESPONSES.ACK,
-                        messageData: { identityId, signature },
+                        messageData: { identityId, signer, v, r, s, vs },
                     },
                     null,
-                    true,
                 );
                 this.operationIdService.emitChangeEvent(
                     OPERATION_ID_STATUS.LOCAL_STORE.LOCAL_STORE_PROCESS_RESPONSE_END,

src/commands/protocols/publish/receiver/v1.0.0/v1-0-0-handle-store-request-command.js

@@ -18,9 +18,9 @@ class HandleStoreRequestCommand extends HandleProtocolMessageCommand {
         this.tripleStoreService = ctx.tripleStoreService;
         this.ualService = ctx.ualService;
         this.pendingStorageService = ctx.pendingStorageService;
-        this.blsService = ctx.blsService;
         this.operationIdService = ctx.operationIdService;
         this.pendingStorageService = ctx.pendingStorageService;
+        this.signatureService = ctx.signatureService;
 
         this.errorType = ERROR_TYPE.PUBLISH.PUBLISH_LOCAL_STORE_REMOTE_ERROR;
         this.operationStartEvent = OPERATION_ID_STATUS.PUBLISH.PUBLISH_LOCAL_STORE_REMOTE_START;
@@ -106,7 +106,10 @@ class HandleStoreRequestCommand extends HandleProtocolMessageCommand {
             operationId,
             blockchain,
         );
-        const signature = await this.blsService.sign(datasetRoot);
+        const { signer, v, r, s, vs } = await this.signatureService.signMessage(
+            blockchain,
+            datasetRoot,
+        );
         await this.operationIdService.emitChangeEvent(
             OPERATION_ID_STATUS.PUBLISH.PUBLISH_LOCAL_STORE_REMOTE_SIGN_END,
             operationId,
@@ -115,7 +118,7 @@ class HandleStoreRequestCommand extends HandleProtocolMessageCommand {
 
         return {
             messageType: NETWORK_MESSAGE_TYPES.RESPONSES.ACK,
-            messageData: { identityId, signature },
+            messageData: { identityId, signer, v, r, s, vs },
         };
     }
 

src/commands/protocols/publish/sender/publish-find-shard-command.js

@@ -23,8 +23,9 @@ class PublishFindShardCommand extends FindShardCommand {
         sequence.push('publishValidateAssetCommand');
         if (nodePartOfShard) {
             sequence.push('localStoreCommand');
+        } else {
+            sequence.push('networkPublishCommand');
         }
-        sequence.push('networkPublishCommand');
 
         return sequence;
     }

src/commands/protocols/publish/sender/v1.0.0/v1-0-0-publish-request-command.js

@@ -9,7 +9,7 @@ class PublishRequestCommand extends ProtocolRequestCommand {
     constructor(ctx) {
         super(ctx);
         this.operationService = ctx.publishService;
-        this.signatureStorageService = ctx.signatureStorageService;
+        this.signatureService = ctx.signatureService;
         this.operationIdService = ctx.operationIdService;
         this.errorType = ERROR_TYPE.PUBLISH.PUBLISH_STORE_REQUEST_ERROR;
 
@@ -59,10 +59,14 @@ class PublishRequestCommand extends ProtocolRequestCommand {
             operationId,
             blockchain,
         );
-        await this.signatureStorageService.addSignatureToStorage(
+        await this.signatureService.addSignatureToStorage(
             operationId,
             responseData.identityId,
-            responseData.signature,
+            responseData.signer,
+            responseData.v,
+            responseData.r,
+            responseData.s,
+            responseData.vs,
         );
         await this.operationIdService.emitChangeEvent(
             OPERATION_ID_STATUS.PUBLISH.PUBLISH_ADD_SIGNATURE_TO_STORAGE_END,

src/commands/protocols/update/receiver/v1.0.0/v1-0-0-handle-update-request-command.js

@@ -12,9 +12,9 @@ class HandleUpdateRequestCommand extends HandleProtocolMessageCommand {
         this.operationService = ctx.updateService;
         this.blockchainModuleManager = ctx.blockchainModuleManager;
         this.pendingStorageService = ctx.pendingStorageService;
-        this.blsService = ctx.blsService;
         this.operationIdService = ctx.operationIdService;
         this.pendingStorageService = ctx.pendingStorageService;
+        this.signatureService = ctx.signatureService;
 
         this.errorType = ERROR_TYPE.UPDATE.UPDATE_LOCAL_STORE_REMOTE_ERROR;
         this.operationStartEvent = OPERATION_ID_STATUS.UPDATE.UPDATE_LOCAL_STORE_REMOTE_START;
@@ -100,7 +100,10 @@ class HandleUpdateRequestCommand extends HandleProtocolMessageCommand {
             operationId,
             blockchain,
         );
-        const signature = await this.blsService.sign(datasetRoot);
+        const { signer, v, r, s, vs } = await this.signatureService.signMessage(
+            blockchain,
+            datasetRoot,
+        );
         this.operationIdService.emitChangeEvent(
             OPERATION_ID_STATUS.UPDATE.UPDATE_LOCAL_STORE_REMOTE_SIGN_END,
             operationId,
@@ -109,7 +112,7 @@ class HandleUpdateRequestCommand extends HandleProtocolMessageCommand {
 
         return {
             messageType: NETWORK_MESSAGE_TYPES.RESPONSES.ACK,
-            messageData: { identityId, signature },
+            messageData: { identityId, signer, v, r, s, vs },
         };
     }
 

src/commands/protocols/update/sender/v1.0.0/v1-0-0-update-request-command.js

@@ -9,7 +9,7 @@ class PublishRequestCommand extends ProtocolRequestCommand {
     constructor(ctx) {
         super(ctx);
         this.operationService = ctx.updateService;
-        this.signatureStorageService = ctx.signatureStorageService;
+        this.signatureService = ctx.signatureService;
         this.operationIdService = ctx.operationIdService;
         this.errorType = ERROR_TYPE.UPDATE.UPDATE_STORE_REQUEST_ERROR;
 
@@ -58,10 +58,14 @@ class PublishRequestCommand extends ProtocolRequestCommand {
             operationId,
             blockchain,
         );
-        await this.signatureStorageService.addSignatureToStorage(
+        await this.signatureService.addSignatureToStorage(
             operationId,
             responseData.identityId,
-            responseData.signature,
+            responseData.signer,
+            responseData.v,
+            responseData.r,
+            responseData.s,
+            responseData.vs,
         );
         await this.operationIdService.emitChangeEvent(
             OPERATION_ID_STATUS.UPDATE.UPDATE_ADD_SIGNATURE_TO_STORAGE_END,

src/modules/blockchain/blockchain-module-manager.js

@@ -5,6 +5,16 @@ class BlockchainModuleManager extends BaseModuleManager {
         return 'blockchain';
     }
 
+    callImplementationFunction(blockchain, functionName, args = []) {
+        if (blockchain) {
+            if (this.getImplementation(blockchain)) {
+                return this.getImplementation(blockchain).module[functionName](...args);
+            }
+        } else {
+            return this.getImplementation().module[functionName](...args);
+        }
+    }
+
     initializeTransactionQueues(blockchain, concurrency) {
         return this.callImplementationFunction(blockchain, 'getTotalTransactionQueueLength', [
             concurrency,
@@ -199,6 +209,18 @@ class BlockchainModuleManager extends BaseModuleManager {
         return this.callImplementationFunction(blockchain, 'convertFromWei', [value, toUnit]);
     }
 
+    hashMessage(blockchain, message) {
+        return this.callImplementationFunction(blockchain, 'hashMessage', [message]);
+    }
+
+    async signMessage(blockchain, messageHash) {
+        return this.callImplementationFunction(blockchain, 'signMessage', [messageHash]);
+    }
+
+    splitSignature(blockchain, flatSignature) {
+        return this.callImplementationFunction(blockchain, 'splitSignature', [flatSignature]);
+    }
+
     async isCommitWindowOpen(blockchain, agreementId, epoch, stateIndex) {
         return this.callImplementationFunction(blockchain, 'isCommitWindowOpen', [
             agreementId,
@@ -413,16 +435,6 @@ class BlockchainModuleManager extends BaseModuleManager {
         return this.callImplementationFunction(blockchain, 'getLog2PLDSFParams');
     }
 
-    callImplementationFunction(blockchain, functionName, args = []) {
-        if (blockchain) {
-            if (this.getImplementation(blockchain)) {
-                return this.getImplementation(blockchain).module[functionName](...args);
-            }
-        } else {
-            return this.getImplementation().module[functionName](...args);
-        }
-    }
-
     async getLatestBlock(blockchain) {
         return this.callImplementationFunction(blockchain, 'getLatestBlock');
     }

src/modules/blockchain/implementation/web3-service.js

@@ -132,6 +132,11 @@ class Web3Service {
         return wallets;
     }
 
+    getRandomOperationalWallet() {
+        const randomIndex = Math.floor(Math.random() * this.operationalWallets.length);
+        return this.operationalWallets[randomIndex];
+    }
+
     async initializeWeb3() {
         const providers = [];
         for (const rpcEndpoint of this.config.rpcEndpoints) {
@@ -1326,6 +1331,20 @@ class Web3Service {
         return ethers.utils.formatUnits(value, toUnit);
     }
 
+    hashMessage(message) {
+        return ethers.utils.hashMessage(message);
+    }
+
+    async signMessage(messageHash) {
+        const wallet = this.getRandomOperationalWallet();
+        const signature = await wallet.signMessage(ethers.utils.arrayify(messageHash));
+        return { signer: wallet.address, signature };
+    }
+
+    splitSignature(flatSignature) {
+        return ethers.utils.splitSignature(flatSignature);
+    }
+
     async healthCheck() {
         try {
             const gasPrice = await this.operationalWallets[0].getGasPrice();