sowle
|
46a0db21ec
|
Merge branch 'develop' into cryptoassets
# Conflicts:
# CMakeLists.txt
# README.md
# contrib/epee/include/net/http_client.h
# src/currency_core/blockchain_storage.cpp
# src/currency_core/currency_core.cpp
# src/currency_core/currency_format_utils.cpp
# src/gui/qt-daemon/layout
# src/rpc/core_rpc_server.cpp
# src/rpc/core_rpc_server.h
# src/rpc/core_rpc_server_commands_defs.h
# src/version.h.in
# src/wallet/wallet2.cpp
# src/wallet/wallet2.h
# src/wallet/wallet_public_structs_defs.h
# src/wallet/wallet_rpc_server.h
# tests/core_tests/chaingen.cpp
# tests/core_tests/pos_validation.cpp
# tests/core_tests/wallet_tests.cpp
# tests/performance_tests/main.cpp
|
2023-11-01 23:48:36 +01:00 |
|
cryptozoidberg
|
6f4d247715
|
fixed few compilation issues - 3
|
2023-10-31 20:01:31 +01:00 |
|
cryptozoidberg
|
66fbe640ef
|
fixed few compilation issues - 2
|
2023-10-31 19:53:26 +01:00 |
|
cryptozoidberg
|
76577d21a9
|
more fixes with namespaces and inline functions
|
2023-10-31 19:31:18 +01:00 |
|
cryptozoidberg
|
cacdb4a4ce
|
moved serialization-specific adaptor-functions from wallet2 to base header file
|
2023-10-31 19:22:29 +01:00 |
|
cryptozoidberg
|
d1dc240a73
|
added forgoten wallet2_base.h
|
2023-10-31 18:37:58 +01:00 |
|
cryptozoidberg
|
ebb8f7b6ff
|
wallet sync state moved to separate base structure
|
2023-10-31 18:29:57 +01:00 |
|
sowle
|
6343812006
|
mixins support implemented in wallet2::prepare_and_sign_pos_block()
|
2023-10-31 15:45:35 +01:00 |
|
cryptozoidberg
|
65b9619762
|
Merge branch 'cryptoassets' into cake
|
2023-10-31 13:37:37 +01:00 |
|
cryptozoidberg
|
208f50ce64
|
additional changes for cake
|
2023-10-30 19:22:33 +00:00 |
|
cryptozoidberg
|
7a9f54443b
|
fixed bug with m_own_asset_descriptors container not being reset after resync wallet
|
2023-10-28 19:25:31 +02:00 |
|
cryptozoidberg
|
9dd4f107b6
|
Fix compilation issue
|
2023-10-26 14:32:56 +00:00 |
|
cryptozoidberg
|
767dbebe54
|
removed include of deleted file
|
2023-10-26 13:19:06 +00:00 |
|
cryptozoidberg
|
f19acdee4b
|
revoked unneeded changes
|
2023-10-26 12:56:37 +00:00 |
|
sowle
|
bdd9e83418
|
simplewallet's "list_outputs" command and wallet2::get_transfers_str() were improved to support assets
|
2023-10-25 21:34:50 +02:00 |
|
sowle
|
e2da6a1f51
|
wallet: minor fixes
|
2023-10-25 21:32:47 +02:00 |
|
cryptozoidberg
|
54d229f746
|
fixed compilation issues
|
2023-10-25 18:51:53 +00:00 |
|
cryptozoidberg
|
2682a719b0
|
changes related to extend plain api for cake
|
2023-10-25 17:29:12 +00:00 |
|
sowle
|
4a5586efad
|
wallet: fixed creation of redundant zero-amount outputs in ionic-swap transactions
|
2023-10-23 17:12:43 +02:00 |
|
cryptozoidberg
|
0b563cc2b8
|
fixed compilation issue
|
2023-10-20 16:39:43 +00:00 |
|
cryptozoidberg
|
fe77c50e2c
|
few cake-specifik tweaks
|
2023-10-20 16:09:12 +00:00 |
|
cryptozoidberg
|
ccfdb93ae4
|
Merge branch 'cryptoassets' into cake
|
2023-10-20 14:15:41 +00:00 |
|
cryptozoidberg
|
15a2c5f362
|
cake wallet extension
|
2023-10-20 14:14:52 +00:00 |
|
sowle
|
43b41fec3d
|
coretests: check_ionic_swap_tx_outs added, some improvements
|
2023-10-19 14:37:57 +02:00 |
|
cryptozoidberg
|
a60857a801
|
fixed abstract interface against mobile wallet: missing ifdef
|
2023-10-12 22:08:30 +02:00 |
|
cryptozoidberg
|
de3931b199
|
fixed abstract interface against mobile wallet
|
2023-10-12 21:23:47 +02:00 |
|
cryptozoidberg
|
b0f31ebd1b
|
fixes for mobile wallet in zarcanum network
|
2023-10-12 21:09:01 +02:00 |
|
cryptozoidberg
|
71c1ba9377
|
Update wallets_manager.h
Fix for mobile wallet
|
2023-10-12 20:33:11 +02:00 |
|
cryptozoidberg
|
e066257278
|
ionic_swaps: replaced Alice and Bob terms to Initiator and Finalizer
|
2023-10-11 12:28:05 +02:00 |
|
sowle
|
d33cfe7259
|
wallet: improved error handling for accept_ionic_swap_proposal (+ overall error handling for wallet)
|
2023-10-06 20:58:17 +02:00 |
|
cryptozoidberg
|
816022eb9d
|
fixed bug with locking assets for ionic swap
|
2023-10-05 17:16:27 +02:00 |
|
cryptozoidberg
|
bdb5af0490
|
added votes state logging
|
2023-10-05 14:44:27 +02:00 |
|
cryptozoidberg
|
2e4c6df22c
|
fixed bug with voting - again
|
2023-10-05 14:36:22 +02:00 |
|
cryptozoidberg
|
a74420a064
|
removed money lock for ionic swap
|
2023-10-05 14:10:11 +02:00 |
|
cryptozoidberg
|
83e543bcec
|
fixed bug with voting
|
2023-10-05 12:27:04 +02:00 |
|
sowle
|
6bd09626b1
|
code clean-up and ionic_swap_basic_test fixed
|
2023-10-04 18:18:11 +02:00 |
|
cryptozoidberg
|
aedab1e68e
|
implemented governance code in wallet
|
2023-10-04 16:08:48 +02:00 |
|
cryptozoidberg
|
1886fae681
|
implemented governance initial code for wallet/daemon
|
2023-10-03 22:43:51 +02:00 |
|
cryptozoidberg
|
0ede461f25
|
merge from release
|
2023-10-02 15:54:58 +02:00 |
|
cryptozoidberg
|
0716e84529
|
fixes for wallet, implemented proxy-rpc for UI
|
2023-09-29 18:16:19 +02:00 |
|
cryptozoidberg
|
db3489a02b
|
fixed minor bug for ionic swaps
|
2023-09-11 20:35:45 +02:00 |
|
cryptozoidberg
|
80d8e49b2a
|
Implemented fix for the bug related to ionic swaps(non-native coins issue)
|
2023-09-08 19:33:13 +02:00 |
|
cryptozoidberg
|
37e6a68509
|
attempt to fix issue with broken versioning in tx versioned structs
|
2023-09-01 11:59:47 +02:00 |
|
cryptozoidberg
|
22821d3ab0
|
Merge branch 'asset_update' into cryptoassets
|
2023-08-30 21:34:43 +02:00 |
|
cryptozoidberg
|
55a972050a
|
added comands for emmit/burn/update assets
|
2023-08-30 21:33:05 +02:00 |
|
sowle
|
3402da561c
|
Merge branch 'asset_update' into cryptoassets
# Conflicts:
# tests/core_tests/multiassets_test.cpp
|
2023-08-29 14:13:15 +02:00 |
|
sowle
|
0783d3e6f9
|
asset operation code clean up and minor improvements
|
2023-08-29 09:22:45 +02:00 |
|
cryptozoidberg
|
7bfa59fd7e
|
full test for assets operations ready and passes
|
2023-08-25 22:40:20 +02:00 |
|
cryptozoidberg
|
1f11b2af97
|
implemented test for validation ownership of asset_update operation
|
2023-08-24 20:32:50 +02:00 |
|
cryptozoidberg
|
06db8961e7
|
implemented basic code for injection of debug events into wallet multistep opperations
|
2023-08-24 17:57:23 +02:00 |
|