feat(dashmate): single node local network [WIP]

packages/bench-suite/package.json

@@ -8,7 +8,7 @@
     "lint": ""
   },
   "dependencies": {
-    "@dashevo/dashcore-lib": "~0.22.0",
+    "@dashevo/dashcore-lib": "github:dashpay/dashcore-lib#feat/add-quourm-111",
     "@dashevo/dpns-contract": "workspace:*",
     "@dashevo/wallet-lib": "workspace:*",
     "@dashevo/wasm-dpp": "workspace:*",

packages/dapi/package.json

@@ -35,7 +35,7 @@
   "dependencies": {
     "@dashevo/bls": "~1.2.9",
     "@dashevo/dapi-grpc": "workspace:*",
-    "@dashevo/dashcore-lib": "~0.22.0",
+    "@dashevo/dashcore-lib": "github:dashpay/dashcore-lib#feat/add-quourm-111",
     "@dashevo/dashd-rpc": "^19.0.0",
     "@dashevo/grpc-common": "workspace:*",
     "@dashevo/wasm-dpp": "workspace:*",

packages/dash-spv/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@dashevo/dark-gravity-wave": "^1.1.1",
     "@dashevo/dash-util": "^2.0.3",
-    "@dashevo/dashcore-lib": "~0.22.0",
+    "@dashevo/dashcore-lib": "github:dashpay/dashcore-lib#feat/add-quourm-111",
     "levelup": "^4.4.0",
     "memdown": "^5.1.0",
     "wasm-x11-hash": "~0.0.2"

packages/dashmate/configs/defaults/getBaseConfigFactory.js

@@ -53,7 +53,7 @@ export default function getBaseConfigFactory() {
           port: 3001,
         },
         docker: {
-          image: 'dashpay/dashd:22',
+          image: 'dashpay/dashd:22.1.0-devpr6437.f0e7eb57',
           commandArgs: [],
         },
         p2p: {
@@ -310,7 +310,7 @@ export default function getBaseConfigFactory() {
           tenderdash: {
             mode: 'full',
             docker: {
-              image: 'dashpay/tenderdash:1',
+              image: 'dashpay/tenderdash:feat-support-quorum-111',
             },
             p2p: {
               host: '0.0.0.0',

packages/dashmate/configs/defaults/getLocalConfigFactory.js

@@ -68,23 +68,23 @@ export default function getLocalConfigFactory(getBaseConfig) {
             epochTime: 1200,
             validatorSet: {
               quorum: {
-                llmqType: 106,
+                llmqType: 111,
                 dkgInterval: 24,
                 activeSigners: 2,
                 rotation: false,
               },
             },
             chainLock: {
               quorum: {
-                llmqType: 100,
+                llmqType: 111,
                 dkgInterval: 24,
                 activeSigners: 2,
                 rotation: false,
               },
             },
             instantLock: {
               quorum: {
-                llmqType: 104,
+                llmqType: 111,
                 dkgInterval: 24,
                 activeSigners: 2,
                 rotation: false,

packages/dashmate/package.json

@@ -56,7 +56,7 @@
   "dependencies": {
     "@dashevo/bls": "~1.2.9",
     "@dashevo/dapi-client": "workspace:*",
-    "@dashevo/dashcore-lib": "~0.22.0",
+    "@dashevo/dashcore-lib": "github:dashpay/dashcore-lib#feat/add-quourm-111",
     "@dashevo/dashd-rpc": "^19.0.0",
     "@dashevo/docker-compose": "^0.24.4",
     "@dashevo/wallet-lib": "workspace:*",

packages/dashmate/src/commands/setup.js

@@ -60,8 +60,8 @@ export default class SetupCommand extends BaseCommand {
     dockerCompose,
     defaultConfigs,
   ) {
-    if (nodeCount !== null && (nodeCount < 3)) {
-      throw new Error('node-count flag should be not less than 3');
+    if (nodeCount !== null && (nodeCount < 1)) {
+      throw new Error('node-count flag should be not less than 1');
     }
 
     const tasks = new Listr(

packages/dashmate/src/config/configJsonSchema.js

@@ -110,7 +110,7 @@ export default {
       properties: {
         llmqType: {
           type: 'integer',
-          enum: [1, 2, 3, 4, 5, 6, 100, 101, 102, 103, 104, 105, 106, 107],
+          enum: [1, 2, 3, 4, 5, 6, 100, 101, 102, 103, 104, 105, 106, 107, 111],
         },
         dkgInterval: {
           type: 'integer',

packages/dashmate/src/constants.js

@@ -29,6 +29,7 @@ export const NODE_TYPE_FULLNODE = 'fullnode';
 
 export const LLMQ_TYPE_TEST = 'llmq_test';
 export const LLMQ_TYPE_TEST_PLATFORM = 'llmq_test_platform';
+export const LLMQ_TYPE_1 = 'llmq_1_100';
 
 export const QUORUM_TYPES = {
   LLMQ_TYPE_TEST: 100,

packages/dashmate/src/createDIContainer.js

@@ -78,7 +78,8 @@ import configureCoreTaskFactory from './listr/tasks/setup/local/configureCoreTas
 import configureTenderdashTaskFactory from './listr/tasks/setup/local/configureTenderdashTaskFactory.js';
 import obtainSelfSignedCertificateTaskFactory from './listr/tasks/ssl/selfSigned/obtainSelfSignedCertificateTaskFactory.js';
 import waitForNodeToBeReadyTaskFactory from './listr/tasks/platform/waitForNodeToBeReadyTaskFactory.js';
-import enableCoreQuorumsTaskFactory from './listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js';
+import enableMultiCoreQuorumsTaskFactory from './listr/tasks/setup/local/enableMultiCoreQuorumsTaskFactory.js';
+import enableSingleCoreQuorumTaskFactory from './listr/tasks/setup/local/enableSingleCoreQuorumTaskFactory.js';
 import startGroupNodesTaskFactory from './listr/tasks/startGroupNodesTaskFactory.js';
 import buildServicesTaskFactory from './listr/tasks/buildServicesTaskFactory.js';
 import reindexNodeTaskFactory from './listr/tasks/reindexNodeTaskFactory.js';
@@ -300,7 +301,8 @@ export default async function createDIContainer(options = {}) {
     configureCoreTask: asFunction(configureCoreTaskFactory).singleton(),
     configureTenderdashTask: asFunction(configureTenderdashTaskFactory).singleton(),
     waitForNodeToBeReadyTask: asFunction(waitForNodeToBeReadyTaskFactory).singleton(),
-    enableCoreQuorumsTask: asFunction(enableCoreQuorumsTaskFactory).singleton(),
+    enableMultiCoreQuorumsTask: asFunction(enableMultiCoreQuorumsTaskFactory).singleton(),
+    enableSingleCoreQuorumTask: asFunction(enableSingleCoreQuorumTaskFactory).singleton(),
     registerMasternodeGuideTask: asFunction(registerMasternodeGuideTaskFactory).singleton(),
     obtainZeroSSLCertificateTask: asFunction(obtainZeroSSLCertificateTaskFactory).singleton(),
     cleanupZeroSSLCertificatesTask: asFunction(cleanupZeroSSLCertificatesTaskFactory).singleton(),

packages/dashmate/src/listr/tasks/setup/local/configureCoreTaskFactory.js

@@ -16,7 +16,8 @@ const { PrivateKey } = DashCoreLib;
  * @param {generateToAddressTask} generateToAddressTask
  * @param {registerMasternodeTask} registerMasternodeTask
  * @param {generateBlsKeys} generateBlsKeys
- * @param {enableCoreQuorumsTask} enableCoreQuorumsTask
+ * @param {enableMultiCoreQuorumsTask} enableMultiCoreQuorumsTask
+ * @param {enableSingleCoreQuorumTask} enableSingleCoreQuorumTask
  * @param {waitForMasternodesSync} waitForMasternodesSync
  * @param {ConfigFile} configFile
  * @return {configureCoreTask}
@@ -30,7 +31,8 @@ export default function configureCoreTaskFactory(
   generateToAddressTask,
   registerMasternodeTask,
   generateBlsKeys,
-  enableCoreQuorumsTask,
+  enableMultiCoreQuorumsTask,
+  enableSingleCoreQuorumTask,
   waitForMasternodesSync,
   configFile,
 ) {
@@ -115,7 +117,8 @@ export default function configureCoreTaskFactory(
             {
               title: 'Generating funds to use as a collateral for masternodes',
               task: () => {
-                const amount = HPMN_COLLATERAL_AMOUNT * configGroup.length;
+                // Generate for evnodes (- a seed node) + some cash for fees
+                const amount = HPMN_COLLATERAL_AMOUNT * (configGroup.length - 1) + 100;
                 return generateToAddressTask(
                   configGroup.find((c) => c.getName() === 'local_seed'),
                   amount,
@@ -125,7 +128,7 @@ export default function configureCoreTaskFactory(
             {
               title: 'Activating v19 and v20',
               task: () => new Observable(async (observer) => {
-                const dip3ActivationHeight = 901;
+                const activationHeight = 901;
                 const blocksToGenerateInOneStep = 10;
 
                 let blocksGenerated = 0;
@@ -149,7 +152,7 @@ export default function configureCoreTaskFactory(
                       observer.next(`${blocksGenerated} blocks generated`);
                     },
                   );
-                } while (dip3ActivationHeight > currentBlockHeight);
+                } while (activationHeight > currentBlockHeight);
 
                 observer.complete();
 
@@ -235,6 +238,7 @@ export default function configureCoreTaskFactory(
             {
               title: 'Set initial mock time',
               task: async () => {
+                // TODO: We want to get rid of mock time
                 // Set initial mock time from the last block
                 const { result: bestBlockHash } = await ctx.seedRpcClient.getBestBlockHash();
                 const { result: bestBlock } = await ctx.seedRpcClient.getBlock(bestBlockHash);
@@ -297,9 +301,15 @@ export default function configureCoreTaskFactory(
                 }
               },
             },
+            {
+              title: 'Wait for quorum to be enabled',
+              enabled: configGroup.length - 1 === 1,
+              task: () => enableSingleCoreQuorumTask(),
+            },
             {
               title: 'Wait for quorums to be enabled',
-              task: () => enableCoreQuorumsTask(),
+              enabled: configGroup.length - 1 > 1,
+              task: () => enableMultiCoreQuorumsTask(),
             },
             {
               title: 'Wait for nodes to have the same height',
@@ -311,7 +321,10 @@ export default function configureCoreTaskFactory(
             {
               title: 'Activating v21 fork',
               task: () => new Observable(async (observer) => {
-                const dip3ActivationHeight = 1001;
+                // Drive expect all quorums available when we activate mn_rr (activation of
+                // Evolution)
+                // We activate v21 at block 1000 when we expect all quorums already formed
+                const activationHeight = 1001;
                 const blocksToGenerateInOneStep = 10;
 
                 let blocksGenerated = 0;
@@ -335,7 +348,7 @@ export default function configureCoreTaskFactory(
                       observer.next(`${blocksGenerated} blocks generated`);
                     },
                   );
-                } while (dip3ActivationHeight > currentBlockHeight);
+                } while (activationHeight > currentBlockHeight);
 
                 observer.complete();
 

packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js → packages/dashmate/src/listr/tasks/setup/local/enableMultiCoreQuorumsTaskFactory.js

@@ -10,32 +10,32 @@ import waitForMasternodeProbes from '../../../../core/quorum/waitForMasternodePr
  * @param {generateBlocks} generateBlocks
  * @return {enableCoreQuorumsTask}
  */
-export default function enableCoreQuorumsTaskFactory(generateBlocks) {
+export default function enableMultiCoreQuorumsTaskFactory(generateBlocks) {
   /**
    * @typedef {enableCoreQuorumsTask}
    * @return {Listr}
    */
-  function enableCoreQuorumsTask() {
+  function enableMultiCoreQuorumsTask() {
     const WAIT_FOR_NODES_TIMEOUT = 60 * 5 * 1000;
 
     return new Listr([
       {
         task: (ctx) => {
-          // Those are default values for the quorum size 3 with all nodes
-          // behaving correctly with "llmq_test" quorum
-          ctx.expectedMembers = 3;
-          ctx.expectedCommitments = 3;
-          ctx.expectedConnections = 2;
-
-          ctx.expectedContributions = 3;
-          ctx.expectedJustifications = 0;
-          ctx.expectedComplaints = 0;
-
           ctx.masternodeCoreServices = ctx.coreServices
             .filter((coreService) => coreService.getConfig().getName() !== 'local_seed');
 
           ctx.masternodeRpcClients = ctx.masternodeCoreServices
             .map((coreService) => coreService.getRpcClient());
+
+          // Those are default values for the quorum size 3 with all nodes
+          // behaving correctly with "llmq_test" quorum
+          ctx.expectedMembers = Math.min(ctx.masternodeCoreServices.length, 3);
+          ctx.expectedCommitments = Math.min(ctx.masternodeCoreServices.length, 3);
+          ctx.expectedConnections = Math.min(ctx.masternodeCoreServices.length, 3) - 1;
+
+          ctx.expectedContributions = Math.min(ctx.masternodeCoreServices.length, 3);
+          ctx.expectedJustifications = 0;
+          ctx.expectedComplaints = 0;
         },
       },
       {
@@ -292,5 +292,5 @@ export default function enableCoreQuorumsTaskFactory(generateBlocks) {
     ]);
   }
 
-  return enableCoreQuorumsTask;
+  return enableMultiCoreQuorumsTask;
 }