Commit graph

39228 commits

Author SHA1 Message Date
Pablo Greco
dc6966ece0 Merge branch 'master' into elem-23.2.6-rc1 2025-01-23 05:49:58 -08:00
Pablo Greco
e9a914465d
Merge pull request #1385 from delta1/wallet-receive-gt-21million
assets: allow issuance and transaction amounts of more than MAX_MONEY for non-policy assets
2025-01-23 05:44:33 -08:00
Byron Hambly
e7f32aac75
unblindconfidentialpair: update moneyrange check with asset 2025-01-17 13:09:11 +02:00
Byron Hambly
8dabb73663
moneyrange: check asset type 2025-01-17 13:09:10 +02:00
Byron Hambly
a3e0ce2e8c
amountfromvalue: add arg to check moneyrange 2025-01-17 13:09:10 +02:00
Byron Hambly
4303fa500d
test: add functional test for issue 2025-01-14 15:25:05 +02:00
Byron Hambly
81ea480be5
Merge pull request #1383 from psgreco/elem-23.2.5-final
Prepare 23.2.5 final
2025-01-10 10:09:12 +02:00
Pablo Greco
4a2f79b601 Bump version to 23.2.5 final 2025-01-09 08:58:41 -08:00
Pablo Greco
5b5740e593 Update manpages 2025-01-09 08:58:00 -08:00
Pablo Greco
475e77c836 Update copyright year to 2025 2025-01-09 08:52:01 -08:00
Pablo Greco
f4a1b43c48 Continue receiving data for the current messages, even when we select to send
(cherry picked from commit cd306bf8d3)
2025-01-07 06:36:13 -08:00
Jeff Frontz
ba24915e56
Merge pull request #1379 from psgreco/elem-23.2.5-rc1
Prepare 23.2.5 rc1
2024-12-19 09:26:21 -05:00
Pablo Greco
081e12150f Merge branch 'master' into elem-23.2.5-rc1 2024-12-17 08:35:30 -08:00
Byron Hambly
d5c9e24b59
Merge pull request #1376 from psgreco/23.x-wallet-crash
Wallet: avoid scanning after the last known block
2024-12-17 18:10:14 +02:00
Pablo Greco
f138566ad3 Wallet: avoid scanning after the last known block 2024-12-17 05:35:31 -08:00
Byron Hambly
cc2ecbb978
Merge pull request #1378 from psgreco/master-discountct-liquidv1
Master discountct liquidv1
2024-12-17 09:22:57 +02:00
Pablo Greco
5de39247e6 Update help text for "acceptdiscountct" 2024-11-18 05:00:12 -08:00
Pablo Greco
22cc8dfe34 Accept by default discountct in liquidv1 2024-11-18 05:00:12 -08:00
Pablo Greco
7622638314 Update manpages 2024-11-18 04:50:54 -08:00
Pablo Greco
0abcf8d2f7 Bump version to 23.2.5-rc1 2024-11-18 04:49:15 -08:00
Pablo Greco
1e8a7cb103 Merge branch 'master' into elem-23.2.5-rc1 2024-11-18 04:48:43 -08:00
Pablo Greco
c7412de133 Merge branch 'master-nosimplicity' into elem-23.2.5-rc1 2024-11-18 04:23:16 -08:00
Pablo Greco
adb4478152 Revert "Merge ElementsProject/elements#1219: Simplicity"
This reverts commit 2534141e19, reversing
changes made to fbc01d56d7.
2024-11-18 04:19:32 -08:00
Pablo Greco
5438960aca Revert "Merge pull request #1368 from apoelstra/2024-10--simplicity-activation"
This reverts commit aa2420cd18, reversing
changes made to 2534141e19.
2024-11-18 04:19:18 -08:00
Byron Hambly
60cf64e070
Merge pull request #1374 from psgreco/master-lbtc
Use LBTC instead of L-BTC in QT
2024-11-18 09:42:30 +02:00
Pablo Greco
7398cfae87 Use LBTC instead of L-BTC in QT 2024-11-04 05:54:22 -08:00
Byron Hambly
117b387b68
Merge pull request #1369 from psgreco/elem-23.2.4-final
Prepare 23.2.4 final
2024-10-13 19:01:01 +02:00
Pablo Greco
242a689d1a Bump version to 23.2.4 final 2024-10-09 13:07:34 -07:00
Byron Hambly
aa2420cd18
Merge pull request #1368 from apoelstra/2024-10--simplicity-activation
simplicity: define liquid testnet activation parameters
2024-10-08 17:16:01 +02:00
Andrew Poelstra
626e3aeafb
test: add functional simplicity activation test 2024-10-08 14:41:40 +00:00
Andrew Poelstra
57ab101352
simplicity: copy activation threshold/period from taproot
Copy the parameters for mainnet because they seem to have worked fine
for Taproot and are therefore a good starting point for Simplicity.
Copy them for regtest so that we can also copy the functional test for
activation, without needing to change a whole bunch of numbers.
2024-10-08 14:41:40 +00:00
Andrew Poelstra
2532c4a6c4
rpc: add simplicity to getdeploymentinfo 2024-10-08 14:41:39 +00:00
Andrew Poelstra
3621e7adc0
liquid testnet: enable simplicity at all times
This will effectively activate Simplicity as soon as the sole Liquid
Testnet signer is updated.
2024-10-08 14:41:39 +00:00
Andrew Poelstra
850b82095c
disable simplicity on regtest
We want to test Simplicity activation using evbparams.
2024-10-08 14:41:39 +00:00
Andrew Poelstra
2f2f3aac1e
link: add simplicity to bitcoin-chainstate binary 2024-10-08 13:03:02 +00:00
merge-script
2534141e19
Merge ElementsProject/elements#1219: Simplicity
508836028e Asset tests: Check script error (Christian Lewe)
4ca2411795 Asset tests: Parse Elements script errors (Russell O'Connor)
afee926dca Simplicity Functional Tests. (Russell O'Connor)
bcd508f409 Add Simplicity Deployment structure (Russell O'Connor)
1698454c2a Add Simplicity verification (Russell O'Connor)
96fb8f5d15 Store hash_genesis_block in PrecomputedTransactionData. (Russell O'Connor)
50916cf108 simplicity: enable coverage in configure.ac (Byron Hambly)
6c6925322c Add MSVC build configuration for libelementssimplicity (Russell O'Connor)
28553fdf67 Add Simplicity to the build system. (Russell O'Connor)
d5ad21b8a0 Lint simplicity subtree (Russell O'Connor)
f502c24196 Squashed 'src/simplicity/' content from commit 86ac0f92c4 (Russell O'Connor)
5224c1abbb Exclude simplicity directory (Russell O'Connor)
52b92b8213 Cherry-pick <https://github.com/bitcoin/bitcoin/pull/27122> (Russell O'Connor)

Pull request description:

  Tasks needed to pass CI:

  - [x] For Mingw32, remove pthread dependency from Simplicity (upstream).
  - [x] Merge (upcoming) libsecp256k1 release into Simplicity (upstream).

  Tasks needed for public signet:
  - [x] Add weight requirements for jets and combinantors (upstream).
  - [x] Maximum memory allocation (upstream).
  - [x] Other missing anti-DOS protection (upstream)?

  Tasks needed for testing.
  - [ ] Ensure that the fuzzer covers `libelementssimplicity`.

  Before merging:
  - [ ] Rebase on master.

ACKs for top commit:
  delta1:
    utACK 508836028e
  apoelstra:
    utACK 508836028e

Tree-SHA512: c1f77c6133306d4d88fbc79aa86764b751497b75ec2884241f7d4fe946bbe6a13f3469cd586c44b4c1640fe2cb4c12299cc9998742d49aea5658a1893c0a6a68
2024-10-07 19:26:59 +00:00
Christian Lewe
508836028e Asset tests: Check script error
Compare the expected script error, parsed from JSON, with the actual
error that VerifyScript returns. If the JSON does not include an
expected error, then skip this check.
2024-10-07 14:39:10 -04:00
Russell O'Connor
4ca2411795 Asset tests: Parse Elements script errors
Take the existing function to parse script errors and extend it to parse
Elements errors. SCRIPT_ERR_ERROR_COUNT is not included because it is a
pseudo error.
2024-10-07 14:39:10 -04:00
Russell O'Connor
afee926dca Simplicity Functional Tests. 2024-10-07 14:39:10 -04:00
Russell O'Connor
bcd508f409 Add Simplicity Deployment structure 2024-10-07 14:39:10 -04:00
Russell O'Connor
1698454c2a Add Simplicity verification
Unactivated.
2024-10-07 14:39:09 -04:00
Russell O'Connor
96fb8f5d15 Store hash_genesis_block in PrecomputedTransactionData.
This will be used by Simplicity.
2024-10-07 14:39:09 -04:00
Byron Hambly
50916cf108 simplicity: enable coverage in configure.ac
also filters src/simplicity/secp256k1 from the coverage results
2024-10-07 14:39:09 -04:00
Russell O'Connor
6c6925322c Add MSVC build configuration for libelementssimplicity 2024-10-07 14:39:09 -04:00
Russell O'Connor
28553fdf67 Add Simplicity to the build system. 2024-10-07 14:39:09 -04:00
Russell O'Connor
d5ad21b8a0 Lint simplicity subtree 2024-10-07 14:39:09 -04:00
Russell O'Connor
8760cdd7be Merge commit 'f502c24196' as 'src/simplicity' 2024-10-07 14:38:29 -04:00
Russell O'Connor
f502c24196 Squashed 'src/simplicity/' content from commit 86ac0f92c4
git-subtree-dir: src/simplicity
git-subtree-split: 86ac0f92c4b2b6d694dca85dce3b6909aed25894
2024-10-07 14:38:29 -04:00
Russell O'Connor
5224c1abbb Exclude simplicity directory 2024-10-07 14:38:19 -04:00
Russell O'Connor
52b92b8213 Cherry-pick <https://github.com/bitcoin/bitcoin/pull/27122>
Simplicity needs this fix.
2024-10-07 14:38:13 -04:00