Commit graph

38996 commits

Author SHA1 Message Date
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
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
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
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
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
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
Byron Hambly
b0d6cde2d0
fix: use discountvsize in miner if discount enabled 2024-08-16 12:35:04 +02:00
Byron Hambly
c1bc7caff5
fix: size estimation for pegin transactions 2024-08-14 15:41:29 +02:00
Pablo Greco
e1d6b66ead
Merge pull request #1346 from delta1/ct-fees-discount
discount: fix init doc for acceptdiscountct and override for creatediscountct
2024-07-24 05:35:52 -07:00
Byron Hambly
fdf3d1eab1
discount: update init doc for acceptdiscountct 2024-07-24 09:35:03 +02:00
Byron Hambly
47d6c34382
discount: fix override for creatediscountct 2024-07-24 09:34:16 +02:00
Pablo Greco
5a07eec02b
Merge pull request #1342 from jhfrontz/macos-arm-qt-thread-stack-parity
Ensure that arm-macos environments have sufficient QT thread stack
2024-07-18 00:56:18 -07:00
jhfrontz
9853992fd2 Ensure that arm-macos environments have sufficient QT thread stack 2024-07-17 17:32:24 -04:00
Byron Hambly
cdcc74bbcc
Merge pull request #1270 from psgreco/master-trim-headers-v2
Restore full functionality to trim_headers (untrim)
2024-06-06 15:01:12 +02:00
Byron Hambly
eed85dc5df
getblockchaininfo: add trim_headers field 2024-06-05 11:21:16 +02:00
Byron Hambly
4171939b58
test: add trim_headers functional test
(cherry picked from commit 630870f21d)
2024-05-30 16:02:27 +02:00
James Dorfman
46a3ee29bc improve efficiency by gating locks with 2024-05-27 09:25:31 +00:00
James Dorfman
b4185c7008 CI: fix asan lock issues 2024-05-21 16:56:01 +00:00
James Dorfman
c6aba4ac06 CI: fix integer underflow bug 2024-05-21 16:56:01 +00:00
James Dorfman
73ed5dd541 CI: fix benchmark + QT tests by properly initializing CBlockIndex by calling SetNodeContext 2024-05-21 16:54:52 +00:00