From 4d825cd58d95873b72c2b85c91dc106e92576384 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Wed, 27 Sep 2023 14:12:29 +0000 Subject: [PATCH 01/16] 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`. --- test/functional/test_runner.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 1542fda9e9..dd0fc8fbd0 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -88,28 +88,28 @@ EXTENDED_SCRIPTS = [ BASE_SCRIPTS = [ # Scripts that are run by default. # vv First elements tests vv - 'feature_fedpeg.py', - 'feature_fedpeg.py --pre_transition', - 'feature_fedpeg.py --post_transition', + 'feature_fedpeg.py --legacy-wallet', + 'feature_fedpeg.py --pre_transition --legacy-wallet', + 'feature_fedpeg.py --post_transition --legacy-wallet', 'feature_mandatory_coinbase.py', - 'feature_dynafed.py', - 'feature_sighash_rangeproof.py', + 'feature_dynafed.py --legacy-wallet', + 'feature_sighash_rangeproof.py --legacy-wallet', 'feature_block_subsidy.py', - 'feature_connect_genesis_outputs.py', + 'feature_connect_genesis_outputs.py --legacy-wallet', 'feature_block_v4.py', - 'feature_pak.py', - 'feature_blocksign.py', + 'feature_pak.py --legacy-wallet', + 'feature_blocksign.py --legacy-wallet', 'rpc_calcfastmerkleroot.py', 'feature_txwitness.py', - 'rpc_tweakfedpeg.py', - 'feature_issuance.py', - 'feature_confidential_transactions.py', - 'feature_default_asset_name.py', + 'rpc_tweakfedpeg.py --legacy-wallet', + 'feature_issuance.py --legacy-wallet', + 'feature_confidential_transactions.py --legacy-wallet', + 'feature_default_asset_name.py --legacy-wallet', 'feature_assetsdir.py', - 'feature_initial_reissuance_token.py', + 'feature_initial_reissuance_token.py --legacy-wallet', 'feature_progress.py', 'rpc_getnewblockhex.py', - 'wallet_elements_regression_1172.py', + 'wallet_elements_regression_1172.py --legacy-wallet', # Longest test should go first, to favor running tests in parallel 'wallet_hd.py --legacy-wallet', 'wallet_hd.py --descriptors', From 61cf89586a212008fb844b3e403491f3d4a3b90d Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Wed, 27 Sep 2023 12:01:23 +0000 Subject: [PATCH 02/16] ci: remove unused param --- src/mainchainrpc.cpp | 2 +- src/pegins.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mainchainrpc.cpp b/src/mainchainrpc.cpp index b79f7b73cd..8ac0605f9b 100644 --- a/src/mainchainrpc.cpp +++ b/src/mainchainrpc.cpp @@ -184,7 +184,7 @@ bool IsConfirmedBitcoinBlock(const uint256& hash, const int nMinConfirmationDept return false; } } - } catch (CConnectionFailed& e) { + } catch (CConnectionFailed&) { LogPrintf("WARNING: Lost connection to mainchain daemon RPC; will retry.\n"); return false; } catch (...) { diff --git a/src/pegins.cpp b/src/pegins.cpp index 506fec9336..6086bc54df 100644 --- a/src/pegins.cpp +++ b/src/pegins.cpp @@ -214,7 +214,7 @@ static bool GetBlockAndTxFromMerkleBlock(uint256& block_hash, uint256& tx_hash, } tx_hash = tx_hashes[0]; tx_index = tx_indices[0]; - } catch (std::exception& e) { + } catch (std::exception&) { // Invalid encoding of merkle block return false; } From de8b4c87bcb6e05829b08a0df8ca421c43cb41c7 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 14 Jun 2023 13:32:22 +0100 Subject: [PATCH 03/16] ci: Switch to `amd64` container in "ARM" task Tee `arm_container` does not support 32-bit mode anymore. See: https://github.com/bitcoin/bitcoin/issues/27879 (cherry picked from commit 016fe6d8280768917081894dfca233c2f06e78d9) --- .cirrus.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 65f9fa07db..a46aec954c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -167,14 +167,13 @@ task: task: name: 'ARM [unit tests, no functional tests] [bullseye]' << : *GLOBAL_TASK_TEMPLATE - arm_container: - image: debian:bullseye - cpu: 2 - memory: 8G + container: + docker_arguments: + CI_IMAGE_NAME_TAG: debian:bullseye + FILE_ENV: "./ci/test/00_setup_env_arm.sh" + << : *CREDITS_TEMPLATE env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV - FILE_ENV: "./ci/test/00_setup_env_arm.sh" - QEMU_USER_CMD: "" # Disable qemu and run the test natively task: name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [jammy]' From d6fdbf80ca38b06cd4fcbeca5ab8ff5f48205c99 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Fri, 2 Apr 2021 12:18:08 -0700 Subject: [PATCH 04/16] Disable certain false positive warnings for libsecp256k1 msvc build (cherry picked from commit cabb5661234f8d832dbc3b65bf80b0acc02db0a0) --- build_msvc/libsecp256k1/libsecp256k1.vcxproj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build_msvc/libsecp256k1/libsecp256k1.vcxproj b/build_msvc/libsecp256k1/libsecp256k1.vcxproj index c42918d6e1..f9b0a7975c 100644 --- a/build_msvc/libsecp256k1/libsecp256k1.vcxproj +++ b/build_msvc/libsecp256k1/libsecp256k1.vcxproj @@ -10,13 +10,14 @@ - + ENABLE_MODULE_ECDH;ENABLE_MODULE_RECOVERY;ENABLE_MODULE_EXTRAKEYS;ENABLE_MODULE_SCHNORRSIG;%(PreprocessorDefinitions) - ..\..\src\secp256k1;%(AdditionalIncludeDirectories) - + ..\..\src\secp256k1;%(AdditionalIncludeDirectories) + 4146;4244;4267;4334 + - \ No newline at end of file + From 11c6bfea6c08e19d86833ee4d3e2d224e48607ac Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Wed, 27 Sep 2023 13:21:51 +0000 Subject: [PATCH 05/16] set ARM CI test to explicitly run on debian:bullseye image --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index a46aec954c..74aa0e087e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -168,6 +168,7 @@ task: name: 'ARM [unit tests, no functional tests] [bullseye]' << : *GLOBAL_TASK_TEMPLATE container: + image: debian:bullseye docker_arguments: CI_IMAGE_NAME_TAG: debian:bullseye FILE_ENV: "./ci/test/00_setup_env_arm.sh" From 950c4ff0d3dcc0d6eabf86704910d70929c577a4 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 28 Sep 2023 09:35:26 -0700 Subject: [PATCH 06/16] Partial cherry-pick of 5080c9c25f44ae9d16a69d41f0da1d1e06483bf7 to fix windows builds --- build_msvc/common.init.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_msvc/common.init.vcxproj b/build_msvc/common.init.vcxproj index 0cbe2effd5..48baefd84f 100644 --- a/build_msvc/common.init.vcxproj +++ b/build_msvc/common.init.vcxproj @@ -90,7 +90,7 @@ /utf-8 /Zc:__cplusplus /std:c++17 %(AdditionalOptions) 4018;4244;4267;4334;4715;4805;4834 true - _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;ZMQ_STATIC;NOMINMAX;WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CONSOLE;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SECP256K1_STATIC;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;ZMQ_STATIC;NOMINMAX;WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CONSOLE;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) ..\..\src;..\..\src\minisketch\include;..\..\src\univalue\include;..\..\src\secp256k1\include;..\..\src\leveldb\include;..\..\src\leveldb\helpers\memenv;%(AdditionalIncludeDirectories) From 5af45ea18570f91b5e434170c40436ee06e9a959 Mon Sep 17 00:00:00 2001 From: James Dorfman Date: Thu, 28 Sep 2023 18:23:19 +0000 Subject: [PATCH 07/16] add mising deps to libbitcoinconsensus windows exe build --- build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj b/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj index 4cb0bdc902..480ec15415 100644 --- a/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj +++ b/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj @@ -22,7 +22,9 @@ + + From 0c2fbefe9897e2fd09a0a8ad835658d9f3692bb7 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Fri, 29 Sep 2023 12:19:29 +0200 Subject: [PATCH 08/16] add missing 'complete' bool to psbt_updater_test --- src/wallet/test/psbt_wallet_tests.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp index cae1a02219..76ef090007 100644 --- a/src/wallet/test/psbt_wallet_tests.cpp +++ b/src/wallet/test/psbt_wallet_tests.cpp @@ -65,6 +65,7 @@ BOOST_AUTO_TEST_CASE(psbt_updater_test) // Try to sign the mutated input SignatureData sigdata; + bool complete = true; BOOST_CHECK(m_wallet.FillPSBT(psbtx, complete, SIGHASH_ALL, true, true) != TransactionError::OK); //BOOST_CHECK(spk_man->FillPSBT(psbtx, PrecomputePSBTData(psbtx), SIGHASH_ALL, true, true) != TransactionError::OK); } From 99ed6e1beecee4a5c238feb1a08b9fb16cf73e38 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Fri, 29 Sep 2023 14:44:08 +0200 Subject: [PATCH 09/16] msvc secp modules --- build_msvc/libsecp256k1/libsecp256k1.vcxproj | 2 +- src/wallet/test/psbt_wallet_tests.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_msvc/libsecp256k1/libsecp256k1.vcxproj b/build_msvc/libsecp256k1/libsecp256k1.vcxproj index f9b0a7975c..673db82f01 100644 --- a/build_msvc/libsecp256k1/libsecp256k1.vcxproj +++ b/build_msvc/libsecp256k1/libsecp256k1.vcxproj @@ -12,7 +12,7 @@ - ENABLE_MODULE_ECDH;ENABLE_MODULE_RECOVERY;ENABLE_MODULE_EXTRAKEYS;ENABLE_MODULE_SCHNORRSIG;%(PreprocessorDefinitions) + ENABLE_MODULE_GENERATOR;ENABLE_MODULE_RANGEPROOF;ENABLE_MODULE_SURJECTIONPROOF;ENABLE_MODULE_WHITELIST;ENABLE_MODULE_ECDH;ENABLE_MODULE_RECOVERY;ENABLE_MODULE_EXTRAKEYS;ENABLE_MODULE_SCHNORRSIG;%(PreprocessorDefinitions) ..\..\src\secp256k1;%(AdditionalIncludeDirectories) 4146;4244;4267;4334 diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp index 76ef090007..5f99cf6cc2 100644 --- a/src/wallet/test/psbt_wallet_tests.cpp +++ b/src/wallet/test/psbt_wallet_tests.cpp @@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE(psbt_updater_test) BOOST_CHECK_EQUAL(final_hex, "70736274ff01009a020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f00000000000100bb0200000001aad73931018bd25f84ae400b68848be09db706eac2ac18298babee71ab656f8b0000000048473044022058f6fc7c6a33e1b31548d481c826c015bd30135aad42cd67790dab66d2ad243b02204a1ced2604c6735b6393e5b41691dd78b00f0c5942fb9f751856faa938157dba01feffffff0280f0fa020000000017a9140fb9463421696b82c833af241c78c17ddbde493487d0f20a270100000017a91429ca74f8a08f81999428185c97b5d852e4063f6187650000000104475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae2206029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f10d90c6a4f000000800000008000000080220602dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d710d90c6a4f00000080000000800100008001090880f0fa02000000000001012000c2eb0b0000000017a914b7f5faf40e3d40a5a459b1db3535f2b72fa921e88701042200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b2028903010547522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae2206023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7310d90c6a4f000000800000008003000080220603089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc10d90c6a4f00000080000000800200008001090800c2eb0b0000000000220203a9a4c37f5996d3aa25dbac6b570af0650394492942460b354753ed9eeca5877110d90c6a4f000000800000008004000080010521010000000000000000000000000000000000000000000000000000000000000000002202027f6399757d2eff55a136ad02c684b1838b6556e5f1b6b34282a94b6b5005109610d90c6a4f00000080000000800500008001052101000000000000000000000000000000000000000000000000000000000000000000"); // Mutate the transaction so that one of the inputs is invalid - psbtx.inputs[0].prevout.n = 2; + // psbtx.inputs[0].prevout.n = 2; // ELEMENTS: FIXME // Try to sign the mutated input SignatureData sigdata; From cb434320b65fd5405e39b62a6aef70383a331531 Mon Sep 17 00:00:00 2001 From: dhruv <856960+dhruv@users.noreply.github.com> Date: Tue, 1 Feb 2022 13:11:33 -0800 Subject: [PATCH 10/16] build: fix MSVC build after subtree update Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Co-authored-by: Aaron Clauson --- build_msvc/libsecp256k1/libsecp256k1.vcxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build_msvc/libsecp256k1/libsecp256k1.vcxproj b/build_msvc/libsecp256k1/libsecp256k1.vcxproj index 673db82f01..d2bfbf52d5 100644 --- a/build_msvc/libsecp256k1/libsecp256k1.vcxproj +++ b/build_msvc/libsecp256k1/libsecp256k1.vcxproj @@ -8,6 +8,8 @@ StaticLibrary + + From 8bf9c630ce1d4518eb8eb603938d101b1c307b9b Mon Sep 17 00:00:00 2001 From: James Dorfman Date: Thu, 28 Sep 2023 23:07:34 +0000 Subject: [PATCH 11/16] ci: add missing dependencies to native win64 build --- .../libbitcoin_common.vcxproj.in | 9 +++++++ .../libbitcoin_node.vcxproj.in | 7 ++++++ .../libbitcoin_wallet.vcxproj.in | 24 +++++++++++++++++++ .../libbitcoinconsensus.vcxproj | 1 + build_msvc/libsecp256k1/libsecp256k1.vcxproj | 4 ++-- .../test_bitcoin-qt/test_bitcoin-qt.vcxproj | 1 + build_msvc/test_bitcoin/test_bitcoin.vcxproj | 1 + 7 files changed, 45 insertions(+), 2 deletions(-) diff --git a/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in b/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in index b47d62b295..9ad4ef07c4 100644 --- a/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in +++ b/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in @@ -8,8 +8,17 @@ StaticLibrary + + + + @SOURCE_FILES@ + + + {bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6} + + diff --git a/build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in b/build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in index 58e90dbaeb..e8478a5968 100644 --- a/build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in +++ b/build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in @@ -8,11 +8,18 @@ StaticLibrary + + @SOURCE_FILES@ $(IntDir)wallet_init.obj + + + {bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6} + + diff --git a/build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in b/build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in index 613d5c7199..39bb696c78 100644 --- a/build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in +++ b/build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in @@ -8,11 +8,35 @@ StaticLibrary + + + + + + + + + + + + + + + + + + + @SOURCE_FILES@ + + + {bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6} + + diff --git a/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj b/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj index 480ec15415..47ba9a75c1 100644 --- a/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj +++ b/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj @@ -9,6 +9,7 @@ + diff --git a/build_msvc/libsecp256k1/libsecp256k1.vcxproj b/build_msvc/libsecp256k1/libsecp256k1.vcxproj index d2bfbf52d5..32b6e3c3da 100644 --- a/build_msvc/libsecp256k1/libsecp256k1.vcxproj +++ b/build_msvc/libsecp256k1/libsecp256k1.vcxproj @@ -14,9 +14,9 @@ - ENABLE_MODULE_GENERATOR;ENABLE_MODULE_RANGEPROOF;ENABLE_MODULE_SURJECTIONPROOF;ENABLE_MODULE_WHITELIST;ENABLE_MODULE_ECDH;ENABLE_MODULE_RECOVERY;ENABLE_MODULE_EXTRAKEYS;ENABLE_MODULE_SCHNORRSIG;%(PreprocessorDefinitions) + ENABLE_MODULE_GENERATOR;ENABLE_MODULE_RANGEPROOF;ENABLE_MODULE_SURJECTIONPROOF;ECMULT_WINDOW_SIZE=15;ECMULT_GEN_PREC_BITS=8;ENABLE_MODULE_WHITELIST;ENABLE_MODULE_ECDH;ENABLE_MODULE_ECDSA_ADAPTOR;ENABLE_MODULE_ECDSA_S2C;ENABLE_MODULE_RECOVERY;ENABLE_MODULE_EXTRAKEYS;ENABLE_MODULE_SCHNORRSIG;%(PreprocessorDefinitions) ..\..\src\secp256k1;%(AdditionalIncludeDirectories) - 4146;4244;4267;4334 + 4005;4146;4244;4267;4334 diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj index d3be693e99..0fcb933f98 100644 --- a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj +++ b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj @@ -23,6 +23,7 @@ + diff --git a/build_msvc/test_bitcoin/test_bitcoin.vcxproj b/build_msvc/test_bitcoin/test_bitcoin.vcxproj index 4182448ec3..9414b30273 100644 --- a/build_msvc/test_bitcoin/test_bitcoin.vcxproj +++ b/build_msvc/test_bitcoin/test_bitcoin.vcxproj @@ -17,6 +17,7 @@ + From 17562593a21ab953158ab2af1ba8f1d75d3c5aae Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Fri, 6 Oct 2023 12:11:28 +0200 Subject: [PATCH 12/16] ci: fix arm test file_env placement --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 74aa0e087e..79c10048e3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -171,10 +171,10 @@ task: image: debian:bullseye docker_arguments: CI_IMAGE_NAME_TAG: debian:bullseye - FILE_ENV: "./ci/test/00_setup_env_arm.sh" << : *CREDITS_TEMPLATE env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV + FILE_ENV: "./ci/test/00_setup_env_arm.sh" task: name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [jammy]' From eed08df346d70522342cde984df561b5a390f51e Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 28 Sep 2023 17:24:47 -0700 Subject: [PATCH 13/16] ci: remove unused param --- src/pegins.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pegins.cpp b/src/pegins.cpp index 6086bc54df..370ffcb83b 100644 --- a/src/pegins.cpp +++ b/src/pegins.cpp @@ -149,7 +149,7 @@ static bool CheckPeginTx(const std::vector& tx_data, T& pegtx, co if (!pegtx_stream.empty()) { return false; } - } catch (std::exception& e) { + } catch (std::exception&) { // Invalid encoding of transaction return false; } From 26e191c4a7ec75c31eb0dfb17ea9cb7c501b4d49 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 28 Sep 2023 12:55:06 -0700 Subject: [PATCH 14/16] Revert "build: add dependencies to Makefile.am for libbitcoinkernel" This reverts commit 5dc85e021435221f16286e016de79b7666198494. --- src/Makefile.am | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7a8e53cc34..8f391279ff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -900,33 +900,6 @@ bitcoin_chainstate_SOURCES = \ validationinterface.cpp \ versionbits.cpp \ warnings.cpp -# ELEMENTS: additional sources for chainstate -bitcoin_chainstate_SOURCES += \ - asset.cpp \ - blind.cpp \ - blindpsbt.cpp \ - block_proof.cpp \ - common/bloom.cpp \ - confidential_validation.cpp \ - dynafed.cpp \ - issuance.cpp \ - mainchainrpc.cpp \ - merkleblock.cpp \ - pegins.cpp \ - primitives/bitcoin/block.cpp \ - primitives/bitcoin/merkleblock.cpp \ - primitives/bitcoin/transaction.cpp \ - primitives/confidential.cpp \ - primitives/pak.cpp \ - primitives/txwitness.cpp \ - psbt.cpp \ - rpc/request.cpp \ - script/pegins.cpp \ - script/sign.cpp \ - script/signingprovider.cpp \ - support/events.h \ - util/url.cpp - bitcoin_chainstate_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) bitcoin_chainstate_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bitcoin_chainstate_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) @@ -937,9 +910,6 @@ bitcoin_chainstate_LDADD = \ $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) \ $(LIBMEMENV) -# ELEMENTS: -bitcoin_chainstate_LDADD += \ - $(EVENT_LIBS) # Required for obj/build.h to be generated first. # More details: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html From 766a24c6925fffccac9aa4cdad59a3db8bf93788 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 28 Sep 2023 12:55:51 -0700 Subject: [PATCH 15/16] Revert "ci: Build bitcoin-chainstate" This reverts commit 2c03cec2ff8cdbfd5da92bfb507d218e5c6435b0. --- .cirrus.yml | 4 ++-- ...et_libbitcoinkernel.sh => 00_setup_env_native_nowallet.sh} | 4 ++-- src/Makefile.am | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) rename ci/test/{00_setup_env_native_nowallet_libbitcoinkernel.sh => 00_setup_env_native_nowallet.sh} (84%) diff --git a/.cirrus.yml b/.cirrus.yml index ebba0dc7df..e1102be446 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -271,13 +271,13 @@ task: FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh" task: - name: '[no wallet, libbitcoinkernel] [bionic]' + name: '[no wallet] [bionic]' << : *GLOBAL_TASK_TEMPLATE container: image: ubuntu:bionic env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV - FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh" + FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh" task: name: 'macOS 10.15 [gui, no tests] [focal]' diff --git a/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh b/ci/test/00_setup_env_native_nowallet.sh similarity index 84% rename from ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh rename to ci/test/00_setup_env_native_nowallet.sh index 89d6256298..d80a7f9633 100755 --- a/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh +++ b/ci/test/00_setup_env_native_nowallet.sh @@ -6,9 +6,9 @@ export LC_ALL=C.UTF-8 -export CONTAINER_NAME=ci_native_nowallet_libbitcoinkernel +export CONTAINER_NAME=ci_native_nowallet export DOCKER_NAME_TAG=ubuntu:18.04 # Use bionic to have one config run the tests in python3.6, see doc/dependencies.md export PACKAGES="python3-zmq clang-7 llvm-7 libc++abi-7-dev libc++-7-dev" # Use clang-7 to test C++17 compatibility, see doc/dependencies.md export DEP_OPTS="NO_WALLET=1 CC=clang-7 CXX='clang++-7 -stdlib=libc++'" export GOAL="install" -export BITCOIN_CONFIG="--enable-reduce-exports CC=clang-7 CXX='clang++-7 -stdlib=libc++' --enable-experimental-util-chainstate" +export BITCOIN_CONFIG="--enable-reduce-exports CC=clang-7 CXX='clang++-7 -stdlib=libc++'" diff --git a/src/Makefile.am b/src/Makefile.am index 8f391279ff..5d2b2c9712 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -910,10 +910,6 @@ bitcoin_chainstate_LDADD = \ $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) \ $(LIBMEMENV) - -# Required for obj/build.h to be generated first. -# More details: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html -bitcoin_chainstate-clientversion.$(OBJEXT): obj/build.h # # bitcoinconsensus library # From 29e54c183ac835dfd321bc76c1d2c99a80fea6be Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 28 Sep 2023 12:58:04 -0700 Subject: [PATCH 16/16] Revert "build: Add example bitcoin-chainstate executable" This reverts commit 095aa6ca37bf0bd5c5e221bab779978a99b2a34c. --- .gitignore | 1 - configure.ac | 13 -- src/Makefile.am | 96 -------------- src/bitcoin-chainstate.cpp | 262 ------------------------------------- 4 files changed, 372 deletions(-) delete mode 100644 src/bitcoin-chainstate.cpp diff --git a/.gitignore b/.gitignore index fcb8fddf63..905ea6dd7d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ src/elements-gui src/elements-node src/elements-tx src/elements-util -src/elements-chainstate src/elements-wallet src/test/fuzz/fuzz src/test/test_bitcoin diff --git a/configure.ac b/configure.ac index 33ecd77f83..287efda2c7 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,6 @@ BITCOIN_GUI_NAME=elements-qt BITCOIN_CLI_NAME=elements-cli BITCOIN_TX_NAME=elements-tx BITCOIN_UTIL_NAME=elements-util -BITCOIN_CHAINSTATE_NAME=elements-chainstate BITCOIN_WALLET_TOOL_NAME=elements-wallet dnl Multi Process BITCOIN_MP_NODE_NAME=elements-node @@ -655,12 +654,6 @@ AC_ARG_ENABLE([util-util], [build_bitcoin_util=$enableval], [build_bitcoin_util=$build_bitcoin_utils]) -AC_ARG_ENABLE([experimental-util-chainstate], - [AS_HELP_STRING([--enable-experimental-util-chainstate], - [build experimental bitcoin-chainstate executable (default=no)])], - [build_bitcoin_chainstate=$enableval], - [build_bitcoin_chainstate=no]) - AC_ARG_WITH([libs], [AS_HELP_STRING([--with-libs], [build libraries (default=yes)])], @@ -1283,7 +1276,6 @@ if test "$enable_fuzz" = "yes"; then build_bitcoin_cli=no build_bitcoin_tx=no build_bitcoin_util=no - build_bitcoin_chainstate=no build_bitcoin_wallet=no build_bitcoind=no build_bitcoin_libs=no @@ -1648,10 +1640,6 @@ AC_MSG_CHECKING([whether to build bitcoin-util]) AM_CONDITIONAL([BUILD_BITCOIN_UTIL], [test $build_bitcoin_util = "yes"]) AC_MSG_RESULT($build_bitcoin_util) -AC_MSG_CHECKING([whether to build experimental bitcoin-chainstate]) -AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_bitcoin_chainstate = "yes"]) -AC_MSG_RESULT($build_bitcoin_chainstate) - AC_MSG_CHECKING([whether to build libraries]) AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test $build_bitcoin_libs = "yes"]) if test "$build_bitcoin_libs" = "yes"; then @@ -1872,7 +1860,6 @@ AC_SUBST(BITCOIN_GUI_NAME) AC_SUBST(BITCOIN_CLI_NAME) AC_SUBST(BITCOIN_TX_NAME) AC_SUBST(BITCOIN_UTIL_NAME) -AC_SUBST(BITCOIN_CHAINSTATE_NAME) AC_SUBST(BITCOIN_WALLET_TOOL_NAME) AC_SUBST(BITCOIN_MP_NODE_NAME) AC_SUBST(BITCOIN_MP_GUI_NAME) diff --git a/src/Makefile.am b/src/Makefile.am index 5d2b2c9712..3bcecf55dd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -106,10 +106,6 @@ if BUILD_BITCOIN_UTIL bin_PROGRAMS += elements-util endif -if BUILD_BITCOIN_CHAINSTATE - bin_PROGRAMS += bitcoin-chainstate -endif - .PHONY: FORCE check-symbols check-security # bitcoin core # BITCOIN_CORE_H = \ @@ -820,98 +816,6 @@ elements_util_LDADD = \ $(LIBSECP256K1) # -# bitcoin-chainstate binary # -bitcoin_chainstate_SOURCES = \ - bitcoin-chainstate.cpp \ - arith_uint256.cpp \ - blockfilter.cpp \ - chain.cpp \ - chainparamsbase.cpp \ - chainparams.cpp \ - clientversion.cpp \ - coins.cpp \ - compat/glibcxx_sanity.cpp \ - compressor.cpp \ - consensus/merkle.cpp \ - consensus/tx_check.cpp \ - consensus/tx_verify.cpp \ - core_read.cpp \ - dbwrapper.cpp \ - deploymentinfo.cpp \ - deploymentstatus.cpp \ - flatfile.cpp \ - fs.cpp \ - hash.cpp \ - index/base.cpp \ - index/blockfilterindex.cpp \ - index/coinstatsindex.cpp \ - init/common.cpp \ - key.cpp \ - logging.cpp \ - netaddress.cpp \ - node/blockstorage.cpp \ - node/chainstate.cpp \ - node/coinstats.cpp \ - node/ui_interface.cpp \ - policy/feerate.cpp \ - policy/fees.cpp \ - policy/packages.cpp \ - policy/policy.cpp \ - policy/rbf.cpp \ - policy/settings.cpp \ - pow.cpp \ - primitives/block.cpp \ - primitives/transaction.cpp \ - pubkey.cpp \ - random.cpp \ - randomenv.cpp \ - scheduler.cpp \ - script/interpreter.cpp \ - script/script.cpp \ - script/script_error.cpp \ - script/sigcache.cpp \ - script/standard.cpp \ - shutdown.cpp \ - signet.cpp \ - support/cleanse.cpp \ - support/lockedpool.cpp \ - sync.cpp \ - threadinterrupt.cpp \ - timedata.cpp \ - txdb.cpp \ - txmempool.cpp \ - uint256.cpp \ - util/asmap.cpp \ - util/bytevectorhash.cpp \ - util/getuniquepath.cpp \ - util/hasher.cpp \ - util/moneystr.cpp \ - util/rbf.cpp \ - util/serfloat.cpp \ - util/settings.cpp \ - util/strencodings.cpp \ - util/syscall_sandbox.cpp \ - util/system.cpp \ - util/thread.cpp \ - util/threadnames.cpp \ - util/time.cpp \ - util/tokenpipe.cpp \ - validation.cpp \ - validationinterface.cpp \ - versionbits.cpp \ - warnings.cpp -bitcoin_chainstate_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -bitcoin_chainstate_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_chainstate_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) -bitcoin_chainstate_LDADD = \ - $(LIBBITCOIN_CRYPTO) \ - $(LIBUNIVALUE) \ - $(LIBSECP256K1) \ - $(LIBLEVELDB) \ - $(LIBLEVELDB_SSE42) \ - $(LIBMEMENV) -# - # bitcoinconsensus library # if BUILD_BITCOIN_LIBS include_HEADERS = script/bitcoinconsensus.h diff --git a/src/bitcoin-chainstate.cpp b/src/bitcoin-chainstate.cpp deleted file mode 100644 index f93197350d..0000000000 --- a/src/bitcoin-chainstate.cpp +++ /dev/null @@ -1,262 +0,0 @@ -// Copyright (c) 2022 The Bitcoin Core developers -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. -// -// The bitcoin-chainstate executable serves to surface the dependencies required -// by a program wishing to use Bitcoin Core's consensus engine as it is right -// now. -// -// DEVELOPER NOTE: Since this is a "demo-only", experimental, etc. executable, -// it may diverge from Bitcoin Core's coding style. -// -// It is part of the libbitcoinkernel project. - -#include -#include -#include -#include -#include -#include -#include -#include