Skip to content

Make parallel tx set builder to flexibly choose the number of stages. #4712

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
18 changes: 10 additions & 8 deletions Builds/VisualStudio/stellar-core.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1630,23 +1630,25 @@ exit /b 0
<None Include="..\..\src\ledger\readme.md" />
<None Include="..\..\src\overlay\readme.md" />
<None Include="..\..\src\rust\Cargo.toml" />
<CustomBuild Include="..\..\src\rust\src\lib.rs">
<CustomBuild Include="..\..\src\rust\src\bridge.rs">
<FileType>Document</FileType>
<Command>$(MSBuildProjectDirectory)\generate_rust_bridge.bat $(OutDir)\..\bin\cxxbridge.exe</Command>
<AdditionalInputs>$(OutDir)\..\bin\cxxbridge.exe;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-internal.h;src/$(Configuration)/generated/xdr/Stellar-contract-config-setting.h;src/$(Configuration)/generated/xdr/Stellar-types.h;src/$(Configuration)/generated/xdr/Stellar-contract.h;src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h</AdditionalInputs>
<Message>running cxxbridge to generate RustBridge.h and RustBridge.cpp</Message>
<Outputs>src\generated\rust\RustBridge.h;src\generated\rust\RustBridge.cpp</Outputs>
<OutputItemType>ClInclude</OutputItemType>
</CustomBuild>
<CustomBuild Include="..\..\src\rust\install-cxxbridge-cmd">
<FileType>Document</FileType>
<Command>cargo install --root $(OutDir)\.. cxxbridge-cmd --version 1.0.68</Command>
<Message>cargo install --root $(OutDir)\.. cxxbridge-cmd --version 1.0.68</Message>
<Outputs>$(OutDir)\..\bin\cxxbridge.exe</Outputs>
</CustomBuild>
<None Include="..\..\src\rust\src\b64.rs" />
<None Include="..\..\src\rust\src\contract.rs" />
<None Include="..\..\src\rust\src\common.rs" />
<None Include="..\..\src\rust\src\i128.rs" />
<None Include="..\..\src\rust\src\lib.rs" />
<None Include="..\..\src\rust\src\log.rs" />
<None Include="..\..\src\rust\src\soroban_invoke.rs" />
<None Include="..\..\src\rust\src\soroban_module_cache.rs" />
<None Include="..\..\src\rust\src\soroban_proto_all.rs" />
<None Include="..\..\src\rust\src\soroban_proto_any.rs" />
<None Include="..\..\src\rust\src\soroban_test_extra_protocol.rs" />
<None Include="..\..\src\rust\src\soroban_test_wasm.rs" />
<None Include="..\..\src\scp\readme.md" />
<None Include="..\..\src\test\check-nondet" />
<None Include="..\..\src\test\run-selftest-nopg" />
Expand Down
37 changes: 28 additions & 9 deletions Builds/VisualStudio/stellar-core.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -2603,9 +2603,6 @@
<None Include="..\..\src\rust\src\b64.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\contract.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\log.rs">
<Filter>rust</Filter>
</None>
Expand Down Expand Up @@ -2648,6 +2645,33 @@
<None Include="..\..\src\transactions\readme.md">
<Filter>transactions</Filter>
</None>
<None Include="..\..\src\rust\src\common.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\i128.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\lib.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\soroban_invoke.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\soroban_module_cache.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\soroban_proto_all.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\soroban_proto_any.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\soroban_test_extra_protocol.rs">
<Filter>rust</Filter>
</None>
<None Include="..\..\src\rust\src\soroban_test_wasm.rs">
<Filter>rust</Filter>
</None>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\src\protocol-next\xdr\Stellar-contract.x">
Expand Down Expand Up @@ -2680,12 +2704,6 @@
<CustomBuild Include="..\..\src\main\StellarCoreVersion.cpp.in">
<Filter>main</Filter>
</CustomBuild>
<CustomBuild Include="..\..\src\rust\src\lib.rs">
<Filter>rust</Filter>
</CustomBuild>
<CustomBuild Include="..\..\src\rust\install-cxxbridge-cmd">
<Filter>rust</Filter>
</CustomBuild>
<CustomBuild Include="..\..\src\protocol-curr\xdr\Stellar-ledger.x">
<Filter>xdr\curr</Filter>
</CustomBuild>
Expand Down Expand Up @@ -2720,6 +2738,7 @@
<Filter>util\xdrquery</Filter>
</CustomBuild>
<CustomBuild Include="..\..\hash-xdrs.sh" />
<CustomBuild Include="..\..\src\rust\src\bridge.rs" />
</ItemGroup>
<ItemGroup>
<Text Include="..\..\INSTALL-Windows.md" />
Expand Down
Loading