Skip to content
Closed
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
8 changes: 4 additions & 4 deletions .github/workflows/dapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ on:
- packages/wasm-dpp/**
- packages/js-grpc-common/**
- packages/js-dapi-client/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
- packages/dpns-contract/**
- packages/masternode-reward-shares-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/dash-spv/**
schedule:
- cron: '30 4 * * *'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dashmate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ on:
- packages/wasm-dpp/**
- packages/rs-dpp/**
- packages/js-grpc-common/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
- packages/masternode-reward-shares-contract/**
- packages/dpns-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/contracts/dpns-contract/**
- packages/dash-spv/**
schedule:
- cron: '30 4 * * *'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dashpay-contract.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ on:
paths:
- .github/workflows/dashpay-contract.yml
- .github/workflows/checks.yml
- packages/dashpay-contract/**
- packages/contracts/dashpay-contract/**
- packages/js-dpp/**
- packages/wasm-dpp/**
- packages/rs-dpp/**
- packages/feature-flags-contract/**
- packages/dpns-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/dpns-contract/**
schedule:
- cron: '30 4 * * *'

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/js-dapi-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ on:
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/js-grpc-common/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
- packages/dpns-contract/**
- packages/masternode-reward-shares-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/dash-spv/**
schedule:
- cron: '30 4 * * *'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/js-dash-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ on:
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/js-grpc-common/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
- packages/masternode-reward-shares-contract/**
- packages/dpns-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/contracts/dpns-contract/**
- packages/dash-spv/**
schedule:
- cron: '30 4 * * *'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/js-dpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ on:
- .github/workflows/js-dpp.yml
- .github/workflows/js-checks.yml
- packages/js-dpp/**
- packages/feature-flags-contract/**
- packages/masternode-reward-shares-contract/**
- packages/dpns-contract/**
- packages/dashpay-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/dashpay-contract/**
schedule:
- cron: '30 4 * * *'

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/js-drive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
- .github/workflows/js-drive.yml
- .github/workflows/js-checks.yml
- packages/js-drive/**
- packages/feature-flags-contract/**
- packages/dpns-contract/**
- packages/dashpay-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/dashpay-contract/**
- packages/js-dpp/**
- packages/masternode-reward-shares-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/dapi-grpc/**
- packages/js-grpc-common/**
- packages/withdrawals-contract/**
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/platform-test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ on:
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/js-grpc-common/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
- packages/masternode-reward-shares-contract/**
- packages/dpns-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/contracts/dpns-contract/**
- packages/dash-spv/**
schedule:
- cron: '30 4 * * *'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rs-dpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ on:
paths:
- .github/workflows/rs-dpp.yml
- .github/workflows/rs-checks.yml
- packages/feature-flags-contract/**
- packages/dpns-contract/**
- packages/dashpay-contract/**
- packages/masternode-reward-shares-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/rs-dpp/**
schedule:
- cron: "30 4 * * *"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rs-drive-abci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ on:
paths:
- .github/workflows/rs-drive-abci.yml
- .github/workflows/rs-checks.yml
- packages/feature-flags-contract/**
- packages/dpns-contract/**
- packages/dashpay-contract/**
- packages/masternode-reward-shares-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/rs-dpp/**
- packages/rs-drive/**
- packages/rs-drive-abci/**
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rs-drive-nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ on:
paths:
- .github/workflows/rs-drive-nodejs.yml
- .github/workflows/rs-checks.yml
- packages/feature-flags-contract/**
- packages/dpns-contract/**
- packages/dashpay-contract/**
- packages/masternode-reward-shares-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/js-dpp/**
- packages/rs-dpp/**
- packages/rs-drive/**
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rs-drive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ on:
paths:
- .github/workflows/rs-drive.yml
- .github/workflows/rs-checks.yml
- packages/feature-flags-contract/**
- packages/dpns-contract/**
- packages/dashpay-contract/**
- packages/masternode-reward-shares-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/rs-dpp/**
schedule:
- cron: '30 4 * * *'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/wallet-lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ on:
- packages/dapi-grpc/**
- packages/js-dpp/**
- packages/js-grpc-common/**
- packages/dashpay-contract/**
- packages/feature-flags-contract/**
- packages/dpns-contract/**
- packages/masternode-reward-shares-contract/**
- packages/contracts/dashpay-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/dash-spv/**
schedule:
- cron: '30 4 * * *'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/wasm-dpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ on:
- .github/workflows/js-checks.yml
- .github/workflows/rs-checks.yml
- packages/js-dpp/**
- packages/feature-flags-contract/**
- packages/masternode-reward-shares-contract/**
- packages/dpns-contract/**
- packages/dashpay-contract/**
- packages/contracts/feature-flags-contract/**
- packages/contracts/masternode-reward-shares-contract/**
- packages/contracts/dpns-contract/**
- packages/contracts/dashpay-contract/**
- packages/wasm-dpp/**
schedule:
- cron: '30 4 * * *'
Expand Down
7 changes: 7 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ members = [
"packages/rs-drive",
"packages/rs-drive-abci",
"packages/rs-drive-nodejs",
"packages/contracts",
]
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@
"packages/bench-suite",
"packages/dapi-grpc",
"packages/js-dpp",
"packages/dashpay-contract",
"packages/dpns-contract",
"packages/feature-flags-contract",
"packages/contracts/dashpay-contract",
"packages/contracts/dpns-contract",
"packages/contracts/feature-flags-contract",
"packages/js-dapi-client",
"packages/wallet-lib",
"packages/js-dash-sdk",
"packages/dapi",
"packages/js-drive",
"packages/dashmate",
"packages/platform-test-suite",
"packages/masternode-reward-shares-contract",
"packages/contracts/masternode-reward-shares-contract",
"packages/dash-spv",
"packages/wasm-dpp",
"packages/withdrawals-contract",
"packages/contracts/withdrawals-contract",
"packages/rs-drive-nodejs"
],
"resolutions": {
Expand Down
6 changes: 3 additions & 3 deletions packages/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
| Package | Version | Description |
|---------|---------|-------------|
| [`@dashevo/dpp`](/packages/js-dpp) | [![npm](https://img.shields.io/npm/v/@dashevo/dpp.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/dpp) | JS implementation of Dash Platform Protocol, the core data structures used by the Platform |
| [`@dashevo/dpns-contract`](/packages/dpns-contract) | [![npm](https://img.shields.io/npm/v/@dashevo/dpns-contract.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/dpns-contract) | Data Contract for DashPay Naming Service |
| [`@dashevo/dpns-contract`](/packages/contracts/dpns-contract) | [![npm](https://img.shields.io/npm/v/@dashevo/dpns-contract.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/dpns-contract) | Data Contract for DashPay Naming Service |
| [`@dashevo/grpc-common`](/packages/js-grpc-common) | [![npm](https://img.shields.io/npm/v/@dashevo/grpc-common.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/grpc-common) | Common gRPC packages |
| [`@dashevo/feature-flags-contract`](/packages/feature-flags-contract) | [![npm](https://img.shields.io/npm/v/@dashevo/feature-flags-contract.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/feature-flags-contract) | System data contract to enable feature flags |
| [`@dashevo/feature-flags-contract`](/packages/contracts/feature-flags-contract) | [![npm](https://img.shields.io/npm/v/@dashevo/feature-flags-contract.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/feature-flags-contract) | System data contract to enable feature flags |

### Fullnode & Masternode tools

Expand All @@ -21,7 +21,7 @@
| [`@dashevo/wallet-lib`](/packages/wallet-lib) | [![npm](https://img.shields.io/npm/v/@dashevo/wallet-lib.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/wallet-lib) | JavaScript light client wallet library |
| [`@dashevo/dapi-client`](/packages/js-dapi-client) | [![npm](https://img.shields.io/npm/v/@dashevo/dapi-client.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/js-dapi-client) | JavaScript client to connect to DAPI |
| [`@dashevo/dapi-grpc`](/packages/dapi-grpc) | [![npm](https://img.shields.io/npm/v/@dashevo/dapi-grpc.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/dapi-grpc) | gRPC clients for various platforms (Web, Android, iOS, Java, Python) to interact with DAPI |
| [`@dashevo/dashpay-contract`](/packages/dashpay-contract) | [![npm](https://img.shields.io/npm/v/@dashevo/dashpay-contract.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/dashpay-contract) | DashPay social payments app data contract |
| [`@dashevo/dashpay-contract`](/packages/contracts/dashpay-contract) | [![npm](https://img.shields.io/npm/v/@dashevo/dashpay-contract.svg?maxAge=3600)](https://www.npmjs.com/package/@dashevo/dashpay-contract) | DashPay social payments app data contract |

### Platform Node Packages

Expand Down
11 changes: 11 additions & 0 deletions packages/contracts/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[package]
name = "contracts"
description = "Dash platform contract loaders"
version = "0.24.0-dev.1"
edition = "2021"
license = "MIT"
private = true
include = ["/src", "/*/LICENSE", "/*/schema/*.json"]

[dependencies]
dpp = { path = "../rs-dpp" }
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.24.0-dev.13",
"description": "Reference contract of the DashPay DPA on Dash Evolution",
"scripts": {
"lint": "eslint .",
"lint": "eslint ",
"test": "yarn run test:unit",
"test:unit": "mocha 'test/unit/*.spec.js'"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.24.0-dev.13",
"description": "A contract and helper scripts for DPNS DApp",
"scripts": {
"lint": "eslint .",
"lint": "eslint ",
"test": "yarn run test:unit",
"test:unit": "mocha 'test/unit/**/*.spec.js'"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Data Contract to store Dash Platform feature flags",
"scripts": {
"build": "",
"lint": "eslint .",
"lint": "eslint ",
"test": "yarn run test:unit",
"test:unit": "mocha 'test/unit/**/*.spec.js'"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.24.0-dev.13",
"description": "A contract and helper scripts for reward sharing",
"scripts": {
"lint": "eslint .",
"lint": "eslint ",
"test": "yarn run test:unit",
"test:unit": "mocha 'test/unit/**/*.spec.js'"
},
Expand Down
50 changes: 50 additions & 0 deletions packages/contracts/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
use std::collections::{BTreeMap, BTreeSet, HashSet};
use std::sync::Arc;
use dpp::data_contract::{DataContract, DataContractFactory};
use dpp::data_contract::extra::common::json_document_to_value;
use dpp::data_contract::validation::data_contract_validator::DataContractValidator;
use dpp::identifier::Identifier;
use dpp::ProtocolError;
use dpp::version::{COMPATIBILITY_MAP, LATEST_VERSION, ProtocolVersionValidator};

#[repr(u8)]
#[derive(PartialEq, Eq, Clone, Copy, Debug, Ord, PartialOrd)]
pub enum SystemContract {
Withdrawals = 0,
MasternodeRewards = 1,
FeatureFlags = 2,
DPNS = 3,
Dashpay = 4,
}

impl SystemContract {
pub fn path_to_contract(&self) -> &str {
match self {
SystemContract::Withdrawals => "/withdrawals-contract/schema/withdrawals-documents.json",
SystemContract::MasternodeRewards => "/masternode-reward-shares-contract/schema/masternode-reward-shares-documents.json",
SystemContract::FeatureFlags => "/feature-flags-contract/schema/feature-flags-documents.json",
SystemContract::DPNS => "/dpns-contract/schema/dpns-contract-documents.json",
SystemContract::Dashpay => "/dashpay-contract/schema/dashpay.schema.json",
}
}
pub fn load_contract(&self, system_contract: SystemContract, owner_id: Identifier) -> Result<DataContract, ProtocolError> {
let protocol_version_validator =
ProtocolVersionValidator::new(LATEST_VERSION, LATEST_VERSION, COMPATIBILITY_MAP.clone());
let data_contract_validator = DataContractValidator::new(Arc::new(protocol_version_validator));
let factory = DataContractFactory::new(1, data_contract_validator);
let value = json_document_to_value(system_contract.path_to_contract())?;
factory.create(owner_id, value)
}

pub fn load_contracts(&self, system_contracts: BTreeSet<SystemContract>, owner_id: Identifier) -> Result<BTreeMap<SystemContract, DataContract>, ProtocolError> {
let protocol_version_validator =
ProtocolVersionValidator::new(LATEST_VERSION, LATEST_VERSION, COMPATIBILITY_MAP.clone());
let data_contract_validator = DataContractValidator::new(Arc::new(protocol_version_validator));
let factory = DataContractFactory::new(1, data_contract_validator);
system_contracts.into_iter().map(|system_contract| {
let value = json_document_to_value(system_contract.path_to_contract())?;
let data_contract = factory.create(owner_id, value)?;
Ok((system_contract, data_contract))
}).collect()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Data Contract to manipulate and track withdrawals",
"scripts": {
"build": "",
"lint": "eslint .",
"lint": "eslint ",
"test": "yarn run test:unit",
"test:unit": "mocha 'test/unit/**/*.spec.js'"
},
Expand Down
Loading