James Dorfman
b3a377c2d0
Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661 )
2024-07-08 15:17:32 +00:00
James Dorfman
c326619931
Merge 1021e4cc68 into merged_master (Bitcoin PR bitcoin/bitcoin#24602 )
2024-07-08 07:26:33 +00:00
James Dorfman
ff2a2e72c9
Merge b7d78e6244 into merged_master (Bitcoin PR bitcoin/bitcoin#24711 )
2024-07-08 07:14:19 +00:00
James Dorfman
9616104db4
Merge a2e1590f67 into merged_master (Bitcoin PR bitcoin/bitcoin#24673 )
2024-07-08 06:22:20 +00:00
James Dorfman
7ed4614970
Merge 87dc1dc55f into merged_master (Bitcoin PR bitcoin/bitcoin#24714 )
2024-06-21 20:30:18 +00:00
James Dorfman
22ccf93f29
Adapt sendall RPC to work properly in elements.
...
This fixes errors introduced in the merge of bitcoin/bitcoin#24118 in d5b8d28d07
2024-06-21 20:19:03 +00:00
James Dorfman
d5b8d28d07
Merge f4e5d704f2 into merged_master (Bitcoin PR bitcoin/bitcoin#24118 )
2024-05-24 18:21:12 +00:00
James Dorfman
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
James Dorfman
b45fbd3857
Merge 5f1cc1ad8c into merged_master (Elements PR #1327 )
2024-05-24 15:35:59 +00:00
James Dorfman
58c12df15c
Merge 2d298f7e3f into merged_master (Elements PR #1294 )
2024-05-24 15:17:43 +00:00
James Dorfman
77b849f4c6
Merge 20c5630f8c into merged_master (Elements PR #1277 )
2024-05-24 06:39:06 +00:00
James Dorfman
26a2a9702e
Merge c248983aab into merged_master (Elements PR #1276 )
2024-05-24 05:46:29 +00:00
James Dorfman
4bad776853
Merge 2a3e8fb359 into merged_master (Bitcoin PR bitcoin/bitcoin#24696 )
2024-05-23 21:52:57 +00:00
James Dorfman
4e288c66ce
fix errors from merge of bitcoin/bitcoin#23083
...
Notes:
- bitcoin/bitcoin#23083 increassed how stict the RPC documentation type checks are
- I initially tried fixing all the types -- you can see that work in this commit.
- In the end, I decided there were way too many discrepencies and that it would take
way too long to fix them all. So I just disabled the type check for elements (also in this commit).
2024-05-23 06:33:42 +00:00
Byron Hambly
52962c16c9
discount: allow wallet to create discount txs
2024-05-14 19:03:37 +02:00
Pablo Greco
33a15604e8
getpeginaddress cannot be trusted during ibd, it should fail
2024-04-18 17:41:51 -07:00
James Dorfman
c40e447800
Merge a13946b822 into merged_master (Bitcoin PR bitcoin/bitcoin#23083 )
2024-04-10 16:21:05 +00:00
James Dorfman
641df02a8d
Merge 6d5771ba07 into merged_master (Bitcoin PR bitcoin/bitcoin#24494 )
...
Please review carefully: this touches the wallet code, and I'm not sure
I adapted the new change metrics to work correctly for multi-asset.
2024-04-10 05:12:50 +00:00
James Dorfman
100d6e7c28
Merge f66c827c2d into merged_master (Bitcoin PR bitcoin/bitcoin#24502 )
...
Changed a bech32m address in the wallet_basic test to blech32m (for elements).
Also changed an error message in the wallet to say "blech32m" instead of "bech32m".
2024-04-08 04:17:28 +00:00
James Dorfman
52a17a3490
Merge 6b1f93700c into merged_master (Bitcoin PR bitcoin/bitcoin#24666 )
2024-03-19 22:09:33 +00:00
James Dorfman
17d45cdb7d
Merge 3740cdd125 into merged_master (Bitcoin PR bitcoin/bitcoin#24091 )
2024-03-19 06:35:30 +00:00
James Dorfman
5082ed04fd
Merge 98e9d8e8e2 into merged_master (Bitcoin PR bitcoin/bitcoin#23732 )
2024-01-11 18:05:49 +00:00
James Dorfman
e8e87a7639
Merge cea230eec4 into merged_master (Bitcoin PR bitcoin/bitcoin#24562 )
2024-01-11 17:57:30 +00:00
James Dorfman
cc32b91393
Merge 3ab96f2945 into merged_master (Bitcoin PR bitcoin/bitcoin#24560 )
2024-01-11 16:36:11 +00:00
Pablo Greco
d66c283f06
Remove constrains on liquidv1 pegout bitcoin descriptor
2023-11-22 09:57:12 -08:00
Pablo Greco
20c5630f8c
Merge pull request #1277 from delta1/issues-1259
...
fix: assert failure on non-policy asset consolidation in CreateTransactionInternal
2023-10-27 12:38:05 -03:00
James Dorfman
39be0f0925
wallet: fix tx credit calculation issues introduced in merge of bitcoin/bitcoin#22100 in 3e939cca and 103069c4
2023-10-27 15:23:19 +00:00
James Dorfman
04cba29faf
coinselection: fail KnapsackSolver if the policy asset doesn't have a solution
2023-10-23 15:55:03 +00:00
James Dorfman
5b72ae23af
coinselection: fail if each non-policy asset doesn't have a solution
2023-10-23 16:51:09 +02:00
goatpig
2e7125c3c8
fix: assert failure on non-policy asset consolidation in CreateTransactionInternal
...
Squash of 2 commits from https://github.com/ElementsProject/elements/pull/1258
- correct application of non_policy_effective_value to policy output in KnapsackSolver
- replace bad fee amount assert with error log and graceful failure in CWallet::CreateTransactionInternal
(cherry picked from commit 0f92a38254cf0f56107b
2023-10-18 16:30:41 +02:00
Byron Hambly
5326676ff3
fix: segfault on getpeginaddress rpc when not in elements mode
...
Fixes https://github.com/ElementsProject/elements/issues/1263
When not running in Elements mode, GetValidFedpegScripts returns an
empty vector. Subsequently `calculate_contract` is called with
`fedpegscripts.front().second` which is a null reference. This reference
is passed into `MatchLiquidWatchman` which tries to dereference the null
reference and causes a segfault.
This fix throws an exception in `getpeginaddress` if fedpegscripts is
empty, returning an error to the RPC caller. It also adds a functional
regression test.
2023-10-18 13:02:51 +02:00
Byron Hambly
93ade4baa3
Merge e66630cc87 into merged_master (Bitcoin PR bitcoin/bitcoin#13226 )
2023-10-16 13:12:42 +00:00
Byron Hambly
8a8b029f97
Merge b8992f2d4a into merged_master (Bitcoin PR bitcoin/bitcoin#24592 )
2023-10-16 08:57:05 +00:00
James Dorfman
3f110a3fe4
Merge 28bdaa3f76 into merged_master (Bitcoin PR bitcoin/bitcoin#24080 )
2023-10-15 22:22:18 +00:00
James Dorfman
f3ee905625
Merge e0881aa5f0 into merged_master (Bitcoin PR bitcoin/bitcoin#24505 )
2023-10-15 21:39:09 +00:00
Byron Hambly
40e776c576
Merge c109e7d51c into merged_master (Bitcoin PR bitcoin/bitcoin#24530 )
2023-10-14 17:11:39 +00:00
Byron Hambly
a1e559fe38
Merge a81717443f into merged_master (Bitcoin PR bitcoin/bitcoin#24453 )
2023-10-14 16:43:10 +00:00
Byron Hambly
2375fc7d0e
Merge 4f5d3ce5a0 into merged_master (Bitcoin PR bitcoin/bitcoin#24486 )
2023-10-14 12:00:47 +00:00
Byron Hambly
1c43dde820
Merge 9d22dbe2e1 into merged_master (Bitcoin PR bitcoin/bitcoin#24198 )
2023-10-13 13:20:16 +00:00
Byron Hambly
b7ad3576f5
Merge 5e49b2a252 into merged_master (Bitcoin PR bitcoin/bitcoin#24050 )
2023-10-13 12:02:55 +00:00
Byron Hambly
99ed6e1bee
msvc secp modules
2023-10-09 21:17:40 +00:00
Byron Hambly
0c2fbefe98
add missing 'complete' bool to psbt_updater_test
2023-10-09 21:17:00 +00:00
Byron Hambly
3eaccae830
lint: fix codespell warnings
2023-09-27 15:56:20 +02:00
James Dorfman
0497d1f894
build: fix additional ASAN issues in CI
2023-09-07 05:07:50 +00:00
James Dorfman
8783a30631
build: fix further ASAN issues in CI
2023-09-06 15:03:51 +02:00
Byron Hambly
860b2c3e4b
fix: move BlindDetails and IssuanceDetails to wallet.h
...
resolves the newly introduced circular dependencies correctly
2023-09-05 14:38:03 +02:00
Byron Hambly
4671addbe0
build: fix forward declaration of CRecipient
2023-09-01 18:13:19 +02:00
Pablo Greco
3dfd7a4e9f
Linter fixes
2023-08-31 14:47:07 -07:00
James Dorfman
d457ef7dbe
Merge 6802564be5 into merged_master (Elements PR #1246 )
2023-08-29 04:21:31 +00:00
Byron Hambly
b958e586ef
Fix for calling GetAmount on potentially blinded output
...
Introduced in 103069c46cbitcoin/bitcoin#22100
2023-08-08 14:11:12 +02:00
