feat: asset lock tx v2 with basic RPC support + tests #7294
Annotations
3 warnings
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7294,
conflictPrs: [
{
number: 6182,
files: [
'src/governance/common.cpp',
'src/governance/common.h',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/governance/object.h',
'src/interfaces/node.h',
'src/rpc/governance.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/feature_governance.py',
'test/functional/feature_governance_cl.py',
'test/functional/feature_governance_objects.py',
'test/functional/interface_zmq_dash.py',
'test/functional/test_framework/governance.py',
'test/functional/test_framework/messages.py'
],
conflicts: [ 'src/wallet/wallet.h' ]
},
{
number: 6845,
files: [
'src/crypto/ripemd160.cpp',
'src/crypto/ripemd160.h',
'src/crypto/sha1.cpp',
'src/crypto/sha1.h',
'src/crypto/sha256.cpp',
'src/crypto/sha256.h',
'src/crypto/sha512.cpp',
'src/crypto/sha512.h',
'src/cuckoocache.h',
'src/dbwrapper.h',
'src/key.h',
'src/policy/fees.cpp',
'src/policy/fees.h',
'src/serialize.h',
'src/span.h',
'src/streams.h',
'src/support/lockedpool.cpp',
'src/support/lockedpool.h',
'src/test/util/net.h',
'src/tinyformat.h',
'src/torcontrol.cpp',
'src/torcontrol.h',
'src/univalue/include/univalue_utffilter.h',
'src/util/sock.h',
'src/wallet/bdb.cpp',
'src/wallet/bdb.h',
'src/wallet/db.h',
'src/wallet/wallet.h',
'src/zmq/zmqabstractnotifier.h',
'src/zmq/zmqnotificationinterface.h',
'test/functional/p2p_getaddr_caching.py',
'test/functional/test_framework/test_node.py'
],
conflicts: [ 'src/wallet/wallet.h' ]
},
{
number: 7037,
files: [
'doc/release-notes-remove-rescan.md',
'src/dummywallet.cpp',
'src/init.cpp',
'src/wallet/init.cpp',
'src/wallet/rpc/backup.cpp',
'src/wallet/rpc/wallet.cpp',
'src/wallet/salvage.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'src/wallet/wallettool.cpp',
'test/functional/feature_notifications.py',
'test/functional/wallet_basic.py',
'test/functional/wallet_hd.py',
'test/functional/wallet_upgradetohd.py'
],
conflicts: [ 'src/wallet/wallet.h' ]
},
{
number: 6904,
files: [
'ci/dash/lint-tidy.sh',
'doc/REST-interface.md',
'doc/release-notes-6888.md',
'src/Makefile.am',
'src/bench/duplicate_inputs.cpp',
'src/bitcoind.cpp',
'src/bls/bls.cpp',
'src/bls/bls.h',
'src/coinjoin/client.cpp',
'src/deploymentstatus.cpp',
'src/deploymentstatus.h',
'src/evo/creditpool.cpp',
'src/evo/creditpool.h',
'src/evo/deterministicmns.cpp',
'src/evo/deterministicmns.h',
'src/evo/mnhftx.cpp',
'src/evo/mnhftx.h',
'src/evo/providertx.cpp',
'src/evo/providertx.h',
'src/evo/smldiff.cpp',
'src/evo/specialtxman.cpp',
'src/governance/classes.cpp',
'src/governance/governance.cpp',
'src/index/base.cpp',
'src/index/base.h',
'src/index/blockfilterindex.cpp',
'src/index/blockfilterindex.h',
'src/index/coinstatsindex.cpp',
'src/index/coinstatsindex.h',
'src/index/txindex.cpp',
'src/index/txindex.h',
'src/init.cpp',
'src/init.h',
'src/init/common.cpp',
'src/init/common.h',
'src/interfaces/chain.h',
'src/interfaces/node.h',
'src/kernel/chain.cpp',
'src/kernel/chain.h',
'src/kernel/checks.cpp',
'src/kernel/checks.h',
'src/kernel/context.cpp',
'src/ke
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
background
wait
wait-all
cancel
Loading