merge-script d15d95c5cc

Merge bitcoin/bitcoin#30575: fuzz: fix timeout in crypter target ...

bfd3c29e4f7942b49986ce0efa08481bae190b7e fuzz: fix timeout in crypter target (brunoerg)

Pull request description:

  Fixes #30503

  - Move SetKeyFromPassphrase to out of LIMITED_WHILE
  - Remove `SetKey` calls since it is already called internally by other functions.
  - Reduce number of iterations (100 is enough, no need for 10,000).

ACKs for top commit:
  maflcko:
    review ACK bfd3c29e4f7942b49986ce0efa08481bae190b7e 📆
  dergoegge:
    utACK bfd3c29e4f7942b49986ce0efa08481bae190b7e

Tree-SHA512: 275ab7d07a20bfd07279a23613678993c10c166f40cdc900213b9f4d5afb107462d5f88518a0f4ce2a52f3b7950ff2c01cf74292042f16996909fcb96f827d3e

2024-08-05 14:42:19 +01:00

..

rpc

policy: Add OP_1 <0x4e73> as a standard output type

2024-07-30 14:06:58 -04:00

test

fuzz: fix timeout in crypter target

2024-08-02 09:48:10 -03:00

bdb.cpp

bdb: Be able to make byteswapped databases

2024-05-16 15:03:13 -04:00

bdb.h

bdb: Be able to make byteswapped databases

2024-05-16 15:03:13 -04:00

coincontrol.cpp

…

coincontrol.h

[wallet, rpc]: add max_tx_weight to tx funding options

2024-06-27 15:31:21 +01:00

coinselection.cpp

Merge bitcoin/bitcoin#29523: Wallet: Add max_tx_weight to transaction funding options (take 2)

2024-07-17 18:27:59 -04:00

coinselection.h

Merge bitcoin/bitcoin#29523: Wallet: Add max_tx_weight to transaction funding options (take 2)

2024-07-17 18:27:59 -04:00

context.cpp

…

context.h

…

crypter.cpp

…

crypter.h

…

db.cpp

wallet: implement BerkeleyROBatch

2024-05-13 23:01:37 -04:00

db.h

tidy: modernize-use-equals-default

2024-07-08 11:12:01 +02:00

dump.cpp

bdb: Be able to make byteswapped databases

2024-05-16 15:03:13 -04:00

dump.h

…

external_signer_scriptpubkeyman.cpp

util: add TransactionError includes and namespace declarations

2024-05-16 10:16:08 -05:00

external_signer_scriptpubkeyman.h

common: Add PSBTError enum

2024-05-16 10:16:08 -05:00

feebumper.cpp

Merge bitcoin/bitcoin#27969: bumpfee: ignore WALLET_INCREMENTAL_RELAY_FEE when user specifies fee_rate

2024-06-14 14:46:04 -04:00

feebumper.h

…

fees.cpp

…

fees.h

…

init.cpp

Merge bitcoin/bitcoin#26606: wallet: Implement independent BDB parser

2024-05-21 10:05:09 +01:00

interfaces.cpp

util: add TransactionError includes and namespace declarations

2024-05-16 10:16:08 -05:00

load.cpp

util: Move util/string.h functions to util namespace

2024-05-16 10:16:08 -05:00

load.h

…

migrate.cpp

refactor: Add explicit cast to expected_last_page to silence fuzz ISan

2024-06-07 17:30:38 +02:00

migrate.h

tidy: modernize-use-equals-default

2024-07-08 11:12:01 +02:00

receive.cpp

[clang-tidy] Enable the misc-no-recursion check

2024-04-07 14:04:45 +01:00

receive.h

…

salvage.cpp

…

salvage.h

…

scriptpubkeyman.cpp

policy: Add OP_1 <0x4e73> as a standard output type

2024-07-30 14:06:58 -04:00

scriptpubkeyman.h

Merge bitcoin/bitcoin#30406: refactor: modernize-use-equals-default

2024-07-11 19:08:46 +01:00

spend.cpp

Merge bitcoin/bitcoin#29523: Wallet: Add max_tx_weight to transaction funding options (take 2)

2024-07-17 18:27:59 -04:00

spend.h

refactor: pass CRecipient to FundTransaction

2024-01-19 15:04:56 +01:00

sqlite.cpp

wallet: use LogTrace for walletdb log messages at trace level

2024-06-28 17:41:52 +10:00

sqlite.h

tidy: modernize-use-equals-default

2024-07-08 11:12:01 +02:00

transaction.cpp

scripted-diff: wallet: s/TxStateConflicted/TxStateBlockConflicted

2024-03-14 17:38:39 -04:00

transaction.h

util: Move util/string.h functions to util namespace

2024-05-16 10:16:08 -05:00

types.h

util: move error.h TransactionError enum to node/types.h

2024-05-16 10:16:08 -05:00

wallet.cpp

Merge bitcoin/bitcoin#30357: Fix cases of calls to FillPSBT errantly returning complete=true

2024-07-16 17:10:19 -04:00

wallet.h

Merge bitcoin/bitcoin#26596: wallet: Migrate legacy wallets to descriptor wallets without requiring BDB

2024-07-11 16:47:02 +01:00

walletdb.cpp

wallet: Use LegacyDataSPKM when loading

2024-07-01 14:25:55 -04:00

walletdb.h

wallet: db, introduce 'RunWithinTxn()' helper function

2024-02-12 16:05:14 -03:00

wallettool.cpp

Merge bitcoin/bitcoin#26606: wallet: Implement independent BDB parser

2024-05-21 10:05:09 +01:00

wallettool.h

…

walletutil.cpp

wallet, descspkm: Refactor wallet descriptor generation to standalone func

2024-03-20 16:15:43 -04:00

walletutil.h

tidy: modernize-use-equals-default

2024-07-08 11:12:01 +02:00