Commit graph

39261 commits

Author SHA1 Message Date
Byron Hambly
5d64e8945d
rpc!: change tweakfedpegscript to output P2WSH address
Changes tweakfedpegscript to return both p2wsh and p2shwsh version of
the tweaked address.

"address" has been removed from the result and replaced with "p2wsh" and
"p2shwsh".
2026-01-20 15:03:08 +02:00
merge-script
9a74bc9e2d
Merge ElementsProject/elements#1519: simplicity: update to d1905055
87c0b44f78 Squashed 'src/simplicity/' changes from 6d503ea4f8..49b96499a6 (Byron Hambly)
73d1e521bf docs: add simplicity code update instructions (Byron Hambly)

Pull request description:

  Updates Simplicity C source subtree from current master BlockstreamResearch/Simplicity@d190505509

  Adds new document describing the process.

  Pushed the C-master branch subtree split to my repo [delta1/simplicity/tree/C-master](https://github.com/delta1/simplicity/tree/C-master) and upstreamed in BlockstreamResearch/Simplicity#330

ACKs for top commit:
  delta1:
    ACK 4539002bee; compiled and tested locally

Tree-SHA512: e9fab8baa728ac122597bf2e3c5ae4fe1c5956c655fc336e1cc7a2be591f1deebcab32004a8b6b4ad359c51154ad47bca5f40c21d06823d5d059a6d66efb15af
2026-01-13 09:04:55 +02:00
Byron Hambly
4539002bee
Merge commit '87c0b44f78' into 2026-01-simplicity-update 2026-01-12 12:56:33 +02:00
Byron Hambly
87c0b44f78 Squashed 'src/simplicity/' changes from 6d503ea4f8..49b96499a6
49b96499a6 Replace Bitcoin Relative Timelock Jets
89ddb43eed Mark depricated parts of the TxEnv as obsolete
ff5d6fe4f7 Deprecate Broken Jets
ae008201ac Test Bitcoin jet deserialization
e81b68f197 Add GenPrimitive --bitcoin option
7887d16f24 Bitcoin specific fee jets
68603073b3 Bitcoin specific environment
ae3287e60f Refactor Makefile
99e3804e2d C: replace string initializations with arrays
c3dd9331cd Allow building on non-intel systems

git-subtree-dir: src/simplicity
git-subtree-split: 49b96499a6bb93b31d2f712fc1d4524f341ae640
2026-01-12 12:56:33 +02:00
Byron Hambly
73d1e521bf
docs: add simplicity code update instructions 2026-01-12 12:53:09 +02:00
Pablo Greco
a98bad738a
Merge pull request #1520 from delta1/2026-01-windows-qt
ci: update win64 native tasks
2026-01-09 09:04:16 -08:00
Byron Hambly
656ad6d1fb
ci(windows): pin jom to 1.1.2 2026-01-09 10:12:19 +02:00
Byron Hambly
2161cf464d
ci: update qt link for windows job 2026-01-08 09:07:48 +02:00
Byron Hambly
72b7c4646b
Merge pull request #1509 from psgreco/master-fixguix
Guix: fix codeberg link
2025-11-12 16:40:34 +02:00
Pablo Greco
4296205e2f
Guix: fix codeberg link 2025-11-12 04:58:21 -08:00
Pablo Greco
72f289d81c
Merge pull request #1507 from tomt1664/fix/reissuance-token-moneyrange
Reissuance token amount MoneyRange check
2025-11-11 00:06:42 -08:00
Tom Trevethan
a700d7f2b8 add reissuance token moneyrange check 2025-11-11 00:24:23 +00:00
Pablo Greco
35bc203315
Merge pull request #1504 from psgreco/master-release-gpgkey
Add GPG key for release signing
2025-11-10 04:38:40 -08:00
Pablo Greco
4465853a90
Add GPG key for release signing 2025-11-10 03:43:46 -08:00
Byron Hambly
d7995d8a56
Merge pull request #1503 from psgreco/master-buildfixes
Minor fixes for guix and regular builds
2025-11-05 08:34:28 +02:00
Pablo Greco
000227db76 Fix tag parsing when doing local tagged builds 2025-11-04 05:59:37 -08:00
Pablo Greco
4a131c80e9 guix builds: Use codeberg.org instead of git.savannah.gnu.org
Cherry-picked from 5c2ba9f583
2025-11-04 05:59:27 -08:00
Pablo Greco
eb7d626428
Merge pull request #1497 from delta1/ci/cirrus-macos
ci: fix macos native task
2025-10-23 05:12:13 -07:00
Byron Hambly
8272615241
Merge pull request #1498 from tomt1664/fix/p2p_invalid_messages_test
Fix p2p_invalid_messages functional test
2025-10-16 11:26:47 +02:00
Tom Trevethan
1484272806 fixed payload limit for elements 2025-10-15 16:06:22 +01:00
Byron Hambly
6ad3eebb7f
ci: fix macos native task 2025-10-15 10:22:23 +02:00
Byron Hambly
af1463a7a1
Merge pull request #1494 from Nazarevsky/fix/tapscript-opcodes-word-reduplication
doc: Remove 'pops a' reduplication
2025-10-02 15:04:34 +02:00
nazarevsky
16799ae3f6
Remove 'pops a' duplication 2025-10-02 13:47:29 +02:00
Pablo Greco
6150a745f9
Merge pull request #1493 from tomt1664/unlimitedissuances_chainparams
acceptunlimitedissuances configurable for CLiquidV1TestParams
2025-09-30 07:08:39 -07:00
Tom Trevethan
2dd017d98c added unlimitedissuance config option for CLiquidV1TestParams 2025-09-30 11:40:24 +01:00
Pablo Greco
cc7aee39b9
Merge pull request #1492 from tomt1664/unlimited_issuance_defaults
Default settings for acceptunlimitedissuances in chainparams
2025-09-29 09:18:04 -07:00
Tom Trevethan
a937d53a23 moved acceptunlimitedissuances to chainparams and set defaults 2025-09-26 14:15:46 +01:00
Byron Hambly
93c84a97f9
fix: unblinded re/issuance for non-policy asset greater than 21 million (#1445)
* test: add test for unblinded re/issuance greater than 21 million

Co-authored-by: Mihailo Milenkovic <mihailo.milenkovic84@gmail.com>

* fix: unblinded re/issuance for greater than 21 million

Co-authored-by: Mihailo Milenkovic <mihailo.milenkovic84@gmail.com>

* enable with param config

* change range check to policy with config option

* refactoring, additional error messages and test extension

---------

Co-authored-by: Mihailo Milenkovic <mihailo.milenkovic84@gmail.com>
Co-authored-by: Tom Trevethan <ttrevethan@blockstream.com>
2025-09-23 13:17:02 +02:00
Tom Trevethan
e145690b42
apply mandatory coinbase only to policyAsset (#1488)
Co-authored-by: Tom Trevethan <ttrevethan@blockstream.com>
2025-09-19 11:44:39 +01:00
Tom Trevethan
9f1cc945b6
Fix: address error messages and test (#1486)
* fix address error messages and test

* newline

---------

Co-authored-by: Tom Trevethan <ttrevethan@blockstream.com>
2025-08-25 15:05:57 +02:00
Byron Hambly
992147b07e
Merge pull request #1483 from tomt1664/fix/functional_sync
Test: fix intermittent failures for wallet_elements_regression_1259.py and feature_dynafed.py
2025-08-11 11:30:32 +02:00
Tom Trevethan
7532092cbc fix intermittent functional test failures 2025-08-08 14:54:54 +01:00
Pablo Greco
7cb85f19c4
Merge pull request #1477 from ElementsProject/simplicity
Unconditionally accept Simplicity spends in the mempool
2025-08-06 06:20:25 -07:00
Byron Hambly
f49f0a2f8a
Merge pull request #1481 from tomt1664/fix/feature_pak_test
test: fix feature_pak.py test
2025-08-05 18:29:06 +02:00
Tom Trevethan
da9d7c16ce fix feature_pak test 2025-08-05 13:51:27 +01:00
Byron Hambly
b1749fb5ff
Merge pull request #1482 from tomt1664/fix/macos_ci_pip_install
Fix macos CI pip install
2025-08-05 05:55:43 +02:00
Tom Trevethan
fcaa080e8d update macos ci install 2025-08-04 11:36:16 +01:00
Byron Hambly
6e2d87990e
Merge pull request #1333 from delta1/mintxfee
wallet: allow mintxfee=0
2025-07-31 10:07:07 +02:00
Tom Trevethan
2eb5b084bc
Enable sending of different assets to the same address (#1479)
* enable rawtransaction send multiple assets to same address

* fix whitespace

* Update test/functional/feature_issuance.py

Co-authored-by: Byron Hambly <byron@hambly.dev>

* Update test/functional/feature_issuance.py

Co-authored-by: Byron Hambly <byron@hambly.dev>

---------

Co-authored-by: Tom Trevethan <ttrevethan@blockstream.com>
Co-authored-by: Byron Hambly <byron@hambly.dev>
2025-07-30 12:41:37 +01:00
Byron Hambly
3524ec0f83
Merge pull request #1480 from tomt1664/fix/mempool_unbroadcast_test
Fix `mempool_unbroadcast.py` test
2025-07-30 10:17:50 +02:00
Tom Trevethan
c1a47134ff prevent reused utxo 2025-07-28 14:30:09 +01:00
Byron Hambly
ab5777ee73
test: minor improvements for send_zero_fee 2025-07-25 15:03:22 +02:00
Russell O'Connor
ddda11cb6a Unconditionally accept Simplicity spends in the mempool
Taproot and other soft-forks historically in Bitcoin have not gated mempool access.
2025-07-23 17:26:53 -04:00
Tom Trevethan
ef7525a446 re-enable zero fee check 2025-07-22 12:10:18 +01:00
Tom Trevethan
cd1b94e64b Merge remote-tracking branch 'origin/master' into mintxfee 2025-07-22 11:57:05 +01:00
Tom Trevethan
e8e19528b0 Zero fee transactions without fee output 2025-07-22 11:37:30 +01:00
Byron Hambly
b379bb2465
Merge pull request #1459 from ElementsProject/simplicity
Update Simplicity integeration
2025-07-17 17:04:48 +02:00
Tom Trevethan
c4bc9fd5b4
Fix position of version argument in walletcreatefundedpsbt (#1474)
* fix position of version argument and add test

* add test for version number

---------

Co-authored-by: Tom Trevethan <ttrevethan@blockstream.com>
2025-07-11 12:27:43 +02:00
Byron Hambly
2f6f7ce26d
Merge pull request #1472 from tomt1664/fix_race_condition
net: fix race condition in self-connect detection
2025-07-09 11:05:05 +02:00
glozow
8db506f406 Merge bitcoin/bitcoin#30394: net: fix race condition in self-connect detection
16bd283b3a Reapply "test: p2p: check that connecting to ourself leads to disconnect" (Sebastian Falbesoner)
0dbcd4c148 net: prevent sending messages in `NetEventsInterface::InitializeNode` (Sebastian Falbesoner)
66673f1c13 net: fix race condition in self-connect detection (Sebastian Falbesoner)

Pull request description:

  This PR fixes a recently discovered race condition in the self-connect detection (see #30362 and #30368).

  Initiating an outbound network connection currently involves the following steps after the socket connection is established (see [`CConnman::OpenNetworkConnection`](bd5d1688b4/src/net.cpp (L2923-L2930)) method):
  1. set up node state
  2. queue VERSION message (both steps 1 and 2 happen in [`InitializeNode`](bd5d1688b4/src/net_processing.cpp (L1662-L1683)))
  3. add new node to vector `m_nodes`

  If we connect to ourself, it can happen that the sent VERSION message (step 2) is received and processed locally *before* the node object is added to the connection manager's `m_nodes` vector (step 3). In this case, the self-connect remains undiscovered, as the detection doesn't find the outbound peer in `m_nodes` yet (see `CConnman::CheckIncomingNonce`).

  Fix this by swapping the order of 2. and 3., by taking the `PushNodeVersion` call out of `InitializeNode` and doing that in the `SendMessages` method instead, which is only called for `CNode` instances in `m_nodes`.

  The temporarily reverted test introduced in #30362 is readded. Fixes #30368.

  Thanks go to vasild, mzumsande and dergoegge for suggestions on how to fix this (see https://github.com/bitcoin/bitcoin/issues/30368#issuecomment-2200625017 ff. and https://github.com/bitcoin/bitcoin/pull/30394#discussion_r1668290789).

ACKs for top commit:
  naiyoma:
    tested ACK [https://github.com/bitcoin/bitcoin/pull/30394/commits/16bd283b3ad05daa41259a062aee0fc05b463fa6](https://github.com/bitcoin/bitcoin/pull/30394/commits/16bd283b3ad05daa41259a062aee0fc05b463fa6),  built and tested locally,  test passes successfully.
  mzumsande:
    ACK 16bd283b3a
  tdb3:
    ACK 16bd283b3a
  glozow:
    ACK 16bd283b3a
  dergoegge:
    ACK 16bd283b3a

Tree-SHA512: 5b8aced6cda8deb38d4cd3fe4980b8af505d37ffa0925afaa734c5d81efe9d490dc48a42e1d0d45dd2961c0e1172a3d5b6582ae9a2d642f2592a17fbdc184445
2025-07-08 13:53:58 +01:00