chore: update to Core 21

dashpay · Jun 14, 2024 · 2cc7d93 · 2cc7d93
1 parent f5d4265
commit 2cc7d93
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 19 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/...-rpc-npm-18.3.0-4f165136e8-b83fbdb149.zip → ...dashd-rpc-https-add9a74649-877060fe5b.zip b/...-rpc-npm-18.3.0-4f165136e8-b83fbdb149.zip → ...dashd-rpc-https-add9a74649-877060fe5b.zip
diff --git 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
@@ -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
@@ -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
@@ -134,13 +134,15 @@ export default function configureCoreTaskFactory(
                 const walletPassphrase = '';
                 const avoidReuse = false;
                 const loadOnStartup = true;
+                const descriptors = false;
 
                 await ctx.coreService.getRpcClient().createWallet(
                   'main',
                   disablePrivateKeys,
                   createBlankWallet,
                   walletPassphrase,
                   avoidReuse,
+                  descriptors,
                   loadOnStartup,
                 );
               },

diff --git 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
@@ -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:*"