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.

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

feat(platform)!: masternode voting based conflict resolution #1659

Closed
wants to merge 157 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
0f3a11b
original approach
QuantumExplorer Sep 4, 2023
b2319b1
added a masternode vote state transition
QuantumExplorer Sep 6, 2023
e0f7a4f
started working on drive structure
QuantumExplorer Sep 6, 2023
52dcb74
temp work
QuantumExplorer Sep 9, 2023
55c7ec4
more work and formatting
QuantumExplorer Sep 11, 2023
3d5fb76
more work
QuantumExplorer Sep 17, 2023
6eaff5b
more work
QuantumExplorer Sep 17, 2023
9b676fb
Merge branch 'v0.25-dev' into feat/masternodeVoting
QuantumExplorer Oct 2, 2023
fba087b
more work
QuantumExplorer Oct 3, 2023
9799f74
more work on masternode voting
QuantumExplorer Oct 6, 2023
701bf40
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Oct 10, 2023
66857cb
a little cleanup
QuantumExplorer Oct 11, 2023
53722c5
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Nov 8, 2023
94cdfff
more fixes
QuantumExplorer Nov 8, 2023
5599632
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Dec 3, 2023
50b0ae3
small fix
QuantumExplorer Dec 3, 2023
9e5e5d6
Merge branch 'master' into feat/masternodeVoting
QuantumExplorer Dec 17, 2023
83c8da0
updated lock
QuantumExplorer Dec 17, 2023
a17afb9
updated proto requests
QuantumExplorer Dec 17, 2023
2210228
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Dec 30, 2023
0a2cdfe
added thing
QuantumExplorer Jan 2, 2024
42ebe6a
Merge branch 'master' into feat/masternodeVoting
QuantumExplorer Jan 2, 2024
afa81fb
dev.2
QuantumExplorer Jan 3, 2024
8ccef9f
more work
QuantumExplorer Jan 4, 2024
8af3443
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Jan 9, 2024
ba24387
review fixes
QuantumExplorer Jan 9, 2024
19b739f
fmt
QuantumExplorer Jan 9, 2024
3cee601
got insert of trees working
QuantumExplorer Jan 10, 2024
1238463
more work
QuantumExplorer Jan 10, 2024
98cc21d
more work
QuantumExplorer Jan 10, 2024
fb550f2
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Feb 21, 2024
f4c859d
more fixes
QuantumExplorer Feb 21, 2024
0541be3
more fixes
QuantumExplorer Feb 21, 2024
c3868e8
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Feb 27, 2024
1ff1a33
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Feb 28, 2024
477cda5
more fixes
QuantumExplorer Feb 29, 2024
2cfdb4f
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Apr 8, 2024
41a3bba
proto update
QuantumExplorer Apr 8, 2024
60f61e9
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Apr 8, 2024
c4f0e35
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Apr 13, 2024
56024d5
small fixes
QuantumExplorer Apr 13, 2024
8467a19
more work
QuantumExplorer Apr 15, 2024
cc6cc81
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Apr 17, 2024
2b662a1
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Apr 24, 2024
256fe4c
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Apr 25, 2024
bd50c0c
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Apr 27, 2024
8980d2e
more work on the actions
QuantumExplorer Apr 28, 2024
a3ca8df
more fixes
QuantumExplorer Apr 28, 2024
82e128e
more work
QuantumExplorer Apr 29, 2024
fcabf19
more work
QuantumExplorer May 2, 2024
b0aa04e
more fixes
QuantumExplorer May 6, 2024
e32cabf
more work
QuantumExplorer May 7, 2024
4af5f4e
more work
QuantumExplorer May 7, 2024
7d6560d
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer May 7, 2024
d9c413a
a lot more work
QuantumExplorer May 7, 2024
b5a8ff3
more work
QuantumExplorer May 8, 2024
cb5a8e6
another function
QuantumExplorer May 8, 2024
9cf2d75
more work on prefunded balances
QuantumExplorer May 8, 2024
ad42409
more work
QuantumExplorer May 8, 2024
3fadcea
more work on masternode voting
QuantumExplorer May 9, 2024
0ce04ff
more work
QuantumExplorer May 9, 2024
4b3bed3
a lot more work
QuantumExplorer May 9, 2024
b8eb464
a lot more work
QuantumExplorer May 9, 2024
b8b93d6
more work
QuantumExplorer May 11, 2024
b87a063
more work
QuantumExplorer May 11, 2024
6a2bdb2
more work
QuantumExplorer May 11, 2024
9ee09fb
more work
QuantumExplorer May 12, 2024
8022778
finally compiles
QuantumExplorer May 12, 2024
5c21022
small
QuantumExplorer May 13, 2024
25ec93a
more work
QuantumExplorer May 13, 2024
2665bb7
more work
QuantumExplorer May 13, 2024
3f21e6e
more fixes
QuantumExplorer May 13, 2024
74ba652
more work
QuantumExplorer May 13, 2024
0454ce1
a lot more work
QuantumExplorer May 14, 2024
3580bae
more work
QuantumExplorer May 14, 2024
e8fd6f8
worked on estimated costs
QuantumExplorer May 14, 2024
acfa5ab
got the trees inserted in contested area
QuantumExplorer May 15, 2024
a6857e6
more work
QuantumExplorer May 15, 2024
0ea1320
more work
QuantumExplorer May 16, 2024
cd443e5
a lot of work on queries
QuantumExplorer May 17, 2024
622eb18
a lot more work
QuantumExplorer May 19, 2024
b54e765
another query
QuantumExplorer May 19, 2024
095e845
more work
QuantumExplorer May 19, 2024
231219b
query now working
QuantumExplorer May 19, 2024
1ee7486
proof verification
QuantumExplorer May 19, 2024
f649798
more work
QuantumExplorer May 20, 2024
67fcc95
more fixes
QuantumExplorer May 20, 2024
470318b
vote validation
QuantumExplorer May 20, 2024
18094a5
voting is working
QuantumExplorer May 21, 2024
a8c9e5c
nit
QuantumExplorer May 21, 2024
afbf2f5
more work
QuantumExplorer May 22, 2024
56b888b
query working
QuantumExplorer May 22, 2024
203ce1e
end date query working
QuantumExplorer May 22, 2024
bbdbf97
work
QuantumExplorer May 22, 2024
a3d1350
much more work
QuantumExplorer May 23, 2024
21d4b81
more work
QuantumExplorer May 24, 2024
37074be
more work on abci execution
QuantumExplorer May 24, 2024
7c3c5fd
work on cleanup
QuantumExplorer May 25, 2024
9e09c5a
small fixes
QuantumExplorer May 27, 2024
bc51eca
more fixes
QuantumExplorer May 27, 2024
d21ee73
builds
QuantumExplorer May 27, 2024
7df7636
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer May 27, 2024
24c4eb8
resolve with provided contract
QuantumExplorer May 27, 2024
5c0547f
fixes
QuantumExplorer May 27, 2024
9cfbebb
fixes
QuantumExplorer May 27, 2024
f6f770c
a lot more work
QuantumExplorer May 28, 2024
cf9513b
contested resource query done
QuantumExplorer May 28, 2024
02a6a4f
fix
QuantumExplorer May 28, 2024
0991a26
feature fixes
QuantumExplorer May 28, 2024
7832cd9
more fixes
QuantumExplorer May 28, 2024
cd12857
more fixes
QuantumExplorer May 28, 2024
a19f599
feature fixes
QuantumExplorer May 28, 2024
cfd2958
more fixes
QuantumExplorer May 28, 2024
170706a
another verification
QuantumExplorer May 28, 2024
96e9230
more work
QuantumExplorer May 29, 2024
c707993
more fixes
QuantumExplorer May 29, 2024
9a83628
a lot more end date queries and tests
QuantumExplorer May 29, 2024
36fb18c
more query tests
QuantumExplorer May 29, 2024
fbc4785
added more tests
QuantumExplorer May 29, 2024
7d77413
query contender votes
QuantumExplorer May 30, 2024
795e67d
query contender votes (better)
QuantumExplorer May 30, 2024
03f8ae7
added lock and abstain tree and did more work on identity votes query
QuantumExplorer May 31, 2024
dec5f81
broke things
QuantumExplorer May 31, 2024
eddf487
repaired some requests
QuantumExplorer May 31, 2024
c43f1ec
last test passed
QuantumExplorer May 31, 2024
748e50d
a lot of work
QuantumExplorer May 31, 2024
f731520
last query done
QuantumExplorer May 31, 2024
635b535
more work
QuantumExplorer May 31, 2024
6912bec
refactored vote tests
QuantumExplorer Jun 2, 2024
ea57cce
a lot of fixes
QuantumExplorer Jun 3, 2024
aa2d257
more work
QuantumExplorer Jun 5, 2024
8757326
small fix
QuantumExplorer Jun 5, 2024
58398ac
temp
QuantumExplorer Jun 6, 2024
8e0c9d0
more work on cleanup
QuantumExplorer Jun 7, 2024
6dfa610
more work
QuantumExplorer Jun 7, 2024
f0e94f6
Merge branch 'v1.0-dev' into feat/masternodeVoting
QuantumExplorer Jun 7, 2024
a3089fa
removed votes from identity table
QuantumExplorer Jun 7, 2024
7d3e52f
Merge branch 'tempmasternodevoting' into feat/masternodeVoting
QuantumExplorer Jun 7, 2024
a2ece4a
more cleanup
QuantumExplorer Jun 8, 2024
da30633
storage of finishing info
QuantumExplorer Jun 8, 2024
3fc6346
its alive
QuantumExplorer Jun 8, 2024
01d29e0
more work
QuantumExplorer Jun 8, 2024
c7072e3
locking test
QuantumExplorer Jun 8, 2024
b5b392b
locking test
QuantumExplorer Jun 8, 2024
83c23ce
more work
QuantumExplorer Jun 9, 2024
eec4cf4
small fixes
QuantumExplorer Jun 9, 2024
6a57303
a lot of validation
QuantumExplorer Jun 9, 2024
df9f373
more work
QuantumExplorer Jun 9, 2024
a6e107d
things working
QuantumExplorer Jun 9, 2024
2f681b7
validation done
QuantumExplorer Jun 9, 2024
20635e1
changing votes is validated now
QuantumExplorer Jun 10, 2024
a221194
last home stretch
QuantumExplorer Jun 10, 2024
a8ac4d2
old vote is removed when new vote is added
QuantumExplorer Jun 10, 2024
e35f963
more validation
QuantumExplorer Jun 10, 2024
eba991a
cleanup
QuantumExplorer Jun 11, 2024
a5c3065
another fix
QuantumExplorer Jun 11, 2024
3ddd0e4
wasm-dpp
QuantumExplorer Jun 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
690 changes: 348 additions & 342 deletions Cargo.lock

Large diffs are not rendered by default.

21 changes: 12 additions & 9 deletions packages/check-features/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ use toml::Value;

fn main() {
let crates = [
"rs-sdk",
"rs-drive-abci",
"rs-dpp",
"rs-drive",
"rs-drive-proof-verifier",
("rs-sdk", vec![]),
("rs-drive-abci", vec![]),
("rs-dpp", vec!["documents-faker"]),
("rs-drive", vec![]),
("rs-drive-proof-verifier", vec![]),
];

for specific_crate in crates {
check_crate(specific_crate)
for (specific_crate, to_ignore) in crates {
check_crate(specific_crate, to_ignore)
}
}

fn check_crate(crate_name: &str) {
fn check_crate(crate_name: &str, to_ignore: Vec<&str>) {
// Construct the path to the Cargo.toml file for each crate
let cargo_toml_path = format!("packages/{}/Cargo.toml", crate_name);

Expand Down Expand Up @@ -77,7 +77,10 @@ fn check_crate(crate_name: &str) {

for (feature, _) in features.as_table().unwrap().iter() {
// Skip special feature groups
if feature == "default" || feature.ends_with("features") {
if feature == "default"
|| feature.ends_with("features")
|| to_ignore.contains(&feature.as_str())
{
continue;
}

Expand Down
16 changes: 14 additions & 2 deletions packages/dapi-grpc/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
// Derive features for versioned messages
//
// "GetConsensusParamsRequest" is excluded as this message does not support proofs
const VERSIONED_REQUESTS: [&str; 19] = [
const VERSIONED_REQUESTS: [&str; 25] = [
"GetDataContractHistoryRequest",
"GetDataContractRequest",
"GetDataContractsRequest",
Expand All @@ -66,10 +66,16 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
"GetProtocolVersionUpgradeVoteStatusRequest",
"GetPathElementsRequest",
"GetIdentitiesContractKeysRequest",
"GetPrefundedSpecializedBalanceRequest",
"GetContestedResourcesRequest",
"GetContestedResourceVoteStateRequest",
"GetContestedResourceVotersForIdentityRequest",
"GetContestedResourceIdentityVotesRequest",
"GetVotePollsByEndDateRequest",
];

// "GetConsensusParamsResponse" is excluded as this message does not support proofs
const VERSIONED_RESPONSES: [&str; 20] = [
const VERSIONED_RESPONSES: [&str; 26] = [
"GetDataContractHistoryResponse",
"GetDataContractResponse",
"GetDataContractsResponse",
Expand All @@ -90,6 +96,12 @@ fn configure_platform(mut platform: MappingConfig) -> MappingConfig {
"GetProtocolVersionUpgradeVoteStatusResponse",
"GetPathElementsResponse",
"GetIdentitiesContractKeysResponse",
"GetPrefundedSpecializedBalanceResponse",
"GetContestedResourcesResponse",
"GetContestedResourceVoteStateResponse",
"GetContestedResourceVotersForIdentityResponse",
"GetContestedResourceIdentityVotesResponse",
"GetVotePollsByEndDateResponse",
];

// Derive VersionedGrpcMessage on requests
Expand Down
Loading
Loading