Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9952ac8
start adding support for subaddresses
Einliterflasche Oct 15, 2025
c3d489e
add happy_path_alice_developer_tip_subaddress
binarybaron Oct 15, 2025
854aaf5
remove redundant addSubaddressAccount bridge
binarybaron Oct 15, 2025
5e092df
document multiple tx keys
binarybaron Oct 15, 2025
53dc1c7
don't autoformat c++ files
Einliterflasche Oct 16, 2025
2f202d8
update PendingTransaction::txKeys() to return the output address and …
Einliterflasche Oct 16, 2025
3cc27ec
fix c++ include error, update bridge.rs
Einliterflasche Oct 16, 2025
8b108ff
Merge branch 'fix/monero-sys-multiple-tx-keys' of https://github.com/…
Einliterflasche Oct 16, 2025
9600894
make TxReceipt have a map of transfer keys
Einliterflasche Oct 16, 2025
61bf3a9
fix derive_puclic_key function call
Einliterflasche Oct 17, 2025
5fbc2b1
add undo-git-changes to justfile (restores unstaged changes in git su…
Einliterflasche Oct 24, 2025
e1e7ef2
don't autoformat c/c++ files
Einliterflasche Oct 24, 2025
a43e967
Change the txKeys method to correctly identify the tx key for each ou…
Einliterflasche Oct 24, 2025
ecf6fec
add a simple test casse
Einliterflasche Oct 24, 2025
e34bab5
update error message to reflect caviat of not beign able to send to y…
Einliterflasche Oct 24, 2025
4e8a6bb
Merge branch 'master' into fix/monero-sys-multiple-tx-keys
Einliterflasche Oct 24, 2025
b5c3937
un-hardcode path in transaction_keys.rs
Einliterflasche Oct 24, 2025
f0733c3
update patch to throw an exception in txKeys() when a crypto operatio…
Einliterflasche Oct 24, 2025
5fb8b39
cleanup
Einliterflasche Nov 3, 2025
9315938
add a new crate monero-tests for monero integration tests
Einliterflasche Nov 3, 2025
5d42351
add monero-tests/transactions to ci
Einliterflasche Nov 3, 2025
2fb2c98
add comment to tx_keys map
Einliterflasche Nov 3, 2025
51b6acf
Merge branch 'master' into fix/monero-sys-multiple-tx-keys
binarybaron Nov 4, 2025
0cd8fff
fix compilation, add test case for wrong transfer key
Einliterflasche Nov 6, 2025
4bb1514
fix ci
Einliterflasche Nov 6, 2025
cacb920
add new test and explanatory comments
Einliterflasche Nov 7, 2025
aba24fc
Add explanatory comment
Einliterflasche Nov 7, 2025
f733ede
rename test to avoid name abiguity
Einliterflasche Nov 8, 2025
816e334
silence some monero c++ spam
Einliterflasche Nov 8, 2025
b69ec7c
start updating distribute function to use integers
Einliterflasche Nov 8, 2025
f589564
Merge branch 'master' into fix/monero-sys-multiple-tx-keys
Einliterflasche Nov 9, 2025
97bd923
Revert "start updating distribute function to use integers"
Einliterflasche Nov 9, 2025
9f7039c
update rust to 1.88
Einliterflasche Nov 9, 2025
37af555
Merge branch 'master' into fix/monero-sys-multiple-tx-keys
Einliterflasche Nov 9, 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
2 changes: 1 addition & 1 deletion .github/actions/setup-build-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ runs:
npm install --global yarn@1

- name: Install Rust stable
uses: dtolnay/rust-toolchain@1.87
uses: dtolnay/rust-toolchain@1.88
with:
targets: ${{ inputs.target }}

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ jobs:
test_name: happy_path
- package: swap
test_name: happy_path_alice_developer_tip
- package: swap
test_name: happy_path_alice_developer_tip_subaddress
- package: swap
test_name: happy_path_restart_bob_after_xmr_locked
- package: swap
Expand Down Expand Up @@ -147,6 +149,10 @@ jobs:
test_name: alice_empty_balance_after_started_btc_early_refund
- package: swap
test_name: alice_broken_wallet_rpc_after_started_btc_early_refund
- package: monero-tests
test_name: transfers
- package: monero-tests
test_name: transfers_wrong_key

runs-on: ubuntu-22.04
if: github.event_name == 'push' || !github.event.pull_request.draft
Expand Down
14 changes: 11 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,17 @@
"shared_mutex": "cpp",
"source_location": "cpp",
"strstream": "cpp",
"typeindex": "cpp"
"typeindex": "cpp",
"valarray": "cpp",
"*.ipp": "cpp"
},
"rust-analyzer.cargo.extraEnv": {
"CARGO_TARGET_DIR": "target-check"
}
}
},
"[cpp]": {
"editor.formatOnSave": false
},
"[c]": {
"editor.formatOnSave": false
},
}
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- Update Rust version to 1.88 to satisfy depenency requirements.
## [3.2.11] - 2025-11-09

- GUI + SWAP: Assume double spend safety of Monero transactions after 6 confirmations. This means we are assuming that there won't be any re-orgs deeper than 5 blocks. We believe this is a safe assumption given that there were almost no orphaned blocks over the last two weeks. Qubic (which was behind the re-orgs) has mined less than 1% of the last 1000 blocks.
Expand Down
Loading
Loading