James Dorfman
7bbef5bbb1
Merge 9745e18051 into merged_master (Bitcoin PR bitcoin/bitcoin#24670 )
2024-04-04 21:36:11 +00:00
James Dorfman
363d930f8e
Merge 9344697e57 into merged_master (Bitcoin PR bitcoin/bitcoin#21160 )
2024-03-19 20:07:00 +00:00
James Dorfman
087b2f13f4
Merge 7c08d81e11 into merged_master (Bitcoin PR bitcoin/bitcoin#23536 )
2024-03-19 19:58:32 +00:00
James Dorfman
17d45cdb7d
Merge 3740cdd125 into merged_master (Bitcoin PR bitcoin/bitcoin#24091 )
2024-03-19 06:35:30 +00:00
Byron Hambly
b9f9528b7c
Merge f0c9ba2b48 into merged_master (Bitcoin PR bitcoin/bitcoin#24205 )
2024-02-02 14:57:29 +02:00
Byron Hambly
cd652e5472
Merge a697a3fc91 into merged_master (Bitcoin PR bitcoin/bitcoin#24653 )
2024-02-02 14:50:04 +02:00
Byron Hambly
7629e72362
Merge 4a0ab355b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24626 )
2024-02-02 11:54:04 +02:00
James Dorfman
2aef7af5b6
Merge 26d98d51f2 into merged_master (Bitcoin PR bitcoin/bitcoin#24574 )
2024-01-17 21:09:55 +00:00
James Dorfman
c3629a2443
Merge 864fb89b2f into merged_master (Bitcoin PR bitcoin/bitcoin#24637 )
2024-01-17 21:00:59 +00:00
James Dorfman
92481c3833
Merge 8234cdaf62 into merged_master (Bitcoin PR bitcoin/bitcoin#24587 )
2024-01-17 01:39:36 +00:00
James Dorfman
127a28e813
Merge ce05f838f1 into merged_master (Bitcoin PR bitcoin/bitcoin#24635 )
2024-01-11 17:38:16 +00:00
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
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
c2c7d08de6
lint: add new circular dep to lint-circular-dependencies.sh
2023-09-01 16:38:38 +02:00
Byron Hambly
b59e244da3
lint: fix issues from lint-python.sh
2023-09-01 16:04:39 +02:00
Pablo Greco
3dfd7a4e9f
Linter fixes
2023-08-31 14:47:07 -07:00
James Dorfman
0b913592b2
Merge f20016d1ab into merged_master (Elements PR #1252 )
2023-08-29 04:36:30 +00: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
Byron Hambly
d9e021486f
lint: fix codespell lint issues
2023-07-28 12:07:19 +02:00
Byron Hambly
dcb3a05a44
lint: exclude src/secp256k1 from lint-python-utf8-encoding.sh
...
It doesn't make sense to use this upstream linter for secp256k1-zkp.
Currently this only affects musig2-vectors.py.
2023-07-28 11:59:15 +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
