Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/dapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@dashevo/bls": "~1.2.9",
"@dashevo/dapi-grpc": "workspace:*",
"@dashevo/dashcore-lib": "~0.22.0",
"@dashevo/dashd-rpc": "^19.0.0",
"@dashevo/dashd-rpc": "^19.1.0",
"@dashevo/grpc-common": "workspace:*",
"@dashevo/wasm-dpp": "workspace:*",
"@grpc/grpc-js": "^1.14.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@dashevo/bls": "~1.2.9",
"@dashevo/dapi-client": "workspace:*",
"@dashevo/dashcore-lib": "~0.22.0",
"@dashevo/dashd-rpc": "^19.0.0",
"@dashevo/dashd-rpc": "^19.1.0",
"@dashevo/docker-compose": "^0.24.4",
"@dashevo/wallet-lib": "workspace:*",
"@dashevo/withdrawals-contract": "workspace:*",
Expand Down
20 changes: 14 additions & 6 deletions packages/dashmate/src/status/scopes/platform.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,19 @@ export default function getPlatformScopeFactory(
rpcClient.getBlockchainInfo(),
]);

const {
result: {
softforks: { mn_rr: mnRR },
},
} = blockchainInfo;
// Core v24 omits softforks from getblockchaininfo unless started with
// -deprecatedrpc=softforks and reports them in getdeploymentinfo. Core v23 has no
// getdeploymentinfo, so softforks is read first.
const deployments = blockchainInfo.result.softforks
?? (await rpcClient.getDeploymentInfo()).result?.deployments;

const mnRR = deployments?.mn_rr;

// getPlatformScope reads the mn_rr deployment outside its try, so a missing or malformed
// deployment has to fail here, where it is handled as unavailable Core info.
if (typeof mnRR?.active !== 'boolean' || !Number.isInteger(mnRR.height)) {
throw new Error(`Core did not report a valid mn_rr deployment: ${JSON.stringify(mnRR)}`);
}

const {
result: {
Expand Down Expand Up @@ -336,7 +344,7 @@ export default function getPlatformScopeFactory(
} catch (e) {
if (process.env.DEBUG) {
// eslint-disable-next-line no-console
console.error('Could not get MNSync from core', e);
console.error('Could not get sync status and platform activation from Core', e);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
{
"chain": "regtest",
"blocks": 1112,
"headers": 1112,
"bestblockhash": "0933f86094f3ded670c18238e70a8eacb06813373657d10e328dba2a31c7f6cd",
"difficulty": 4.656542373906925e-10,
"time": 1792060531,
"mediantime": 1792060530,
"verificationprogress": 1,
"initialblockdownload": false,
"chainwork": "00000000000000000000000000000000000000000000000000000000000008b2",
"size_on_disk": 802296,
"pruned": false,
"softforks": {
"bip34": {
"type": "buried",
"active": true,
"height": 1
},
"bip66": {
"type": "buried",
"active": true,
"height": 1
},
"bip65": {
"type": "buried",
"active": true,
"height": 1
},
"bip147": {
"type": "buried",
"active": true,
"height": 0
},
"csv": {
"type": "buried",
"active": true,
"height": 1
},
"dip0001": {
"type": "buried",
"active": true,
"height": 1
},
"dip0003": {
"type": "buried",
"active": true,
"height": 432
},
"dip0008": {
"type": "buried",
"active": true,
"height": 1
},
"dip0020": {
"type": "buried",
"active": true,
"height": 1
},
"dip0024": {
"type": "buried",
"active": true,
"height": 1
},
"realloc": {
"type": "buried",
"active": true,
"height": 1
},
"v19": {
"type": "buried",
"active": true,
"height": 1
},
"v20": {
"type": "buried",
"active": true,
"height": 432
},
"mn_rr": {
"type": "buried",
"active": true,
"height": 1000
},
"withdrawals": {
"type": "buried",
"active": true,
"height": 600
},
"v24": {
"type": "bip9",
"bip9": {
"status": "defined",
"start_time": 0,
"timeout": 9223372036854775807,
"min_activation_height": 0,
"ehf": true,
"since": 0
},
"active": false
},
"testdummy": {
"type": "bip9",
"bip9": {
"status": "active",
"start_time": 0,
"timeout": 9223372036854775807,
"min_activation_height": 0,
"ehf": false,
"since": 432
},
"height": 432,
"active": true
}
},
"warnings": ""
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"AssetID": 999,
"AssetName": "MASTERNODE_SYNC_FINISHED",
"AssetStartTime": 1792060356,
"Attempt": 0,
"IsBlockchainSynced": true,
"IsSynced": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"chain": "regtest",
"blocks": 1112,
"headers": 1112,
"bestblockhash": "69bf772133b0ed53979dce7927104fcc3577180137aacb283e8a282ecb86bf85",
"difficulty": 4.656542373906925e-10,
"time": 1792060432,
"mediantime": 1792060431,
"verificationprogress": 1,
"initialblockdownload": false,
"chainwork": "00000000000000000000000000000000000000000000000000000000000008b2",
"size_on_disk": 802291,
"pruned": false,
"warnings": "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"chain": "regtest",
"blocks": 512,
"headers": 512,
"bestblockhash": "0883b85d67c2eaf7d5756fd174cb79e99144bcab29a56b2a122b2134203ab45d",
"difficulty": 4.656542373906925e-10,
"time": 1792060332,
"mediantime": 1792060331,
"verificationprogress": 1,
"initialblockdownload": false,
"chainwork": "0000000000000000000000000000000000000000000000000000000000000402",
"size_on_disk": 172286,
"pruned": false,
"warnings": "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
{
"hash": "69bf772133b0ed53979dce7927104fcc3577180137aacb283e8a282ecb86bf85",
"height": 1112,
"deployments": {
"bip34": {
"type": "buried",
"active": true,
"height": 1
},
"bip66": {
"type": "buried",
"active": true,
"height": 1
},
"bip65": {
"type": "buried",
"active": true,
"height": 1
},
"bip147": {
"type": "buried",
"active": true,
"height": 0
},
"csv": {
"type": "buried",
"active": true,
"height": 1
},
"dip0001": {
"type": "buried",
"active": true,
"height": 1
},
"dip0003": {
"type": "buried",
"active": true,
"height": 432
},
"dip0008": {
"type": "buried",
"active": true,
"height": 1
},
"dip0020": {
"type": "buried",
"active": true,
"height": 1
},
"dip0024": {
"type": "buried",
"active": true,
"height": 1
},
"realloc": {
"type": "buried",
"active": true,
"height": 1
},
"v19": {
"type": "buried",
"active": true,
"height": 1
},
"v20": {
"type": "buried",
"active": true,
"height": 432
},
"mn_rr": {
"type": "buried",
"active": true,
"height": 1000
},
"withdrawals": {
"type": "buried",
"active": true,
"height": 600
},
"v24": {
"type": "bip9",
"active": false,
"bip9": {
"start_time": 0,
"timeout": 9223372036854775807,
"ehf": true,
"min_activation_height": 0,
"status": "defined",
"since": 0,
"status_next": "defined"
}
},
"evo_shares": {
"type": "bip9",
"active": false,
"bip9": {
"start_time": 0,
"timeout": 9223372036854775807,
"ehf": true,
"min_activation_height": 0,
"status": "defined",
"since": 0,
"status_next": "defined"
}
},
"testdummy": {
"type": "bip9",
"height": 432,
"active": true,
"bip9": {
"start_time": 0,
"timeout": 9223372036854775807,
"ehf": false,
"min_activation_height": 0,
"status": "active",
"since": 432,
"status_next": "active"
}
}
}
}
Loading
Loading