James Dorfman
0ea088b896
Merge b8f498f80d into merged_master (Bitcoin PR bitcoin/bitcoin#24535 )
2024-01-08 19:52:28 +00:00
James Dorfman
aa80572b01
Merge e3206c9445 into merged_master (Bitcoin PR bitcoin/bitcoin#24605 )
...
Please review my changes in test/functional/test_framework/wallet.py.
Confirm that my change of the return value from 1 --> 2 was correct.
That fixed a failing test. I think it's needed because in elements we
have an extra fee output.
2024-01-08 19:45:18 +00:00
Byron Hambly
13a3eadcc0
Merge 66e2d21ef2 into merged_master (Bitcoin PR bitcoin/bitcoin#24578 )
2023-10-16 11:55:39 +00:00
James Dorfman
8715ef526d
Merge 7b83c7d609 into merged_master (Bitcoin PR bitcoin/bitcoin#24510 )
2023-10-15 23:34:23 +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
b7467fc044
Merge e04720ec33 into merged_master (Bitcoin PR bitcoin/bitcoin#24528 )
2023-10-15 13:33:48 +00:00
Byron Hambly
53d81644ad
Merge f94784f5bc into merged_master (Bitcoin PR bitcoin/bitcoin#24533 )
2023-10-15 11:49:10 +00:00
Byron Hambly
4c573ba511
Merge 23e8c702bc into merged_master (Bitcoin PR bitcoin/bitcoin#24421 )
2023-10-14 16:21:34 +00:00
Byron Hambly
ea4ad0dddc
Merge aa83bbb1fe into merged_master (Bitcoin PR bitcoin/bitcoin#24490 )
2023-10-13 13:56:53 +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
00daba20d1
Merge b07fdd7f9e into merged_master (Bitcoin PR bitcoin/bitcoin#24312 )
2023-10-13 12:40:53 +00:00
Byron Hambly
35dc3274d6
Merge 64a4483dc6 into merged_master (Bitcoin PR bitcoin/bitcoin#24496 )
2023-10-13 12:32:40 +00:00
Byron Hambly
45f83fd396
Merge bada9636d7 into merged_master (Bitcoin PR bitcoin/bitcoin#24043 )
2023-10-13 07:53:59 +00:00
Byron Hambly
4d825cd58d
test: specify legacy wallet for failing functional tests on macos13
...
In the "macOS 13 native arm64 [gui, sqlite only]" CI task, the
test_runner defaults to descriptor wallets, causing some Elements
specific tests to fail.
This commit explicitly runs those tests with `--legacy-wallet`.
2023-10-09 20:32:28 +00:00
James Dorfman
dabea18f29
rpc: fix bug in 'utxo_size_inc' calculation
2023-09-13 09:27:52 +02:00
Byron Hambly
3ead0ce841
test: fix node_fastmerkle exception in interface_zmq.py
2023-09-08 09:57:28 +02:00
Byron Hambly
b59e244da3
lint: fix issues from lint-python.sh
2023-09-01 16:04:39 +02:00
James Dorfman
d457ef7dbe
Merge 6802564be5 into merged_master (Elements PR #1246 )
2023-08-29 04:21:31 +00:00
James Dorfman
bb30fa363d
Fix feature_taproot functional test which has been failing since
...
the merge of bitcoin/bitcoin#23394 in 1beaa601b4
2023-08-11 16:39:14 +00:00
James Dorfman
1c5469b60c
Re-activate assertion which was disabled in the merge of bitcoin/bitcoin#23371 in 2110cca
...
A subsequent commit appears to have fixed that assertion. It works now.
2023-08-01 10:28:20 +02:00
James Dorfman
c1b2582a0b
Add elements-specific descriptions to assertions commented out in the merge of bitcoin/bitcoin#23201 in 7d759da52a
2023-08-01 10:28:19 +02:00
James Dorfman
8b21677a65
Add back comment which was deleted in the merge of bitcoin/bitcoin#23789 in fa3c0f4eaa
2023-07-24 17:50:33 +00:00
James Dorfman
b6f5c2de90
Add more detail to FIXME comment introduced in the merge of bitcoin/bitcoin#22019 in e3ab195851
2023-07-24 17:50:33 +00:00
James Dorfman
e815e6ad8c
Rename 'bitcoin-cli' -> 'elements-cli' in logging change introduced in the merge of bitcoin/bitcoin#23712 in 4c0504b349
2023-07-24 17:50:33 +00:00
James Dorfman
bbfdbf732c
Remove extraneous sync in rpc_signrawtransaction functional test
...
which should have been removed in the merge of bitcoin/bitcoin#23474 in bd68371fb6
2023-07-21 02:23:18 +00:00
James Dorfman
654752a8b3
Fix typos left over from the merge of bitcoin/bitcoin#23207 in f80332fee5
2023-07-21 01:39:36 +00:00
Byron Hambly
49c3ea309e
fix: getnewaddress - don't blind bech32 addresses
...
fixes #1245
2023-07-19 12:40:22 +02:00
Byron Hambly
8dbf577aaa
Merge cfc10a5dd6 into merged_master (Elements PR #1232 )
2023-07-03 13:48:57 +00:00
Byron Hambly
5e994b4aa6
Merge 1443d302ae into merged_master (Elements PR #1231 )
2023-07-03 12:27:53 +00:00
Byron Hambly
6f90a02548
Merge 30308cc380 into merged_master (Bitcoin PR bitcoin/bitcoin#20196 )
2023-07-03 11:17:52 +00:00
Byron Hambly
7a7253639a
Merge 267917f563 into merged_master (Bitcoin PR bitcoin/bitcoin#23304 )
2023-07-03 10:06:51 +00:00
Byron Hambly
7d91422a87
Merge 848b11615b into merged_master (Bitcoin PR bitcoin/bitcoin#22834 )
2023-07-03 09:33:46 +00:00
Byron Hambly
7e989c64b3
Merge 159f89c118 into merged_master (Bitcoin PR bitcoin/bitcoin#24365 )
2023-07-02 17:03:39 +00:00
Byron Hambly
b2b09ea422
Merge c7da61dcc3 into merged_master (Bitcoin PR bitcoin/bitcoin#24403 )
2023-07-02 16:55:32 +00:00
Byron Hambly
8211047b9c
Merge b00b60ed4f into merged_master (Bitcoin PR bitcoin/bitcoin#24201 )
2023-07-02 15:50:25 +00:00
Byron Hambly
1223ba95ca
Merge f1ce67f09f into merged_master (Bitcoin PR bitcoin/bitcoin#19013 )
2023-07-02 15:42:51 +00:00
Byron Hambly
b80c04e05a
Merge 358fe779cb into merged_master (Bitcoin PR bitcoin/bitcoin#24381 )
2023-07-02 14:47:05 +00:00
Byron Hambly
0e89b30f95
Merge 8add59d77d into merged_master (Bitcoin PR bitcoin/bitcoin#24367 )
2023-07-02 07:33:56 +00:00
Byron Hambly
ca0735a437
Merge 003523d239 into merged_master (Bitcoin PR bitcoin/bitcoin#24338 )
2023-06-30 20:58:14 +00:00
Byron Hambly
b6546f3091
Merge 1e8aa02ec5 into merged_master (Bitcoin PR bitcoin/bitcoin#24117 )
2023-06-30 17:42:41 +00:00
Byron Hambly
d2ee0b0b61
Merge 7164e00e1b into merged_master (Bitcoin PR bitcoin/bitcoin#24324 )
2023-06-30 17:34:42 +00:00
Byron Hambly
71acfa3da7
Merge 6b8e4977b8 into merged_master (Bitcoin PR bitcoin/bitcoin#24342 )
2023-06-30 17:03:39 +00:00
Byron Hambly
db3167a06b
Merge 2d7ea201fc into merged_master (Bitcoin PR bitcoin/bitcoin#24307 )
2023-06-30 12:57:14 +00:00
Byron Hambly
8719928e6e
Merge 87b5b002ad into merged_master (Bitcoin PR bitcoin/bitcoin#24259 )
2023-06-30 10:09:37 +00:00
Byron Hambly
900cf5f60d
Merge eca694a4e7 into merged_master (Bitcoin PR bitcoin/bitcoin#24239 )
2023-06-30 10:01:50 +00:00
Byron Hambly
2aa75b6d6d
Merge 9392e1350c into merged_master (Bitcoin PR bitcoin/bitcoin#24195 )
2023-06-30 09:45:52 +00:00
Byron Hambly
4988afcbc2
Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744 )
2023-06-30 07:38:29 +00:00
Byron Hambly
fe699e1423
Merge a41976ab77 into merged_master (Bitcoin PR bitcoin/bitcoin#24223 )
2023-06-30 06:22:27 +00:00
Byron Hambly
999b6ac80b
Merge 02e1d8d06f into merged_master (Bitcoin PR bitcoin/bitcoin#24083 )
2023-06-30 06:11:44 +00:00
Byron Hambly
687f3b8fcd
Merge 8f137e69ca into merged_master (Bitcoin PR bitcoin/bitcoin#24192 )
2023-06-29 14:39:34 +00:00
