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

Rust log to core #3432

Merged
merged 5 commits into from
Jun 2, 2022
Merged

Rust log to core #3432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ef7bf0
Rename bridge.{cpp,h} to rust_bridge.{cpp,h}
graydon May 13, 2022
a27e136
Add initial smart contract system that delegates to rust host.
graydon May 13, 2022
ba4d77e
Add entries to VS project files
graydon May 14, 2022
746c21d
Rename src/rust/*.{cpp,h} files to match CamelCase naming style.
graydon May 20, 2022
51009b0
Connect Rust's standard log crate to stellar-core's logging system.
graydon May 20, 2022
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
13 changes: 7 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,13 @@ min-testcases/
/my-history/

# Rust specific
src/rust/bin
src/rust/target
src/rust/bridge.cpp
src/rust/bridge.h
src/rust/.crates.toml
src/rust/.crates2.json
/src/rust/bin
/src/rust/target
/target
/src/rust/RustBridge.cpp
/src/rust/RustBridge.h
/src/rust/.crates.toml
/src/rust/.crates2.json

# Windows specific
**/Build/*
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@
path = lib/spdlog
url = https://github.com/gabime/spdlog
ignore = dirty
[submodule "lib/rs-stellar-contract-env"]
path = lib/rs-stellar-contract-env
url = https://github.com/stellar/rs-stellar-contract-env
53 changes: 38 additions & 15 deletions Builds/VisualStudio/stellar-core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ exit /b 0
</Message>
</PreBuildEvent>
<CustomBuildStep>
<Inputs>src/generated/xdr/Stellar-overlay.h;src/generated/rust/bridge.h</Inputs>
<Inputs>src/generated/xdr/Stellar-overlay.h;src/generated/rust/RustBridge.h</Inputs>
<Command>@echo XDR &gt; $(IntermediateOutputPath)\xdrgen.stamp</Command>
<Message>XDR check</Message>
<Outputs>$(IntermediateOutputPath)\xdrgen.stamp</Outputs>
Expand Down Expand Up @@ -374,6 +374,7 @@ exit /b 0
<ClCompile Include="..\..\src\transactions\TransactionSQL.cpp" />
<ClCompile Include="..\..\src\transactions\RevokeSponsorshipOpFrame.cpp" />
<ClCompile Include="..\..\src\transactions\TrustFlagsOpFrameBase.cpp" />
<ClCompile Include="..\..\src\transactions\contracts\ContractUtils.cpp" />
<ClCompile Include="..\..\src\util\Backtrace.cpp" />
<ClCompile Include="..\..\src\util\FileSystemException.cpp" />
<ClCompile Include="..\..\src\util\ProtocolVersion.cpp" />
Expand Down Expand Up @@ -643,7 +644,7 @@ exit /b 0
<ClCompile Include="..\..\src\work\WorkScheduler.cpp" />
<ClCompile Include="..\..\src\work\WorkSequence.cpp" />
<ClCompile Include="..\..\src\work\WorkWithCallback.cpp" />
<ClCompile Include="src\generated\rust\bridge.cpp" />
<ClCompile Include="src\generated\rust\RustBridge.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\lib\catch.hpp" />
Expand Down Expand Up @@ -750,6 +751,7 @@ exit /b 0
<ClInclude Include="..\..\src\transactions\TransactionSQL.h" />
<ClInclude Include="..\..\src\transactions\RevokeSponsorshipOpFrame.h" />
<ClInclude Include="..\..\src\transactions\TrustFlagsOpFrameBase.h" />
<ClInclude Include="..\..\src\transactions\contracts\ContractUtils.h" />
<ClInclude Include="..\..\src\util\Backtrace.h" />
<ClInclude Include="..\..\src\util\Decoder.h" />
<ClInclude Include="..\..\src\util\ProtocolVersion.h" />
Expand Down Expand Up @@ -871,6 +873,8 @@ exit /b 0
<ClInclude Include="..\..\src\overlay\Tracker.h" />
<ClInclude Include="..\..\src\process\ProcessManager.h" />
<ClInclude Include="..\..\src\process\ProcessManagerImpl.h" />
<ClInclude Include="..\..\src\rust\CppShims.h" />
<ClInclude Include="..\..\src\rust\RustVecXdrMarshal.h" />
<ClInclude Include="..\..\src\scp\BallotProtocol.h" />
<ClInclude Include="..\..\src\scp\LocalNode.h" />
<ClInclude Include="..\..\src\scp\NominationProtocol.h" />
Expand Down Expand Up @@ -945,7 +949,8 @@ exit /b 0
<ClInclude Include="..\..\src\work\WorkScheduler.h" />
<ClInclude Include="..\..\src\work\WorkSequence.h" />
<ClInclude Include="..\..\src\work\WorkWithCallback.h" />
<ClInclude Include="src\generated\rust\bridge.h" />
<ClInclude Include="src\generated\rust\RustBridge.h" />
<ClInclude Include="src\generated\xdr\Stellar-contract.h" />
<ClInclude Include="src\generated\xdr\Stellar-ledger-entries.h" />
<ClInclude Include="src\generated\xdr\Stellar-ledger.h" />
<ClInclude Include="src\generated\xdr\Stellar-overlay.h" />
Expand Down Expand Up @@ -1001,6 +1006,24 @@ exit /b 0
<None Include="..\..\src\history\serialize-tests\stellar-history.livenet.15686975.json" />
<None Include="..\..\src\history\serialize-tests\stellar-history.testnet.6714239.json" />
<None Include="..\..\lib\xdrpp\tests\xdrtest.x" />
<CustomBuild Include="..\..\src\protocol-next\xdr\Stellar-contract.x">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\xdrc.exe -hh -pedantic -o src/generated/xdr/Stellar-contract.h ../../src/protocol-next/xdr/Stellar-contract.x</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">$(SolutionDir)$(Platform)\$(Configuration)\xdrc.exe -hh -pedantic -o src/generated/xdr/Stellar-contract.h ../../src/protocol-next/xdr/Stellar-contract.x</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\xdrc.exe -hh -pedantic -o src/generated/xdr/Stellar-contract.h ../../src/protocol-next/xdr/Stellar-contract.x</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">running xdrc</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">running xdrc</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">running xdrc</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">src/generated/xdr/Stellar-contract.h</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">src/generated/xdr/Stellar-contract.h</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src/generated/xdr/Stellar-contract.h</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">src/generated/xdr/Stellar-types.h</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">src/generated/xdr/Stellar-types.h</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src/generated/xdr/Stellar-types.h</AdditionalInputs>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ClInclude</OutputItemType>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">ClInclude</OutputItemType>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ClInclude</OutputItemType>
</CustomBuild>
<CustomBuild Include="..\..\src\protocol-next\xdr\Stellar-ledger.x">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\xdrc.exe -hh -pedantic -o src/generated/xdr/Stellar-ledger.h ../../src/protocol-next/xdr/Stellar-ledger.x</Command>
Expand Down Expand Up @@ -1158,18 +1181,18 @@ exit /b 0
</CustomBuild>
<CustomBuild Include="..\..\src\rust\src\lib.rs">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --header --output src\generated\rust\bridge.h
$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --output src\generated\rust\bridge.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --header --output src\generated\rust\bridge.h
$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --output src\generated\rust\bridge.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --header --output src\generated\rust\bridge.h
$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --output src\generated\rust\bridge.cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">running cxxbridge to generate bridge.h and bridge.cpp</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">running cxxbridge to generate bridge.h and bridge.cpp</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">running cxxbridge to generate bridge.h and bridge.cpp</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">src\generated\rust\bridge.h;src\generated\rust\bridge.cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">src\generated\rust\bridge.h;src\generated\rust\bridge.cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src\generated\rust\bridge.h;src\generated\rust\bridge.cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --header --output src\generated\rust\RustBridge.h
$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --output src\generated\rust\RustBridge.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --header --output src\generated\rust\RustBridge.h
$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --output src\generated\rust\RustBridge.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --header --output src\generated\rust\RustBridge.h
$(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --output src\generated\rust\RustBridge.cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">running cxxbridge to generate RustBridge.h and RustBridge.cpp</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">running cxxbridge to generate RustBridge.h and RustBridge.cpp</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">running cxxbridge to generate RustBridge.h and RustBridge.cpp</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">src\generated\rust\RustBridge.h;src\generated\rust\RustBridge.cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">src\generated\rust\RustBridge.h;src\generated\rust\RustBridge.cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src\generated\rust\RustBridge.h;src\generated\rust\RustBridge.cpp</Outputs>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ClInclude</OutputItemType>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">ClInclude</OutputItemType>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ClInclude</OutputItemType>
Expand Down
22 changes: 20 additions & 2 deletions Builds/VisualStudio/stellar-core.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,10 +1227,13 @@
<ClCompile Include="..\..\src\transactions\TrustFlagsOpFrameBase.cpp">
<Filter>transactions</Filter>
</ClCompile>
<ClCompile Include="..\..\src\transactions\contracts\ContractUtils.cpp">
<Filter>transactions</Filter>
</ClCompile>
<ClCompile Include="..\..\src\util\ProtocolVersion.cpp">
<Filter>util</Filter>
</ClCompile>
<ClCompile Include="src\generated\rust\bridge.cpp">
<ClCompile Include="src\generated\rust\RustBridge.cpp">
<Filter>rust\generated</Filter>
</ClCompile>
<ClCompile Include="..\..\src\herder\test\TestTxSetUtils.cpp">
Expand Down Expand Up @@ -1361,6 +1364,9 @@
<ClInclude Include="..\..\lib\util\basen.h">
<Filter>util</Filter>
</ClInclude>
<ClInclude Include="src\generated\xdr\Stellar-contract.h">
<Filter>xdr\generated</Filter>
</ClInclude>
<ClInclude Include="src\generated\xdr\Stellar-ledger.h">
<Filter>xdr\generated</Filter>
</ClInclude>
Expand Down Expand Up @@ -2144,10 +2150,13 @@
<ClInclude Include="..\..\src\transactions\TrustFlagsOpFrameBase.h">
<Filter>transactions</Filter>
</ClInclude>
<ClInclude Include="..\..\src\transactions\contracts\ContractUtils.h">
<Filter>transactions</Filter>
</ClInclude>
<ClInclude Include="..\..\src\util\ProtocolVersion.h">
<Filter>util</Filter>
</ClInclude>
<ClInclude Include="src\generated\rust\bridge.h">
<ClInclude Include="src\generated\rust\RustBridge.h">
<Filter>rust\generated</Filter>
</ClInclude>
<ClInclude Include="..\..\src\herder\test\TestTxSetUtils.h">
Expand All @@ -2156,6 +2165,12 @@
<ClInclude Include="..\..\src\herder\TxSetUtils.h">
<Filter>herder</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rust\CppShims.h">
<Filter>rust</Filter>
</ClInclude>
<ClInclude Include="..\..\src\rust\RustVecXdrMarshal.h">
<Filter>rust</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\AUTHORS" />
Expand Down Expand Up @@ -2296,6 +2311,9 @@
</None>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\src\protocol-next\xdr\Stellar-contract.x">
<Filter>xdr</Filter>
</CustomBuild>
<CustomBuild Include="..\..\src\protocol-next\xdr\Stellar-ledger.x">
<Filter>xdr</Filter>
</CustomBuild>
Expand Down
Loading