Pablo Greco
cfd77df7b0
Merge branch 'master' into elem-23.3.0-rc1
2024-11-18 04:29:09 -08:00
Pablo Greco
e213060a12
Merge branch 'master-nochainstate' into elem-23.3.0-rc1
2024-11-18 04:28:02 -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
Pablo Greco
96a0957d9d
Revert "link: add simplicity to bitcoin-chainstate binary"
...
This reverts commit 2f2f3aac1e
2024-10-08 08:27:25 -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
...
508836028e4ca2411795afee926dcabcd508f4091698454c2a96fb8f5d1550916cf1086c6925322c28553fdf67d5ad21b8a0f502c241965224c1abbb52b92b8213https://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 508836028e508836028e
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
James Dorfman
ced5fd9489
Merge pull request #1367 from psgreco/elem-23.2.4-rc1
...
Prepare 23.2.4 rc1
2024-09-26 21:40:49 -04:00
Pablo Greco
bcf3a37cba
Bump version to 23.2.4rc1
2024-09-25 09:38:22 -07:00
Pablo Greco
00ddf91c31
Merge branch 'master' into elem-23.2.4-rc1
2024-09-25 09:37:34 -07:00
Pablo Greco
fbc01d56d7
Merge pull request #1366 from delta1/discountweight
...
discount: fix weight calculation
2024-09-25 09:29:08 -07:00
Byron Hambly
09c5068ab1
discount: fix weight calculation
...
Thanks to Jon Griffiths for picking up that the amount and nonce discount
should be multiplied by the witness scaling factor as they form part of
the base transaction.
2024-09-25 15:18:38 +02:00
Byron Hambly
d0f714638a
feat: add discountweight to TxToUniv
2024-09-20 14:39:13 +02:00
Byron Hambly
e29fd0a463
Merge pull request #1364 from psgreco/elem-23.2.3-final
...
Prepare 23.2.3 final
2024-09-15 07:45:47 +02:00
Pablo Greco
1a559f6c4e
Bump version to 23.2.3 final
2024-09-14 19:41:33 -07:00
James Dorfman
1226e4890d
Merge pull request #1363 from psgreco/elem-23.2.3-rc2
...
Prepare 23.2.3 rc2
2024-09-10 16:26:12 -04:00
Pablo Greco
4b22137159
Bump version to 23.2.3rc2
2024-09-09 09:44:53 -07:00
Pablo Greco
49549ab42b
Merge branch 'master' into elem-23.2.3-rc2
2024-09-09 09:44:04 -07:00
Pablo Greco
99ca072a94
Merge pull request #1362 from delta1/ct-discount-package
...
fix: discountct package mining
2024-09-09 09:40:43 -07:00
Byron Hambly
f107021869
fix: discountct package mining
2024-09-09 12:03:33 +02:00
James Dorfman
d75c2324f1
Merge pull request #1361 from psgreco/elem-23.2.3-rc1
...
Prepare 23.2.3 rc1
2024-08-26 13:20:00 -04:00
Pablo Greco
bb9e44df57
Update manpages
2024-08-23 08:20:48 -07:00
Pablo Greco
64c6db401c
Bump version to 23.2.3rc1
2024-08-23 08:20:25 -07:00
Pablo Greco
6ef35aca7b
Merge branch 'master' into elem-23.2.3-rc1
2024-08-23 08:16:31 -07:00
James Dorfman
86ffda8a7d
Merge pull request #1360 from psgreco/master-enable-discountct-liquidtestnet
...
Accept discount-ct by default in liquidtestnet
2024-08-23 11:10:52 -04:00
Pablo Greco
5c04f7d9a0
Accept discount-ct by default in liquidtestnet
2024-08-19 08:29:18 -07:00
James Dorfman
639715df61
Merge pull request #1356 from delta1/discountct-blockmintxfee
...
fix: use discountvsize in miner if discount enabled
2024-08-19 11:27:01 -04:00
Byron Hambly
e40b57d87b
Merge pull request #1355 from delta1/pegin-estimate
...
fix: size estimation for pegin transactions
2024-08-16 14:46:47 +02:00
