chore(drive): increase withdrawal limits to 2000 Dash per day

packages/dashmate/configs/defaults/getLocalConfigFactory.js

@@ -24,6 +24,9 @@ export default function getLocalConfigFactory(getBaseConfig) {
         },
       },
       core: {
+        docker: {
+          image: 'dashpay/dashd:22.0.0-nightly.2024.10.29',
+        },
         p2p: {
           port: 20001,
         },

packages/dashmate/configs/defaults/getTestnetConfigFactory.js

@@ -24,6 +24,9 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
         },
       },
       core: {
+        docker: {
+          image: 'dashpay/dashd:22.0.0-nightly.2024.10.29',
+        },
         p2p: {
           port: 19999,
         },

packages/dashmate/configs/getConfigFileMigrationsFactory.js

@@ -4,6 +4,7 @@ import lodash from 'lodash';
 import path from 'path';
 
 import {
+  NETWORK_DEVNET,
   NETWORK_LOCAL,
   NETWORK_MAINNET,
   NETWORK_TESTNET,
@@ -1029,6 +1030,10 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
             if (options.network === NETWORK_TESTNET && name !== 'base') {
               options.platform.drive.tenderdash.p2p.seeds = testnet.get('platform.drive.tenderdash.p2p.seeds');
             }
+
+            if ([NETWORK_LOCAL, NETWORK_TESTNET, NETWORK_DEVNET].includes(options.network)) {
+              options.core.docker.image = 'dashpay/dashd:22.0.0-nightly.2024.10.29';
+            }
           });
         return configFile;
       },

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

@@ -2,7 +2,6 @@ import { Listr } from 'listr2';
 import { Observable } from 'rxjs';
 import DashCoreLib from '@dashevo/dashcore-lib';
 import waitForNodesToHaveTheSameHeight from '../../../../core/waitForNodesToHaveTheSameHeight.js';
-import waitForNodesToHaveTheSameSporks from '../../../../core/waitForNodesToHaveTheSameSporks.js';
 
 import { NETWORK_LOCAL, HPMN_COLLATERAL_AMOUNT } from '../../../../constants.js';
 
@@ -93,9 +92,40 @@ export default function configureCoreTaskFactory(
               },
             },
             {
-              title: 'Activating DIP3',
+              title: 'Create wallet',
+              task: async () => {
+                const disablePrivateKeys = false;
+                const createBlankWallet = false;
+                const walletPassphrase = '';
+                const avoidReuse = false;
+                const loadOnStartup = true;
+                const descriptors = false;
+
+                await ctx.coreService.getRpcClient().createWallet(
+                  'main',
+                  disablePrivateKeys,
+                  createBlankWallet,
+                  walletPassphrase,
+                  avoidReuse,
+                  descriptors,
+                  loadOnStartup,
+                );
+              },
+            },
+            {
+              title: 'Generating funds to use as a collateral for masternodes',
+              task: () => {
+                const amount = HPMN_COLLATERAL_AMOUNT * configGroup.length;
+                return generateToAddressTask(
+                  configGroup.find((c) => c.getName() === 'local_seed'),
+                  amount,
+                );
+              },
+            },
+            {
+              title: 'Activating v19 and v20',
               task: () => new Observable(async (observer) => {
-                const dip3ActivationHeight = 1000;
+                const dip3ActivationHeight = 901;
                 const blocksToGenerateInOneStep = 10;
 
                 let blocksGenerated = 0;
@@ -126,37 +156,6 @@ export default function configureCoreTaskFactory(
                 return this;
               }),
             },
-            {
-              title: 'Create wallet',
-              task: async () => {
-                const disablePrivateKeys = false;
-                const createBlankWallet = false;
-                const walletPassphrase = '';
-                const avoidReuse = false;
-                const loadOnStartup = true;
-                const descriptors = false;
-
-                await ctx.coreService.getRpcClient().createWallet(
-                  'main',
-                  disablePrivateKeys,
-                  createBlankWallet,
-                  walletPassphrase,
-                  avoidReuse,
-                  descriptors,
-                  loadOnStartup,
-                );
-              },
-            },
-            {
-              title: 'Generating funds to use as a collateral for masternodes',
-              task: () => {
-                const amount = HPMN_COLLATERAL_AMOUNT * configGroup.length;
-                return generateToAddressTask(
-                  configGroup.find((c) => c.getName() === 'local_seed'),
-                  amount,
-                );
-              },
-            },
             {
               title: 'Register masternodes',
               task: async () => {
@@ -276,51 +275,6 @@ export default function configureCoreTaskFactory(
                 );
               },
             },
-            {
-              title: 'Wait for nodes to have the same sporks',
-              task: () => waitForNodesToHaveTheSameSporks(ctx.coreServices),
-            },
-            {
-              title: 'Activating DIP8 to enable ChainLocks',
-              task: () => new Observable(async (observer) => {
-                let isDip8Activated = false;
-                let blockchainInfo;
-
-                let blocksGenerated = 0;
-
-                const blocksToGenerateInOneStep = 10;
-
-                do {
-                  ({
-                    result: blockchainInfo,
-                  } = await ctx.seedCoreService.getRpcClient().getBlockchainInfo());
-
-                  isDip8Activated = blockchainInfo.softforks.dip0008.active;
-
-                  if (isDip8Activated) {
-                    break;
-                  }
-
-                  await generateBlocks(
-                    ctx.seedCoreService,
-                    blocksToGenerateInOneStep,
-                    NETWORK_LOCAL,
-                    // eslint-disable-next-line no-loop-func
-                    (blocks) => {
-                      blocksGenerated += blocks;
-
-                      observer.next(`${blocksGenerated} blocks generated`);
-                    },
-                  );
-                } while (!isDip8Activated);
-
-                observer.next(`DIP8 has been activated at height ${blockchainInfo.softforks.dip0008.height}`);
-
-                observer.complete();
-
-                return this;
-              }),
-            },
             {
               title: 'Wait for nodes to have the same height',
               task: () => waitForNodesToHaveTheSameHeight(
@@ -347,47 +301,6 @@ export default function configureCoreTaskFactory(
               title: 'Wait for quorums to be enabled',
               task: () => enableCoreQuorumsTask(),
             },
-            {
-              title: 'Activating V20 fork',
-              task: () => new Observable(async (observer) => {
-                let isV20Activated = false;
-                let blockchainInfo;
-
-                let blocksGenerated = 0;
-
-                const blocksToGenerateInOneStep = 10;
-
-                do {
-                  ({
-                    result: blockchainInfo,
-                  } = await ctx.seedCoreService.getRpcClient().getBlockchainInfo());
-
-                  isV20Activated = blockchainInfo.softforks && blockchainInfo.softforks.v20
-                    && blockchainInfo.softforks.v20.active;
-                  if (isV20Activated) {
-                    break;
-                  }
-
-                  await generateBlocks(
-                    ctx.seedCoreService,
-                    blocksToGenerateInOneStep,
-                    NETWORK_LOCAL,
-                    // eslint-disable-next-line no-loop-func
-                    (blocks) => {
-                      blocksGenerated += blocks;
-
-                      observer.next(`${blocksGenerated} blocks generated`);
-                    },
-                  );
-                } while (!isV20Activated);
-
-                observer.next(`V20 fork has been activated at height ${blockchainInfo.softforks.v20.height}`);
-
-                observer.complete();
-
-                return this;
-              }),
-            },
             {
               title: 'Wait for nodes to have the same height',
               task: () => waitForNodesToHaveTheSameHeight(
@@ -396,41 +309,23 @@ export default function configureCoreTaskFactory(
               ),
             },
             {
-              title: 'Enable EHF spork',
-              task: async () => new Observable(async (observer) => {
-                const seedRpcClient = ctx.seedCoreService.getRpcClient();
-                const {
-                  result: initialCoreChainLockedHeight,
-                } = await seedRpcClient.getBlockCount();
-
-                await activateCoreSpork(
-                  seedRpcClient,
-                  'SPORK_24_TEST_EHF',
-                  initialCoreChainLockedHeight,
-                );
-
-                let isEhfActivated = false;
-                let blockchainInfo;
+              title: 'Activating v21 fork',
+              task: () => new Observable(async (observer) => {
+                const dip3ActivationHeight = 1001;
+                const blocksToGenerateInOneStep = 10;
 
                 let blocksGenerated = 0;
-
-                const blocksToGenerateInOneStep = 48;
+                let {
+                  result: currentBlockHeight,
+                } = await ctx.coreService.getRpcClient().getBlockCount();
 
                 do {
                   ({
-                    result: blockchainInfo,
-                  } = await ctx.seedCoreService.getRpcClient().getBlockchainInfo());
-
-                  isEhfActivated = blockchainInfo.softforks && blockchainInfo.softforks.mn_rr
-                    && blockchainInfo.softforks.mn_rr.active;
-                  if (isEhfActivated) {
-                    break;
-                  }
-
-                  await ctx.bumpMockTime(blocksToGenerateInOneStep);
+                    result: currentBlockHeight,
+                  } = await ctx.coreService.getRpcClient().getBlockCount());
 
                   await generateBlocks(
-                    ctx.seedCoreService,
+                    ctx.coreService,
                     blocksToGenerateInOneStep,
                     NETWORK_LOCAL,
                     // eslint-disable-next-line no-loop-func
@@ -440,9 +335,7 @@ export default function configureCoreTaskFactory(
                       observer.next(`${blocksGenerated} blocks generated`);
                     },
                   );
-                } while (!isEhfActivated);
-
-                observer.next(`EHF has been activated at height ${blockchainInfo.softforks.mn_rr.height}`);
+                } while (dip3ActivationHeight > currentBlockHeight);
 
                 observer.complete();
 

packages/dashmate/templates/core/dash.conf.dot

@@ -31,7 +31,6 @@ debuglogfile=/var/log/dash/debug.log
 # JSON RPC
 server=1
 rpcwallet=main
-deprecatedrpc=hpmn
 rpcworkqueue=64
 rpcthreads=16
 rpcwhitelistdefault=0
@@ -93,6 +92,7 @@ fallbackfee=0.00001
 {{?? it.network === 'local'}}
 regtest=1
 [regtest]
+testactivationheight=mn_rr@1000
 {{? it.core.spork.address}}sporkaddr={{=it.core.spork.address}}{{?}}
 {{? it.core.spork.privateKey}}sporkkey={{=it.core.spork.privateKey}}{{?}}
 {{? it.core.miner.mediantime}}mocktime={{=it.core.miner.mediantime}}{{?}}

packages/rs-dpp/src/withdrawal/daily_withdrawal_limit/mod.rs

@@ -4,13 +4,15 @@ use crate::ProtocolError;
 use platform_version::version::PlatformVersion;
 
 mod v0;
+mod v1;
 
 pub fn daily_withdrawal_limit(
     total_credits_in_platform: Credits,
     platform_version: &PlatformVersion,
 ) -> Result<Credits, ProtocolError> {
     match platform_version.dpp.methods.daily_withdrawal_limit {
         0 => Ok(daily_withdrawal_limit_v0(total_credits_in_platform)),
+        1 => Ok(v1::daily_withdrawal_limit_v1()),
         v => Err(ProtocolError::UnknownVersionError(format!(
             "Unknown daily_withdrawal_limit version {v}"
         ))),

packages/rs-dpp/src/withdrawal/daily_withdrawal_limit/v1/mod.rs

@@ -0,0 +1,12 @@
+use crate::fee::Credits;
+
+/// Set constant withdrawal daily limit to 2000 Dash
+///
+/// # Returns
+///
+/// * `Credits`: The calculated daily withdrawal limit based on the available credits.
+///
+pub fn daily_withdrawal_limit_v1() -> Credits {
+    // 2000 Dash
+    200_000_000_000_000
+}

packages/rs-drive-abci/src/execution/engine/run_block_proposal/v0/mod.rs

@@ -270,9 +270,13 @@ where
             })?; // This is a system error
 
         // Rebroadcast expired withdrawals if they exist
+        // We do that before we mark withdrawals as expired
+        // to rebroadcast them on the next block but not the same
+        // one
+        // TODO: It must be also only on core height change
         self.rebroadcast_expired_withdrawal_documents(
             &block_info,
-            &last_committed_platform_state,
+            last_committed_platform_state,
             transaction,
             platform_version,
         )?;

packages/rs-drive-abci/src/execution/platform_events/withdrawals/append_signatures_and_broadcast_withdrawal_transactions/v0/mod.rs

@@ -1,10 +1,7 @@
 use crate::error::execution::ExecutionError;
 use crate::error::Error;
 use crate::platform_types::platform::Platform;
-use crate::rpc::core::{
-    CoreRPCLike, CORE_RPC_ERROR_ASSET_UNLOCK_EXPIRED, CORE_RPC_ERROR_ASSET_UNLOCK_NO_ACTIVE_QUORUM,
-    CORE_RPC_TX_ALREADY_IN_CHAIN,
-};
+use crate::rpc::core::{CoreRPCLike, CORE_RPC_TX_ALREADY_IN_CHAIN};
 use dashcore_rpc::jsonrpc;
 use dashcore_rpc::Error as CoreRPCError;
 use dpp::dashcore::bls_sig_utils::BLSSignature;
@@ -18,6 +15,14 @@ use std::path::Path;
 use std::time::{SystemTime, UNIX_EPOCH};
 use tenderdash_abci::proto::types::VoteExtension;
 
+// This error is returned when Core can't find a quorum for the asset unlock transaction in Core 21
+const CORE_RPC_ERROR_ASSET_UNLOCK_NO_ACTIVE_QUORUM: &str = "bad-assetunlock-not-active-quorum";
+
+// This error replaced the previous since Core 22 to make it more verbose
+const CORE_RPC_ERROR_ASSET_UNLOCK_TOO_OLD_QUORUM: &str = " bad-assetunlock-too-old-quorum";
+
+const CORE_RPC_ERROR_ASSET_UNLOCK_EXPIRED: &str = "bad-assetunlock-too-late";
+
 impl<C> Platform<C>
 where
     C: CoreRPCLike,
@@ -90,7 +95,8 @@ where
                 }
                 Err(CoreRPCError::JsonRpc(jsonrpc::error::Error::Rpc(e)))
                     if e.message == CORE_RPC_ERROR_ASSET_UNLOCK_NO_ACTIVE_QUORUM
-                        || e.message == CORE_RPC_ERROR_ASSET_UNLOCK_EXPIRED =>
+                        || e.message == CORE_RPC_ERROR_ASSET_UNLOCK_EXPIRED
+                        || e.message == CORE_RPC_ERROR_ASSET_UNLOCK_TOO_OLD_QUORUM =>
                 {
                     tracing::debug!(
                         tx_id = transaction.txid().to_string(),

packages/rs-drive-abci/src/rpc/core.rs

@@ -152,11 +152,6 @@ pub const CORE_RPC_INVALID_ADDRESS_OR_KEY: i32 = -5;
 /// Invalid, missing or duplicate parameter
 pub const CORE_RPC_INVALID_PARAMETER: i32 = -8;
 
-/// Asset Unlock consensus error "bad-assetunlock-not-active-quorum"
-pub const CORE_RPC_ERROR_ASSET_UNLOCK_NO_ACTIVE_QUORUM: &str = "bad-assetunlock-not-active-quorum";
-/// Asset Unlock consensus error "bad-assetunlock-not-active-quorum"
-pub const CORE_RPC_ERROR_ASSET_UNLOCK_EXPIRED: &str = "bad-assetunlock-too-late";
-
 macro_rules! retry {
     ($action:expr) => {{
         /// Maximum number of retry attempts