tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge regression in wallet; updated build order for binary releases

Browse Source
This commit is contained in:
Some Random Crypto Guy
2024-10-09 13:37:14 +01:00
parent c5c828516b
commit 6fefb49da0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
make_releases.sh
+6 -6
View File
@@ -4,6 +4,12 @@
TAG=`git tag -l --points-at HEAD` TAG=`git tag -l --points-at HEAD`
COMMIT=`git rev-parse --short=9 HEAD` COMMIT=`git rev-parse --short=9 HEAD`
# Build the 64-bit Windows release
USE_DEVICE_TREZOR=OFF make depends target=x86_64-w64-mingw32 -j12
pushd ./build/x86_64-w64-mingw32/release/bin > /dev/null
zip -ur ~/releases/salvium-${TAG}-win64.zip salviumd.exe salvium-wallet-cli.exe salvium-wallet-rpc.exe
popd > /dev/null
# Build the 64-bit Apple Silicon release # Build the 64-bit Apple Silicon release
USE_DEVICE_TREZOR=OFF make depends target=aarch64-apple-darwin -j12 USE_DEVICE_TREZOR=OFF make depends target=aarch64-apple-darwin -j12
pushd ./build/aarch64-apple-darwin/release/bin > /dev/null pushd ./build/aarch64-apple-darwin/release/bin > /dev/null
@@ -22,10 +28,4 @@ pushd ./build/x86_64-linux-gnu/release/bin > /dev/null
zip -ur ~/releases/salvium-${TAG}-linux-x86_64.zip salviumd salvium-wallet-cli salvium-wallet-rpc zip -ur ~/releases/salvium-${TAG}-linux-x86_64.zip salviumd salvium-wallet-cli salvium-wallet-rpc
popd > /dev/null popd > /dev/null
# Build the 64-bit Windows release
USE_DEVICE_TREZOR=OFF make depends target=x86_64-w64-mingw32 -j12
pushd ./build/x86_64-w64-mingw32/release/bin > /dev/null
zip -ur ~/releases/salvium-${TAG}-win64.zip salviumd.exe salvium-wallet-cli.exe salvium-wallet-rpc.exe
popd > /dev/null
# Finish # Finish
src/wallet/wallet2.cpp
+2 -1
View File
@@ -11265,7 +11265,8 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_all(uint64_t below
// gather all dust and non-dust outputs of specified subaddress (if any) and below specified threshold (if any) // gather all dust and non-dust outputs of specified subaddress (if any) and below specified threshold (if any)
bool fund_found = false; bool fund_found = false;
for (size_t idx = 0; idx < m_transfers_indices[asset_type].size(); idx++) //for (size_t idx = 0; idx < m_transfers_indices[asset_type].size(); idx++)
for (const auto& idx: m_transfers_indices[asset_type])
{ {
size_t i = m_transfers_indices[asset_type][idx]; size_t i = m_transfers_indices[asset_type][idx];
const transfer_details& td = m_transfers[i]; const transfer_details& td = m_transfers[i];