Skip to content

simplewallet: fix payment ID false positive on Carrot receive #217

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

Draft
jeffro256 wants to merge 8 commits into
base: fcmp++-stage
Choose a base branch
from
Draft

simplewallet: fix payment ID false positive on Carrot receive #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9391751
cryptonote_core: cache input verification results directly in mempool
jeffro256 Oct 9, 2025
b4ccefd
unit_tests: @j-berman unit tests for #10157
jeffro256 Oct 16, 2025
7bfffa9
FCMP++/Carrot mega commit [10/24/25]
j-berman Oct 24, 2025
02eab94
tx pool: only increment m_txpool_weight for newly added pool txs
j-berman Oct 28, 2025
13c6dac
Curve Trees: handle get_max_concurrency() == 0
j-berman Oct 22, 2025
67aac62
Merge pull request #189 from j-berman/handle-zero-max-conc
j-berman Oct 31, 2025
70fbf33
Merge pull request #194 from j-berman/fix-pool-weight-inc
jeffro256 Nov 3, 2025
878517a
simplewallet: fix payment ID false positive on Carrot receive
jeffro256 Nov 5, 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
7 changes: 7 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,10 @@
[submodule "external/gtest"]
path = external/gtest
url = https://github.com/google/googletest.git
[submodule "external/fcmp-plus-plus"]
path = external/fcmp-plus-plus
url = https://github.com/kayabaNerve/fcmp-plus-plus.git
[submodule "external/mx25519"]
path = external/mx25519
url = https://github.com/jeffro256/mx25519
branch = unclamped
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ if(NOT MANUAL_SUBMODULES)
check_submodule(external/rapidjson)
check_submodule(external/randomx)
check_submodule(external/supercop)
check_submodule(external/mx25519)
endif()
endif()

Expand Down Expand Up @@ -452,7 +453,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
set(BSDI TRUE)
endif()

include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include external/mx25519/include)

if(MINGW)
set(DEFAULT_STATIC true)
Expand All @@ -479,6 +480,7 @@ set(PIC_FLAG "-fPIC")
if(STATIC)
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DZMQ_STATIC")
add_definitions("-DMX25519_STATIC")
endif()

option(SANITIZE "Use ASAN memory sanitizer" OFF)
Expand Down Expand Up @@ -1061,6 +1063,9 @@ endif()
add_definitions(-DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION)
add_definitions(-DBOOST_NO_AUTO_PTR)
add_definitions(-DBOOST_UUID_DISABLE_ALIGNMENT) # This restores UUID's std::has_unique_object_representations property
# Boost has two conflicting save/load impls for `std::variant`, one in serialization/variant.hpp,
# and one in serialization/std_variant.hpp. This macro disables the one in variant.hpp.
add_definitions(-DBOOST_NO_CXX17_HDR_VARIANT)

include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
if(MINGW)
Expand Down
1 change: 1 addition & 0 deletions external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,4 @@ add_subdirectory(db_drivers)
add_subdirectory(easylogging++)
add_subdirectory(qrcodegen)
add_subdirectory(randomx EXCLUDE_FROM_ALL)
add_subdirectory(mx25519)
1 change: 1 addition & 0 deletions external/mx25519
Open in desktop
Submodule mx25519 added at e808a6
3 changes: 3 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,15 @@ endfunction ()
include(Version)
monero_add_library(version SOURCES ${CMAKE_BINARY_DIR}/version.cpp DEPENDS genversion)

add_subdirectory(carrot_core)
add_subdirectory(carrot_impl)
add_subdirectory(common)
add_subdirectory(crypto)
add_subdirectory(ringct)
add_subdirectory(checkpoints)
add_subdirectory(cryptonote_basic)
add_subdirectory(cryptonote_core)
add_subdirectory(fcmp_pp)
add_subdirectory(lmdb)
add_subdirectory(multisig)
add_subdirectory(net)
Expand Down
1 change: 1 addition & 0 deletions src/blockchain_db/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ target_link_libraries(blockchain_db
common
cncrypto
cryptonote_basic
fcmp_pp
ringct_basic
${LMDB_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
Expand Down
Loading