Skip to content

Prepare 23.2.6 final #1394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Feb 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1c871c8
interpreter: fix use-after-free in Simplicity init code
apoelstra Jan 20, 2025
b1b4e6d
Sanitize libsimplicity
apoelstra Jan 20, 2025
3b60583
Squashed 'src/simplicity/' changes from 86ac0f92c4..c2d4c3d07b
roconnor-blockstream Jan 31, 2025
7fc5466
Merge commit '3b60583dd2c4ffe8e341a65f6115bae2c031f83f' into simplicity
roconnor-blockstream Jan 31, 2025
31d9477
Update to latest Simplicity
roconnor-blockstream Jan 31, 2025
00399aa
Enable coverage for simplicity/secp256k1
roconnor-blockstream Feb 4, 2025
368010a
Merge pull request #1390 from ElementsProject/simplicity
delta1 Feb 6, 2025
a3b7e71
transaction: refuse to deserialize TxOuts with null values
apoelstra Jan 26, 2025
ff6482f
fuzz: add SelectParams to rbf.cpp
apoelstra Jan 26, 2025
74cae2d
CI: use default wallet name in wallet_elements_21million
psgreco Jan 28, 2025
1ecd582
CI: wallet_elements_regression_1263 uses getpeginaddress, disable for…
psgreco Jan 28, 2025
6991cf7
CI: trim_headers test uses combineblocksigs, disable for descriptor w…
psgreco Jan 28, 2025
e3c318b
CI: discounttests use initialfreecoins, disable for descriptor wallets
psgreco Jan 28, 2025
8780810
CI: feature_taphash_pegins_issuances test uses initialfreecoins, disa…
psgreco Jan 28, 2025
a33ceac
CI: feature_tapscript_opcodes test uses initialfreecoins, disable for…
psgreco Jan 28, 2025
e6aa6e7
CI: example_elements_code_tutorial test test uses initialfreecoins, d…
psgreco Jan 28, 2025
72a5e41
Merge pull request #1391 from apoelstra/2025-02--misc-fuzz-fixes
delta1 Feb 7, 2025
29cf7c2
Merge pull request #1392 from psgreco/master-fixfunctional
delta1 Feb 7, 2025
e727ea5
Revert "Merge pull request #1390 from ElementsProject/simplicity"
psgreco Feb 9, 2025
acbb8b5
Revert "Merge pull request #1391 from apoelstra/2025-02--misc-fuzz-fi…
psgreco Feb 9, 2025
5823edd
Merge branch 'master-nosimplicity' into elem-23.2.6-final
psgreco Feb 9, 2025
320b49d
Bump version to 23.2.6 final
psgreco Feb 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 23)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_BUILD, 6)
define(_CLIENT_VERSION_RC, 1)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2025)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
1 change: 1 addition & 0 deletions test/functional/example_elements_code_tutorial.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def set_test_params(self):

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
self.skip_if_no_bdb()

def run_test(self):
self.generate(self.nodes[0], COINBASE_MATURITY + 1)
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_discount_ct.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def set_test_params(self):

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
self.skip_if_no_bdb()

def run_test(self):
feerate = 1.0
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_discount_ct_ordering.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def set_test_params(self):

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
self.skip_if_no_bdb()

def run_test(self):

Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_taphash_pegins_issuances.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def set_test_params(self):

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
self.skip_if_no_bdb()

def setup_network(self, split=False):
self.setup_nodes()
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_tapscript_opcodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def set_test_params(self):

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
self.skip_if_no_bdb()

def setup_network(self, split=False):
self.setup_nodes()
Expand Down
1 change: 1 addition & 0 deletions test/functional/feature_trim_headers.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def make_signblockscript(num_nodes, required_signers, keys):
class TrimHeadersTest(BitcoinTestFramework):
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
self.skip_if_no_bdb()

# Dynamically generate N keys to be used for block signing.
def init_keys(self, num_keys):
Expand Down
12 changes: 6 additions & 6 deletions test/functional/wallet_elements_21million.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def run_test(self):
assert_equal(self.nodes[1].getbalance()[asset], 22_000_000)

# unload/load wallet
self.nodes[1].unloadwallet("")
self.nodes[1].loadwallet("")
self.nodes[1].unloadwallet(self.default_wallet_name)
self.nodes[1].loadwallet(self.default_wallet_name)
assert_equal(self.nodes[1].getbalance()[asset], 22_000_000)

# send more than 45 million of that asset
Expand All @@ -62,8 +62,8 @@ def run_test(self):
assert_equal(self.nodes[2].getbalance()[asset], 46_000_000)

# unload/load wallet
self.nodes[2].unloadwallet("")
self.nodes[2].loadwallet("")
self.nodes[2].unloadwallet(self.default_wallet_name)
self.nodes[2].loadwallet(self.default_wallet_name)
assert_equal(self.nodes[2].getbalance()[asset], 46_000_000)

# send some policy asset to node 1 for fees
Expand All @@ -86,8 +86,8 @@ def run_test(self):
assert_equal(self.nodes[2].getbalance()[asset], 200_000_000)

# unload/load wallet
self.nodes[2].unloadwallet("")
self.nodes[2].loadwallet("")
self.nodes[2].unloadwallet(self.default_wallet_name)
self.nodes[2].loadwallet(self.default_wallet_name)
assert_equal(self.nodes[2].getbalance()[asset], 200_000_000)

if __name__ == '__main__':
Expand Down
1 change: 1 addition & 0 deletions test/functional/wallet_elements_regression_1263.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def set_test_params(self):

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
self.skip_if_no_bdb()

def run_test(self):
self.log.info("Start in Bitcoin regtest mode")
Expand Down