jwinterm b7b7a6d21d Merge upstream staging into contracts ...

Bring the branch current with upstream staging (= master + #748). The earlier
"Merge branch master into contracts" used a stale local master snapshot, which
left the branch ~41 commits behind; this merges the current tip, including the
grin 5.4.0 dependency bump (#745) and the tx-delete / retrieve_txs fixes.

Only Cargo.lock conflicted (regenerated). Full cargo test --workspace green
(52 binaries / 185 tests).

2026-06-03 15:27:43 -04:00

..

common

Merge upstream staging into contracts

2026-06-03 15:27:43 -04:00

contract

Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"

2024-09-19 09:05:44 +00:00

accounts.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

build_chain.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

build_output.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

check.rs

Save last scanned block info for wallet scanning (#748)

2026-06-02 20:09:50 +02:00

contract_accounts_switch.rs

Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"

2024-09-19 09:05:44 +00:00

contract_accounts.rs

Make payment proofs opt-in to fix #729

2026-06-02 20:25:48 -04:00

contract_early_lock.rs

Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"

2024-09-19 09:05:44 +00:00

contract_early_proofs_rsr.rs

Make payment proofs opt-in to fix #729

2026-06-02 20:25:48 -04:00

contract_early_proofs_srs.rs

Make payment proofs opt-in to fix #729

2026-06-02 20:25:48 -04:00

contract_rsr.rs

Make payment proofs opt-in to fix #729

2026-06-02 20:25:48 -04:00

contract_self_spend_cancel.rs

Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"

2024-09-19 09:05:44 +00:00

contract_self_spend_custom.rs

De-panic output_amounts(): fallible make-outputs parsing

2026-06-03 13:56:32 -04:00

contract_self_spend.rs

Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"

2024-09-19 09:05:44 +00:00

contract_srs_mwmixnet.rs

Fix contract_srs_mwmixnet test import after merge

2026-06-02 20:15:03 -04:00

contract_srs.rs

Make payment proofs opt-in to fix #729

2026-06-02 20:25:48 -04:00

file.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

invoice.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

late_lock.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

mwixnet.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

no_change.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

payment_proofs.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

repost.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

revert.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

self_send_cancel.rs

Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"

2024-09-19 09:05:44 +00:00

self_send.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

slatepack.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

transaction.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

ttl_cutoff.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

tx_list_filter.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00

updater_thread.rs

Normalize line endings, attempt 2

2025-09-18 14:56:43 +02:00