Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(platform)!: system data contracts should not have an owner #1992

Merged
merged 12 commits into from
Jul 24, 2024
Merged

feat(platform)!: system data contracts should not have an owner #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
26d80a5
feat: system data contracts should not have an owner
QuantumExplorer Jul 23, 2024
673466e
Merge branch 'v1.0-dev' into feat/systemDataContractsHaveNoOwner
shumkov Jul 24, 2024
2b111db
chore: erase system data contract owner identity
shumkov Jul 24, 2024
75cde88
chore: update yarn lock
shumkov Jul 24, 2024
06d1690
chore: remove unused dependency
shumkov Jul 24, 2024
4cb7b9b
refactor: remove unused argument
shumkov Jul 24, 2024
e01d155
chore: update SDK test vectors
shumkov Jul 24, 2024
fc0e4a5
test: fix test suite
shumkov Jul 24, 2024
68b2124
test: provide default identity for SDK tests
shumkov Jul 24, 2024
6de86e1
test: provide correct identity
shumkov Jul 24, 2024
8e761c7
test: incorrect dpns contract id
shumkov Jul 24, 2024
4666e0b
Merge branch 'v1.0-dev' into feat/systemDataContractsHaveNoOwner
shumkov Jul 24, 2024
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
4 changes: 0 additions & 4 deletions .pnp.cjs
View file
Open in desktop

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

33 changes: 2 additions & 31 deletions Cargo.lock
View file
Open in desktop

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

62 changes: 0 additions & 62 deletions packages/dashmate/configs/defaults/getBaseConfigFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
import path from 'path';

import DPNSContract from '@dashevo/dpns-contract/lib/systemIds.js';

import DashPayContract from '@dashevo/dashpay-contract/lib/systemIds.js';

import FeatureFlagsContract from '@dashevo/feature-flags-contract/lib/systemIds.js';

import MasternodeRewardSharesContract from '@dashevo/masternode-reward-shares-contract/lib/systemIds.js';

import WithdrawalsContract from '@dashevo/withdrawals-contract/lib/systemIds.js';

import semver from 'semver';

import fs from 'fs';
Expand All @@ -19,20 +8,6 @@ import {
PACKAGE_ROOT_DIR,
} from '../../src/constants.js';

const {
contractId: dpnsContractId,
ownerId: dpnsOwnerId,
} = DPNSContract;

const { contractId: dashpayContractId } = DashPayContract;

const {
contractId: featureFlagsContractId,
ownerId: featureFlagsOwnerId,
} = FeatureFlagsContract;
const { contractId: masternodeRewardSharesContractId } = MasternodeRewardSharesContract;
const { contractId: withdrawalsContractId } = WithdrawalsContract;

const { version } = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT_DIR, 'package.json'), 'utf8'));

/**
Expand Down Expand Up @@ -432,44 +407,7 @@ export default function getBaseConfigFactory(homeDir) {
moniker: null,
},
},
dpns: {
contract: {
id: dpnsContractId,
},
ownerId: dpnsOwnerId,
masterPublicKey: null,
secondPublicKey: null,
},
dashpay: {
contract: {
id: dashpayContractId,
},
masterPublicKey: null,
secondPublicKey: null,
},
featureFlags: {
contract: {
id: featureFlagsContractId,
},
ownerId: featureFlagsOwnerId,
masterPublicKey: null,
secondPublicKey: null,
},
sourcePath: null,
masternodeRewardShares: {
contract: {
id: masternodeRewardSharesContractId,
},
masterPublicKey: null,
secondPublicKey: null,
},
withdrawals: {
contract: {
id: withdrawalsContractId,
},
masterPublicKey: null,
secondPublicKey: null,
},
enable: true,
},
dashmate: {
Expand Down
20 changes: 0 additions & 20 deletions packages/dashmate/configs/defaults/getTestnetConfigFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,26 +118,6 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
},
},
},
dpns: {
masterPublicKey: '02c8b4747b528cac5fddf7a6cc63702ee04ed7d1332904e08510343ea00dce546a',
secondPublicKey: '0201ee28f84f5485390567e939c2b586010b63a69ec92cab535dc96a8c71913602',
},
dashpay: {
masterPublicKey: '02d4dcce3f0a8d2936ce26df4d255fd2835b629b73eea39d4b2778096b91e77946',
secondPublicKey: '03699c8b4ebf1696c92e9ec605a02a38f6f9cec47d13fb584fdad779e936e20ccb',
},
featureFlags: {
masterPublicKey: '029cf2232549de08c114c19763309cb067688e21e310ac07458b59c2c026be7234',
secondPublicKey: '02a2abb50c03ae9f778f08a93849ba334a82e625153720dd5ef14e564b78b414e5',
},
masternodeRewardShares: {
masterPublicKey: '0319d795c0795bc8678bd0e58cfc7a4ad75c8e1797537728e7e8de8b9acc2bae2b',
secondPublicKey: '033756572938aaad752158b858ad38511c6edff4c79cf8462f70baa25fc6e8a616',
},
withdrawals: {
masterPublicKey: '032f79d1d9d6e652599d3315d30306b1277fbf588e32e383aef0a59749547d47b7',
secondPublicKey: '03eebbe3dc3721603a0b5a13441f214550ffa7d035b7dea9f1911de0f63ddac58d',
},
},
network: NETWORK_TESTNET,
};
Expand Down
7 changes: 7 additions & 0 deletions packages/dashmate/configs/getConfigFileMigrationsFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,13 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
'1.0.0-rc.1': (configFile) => {
Object.entries(configFile.configs)
.forEach(([, options]) => {
delete options.platform.dpns;
delete options.platform.dashpay;
delete options.platform.featureFlags;
delete options.platform.masternodeRewardShares;
delete options.platform.withdrawals;

// Update tenderdash image
options.platform.drive.tenderdash.docker.image = base.get('platform.drive.tenderdash.docker.image');

// Replace quorumsign with qurumplatformsign in Core RPC Tenderdash auth whitelist
Expand Down
10 changes: 0 additions & 10 deletions packages/dashmate/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,7 @@ services:
- CORE_CHECK_TX_JSON_RPC_PASSWORD=${CORE_RPC_USERS_DRIVE_CHECK_TX_PASSWORD:?err}
- CORE_CHECK_TX_JSON_RPC_HOST=core
- CORE_CHECK_TX_JSON_RPC_PORT=${CORE_RPC_PORT:?err}
- DPNS_MASTER_PUBLIC_KEY=${PLATFORM_DPNS_MASTER_PUBLIC_KEY}
- DPNS_SECOND_PUBLIC_KEY=${PLATFORM_DPNS_SECOND_PUBLIC_KEY}
- DASHPAY_MASTER_PUBLIC_KEY=${PLATFORM_DASHPAY_MASTER_PUBLIC_KEY}
- DASHPAY_SECOND_PUBLIC_KEY=${PLATFORM_DASHPAY_SECOND_PUBLIC_KEY}
- EPOCH_TIME_LENGTH_S=${PLATFORM_DRIVE_ABCI_EPOCH_TIME}
- FEATURE_FLAGS_MASTER_PUBLIC_KEY=${PLATFORM_FEATURE_FLAGS_MASTER_PUBLIC_KEY}
- FEATURE_FLAGS_SECOND_PUBLIC_KEY=${PLATFORM_FEATURE_FLAGS_SECOND_PUBLIC_KEY}
- MASTERNODE_REWARD_SHARES_MASTER_PUBLIC_KEY=${PLATFORM_MASTERNODE_REWARD_SHARES_MASTER_PUBLIC_KEY}
- MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY=${PLATFORM_MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY}
- WITHDRAWALS_MASTER_PUBLIC_KEY=${PLATFORM_WITHDRAWALS_MASTER_PUBLIC_KEY}
- WITHDRAWALS_SECOND_PUBLIC_KEY=${PLATFORM_WITHDRAWALS_SECOND_PUBLIC_KEY}
- VALIDATOR_SET_QUORUM_TYPE=${PLATFORM_DRIVE_ABCI_VALIDATOR_SET_QUORUM_LLMQ_TYPE:?err}
- VALIDATOR_SET_QUORUM_WINDOW=${PLATFORM_DRIVE_ABCI_VALIDATOR_SET_QUORUM_DKG_INTERVAL:?err}
- VALIDATOR_SET_QUORUM_ACTIVE_SIGNERS=${PLATFORM_DRIVE_ABCI_VALIDATOR_SET_QUORUM_ACTIVE_SIGNERS:?err}
Expand Down
4 changes: 0 additions & 4 deletions packages/dashmate/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,7 @@
"@dashevo/dapi-client": "workspace:*",
"@dashevo/dashcore-lib": "~0.21.3",
"@dashevo/dashd-rpc": "^19.0.0",
"@dashevo/dashpay-contract": "workspace:*",
"@dashevo/docker-compose": "^0.24.4",
"@dashevo/dpns-contract": "workspace:*",
"@dashevo/feature-flags-contract": "workspace:*",
"@dashevo/masternode-reward-shares-contract": "workspace:*",
"@dashevo/wallet-lib": "workspace:*",
"@dashevo/withdrawals-contract": "workspace:*",
"@oclif/core": "^3.10.8",
Expand Down
140 changes: 1 addition & 139 deletions packages/dashmate/src/config/configJsonSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,153 +1128,15 @@ export default {
required: ['abci', 'tenderdash'],
additionalProperties: false,
},
dpns: {
type: 'object',
properties: {
contract: {
type: 'object',
properties: {
id: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['id'],
additionalProperties: false,
},
ownerId: {
type: ['string', 'null'],
minLength: 1,
},
masterPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
secondPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['contract', 'ownerId', 'masterPublicKey', 'secondPublicKey'],
additionalProperties: false,
},
dashpay: {
type: 'object',
properties: {
contract: {
type: 'object',
properties: {
id: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['id'],
additionalProperties: false,
},
masterPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
secondPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['contract', 'masterPublicKey', 'secondPublicKey'],
additionalProperties: false,
},
featureFlags: {
type: 'object',
properties: {
contract: {
type: 'object',
properties: {
id: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['id'],
additionalProperties: false,
},
ownerId: {
type: ['string', 'null'],
minLength: 1,
},
masterPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
secondPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['contract', 'ownerId', 'masterPublicKey', 'secondPublicKey'],
additionalProperties: false,
},
sourcePath: {
type: ['string', 'null'],
minLength: 1,
},
masternodeRewardShares: {
type: 'object',
properties: {
contract: {
type: 'object',
properties: {
id: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['id'],
additionalProperties: false,
},
masterPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
secondPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['contract', 'masterPublicKey', 'secondPublicKey'],
additionalProperties: false,
},
withdrawals: {
type: 'object',
properties: {
contract: {
type: 'object',
properties: {
id: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['id'],
additionalProperties: false,
},
masterPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
secondPublicKey: {
type: ['string', 'null'],
minLength: 1,
},
},
required: ['contract', 'masterPublicKey', 'secondPublicKey'],
additionalProperties: false,
},
enable: {
type: 'boolean',
},
},
required: ['gateway', 'dapi', 'drive', 'dpns', 'dashpay', 'featureFlags', 'sourcePath', 'masternodeRewardShares', 'withdrawals', 'enable'],
required: ['gateway', 'dapi', 'drive', 'sourcePath', 'enable'],
additionalProperties: false,
},
dashmate: {
Expand Down
Loading
Loading