Skip to content
Merged
Show file tree
Hide file tree
Changes from 76 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
36f7977
don't force nullifier if tx isn't mined yet
borngraced Jan 29, 2025
6215378
revert unrelated changes
borngraced Jan 29, 2025
bfc0a37
wait for required spendable notes before generating txs
borngraced Jan 30, 2025
e735df9
revert previous changes with decrypt_and_store_transaction
borngraced Jan 30, 2025
13d1dd4
minor changes to wait_for_confirmations
borngraced Jan 30, 2025
f03b30e
debug wait for note confirmations
borngraced Jan 31, 2025
9a76c1b
remove tx from tracker after validation
borngraced Feb 3, 2025
f5f340b
more log and remove notes when taker fee is validated
borngraced Feb 3, 2025
78f8b1a
implement another note tracking mechanism
borngraced Feb 5, 2025
570e058
fix clippy
borngraced Feb 5, 2025
07bd8f0
minor changes
borngraced Feb 5, 2025
4a67cbc
prevent overflow, remove obs comment, remove new initialization metho…
borngraced Feb 5, 2025
1411032
wait for confirmation only if prev change is needed
borngraced Feb 6, 2025
dd24c16
Merge branch 'refs/heads/dev' into fix-arrr-note-saving
borngraced Feb 7, 2025
078465b
fix conflicts after merge with dev
borngraced Feb 7, 2025
0f0b00b
improve notes accounting, add cleanup op for swaps etc.
borngraced Feb 8, 2025
672b902
call maker_coin cleanup dn
borngraced Feb 8, 2025
b57973c
ChangeNotes::get_note removed, no longer used.
borngraced Feb 8, 2025
22f7f8f
i mean to delete get_note!
borngraced Feb 8, 2025
4bca641
implement change note storage
borngraced Feb 11, 2025
1355825
use AsyncSqlConnection
borngraced Feb 11, 2025
e140c58
fix sql bug and implement WASM storage
borngraced Feb 12, 2025
6f19f3f
finish db impls with unit tests
borngraced Feb 12, 2025
55b675f
fix clippy
borngraced Feb 12, 2025
80e66cc
merge with dev
borngraced Feb 13, 2025
5dbe9d5
remove change output if output fails
borngraced Feb 13, 2025
e4e6114
reduce change log
borngraced Feb 13, 2025
6d0871a
Merge branch 'dev' into fix-arrr-note-saving
borngraced Feb 19, 2025
9af4f47
Merge remote-tracking branch 'origin/dev' into fix-arrr-note-saving
shamardy Mar 6, 2025
d5b1d35
Merge branch 'dev' into fix-arrr-note-saving
borngraced Mar 13, 2025
918ff8f
Fix locked notes reuse by ensuring retries after blockchain sync
borngraced Mar 14, 2025
60eba1e
increase wait time
borngraced Mar 14, 2025
cd4ddaf
reworked locking notes approach
borngraced Mar 15, 2025
ac1a7e1
revert walletdb wasm test comment
borngraced Mar 17, 2025
ddc18b5
use cross_tests
borngraced Mar 19, 2025
13fcd8e
rename z_change_notes to z_locked_notes
borngraced Mar 19, 2025
e4b68d6
Merge branch 'dev' into fix-arrr-note-saving
borngraced Mar 24, 2025
b4581c2
Merge branch 'dev' into fix-arrr-note-saving
borngraced Mar 31, 2025
589d54b
enable z_coin_docker_tests and allow gen tx if locked notes wont be n…
borngraced Apr 2, 2025
d6d14f5
avoid using by_ref when filtering notes
borngraced Apr 2, 2025
27883fe
reuse db path for tests sequentially
borngraced Apr 3, 2025
b125501
remove unused imports
borngraced Apr 3, 2025
499d29a
debug tests
borngraced Apr 3, 2025
01ba17d
track and handle spendable and unspendable balance for z_coin
borngraced Apr 8, 2025
d7b6556
use current_thread
borngraced Apr 14, 2025
9b51735
Trigger Tests
borngraced Apr 14, 2025
b52ac83
Trigger Tests Again
borngraced Apr 14, 2025
9cbe1ca
Merge branch 'dev' into fix-arrr-note-saving
borngraced Apr 16, 2025
cec4fec
store locked notes in path instead of in-memory
borngraced Apr 17, 2025
0913748
make sure z tests uses the same db path for same key
borngraced Apr 19, 2025
5b2b970
Merge branch 'dev' into fix-arrr-note-saving
borngraced Apr 24, 2025
f56917b
Merge branch 'dev' into fix-arrr-note-saving
borngraced May 7, 2025
2b6dd04
increase wait timeout for unconfirmed locked note make z_docker_tests…
borngraced May 16, 2025
07c912b
remove locking note when withdraw zcoin
borngraced May 16, 2025
73601d3
simplify gen_tx and refactor wait_for_spendable_balance
borngraced May 16, 2025
8c255f3
spawn spendable balance waiting fut
borngraced May 17, 2025
5ae263e
fix wasm clippy
borngraced May 17, 2025
387750b
remove unused
borngraced May 17, 2025
ae90a15
minor changes to locked notes sql create_table
borngraced May 17, 2025
a8f606f
revert unintentional changes
borngraced May 17, 2025
2136ebd
don't check for error type in check_tx_existence
borngraced May 17, 2025
eec8ca7
fix review notes
borngraced May 20, 2025
0b83244
simplify wait_for_spendable_balance logic
borngraced May 20, 2025
9d5d839
delete z_coin_nativer_tests.rs
borngraced May 20, 2025
dcbab76
imports
borngraced May 20, 2025
2550e9f
Merge branch 'dev' into fix-arrr-note-saving
borngraced May 20, 2025
dd4d049
add todo
borngraced May 20, 2025
34efbde
fix review notes and improve my_balance query
borngraced May 21, 2025
e931e8a
Merge branch 'dev' into fix-arrr-note-saving
borngraced May 21, 2025
9305ec0
post merge fix
borngraced May 21, 2025
fe07307
adapt to new db path changes
borngraced May 21, 2025
f02d86d
Merge branch 'dev' into fix-arrr-note-saving
borngraced May 23, 2025
2bc5561
post merge fix
borngraced May 23, 2025
ef963b3
remove unintended committed file
borngraced May 23, 2025
5dbdec2
Merge branch 'dev' into fix-arrr-note-saving
borngraced May 26, 2025
cc9ec0c
Merge branch 'dev' into fix-arrr-note-saving
borngraced May 30, 2025
54a1e0f
handle sync_guard lifetime
borngraced May 30, 2025
fb90abb
Merge remote-tracking branch 'origin/dev' into fix-arrr-note-saving
shamardy Jun 10, 2025
66d00f5
add TODOs for atomic locked_notes_db and wallet_db updates, and uncon…
shamardy Jun 10, 2025
f1475a1
rollback(tempfile): revert to tempfile 3.4.0
shamardy Jun 10, 2025
b138959
refactor: use incremental versioned migration for LockedNoteTable Ind…
shamardy Jun 10, 2025
4f9f72b
Fix typo in GenTxError variant SaveLockedNotessError → SaveLockedNote…
shamardy Jun 10, 2025
24bc344
refactor: simplify BlockDbImpl::new by construct cache db path intern…
shamardy Jun 10, 2025
33c05cf
fix: mm_ctx native imports order
shamardy Jun 10, 2025
2e017ea
fix(balance): correctly separate unspendable shielded balance into pe…
shamardy Jun 11, 2025
2df2e2d
z_coin: Track change note value via AdditionalTxData in GenTxData, re…
shamardy Jun 11, 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
152 changes: 74 additions & 78 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ sp-trie = { version = "6.0", default-features = false }
sql-builder = "3.1.1"
syn = "1.0"
sysinfo = "0.28"
tempfile = "3.20.0"
# using the same version as cosmrs
tendermint-rpc = { version = "0.35", default-features = false }
testcontainers = "0.15.0"
Expand Down
1 change: 1 addition & 0 deletions mm2src/coins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ hex.workspace = true
http.workspace = true
itertools = { workspace = true, features = ["use_std"] }
jsonrpc-core.workspace = true
jubjub.workspace = true
keys = { path = "../mm2_bitcoin/keys" }
lazy_static.workspace = true
libc.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion mm2src/coins/eth/eth_tests.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use super::*;
use crate::IguanaPrivKey;
use common::block_on;
use futures_util::future;
use mm2_core::mm_ctx::MmCtxBuilder;

cfg_native!(
Expand All @@ -10,6 +9,7 @@ cfg_native!(

use common::{now_sec, block_on_f01};
use ethkey::{Generator, Random};
use futures_util::future;
use mm2_test_helpers::for_tests::{ETH_MAINNET_CHAIN_ID, ETH_MAINNET_NODES, ETH_SEPOLIA_CHAIN_ID, ETH_SEPOLIA_NODES,
ETH_SEPOLIA_TOKEN_CONTRACT};
use mocktopus::mocking::*;
Expand Down
7 changes: 4 additions & 3 deletions mm2src/coins/utxo/utxo_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ use crate::rpc_command::init_scan_for_new_addresses::{InitScanAddressesRpcOps, S
ScanAddressesResponse};
use crate::utxo::qtum::{qtum_coin_with_priv_key, QtumCoin, QtumDelegationOps, QtumDelegationRequest};
#[cfg(not(target_arch = "wasm32"))]
use crate::utxo::rpc_clients::{BlockHashOrHeight, NativeUnspent};
use crate::utxo::rpc_clients::{BlockHashOrHeight, ElectrumClientSettings, NativeUnspent};
use crate::utxo::rpc_clients::{ElectrumBalance, ElectrumBlockHeader, ElectrumClient, ElectrumClientImpl,
ElectrumClientSettings, GetAddressInfoRes, ListSinceBlockRes, NativeClient,
NativeClientImpl, NetworkInfo, UtxoRpcClientOps, ValidateAddressRes, VerboseBlock};
GetAddressInfoRes, ListSinceBlockRes, NativeClient, NativeClientImpl, NetworkInfo,
UtxoRpcClientOps, ValidateAddressRes, VerboseBlock};
use crate::utxo::spv::SimplePaymentVerification;
#[cfg(not(target_arch = "wasm32"))]
use crate::utxo::utxo_block_header_storage::{BlockHeaderStorage, SqliteBlockHeadersStorage};
Expand Down Expand Up @@ -43,6 +43,7 @@ use futures::future::{join_all, Either, FutureExt, TryFutureExt};
use hex::FromHex;
use keys::prefixes::*;
use mm2_core::mm_ctx::MmCtxBuilder;
#[cfg(not(target_arch = "wasm32"))]
use mm2_event_stream::StreamingManager;
use mm2_number::bigdecimal::{BigDecimal, Signed};
use mm2_number::MmNumber;
Expand Down
Loading