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

new SAT-based, process-isolated quorum intersection checker #4653

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

new SAT-based, process-isolated quorum intersection checker #4653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2a4296
new SAT-based, process-isolated quorum intersection checker
jayz22 Feb 24, 2025
cfcae15
fixup! new SAT-based, process-isolated quorum intersection checker
jayz22 Feb 24, 2025
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
3 changes: 3 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,7 @@ exit /b 0
<ClCompile Include="..\..\src\herder\PendingEnvelopes.cpp" />
<ClCompile Include="..\..\src\herder\QuorumIntersectionCheckerImpl.cpp" />
<ClCompile Include="..\..\src\herder\QuorumTracker.cpp" />
<ClCompile Include="..\..\src\herder\RustQuorumCheckerAdaptor.cpp" />
<ClCompile Include="..\..\src\herder\SurgePricingUtils.cpp" />
<ClCompile Include="..\..\src\herder\test\HerderTests.cpp" />
<ClCompile Include="..\..\src\herder\test\PendingEnvelopesTests.cpp" />
Expand Down Expand Up @@ -976,6 +977,7 @@ exit /b 0
<ClInclude Include="..\..\src\herder\QuorumIntersectionChecker.h" />
<ClInclude Include="..\..\src\herder\QuorumIntersectionCheckerImpl.h" />
<ClInclude Include="..\..\src\herder\QuorumTracker.h" />
<ClInclude Include="..\..\src\herder\RustQuorumCheckerAdaptor.h" />
<ClInclude Include="..\..\src\herder\SurgePricingUtils.h" />
<ClInclude Include="..\..\src\herder\test\TestTxSetUtils.h" />
<ClInclude Include="..\..\src\herder\TransactionQueue.h" />
Expand Down Expand Up @@ -1619,6 +1621,7 @@ exit /b 0
</CustomBuild>
<None Include="..\..\src\rust\src\b64.rs" />
<None Include="..\..\src\rust\src\contract.rs" />
<None Include="..\..\src\rust\src\quorum_checker.rs" />
<None Include="..\..\src\rust\src\log.rs" />
<None Include="..\..\src\scp\readme.md" />
<None Include="..\..\src\test\check-nondet" />
Expand Down
9 changes: 9 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,9 @@
<ClCompile Include="..\..\src\herder\QuorumTracker.cpp">
<Filter>herder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\herder\RustQuorumCheckerAdaptor.cpp">
<Filter>herder</Filter>
</ClCompile>
<ClCompile Include="..\..\src\herder\SurgePricingUtils.cpp">
<Filter>herder</Filter>
</ClCompile>
Expand Down Expand Up @@ -1892,6 +1895,9 @@
<ClInclude Include="..\..\src\herder\QuorumTracker.h">
<Filter>herder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\herder\RustQuorumCheckerAdaptor.h">
<Filter>herder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\herder\SurgePricingUtils.h">
<Filter>herder</Filter>
</ClInclude>
Expand Down Expand Up @@ -2536,6 +2542,9 @@
<None Include="..\..\src\rust\src\contract.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\quorum_checker.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\log.rs">
<Filter>rust</Filter>
</None>
Expand Down
45 changes: 45 additions & 0 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.

4 changes: 2 additions & 2 deletions docs/versioning-soroban.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ We are leveraging Rust's support for linking together multiple copies of "the
same" library (soroban) with different versions, but we are doing so somewhat
against the grain of how cargo normally wants to do it.

Do do this "the normal way", we would just list the different versions of the
To do this "the normal way", we would just list the different versions of the
soroban crate in `Cargo.toml`, and then when we built it cargo would attempt to
resolve all the dependencies and transitive-dependencies of all those soroban
versions into a hopefully-minimal set of crates and download, compile and link
Expand All @@ -165,7 +165,7 @@ This has one minor and one major problem:
p22 module on foo 0.1, cargo will bump _both_ to foo 0.2, which _changes_
the semantics of the p22 module.

- We initially though a way out of this is to add redundant exact-version
- We initially thought a way out of this is to add redundant exact-version
dependencies (like `foo = "=0.2"`) to `Cargo.toml` for
`soroban-env-host` but there turn out to be both a minor and a major
problem with that too.
Expand Down
Loading
Loading