Commit Graph

11682 Commits

Author SHA1 Message Date
DiosDelRayo 9e42096333
Merge remote-tracking branch 'origin' into monerogui-otsur 2024-11-21 13:36:35 -06:00
DiosDelRayo c399de283f
https://github.com/monero-project/monero/pull/9492#pullrequestreview-2358265221 2024-11-21 13:26:39 -06:00
DiosDelRayo bc76da9a93
https://github.com/monero-project/monero/pull/9492#pullrequestreview-2358265221 2024-11-20 10:03:51 -06:00
DiosDelRayo 744bf8d9e1
https://github.com/monero-project/monero/pull/9492#pullrequestreview-2358265221 2024-11-20 09:07:21 -06:00
DiosDelRayo 23d893473e
https://github.com/monero-project/monero/pull/9492#pullrequestreview-2358265221 2024-11-20 08:47:52 -06:00
DiosDelRayo 2bc362d9e6
Modifications to enable Offline Signing in monero-gui and possible other projects via UR or other mediums of exchange.
Added the following signatures in the mention files:

       wallet/wallet2.h
       +    std::string export_key_images_string(bool all = false) const;
       +    uint64_t import_key_images_string(const std::string &data, uint64_t &spent, uint64_t &unspent);
       M    bool wallet2::export_key_images(const std::string &filename, bool all) const

       wallet/api/pending_transaction.h
       +    std::string commit_string() override;

       wallet/api/unsigned_transaction.h
       +    std::string signAsString() override;

       wallet/api/wallet.h:
       +    bool submitTransactionFromString(const std::string &fileName) override;
       +    virtual UnsignedTransaction * loadUnsignedTxFromString(const std::string &unsigned_filename) override;
       +    std::string exportKeyImagesAsString(bool all = false) override;
       +    bool importKeyImagesFromString(const std::string &data) override;
       +    std::string exportOutputsAsString(bool all = false) override;
       +    bool importOutputsFromString(const std::string &data) override;

       wallet/api/wallet2_api.h
       +    virtual std::string commit_string() = 0;
       +    virtual std::string signAsString() = 0;
       +    virtual UnsignedTransaction * loadUnsignedTxFromString(const std::string &unsigned_filename) = 0;
       +    virtual bool submitTransactionFromString(const std::string &fileName) = 0;
       +    virtual bool importKeyImagesFromString(const std::string &data) = 0;
       +    virtual std::string exportOutputsAsString(bool all = false) = 0;
       +    virtual bool importOutputsFromString(const std::string &data) = 0;
       +    uint64_t import_key_images_string(const std::string &data, uint64_t &spent, uint64_t &unspent);

       And the implementations in:

       wallet/wallet2.cpp
       wallet/api/pending_transaction.cpp
       wallet/api/unsigned_transaction.cpp
       wallet/api/wallet.cpp

       The method `bool wallet2::export_key_images(const std::string &filename, bool all) const` is modified to
       use `std::string export_key_images_string(bool all = false) const;` to get the string to write to the file.
       IMO that would be the perfect way to do it everywhere, but in the other methods it would require more modifications, so the other I duplicated and removed the part writing to the file and return instead a std::string, or
       use a std::string for the actual payload instead of a file path.

       One thing to mention is I remove in one or two log messages the filename, and the other is in `export_key_images` probably(almost sure) is now the performance messed up.

       This modifications was done to get all the necessary data for offline signing via UR or any other channel not
       using files as medium. IMO it had been better to not implement the filehandling direct in wallet2 or in the wallet api but rather in monero-wallet-cli and monero-gui itself, but it is like it is.
2024-09-27 01:46:32 -06:00
who asks? 25b09501e3 remove whitespace 2024-08-20 23:32:13 -06:00
who asks? e2fe45d480 manual merge 2024-08-20 23:29:01 -06:00
who asks? 5e7c234462 .gitignore 2024-08-20 22:16:05 -06:00
luigi1111 a1dc85c537
Merge pull request #9416
ac0af73 rpc: add cumul weight field to block template resp (jeffro256)
2024-08-14 14:19:03 -04:00
luigi1111 65cc1f133b
Merge pull request #9287
59cddbb serialization: support passing extra args to fields in DSL (jeffro256) b2c59c4 common: add va_args.h (jeffro256)
2024-08-14 14:17:56 -04:00
jeffro256 59cddbb9ca
serialization: support passing extra args to fields in DSL
This PR is upstreaming changes in the Seraphis lib here: https://github.com/UkoeHB/monero/pull/39. The changes to the serialization header allow clean passing
of extra arguments to field serialization in the DSL. This is used mainly to pass implied sizes of containers during deserialization to make the format more
compact. For example, if my object has two containers A & B which must be the same size, I can serialize only the size of container A. Then, during
deserialization, when I deserialize A, I can then use A's size to deserialize B.

Depends on #9286.
2024-08-13 12:05:24 -05:00
jeffro256 b2c59c498c
common: add va_args.h
This PR is upstreaming changes in the Seraphis lib here: https://github.com/UkoeHB/monero/pull/39. This header adds a macro `VA_ARGS_COMMAPREFIX`
which, when passed `__VA_ARGS__`, expands to `, __VA_ARGS__` unless the length of `__VA_ARGS__` is 0, in which case it expands to nothing. This
macro is useful for passing/declaring optional function arguments.
2024-08-13 12:02:45 -05:00
luigi1111 0db9e74223
Merge pull request #9429
bd2b226 device: add ledger flex support (tobtoht)
2024-08-13 12:29:47 -04:00
luigi1111 28788bc031
Merge pull request #9425
fc0a4b4 Make wallet2::estimate_fee static (Lee Clagett)
2024-08-13 12:18:24 -04:00
luigi1111 4bb00420cc
Merge pull request #9423
aaeffb7 rpc: remove COMMAND_RPC_FAST_EXIT (hinto.janai)
2024-08-13 12:17:46 -04:00
luigi1111 fdc238ef59
Merge pull request #9421
bf74f89 monerod.service: use network-online.target Wait for network to be online before starting (Jared Monger)
2024-08-13 12:17:03 -04:00
luigi1111 dad4357f7a
Merge pull request #9414
3216165 src: update checkpoints to match v0.18.3.4 (again) (selsta)
2024-08-13 12:16:29 -04:00
luigi1111 93d6e0964e
Merge pull request #9384
88afcdb Fix ZMQ DaemonInfo: (Lee *!* Clagett)
2024-08-13 12:15:28 -04:00
luigi1111 1d4030937e
Merge pull request #9357
802d643 Update depends.yml (preland)
2024-08-13 12:14:30 -04:00
tobtoht bd2b226572
device: add ledger flex support
See: bd1b09970f/libs/ledgerjs/packages/devices/src/index.ts (L111)
2024-08-09 10:31:16 +02:00
Lee Clagett fc0a4b4b04 Make wallet2::estimate_fee static 2024-08-07 13:47:31 -04:00
hinto.janai aaeffb7c93
rpc: remove `COMMAND_RPC_FAST_EXIT` 2024-08-05 20:21:29 -04:00
Jared Monger bf74f89ea6
monerod.service: use network-online.target
Wait for network to be online before starting
2024-08-04 05:52:59 -05:00
jeffro256 ac0af73222
rpc: add cumul weight field to block template resp
Resolves #9415
2024-08-01 01:03:41 -05:00
selsta 3216165822
src: update checkpoints to match v0.18.3.4 (again) 2024-07-31 18:14:23 +02:00
who asks? 75c14c8b45 final modifications to adding endpoints import_encrypted_key_images and export_encrypted_key_images 2024-07-18 21:18:56 -06:00
who asks? c5822d77ce more debug code 2024-07-18 19:02:08 -06:00
who asks? 26913952a6 more debug code 2024-07-18 18:38:54 -06:00
who asks? 67e634e734 more debug code 2024-07-18 18:35:15 -06:00
who asks? 5722f42423 change back and add debug code 2024-07-18 17:51:10 -06:00
who asks? d2e3cff9f5 change to hex_to_pod 2024-07-18 17:28:04 -06:00
who asks? 9b6499ccaf fix / 2024-07-18 15:50:35 -06:00
who asks? 86ba8e2776 fix / 2024-07-18 15:48:20 -06:00
who asks? 54dab2e121 add magic 2024-07-18 15:36:57 -06:00
who asks? 418adb7857 add endpoints: export_encrypted_key_images and import_encrypted_key_images 2024-07-17 20:09:55 -06:00
luigi1111 caa62bc9ea
Merge pull request #9392
b894042 epee: fix mlog filename compare bug. (0xFFFC0000)
2024-07-16 19:02:24 -04:00
luigi1111 3b53db47cf
Merge pull request #9386
1d024f0 chore: fix some comments (haouvw)
2024-07-16 19:01:09 -04:00
luigi1111 330212888a
Merge pull request #9383
9f83e74 Daemon RPC: /getblocks.bin return chain's top_block_hash in resp (j-berman)
2024-07-16 19:00:39 -04:00
luigi1111 4ed5bc5436
Merge pull request #9382
356829a Daemon RPC: high_height_ok req boolean field /getblocks.bin (j-berman)
2024-07-16 19:00:06 -04:00
luigi1111 8dbbc47804
Merge pull request #9379
6c28bdb wallet2: move get_rpc_status func to RPC server definition file (j-berman)
2024-07-16 18:58:08 -04:00
luigi1111 cfd7f5222d
Merge pull request #9370
9fc48f4 Fix ZMQ Tx Pruning (Lee Clagett)
2024-07-16 18:56:44 -04:00
luigi1111 66c5917876
Merge pull request #9353
32f3245 cryptonote_protocol: prevent duplicate txs in fluff queue (0xFFFC0000)
2024-07-16 18:51:30 -04:00
luigi1111 c830fc05d8
Merge pull request #9349
9817293 workflows: don't hardcode repo name (selsta)
2024-07-16 18:50:40 -04:00
luigi1111 e3cfaed278
Merge pull request #9346
0fad1a8 src: update checkpoints to match v0.18.3.4 (selsta)
2024-07-16 18:49:44 -04:00
luigi1111 c2fceb2939
Merge pull request #9344
a026d5a wallet2: validate fetched block height and parent hash (Oscar Mira)
c634c26 wallet2: use start_height consistently as const in process_parsed_blocks (Oscar Mira)
2024-07-16 18:48:43 -04:00
luigi1111 baf6df06c2
Merge pull request #9343
302fa9b wallet: fetch pool txs in pruned form (jeffro256)
2024-07-16 18:46:04 -04:00
luigi1111 b02bf31b83
Merge pull request #9342
b07a97c epee: partially revert c56ee140 to fix linking errors (jeffro256)
2024-07-16 18:44:04 -04:00
luigi1111 040bccc22f
Merge pull request #9338
4a376d6 copyright: fix vector.h typo (hinto.janaiyo)
d61e8e9 workflows: delete copyright.yml (plowsof)
341771a copyright: bump to 2024 (copyCat)
2024-07-16 18:42:49 -04:00
luigi1111 2a6b6ea0f2
Merge pull request #9326
004ead1 gpg_keys: renew jeffro256 (jeffro256)
2024-07-16 18:41:57 -04:00