Pablo Greco
b032722e30
Merge branch 'master' into elements-23.2.2-final
2024-07-24 06:28:07 -07:00
Byron Hambly
47d6c34382
discount: fix override for creatediscountct
2024-07-24 09:34:16 +02:00
James Dorfman
c5e8a2be77
Merge pull request #1337 from ElementsProject/master
...
elements-23.x: merge master to prep release
2024-06-14 11:14:47 -04:00
Byron Hambly
eed85dc5df
getblockchaininfo: add trim_headers field
2024-06-05 11:21:16 +02:00
Byron Hambly
4171939b58
test: add trim_headers functional test
...
(cherry picked from commit 630870f21d
2024-05-30 16:02:27 +02:00
Byron Hambly
3ebc35359f
discount: add functional tests
2024-05-14 19:03:37 +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
Pablo Greco
996e71f546
Merge branch 'master' into elem-23.2.1
2023-11-22 05:06:52 -08:00
Byron Hambly
9368fbac1c
test: fix flaky test wallet_groups.py
...
since the SRD coin selection was added, Elements sometimes picks a 1.0
input instead of 0.5 in this test
2023-11-22 08:55:40 +02:00
James Dorfman
48ca8b0f76
test: fix bug in wallet_groups.py functional test that was introduced in merge of bitcoin/bitcoin#22364 in 00f2e32
2023-11-15 20:01:50 +00:00
James Dorfman
ec4c2a4898
test: fix feature_taphash_pegins_issuances.py
...
The first transaction was failing with bad-txns-inputs-missingorspent
because the "input" selected with fundrawtransaction was the
anyonecanspend initialfreecoins.
Fixed by first spending the initialfreecoins to "real" outputs.
2023-11-13 15:33:58 +00:00
Byron Hambly
d215bf7f91
test: fix feature_tapscript_opcodes.py
...
The first transaction from create_taproot_utxo was failing with
bad-txns-inputs-missingorspent because the "input" selected with
fundrawtransaction was the anyonecanspend initialfreecoins.
Fixed by first spending the initialfreecoins to "real" outputs.
2023-11-13 09:06:43 +00:00
James Dorfman
8ccb3e1604
test_runner: re-enable the now-passing 'feature_taproot.py'
2023-11-13 03:17:08 +00:00
James Dorfman
eb24b3eb39
test_runner: re-enable the now-passing 'wallet_basic.py --descriptors'
2023-11-09 06:42:33 +00:00
James Dorfman
06423a6aac
test: remove useless comment from feature_taproot_opcodes
...
The line immediately below the commented out code I removed explicitly
tests the exact behaviour which was being questioned in the comment.
This indicates that the comment was incorrect.
2023-11-09 06:34:34 +00:00
Pablo Greco
4599a5fac3
Merge branch 'master' into elem-23.2.1rc3
2023-10-27 08:39:57 -07: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
e02024e53f
test: add new elements_code_tutorial functional test
2023-10-27 15:23:36 +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
Byron Hambly
d3ffd2a380
test: add functional test for issue #1259
...
Adds a functional test to cover the issue uncovered in #1259 , where
calling fundrawtransaction with many non-policy inputs and no policy
recipients results in an assertion failure and a crash.
Fixed in #1258 .
(cherry picked from commit a8b0ed6f96
2023-10-23 16:43:20 +02:00
James Dorfman
c248983aab
Merge pull request #1276 from delta1/issues-1263
...
fix: segfault on getpeginaddress rpc when not in elements mode
2023-10-18 11:51:06 -04:00
Byron Hambly
181b9e5932
test: reduce sleep time in witness_script_test and bump precision for csv test
2023-10-18 14:09:09 +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
James Dorfman
550563e04b
test: give env more time to settle in signrawtransaction.py
2023-10-17 21:00:59 +00:00
Byron Hambly
67bb197647
test: fix flaky CLTV test in signrawtransaction.py
2023-10-16 13:02:43 +02:00
Pablo Greco
8719509424
Merge branch 'master' into temp-ci-rebased
2023-10-10 09:04:16 -07: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
Byron Hambly
477a871a16
Merge 65c2f787c5 (Bitcoin PR bitcoin/bitcoin#26411 )
2023-09-24 12:20:03 +00:00
James Dorfman
fbb5257424
Merge 313ea18e5e (Bitcoin PR bitcoin/bitcoin#25799 )
2023-09-24 05:26:23 +00:00
James Dorfman
d9f4560cbe
Merge dabac355c8 (Bitcoin PR bitcoin/bitcoin#24843 )
2023-09-24 02:33:09 +00:00
James Dorfman
07d701997b
Merge c243e08351 (Bitcoin PR bitcoin/bitcoin#24512 )
2023-09-24 01:33:13 +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
