From 2cc7d93404f859a11a017d5e75453477f4a8dc6b Mon Sep 17 00:00:00 2001
From: Ivan Shumkov <ivan@shumkov.ru>
Date: Fri, 14 Jun 2024 14:55:25 +0700
Subject: [PATCH] chore: update to Core 21

---
 .pnp.cjs                                      |  10 +++++-----
 ...dashd-rpc-https-add9a74649-877060fe5b.zip} | Bin 11424 -> 11426 bytes
 packages/dapi/package.json                    |   2 +-
 .../configs/defaults/getLocalConfigFactory.js |   2 +-
 packages/dashmate/package.json                |   2 +-
 .../setup/local/configureCoreTaskFactory.js   |   2 ++
 .../dashmate/templates/core/dash.conf.dot     |  12 ++++++------
 yarn.lock                                     |  10 +++++-----
 8 files changed, 21 insertions(+), 19 deletions(-)
 rename .yarn/cache/{@dashevo-dashd-rpc-npm-18.3.0-4f165136e8-b83fbdb149.zip => @dashevo-dashd-rpc-https-add9a74649-877060fe5b.zip} (75%)

diff --git a/.pnp.cjs b/.pnp.cjs
index c9529f485b2..1ce10cbb9c1 100755
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -2588,7 +2588,7 @@ const RAW_RUNTIME_STATE =
           ["@dashevo/dapi-client", "workspace:packages/js-dapi-client"],\
           ["@dashevo/dapi-grpc", "workspace:packages/dapi-grpc"],\
           ["@dashevo/dashcore-lib", "npm:0.21.1"],\
-          ["@dashevo/dashd-rpc", "npm:18.3.0"],\
+          ["@dashevo/dashd-rpc", "https://github.com/dashpay/dashd-rpc.git#commit=8aaa899d6f7bffb01b1deef2ef6981302e4b4034"],\
           ["@dashevo/dp-services-ctl", "https://github.com/dashevo/js-dp-services-ctl.git#commit=3976076b0018c5b4632ceda4c752fc597f27a640"],\
           ["@dashevo/grpc-common", "workspace:packages/js-grpc-common"],\
           ["@dashevo/wasm-dpp", "workspace:packages/wasm-dpp"],\
@@ -2772,10 +2772,10 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@dashevo/dashd-rpc", [\
-      ["npm:18.3.0", {\
-        "packageLocation": "./.yarn/cache/@dashevo-dashd-rpc-npm-18.3.0-4f165136e8-b83fbdb149.zip/node_modules/@dashevo/dashd-rpc/",\
+      ["https://github.com/dashpay/dashd-rpc.git#commit=8aaa899d6f7bffb01b1deef2ef6981302e4b4034", {\
+        "packageLocation": "./.yarn/cache/@dashevo-dashd-rpc-https-add9a74649-877060fe5b.zip/node_modules/@dashevo/dashd-rpc/",\
         "packageDependencies": [\
-          ["@dashevo/dashd-rpc", "npm:18.3.0"],\
+          ["@dashevo/dashd-rpc", "https://github.com/dashpay/dashd-rpc.git#commit=8aaa899d6f7bffb01b1deef2ef6981302e4b4034"],\
           ["async", "npm:3.2.4"],\
           ["bluebird", "npm:3.7.2"]\
         ],\
@@ -8455,7 +8455,7 @@ const RAW_RUNTIME_STATE =
           ["@dashevo/bls", "npm:1.2.9"],\
           ["@dashevo/dapi-client", "workspace:packages/js-dapi-client"],\
           ["@dashevo/dashcore-lib", "npm:0.21.1"],\
-          ["@dashevo/dashd-rpc", "npm:18.3.0"],\
+          ["@dashevo/dashd-rpc", "https://github.com/dashpay/dashd-rpc.git#commit=8aaa899d6f7bffb01b1deef2ef6981302e4b4034"],\
           ["@dashevo/dashpay-contract", "workspace:packages/dashpay-contract"],\
           ["@dashevo/docker-compose", "npm:0.24.4"],\
           ["@dashevo/dpns-contract", "workspace:packages/dpns-contract"],\
diff --git a/.yarn/cache/@dashevo-dashd-rpc-npm-18.3.0-4f165136e8-b83fbdb149.zip b/.yarn/cache/@dashevo-dashd-rpc-https-add9a74649-877060fe5b.zip
similarity index 75%
rename from .yarn/cache/@dashevo-dashd-rpc-npm-18.3.0-4f165136e8-b83fbdb149.zip
rename to .yarn/cache/@dashevo-dashd-rpc-https-add9a74649-877060fe5b.zip
index 4f4b7a146a3c15996909e84d28d0bb058532e783..27d088c21fbc3dafa140938016d9f9a29e8dc7ae 100644
GIT binary patch
delta 1811
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
BU;6+6

delta 1853
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

diff --git a/packages/dapi/package.json b/packages/dapi/package.json
index ab442480567..38ebe05704a 100644
--- a/packages/dapi/package.json
+++ b/packages/dapi/package.json
@@ -36,7 +36,7 @@
     "@dashevo/bls": "~1.2.9",
     "@dashevo/dapi-grpc": "workspace:*",
     "@dashevo/dashcore-lib": "~0.21.1",
-    "@dashevo/dashd-rpc": "^18.3.0",
+    "@dashevo/dashd-rpc": "github:dashpay/dashd-rpc#feat/add-descriptors",
     "@dashevo/grpc-common": "workspace:*",
     "@dashevo/wasm-dpp": "workspace:*",
     "@grpc/grpc-js": "1.4.4",
diff --git a/packages/dashmate/configs/defaults/getLocalConfigFactory.js b/packages/dashmate/configs/defaults/getLocalConfigFactory.js
index 33992ceceb7..c2fde1eef83 100644
--- a/packages/dashmate/configs/defaults/getLocalConfigFactory.js
+++ b/packages/dashmate/configs/defaults/getLocalConfigFactory.js
@@ -25,7 +25,7 @@ export default function getLocalConfigFactory(getBaseConfig) {
       },
       core: {
         docker: {
-          image: 'dashpay/dashd:20.1.0',
+          image: 'dashpay/dashd:21.0.0-devpr6045.241f0739',
           commandArgs: [],
         },
         p2p: {
diff --git a/packages/dashmate/package.json b/packages/dashmate/package.json
index ec527ce5054..e3b3119978a 100644
--- a/packages/dashmate/package.json
+++ b/packages/dashmate/package.json
@@ -59,7 +59,7 @@
     "@dashevo/bls": "~1.2.9",
     "@dashevo/dapi-client": "workspace:*",
     "@dashevo/dashcore-lib": "~0.21.1",
-    "@dashevo/dashd-rpc": "^18.3.0",
+    "@dashevo/dashd-rpc": "github:dashpay/dashd-rpc#feat/add-descriptors",
     "@dashevo/dashpay-contract": "workspace:*",
     "@dashevo/docker-compose": "^0.24.4",
     "@dashevo/dpns-contract": "workspace:*",
diff --git a/packages/dashmate/src/listr/tasks/setup/local/configureCoreTaskFactory.js b/packages/dashmate/src/listr/tasks/setup/local/configureCoreTaskFactory.js
index 93966875254..3b47f9f3b86 100644
--- a/packages/dashmate/src/listr/tasks/setup/local/configureCoreTaskFactory.js
+++ b/packages/dashmate/src/listr/tasks/setup/local/configureCoreTaskFactory.js
@@ -134,6 +134,7 @@ export default function configureCoreTaskFactory(
                 const walletPassphrase = '';
                 const avoidReuse = false;
                 const loadOnStartup = true;
+                const descriptors = false;
 
                 await ctx.coreService.getRpcClient().createWallet(
                   'main',
@@ -141,6 +142,7 @@ export default function configureCoreTaskFactory(
                   createBlankWallet,
                   walletPassphrase,
                   avoidReuse,
+                  descriptors,
                   loadOnStartup,
                 );
               },
diff --git a/packages/dashmate/templates/core/dash.conf.dot b/packages/dashmate/templates/core/dash.conf.dot
index 76536fdf630..1cecbc000bf 100644
--- a/packages/dashmate/templates/core/dash.conf.dot
+++ b/packages/dashmate/templates/core/dash.conf.dot
@@ -14,20 +14,18 @@ fallbackfee=0.00001
 
 # JSON RPC
 server=1
-rpcbind=0.0.0.0
-rpcport={{=it.core.rpc.port}}
 rpcwallet=main
 deprecatedrpc=hpmn
-rpcworkqueue=96
-rpcthreads=12
-rpcwhitelistdefault=0
+rpcworkqueue=64
+rpcthreads=16
+#rpcwhitelistdefault=0
 rpcexternaluser={{= Object.entries(it.core.rpc.users).filter(([username, options]) => options.lowPriority).map(([username, options]) => username).join(',') }}
 {{~ Object.keys(it.core.rpc.users) :user}}
 {{ salt = it.crypto.randomBytes(16).toString('hex'); }}
 {{ hmac = it.crypto.createHmac('sha256', salt).update(it.core.rpc.users[user].password); }}
 rpcauth={{=user}}:{{=salt}}${{=hmac.digest('hex') }}
 {{? it.core.rpc.users[user].whitelist !== null }}
-rpcwhitelist={{=user}}:{{=it.core.rpc.users[user].whitelist.join(',')}}
+#rpcwhitelist={{=user}}:{{=it.core.rpc.users[user].whitelist.join(',')}}
 {{?}}
 {{~}}
 
@@ -103,4 +101,6 @@ addnode={{=seed.host}}:{{=seed.port}}{{~}}
 # network
 port={{=it.core.p2p.port}}
 bind=0.0.0.0
+rpcbind=0.0.0.0
+rpcport={{=it.core.rpc.port}}
 
diff --git a/yarn.lock b/yarn.lock
index 4d6964c3908..c04ba71deb7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1550,7 +1550,7 @@ __metadata:
     "@dashevo/dapi-client": "workspace:*"
     "@dashevo/dapi-grpc": "workspace:*"
     "@dashevo/dashcore-lib": "npm:~0.21.1"
-    "@dashevo/dashd-rpc": "npm:^18.3.0"
+    "@dashevo/dashd-rpc": "github:dashpay/dashd-rpc#feat/add-descriptors"
     "@dashevo/dp-services-ctl": "github:dashevo/js-dp-services-ctl#v0.19-dev"
     "@dashevo/grpc-common": "workspace:*"
     "@dashevo/wasm-dpp": "workspace:*"
@@ -1642,13 +1642,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@dashevo/dashd-rpc@npm:^18.3.0":
+"@dashevo/dashd-rpc@github:dashpay/dashd-rpc#feat/add-descriptors":
   version: 18.3.0
-  resolution: "@dashevo/dashd-rpc@npm:18.3.0"
+  resolution: "@dashevo/dashd-rpc@https://github.com/dashpay/dashd-rpc.git#commit=8aaa899d6f7bffb01b1deef2ef6981302e4b4034"
   dependencies:
     async: "npm:^3.2.4"
     bluebird: "npm:^3.7.2"
-  checksum: b83fbdb14940e18a6759dfb10313f8b6eaa1d11f584a6fd378c5d6bd1ae2f9519e59f6114b692e24b77d81c0b8b275f2c408fe3500144f1aadf5e6b270a76ff7
+  checksum: 877060fe5b769d5cb04fb9bc686a38b61c40c54c7736f0facf920fcd5f7c7e609a57439d6eba0471c978e1aa06e1e8fc5f67df2019317ce3c4c8dc5706e94596
   languageName: node
   linkType: hard
 
@@ -6316,7 +6316,7 @@ __metadata:
     "@dashevo/bls": "npm:~1.2.9"
     "@dashevo/dapi-client": "workspace:*"
     "@dashevo/dashcore-lib": "npm:~0.21.1"
-    "@dashevo/dashd-rpc": "npm:^18.3.0"
+    "@dashevo/dashd-rpc": "github:dashpay/dashd-rpc#feat/add-descriptors"
     "@dashevo/dashpay-contract": "workspace:*"
     "@dashevo/docker-compose": "npm:^0.24.4"
     "@dashevo/dpns-contract": "workspace:*"