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
d1b8d682f2
Merge 7ff33d45df into merged_master (Elements PR #1330 )
2024-05-24 16:13:43 +00:00
James Dorfman
b45fbd3857
Merge 5f1cc1ad8c into merged_master (Elements PR #1327 )
2024-05-24 15:35:59 +00:00
James Dorfman
05aec5204c
Merge 99e502f90c into merged_master (Elements PR #1324 )
2024-05-24 15:27:04 +00:00
James Dorfman
58c12df15c
Merge 2d298f7e3f into merged_master (Elements PR #1294 )
2024-05-24 15:17:43 +00:00
James Dorfman
51ce17b418
Merge 1b65d4d37b into merged_master (Elements PR #1284 )
2024-05-24 07:10:54 +00:00
James Dorfman
dbbde2d123
Merge df8e57296c into merged_master (Elements PR ElementsProject/elements#1286 )
2024-05-24 06:48:04 +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
44228c4194
Merge e14d987438 into merged_master (Elements PR #1275 )
2024-05-24 05:37:54 +00:00
James Dorfman
44d5a65bb0
Merge 171f6f2699 into merged_master (Bitcoin PR bitcoin/bitcoin#24374 )
2024-05-24 00:57:01 +00:00
James Dorfman
f1169e127f
Merge 50c806f001 into merged_master (Bitcoin PR bitcoin/bitcoin#24693 )
2024-05-24 00:48:46 +00:00
James Dorfman
19d9a7665c
Merge f9aedbc300 into merged_master (Bitcoin PR bitcoin/bitcoin#24690 )
2024-05-24 00:40:33 +00:00
James Dorfman
9d2e5152cd
Merge bdbabc50ba into merged_master (Bitcoin PR bitcoin/bitcoin#24561 )
2024-05-24 00:32:01 +00:00
James Dorfman
ac86a73322
Merge 896beca831 into merged_master (Bitcoin PR bitcoin/bitcoin#24708 )
2024-05-24 00:23:32 +00:00
James Dorfman
125e6630d8
Merge f4fba57829 into merged_master (Bitcoin PR bitcoin/bitcoin#24704 )
2024-05-24 00:02:31 +00:00
James Dorfman
e860ace1e4
Merge f089a0802c into merged_master (Bitcoin PR bitcoin/bitcoin#24692 )
2024-05-23 23:51:34 +00:00
James Dorfman
b79e206599
Merge ecf692b466 into merged_master (Bitcoin PR bitcoin/bitcoin#24540 )
2024-05-23 22:28:14 +00:00
James Dorfman
331c0eb2af
Merge 9e32adbb5c into merged_master (Bitcoin PR bitcoin/bitcoin#24523 )
2024-05-23 22:19:51 +00:00
James Dorfman
5840c0dbe8
Merge 565aac2e6f into merged_master (Bitcoin PR bitcoin/bitcoin#24705 )
2024-05-23 22:11:45 +00:00
James Dorfman
15a4dce6a5
Merge 7c72eabb57 into merged_master (Bitcoin PR bitcoin/bitcoin#24633 )
2024-05-23 22:03:11 +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
Pablo Greco
a4d7ac7bbe
Merge pull request #1317 from delta1/ct-fees-discount
...
feat: discounted fees for confidential transactions
2024-05-14 11:05:57 -07:00
Byron Hambly
3ebc35359f
discount: add functional tests
2024-05-14 19:03:37 +02:00
Byron Hambly
52962c16c9
discount: allow wallet to create discount txs
2024-05-14 19:03:37 +02:00
Byron Hambly
4807f3ef1f
discount: change miner tx ordering
2024-05-14 19:03:37 +02:00
Byron Hambly
c85f0d4fda
discount: implement net processing
2024-05-14 19:03:36 +02:00
Byron Hambly
b7b2288a74
discount: implement mempool logic
2024-05-14 19:03:36 +02:00
Byron Hambly
9cbd3e0f05
discount: add policy/discount.h
2024-05-14 19:03:36 +02:00
Byron Hambly
c1661b251a
discount: introduce config args
2024-05-14 19:03:17 +02:00
Byron Hambly
7ff33d45df
Merge pull request #1330 from delta1/test-fix-getpeginaddress
...
test: fix tests broken by change to getpeginaddress
2024-05-07 09:47:54 +02:00
Byron Hambly
98c8e4f387
test: fix tests broken by change to getpeginaddress
...
Fixes 2 functional tests failing since PR #1327 changes getpeginaddress
to only be valid when IsInitialBlockDownload is false
2024-05-06 14:21:44 +02:00
Byron Hambly
5f1cc1ad8c
Merge pull request #1327 from psgreco/master-nopegin-ibd
...
getpeginaddress cannot be trusted during ibd, it should fail
2024-04-19 17:17:15 +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
14e2bc8e34
Merge 56c4ac55f6 into merged_master (Bitcoin PR bitcoin/bitcoin#24691 )
2024-04-10 16:12:55 +00:00
James Dorfman
3a37a8cbb5
Merge 3297f5c11c into merged_master (Bitcoin PR bitcoin/bitcoin#24623 )
2024-04-10 16:04:47 +00:00
James Dorfman
c44ed1ba6b
Merge 161dd7e864 into merged_master (Bitcoin PR bitcoin/bitcoin#24687 )
2024-04-10 06:49:17 +00:00
James Dorfman
f5d5d7a98e
Merge dc0ba8ce9f into merged_master (Bitcoin PR bitcoin/bitcoin#24659 )
2024-04-10 06:40:36 +00:00
James Dorfman
4a0070731e
Merge 88709e9dc5 into merged_master (Bitcoin PR bitcoin/bitcoin#24258 )
2024-04-10 06:32:39 +00:00
James Dorfman
09b290ad91
Merge 3d2f24bb38 into merged_master (Bitcoin PR bitcoin/bitcoin#24656 )
2024-04-10 06:24:27 +00:00
James Dorfman
c5ad188893
Merge 2f0f056e08 into merged_master (Bitcoin PR bitcoin/bitcoin#24665 )
2024-04-10 05:22:49 +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
7bbef5bbb1
Merge 9745e18051 into merged_master (Bitcoin PR bitcoin/bitcoin#24670 )
2024-04-04 21:36:11 +00:00
Byron Hambly
99e502f90c
Merge pull request #1324 from xiaoxianBoy/fix-typos
...
chore: fix typos
2024-04-02 09:33:44 +02:00
snoppy
605acb0a40
chore: fix typos
2024-03-31 23:07:05 +08:00
