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
1 change: 1 addition & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ ignore:
- "packages/keyword-search-contract/src/**"
- "packages/app-connect-contract/src/**"
- "packages/moderation-charters-contract/src/**"
- "packages/decision-proposals-contract/src/**"
- "packages/masternode-reward-shares-contract/src/**"
- "packages/token-history-contract/src/**"
- "packages/wallet-utils-contract/src/**"
Expand Down
3 changes: 3 additions & 0 deletions .github/package-filters/js-packages-direct.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
'@dashevo/moderation-charters-contract':
- packages/moderation-charters-contract/**

'@dashevo/decision-proposals-contract':
- packages/decision-proposals-contract/**

'@dashevo/dashpay-contract':
- packages/dashpay-contract/**

Expand Down
4 changes: 4 additions & 0 deletions .github/package-filters/js-packages-no-workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
'@dashevo/moderation-charters-contract': &moderation-charters-contract
- packages/moderation-charters-contract/**

'@dashevo/decision-proposals-contract': &decision-proposals-contract
- packages/decision-proposals-contract/**

'@dashevo/dashpay-contract': &dashpay-contract
- packages/dashpay-contract/**

Expand Down Expand Up @@ -43,6 +46,7 @@
- *keyword-search-contract
- *app-connect-contract
- *moderation-charters-contract
- *decision-proposals-contract
- packages/rs-platform-serialization/**
- packages/rs-platform-serialization-derive/**
- packages/rs-platform-value/**
Expand Down
5 changes: 5 additions & 0 deletions .github/package-filters/js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
- .github/workflows/tests*
- packages/moderation-charters-contract/**

'@dashevo/decision-proposals-contract': &decision-proposals-contract
- .github/workflows/tests*
- packages/decision-proposals-contract/**

'@dashevo/dashpay-contract': &dashpay-contract
- .github/workflows/tests*
- packages/dashpay-contract/**
Expand Down Expand Up @@ -55,6 +59,7 @@
- *keyword-search-contract
- *app-connect-contract
- *moderation-charters-contract
- *decision-proposals-contract
- packages/rs-platform-serialization/**
- packages/rs-platform-serialization-derive/**
- packages/rs-platform-value/**
Expand Down
5 changes: 5 additions & 0 deletions .github/package-filters/rs-packages-direct.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ moderation-charters-contract:
- packages/moderation-charters-contract/schema/**
- packages/moderation-charters-contract/Cargo.toml

decision-proposals-contract:
- packages/decision-proposals-contract/src/**
- packages/decision-proposals-contract/schema/**
- packages/decision-proposals-contract/Cargo.toml

dashpay-contract:
- packages/dashpay-contract/src/**
- packages/dashpay-contract/schema/**
Expand Down
6 changes: 6 additions & 0 deletions .github/package-filters/rs-packages-no-workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ moderation-charters-contract: &moderation-charters-contract
- packages/moderation-charters-contract/schema/**
- packages/moderation-charters-contract/Cargo.toml

decision-proposals-contract: &decision-proposals-contract
- packages/decision-proposals-contract/src/**
- packages/decision-proposals-contract/schema/**
- packages/decision-proposals-contract/Cargo.toml

dashpay-contract: &dashpay-contract
- packages/dashpay-contract/src/**
- packages/dashpay-contract/schema/**
Expand Down Expand Up @@ -63,6 +68,7 @@ data-contracts: &data-contracts
- *document-history-contract
- *app-connect-contract
- *moderation-charters-contract
- *decision-proposals-contract

dpp: &dpp
- packages/rs-dpp/**
Expand Down
7 changes: 7 additions & 0 deletions .github/package-filters/rs-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ moderation-charters-contract: &moderation-charters-contract
- packages/moderation-charters-contract/schema/**
- packages/moderation-charters-contract/Cargo.toml

decision-proposals-contract: &decision-proposals-contract
- .github/workflows/tests*
- packages/decision-proposals-contract/src/**
- packages/decision-proposals-contract/schema/**
- packages/decision-proposals-contract/Cargo.toml

dashpay-contract: &dashpay-contract
- .github/workflows/tests*
- packages/dashpay-contract/src/**
Expand Down Expand Up @@ -75,6 +81,7 @@ data-contracts: &data-contracts
- *document-history-contract
- *app-connect-contract
- *moderation-charters-contract
- *decision-proposals-contract

dpp: &dpp
- .github/workflows/tests*
Expand Down
1 change: 1 addition & 0 deletions .github/package-filters/test-suite-triggers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ run:
- packages/keyword-search-contract/**
- packages/app-connect-contract/**
- packages/moderation-charters-contract/**
- packages/decision-proposals-contract/**
- packages/wallet-utils-contract/**
# Local network scripts and action
- .github/actions/local-network/**
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests-rs-workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ jobs:
--package keyword-search-contract \
--package app-connect-contract \
--package moderation-charters-contract \
--package decision-proposals-contract \
--all-features \
--locked \
-E '(not test(~shield) or (package(=platform-wallet-storage) and not test(~wallet::shielded::))) and (not binary_id(=drive-abci::strategy_tests) or test(~comprehensive_mixed_operations) or test(~process_proposal_collision))'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ jobs:
- packages/swift-sdk/**
- packages/app-connect-contract/**
- packages/moderation-charters-contract/**
- packages/decision-proposals-contract/**
- packages/dapi-grpc/**
- packages/dashpay-contract/**
- packages/data-contracts/**
Expand Down
21 changes: 21 additions & 0 deletions .pnp.cjs

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

12 changes: 12 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 @@ -40,6 +40,7 @@ members = [
"packages/keyword-search-contract",
"packages/app-connect-contract",
"packages/moderation-charters-contract",
"packages/decision-proposals-contract",
"packages/rs-sdk-ffi",
"packages/wasm-drive-verify",
"packages/dash-platform-balance-checker",
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
ARG SCCACHE_BUCKET
ARG AWS_PROFILE
ARG SCCACHE_REGION
ARG SCCACHE_S3_KEY_PREFIX

Check warning on line 216 in Dockerfile

View workflow job for this annotation

GitHub Actions / Build Docker images (RS-DAPI, rs-dapi, rs-dapi) / Build RS-DAPI image

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SCCACHE_S3_KEY_PREFIX") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 216 in Dockerfile

View workflow job for this annotation

GitHub Actions / Build Docker images (Drive, drive, drive-abci, SDK_TEST_DATA=true ) / Build Drive image

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SCCACHE_S3_KEY_PREFIX") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 216 in Dockerfile

View workflow job for this annotation

GitHub Actions / Build Docker images (Dashmate helper, dashmate-helper, dashmate-helper) / Build Dashmate helper image

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "SCCACHE_S3_KEY_PREFIX") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
ARG SCCACHE_ENDPOINT

# Generate sccache configuration variables and save them to /root/env
Expand Down Expand Up @@ -405,6 +405,7 @@
packages/keyword-search-contract \
packages/app-connect-contract \
packages/moderation-charters-contract \
packages/decision-proposals-contract \
packages/data-contracts \
packages/strategy-tests \
packages/simple-signer \
Expand Down Expand Up @@ -530,6 +531,7 @@
packages/keyword-search-contract \
packages/app-connect-contract \
packages/moderation-charters-contract \
packages/decision-proposals-contract \
packages/withdrawals-contract \
packages/masternode-reward-shares-contract \
packages/dpns-contract \
Expand Down Expand Up @@ -716,6 +718,7 @@
packages/keyword-search-contract \
packages/app-connect-contract \
packages/moderation-charters-contract \
packages/decision-proposals-contract \
packages/masternode-reward-shares-contract \
packages/dpns-contract \
packages/data-contracts \
Expand Down Expand Up @@ -863,6 +866,7 @@
COPY --from=build-dashmate-helper /platform/packages/keyword-search-contract packages/keyword-search-contract
COPY --from=build-dashmate-helper /platform/packages/app-connect-contract packages/app-connect-contract
COPY --from=build-dashmate-helper /platform/packages/moderation-charters-contract packages/moderation-charters-contract
COPY --from=build-dashmate-helper /platform/packages/decision-proposals-contract packages/decision-proposals-contract
COPY --from=build-dashmate-helper /platform/packages/withdrawals-contract packages/withdrawals-contract
COPY --from=build-dashmate-helper /platform/packages/masternode-reward-shares-contract packages/masternode-reward-shares-contract
COPY --from=build-dashmate-helper /platform/packages/dpns-contract packages/dpns-contract
Expand Down Expand Up @@ -968,6 +972,7 @@
packages/keyword-search-contract \
packages/app-connect-contract \
packages/moderation-charters-contract \
packages/decision-proposals-contract \
packages/withdrawals-contract \
packages/masternode-reward-shares-contract \
packages/dpns-contract \
Expand Down
2 changes: 1 addition & 1 deletion book/src/architecture/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ Here is a simplified view of every Rust workspace member, grouped by role:
| **gRPC definitions** | `dapi-grpc` |
| **WASM bindings** | `wasm-dpp`, `wasm-dpp2`, `wasm-sdk`, `wasm-drive-verify` |
| **iOS/FFI** | `rs-sdk-ffi` |
| **System contracts** | `dpns-contract`, `dashpay-contract`, `withdrawals-contract`, `masternode-reward-shares-contract`, `wallet-utils-contract`, `token-history-contract`, `keyword-search-contract`, `document-history-contract`, `app-connect-contract`, `moderation-charters-contract`, `data-contracts` |
| **System contracts** | `dpns-contract`, `dashpay-contract`, `withdrawals-contract`, `masternode-reward-shares-contract`, `wallet-utils-contract`, `token-history-contract`, `keyword-search-contract`, `document-history-contract`, `app-connect-contract`, `moderation-charters-contract`, `decision-proposals-contract`, `data-contracts` |
| **Tooling** | `dashmate` (JS), `strategy-tests`, `simple-signer`, `check-features`, `json-schema-compatibility-validator` |
| **Other** | `dash-platform-macros`, `rs-dash-event-bus`, `rs-platform-wallet`, `dash-platform-balance-checker`, `rs-dapi` |

Expand Down
2 changes: 2 additions & 0 deletions book/src/error-handling/error-codes.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ Error codes are organized into ranges that correspond to error categories and su
| 10800-10818 | Address | `TransitionOverMaxInputsError` (10800), `WithdrawalBelowMinAmountError` (10818) |
| 10819-10827 | Shielded | `ShieldedNoActionsError` (10819), `ShieldedTooManyActionsError` (10825), `ShieldedImplicitFeeCapExceededError` (10826), `ShieldedInvalidDenominationError` (10827 β€” `IdentityCreateFromShieldedPool` exit amount not a member of the versioned denomination set) |
| 10900-10949 | Contract Moderation | `InvalidContractModerationConfigError` (10900), `ContractModerationSelfTargetError` (10901), `DocumentActionFeesWithoutModerationError` (10902), `ContractModerationReasonTooLongError` (10903), `InvalidContractModerationReasonDocumentsError` (10904), `InvalidContractModerationDocumentFieldsError` (10905) |
| 11100-11149 | Decision Proposals | `DecisionProposalFundMismatchError` (11100), `InvalidDecisionProposalRuleError` (11101) |

### SignatureError codes (20000-20012)

Expand Down Expand Up @@ -119,6 +120,7 @@ The fee category currently has a single code. The 30000 range is reserved for fu
| 41000-41003 | Contract Groups | `ContractGroupAlreadyExistsError` (41000), `ContractGroupNotFoundError` (41001), `IdentityNotContractGroupOwnerOrAdminError` (41002), `ContractGroupAdminNotFoundError` (41003) |
| 41100-41124 | Contract Moderation | `ContractModerationNotEnabledError` (41100), `IdentityNotContractModeratorError` (41101), `ContractUserBannedError` (41107), `ContractUserSuspendedError` (41108), `ContractModerationTargetNotFoundError` (41109), `ContractModeratorIdentityNotFoundError` (41110), `ContractFeesAlreadyClaimedThisEpochError` (41111), `ContractFeesNothingToClaimError` (41112), `ContractFeeClaimNotAllowedError` (41113), `ContractModerationCounterpartyBarredError` (41114), `DocumentTypeNotDeletableByModeratorsError` (41115), `DocumentModerationWindowElapsedError` (41116), `ContractUserNotWarnedError` (41117), `ContractUserWarningLimitReachedError` (41118), `ContractDocumentRemovalNotFoundError` (41119), `DocumentRestoreWindowElapsedError` (41120), `DocumentRestoreHashMismatchError` (41121), `ContractDocumentAlreadyRestoredError` (41122), `DocumentFieldNotChangeableByModeratorsError` (41123), `DocumentModeratorFieldNotWritableError` (41124) |
| 41200-41299 | Contract Moderation Teams | `ContractModeratedDocumentTypeNotYetUsableError` (41200), `ContractModerationAbilityNotGrantedError` (41201), `ModerationCharterAddedModeratorLimitReachedError` (41202), `ModerationReasonNotListedError` (41203), `DocumentTypeNotDeletableOnceSettledError` (41204), `ContractModerationTeamNotSeatedError` (41205), `DocumentNotSettledError` (41206), `ContractTeamActionDoesNotExistError` (41207), `ContractTeamActionAlreadySignedError` (41208), `SettledDeletionNotRestorableError` (41209), `ContractTeamActionAlreadyCompletedError` (41210), `ContractTeamActionDocumentChangedError` (41211), `ContractTeamMemberAddedAfterDocumentError` (41212) |
| 41300-41349 | Decision Proposals | `DecisionProposalEndDateOutOfRangeError` (41300) |

Notice how the `DataTriggerError` sub-enum has its own `ErrorWithCode` implementation that the `StateError` delegates to:

Expand Down
25 changes: 16 additions & 9 deletions book/src/fees/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,22 @@ contest's prefunded balance, each vote takes a fixed cost from it, and what is
left when the contest ends is released as processing fees. The amounts are
`VoteResolutionFundFees` in the fee version:

| Component | Protocol versions 1 to 13 | Protocol version 14 |
|---|---|---|
| Contested document fund (DPNS and every other contest) | 0.2 Dash | 0.1 Dash |
| Moderation election fund (an `electedCharter` application) | none exist | 0.5 Dash |
| One vote | 0.0001 Dash | 0.00002 Dash |

`required_vote_resolution_fund` in `rs-dpp` picks between the two funds; the
schedules before 14 carry the contested document amount in the moderation
field, so the choice changes nothing there.
| Component | Protocol versions 1 to 13 | Protocol version 14 | Protocol version 15 |
|---|---|---|---|
| Contested document fund (DPNS and every other contest) | 0.2 Dash | 0.1 Dash | 0.1 Dash |
| Moderation election fund (an `electedCharter` application) | none exist | 0.5 Dash | 0.5 Dash |
| Decision proposal fund (a `proposal` on the decision proposals contract) | none exist | none exist | 0.5 Dash |
| One vote | 0.0001 Dash | 0.00002 Dash | 0.00002 Dash |

`required_vote_resolution_fund` in `rs-dpp` picks between the two contest
funds; the schedules before 14 carry the contested document amount in the
moderation field, so the choice changes nothing there.

A decision proposal (see `docs/protocol/decision-proposals.md`) opens a yes/no
vote poll rather than a contest, and its fund
(`decision_proposal_fund_required_amount`, added in `FEE_VERSION4` for
protocol version 15) prefunds that poll's votes the same way. The schedules
before 15 carry 0 there, unread.

## User Fee Increase

Expand Down
Loading
Loading