From ace417fc3c1fb25f586aaf8228d1dd192badfc2d Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Tue, 23 Jun 2026 15:13:52 -0700 Subject: [PATCH] multi: update to btcd v2 modules Bump btcd to v0.26.0 and adopt its new per-package v2 modules: wire/v2, txscript/v2, chaincfg/v2, chainhash/v2, btcutil/v2, psbt/v2, and btcec/v2 v2.5.0. The address symbols that moved out of btcutil into the new address package (Hash160, DecodeAddress, the Address types and the NewAddress* constructors) are imported as btcaddr to avoid shadowing by local "address" variables. bech32 stays on the v1 btcutil path. The migrated dependencies are pulled in via temporary replaces until they are tagged: btcwallet, neutrino, and lightning-onion. btcec/v2 v2.5.0 requires Go 1.25, so the Go version is bumped to 1.25.11. --- autopilot/agent.go | 2 +- autopilot/agent_constraints.go | 2 +- autopilot/agent_constraints_test.go | 2 +- autopilot/agent_test.go | 4 +- autopilot/centrality_testdata_test.go | 2 +- autopilot/combinedattach.go | 2 +- autopilot/externalscoreattach.go | 2 +- autopilot/externalscoreattach_test.go | 2 +- autopilot/graph.go | 2 +- autopilot/graph_test.go | 2 +- autopilot/interface.go | 4 +- autopilot/manager.go | 2 +- autopilot/prefattach.go | 2 +- autopilot/prefattach_test.go | 4 +- autopilot/top_centrality.go | 2 +- autopilot/top_centrality_test.go | 2 +- blockcache/blockcache.go | 6 +- blockcache/blockcache_test.go | 6 +- bolt12/validate.go | 2 +- chainntnfs/best_block_view.go | 2 +- chainntnfs/best_block_view_test.go | 4 +- chainntnfs/bitcoindnotify/bitcoind.go | 10 +-- chainntnfs/bitcoindnotify/bitcoind_dev.go | 2 +- chainntnfs/bitcoindnotify/bitcoind_test.go | 2 +- chainntnfs/bitcoindnotify/driver.go | 2 +- chainntnfs/btcdnotify/btcd.go | 10 +-- chainntnfs/btcdnotify/btcd_dev.go | 2 +- chainntnfs/btcdnotify/btcd_test.go | 2 +- chainntnfs/btcdnotify/driver.go | 2 +- chainntnfs/interface.go | 6 +- chainntnfs/interface_dev.go | 2 +- chainntnfs/mempool.go | 4 +- chainntnfs/mempool_test.go | 4 +- chainntnfs/mocks.go | 4 +- chainntnfs/neutrinonotify/neutrino.go | 10 +-- chainntnfs/neutrinonotify/neutrino_dev.go | 2 +- chainntnfs/test/test_interface.go | 6 +- chainntnfs/test_utils.go | 12 +-- chainntnfs/txnotifier.go | 8 +- chainntnfs/txnotifier_test.go | 6 +- chainparams/store.go | 2 +- chainparams/store_test.go | 2 +- chainreg/chainparams.go | 4 +- chainreg/chainregistry.go | 2 +- chainreg/no_chain_backend.go | 12 +-- chanacceptor/acceptor_test.go | 4 +- chanacceptor/interface.go | 2 +- chanacceptor/merge.go | 2 +- chanacceptor/rpcacceptor.go | 4 +- chanacceptor/rpcacceptor_test.go | 4 +- chanbackup/backup.go | 2 +- chanbackup/backup_test.go | 2 +- chanbackup/pubsub.go | 2 +- chanbackup/pubsub_test.go | 2 +- chanbackup/single.go | 6 +- chanbackup/single_test.go | 4 +- chanfitness/chanevent.go | 2 +- chanfitness/chanevent_test.go | 2 +- chanfitness/chaneventstore.go | 2 +- chanfitness/chaneventstore_test.go | 2 +- chanfitness/chaneventstore_testctx_test.go | 4 +- chanfitness/interface.go | 2 +- channel_notifier.go | 2 +- channeldb/channel.go | 6 +- channeldb/channel_test.go | 6 +- channeldb/close_channel_test.go | 2 +- channeldb/codec.go | 6 +- channeldb/db.go | 2 +- channeldb/db_test.go | 6 +- channeldb/forwarding_package_test.go | 2 +- channeldb/height_hint_test.go | 4 +- .../migration/lnwire21/accept_channel.go | 2 +- .../lnwire21/channel_announcement.go | 2 +- channeldb/migration/lnwire21/channel_id.go | 4 +- .../migration/lnwire21/channel_update.go | 2 +- .../migration/lnwire21/closing_signed.go | 2 +- .../migration/lnwire21/funding_created.go | 2 +- .../lnwire21/gossip_timestamp_range.go | 2 +- channeldb/migration/lnwire21/lnwire.go | 6 +- channeldb/migration/lnwire21/msat.go | 2 +- channeldb/migration/lnwire21/netaddress.go | 2 +- channeldb/migration/lnwire21/open_channel.go | 4 +- .../migration/lnwire21/query_channel_range.go | 2 +- .../lnwire21/query_short_chan_ids.go | 2 +- .../lnwire21/reply_short_chan_ids_end.go | 2 +- channeldb/migration12/invoices.go | 2 +- channeldb/migration16/migration.go | 2 +- channeldb/migration20/codec.go | 2 +- channeldb/migration20/migration.go | 2 +- .../migration21/common/enclosed_types.go | 6 +- .../migration21/current/current_codec.go | 6 +- channeldb/migration21/legacy/legacy_codec.go | 6 +- channeldb/migration21/migration_test.go | 4 +- channeldb/migration24/migration_test.go | 6 +- channeldb/migration25/migration_test.go | 6 +- channeldb/migration26/migration_test.go | 4 +- channeldb/migration27/migration_test.go | 4 +- channeldb/migration29/codec.go | 2 +- channeldb/migration29/migration.go | 2 +- channeldb/migration30/iterator_test.go | 6 +- channeldb/migration30/lnwallet.go | 2 +- channeldb/migration30/revocation_log.go | 2 +- channeldb/migration30/test_mock.go | 2 +- channeldb/migration30/test_utils.go | 6 +- channeldb/migration32/codec.go | 2 +- .../migration32/mission_control_store.go | 2 +- channeldb/migration32/route.go | 2 +- channeldb/migration_01_to_11/channel.go | 6 +- channeldb/migration_01_to_11/channel_test.go | 6 +- channeldb/migration_01_to_11/codec.go | 6 +- channeldb/migration_01_to_11/graph.go | 6 +- channeldb/migration_01_to_11/invoices.go | 2 +- .../migration_11_invoices.go | 4 +- .../migration_11_invoices_test.go | 2 +- .../migration_01_to_11/migrations_test.go | 2 +- channeldb/migration_01_to_11/payments.go | 2 +- channeldb/migration_01_to_11/zpay32/decode.go | 18 ++--- .../migration_01_to_11/zpay32/invoice.go | 8 +- channeldb/nodes.go | 2 +- channeldb/nodes_test.go | 2 +- channeldb/reports.go | 6 +- channeldb/reports_test.go | 4 +- channeldb/revocation_log.go | 2 +- channeldb/revocation_log_test.go | 2 +- channelnotifier/channelnotifier.go | 2 +- channelnotifier/channelnotifier_test.go | 4 +- chanrestore.go | 6 +- chanstate/interface.go | 2 +- cmd/commands/chainrpc_active.go | 4 +- cmd/commands/cmd_mission_control.go | 2 +- cmd/commands/cmd_open_channel.go | 6 +- cmd/commands/cmd_payments.go | 2 +- cmd/commands/cmd_profile.go | 2 +- cmd/commands/commands.go | 4 +- cmd/commands/main.go | 4 +- cmd/commands/walletrpc_active.go | 12 +-- config.go | 4 +- config_builder.go | 6 +- contractcourt/anchor_resolver.go | 6 +- contractcourt/breach_arbitrator.go | 8 +- contractcourt/breach_arbitrator_test.go | 8 +- contractcourt/briefcase.go | 6 +- contractcourt/briefcase_test.go | 6 +- contractcourt/chain_arbitrator.go | 8 +- contractcourt/chain_arbitrator_test.go | 4 +- contractcourt/chain_watcher.go | 13 ++-- .../chain_watcher_coop_reorg_test.go | 2 +- contractcourt/chain_watcher_reorg_test.go | 2 +- contractcourt/chain_watcher_test.go | 2 +- contractcourt/chain_watcher_test_harness.go | 4 +- contractcourt/channel_arbitrator.go | 8 +- contractcourt/channel_arbitrator_test.go | 6 +- contractcourt/commit_sweep_resolver.go | 8 +- contractcourt/commit_sweep_resolver_test.go | 4 +- contractcourt/config.go | 2 +- contractcourt/config_test.go | 2 +- contractcourt/contract_resolver.go | 2 +- .../htlc_incoming_contest_resolver.go | 4 +- .../htlc_incoming_contest_resolver_test.go | 2 +- contractcourt/htlc_lease_resolver.go | 2 +- .../htlc_outgoing_contest_resolver.go | 2 +- .../htlc_outgoing_contest_resolver_test.go | 2 +- contractcourt/htlc_success_resolver.go | 8 +- contractcourt/htlc_success_resolver_test.go | 6 +- contractcourt/htlc_timeout_resolver.go | 8 +- contractcourt/htlc_timeout_resolver_test.go | 8 +- contractcourt/interfaces.go | 2 +- contractcourt/nursery_store.go | 4 +- contractcourt/nursery_store_test.go | 4 +- contractcourt/utxonursery.go | 6 +- contractcourt/utxonursery_test.go | 8 +- discovery/chan_series.go | 2 +- discovery/gossiper.go | 13 ++-- discovery/gossiper_test.go | 8 +- discovery/mock_test.go | 2 +- discovery/sync_manager.go | 2 +- discovery/syncer.go | 2 +- discovery/syncer_queue_test.go | 2 +- discovery/syncer_test.go | 4 +- funding/aux_funding.go | 2 +- funding/batch.go | 10 +-- funding/batch_test.go | 8 +- funding/manager.go | 8 +- funding/manager_test.go | 8 +- go.mod | 39 ++++++++-- go.sum | 73 +++++++++++-------- graph/builder.go | 2 +- graph/builder_test.go | 8 +- graph/db/benchmark_test.go | 2 +- graph/db/channel_cache_test.go | 2 +- graph/db/codec.go | 2 +- graph/db/graph.go | 4 +- graph/db/graph_cache.go | 2 +- graph/db/graph_test.go | 8 +- graph/db/interfaces.go | 4 +- graph/db/kv_store.go | 4 +- graph/db/migration1/codec.go | 2 +- graph/db/migration1/kv_store.go | 4 +- .../db/migration1/models/channel_edge_info.go | 6 +- graph/db/migration1/sql_migration.go | 2 +- graph/db/migration1/sql_migration_test.go | 8 +- graph/db/migration1/sql_store.go | 6 +- graph/db/migration1/test_postgres.go | 2 +- graph/db/migration1/test_sqlite.go | 2 +- graph/db/models/cached_edge_info.go | 2 +- graph/db/models/channel_edge_info.go | 6 +- graph/db/models/channel_edge_info_test.go | 2 +- graph/db/notifications.go | 4 +- graph/db/sql_store.go | 6 +- graph/db/test_postgres.go | 2 +- graph/db/test_sqlite.go | 2 +- graph/notifications_test.go | 8 +- htlcswitch/circuit_map_test.go | 4 +- htlcswitch/circuit_test.go | 2 +- htlcswitch/hop/forwarding_info.go | 2 +- htlcswitch/hop/iterator.go | 2 +- htlcswitch/hop/payload.go | 2 +- htlcswitch/interfaces.go | 4 +- htlcswitch/link.go | 4 +- htlcswitch/link_test.go | 6 +- htlcswitch/mailbox_test.go | 2 +- htlcswitch/mock.go | 4 +- htlcswitch/switch.go | 4 +- htlcswitch/switch_test.go | 2 +- htlcswitch/test_utils.go | 6 +- input/fuzz_script_is_op_return_test.go | 4 +- input/input.go | 6 +- input/mocks.go | 4 +- input/script_desc.go | 2 +- input/script_utils.go | 20 ++--- input/script_utils_legacy_test.go | 16 ++-- input/script_utils_test.go | 8 +- input/signdescriptor.go | 4 +- input/signdescriptor_test.go | 4 +- input/signer.go | 2 +- input/size.go | 4 +- input/size_test.go | 19 ++--- input/taproot.go | 4 +- input/taproot_test.go | 6 +- input/test_utils.go | 16 ++-- input/txout.go | 2 +- input/txout_test.go | 2 +- input/witnessgen.go | 4 +- internal/musig2v040/keys.go | 2 +- internal/musig2v040/musig2_test.go | 2 +- internal/musig2v040/nonces.go | 2 +- internal/musig2v040/sign.go | 2 +- invoices/interface.go | 2 +- invoices/invoice_expiry_watcher.go | 2 +- invoices/test_utils.go | 4 +- invoices/test_utils_test.go | 4 +- invoices/update.go | 2 +- itest/lnd_amp_test.go | 2 +- itest/lnd_bump_fee.go | 4 +- itest/lnd_channel_backup_test.go | 4 +- itest/lnd_channel_balance_test.go | 2 +- itest/lnd_channel_force_close_test.go | 4 +- itest/lnd_channel_funding_fund_max_test.go | 2 +- ...lnd_channel_funding_utxo_selection_test.go | 2 +- itest/lnd_channel_graph_test.go | 2 +- itest/lnd_channel_policy_test.go | 2 +- .../lnd_coop_close_external_delivery_test.go | 11 +-- itest/lnd_coop_close_rbf_test.go | 4 +- itest/lnd_coop_close_with_htlcs_test.go | 4 +- itest/lnd_estimate_on_chain_fee_test.go | 2 +- itest/lnd_estimate_route_fee_test.go | 2 +- itest/lnd_etcd_failover_test.go | 2 +- itest/lnd_experimental_accountability.go | 2 +- itest/lnd_forward_delete_test.go | 2 +- itest/lnd_forward_interceptor_test.go | 2 +- itest/lnd_funding_test.go | 8 +- itest/lnd_graph.go | 2 +- itest/lnd_hold_persistence_test.go | 2 +- itest/lnd_htlc_test.go | 2 +- itest/lnd_htlc_timeout_resolver_test.go | 2 +- itest/lnd_invoice_acceptor_test.go | 2 +- itest/lnd_max_channel_size_test.go | 2 +- itest/lnd_misc_test.go | 8 +- itest/lnd_mpp_test.go | 2 +- itest/lnd_multi-hop-payments_test.go | 2 +- itest/lnd_multi-hop_force_close_test.go | 2 +- itest/lnd_network_test.go | 2 +- itest/lnd_neutrino_headers_import_test.go | 2 +- itest/lnd_nonstd_sweep_test.go | 13 ++-- itest/lnd_onchain_test.go | 8 +- itest/lnd_onion_message_forward_test.go | 2 +- itest/lnd_onion_message_test.go | 2 +- itest/lnd_open_channel_test.go | 4 +- itest/lnd_payment_test.go | 2 +- itest/lnd_postgres_network_separation_test.go | 2 +- itest/lnd_psbt_test.go | 33 +++++---- itest/lnd_quiescence_test.go | 2 +- itest/lnd_recovery_test.go | 15 ++-- itest/lnd_remote_signer_test.go | 4 +- itest/lnd_res_handoff_test.go | 2 +- itest/lnd_revocation_test.go | 6 +- itest/lnd_route_blinding_test.go | 2 +- itest/lnd_routing_test.go | 2 +- itest/lnd_rpc_middleware_interceptor_test.go | 2 +- itest/lnd_signer_test.go | 14 ++-- itest/lnd_single_hop_invoice_test.go | 2 +- itest/lnd_sweep_test.go | 6 +- itest/lnd_switch_test.go | 2 +- itest/lnd_taproot_test.go | 31 ++++---- itest/lnd_test.go | 2 +- itest/lnd_trackpayments_test.go | 2 +- itest/lnd_wallet.go | 4 +- itest/lnd_wallet_import_test.go | 19 ++--- itest/lnd_watchtower_test.go | 2 +- itest/lnd_wumbo_channels_test.go | 2 +- itest/lnd_zero_conf_close_event_test.go | 2 +- itest/lnd_zero_conf_test.go | 2 +- keychain/btcwallet.go | 4 +- keychain/interface_test.go | 4 +- keychain/signer.go | 2 +- lnd.go | 4 +- lnmock/chain.go | 12 +-- lnpeer/mock_peer.go | 2 +- lnpeer/peer.go | 2 +- lnrpc/chainrpc/chain_server.go | 4 +- lnrpc/devrpc/config_active.go | 2 +- lnrpc/devrpc/dev_server.go | 6 +- lnrpc/invoicesrpc/addinvoice.go | 11 +-- lnrpc/invoicesrpc/addinvoice_test.go | 4 +- lnrpc/invoicesrpc/config_active.go | 2 +- lnrpc/invoicesrpc/htlc_modifier.go | 2 +- lnrpc/invoicesrpc/utils.go | 2 +- lnrpc/marshall_utils.go | 8 +- lnrpc/neutrinorpc/neutrino_server.go | 4 +- lnrpc/routerrpc/router_backend.go | 6 +- lnrpc/routerrpc/router_backend_test.go | 4 +- lnrpc/routerrpc/router_server.go | 4 +- lnrpc/routerrpc/router_server_test.go | 4 +- lnrpc/routerrpc/routing_config.go | 2 +- lnrpc/rpc_utils.go | 2 +- lnrpc/signrpc/signer_server.go | 6 +- lnrpc/walletrpc/config_active.go | 2 +- lnrpc/walletrpc/psbt.go | 2 +- lnrpc/walletrpc/walletkit_server.go | 45 ++++++------ lnrpc/walletrpc/walletkit_server_test.go | 10 +-- lnrpc/walletrpc/walletkit_util.go | 4 +- lntest/bitcoind.go | 2 +- lntest/bitcoind_common.go | 2 +- lntest/bitcoind_notxindex.go | 2 +- lntest/bitcoind_rpcpolling.go | 2 +- lntest/btcd.go | 2 +- lntest/channels/channels.go | 4 +- lntest/harness.go | 15 ++-- lntest/harness_assertion.go | 33 +++++---- lntest/harness_miner.go | 9 ++- lntest/miner/bitcoind_miner.go | 13 ++-- lntest/miner/btcd_miner.go | 9 ++- lntest/miner/interface.go | 9 ++- lntest/miner/miner.go | 11 +-- lntest/mock/chainio.go | 6 +- lntest/mock/chainnotifier.go | 4 +- lntest/mock/secretkeyring.go | 4 +- lntest/mock/signer.go | 6 +- lntest/mock/spendnotifier.go | 2 +- lntest/mock/walletcontroller.go | 27 +++---- lntest/neutrino.go | 2 +- lntest/node/config.go | 2 +- lntest/node/state.go | 2 +- lntest/node/watcher.go | 2 +- lntest/rpc/harness_rpc.go | 2 +- lntest/unittest/backend.go | 2 +- lntest/utils.go | 4 +- lnwallet/aux_leaf_store.go | 6 +- lnwallet/aux_resolutions.go | 4 +- lnwallet/aux_signer.go | 2 +- lnwallet/btcwallet/blockchain.go | 6 +- lnwallet/btcwallet/btcwallet.go | 33 +++++---- lnwallet/btcwallet/btcwallet_test.go | 2 +- lnwallet/btcwallet/config.go | 4 +- lnwallet/btcwallet/psbt.go | 10 +-- lnwallet/btcwallet/psbt_test.go | 34 ++++----- lnwallet/btcwallet/signer.go | 17 +++-- lnwallet/btcwallet/signer_test.go | 13 ++-- lnwallet/chainfee/estimator.go | 2 +- lnwallet/chainfee/estimator_test.go | 2 +- lnwallet/chainfee/filtermanager.go | 2 +- lnwallet/chainfee/rates.go | 2 +- lnwallet/chancloser/aux_closer.go | 2 +- lnwallet/chancloser/chancloser.go | 11 +-- lnwallet/chancloser/chancloser_test.go | 10 +-- lnwallet/chancloser/interface.go | 4 +- lnwallet/chancloser/mock.go | 6 +- lnwallet/chancloser/rbf_coop_states.go | 6 +- lnwallet/chancloser/rbf_coop_test.go | 10 +-- lnwallet/chancloser/rbf_coop_transitions.go | 8 +- lnwallet/chanfunding/canned_assembler.go | 6 +- lnwallet/chanfunding/coin_select.go | 4 +- lnwallet/chanfunding/coin_select_test.go | 4 +- lnwallet/chanfunding/interface.go | 9 ++- lnwallet/chanfunding/psbt_assembler.go | 15 ++-- lnwallet/chanfunding/psbt_assembler_test.go | 15 ++-- lnwallet/chanfunding/wallet_assembler.go | 8 +- lnwallet/channel.go | 10 +-- lnwallet/channel_revoke_nonces_test.go | 2 +- lnwallet/channel_test.go | 10 +-- lnwallet/chanvalidate/validate.go | 6 +- lnwallet/chanvalidate/validate_test.go | 8 +- lnwallet/close_test.go | 2 +- lnwallet/commit_sort.go | 4 +- lnwallet/commit_sort_test.go | 2 +- lnwallet/commitment.go | 8 +- lnwallet/config.go | 2 +- lnwallet/confscale.go | 2 +- lnwallet/confscale_integration.go | 2 +- lnwallet/confscale_prod.go | 2 +- lnwallet/confscale_test.go | 2 +- lnwallet/errors.go | 4 +- lnwallet/interface.go | 31 ++++---- lnwallet/mock.go | 25 ++++--- lnwallet/musig_session.go | 6 +- lnwallet/musig_session_test.go | 2 +- lnwallet/parameters.go | 4 +- lnwallet/parameters_test.go | 2 +- lnwallet/rebroadcaster.go | 4 +- lnwallet/rebroadcaster_test.go | 4 +- lnwallet/reservation.go | 6 +- lnwallet/revocation_producer_itest.go | 2 +- lnwallet/rpcwallet/rpcwallet.go | 18 ++--- lnwallet/rpcwallet/rpcwallet_test.go | 8 +- lnwallet/sigpool.go | 2 +- lnwallet/taproot_test_vectors_test.go | 8 +- lnwallet/test/test_interface.go | 25 ++++--- lnwallet/test_utils.go | 6 +- lnwallet/transactions.go | 4 +- lnwallet/transactions_test.go | 8 +- lnwallet/types/close_types.go | 4 +- lnwallet/wallet.go | 17 +++-- lnwire/accept_channel.go | 2 +- lnwire/channel_announcement.go | 2 +- lnwire/channel_announcement_2.go | 4 +- lnwire/channel_id.go | 4 +- lnwire/channel_reestablish.go | 2 +- lnwire/channel_update.go | 2 +- lnwire/channel_update_2.go | 4 +- lnwire/closing_complete.go | 2 +- lnwire/closing_sig.go | 2 +- lnwire/closing_signed.go | 2 +- lnwire/dyn_commit.go | 2 +- lnwire/dyn_propose.go | 2 +- lnwire/funding_created.go | 2 +- lnwire/gossip_timestamp_range.go | 2 +- lnwire/interfaces.go | 2 +- lnwire/lnwire.go | 6 +- lnwire/lnwire_test.go | 4 +- lnwire/local_nonces.go | 2 +- lnwire/local_nonces_test.go | 2 +- lnwire/message_test.go | 2 +- lnwire/msat.go | 2 +- lnwire/msat_test.go | 2 +- lnwire/netaddress.go | 2 +- lnwire/open_channel.go | 4 +- lnwire/outpoint.go | 2 +- lnwire/outpoint_test.go | 4 +- lnwire/query_channel_range.go | 2 +- lnwire/query_short_chan_ids.go | 2 +- lnwire/reply_channel_range.go | 2 +- lnwire/reply_short_chan_ids_end.go | 2 +- lnwire/test_message.go | 4 +- lnwire/test_utils.go | 4 +- lnwire/writer.go | 4 +- lnwire/writer_test.go | 6 +- netann/chan_status_manager.go | 2 +- netann/chan_status_manager_test.go | 4 +- netann/channel_announcement.go | 10 +-- netann/channel_announcement_test.go | 23 +++--- netann/channel_state.go | 2 +- netann/channel_update.go | 4 +- netann/interface.go | 2 +- netann/msg_hash.go | 2 +- netann/node_announcement.go | 2 +- netann/node_announcement_test.go | 2 +- payments/db/kv_store.go | 2 +- payments/db/kv_store_test.go | 2 +- payments/db/migration1/codec.go | 2 +- payments/db/migration1/kv_store.go | 2 +- payments/db/migration1/lnwire/channel_id.go | 4 +- .../db/migration1/lnwire/channel_update.go | 2 +- payments/db/migration1/lnwire/interfaces.go | 2 +- payments/db/migration1/lnwire/lnwire.go | 2 +- payments/db/migration1/lnwire/msat.go | 2 +- payments/db/migration1/lnwire/writer.go | 2 +- payments/db/payment_test.go | 2 +- peer/brontide.go | 6 +- peer/brontide_test.go | 11 +-- peer/chan_observer.go | 2 +- peer/daemon_adapters.go | 4 +- peer/musig_nonce_order_test.go | 10 +-- peer/rbf_close_wrapper_actor.go | 2 +- peer/rbf_close_wrapper_actor_test.go | 2 +- peer/test_utils.go | 6 +- pilot.go | 4 +- protofsm/daemon_events.go | 4 +- protofsm/state_machine.go | 4 +- protofsm/state_machine_test.go | 4 +- routing/bandwidth_test.go | 2 +- routing/blindedpath/blinded_path.go | 2 +- routing/chainview/bitcoind.go | 4 +- routing/chainview/btcd.go | 9 ++- routing/chainview/interface.go | 4 +- routing/chainview/interface_test.go | 13 ++-- routing/chainview/neutrino.go | 8 +- routing/graph.go | 2 +- routing/integrated_routing_test.go | 2 +- routing/localchans/manager.go | 2 +- routing/localchans/manager_test.go | 8 +- routing/missioncontrol.go | 2 +- routing/mock_graph_test.go | 2 +- routing/mock_test.go | 2 +- routing/pathfind.go | 2 +- routing/pathfind_test.go | 8 +- routing/probability_apriori.go | 2 +- routing/probability_apriori_test.go | 2 +- routing/probability_bimodal.go | 2 +- routing/probability_estimator.go | 2 +- routing/router.go | 2 +- routing/router_test.go | 6 +- routing/unified_edges.go | 2 +- routing/unified_edges_test.go | 2 +- rpcperms/middleware_handler.go | 2 +- rpcserver.go | 21 +++--- server.go | 10 +-- shachain/element.go | 2 +- shachain/producer.go | 2 +- shachain/producer_test.go | 2 +- shachain/store.go | 2 +- shachain/store_test.go | 2 +- shachain/utils.go | 2 +- subrpcserver_config.go | 2 +- sweep/aggregator.go | 4 +- sweep/aggregator_test.go | 6 +- sweep/fee_bumper.go | 8 +- sweep/fee_bumper_test.go | 6 +- sweep/fee_function.go | 2 +- sweep/interface.go | 6 +- sweep/mock_test.go | 6 +- sweep/store.go | 4 +- sweep/store_test.go | 4 +- sweep/sweeper.go | 6 +- sweep/sweeper_test.go | 6 +- sweep/test_utils.go | 4 +- sweep/tx_input_set.go | 6 +- sweep/tx_input_set_test.go | 6 +- sweep/txgenerator.go | 6 +- sweep/txgenerator_test.go | 4 +- sweep/walletsweep.go | 11 +-- sweep/walletsweep_test.go | 10 +-- sweep/weight_estimator.go | 6 +- sweep/weight_estimator_test.go | 10 +-- sweeper_wallet.go | 2 +- types.go | 2 +- walletunlocker/service.go | 4 +- walletunlocker/service_test.go | 2 +- watchtower/blob/commitments.go | 2 +- watchtower/blob/derivation.go | 2 +- watchtower/blob/justice_kit.go | 6 +- watchtower/blob/justice_kit_packet.go | 2 +- watchtower/blob/justice_kit_test.go | 4 +- watchtower/config.go | 8 +- watchtower/lookout/interface.go | 4 +- watchtower/lookout/justice_descriptor.go | 8 +- watchtower/lookout/justice_descriptor_test.go | 8 +- watchtower/lookout/lookout.go | 4 +- watchtower/lookout/lookout_test.go | 2 +- watchtower/lookout/mock.go | 4 +- watchtower/lookout/punisher.go | 2 +- watchtower/wtclient/backup_task.go | 10 +-- .../wtclient/backup_task_internal_test.go | 13 ++-- watchtower/wtclient/client_test.go | 14 ++-- watchtower/wtclient/manager.go | 2 +- watchtower/wtclient/session_negotiator.go | 2 +- watchtower/wtclient/session_queue.go | 2 +- watchtower/wtdb/migration8/codec.go | 2 +- watchtower/wtdb/tower_db.go | 2 +- watchtower/wtdb/tower_db_test.go | 2 +- watchtower/wtmock/signer.go | 4 +- watchtower/wtpolicy/policy.go | 4 +- watchtower/wtserver/create_session.go | 2 +- watchtower/wtserver/server.go | 6 +- watchtower/wtserver/server_test.go | 10 +-- watchtower/wtwire/init.go | 2 +- watchtower/wtwire/init_test.go | 4 +- watchtower/wtwire/wtwire.go | 4 +- watchtower/wtwire/wtwire_test.go | 2 +- zpay32/decode.go | 22 +++--- zpay32/encode.go | 16 ++-- zpay32/fuzz_test.go | 2 +- zpay32/invoice.go | 8 +- zpay32/invoice_internal_test.go | 6 +- zpay32/invoice_test.go | 18 ++--- 594 files changed, 1543 insertions(+), 1468 deletions(-) diff --git a/autopilot/agent.go b/autopilot/agent.go index cbb29f38ca5..793e38d06ac 100644 --- a/autopilot/agent.go +++ b/autopilot/agent.go @@ -10,7 +10,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnutils" "github.com/lightningnetwork/lnd/lnwire" diff --git a/autopilot/agent_constraints.go b/autopilot/agent_constraints.go index 63c7ac511e2..1b006ba4730 100644 --- a/autopilot/agent_constraints.go +++ b/autopilot/agent_constraints.go @@ -1,7 +1,7 @@ package autopilot import ( - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) // AgentConstraints is an interface the agent will query to determine what diff --git a/autopilot/agent_constraints_test.go b/autopilot/agent_constraints_test.go index 64152cef8ab..59d4932f235 100644 --- a/autopilot/agent_constraints_test.go +++ b/autopilot/agent_constraints_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/autopilot/agent_test.go b/autopilot/agent_test.go index 82c21a2ffc1..0dbe4f112ee 100644 --- a/autopilot/agent_test.go +++ b/autopilot/agent_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/stretchr/testify/require" ) diff --git a/autopilot/centrality_testdata_test.go b/autopilot/centrality_testdata_test.go index 38a9045af5c..756feda42ea 100644 --- a/autopilot/centrality_testdata_test.go +++ b/autopilot/centrality_testdata_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/stretchr/testify/require" ) diff --git a/autopilot/combinedattach.go b/autopilot/combinedattach.go index 9064a822973..d98fa5a9741 100644 --- a/autopilot/combinedattach.go +++ b/autopilot/combinedattach.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) // WeightedHeuristic is a tuple that associates a weight to an diff --git a/autopilot/externalscoreattach.go b/autopilot/externalscoreattach.go index a979e15ee8b..1db25fb72cb 100644 --- a/autopilot/externalscoreattach.go +++ b/autopilot/externalscoreattach.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) // ExternalScoreAttachment is an implementation of the AttachmentHeuristic diff --git a/autopilot/externalscoreattach_test.go b/autopilot/externalscoreattach_test.go index 7bf440aa53c..5219a56fdcc 100644 --- a/autopilot/externalscoreattach_test.go +++ b/autopilot/externalscoreattach_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/autopilot" ) diff --git a/autopilot/graph.go b/autopilot/graph.go index 19bd3808a43..d2876ed91e6 100644 --- a/autopilot/graph.go +++ b/autopilot/graph.go @@ -8,7 +8,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" diff --git a/autopilot/graph_test.go b/autopilot/graph_test.go index 9a52e67c894..b199c463d8f 100644 --- a/autopilot/graph_test.go +++ b/autopilot/graph_test.go @@ -3,7 +3,7 @@ package autopilot_test import ( "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/autopilot" ) diff --git a/autopilot/interface.go b/autopilot/interface.go index 71813232ab9..8c24e03407b 100644 --- a/autopilot/interface.go +++ b/autopilot/interface.go @@ -5,8 +5,8 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" diff --git a/autopilot/manager.go b/autopilot/manager.go index 600a1055b27..aa56d15b955 100644 --- a/autopilot/manager.go +++ b/autopilot/manager.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" diff --git a/autopilot/prefattach.go b/autopilot/prefattach.go index 7d36674dc5f..b90a15e7e56 100644 --- a/autopilot/prefattach.go +++ b/autopilot/prefattach.go @@ -6,7 +6,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) // minMedianChanSizeFraction determines the minimum size a channel must have to diff --git a/autopilot/prefattach_test.go b/autopilot/prefattach_test.go index 9ff9d30cca3..d836a7b60a4 100644 --- a/autopilot/prefattach_test.go +++ b/autopilot/prefattach_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" diff --git a/autopilot/top_centrality.go b/autopilot/top_centrality.go index e96b3409784..39e10a434f4 100644 --- a/autopilot/top_centrality.go +++ b/autopilot/top_centrality.go @@ -4,7 +4,7 @@ import ( "context" "runtime" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) // TopCentrality is a simple greedy technique to create connections to nodes diff --git a/autopilot/top_centrality_test.go b/autopilot/top_centrality_test.go index a6fe227273c..57e8d2fa2a9 100644 --- a/autopilot/top_centrality_test.go +++ b/autopilot/top_centrality_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/stretchr/testify/require" ) diff --git a/blockcache/blockcache.go b/blockcache/blockcache.go index 532629febe1..54749e23be2 100644 --- a/blockcache/blockcache.go +++ b/blockcache/blockcache.go @@ -1,9 +1,9 @@ package blockcache import ( - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightninglabs/neutrino" "github.com/lightninglabs/neutrino/cache" "github.com/lightninglabs/neutrino/cache/lru" diff --git a/blockcache/blockcache_test.go b/blockcache/blockcache_test.go index f108ab644fe..89cfd440b8f 100644 --- a/blockcache/blockcache_test.go +++ b/blockcache/blockcache_test.go @@ -6,9 +6,9 @@ import ( "sync" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightninglabs/neutrino" "github.com/lightninglabs/neutrino/cache" "github.com/stretchr/testify/require" diff --git a/bolt12/validate.go b/bolt12/validate.go index d6473b6a35d..b8c359d0a07 100644 --- a/bolt12/validate.go +++ b/bolt12/validate.go @@ -8,7 +8,7 @@ import ( "unicode/utf8" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tlv" diff --git a/chainntnfs/best_block_view.go b/chainntnfs/best_block_view.go index c043e68e7e0..4ad934ee9f4 100644 --- a/chainntnfs/best_block_view.go +++ b/chainntnfs/best_block_view.go @@ -6,7 +6,7 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) // BestBlockView is an interface that allows the querying of the most diff --git a/chainntnfs/best_block_view_test.go b/chainntnfs/best_block_view_test.go index 2a55bc8b032..9b49600710e 100644 --- a/chainntnfs/best_block_view_test.go +++ b/chainntnfs/best_block_view_test.go @@ -7,8 +7,8 @@ import ( "testing/quick" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/lntest/mock" "github.com/lightningnetwork/lnd/lntest/wait" diff --git a/chainntnfs/bitcoindnotify/bitcoind.go b/chainntnfs/bitcoindnotify/bitcoind.go index a1beb78207d..5028c78df1d 100644 --- a/chainntnfs/bitcoindnotify/bitcoind.go +++ b/chainntnfs/bitcoindnotify/bitcoind.go @@ -8,11 +8,11 @@ import ( "sync/atomic" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/lightningnetwork/lnd/blockcache" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/chainntnfs/bitcoindnotify/bitcoind_dev.go b/chainntnfs/bitcoindnotify/bitcoind_dev.go index b7c2b5f9cb4..f16b1ba36c5 100644 --- a/chainntnfs/bitcoindnotify/bitcoind_dev.go +++ b/chainntnfs/bitcoindnotify/bitcoind_dev.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcwallet/chain" "github.com/lightningnetwork/lnd/chainntnfs" ) diff --git a/chainntnfs/bitcoindnotify/bitcoind_test.go b/chainntnfs/bitcoindnotify/bitcoind_test.go index 0a2d14fbc2b..141e183c29a 100644 --- a/chainntnfs/bitcoindnotify/bitcoind_test.go +++ b/chainntnfs/bitcoindnotify/bitcoind_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/btcsuite/btcd/rpcclient" "github.com/btcsuite/btcwallet/chain" diff --git a/chainntnfs/bitcoindnotify/driver.go b/chainntnfs/bitcoindnotify/driver.go index 1968f74c65f..b24fdf78aa4 100644 --- a/chainntnfs/bitcoindnotify/driver.go +++ b/chainntnfs/bitcoindnotify/driver.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcwallet/chain" "github.com/lightningnetwork/lnd/blockcache" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/chainntnfs/btcdnotify/btcd.go b/chainntnfs/btcdnotify/btcd.go index 91178044cfb..ebe2c62b8d7 100644 --- a/chainntnfs/btcdnotify/btcd.go +++ b/chainntnfs/btcdnotify/btcd.go @@ -8,12 +8,12 @@ import ( "time" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/lightningnetwork/lnd/blockcache" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/chainntnfs/btcdnotify/btcd_dev.go b/chainntnfs/btcdnotify/btcd_dev.go index 11b20ff7ced..bd2a157262a 100644 --- a/chainntnfs/btcdnotify/btcd_dev.go +++ b/chainntnfs/btcdnotify/btcd_dev.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/chainntnfs" ) diff --git a/chainntnfs/btcdnotify/btcd_test.go b/chainntnfs/btcdnotify/btcd_test.go index 6a1b9785488..df7a6ce6a39 100644 --- a/chainntnfs/btcdnotify/btcd_test.go +++ b/chainntnfs/btcdnotify/btcd_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/lightningnetwork/lnd/blockcache" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/chainntnfs/btcdnotify/driver.go b/chainntnfs/btcdnotify/driver.go index 067b48cf82b..08afbd694e1 100644 --- a/chainntnfs/btcdnotify/driver.go +++ b/chainntnfs/btcdnotify/driver.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcd/rpcclient" "github.com/lightningnetwork/lnd/blockcache" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/chainntnfs/interface.go b/chainntnfs/interface.go index 342d268fd72..9dc9fd7b94f 100644 --- a/chainntnfs/interface.go +++ b/chainntnfs/interface.go @@ -10,9 +10,9 @@ import ( "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" ) diff --git a/chainntnfs/interface_dev.go b/chainntnfs/interface_dev.go index eb307224782..472d863fd5e 100644 --- a/chainntnfs/interface_dev.go +++ b/chainntnfs/interface_dev.go @@ -3,7 +3,7 @@ package chainntnfs -import "github.com/btcsuite/btcd/chaincfg/chainhash" +import "github.com/btcsuite/btcd/chainhash/v2" // TestChainNotifier enables the use of methods that are only present during // testing for ChainNotifiers. diff --git a/chainntnfs/mempool.go b/chainntnfs/mempool.go index 037bde9e376..82ca0693510 100644 --- a/chainntnfs/mempool.go +++ b/chainntnfs/mempool.go @@ -4,8 +4,8 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnutils" ) diff --git a/chainntnfs/mempool_test.go b/chainntnfs/mempool_test.go index c0da43fa107..905b0631d50 100644 --- a/chainntnfs/mempool_test.go +++ b/chainntnfs/mempool_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/stretchr/testify/require" ) diff --git a/chainntnfs/mocks.go b/chainntnfs/mocks.go index 4a888b162ec..3579bbbd481 100644 --- a/chainntnfs/mocks.go +++ b/chainntnfs/mocks.go @@ -1,8 +1,8 @@ package chainntnfs import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/stretchr/testify/mock" ) diff --git a/chainntnfs/neutrinonotify/neutrino.go b/chainntnfs/neutrinonotify/neutrino.go index 51e82a118aa..06752f059c2 100644 --- a/chainntnfs/neutrinonotify/neutrino.go +++ b/chainntnfs/neutrinonotify/neutrino.go @@ -9,12 +9,12 @@ import ( "time" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/gcs/builder" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/gcs/builder" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightninglabs/neutrino" "github.com/lightninglabs/neutrino/headerfs" "github.com/lightningnetwork/lnd/blockcache" diff --git a/chainntnfs/neutrinonotify/neutrino_dev.go b/chainntnfs/neutrinonotify/neutrino_dev.go index e70cdf4d0f8..44aa9c2e050 100644 --- a/chainntnfs/neutrinonotify/neutrino_dev.go +++ b/chainntnfs/neutrinonotify/neutrino_dev.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/rpcclient" "github.com/lightninglabs/neutrino" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/chainntnfs/test/test_interface.go b/chainntnfs/test/test_interface.go index 7536d24c503..7c899897fd4 100644 --- a/chainntnfs/test/test_interface.go +++ b/chainntnfs/test/test_interface.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" _ "github.com/btcsuite/btcwallet/walletdb/bdb" // Required to auto-register the boltdb walletdb implementation. "github.com/lightninglabs/neutrino" diff --git a/chainntnfs/test_utils.go b/chainntnfs/test_utils.go index 17e379e1235..535a0e2d730 100644 --- a/chainntnfs/test_utils.go +++ b/chainntnfs/test_utils.go @@ -9,13 +9,13 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/integration/rpctest" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntest/unittest" "github.com/stretchr/testify/require" @@ -36,8 +36,8 @@ func randPubKeyHashScript() ([]byte, *btcec.PrivateKey, error) { return nil, nil, err } - pubKeyHash := btcutil.Hash160(privKey.PubKey().SerializeCompressed()) - addrScript, err := btcutil.NewAddressWitnessPubKeyHash( + pubKeyHash := btcaddr.Hash160(privKey.PubKey().SerializeCompressed()) + addrScript, err := btcaddr.NewAddressWitnessPubKeyHash( pubKeyHash, unittest.NetParams, ) if err != nil { diff --git a/chainntnfs/txnotifier.go b/chainntnfs/txnotifier.go index af85c298086..3530b8a4436 100644 --- a/chainntnfs/txnotifier.go +++ b/chainntnfs/txnotifier.go @@ -7,10 +7,10 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" ) const ( diff --git a/chainntnfs/txnotifier_test.go b/chainntnfs/txnotifier_test.go index 451062a5dc3..e5c9b221081 100644 --- a/chainntnfs/txnotifier_test.go +++ b/chainntnfs/txnotifier_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/stretchr/testify/require" ) diff --git a/chainparams/store.go b/chainparams/store.go index 7459d518327..a71f52da0ef 100644 --- a/chainparams/store.go +++ b/chainparams/store.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/sqldb" "github.com/lightningnetwork/lnd/sqldb/sqlc" diff --git a/chainparams/store_test.go b/chainparams/store_test.go index bc0f45b2b37..eb6d577b954 100644 --- a/chainparams/store_test.go +++ b/chainparams/store_test.go @@ -5,7 +5,7 @@ package chainparams import ( "testing" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/stretchr/testify/require" ) diff --git a/chainreg/chainparams.go b/chainreg/chainparams.go index 166a1fec5ea..ecaf6dbee76 100644 --- a/chainreg/chainparams.go +++ b/chainreg/chainparams.go @@ -1,8 +1,8 @@ package chainreg import ( - bitcoinCfg "github.com/btcsuite/btcd/chaincfg" - bitcoinWire "github.com/btcsuite/btcd/wire" + bitcoinCfg "github.com/btcsuite/btcd/chaincfg/v2" + bitcoinWire "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/chainreg/chainregistry.go b/chainreg/chainregistry.go index 30a9082790c..6740848a56e 100644 --- a/chainreg/chainregistry.go +++ b/chainreg/chainregistry.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/rpcclient" "github.com/btcsuite/btcwallet/chain" "github.com/lightninglabs/neutrino" diff --git a/chainreg/no_chain_backend.go b/chainreg/no_chain_backend.go index 2a3f7bf9975..75fec314f8c 100644 --- a/chainreg/no_chain_backend.go +++ b/chainreg/no_chain_backend.go @@ -5,10 +5,10 @@ import ( "errors" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightningnetwork/lnd/chainntnfs" @@ -193,13 +193,13 @@ func (n *NoChainSource) SendRawTransaction(*wire.MsgTx, bool) (*chainhash.Hash, return nil, errNotImplemented } -func (n *NoChainSource) Rescan(*chainhash.Hash, []btcutil.Address, - map[wire.OutPoint]btcutil.Address) error { +func (n *NoChainSource) Rescan(*chainhash.Hash, []btcaddr.Address, + map[wire.OutPoint]btcaddr.Address) error { return nil } -func (n *NoChainSource) NotifyReceived([]btcutil.Address) error { +func (n *NoChainSource) NotifyReceived([]btcaddr.Address) error { return nil } diff --git a/chanacceptor/acceptor_test.go b/chanacceptor/acceptor_test.go index 2746b31b085..b2b0bf3cb39 100644 --- a/chanacceptor/acceptor_test.go +++ b/chanacceptor/acceptor_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet/chancloser" "github.com/lightningnetwork/lnd/lnwire" diff --git a/chanacceptor/interface.go b/chanacceptor/interface.go index 3149cb05b3e..0939d23302c 100644 --- a/chanacceptor/interface.go +++ b/chanacceptor/interface.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/chanacceptor/merge.go b/chanacceptor/merge.go index 34f191743d4..176405903ca 100644 --- a/chanacceptor/merge.go +++ b/chanacceptor/merge.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/chanacceptor/rpcacceptor.go b/chanacceptor/rpcacceptor.go index 1a06b659c55..fec798e3ebd 100644 --- a/chanacceptor/rpcacceptor.go +++ b/chanacceptor/rpcacceptor.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet/chancloser" diff --git a/chanacceptor/rpcacceptor_test.go b/chanacceptor/rpcacceptor_test.go index eb65080d5b5..d1f3b2f02bb 100644 --- a/chanacceptor/rpcacceptor_test.go +++ b/chanacceptor/rpcacceptor_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet/chancloser" diff --git a/chanbackup/backup.go b/chanbackup/backup.go index cf7217ae383..88b8a0ce411 100644 --- a/chanbackup/backup.go +++ b/chanbackup/backup.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" ) diff --git a/chanbackup/backup_test.go b/chanbackup/backup_test.go index 05a24090c0a..f2a10c21d4a 100644 --- a/chanbackup/backup_test.go +++ b/chanbackup/backup_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/stretchr/testify/require" ) diff --git a/chanbackup/pubsub.go b/chanbackup/pubsub.go index 6304f0cb376..19151275f1d 100644 --- a/chanbackup/pubsub.go +++ b/chanbackup/pubsub.go @@ -9,7 +9,7 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnutils" diff --git a/chanbackup/pubsub_test.go b/chanbackup/pubsub_test.go index 615f170fa6e..9d5ea4e9157 100644 --- a/chanbackup/pubsub_test.go +++ b/chanbackup/pubsub_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnencrypt" "github.com/stretchr/testify/require" diff --git a/chanbackup/single.go b/chanbackup/single.go index 0a38d6b561f..4acd649304f 100644 --- a/chanbackup/single.go +++ b/chanbackup/single.go @@ -8,9 +8,9 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/keychain" diff --git a/chanbackup/single_test.go b/chanbackup/single_test.go index f1f805c1435..881aedf8a04 100644 --- a/chanbackup/single_test.go +++ b/chanbackup/single_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/chanfitness/chanevent.go b/chanfitness/chanevent.go index b829a6c3068..1edfec5be25 100644 --- a/chanfitness/chanevent.go +++ b/chanfitness/chanevent.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/clock" ) diff --git a/chanfitness/chanevent_test.go b/chanfitness/chanevent_test.go index 8d1cc548c2e..40a0e539dd0 100644 --- a/chanfitness/chanevent_test.go +++ b/chanfitness/chanevent_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/clock" "github.com/stretchr/testify/require" ) diff --git a/chanfitness/chaneventstore.go b/chanfitness/chaneventstore.go index a8014a8f969..9fc42964082 100644 --- a/chanfitness/chaneventstore.go +++ b/chanfitness/chaneventstore.go @@ -17,7 +17,7 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channelnotifier" "github.com/lightningnetwork/lnd/clock" diff --git a/chanfitness/chaneventstore_test.go b/chanfitness/chaneventstore_test.go index f2e578157d8..09dc1ce7239 100644 --- a/chanfitness/chaneventstore_test.go +++ b/chanfitness/chaneventstore_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/routing/route" diff --git a/chanfitness/chaneventstore_testctx_test.go b/chanfitness/chaneventstore_testctx_test.go index 6906ebbb62f..dca7580cc2e 100644 --- a/chanfitness/chaneventstore_testctx_test.go +++ b/chanfitness/chaneventstore_testctx_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channelnotifier" "github.com/lightningnetwork/lnd/clock" diff --git a/chanfitness/interface.go b/chanfitness/interface.go index 22678d650da..23726ae308c 100644 --- a/chanfitness/interface.go +++ b/chanfitness/interface.go @@ -3,7 +3,7 @@ package chanfitness import ( "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) // peerMonitor is an interface implemented by entities that monitor our peers diff --git a/channel_notifier.go b/channel_notifier.go index 8affd48f08d..360fb6c58a7 100644 --- a/channel_notifier.go +++ b/channel_notifier.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channelnotifier" diff --git a/channeldb/channel.go b/channeldb/channel.go index 676c109af9c..4c299f8fd1b 100644 --- a/channeldb/channel.go +++ b/channeldb/channel.go @@ -15,9 +15,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/walletdb" "github.com/lightningnetwork/lnd/fn/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" diff --git a/channeldb/channel_test.go b/channeldb/channel_test.go index 5b8758e9a42..f900964fec0 100644 --- a/channeldb/channel_test.go +++ b/channeldb/channel_test.go @@ -12,9 +12,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" _ "github.com/btcsuite/btcwallet/walletdb/bdb" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/clock" diff --git a/channeldb/close_channel_test.go b/channeldb/close_channel_test.go index 3a940b78dec..cd9c796965b 100644 --- a/channeldb/close_channel_test.go +++ b/channeldb/close_channel_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/tlv" diff --git a/channeldb/codec.go b/channeldb/codec.go index e5bab3d5f76..a23bdd556c2 100644 --- a/channeldb/codec.go +++ b/channeldb/codec.go @@ -9,9 +9,9 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" diff --git a/channeldb/db.go b/channeldb/db.go index 3f0036b112c..894f9fae555 100644 --- a/channeldb/db.go +++ b/channeldb/db.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/walletdb" mig "github.com/lightningnetwork/lnd/channeldb/migration" "github.com/lightningnetwork/lnd/channeldb/migration12" diff --git a/channeldb/db_test.go b/channeldb/db_test.go index c41b8e12abd..9bc3efcd2b2 100644 --- a/channeldb/db_test.go +++ b/channeldb/db_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/kvdb" diff --git a/channeldb/forwarding_package_test.go b/channeldb/forwarding_package_test.go index b11764bee93..5f47336f699 100644 --- a/channeldb/forwarding_package_test.go +++ b/channeldb/forwarding_package_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lnwire" diff --git a/channeldb/height_hint_test.go b/channeldb/height_hint_test.go index 1549ee5f474..bf2dd894987 100644 --- a/channeldb/height_hint_test.go +++ b/channeldb/height_hint_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/stretchr/testify/require" ) diff --git a/channeldb/migration/lnwire21/accept_channel.go b/channeldb/migration/lnwire21/accept_channel.go index 6069d3d0014..2a50e2dfc09 100644 --- a/channeldb/migration/lnwire21/accept_channel.go +++ b/channeldb/migration/lnwire21/accept_channel.go @@ -4,7 +4,7 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) // AcceptChannel is the message Bob sends to Alice after she initiates the diff --git a/channeldb/migration/lnwire21/channel_announcement.go b/channeldb/migration/lnwire21/channel_announcement.go index 897844fb1cf..3c1f55deac6 100644 --- a/channeldb/migration/lnwire21/channel_announcement.go +++ b/channeldb/migration/lnwire21/channel_announcement.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // ChannelAnnouncement message is used to announce the existence of a channel diff --git a/channeldb/migration/lnwire21/channel_id.go b/channeldb/migration/lnwire21/channel_id.go index 0a9e0822658..7814cfcce92 100644 --- a/channeldb/migration/lnwire21/channel_id.go +++ b/channeldb/migration/lnwire21/channel_id.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "math" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" ) const ( diff --git a/channeldb/migration/lnwire21/channel_update.go b/channeldb/migration/lnwire21/channel_update.go index 77e65e76b43..79d6edf64c0 100644 --- a/channeldb/migration/lnwire21/channel_update.go +++ b/channeldb/migration/lnwire21/channel_update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // ChanUpdateMsgFlags is a bitfield that signals whether optional fields are diff --git a/channeldb/migration/lnwire21/closing_signed.go b/channeldb/migration/lnwire21/closing_signed.go index b4838854ee2..af8dc2ad3ae 100644 --- a/channeldb/migration/lnwire21/closing_signed.go +++ b/channeldb/migration/lnwire21/closing_signed.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) // ClosingSigned is sent by both parties to a channel once the channel is clear diff --git a/channeldb/migration/lnwire21/funding_created.go b/channeldb/migration/lnwire21/funding_created.go index c14321ec8f9..16edbfa744d 100644 --- a/channeldb/migration/lnwire21/funding_created.go +++ b/channeldb/migration/lnwire21/funding_created.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) // FundingCreated is sent from Alice (the initiator) to Bob (the responder), diff --git a/channeldb/migration/lnwire21/gossip_timestamp_range.go b/channeldb/migration/lnwire21/gossip_timestamp_range.go index 039257c2697..b4716bede46 100644 --- a/channeldb/migration/lnwire21/gossip_timestamp_range.go +++ b/channeldb/migration/lnwire21/gossip_timestamp_range.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // GossipTimestampRange is a message that allows the sender to restrict the set diff --git a/channeldb/migration/lnwire21/lnwire.go b/channeldb/migration/lnwire21/lnwire.go index e3f96e2cdab..95e1924f4f3 100644 --- a/channeldb/migration/lnwire21/lnwire.go +++ b/channeldb/migration/lnwire21/lnwire.go @@ -11,9 +11,9 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tor" ) diff --git a/channeldb/migration/lnwire21/msat.go b/channeldb/migration/lnwire21/msat.go index 3c3d85c33b4..6a80e726c71 100644 --- a/channeldb/migration/lnwire21/msat.go +++ b/channeldb/migration/lnwire21/msat.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/channeldb/migration/lnwire21/netaddress.go b/channeldb/migration/lnwire21/netaddress.go index dd5a7c57b82..0b9311b3c91 100644 --- a/channeldb/migration/lnwire21/netaddress.go +++ b/channeldb/migration/lnwire21/netaddress.go @@ -5,7 +5,7 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) // NetAddress represents information pertaining to the identity and network diff --git a/channeldb/migration/lnwire21/open_channel.go b/channeldb/migration/lnwire21/open_channel.go index 36747894e9b..7955109d15a 100644 --- a/channeldb/migration/lnwire21/open_channel.go +++ b/channeldb/migration/lnwire21/open_channel.go @@ -4,8 +4,8 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" ) // FundingFlag represents the possible bit mask values for the ChannelFlags diff --git a/channeldb/migration/lnwire21/query_channel_range.go b/channeldb/migration/lnwire21/query_channel_range.go index 9546fcd32a1..8677a3bb8c3 100644 --- a/channeldb/migration/lnwire21/query_channel_range.go +++ b/channeldb/migration/lnwire21/query_channel_range.go @@ -4,7 +4,7 @@ import ( "io" "math" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // QueryChannelRange is a message sent by a node in order to query the diff --git a/channeldb/migration/lnwire21/query_short_chan_ids.go b/channeldb/migration/lnwire21/query_short_chan_ids.go index 7e8d1e68f00..96ccdd9d897 100644 --- a/channeldb/migration/lnwire21/query_short_chan_ids.go +++ b/channeldb/migration/lnwire21/query_short_chan_ids.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // ShortChanIDEncoding is an enum-like type that represents exactly how a set diff --git a/channeldb/migration/lnwire21/reply_short_chan_ids_end.go b/channeldb/migration/lnwire21/reply_short_chan_ids_end.go index d77aa0b5ce9..335692a6c02 100644 --- a/channeldb/migration/lnwire21/reply_short_chan_ids_end.go +++ b/channeldb/migration/lnwire21/reply_short_chan_ids_end.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // ReplyShortChanIDsEnd is a message that marks the end of a streaming message diff --git a/channeldb/migration12/invoices.go b/channeldb/migration12/invoices.go index 6b83518f30a..69d79e5c71e 100644 --- a/channeldb/migration12/invoices.go +++ b/channeldb/migration12/invoices.go @@ -6,7 +6,7 @@ import ( "io" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/tlv" diff --git a/channeldb/migration16/migration.go b/channeldb/migration16/migration.go index 64a5e493d2c..cab2d202527 100644 --- a/channeldb/migration16/migration.go +++ b/channeldb/migration16/migration.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/kvdb" ) diff --git a/channeldb/migration20/codec.go b/channeldb/migration20/codec.go index 37481c997bd..829476b3df4 100644 --- a/channeldb/migration20/codec.go +++ b/channeldb/migration20/codec.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) var ( diff --git a/channeldb/migration20/migration.go b/channeldb/migration20/migration.go index c341d6a55a7..2829d747ec7 100644 --- a/channeldb/migration20/migration.go +++ b/channeldb/migration20/migration.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/channeldb/migration21/common/enclosed_types.go b/channeldb/migration21/common/enclosed_types.go index d129a6d52a5..44b81c4df0a 100644 --- a/channeldb/migration21/common/enclosed_types.go +++ b/channeldb/migration21/common/enclosed_types.go @@ -6,9 +6,9 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/channeldb/migration21/current/current_codec.go b/channeldb/migration21/current/current_codec.go index d4a28e69b27..90d0f4923b8 100644 --- a/channeldb/migration21/current/current_codec.go +++ b/channeldb/migration21/current/current_codec.go @@ -7,9 +7,9 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/channeldb/migration21/common" "github.com/lightningnetwork/lnd/keychain" diff --git a/channeldb/migration21/legacy/legacy_codec.go b/channeldb/migration21/legacy/legacy_codec.go index e14a42a5c01..a251352b7aa 100644 --- a/channeldb/migration21/legacy/legacy_codec.go +++ b/channeldb/migration21/legacy/legacy_codec.go @@ -6,9 +6,9 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/channeldb/migration21/common" "github.com/lightningnetwork/lnd/keychain" diff --git a/channeldb/migration21/migration_test.go b/channeldb/migration21/migration_test.go index 735e45dc0d5..fd3d1f12b41 100644 --- a/channeldb/migration21/migration_test.go +++ b/channeldb/migration21/migration_test.go @@ -9,8 +9,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/channeldb/migration21/common" diff --git a/channeldb/migration24/migration_test.go b/channeldb/migration24/migration_test.go index 417c3d0edfc..77d54ac9d8d 100644 --- a/channeldb/migration24/migration_test.go +++ b/channeldb/migration24/migration_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11" "github.com/lightningnetwork/lnd/channeldb/migtest" diff --git a/channeldb/migration25/migration_test.go b/channeldb/migration25/migration_test.go index 4c67c077581..9da539cfd4a 100644 --- a/channeldb/migration25/migration_test.go +++ b/channeldb/migration25/migration_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" mig24 "github.com/lightningnetwork/lnd/channeldb/migration24" mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11" diff --git a/channeldb/migration26/migration_test.go b/channeldb/migration26/migration_test.go index dd1247db412..32430ed24ff 100644 --- a/channeldb/migration26/migration_test.go +++ b/channeldb/migration26/migration_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" mig25 "github.com/lightningnetwork/lnd/channeldb/migration25" mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11" diff --git a/channeldb/migration27/migration_test.go b/channeldb/migration27/migration_test.go index d8d769d2f17..a53ba54a05f 100644 --- a/channeldb/migration27/migration_test.go +++ b/channeldb/migration27/migration_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" mig25 "github.com/lightningnetwork/lnd/channeldb/migration25" mig26 "github.com/lightningnetwork/lnd/channeldb/migration26" mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11" diff --git a/channeldb/migration29/codec.go b/channeldb/migration29/codec.go index fe11348a61f..f94a7fe4eab 100644 --- a/channeldb/migration29/codec.go +++ b/channeldb/migration29/codec.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) var ( diff --git a/channeldb/migration29/migration.go b/channeldb/migration29/migration.go index 7ca3a8f8947..9cd93030e03 100644 --- a/channeldb/migration29/migration.go +++ b/channeldb/migration29/migration.go @@ -3,7 +3,7 @@ package migration29 import ( "bytes" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/kvdb" ) diff --git a/channeldb/migration30/iterator_test.go b/channeldb/migration30/iterator_test.go index de654a01755..6184a57ed1c 100644 --- a/channeldb/migration30/iterator_test.go +++ b/channeldb/migration30/iterator_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" mig25 "github.com/lightningnetwork/lnd/channeldb/migration25" mig26 "github.com/lightningnetwork/lnd/channeldb/migration26" diff --git a/channeldb/migration30/lnwallet.go b/channeldb/migration30/lnwallet.go index 02e84a3b991..db5bc42fc58 100644 --- a/channeldb/migration30/lnwallet.go +++ b/channeldb/migration30/lnwallet.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" mig25 "github.com/lightningnetwork/lnd/channeldb/migration25" mig26 "github.com/lightningnetwork/lnd/channeldb/migration26" mig "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11" diff --git a/channeldb/migration30/revocation_log.go b/channeldb/migration30/revocation_log.go index c4f3f1626bb..6d836046790 100644 --- a/channeldb/migration30/revocation_log.go +++ b/channeldb/migration30/revocation_log.go @@ -6,7 +6,7 @@ import ( "io" "math" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" mig24 "github.com/lightningnetwork/lnd/channeldb/migration24" mig25 "github.com/lightningnetwork/lnd/channeldb/migration25" diff --git a/channeldb/migration30/test_mock.go b/channeldb/migration30/test_mock.go index 0246ca90d8d..01cf6593bcc 100644 --- a/channeldb/migration30/test_mock.go +++ b/channeldb/migration30/test_mock.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/shachain" "github.com/stretchr/testify/mock" ) diff --git a/channeldb/migration30/test_utils.go b/channeldb/migration30/test_utils.go index e272cf41c5b..adfa0c5a8f0 100644 --- a/channeldb/migration30/test_utils.go +++ b/channeldb/migration30/test_utils.go @@ -7,9 +7,9 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" mig25 "github.com/lightningnetwork/lnd/channeldb/migration25" mig26 "github.com/lightningnetwork/lnd/channeldb/migration26" diff --git a/channeldb/migration32/codec.go b/channeldb/migration32/codec.go index 9f626c57486..f03e637dc40 100644 --- a/channeldb/migration32/codec.go +++ b/channeldb/migration32/codec.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" ) diff --git a/channeldb/migration32/mission_control_store.go b/channeldb/migration32/mission_control_store.go index 701c4b31ecb..c7dcaeb005f 100644 --- a/channeldb/migration32/mission_control_store.go +++ b/channeldb/migration32/mission_control_store.go @@ -6,7 +6,7 @@ import ( "math" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/tlv" diff --git a/channeldb/migration32/route.go b/channeldb/migration32/route.go index a35338e5040..31a3bc52580 100644 --- a/channeldb/migration32/route.go +++ b/channeldb/migration32/route.go @@ -7,7 +7,7 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/channeldb/migration_01_to_11/channel.go b/channeldb/migration_01_to_11/channel.go index ec025263bc7..083bbb43155 100644 --- a/channeldb/migration_01_to_11/channel.go +++ b/channeldb/migration_01_to_11/channel.go @@ -9,9 +9,9 @@ import ( "sync" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/shachain" diff --git a/channeldb/migration_01_to_11/channel_test.go b/channeldb/migration_01_to_11/channel_test.go index 76a16c7d0b4..4e5cd7a6b90 100644 --- a/channeldb/migration_01_to_11/channel_test.go +++ b/channeldb/migration_01_to_11/channel_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" _ "github.com/btcsuite/btcwallet/walletdb/bdb" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/keychain" diff --git a/channeldb/migration_01_to_11/codec.go b/channeldb/migration_01_to_11/codec.go index ca2f5cff6d4..28c295c9c57 100644 --- a/channeldb/migration_01_to_11/codec.go +++ b/channeldb/migration_01_to_11/codec.go @@ -7,9 +7,9 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/shachain" diff --git a/channeldb/migration_01_to_11/graph.go b/channeldb/migration_01_to_11/graph.go index 9035e3e6f95..c7d77d2e3b1 100644 --- a/channeldb/migration_01_to_11/graph.go +++ b/channeldb/migration_01_to_11/graph.go @@ -10,9 +10,9 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/kvdb" ) diff --git a/channeldb/migration_01_to_11/invoices.go b/channeldb/migration_01_to_11/invoices.go index 3adbbf5f25e..15a1a9b8b0e 100644 --- a/channeldb/migration_01_to_11/invoices.go +++ b/channeldb/migration_01_to_11/invoices.go @@ -7,7 +7,7 @@ import ( "io" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" diff --git a/channeldb/migration_01_to_11/migration_11_invoices.go b/channeldb/migration_01_to_11/migration_11_invoices.go index 91d0e00f907..b87fdf97497 100644 --- a/channeldb/migration_01_to_11/migration_11_invoices.go +++ b/channeldb/migration_01_to_11/migration_11_invoices.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - bitcoinCfg "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/wire" + bitcoinCfg "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/channeldb/migration_01_to_11/zpay32" "github.com/lightningnetwork/lnd/kvdb" diff --git a/channeldb/migration_01_to_11/migration_11_invoices_test.go b/channeldb/migration_01_to_11/migration_11_invoices_test.go index 4098fe5a6cc..00ff0fd1073 100644 --- a/channeldb/migration_01_to_11/migration_11_invoices_test.go +++ b/channeldb/migration_01_to_11/migration_11_invoices_test.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - bitcoinCfg "github.com/btcsuite/btcd/chaincfg" + bitcoinCfg "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/zpay32" litecoinCfg "github.com/ltcsuite/ltcd/chaincfg" diff --git a/channeldb/migration_01_to_11/migrations_test.go b/channeldb/migration_01_to_11/migrations_test.go index 7c28d203903..dcec0a87a2e 100644 --- a/channeldb/migration_01_to_11/migrations_test.go +++ b/channeldb/migration_01_to_11/migrations_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/davecgh/go-spew/spew" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/kvdb" diff --git a/channeldb/migration_01_to_11/payments.go b/channeldb/migration_01_to_11/payments.go index 7e9eebd6440..1ead7575ff9 100644 --- a/channeldb/migration_01_to_11/payments.go +++ b/channeldb/migration_01_to_11/payments.go @@ -10,7 +10,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" diff --git a/channeldb/migration_01_to_11/zpay32/decode.go b/channeldb/migration_01_to_11/zpay32/decode.go index 9f27543c055..7d0b7edd28d 100644 --- a/channeldb/migration_01_to_11/zpay32/decode.go +++ b/channeldb/migration_01_to_11/zpay32/decode.go @@ -8,12 +8,12 @@ import ( "strings" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil/bech32" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" ) @@ -378,13 +378,13 @@ func parseMinFinalCLTVExpiry(data []byte) (*uint64, error) { // parseFallbackAddr converts the data (encoded in base32) into a fallback // on-chain address. -func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, error) { +func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcaddr.Address, error) { // Checks if the data is empty or contains a version without an address. if len(data) < 2 { return nil, fmt.Errorf("empty fallback address field") } - var addr btcutil.Address + var addr btcaddr.Address version := data[0] switch version { @@ -396,9 +396,9 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro switch len(witness) { case 20: - addr, err = btcutil.NewAddressWitnessPubKeyHash(witness, net) + addr, err = btcaddr.NewAddressWitnessPubKeyHash(witness, net) case 32: - addr, err = btcutil.NewAddressWitnessScriptHash(witness, net) + addr, err = btcaddr.NewAddressWitnessScriptHash(witness, net) default: return nil, fmt.Errorf("unknown witness program length %d", len(witness)) @@ -413,7 +413,7 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro return nil, err } - addr, err = btcutil.NewAddressPubKeyHash(pubKeyHash, net) + addr, err = btcaddr.NewAddressPubKeyHash(pubKeyHash, net) if err != nil { return nil, err } @@ -423,7 +423,7 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro return nil, err } - addr, err = btcutil.NewAddressScriptHashFromHash(scriptHash, net) + addr, err = btcaddr.NewAddressScriptHashFromHash(scriptHash, net) if err != nil { return nil, err } diff --git a/channeldb/migration_01_to_11/zpay32/invoice.go b/channeldb/migration_01_to_11/zpay32/invoice.go index cf24e4e10d8..19591607799 100644 --- a/channeldb/migration_01_to_11/zpay32/invoice.go +++ b/channeldb/migration_01_to_11/zpay32/invoice.go @@ -5,9 +5,9 @@ import ( "fmt" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21" ) @@ -171,7 +171,7 @@ type Invoice struct { // FallbackAddr is an on-chain address that can be used for payment in // case the Lightning payment fails. // Optional. - FallbackAddr btcutil.Address + FallbackAddr btcaddr.Address // RouteHints represents one or more different route hints. Each route // hint can be individually used to reach the destination. These usually @@ -242,7 +242,7 @@ func Expiry(expiry time.Duration) func(*Invoice) { // FallbackAddr is a functional option that allows callers of NewInvoice to set // the Invoice's fallback on-chain address that can be used for payment in case // the Lightning payment fails -func FallbackAddr(fallbackAddr btcutil.Address) func(*Invoice) { +func FallbackAddr(fallbackAddr btcaddr.Address) func(*Invoice) { return func(i *Invoice) { i.FallbackAddr = fallbackAddr } diff --git a/channeldb/nodes.go b/channeldb/nodes.go index 70f6fad8beb..688735ce168 100644 --- a/channeldb/nodes.go +++ b/channeldb/nodes.go @@ -9,7 +9,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/kvdb" ) diff --git a/channeldb/nodes_test.go b/channeldb/nodes_test.go index a88e452282d..413e0bc3910 100644 --- a/channeldb/nodes_test.go +++ b/channeldb/nodes_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/kvdb" "github.com/stretchr/testify/require" ) diff --git a/channeldb/reports.go b/channeldb/reports.go index 4f46bd9e1f0..98e54beb74a 100644 --- a/channeldb/reports.go +++ b/channeldb/reports.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/tlv" diff --git a/channeldb/reports_test.go b/channeldb/reports_test.go index 6f0c21c1f1c..ce03ef7cc18 100644 --- a/channeldb/reports_test.go +++ b/channeldb/reports_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/kvdb" "github.com/stretchr/testify/require" diff --git a/channeldb/revocation_log.go b/channeldb/revocation_log.go index 5a7f7a76bea..d30a2191b9d 100644 --- a/channeldb/revocation_log.go +++ b/channeldb/revocation_log.go @@ -7,7 +7,7 @@ import ( "io" "math" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" diff --git a/channeldb/revocation_log_test.go b/channeldb/revocation_log_test.go index 347e86e4fb1..d59de810331 100644 --- a/channeldb/revocation_log_test.go +++ b/channeldb/revocation_log_test.go @@ -8,7 +8,7 @@ import ( "math/rand" "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntest/channels" diff --git a/channelnotifier/channelnotifier.go b/channelnotifier/channelnotifier.go index 96285aaa647..733242167d1 100644 --- a/channelnotifier/channelnotifier.go +++ b/channelnotifier/channelnotifier.go @@ -3,7 +3,7 @@ package channelnotifier import ( "sync" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/chanstate" "github.com/lightningnetwork/lnd/subscribe" diff --git a/channelnotifier/channelnotifier_test.go b/channelnotifier/channelnotifier_test.go index 0f815f73075..afeea30f8f2 100644 --- a/channelnotifier/channelnotifier_test.go +++ b/channelnotifier/channelnotifier_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/stretchr/testify/require" ) diff --git a/chanrestore.go b/chanrestore.go index 39d55557644..d97e50f8ba6 100644 --- a/chanrestore.go +++ b/chanrestore.go @@ -6,9 +6,9 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/chanstate" diff --git a/chanstate/interface.go b/chanstate/interface.go index 49344855128..038cdc9d954 100644 --- a/chanstate/interface.go +++ b/chanstate/interface.go @@ -2,7 +2,7 @@ package chanstate import ( "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" diff --git a/cmd/commands/chainrpc_active.go b/cmd/commands/chainrpc_active.go index 0f1f8b61210..3975be8cdca 100644 --- a/cmd/commands/chainrpc_active.go +++ b/cmd/commands/chainrpc_active.go @@ -8,8 +8,8 @@ import ( "fmt" "strconv" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnrpc/chainrpc" "github.com/urfave/cli" ) diff --git a/cmd/commands/cmd_mission_control.go b/cmd/commands/cmd_mission_control.go index fe4acb25cf7..33f98881cf0 100644 --- a/cmd/commands/cmd_mission_control.go +++ b/cmd/commands/cmd_mission_control.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" diff --git a/cmd/commands/cmd_open_channel.go b/cmd/commands/cmd_open_channel.go index 921f8478756..48fba50e8bc 100644 --- a/cmd/commands/cmd_open_channel.go +++ b/cmd/commands/cmd_open_channel.go @@ -13,9 +13,9 @@ import ( "strconv" "strings" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet/chanfunding" diff --git a/cmd/commands/cmd_payments.go b/cmd/commands/cmd_payments.go index 961709a3cc7..57290bd5401 100644 --- a/cmd/commands/cmd_payments.go +++ b/cmd/commands/cmd_payments.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/cmd/commands/cmd_profile.go b/cmd/commands/cmd_profile.go index 6767964eb4f..e8b22ad9d9a 100644 --- a/cmd/commands/cmd_profile.go +++ b/cmd/commands/cmd_profile.go @@ -6,7 +6,7 @@ import ( "path" "strings" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lncfg" "github.com/urfave/cli" "gopkg.in/macaroon.v2" diff --git a/cmd/commands/commands.go b/cmd/commands/commands.go index 8bf75a2af70..e2726bb4fc6 100644 --- a/cmd/commands/commands.go +++ b/cmd/commands/commands.go @@ -16,8 +16,8 @@ import ( "strings" "sync" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/jessevdk/go-flags" "github.com/lightningnetwork/lnd" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/cmd/commands/main.go b/cmd/commands/main.go index dc9b993de57..0c0997a2ccd 100644 --- a/cmd/commands/main.go +++ b/cmd/commands/main.go @@ -14,8 +14,8 @@ import ( "strings" "syscall" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd" "github.com/lightningnetwork/lnd/build" "github.com/lightningnetwork/lnd/lncfg" diff --git a/cmd/commands/walletrpc_active.go b/cmd/commands/walletrpc_active.go index 99f89820c2c..b7e1e558a30 100644 --- a/cmd/commands/walletrpc_active.go +++ b/cmd/commands/walletrpc_active.go @@ -15,11 +15,11 @@ import ( "strconv" "strings" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd" "github.com/lightningnetwork/lnd/lnrpc/walletrpc" "github.com/lightningnetwork/lnd/lnwallet/chainfee" @@ -1025,7 +1025,7 @@ func fundTemplatePsbt(ctx *cli.Context) error { err) } - addr, err := btcutil.DecodeAddress( + addr, err := btcaddr.DecodeAddress( addrStr, chainParams, ) if err != nil { diff --git a/config.go b/config.go index bffebc36973..3b73dbce1ac 100644 --- a/config.go +++ b/config.go @@ -20,8 +20,8 @@ import ( "strings" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" flags "github.com/jessevdk/go-flags" "github.com/lightninglabs/neutrino" "github.com/lightningnetwork/lnd/autopilot" diff --git a/config_builder.go b/config_builder.go index bcfd8ec6afa..25ec8401b57 100644 --- a/config_builder.go +++ b/config_builder.go @@ -16,9 +16,9 @@ import ( "time" "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btclog/v2" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/waddrmgr" diff --git a/contractcourt/anchor_resolver.go b/contractcourt/anchor_resolver.go index 7e267678240..35b17607e4b 100644 --- a/contractcourt/anchor_resolver.go +++ b/contractcourt/anchor_resolver.go @@ -6,9 +6,9 @@ import ( "io" "sync" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/contractcourt/breach_arbitrator.go b/contractcourt/breach_arbitrator.go index 130efcb52ce..7b839e67e2d 100644 --- a/contractcourt/breach_arbitrator.go +++ b/contractcourt/breach_arbitrator.go @@ -9,10 +9,10 @@ import ( "sync" "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/chanstate" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/breach_arbitrator_test.go b/contractcourt/breach_arbitrator_test.go index 869a0093e01..37cf07977a5 100644 --- a/contractcourt/breach_arbitrator_test.go +++ b/contractcourt/breach_arbitrator_test.go @@ -16,10 +16,10 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/briefcase.go b/contractcourt/briefcase.go index 2e7efe0e386..03337de7350 100644 --- a/contractcourt/briefcase.go +++ b/contractcourt/briefcase.go @@ -6,9 +6,9 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/contractcourt/briefcase_test.go b/contractcourt/briefcase_test.go index c86bffb389a..866c3cbf7c8 100644 --- a/contractcourt/briefcase_test.go +++ b/contractcourt/briefcase_test.go @@ -9,9 +9,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/chain_arbitrator.go b/contractcourt/chain_arbitrator.go index 1b448cb4acb..775db0a93ad 100644 --- a/contractcourt/chain_arbitrator.go +++ b/contractcourt/chain_arbitrator.go @@ -7,9 +7,9 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/walletdb" "github.com/lightningnetwork/lnd/chainio" "github.com/lightningnetwork/lnd/chainntnfs" @@ -113,7 +113,7 @@ type ChainArbitratorConfig struct { // IsOurAddress is a function that returns true if the passed address // is known to the underlying wallet. Otherwise, false should be // returned. - IsOurAddress func(btcutil.Address) bool + IsOurAddress func(btcaddr.Address) bool // IncubateOutputs sends either an incoming HTLC, an outgoing HTLC, or // both to the utxo nursery. Once this function returns, the nursery diff --git a/contractcourt/chain_arbitrator_test.go b/contractcourt/chain_arbitrator_test.go index d859d2d7940..90d0e4bcae9 100644 --- a/contractcourt/chain_arbitrator_test.go +++ b/contractcourt/chain_arbitrator_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/clock" diff --git a/contractcourt/chain_watcher.go b/contractcourt/chain_watcher.go index 577dcc3aa00..a2b4e0e0f86 100644 --- a/contractcourt/chain_watcher.go +++ b/contractcourt/chain_watcher.go @@ -8,13 +8,14 @@ import ( "sync/atomic" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/mempool" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainio" "github.com/lightningnetwork/lnd/chainntnfs" @@ -258,7 +259,7 @@ type chainWatcherConfig struct { // isOurAddr is a function that returns true if the passed address is // known to us. - isOurAddr func(btcutil.Address) bool + isOurAddr func(btcaddr.Address) bool // extractStateNumHint extracts the encoded state hint using the passed // obfuscater. This is used by the chain watcher to identify which diff --git a/contractcourt/chain_watcher_coop_reorg_test.go b/contractcourt/chain_watcher_coop_reorg_test.go index a97c00e09af..8753a564b17 100644 --- a/contractcourt/chain_watcher_coop_reorg_test.go +++ b/contractcourt/chain_watcher_coop_reorg_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) // TestChainWatcherCoopCloseReorg tests that the chain watcher properly handles diff --git a/contractcourt/chain_watcher_reorg_test.go b/contractcourt/chain_watcher_reorg_test.go index 141eda571eb..bf2edd11033 100644 --- a/contractcourt/chain_watcher_reorg_test.go +++ b/contractcourt/chain_watcher_reorg_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "pgregory.net/rapid" ) diff --git a/contractcourt/chain_watcher_test.go b/contractcourt/chain_watcher_test.go index c7287d35c1c..d3289b75359 100644 --- a/contractcourt/chain_watcher_test.go +++ b/contractcourt/chain_watcher_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainio" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" diff --git a/contractcourt/chain_watcher_test_harness.go b/contractcourt/chain_watcher_test_harness.go index e67b84abc95..06e7e49dd81 100644 --- a/contractcourt/chain_watcher_test_harness.go +++ b/contractcourt/chain_watcher_test_harness.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go index ac7e259cc2a..f17d873ab9d 100644 --- a/contractcourt/channel_arbitrator.go +++ b/contractcourt/channel_arbitrator.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainio" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/channel_arbitrator_test.go b/contractcourt/channel_arbitrator_test.go index 0e08d2cc492..4503b2e71a5 100644 --- a/contractcourt/channel_arbitrator_test.go +++ b/contractcourt/channel_arbitrator_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainio" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/contractcourt/commit_sweep_resolver.go b/contractcourt/commit_sweep_resolver.go index dd02e848b4a..f47afa5dff1 100644 --- a/contractcourt/commit_sweep_resolver.go +++ b/contractcourt/commit_sweep_resolver.go @@ -6,10 +6,10 @@ import ( "io" "sync" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/commit_sweep_resolver_test.go b/contractcourt/commit_sweep_resolver_test.go index eb00b3d734f..ef82c39877c 100644 --- a/contractcourt/commit_sweep_resolver_test.go +++ b/contractcourt/commit_sweep_resolver_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/contractcourt/config.go b/contractcourt/config.go index 7331ceb91f5..67c4267b66c 100644 --- a/contractcourt/config.go +++ b/contractcourt/config.go @@ -3,7 +3,7 @@ package contractcourt import ( "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) const ( diff --git a/contractcourt/config_test.go b/contractcourt/config_test.go index e7bc22a7abd..86e0957d0f9 100644 --- a/contractcourt/config_test.go +++ b/contractcourt/config_test.go @@ -3,7 +3,7 @@ package contractcourt import ( "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/stretchr/testify/require" ) diff --git a/contractcourt/contract_resolver.go b/contractcourt/contract_resolver.go index d11bd2f597a..62b8f1a1324 100644 --- a/contractcourt/contract_resolver.go +++ b/contractcourt/contract_resolver.go @@ -7,7 +7,7 @@ import ( "io" "sync/atomic" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/htlc_incoming_contest_resolver.go b/contractcourt/htlc_incoming_contest_resolver.go index 70349808c62..c3e511c30eb 100644 --- a/contractcourt/htlc_incoming_contest_resolver.go +++ b/contractcourt/htlc_incoming_contest_resolver.go @@ -7,8 +7,8 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/contractcourt/htlc_incoming_contest_resolver_test.go b/contractcourt/htlc_incoming_contest_resolver_test.go index f17190e96e8..457f8a86ba8 100644 --- a/contractcourt/htlc_incoming_contest_resolver_test.go +++ b/contractcourt/htlc_incoming_contest_resolver_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" diff --git a/contractcourt/htlc_lease_resolver.go b/contractcourt/htlc_lease_resolver.go index 3002cec0b75..438a09393e9 100644 --- a/contractcourt/htlc_lease_resolver.go +++ b/contractcourt/htlc_lease_resolver.go @@ -1,7 +1,7 @@ package contractcourt import ( - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/htlc_outgoing_contest_resolver.go b/contractcourt/htlc_outgoing_contest_resolver.go index 64db6bc4e70..08ded07a885 100644 --- a/contractcourt/htlc_outgoing_contest_resolver.go +++ b/contractcourt/htlc_outgoing_contest_resolver.go @@ -3,7 +3,7 @@ package contractcourt import ( "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/contractcourt/htlc_outgoing_contest_resolver_test.go b/contractcourt/htlc_outgoing_contest_resolver_test.go index 625df60bf1f..452527ca1a3 100644 --- a/contractcourt/htlc_outgoing_contest_resolver_test.go +++ b/contractcourt/htlc_outgoing_contest_resolver_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/contractcourt/htlc_success_resolver.go b/contractcourt/htlc_success_resolver.go index 1770c214a45..2286ce26d5d 100644 --- a/contractcourt/htlc_success_resolver.go +++ b/contractcourt/htlc_success_resolver.go @@ -6,10 +6,10 @@ import ( "io" "sync" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/contractcourt/htlc_success_resolver_test.go b/contractcourt/htlc_success_resolver_test.go index f0f5dd8f0ac..61777bf41c7 100644 --- a/contractcourt/htlc_success_resolver_test.go +++ b/contractcourt/htlc_success_resolver_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" diff --git a/contractcourt/htlc_timeout_resolver.go b/contractcourt/htlc_timeout_resolver.go index c2cbb133beb..5b89a345f55 100644 --- a/contractcourt/htlc_timeout_resolver.go +++ b/contractcourt/htlc_timeout_resolver.go @@ -6,10 +6,10 @@ import ( "io" "sync" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/htlc_timeout_resolver_test.go b/contractcourt/htlc_timeout_resolver_test.go index 86ebede8682..cf27cece199 100644 --- a/contractcourt/htlc_timeout_resolver_test.go +++ b/contractcourt/htlc_timeout_resolver_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/interfaces.go b/contractcourt/interfaces.go index 75b81e9dd44..7253cfaa2f1 100644 --- a/contractcourt/interfaces.go +++ b/contractcourt/interfaces.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch/hop" diff --git a/contractcourt/nursery_store.go b/contractcourt/nursery_store.go index 428b37f97be..3b9218e1f1f 100644 --- a/contractcourt/nursery_store.go +++ b/contractcourt/nursery_store.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/kvdb" diff --git a/contractcourt/nursery_store_test.go b/contractcourt/nursery_store_test.go index ca537693cbf..11f793c2935 100644 --- a/contractcourt/nursery_store_test.go +++ b/contractcourt/nursery_store_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/stretchr/testify/require" ) diff --git a/contractcourt/utxonursery.go b/contractcourt/utxonursery.go index 02e832337a3..924437e602b 100644 --- a/contractcourt/utxonursery.go +++ b/contractcourt/utxonursery.go @@ -9,9 +9,9 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/contractcourt/utxonursery_test.go b/contractcourt/utxonursery_test.go index a99eb7eaf88..a4b8b00d16c 100644 --- a/contractcourt/utxonursery_test.go +++ b/contractcourt/utxonursery_test.go @@ -14,10 +14,10 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/discovery/chan_series.go b/discovery/chan_series.go index 72f2076a1a3..9617528b94c 100644 --- a/discovery/chan_series.go +++ b/discovery/chan_series.go @@ -5,7 +5,7 @@ import ( "iter" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/fn/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/lnwire" diff --git a/discovery/gossiper.go b/discovery/gossiper.go index 6a778bba4ee..9f84162d3e5 100644 --- a/discovery/gossiper.go +++ b/discovery/gossiper.go @@ -12,13 +12,14 @@ import ( "sync/atomic" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightninglabs/neutrino/cache" "github.com/lightninglabs/neutrino/cache/lru" "github.com/lightningnetwork/lnd/actor" @@ -2161,7 +2162,7 @@ func (d *AuthenticatedGossiper) processRejectedEdge(_ context.Context, // fetchPKScript fetches the output script for the given SCID. func (d *AuthenticatedGossiper) fetchPKScript(chanID lnwire.ShortChannelID) ( - txscript.ScriptClass, btcutil.Address, error) { + txscript.ScriptClass, btcaddr.Address, error) { pkScript, err := lnwallet.FetchPKScriptWithQuit( d.cfg.ChainIO, chanID, d.quit, diff --git a/discovery/gossiper_test.go b/discovery/gossiper_test.go index d6fe209c0bb..f9151ed096b 100644 --- a/discovery/gossiper_test.go +++ b/discovery/gossiper_test.go @@ -17,10 +17,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightninglabs/neutrino/cache" "github.com/lightningnetwork/lnd/actor" diff --git a/discovery/mock_test.go b/discovery/mock_test.go index 050c570964d..ad0ff8cf76e 100644 --- a/discovery/mock_test.go +++ b/discovery/mock_test.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/discovery/sync_manager.go b/discovery/sync_manager.go index 4ea3eac4911..de071e8faeb 100644 --- a/discovery/sync_manager.go +++ b/discovery/sync_manager.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnwire" diff --git a/discovery/syncer.go b/discovery/syncer.go index 7ffe7f65031..bcd0cd6c26a 100644 --- a/discovery/syncer.go +++ b/discovery/syncer.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/actor" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph" diff --git a/discovery/syncer_queue_test.go b/discovery/syncer_queue_test.go index 704328cd1ea..5dee661c49f 100644 --- a/discovery/syncer_queue_test.go +++ b/discovery/syncer_queue_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lntest/wait" "github.com/lightningnetwork/lnd/lnwire" "github.com/stretchr/testify/require" diff --git a/discovery/syncer_test.go b/discovery/syncer_test.go index f27ba7be544..cd05c78f13c 100644 --- a/discovery/syncer_test.go +++ b/discovery/syncer_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/davecgh/go-spew/spew" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/lnpeer" diff --git a/funding/aux_funding.go b/funding/aux_funding.go index c7ef653f47f..9a300ba011f 100644 --- a/funding/aux_funding.go +++ b/funding/aux_funding.go @@ -1,7 +1,7 @@ package funding import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/funding/batch.go b/funding/batch.go index 23733d33df8..796c06ad044 100644 --- a/funding/batch.go +++ b/funding/batch.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/labels" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/walletrpc" diff --git a/funding/batch_test.go b/funding/batch_test.go index ee74082a449..0f89158e4cf 100644 --- a/funding/batch_test.go +++ b/funding/batch_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/walletrpc" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/funding/manager.go b/funding/manager.go index 66f68859c33..4efbb101a0a 100644 --- a/funding/manager.go +++ b/funding/manager.go @@ -15,10 +15,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/actor" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/chanacceptor" diff --git a/funding/manager_test.go b/funding/manager_test.go index b4581cecc08..6e4b8881413 100644 --- a/funding/manager_test.go +++ b/funding/manager_test.go @@ -19,10 +19,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/actor" "github.com/lightningnetwork/lnd/aliasmgr" diff --git a/go.mod b/go.mod index fbc3ba02b06..39a14c89b16 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,16 @@ require ( github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 github.com/andybalholm/brotli v1.0.4 - github.com/btcsuite/btcd v0.25.1-0.20260310163610-1c55c7c18179 - github.com/btcsuite/btcd/btcec/v2 v2.3.6 + github.com/btcsuite/btcd v0.26.0 + github.com/btcsuite/btcd/address/v2 v2.0.0 + github.com/btcsuite/btcd/btcec/v2 v2.5.0 github.com/btcsuite/btcd/btcutil v1.1.6 - github.com/btcsuite/btcd/btcutil/psbt v1.1.10 - github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 + github.com/btcsuite/btcd/btcutil/v2 v2.0.0 + github.com/btcsuite/btcd/chaincfg/v2 v2.0.0 + github.com/btcsuite/btcd/chainhash/v2 v2.0.0 + github.com/btcsuite/btcd/psbt/v2 v2.0.0 + github.com/btcsuite/btcd/txscript/v2 v2.0.0 + github.com/btcsuite/btcd/wire/v2 v2.0.0 github.com/btcsuite/btclog v1.0.0 github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b github.com/btcsuite/btcwallet v0.16.18 @@ -19,7 +24,7 @@ require ( github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f github.com/davecgh/go-spew v1.1.1 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 - github.com/gorilla/websocket v1.5.0 + github.com/gorilla/websocket v1.5.3 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 @@ -42,7 +47,7 @@ require ( github.com/lightningnetwork/lnd/queue v1.2.0 github.com/lightningnetwork/lnd/sqldb v1.0.13 github.com/lightningnetwork/lnd/ticker v1.1.1 - github.com/lightningnetwork/lnd/tlv v1.3.2 + github.com/lightningnetwork/lnd/tlv v1.3.3-0.20260615022959-a067468f0f45 github.com/lightningnetwork/lnd/tor v1.1.7 github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 github.com/miekg/dns v1.1.43 @@ -65,6 +70,8 @@ require ( pgregory.net/rapid v1.2.0 ) +require github.com/kcalvinalvin/anet v0.0.0-20251112173137-d8ddc1f6dbee // indirect + require ( dario.cat/mergo v1.0.1 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect @@ -86,7 +93,7 @@ require ( github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect - github.com/decred/dcrd/lru v1.1.2 // indirect + github.com/decred/dcrd/lru v1.1.3 // indirect github.com/docker/cli v28.1.1+incompatible // indirect github.com/docker/docker v28.1.1+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect @@ -102,7 +109,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/golang-migrate/migrate/v4 v4.17.0 // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/golang/snappy v0.0.4 // indirect + github.com/golang/snappy v1.0.0 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect @@ -211,3 +218,19 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d go 1.25.11 retract v0.0.2 + +replace github.com/btcsuite/btcwallet => github.com/guggero/btcwallet v0.13.1-0.20260619113612-9ea600d63685 + +replace github.com/btcsuite/btcwallet/wallet/txauthor => github.com/guggero/btcwallet/wallet/txauthor v1.1.1-0.20260619113612-9ea600d63685 + +replace github.com/btcsuite/btcwallet/wallet/txrules => github.com/guggero/btcwallet/wallet/txrules v1.1.1-0.20260619113612-9ea600d63685 + +replace github.com/btcsuite/btcwallet/wallet/txsizes => github.com/guggero/btcwallet/wallet/txsizes v1.1.1-0.20260619113612-9ea600d63685 + +replace github.com/btcsuite/btcwallet/walletdb => github.com/guggero/btcwallet/walletdb v1.4.1-0.20260619113612-9ea600d63685 + +replace github.com/btcsuite/btcwallet/wtxmgr => github.com/guggero/btcwallet/wtxmgr v1.3.1-0.20260619113612-9ea600d63685 + +replace github.com/lightninglabs/neutrino => github.com/guggero/neutrino v0.11.1-0.20260619073835-e49be6c9c0ef + +replace github.com/lightningnetwork/lightning-onion => github.com/ellemouton/lightning-onion v1.2.1-0.20260623213731-6904fc7e08e0 diff --git a/go.sum b/go.sum index 45385931ad0..19fee3ca1b9 100644 --- a/go.sum +++ b/go.sum @@ -34,43 +34,42 @@ github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13P github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M= github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A= github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg= -github.com/btcsuite/btcd v0.25.1-0.20260310163610-1c55c7c18179 h1:yJOTxkbxxtuSFrErMqYRvqZLfWggHssioBiWebkV9yo= -github.com/btcsuite/btcd v0.25.1-0.20260310163610-1c55c7c18179/go.mod h1:qbPE+pEiR9643E1s1xu57awsRhlCIm1ZIi6FfeRA4KE= +github.com/btcsuite/btcd v0.26.0 h1:yntnSshlG3+H7dTwIOR4LTFXDPojVBsFORBNN5y5c/c= +github.com/btcsuite/btcd v0.26.0/go.mod h1:7ft7+a/MoJHFouFopCb1zyiR9IWPlrcPVn6K/lJ1dcA= +github.com/btcsuite/btcd/address/v2 v2.0.0 h1:UVu8Hal6Siu4XastFe+JX5JkeBYONbDUIY5E+SVTs6I= +github.com/btcsuite/btcd/address/v2 v2.0.0/go.mod h1:htJK1AtaeK3bKNfZY63ep2oN8LbrI6qvmPGe1vekb3I= github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA= github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= -github.com/btcsuite/btcd/btcec/v2 v2.3.6 h1:IzlsEr9olcSRKB/n7c4351F3xHKxS2lma+1UFGCYd4E= -github.com/btcsuite/btcd/btcec/v2 v2.3.6/go.mod h1:m22FrOAiuxl/tht9wIqAoGHcbnCCaPWyauO8y2LGGtQ= +github.com/btcsuite/btcd/btcec/v2 v2.5.0 h1:KioMXOWa76b86sTZZOmbzv/ldaQCmB8KFAyn5PbB8E8= +github.com/btcsuite/btcd/btcec/v2 v2.5.0/go.mod h1:+K/MYXcLBtHEQjRbjHuJChuybk4LCgjdjgRwil+e+Kk= github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A= github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE= github.com/btcsuite/btcd/btcutil v1.1.5/go.mod h1:PSZZ4UitpLBWzxGd5VGOrLnmOjtPP/a6HaFo12zMs00= github.com/btcsuite/btcd/btcutil v1.1.6 h1:zFL2+c3Lb9gEgqKNzowKUPQNb8jV7v5Oaodi/AYFd6c= github.com/btcsuite/btcd/btcutil v1.1.6/go.mod h1:9dFymx8HpuLqBnsPELrImQeTQfKBQqzqGbbV3jK55aE= -github.com/btcsuite/btcd/btcutil/psbt v1.1.10 h1:TC1zhxhFfhnGqoPjsrlEpoqzh+9TPOHrCgnPR47Mj9I= -github.com/btcsuite/btcd/btcutil/psbt v1.1.10/go.mod h1:ehBEvU91lxSlXtA+zZz3iFYx7Yq9eqnKx4/kSrnsvMY= +github.com/btcsuite/btcd/btcutil/v2 v2.0.0 h1:77pgf/4tjWaSBLdos8yiWVWL3rSphxWNqkLwcyONExA= +github.com/btcsuite/btcd/btcutil/v2 v2.0.0/go.mod h1:ZF8MMdsx1JGgvHJUanxbigekSO+8bN/ai34LBk/lg3c= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= -github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ= github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/btcsuite/btcd/chaincfg/v2 v2.0.0 h1:M/RTtXfXA9odC1RUEOyZFXj/NXKVHPYZXVjb60xTOok= +github.com/btcsuite/btcd/chaincfg/v2 v2.0.0/go.mod h1:rHgHIXYYfn70m25a+BJ9f9z7VZAsTiDQGB2XYaippGQ= +github.com/btcsuite/btcd/chainhash/v2 v2.0.0 h1:PMLlSloHJuEeB80XG9EjpXWNEKAZAMLl6YHZ6YsEuoA= +github.com/btcsuite/btcd/chainhash/v2 v2.0.0/go.mod h1:mKxcZ7oGTXE7IRV+sS9hP4EVBwc/SzfNR+52IsOP9j8= +github.com/btcsuite/btcd/psbt/v2 v2.0.0 h1:vKBfHGkxsplVExwCozfK9VuioZ6D6cRpAhcMia2kgrQ= +github.com/btcsuite/btcd/psbt/v2 v2.0.0/go.mod h1:WdHfpXJDXklnMU8u22YXz8o12q8hPYr4b8CxpKdjGYs= +github.com/btcsuite/btcd/txscript/v2 v2.0.0 h1:pEmmHaC8eRx6KSB63zSVJD7qrit9/c9cLSrw++XrYP8= +github.com/btcsuite/btcd/txscript/v2 v2.0.0/go.mod h1:pZXabc11Xr9nz/18kXY3yErdAajYc3gi28Zqb3KqlFo= github.com/btcsuite/btcd/v2transport v1.0.1 h1:pIyyyBCPwd087K3Wdb/9tIvUubAQdzTJghjPgzTQVsE= github.com/btcsuite/btcd/v2transport v1.0.1/go.mod h1:N6H0HGSElVVJKntzaYHYVbW71DtWDLMw2yhwVRO3ZOE= +github.com/btcsuite/btcd/wire/v2 v2.0.0 h1:mYSKzZZ0a1sK+aMhXzfDSVsSzRkWkU3x2U04TFRS2z8= +github.com/btcsuite/btcd/wire/v2 v2.0.0/go.mod h1:bGxkPkk8IiDvUo1D96wE03llBIk7p2MdWYRyAQwLmqM= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btclog v1.0.0 h1:sEkpKJMmfGiyZjADwEIgB1NSwMyfdD1FB8v6+w1T0Ns= github.com/btcsuite/btclog v1.0.0/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ= github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b h1:MQ+Q6sDy37V1wP1Yu79A5KqJutolqUGwA99UZWQDWZM= github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcwallet v0.16.18 h1:6h0kMxij4igPu35jOPAWZbn22ceOC4me4L3jj8Za6Zk= -github.com/btcsuite/btcwallet v0.16.18/go.mod h1:4TTru0cgIPbCZpY4aRfAVwX87zrQw4GXM8MH6+A5xZw= -github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 h1:Rr0njWI3r341nhSPesKQ2JF+ugDSzdPoeckS75SeDZk= -github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5/go.mod h1:+tXJ3Ym0nlQc/iHSwW1qzjmPs3ev+UVWMbGgfV1OZqU= -github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 h1:YEO+Lx1ZJJAtdRrjuhXjWrYsmAk26wLTlNzxt2q0lhk= -github.com/btcsuite/btcwallet/wallet/txrules v1.2.2/go.mod h1:4v+grppsDpVn91SJv+mZT7B8hEV4nSmpREM4I8Uohws= -github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 h1:93o5Xz9dYepBP4RMFUc9RGIFXwqP2volSWRkYJFrNtI= -github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5/go.mod h1:lQ+e9HxZ85QP7r3kdxItkiMSloSLg1PEGis5o5CXUQw= -github.com/btcsuite/btcwallet/walletdb v1.5.1 h1:HgMhDNCrtEFPC+8q0ei5DQ5U9Tl4RCspA22DEKXlopI= -github.com/btcsuite/btcwallet/walletdb v1.5.1/go.mod h1:jk/hvpLFINF0C1kfTn0bfx2GbnFT+Nvnj6eblZALfjs= -github.com/btcsuite/btcwallet/wtxmgr v1.5.6 h1:Zwvr/rrJYdOLqdBCSr4eICEstnEA+NBUvjIWLkrXaYI= -github.com/btcsuite/btcwallet/wtxmgr v1.5.6/go.mod h1:lzVbDkk/jRao2ib5kge46aLZW1yFc8RFNycdYpnsmZA= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/golangcrypto v0.0.0-20150304025918-53f62d9b43e8/go.mod h1:tYvUd8KLhm/oXvUeSEs2VlLghFjQt9+ZaF9ghH0JNjc= @@ -117,8 +116,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeC github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= -github.com/decred/dcrd/lru v1.1.2 h1:KdCzlkxppuoIDGEvCGah1fZRicrDH36IipvlB1ROkFY= -github.com/decred/dcrd/lru v1.1.2/go.mod h1:gEdCVgXs1/YoBvFWt7Scgknbhwik3FgVSzlnCcXL2N8= +github.com/decred/dcrd/lru v1.1.3 h1:w9EAbvGLyzm6jTjF83UKuqZEiUtJmvRhQDOCEIvSuE0= +github.com/decred/dcrd/lru v1.1.3/go.mod h1:Tw0i0pJyiLEx/oZdHLe1Wdv/Y7EGzAX+sYftnmxBR4o= github.com/dhui/dktest v0.4.0 h1:z05UmuXZHO/bgj/ds2bGMBu8FI4WA+Ag/m3ghL+om7M= github.com/dhui/dktest v0.4.0/go.mod h1:v/Dbz1LgCBOi2Uki2nUqLBGa83hWBGFMu5MrgMDCc78= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= @@ -133,6 +132,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/ellemouton/lightning-onion v1.2.1-0.20260623213731-6904fc7e08e0 h1:PmE3HoMBb5fTVJuNHtouxX1aiJfDeb9xMrbi2h5nZrc= +github.com/ellemouton/lightning-onion v1.2.1-0.20260623213731-6904fc7e08e0/go.mod h1:MDGNhCkkJAexcaAN0K0vZKw8UAHJc1hog4Ih2xGGI9g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -180,8 +181,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= +github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -198,8 +200,9 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= @@ -208,6 +211,20 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/guggero/btcwallet v0.13.1-0.20260619113612-9ea600d63685 h1:WvLViEDBwTzcy/lpt6rvKo+joLqA+f5eGbAVYGYrd0Q= +github.com/guggero/btcwallet v0.13.1-0.20260619113612-9ea600d63685/go.mod h1:1tbmPRVRR5KH240kyxQ7CCOCxWJURVlGVbhgEGkQ98s= +github.com/guggero/btcwallet/wallet/txauthor v1.1.1-0.20260619113612-9ea600d63685 h1:YuDCiUIi46pkhTmnmYUW0b0UbUyQbrNzy9rZIzrSF2c= +github.com/guggero/btcwallet/wallet/txauthor v1.1.1-0.20260619113612-9ea600d63685/go.mod h1:g5assDFIEicw3DPQwrCcgbbfbFiJ7L52Dj3AOjOdZTs= +github.com/guggero/btcwallet/wallet/txrules v1.1.1-0.20260619113612-9ea600d63685 h1:2qXQ8JajCvzw/3bLU0NKN/Zl6lLLhr/t9hDLx8OKA2Y= +github.com/guggero/btcwallet/wallet/txrules v1.1.1-0.20260619113612-9ea600d63685/go.mod h1:J9eUkShH430SZI5OesAQheTYQ4H+bz/6Fe0L1dBkxMY= +github.com/guggero/btcwallet/wallet/txsizes v1.1.1-0.20260619113612-9ea600d63685 h1:iQbLjjPnNxC1DL/xLtxQNrHOhr4ArPZtbZwwpMm0DhI= +github.com/guggero/btcwallet/wallet/txsizes v1.1.1-0.20260619113612-9ea600d63685/go.mod h1:D0gVV+Pf7gVGn2U/R0IY0WingXa6cTO4Anx9P7ETcv8= +github.com/guggero/btcwallet/walletdb v1.4.1-0.20260619113612-9ea600d63685 h1:Jx7o9z9Ip3d7hxMzNdGHVXlqgu7SXAXNvFETERfSuYE= +github.com/guggero/btcwallet/walletdb v1.4.1-0.20260619113612-9ea600d63685/go.mod h1:q9xif0Csp52GVb3l252BbHCuyiCnuEbrPWu/HAsvaYc= +github.com/guggero/btcwallet/wtxmgr v1.3.1-0.20260619113612-9ea600d63685 h1:ErNFMXeXBgVnX1RzGvT37+JzZrX+ATAfXcquF275hXg= +github.com/guggero/btcwallet/wtxmgr v1.3.1-0.20260619113612-9ea600d63685/go.mod h1:luCTnCuAqoDWMxkf8pjzOJCWofuh+9uUBdnO4UuJpzQ= +github.com/guggero/neutrino v0.11.1-0.20260619073835-e49be6c9c0ef h1:g4UO1v0J62JnwqAT3ge/Yb0ynDBA0z83xOf3jLRScGU= +github.com/guggero/neutrino v0.11.1-0.20260619073835-e49be6c9c0ef/go.mod h1:+1uMpDG/YbC3VaPKVjIQf0DWrEAPgvdbuyUGMcrU8Iw= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -262,6 +279,8 @@ github.com/juju/utils/v3 v3.0.0-20220130232349-cd7ecef0e94a h1:5ZWDCeCF0RaITrZGe github.com/juju/utils/v3 v3.0.0-20220130232349-cd7ecef0e94a/go.mod h1:LzwbbEN7buYjySp4nqnti6c6olSqRXUk6RkbSUUP1n8= github.com/juju/version/v2 v2.0.0-20211007103408-2e8da085dc23 h1:wtEPbidt1VyHlb8RSztU6ySQj29FLsOQiI9XiJhXDM4= github.com/juju/version/v2 v2.0.0-20211007103408-2e8da085dc23/go.mod h1:Ljlbryh9sYaUSGXucslAEDf0A2XUSGvDbHJgW8ps6nc= +github.com/kcalvinalvin/anet v0.0.0-20251112173137-d8ddc1f6dbee h1:FPP9HDkBbPyniu+u7FHZg+kKFX1WW0gxOGteJ0h3AJk= +github.com/kcalvinalvin/anet v0.0.0-20251112173137-d8ddc1f6dbee/go.mod h1:N6sz6HwJAenJ6d+/xmSl0ikfV05ZrVGmjt1ryy/WOtE= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= @@ -284,14 +303,10 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc= github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk= -github.com/lightninglabs/neutrino v0.17.1 h1:lNhgq7ix/N81R6oATroP/kHMzH1qzVVF2dEGcTlN2t4= -github.com/lightninglabs/neutrino v0.17.1/go.mod h1:tcwCgRTGWcaua0L/xzdwllW8eslHDbux4XkiYsivvHE= github.com/lightninglabs/neutrino/cache v1.1.3 h1:rgnabC41W+XaPuBTQrdeFjFCCAVKh1yctAgmb3Se9zA= github.com/lightninglabs/neutrino/cache v1.1.3/go.mod h1:qxkJb+pUxR5p84jl5uIGFCR4dGdFkhNUwMSxw3EUWls= github.com/lightninglabs/protobuf-go-hex-display v1.36.11-hex-display h1:fjePiMfYbg3KodAiSXwkpGZpYdPeNd9VnggJWiY6AaY= github.com/lightninglabs/protobuf-go-hex-display v1.36.11-hex-display/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= -github.com/lightningnetwork/lightning-onion v1.3.0 h1:FqILgHjD6euc/Muo1VOzZ4+XDPuFnw6EYROBq0rR/5c= -github.com/lightningnetwork/lightning-onion v1.3.0/go.mod h1:nP85zMHG7c0si/eHBbSQpuDCtnIXfSvFrK3tW6YWzmU= github.com/lightningnetwork/lnd/actor v0.0.6 h1:Ge8N2wivARG+27qJBwTlB0vwsypStZYZy8vk4Zl38sU= github.com/lightningnetwork/lnd/actor v0.0.6/go.mod h1:YAsoniSbY/cAM9HTVNfZLvt7RI6swDxy6wzPspTcMZg= github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI= @@ -308,8 +323,8 @@ github.com/lightningnetwork/lnd/queue v1.2.0 h1:sSrn+u84OLuOT/F+xGxgg8VfknXeIZEA github.com/lightningnetwork/lnd/queue v1.2.0/go.mod h1:qLNP0L3B7piRGvDyhAyJKic4xTt+Mw4D7mWrQeuAwxY= github.com/lightningnetwork/lnd/ticker v1.1.1 h1:J/b6N2hibFtC7JLV77ULQp++QLtCwT6ijJlbdiZFbSM= github.com/lightningnetwork/lnd/ticker v1.1.1/go.mod h1:waPTRAAcwtu7Ji3+3k+u/xH5GHovTsCoSVpho0KDvdA= -github.com/lightningnetwork/lnd/tlv v1.3.2 h1:MO4FCk7F4k5xPMqVZF6Nb/kOpxlwPrUQpYjmyKny5s0= -github.com/lightningnetwork/lnd/tlv v1.3.2/go.mod h1:pJuiBj1ecr1WWLOtcZ+2+hu9Ey25aJWFIsjmAoPPnmc= +github.com/lightningnetwork/lnd/tlv v1.3.3-0.20260615022959-a067468f0f45 h1:krvpxGTZJiDyvwU4Jr3GwR00lT4DKITDS95s28wQKU4= +github.com/lightningnetwork/lnd/tlv v1.3.3-0.20260615022959-a067468f0f45/go.mod h1:oL5WIFd3ZoEwh3oH1xzizeUl6pq3DIhx9ljDvRdvI3Q= github.com/lightningnetwork/lnd/tor v1.1.7 h1:BfY1KQGz3LVaeaAGI4XYGYCwDQR1ADFD1P/uXsS2dQc= github.com/lightningnetwork/lnd/tor v1.1.7/go.mod h1:DANQ6QCQBiR+CqrM+mKudgkMy6CR/RS4ALDbjb2W4FU= github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 h1:sjOGyegMIhvgfq5oaue6Td+hxZuf3tDC8lAPrFldqFw= diff --git a/graph/builder.go b/graph/builder.go index 14f5b7ac8a6..c8e8d09f22c 100644 --- a/graph/builder.go +++ b/graph/builder.go @@ -9,7 +9,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/graph/builder_test.go b/graph/builder_test.go index d9e1c2c5a6f..2102f966bd1 100644 --- a/graph/builder_test.go +++ b/graph/builder_test.go @@ -16,10 +16,10 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/graph/db/benchmark_test.go b/graph/db/benchmark_test.go index ff245d08b2c..4b6bf201dc7 100644 --- a/graph/db/benchmark_test.go +++ b/graph/db/benchmark_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/graph/db/channel_cache_test.go b/graph/db/channel_cache_test.go index 28d6127244f..4f61def20d3 100644 --- a/graph/db/channel_cache_test.go +++ b/graph/db/channel_cache_test.go @@ -3,7 +3,7 @@ package graphdb import ( "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/graph/db/codec.go b/graph/db/codec.go index 029f9b93d41..a3981a603d2 100644 --- a/graph/db/codec.go +++ b/graph/db/codec.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) var ( diff --git a/graph/db/graph.go b/graph/db/graph.go index a63b9d0e663..c84ed364d3a 100644 --- a/graph/db/graph.go +++ b/graph/db/graph.go @@ -12,8 +12,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/graph/db/graph_cache.go b/graph/db/graph_cache.go index 7cf101face8..4343be8ac86 100644 --- a/graph/db/graph_cache.go +++ b/graph/db/graph_cache.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/graph/db/graph_test.go b/graph/db/graph_test.go index e524f0b1fca..46d61866d75 100644 --- a/graph/db/graph_test.go +++ b/graph/db/graph_test.go @@ -18,10 +18,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" diff --git a/graph/db/interfaces.go b/graph/db/interfaces.go index c126be014c4..df112064d01 100644 --- a/graph/db/interfaces.go +++ b/graph/db/interfaces.go @@ -7,8 +7,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" diff --git a/graph/db/kv_store.go b/graph/db/kv_store.go index 47c478c3607..7ca125d23ed 100644 --- a/graph/db/kv_store.go +++ b/graph/db/kv_store.go @@ -16,8 +16,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/walletdb" "github.com/lightningnetwork/lnd/aliasmgr" "github.com/lightningnetwork/lnd/batch" diff --git a/graph/db/migration1/codec.go b/graph/db/migration1/codec.go index 243308f6c44..3f839e7bc4e 100644 --- a/graph/db/migration1/codec.go +++ b/graph/db/migration1/codec.go @@ -7,7 +7,7 @@ import ( "io" "strconv" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) var ( diff --git a/graph/db/migration1/kv_store.go b/graph/db/migration1/kv_store.go index 1146ec758f9..c9552402a91 100644 --- a/graph/db/migration1/kv_store.go +++ b/graph/db/migration1/kv_store.go @@ -11,8 +11,8 @@ import ( "net" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/migration1/models" diff --git a/graph/db/migration1/models/channel_edge_info.go b/graph/db/migration1/models/channel_edge_info.go index c99dfa215b8..443d089a65a 100644 --- a/graph/db/migration1/models/channel_edge_info.go +++ b/graph/db/migration1/models/channel_edge_info.go @@ -1,9 +1,9 @@ package models import ( - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/graph/db/migration1/sql_migration.go b/graph/db/migration1/sql_migration.go index 8a3161800b4..7a68a214890 100644 --- a/graph/db/migration1/sql_migration.go +++ b/graph/db/migration1/sql_migration.go @@ -12,7 +12,7 @@ import ( "slices" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/graph/db/migration1/models" "github.com/lightningnetwork/lnd/graph/db/migration1/sqlc" "github.com/lightningnetwork/lnd/kvdb" diff --git a/graph/db/migration1/sql_migration_test.go b/graph/db/migration1/sql_migration_test.go index d1c38683fd6..4e86b03046a 100644 --- a/graph/db/migration1/sql_migration_test.go +++ b/graph/db/migration1/sql_migration_test.go @@ -23,10 +23,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/graph/db/migration1/models" "github.com/lightningnetwork/lnd/kvdb" diff --git a/graph/db/migration1/sql_store.go b/graph/db/migration1/sql_store.go index c012ec30ec7..d095e04921c 100644 --- a/graph/db/migration1/sql_store.go +++ b/graph/db/migration1/sql_store.go @@ -12,9 +12,9 @@ import ( "strconv" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/migration1/models" "github.com/lightningnetwork/lnd/graph/db/migration1/sqlc" diff --git a/graph/db/migration1/test_postgres.go b/graph/db/migration1/test_postgres.go index c5724fced30..a428af0640c 100644 --- a/graph/db/migration1/test_postgres.go +++ b/graph/db/migration1/test_postgres.go @@ -5,7 +5,7 @@ package migration1 import ( "testing" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/graph/db/migration1/sqlc" "github.com/lightningnetwork/lnd/sqldb" "github.com/stretchr/testify/require" diff --git a/graph/db/migration1/test_sqlite.go b/graph/db/migration1/test_sqlite.go index 69096faba78..ed6402ffd43 100644 --- a/graph/db/migration1/test_sqlite.go +++ b/graph/db/migration1/test_sqlite.go @@ -5,7 +5,7 @@ package migration1 import ( "testing" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/graph/db/migration1/sqlc" "github.com/lightningnetwork/lnd/sqldb" "github.com/stretchr/testify/require" diff --git a/graph/db/models/cached_edge_info.go b/graph/db/models/cached_edge_info.go index eab12fbdd69..3e9cfea0795 100644 --- a/graph/db/models/cached_edge_info.go +++ b/graph/db/models/cached_edge_info.go @@ -1,6 +1,6 @@ package models -import "github.com/btcsuite/btcd/btcutil" +import "github.com/btcsuite/btcd/btcutil/v2" // CachedEdgeInfo is a struct that only caches the information of a // ChannelEdgeInfo that we actually use for pathfinding and therefore need to diff --git a/graph/db/models/channel_edge_info.go b/graph/db/models/channel_edge_info.go index a7e1107be20..d2665842651 100644 --- a/graph/db/models/channel_edge_info.go +++ b/graph/db/models/channel_edge_info.go @@ -6,9 +6,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwire" diff --git a/graph/db/models/channel_edge_info_test.go b/graph/db/models/channel_edge_info_test.go index 71028950202..1ed1915715a 100644 --- a/graph/db/models/channel_edge_info_test.go +++ b/graph/db/models/channel_edge_info_test.go @@ -5,7 +5,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwire" diff --git a/graph/db/notifications.go b/graph/db/notifications.go index 1c8a8898602..405c26558cb 100644 --- a/graph/db/notifications.go +++ b/graph/db/notifications.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnutils" diff --git a/graph/db/sql_store.go b/graph/db/sql_store.go index 871ad1a5106..1476515171b 100644 --- a/graph/db/sql_store.go +++ b/graph/db/sql_store.go @@ -18,9 +18,9 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/aliasmgr" "github.com/lightningnetwork/lnd/batch" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/graph/db/test_postgres.go b/graph/db/test_postgres.go index a1bd61a2cb0..375480656fc 100644 --- a/graph/db/test_postgres.go +++ b/graph/db/test_postgres.go @@ -6,7 +6,7 @@ import ( "database/sql" "testing" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/sqldb" "github.com/stretchr/testify/require" ) diff --git a/graph/db/test_sqlite.go b/graph/db/test_sqlite.go index 137ab7aa91c..50db504739a 100644 --- a/graph/db/test_sqlite.go +++ b/graph/db/test_sqlite.go @@ -6,7 +6,7 @@ import ( "database/sql" "testing" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/sqldb" "github.com/stretchr/testify/require" ) diff --git a/graph/notifications_test.go b/graph/notifications_test.go index f8bc0f21fb9..898d951fcf4 100644 --- a/graph/notifications_test.go +++ b/graph/notifications_test.go @@ -13,10 +13,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/fn/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" diff --git a/htlcswitch/circuit_map_test.go b/htlcswitch/circuit_map_test.go index 9bbb2c051a7..c4b6e442fb7 100644 --- a/htlcswitch/circuit_map_test.go +++ b/htlcswitch/circuit_map_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/kvdb" diff --git a/htlcswitch/circuit_test.go b/htlcswitch/circuit_test.go index ddad11aca91..f21e97367ba 100644 --- a/htlcswitch/circuit_test.go +++ b/htlcswitch/circuit_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/htlcswitch" diff --git a/htlcswitch/hop/forwarding_info.go b/htlcswitch/hop/forwarding_info.go index 92ea541cc3e..7f728f04709 100644 --- a/htlcswitch/hop/forwarding_info.go +++ b/htlcswitch/hop/forwarding_info.go @@ -1,7 +1,7 @@ package hop import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/htlcswitch/hop/iterator.go b/htlcswitch/hop/iterator.go index 553c4921dbc..cc539fe8a01 100644 --- a/htlcswitch/hop/iterator.go +++ b/htlcswitch/hop/iterator.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" diff --git a/htlcswitch/hop/payload.go b/htlcswitch/hop/payload.go index fc456828a57..052cf18003e 100644 --- a/htlcswitch/hop/payload.go +++ b/htlcswitch/hop/payload.go @@ -6,7 +6,7 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/record" diff --git a/htlcswitch/interfaces.go b/htlcswitch/interfaces.go index 4739afff6ec..75974a748bd 100644 --- a/htlcswitch/interfaces.go +++ b/htlcswitch/interfaces.go @@ -3,8 +3,8 @@ package htlcswitch import ( "context" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/htlcswitch/link.go b/htlcswitch/link.go index dd0f5d37ac2..77b2b394474 100644 --- a/htlcswitch/link.go +++ b/htlcswitch/link.go @@ -12,8 +12,8 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/contractcourt" diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go index 6a518cbfa20..148254d9b7e 100644 --- a/htlcswitch/link_test.go +++ b/htlcswitch/link_test.go @@ -18,9 +18,9 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/build" diff --git a/htlcswitch/mailbox_test.go b/htlcswitch/mailbox_test.go index 57a581c4b14..af4b192e7f0 100644 --- a/htlcswitch/mailbox_test.go +++ b/htlcswitch/mailbox_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/clock" diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go index 70bd73c37d2..637f3e2d5b7 100644 --- a/htlcswitch/mock.go +++ b/htlcswitch/mock.go @@ -17,8 +17,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go index a3aae809b93..b86d7be717d 100644 --- a/htlcswitch/switch.go +++ b/htlcswitch/switch.go @@ -11,8 +11,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/clock" diff --git a/htlcswitch/switch_test.go b/htlcswitch/switch_test.go index 9dfe22e7b4f..2f66fedb347 100644 --- a/htlcswitch/switch_test.go +++ b/htlcswitch/switch_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go index 2e084250943..10f7bdb8a95 100644 --- a/htlcswitch/test_utils.go +++ b/htlcswitch/test_utils.go @@ -19,9 +19,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/contractcourt" diff --git a/input/fuzz_script_is_op_return_test.go b/input/fuzz_script_is_op_return_test.go index 148d7b02ee0..ca6b730664e 100644 --- a/input/fuzz_script_is_op_return_test.go +++ b/input/fuzz_script_is_op_return_test.go @@ -3,8 +3,8 @@ package input import ( "testing" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/txscript/v2" "github.com/stretchr/testify/require" ) diff --git a/input/input.go b/input/input.go index 5ca42716e2c..13e6dc37835 100644 --- a/input/input.go +++ b/input/input.go @@ -3,9 +3,9 @@ package input import ( "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/tlv" diff --git a/input/mocks.go b/input/mocks.go index a7d7583e8a9..f8ec38a9037 100644 --- a/input/mocks.go +++ b/input/mocks.go @@ -6,8 +6,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lntypes" diff --git a/input/script_desc.go b/input/script_desc.go index 17b58b72196..3b566e2e607 100644 --- a/input/script_desc.go +++ b/input/script_desc.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/txscript/v2" "github.com/lightningnetwork/lnd/lnutils" ) diff --git a/input/script_utils.go b/input/script_utils.go index 3b907fcc32a..b6ed922b1df 100644 --- a/input/script_utils.go +++ b/input/script_utils.go @@ -6,14 +6,14 @@ import ( "encoding/hex" "fmt" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnutils" @@ -100,7 +100,7 @@ func WitnessScriptHash(witnessScript []byte) ([]byte, error) { // paying to a version 0 witness program containing the passed serialized // public key. func WitnessPubKeyHash(pubkey []byte) ([]byte, error) { - pkhash := btcutil.Hash160(pubkey) + pkhash := btcaddr.Hash160(pubkey) return txscript.ScriptTemplate( `OP_0 {{ hex .PKHash }}`, txscript.WithScriptTemplateParams(TemplateParams{ @@ -112,7 +112,7 @@ func WitnessPubKeyHash(pubkey []byte) ([]byte, error) { // GenerateP2SH generates a pay-to-script-hash public key script paying to the // passed redeem script. func GenerateP2SH(script []byte) ([]byte, error) { - scriptHash := btcutil.Hash160(script) + scriptHash := btcaddr.Hash160(script) return txscript.ScriptTemplate( `OP_HASH160 {{ hex .ScriptHash }} OP_EQUAL`, txscript.WithScriptTemplateParams(TemplateParams{ @@ -124,7 +124,7 @@ func GenerateP2SH(script []byte) ([]byte, error) { // GenerateP2PKH generates a pay-to-public-key-hash public key script paying to // the passed serialized public key. func GenerateP2PKH(pubkey []byte) ([]byte, error) { - pkHash := btcutil.Hash160(pubkey) + pkHash := btcaddr.Hash160(pubkey) return txscript.ScriptTemplate( `OP_DUP OP_HASH160 {{ hex .pkh }} OP_EQUALVERIFY OP_CHECKSIG`, txscript.WithScriptTemplateParams(TemplateParams{ @@ -375,7 +375,7 @@ func SenderHTLCScript(senderHtlcKey, receiverHtlcKey, return txscript.ScriptTemplate( scriptTemplate, txscript.WithScriptTemplateParams(TemplateParams{ - "RevKeyHash": btcutil.Hash160(revocationKey.SerializeCompressed()), //nolint:ll + "RevKeyHash": btcaddr.Hash160(revocationKey.SerializeCompressed()), //nolint:ll "ReceiverKey": receiverHtlcKey.SerializeCompressed(), //nolint:ll "SenderKey": senderHtlcKey.SerializeCompressed(), //nolint:ll "PaymentHashRipemd": Ripemd160H(paymentHash), @@ -1000,7 +1000,7 @@ func ReceiverHTLCScript(cltvExpiry uint32, senderHtlcKey, return txscript.ScriptTemplate( scriptTemplate, txscript.WithScriptTemplateParams(TemplateParams{ - "RevKeyHash": btcutil.Hash160( + "RevKeyHash": btcaddr.Hash160( revocationKey.SerializeCompressed(), ), "SenderKey": senderHtlcKey.SerializeCompressed(), //nolint:ll @@ -2513,7 +2513,7 @@ func CommitScriptUnencumbered(key *btcec.PublicKey) ([]byte, error) { return txscript.ScriptTemplate( `OP_0 {{ hex .PKHash }}`, txscript.WithScriptTemplateParams(TemplateParams{ - "PKHash": btcutil.Hash160(key.SerializeCompressed()), + "PKHash": btcaddr.Hash160(key.SerializeCompressed()), }), ) } diff --git a/input/script_utils_legacy_test.go b/input/script_utils_legacy_test.go index b3b4f88e741..5dbb49997c0 100644 --- a/input/script_utils_legacy_test.go +++ b/input/script_utils_legacy_test.go @@ -5,10 +5,10 @@ import ( "crypto/sha256" "fmt" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/txscript/v2" ) // legacyWitnessScriptHash generates a pay-to-witness-script-hash public key @@ -35,7 +35,7 @@ func legacyWitnessPubKeyHash(pubkey []byte) ([]byte, error) { ) bldr.AddOp(txscript.OP_0) - pkhash := btcutil.Hash160(pubkey) + pkhash := btcaddr.Hash160(pubkey) bldr.AddData(pkhash) return bldr.Script() @@ -49,7 +49,7 @@ func legacyGenerateP2SH(script []byte) ([]byte, error) { ) bldr.AddOp(txscript.OP_HASH160) - scripthash := btcutil.Hash160(script) + scripthash := btcaddr.Hash160(script) bldr.AddData(scripthash) bldr.AddOp(txscript.OP_EQUAL) @@ -65,7 +65,7 @@ func legacyGenerateP2PKH(pubkey []byte) ([]byte, error) { bldr.AddOp(txscript.OP_DUP) bldr.AddOp(txscript.OP_HASH160) - pkhash := btcutil.Hash160(pubkey) + pkhash := btcaddr.Hash160(pubkey) bldr.AddData(pkhash) bldr.AddOp(txscript.OP_EQUALVERIFY) bldr.AddOp(txscript.OP_CHECKSIG) @@ -117,7 +117,7 @@ func legacySenderHTLCScript(senderHtlcKey, receiverHtlcKey, // the stack. builder.AddOp(txscript.OP_DUP) builder.AddOp(txscript.OP_HASH160) - builder.AddData(btcutil.Hash160(revocationKey.SerializeCompressed())) + builder.AddData(btcaddr.Hash160(revocationKey.SerializeCompressed())) builder.AddOp(txscript.OP_EQUAL) // If the hash matches, then this is the revocation clause. The output @@ -212,7 +212,7 @@ func legacyReceiverHTLCScript(cltvExpiry uint32, senderHtlcKey, // the stack. builder.AddOp(txscript.OP_DUP) builder.AddOp(txscript.OP_HASH160) - builder.AddData(btcutil.Hash160(revocationKey.SerializeCompressed())) + builder.AddData(btcaddr.Hash160(revocationKey.SerializeCompressed())) builder.AddOp(txscript.OP_EQUAL) // If the hash matches, then this is the revocation clause. The output @@ -440,7 +440,7 @@ func legacyCommitScriptUnencumbered(key *btcec.PublicKey) ([]byte, error) { P2WPKHSize, )) builder.AddOp(txscript.OP_0) - builder.AddData(btcutil.Hash160(key.SerializeCompressed())) + builder.AddData(btcaddr.Hash160(key.SerializeCompressed())) return builder.Script() } diff --git a/input/script_utils_test.go b/input/script_utils_test.go index 4e1a92d3d6f..9616948a0e4 100644 --- a/input/script_utils_test.go +++ b/input/script_utils_test.go @@ -9,10 +9,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lntypes" "github.com/stretchr/testify/require" diff --git a/input/signdescriptor.go b/input/signdescriptor.go index a01c939ae74..7e77326b4a1 100644 --- a/input/signdescriptor.go +++ b/input/signdescriptor.go @@ -7,8 +7,8 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/input/signdescriptor_test.go b/input/signdescriptor_test.go index a929e3a1666..ddffaacf572 100644 --- a/input/signdescriptor_test.go +++ b/input/signdescriptor_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/input/signer.go b/input/signer.go index 1cf4003b00d..978a40f736b 100644 --- a/input/signer.go +++ b/input/signer.go @@ -1,7 +1,7 @@ package input import ( - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) // Signer represents an abstract object capable of generating raw signatures as diff --git a/input/size.go b/input/size.go index 97e251acf0a..3618f204f1b 100644 --- a/input/size.go +++ b/input/size.go @@ -2,8 +2,8 @@ package input import ( "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightningnetwork/lnd/lntypes" ) diff --git a/input/size_test.go b/input/size_test.go index b0531b1b811..93836f0a42e 100644 --- a/input/size_test.go +++ b/input/size_test.go @@ -3,13 +3,14 @@ package input_test import ( "testing" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" @@ -59,25 +60,25 @@ var ( func TestTxWeightEstimator(t *testing.T) { netParams := &chaincfg.MainNetParams - p2pkhAddr, err := btcutil.NewAddressPubKeyHash( + p2pkhAddr, err := btcaddr.NewAddressPubKeyHash( make([]byte, 20), netParams) require.NoError(t, err, "Failed to generate address") p2pkhScript, err := txscript.PayToAddrScript(p2pkhAddr) require.NoError(t, err, "Failed to generate scriptPubKey") - p2wkhAddr, err := btcutil.NewAddressWitnessPubKeyHash( + p2wkhAddr, err := btcaddr.NewAddressWitnessPubKeyHash( make([]byte, 20), netParams) require.NoError(t, err, "Failed to generate address") p2wkhScript, err := txscript.PayToAddrScript(p2wkhAddr) require.NoError(t, err, "Failed to generate scriptPubKey") - p2wshAddr, err := btcutil.NewAddressWitnessScriptHash( + p2wshAddr, err := btcaddr.NewAddressWitnessScriptHash( make([]byte, 32), netParams) require.NoError(t, err, "Failed to generate address") p2wshScript, err := txscript.PayToAddrScript(p2wshAddr) require.NoError(t, err, "Failed to generate scriptPubKey") - p2shAddr, err := btcutil.NewAddressScriptHash([]byte{0}, netParams) + p2shAddr, err := btcaddr.NewAddressScriptHash([]byte{0}, netParams) require.NoError(t, err, "Failed to generate address") p2shScript, err := txscript.PayToAddrScript(p2shAddr) require.NoError(t, err, "Failed to generate scriptPubKey") diff --git a/input/taproot.go b/input/taproot.go index aa467fb6b2a..32a634af087 100644 --- a/input/taproot.go +++ b/input/taproot.go @@ -5,8 +5,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightningnetwork/lnd/fn/v2" ) diff --git a/input/taproot_test.go b/input/taproot_test.go index 8405092f91e..e1eef69d50f 100644 --- a/input/taproot_test.go +++ b/input/taproot_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lntypes" diff --git a/input/test_utils.go b/input/test_utils.go index 682dfdcd4e8..8b984d61b72 100644 --- a/input/test_utils.go +++ b/input/test_utils.go @@ -5,14 +5,14 @@ import ( "encoding/hex" "fmt" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/keychain" ) @@ -84,7 +84,7 @@ func (m *MockSigner) SignOutputRaw(tx *wire.MsgTx, pubkey = DeriveRevocationPubkey(pubkey, signDesc.DoubleTweak.PubKey()) } - hash160 := btcutil.Hash160(pubkey.SerializeCompressed()) + hash160 := btcaddr.Hash160(pubkey.SerializeCompressed()) privKey := m.findKey(hash160, signDesc.SingleTweak, signDesc.DoubleTweak) if privKey == nil { return nil, fmt.Errorf("mock signer does not have key") @@ -223,7 +223,7 @@ func (m *MockSigner) findKey(needleHash160 []byte, singleTweak []byte, for _, privkey := range m.Privkeys { // First check whether public key is directly derived from // private key. - hash160 := btcutil.Hash160(privkey.PubKey().SerializeCompressed()) + hash160 := btcaddr.Hash160(privkey.PubKey().SerializeCompressed()) if bytes.Equal(hash160, needleHash160) { return privkey } @@ -238,7 +238,7 @@ func (m *MockSigner) findKey(needleHash160 []byte, singleTweak []byte, default: continue } - hash160 = btcutil.Hash160(privkey.PubKey().SerializeCompressed()) + hash160 = btcaddr.Hash160(privkey.PubKey().SerializeCompressed()) if bytes.Equal(hash160, needleHash160) { return privkey } diff --git a/input/txout.go b/input/txout.go index 381c6be97a5..1322e356c36 100644 --- a/input/txout.go +++ b/input/txout.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) // writeTxOut serializes a wire.TxOut struct into the passed io.Writer stream. diff --git a/input/txout_test.go b/input/txout_test.go index 5587f1926e9..9e98e739bd2 100644 --- a/input/txout_test.go +++ b/input/txout_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) func TestTxOutSerialization(t *testing.T) { diff --git a/input/witnessgen.go b/input/witnessgen.go index eae3f5f5a09..612cdc36cff 100644 --- a/input/witnessgen.go +++ b/input/witnessgen.go @@ -3,8 +3,8 @@ package input import ( "fmt" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lntypes" ) diff --git a/internal/musig2v040/keys.go b/internal/musig2v040/keys.go index 9016f0b5653..96a44874487 100644 --- a/internal/musig2v040/keys.go +++ b/internal/musig2v040/keys.go @@ -9,7 +9,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" secp "github.com/decred/dcrd/dcrec/secp256k1/v4" ) diff --git a/internal/musig2v040/musig2_test.go b/internal/musig2v040/musig2_test.go index a5631767678..fa2e1bc5c4d 100644 --- a/internal/musig2v040/musig2_test.go +++ b/internal/musig2v040/musig2_test.go @@ -16,7 +16,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/decred/dcrd/dcrec/secp256k1/v4" ) diff --git a/internal/musig2v040/nonces.go b/internal/musig2v040/nonces.go index 86ca6831861..2e13d641718 100644 --- a/internal/musig2v040/nonces.go +++ b/internal/musig2v040/nonces.go @@ -10,7 +10,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) const ( diff --git a/internal/musig2v040/sign.go b/internal/musig2v040/sign.go index b1236c3a9bf..ad070bf3144 100644 --- a/internal/musig2v040/sign.go +++ b/internal/musig2v040/sign.go @@ -9,7 +9,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" secp "github.com/decred/dcrd/dcrec/secp256k1/v4" ) diff --git a/invoices/interface.go b/invoices/interface.go index 567df454c6b..b963b3973fa 100644 --- a/invoices/interface.go +++ b/invoices/interface.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" diff --git a/invoices/invoice_expiry_watcher.go b/invoices/invoice_expiry_watcher.go index d7659dce3fa..8549dded843 100644 --- a/invoices/invoice_expiry_watcher.go +++ b/invoices/invoice_expiry_watcher.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/lntypes" diff --git a/invoices/test_utils.go b/invoices/test_utils.go index b21804346c5..c6322940f47 100644 --- a/invoices/test_utils.go +++ b/invoices/test_utils.go @@ -10,8 +10,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/lntypes" diff --git a/invoices/test_utils_test.go b/invoices/test_utils_test.go index 3ee8e965e7b..9698dc72d80 100644 --- a/invoices/test_utils_test.go +++ b/invoices/test_utils_test.go @@ -13,8 +13,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/clock" invpkg "github.com/lightningnetwork/lnd/invoices" diff --git a/invoices/update.go b/invoices/update.go index 6f7a34f4c46..7db86c0d0d8 100644 --- a/invoices/update.go +++ b/invoices/update.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "errors" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/amp" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" diff --git a/itest/lnd_amp_test.go b/itest/lnd_amp_test.go index 525dff0dd4d..72c3678e511 100644 --- a/itest/lnd_amp_test.go +++ b/itest/lnd_amp_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/amp" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_bump_fee.go b/itest/lnd_bump_fee.go index 3b89e10886b..3493a585abe 100644 --- a/itest/lnd_bump_fee.go +++ b/itest/lnd_bump_fee.go @@ -3,8 +3,8 @@ package itest import ( "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/walletrpc" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_channel_backup_test.go b/itest/lnd_channel_backup_test.go index bdfb21a9d51..ea28b457f1c 100644 --- a/itest/lnd_channel_backup_test.go +++ b/itest/lnd_channel_backup_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_channel_balance_test.go b/itest/lnd_channel_balance_test.go index 75e3e8594f9..4c5eee35495 100644 --- a/itest/lnd_channel_balance_test.go +++ b/itest/lnd_channel_balance_test.go @@ -3,7 +3,7 @@ package itest import ( "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_channel_force_close_test.go b/itest/lnd_channel_force_close_test.go index 817a3567dce..2df19f98f72 100644 --- a/itest/lnd_channel_force_close_test.go +++ b/itest/lnd_channel_force_close_test.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_channel_funding_fund_max_test.go b/itest/lnd_channel_funding_fund_max_test.go index 34718623fdd..d26215172df 100644 --- a/itest/lnd_channel_funding_fund_max_test.go +++ b/itest/lnd_channel_funding_fund_max_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/input" diff --git a/itest/lnd_channel_funding_utxo_selection_test.go b/itest/lnd_channel_funding_utxo_selection_test.go index 32caf2b576f..70765a5fb28 100644 --- a/itest/lnd_channel_funding_utxo_selection_test.go +++ b/itest/lnd_channel_funding_utxo_selection_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/walletrpc" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_channel_graph_test.go b/itest/lnd_channel_graph_test.go index 52612b81308..54db51717d6 100644 --- a/itest/lnd_channel_graph_test.go +++ b/itest/lnd_channel_graph_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_channel_policy_test.go b/itest/lnd_channel_policy_test.go index 67f55d85b67..8a38c31d6fb 100644 --- a/itest/lnd_channel_policy_test.go +++ b/itest/lnd_channel_policy_test.go @@ -5,7 +5,7 @@ import ( "math" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_coop_close_external_delivery_test.go b/itest/lnd_coop_close_external_delivery_test.go index 4c2f0a5c468..a464692c431 100644 --- a/itest/lnd_coop_close_external_delivery_test.go +++ b/itest/lnd_coop_close_external_delivery_test.go @@ -3,8 +3,9 @@ package itest import ( "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/walletrpc" "github.com/lightningnetwork/lnd/lntest" @@ -158,7 +159,7 @@ func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest, // Use ImportPublicKey. case importPubkey: var ( - address btcutil.Address + address btcaddr.Address pubKey []byte addressType walletrpc.AddressType ) @@ -170,8 +171,8 @@ func testCoopCloseWithExternalDelivery(ht *lntest.HarnessTest, // Make new address for second sub-test. pk[1]++ } - address, err = btcutil.NewAddressWitnessPubKeyHash( - btcutil.Hash160(pk[:]), harnessNetParams, + address, err = btcaddr.NewAddressWitnessPubKeyHash( + btcaddr.Hash160(pk[:]), harnessNetParams, ) require.NoError(ht, err) pubKey = pk[:] diff --git a/itest/lnd_coop_close_rbf_test.go b/itest/lnd_coop_close_rbf_test.go index f607e50583f..e23f8d351a1 100644 --- a/itest/lnd_coop_close_rbf_test.go +++ b/itest/lnd_coop_close_rbf_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/lntest/node" diff --git a/itest/lnd_coop_close_with_htlcs_test.go b/itest/lnd_coop_close_with_htlcs_test.go index b35b526fd93..f4654288a10 100644 --- a/itest/lnd_coop_close_with_htlcs_test.go +++ b/itest/lnd_coop_close_with_htlcs_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/invoicesrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_estimate_on_chain_fee_test.go b/itest/lnd_estimate_on_chain_fee_test.go index 7fd5d4718a2..93130b9745d 100644 --- a/itest/lnd_estimate_on_chain_fee_test.go +++ b/itest/lnd_estimate_on_chain_fee_test.go @@ -3,7 +3,7 @@ package itest import ( "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/walletrpc" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_estimate_route_fee_test.go b/itest/lnd_estimate_route_fee_test.go index ad19e7bdb74..c9f40eac7ff 100644 --- a/itest/lnd_estimate_route_fee_test.go +++ b/itest/lnd_estimate_route_fee_test.go @@ -3,7 +3,7 @@ package itest import ( "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_etcd_failover_test.go b/itest/lnd_etcd_failover_test.go index 3821229faf9..ef361230e9c 100644 --- a/itest/lnd_etcd_failover_test.go +++ b/itest/lnd_etcd_failover_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/cluster" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lncfg" diff --git a/itest/lnd_experimental_accountability.go b/itest/lnd_experimental_accountability.go index 30296e7cbcd..56b5d0b0435 100644 --- a/itest/lnd_experimental_accountability.go +++ b/itest/lnd_experimental_accountability.go @@ -3,7 +3,7 @@ package itest import ( "math" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_forward_delete_test.go b/itest/lnd_forward_delete_test.go index 678a0d708aa..0361d7e230c 100644 --- a/itest/lnd_forward_delete_test.go +++ b/itest/lnd_forward_delete_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_forward_interceptor_test.go b/itest/lnd_forward_interceptor_test.go index f68042db57a..07244295fe7 100644 --- a/itest/lnd_forward_interceptor_test.go +++ b/itest/lnd_forward_interceptor_test.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_funding_test.go b/itest/lnd_funding_test.go index d23c8862bb2..cf7dad22508 100644 --- a/itest/lnd_funding_test.go +++ b/itest/lnd_funding_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/labels" diff --git a/itest/lnd_graph.go b/itest/lnd_graph.go index 2069482272b..25c08d2f8b0 100644 --- a/itest/lnd_graph.go +++ b/itest/lnd_graph.go @@ -3,7 +3,7 @@ package itest import ( "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/lntest/wait" "github.com/stretchr/testify/require" diff --git a/itest/lnd_hold_persistence_test.go b/itest/lnd_hold_persistence_test.go index f024453eb1f..73c096d6e96 100644 --- a/itest/lnd_hold_persistence_test.go +++ b/itest/lnd_hold_persistence_test.go @@ -3,7 +3,7 @@ package itest import ( "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/invoicesrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_htlc_test.go b/itest/lnd_htlc_test.go index e5825993f97..27169a95be8 100644 --- a/itest/lnd_htlc_test.go +++ b/itest/lnd_htlc_test.go @@ -1,7 +1,7 @@ package itest import ( - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" "github.com/stretchr/testify/require" diff --git a/itest/lnd_htlc_timeout_resolver_test.go b/itest/lnd_htlc_timeout_resolver_test.go index 2710086258a..d4107e98838 100644 --- a/itest/lnd_htlc_timeout_resolver_test.go +++ b/itest/lnd_htlc_timeout_resolver_test.go @@ -1,7 +1,7 @@ package itest import ( - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_invoice_acceptor_test.go b/itest/lnd_invoice_acceptor_test.go index 4d5e30cc1bb..23bb30ee702 100644 --- a/itest/lnd_invoice_acceptor_test.go +++ b/itest/lnd_invoice_acceptor_test.go @@ -3,7 +3,7 @@ package itest import ( "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_max_channel_size_test.go b/itest/lnd_max_channel_size_test.go index 4e19f865389..9f565f3bdc5 100644 --- a/itest/lnd_max_channel_size_test.go +++ b/itest/lnd_max_channel_size_test.go @@ -3,7 +3,7 @@ package itest import ( "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/itest/lnd_misc_test.go b/itest/lnd_misc_test.go index 33b44ef9e84..99d8de6b7b9 100644 --- a/itest/lnd_misc_test.go +++ b/itest/lnd_misc_test.go @@ -7,10 +7,10 @@ import ( "os" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/input" diff --git a/itest/lnd_mpp_test.go b/itest/lnd_mpp_test.go index abc61e298a4..f9c38fb7060 100644 --- a/itest/lnd_mpp_test.go +++ b/itest/lnd_mpp_test.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_multi-hop-payments_test.go b/itest/lnd_multi-hop-payments_test.go index 718fdca8775..dea04bd25a2 100644 --- a/itest/lnd_multi-hop-payments_test.go +++ b/itest/lnd_multi-hop-payments_test.go @@ -1,7 +1,7 @@ package itest import ( - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_multi-hop_force_close_test.go b/itest/lnd_multi-hop_force_close_test.go index 1e90129c173..fbd82ec165f 100644 --- a/itest/lnd_multi-hop_force_close_test.go +++ b/itest/lnd_multi-hop_force_close_test.go @@ -3,7 +3,7 @@ package itest import ( "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/invoicesrpc" diff --git a/itest/lnd_network_test.go b/itest/lnd_network_test.go index c5df649ed43..fb5c1758853 100644 --- a/itest/lnd_network_test.go +++ b/itest/lnd_network_test.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_neutrino_headers_import_test.go b/itest/lnd_neutrino_headers_import_test.go index 46cd0c0c16e..48fdcc62c41 100644 --- a/itest/lnd_neutrino_headers_import_test.go +++ b/itest/lnd_neutrino_headers_import_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightninglabs/neutrino/chainimport" "github.com/lightninglabs/neutrino/headerfs" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_nonstd_sweep_test.go b/itest/lnd_nonstd_sweep_test.go index ca596d10d9f..047bdf0473d 100644 --- a/itest/lnd_nonstd_sweep_test.go +++ b/itest/lnd_nonstd_sweep_test.go @@ -3,34 +3,35 @@ package itest import ( "testing" - "github.com/btcsuite/btcd/btcutil" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" "github.com/stretchr/testify/require" ) func testNonstdSweep(ht *lntest.HarnessTest) { - p2shAddr, err := btcutil.NewAddressScriptHash( + p2shAddr, err := btcaddr.NewAddressScriptHash( make([]byte, 1), harnessNetParams, ) require.NoError(ht, err) - p2pkhAddr, err := btcutil.NewAddressPubKeyHash( + p2pkhAddr, err := btcaddr.NewAddressPubKeyHash( make([]byte, 20), harnessNetParams, ) require.NoError(ht, err) - p2wshAddr, err := btcutil.NewAddressWitnessScriptHash( + p2wshAddr, err := btcaddr.NewAddressWitnessScriptHash( make([]byte, 32), harnessNetParams, ) require.NoError(ht, err) - p2wkhAddr, err := btcutil.NewAddressWitnessPubKeyHash( + p2wkhAddr, err := btcaddr.NewAddressWitnessPubKeyHash( make([]byte, 20), harnessNetParams, ) require.NoError(ht, err) - p2trAddr, err := btcutil.NewAddressTaproot( + p2trAddr, err := btcaddr.NewAddressTaproot( make([]byte, 32), harnessNetParams, ) require.NoError(ht, err) diff --git a/itest/lnd_onchain_test.go b/itest/lnd_onchain_test.go index d5d0a19f28e..08860c12fce 100644 --- a/itest/lnd_onchain_test.go +++ b/itest/lnd_onchain_test.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/chainrpc" "github.com/lightningnetwork/lnd/lnrpc/signrpc" diff --git a/itest/lnd_onion_message_forward_test.go b/itest/lnd_onion_message_forward_test.go index 049e33adec1..192dbd8a82a 100644 --- a/itest/lnd_onion_message_forward_test.go +++ b/itest/lnd_onion_message_forward_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_onion_message_test.go b/itest/lnd_onion_message_test.go index 74ec0b86ebc..c74423e3a05 100644 --- a/itest/lnd_onion_message_test.go +++ b/itest/lnd_onion_message_test.go @@ -4,7 +4,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_open_channel_test.go b/itest/lnd_open_channel_test.go index 15b0bd70d8f..5e92ebe1a60 100644 --- a/itest/lnd_open_channel_test.go +++ b/itest/lnd_open_channel_test.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lncfg" diff --git a/itest/lnd_payment_test.go b/itest/lnd_payment_test.go index 5b693715888..707e6d581e9 100644 --- a/itest/lnd_payment_test.go +++ b/itest/lnd_payment_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_postgres_network_separation_test.go b/itest/lnd_postgres_network_separation_test.go index d950d8c458b..5fd6db9fee2 100644 --- a/itest/lnd_postgres_network_separation_test.go +++ b/itest/lnd_postgres_network_separation_test.go @@ -1,7 +1,7 @@ package itest import ( - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/chainparams" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/sqldb" diff --git a/itest/lnd_psbt_test.go b/itest/lnd_psbt_test.go index c70803d1da0..eb625d39c54 100644 --- a/itest/lnd_psbt_test.go +++ b/itest/lnd_psbt_test.go @@ -6,15 +6,16 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" @@ -501,7 +502,7 @@ func runPsbtChanFundingSingleStep(ht *lntest.HarnessTest, private bool, Type: lnrpc.AddressType_WITNESS_PUBKEY_HASH, } addrResp := carol.RPC.NewAddress(req) - reserveAddr, err := btcutil.DecodeAddress( + reserveAddr, err := btcaddr.DecodeAddress( addrResp.Address, harnessNetParams, ) require.NoError(ht, err) @@ -720,8 +721,8 @@ func runSignPsbtSegWitV0P2WKH(ht *lntest.HarnessTest, alice *node.HarnessNode) { addrPubKey, err := addrKey.ECPubKey() require.NoError(ht, err) - pubKeyHash := btcutil.Hash160(addrPubKey.SerializeCompressed()) - witnessAddr, err := btcutil.NewAddressWitnessPubKeyHash( + pubKeyHash := btcaddr.Hash160(addrPubKey.SerializeCompressed()) + witnessAddr, err := btcaddr.NewAddressWitnessPubKeyHash( pubKeyHash, harnessNetParams, ) require.NoError(ht, err) @@ -801,15 +802,15 @@ func runSignPsbtSegWitV0NP2WKH(ht *lntest.HarnessTest, addrPubKey, err := addrKey.ECPubKey() require.NoError(ht, err) - pubKeyHash := btcutil.Hash160(addrPubKey.SerializeCompressed()) - witnessAddr, err := btcutil.NewAddressWitnessPubKeyHash( + pubKeyHash := btcaddr.Hash160(addrPubKey.SerializeCompressed()) + witnessAddr, err := btcaddr.NewAddressWitnessPubKeyHash( pubKeyHash, harnessNetParams, ) require.NoError(ht, err) witnessProgram, err := txscript.PayToAddrScript(witnessAddr) require.NoError(ht, err) - np2wkhAddr, err := btcutil.NewAddressScriptHash( + np2wkhAddr, err := btcaddr.NewAddressScriptHash( witnessProgram, harnessNetParams, ) require.NoError(ht, err) @@ -857,7 +858,7 @@ func runSignPsbtSegWitV1KeySpendBip86(ht *lntest.HarnessTest, // Our taproot key is a BIP0086 key spend only construction that just // commits to the internal key and no root hash. taprootKey := txscript.ComputeTaprootKeyNoScript(internalKey) - tapScriptAddr, err := btcutil.NewAddressTaproot( + tapScriptAddr, err := btcaddr.NewAddressTaproot( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) require.NoError(ht, err) @@ -905,7 +906,7 @@ func runSignPsbtSegWitV1KeySpendRootHash(ht *lntest.HarnessTest, rootHash := leaf1.TapHash() taprootKey := txscript.ComputeTaprootOutputKey(internalKey, rootHash[:]) - tapScriptAddr, err := btcutil.NewAddressTaproot( + tapScriptAddr, err := btcaddr.NewAddressTaproot( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) require.NoError(ht, err) @@ -953,7 +954,7 @@ func runSignPsbtSegWitV1ScriptSpend(ht *lntest.HarnessTest, rootHash := leaf1.TapHash() taprootKey := txscript.ComputeTaprootOutputKey(internalKey, rootHash[:]) - tapScriptAddr, err := btcutil.NewAddressTaproot( + tapScriptAddr, err := btcaddr.NewAddressTaproot( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) require.NoError(ht, err) @@ -1178,7 +1179,7 @@ func runFundPsbt(ht *lntest.HarnessTest, alice, bob *node.HarnessNode) { // addressToPkScript parses the given address string and returns the pkScript // for the regtest environment. func addressToPkScript(t testing.TB, addr string) []byte { - parsed, err := btcutil.DecodeAddress(addr, harnessNetParams) + parsed, err := btcaddr.DecodeAddress(addr, harnessNetParams) require.NoError(t, err) pkScript, err := txscript.PayToAddrScript(parsed) diff --git a/itest/lnd_quiescence_test.go b/itest/lnd_quiescence_test.go index c60f9384292..10a01fed8e8 100644 --- a/itest/lnd_quiescence_test.go +++ b/itest/lnd_quiescence_test.go @@ -1,7 +1,7 @@ package itest import ( - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/devrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_recovery_test.go b/itest/lnd_recovery_test.go index ea93f373ebf..cbb6688263c 100644 --- a/itest/lnd_recovery_test.go +++ b/itest/lnd_recovery_test.go @@ -5,11 +5,12 @@ import ( "fmt" "math" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/aezeed" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnrpc" @@ -335,8 +336,8 @@ func testRescanAddressDetection(ht *lntest.HarnessTest) { // Create an address generated from internal keys. keyDesc := carol.RPC.DeriveNextKey(&walletrpc.KeyReq{KeyFamily: 123}) - pubKeyHash := btcutil.Hash160(keyDesc.RawKeyBytes) - ghostUtxoAddr, err := btcutil.NewAddressWitnessPubKeyHash( + pubKeyHash := btcaddr.Hash160(keyDesc.RawKeyBytes) + ghostUtxoAddr, err := btcaddr.NewAddressWitnessPubKeyHash( pubKeyHash, harnessNetParams, ) require.NoError(ht, err) diff --git a/itest/lnd_remote_signer_test.go b/itest/lnd_remote_signer_test.go index db1e283dece..1c1ffa592eb 100644 --- a/itest/lnd_remote_signer_test.go +++ b/itest/lnd_remote_signer_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/itest/lnd_res_handoff_test.go b/itest/lnd_res_handoff_test.go index d7bf4999050..626a2183ace 100644 --- a/itest/lnd_res_handoff_test.go +++ b/itest/lnd_res_handoff_test.go @@ -3,7 +3,7 @@ package itest import ( "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" "github.com/stretchr/testify/require" diff --git a/itest/lnd_revocation_test.go b/itest/lnd_revocation_test.go index 0c7b29cc5c1..0cc7d6de20d 100644 --- a/itest/lnd_revocation_test.go +++ b/itest/lnd_revocation_test.go @@ -6,9 +6,9 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_route_blinding_test.go b/itest/lnd_route_blinding_test.go index 2c695481f11..e113fce3b83 100644 --- a/itest/lnd_route_blinding_test.go +++ b/itest/lnd_route_blinding_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_routing_test.go b/itest/lnd_routing_test.go index b68f7967d91..9d3494055c1 100644 --- a/itest/lnd_routing_test.go +++ b/itest/lnd_routing_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_rpc_middleware_interceptor_test.go b/itest/lnd_rpc_middleware_interceptor_test.go index 3a82e5a991a..ab4c96dd4aa 100644 --- a/itest/lnd_rpc_middleware_interceptor_test.go +++ b/itest/lnd_rpc_middleware_interceptor_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/lntest/node" diff --git a/itest/lnd_signer_test.go b/itest/lnd_signer_test.go index 8c408aa1ecf..3d6e76d3e0a 100644 --- a/itest/lnd_signer_test.go +++ b/itest/lnd_signer_test.go @@ -4,12 +4,12 @@ import ( "bytes" "crypto/sha256" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/signrpc" @@ -282,8 +282,8 @@ func assertSignOutputRaw(ht *lntest.HarnessTest, keyDesc *signrpc.KeyDescriptor, sigHash txscript.SigHashType) { - pubKeyHash := btcutil.Hash160(targetPubKey.SerializeCompressed()) - targetAddr, err := btcutil.NewAddressWitnessPubKeyHash( + pubKeyHash := btcaddr.Hash160(targetPubKey.SerializeCompressed()) + targetAddr, err := btcaddr.NewAddressWitnessPubKeyHash( pubKeyHash, harnessNetParams, ) require.NoError(ht, err) @@ -310,7 +310,7 @@ func assertSignOutputRaw(ht *lntest.HarnessTest, addrReq := &lnrpc.NewAddressRequest{Type: AddrTypeWitnessPubkeyHash} p2wkhResp := alice.RPC.NewAddress(addrReq) - p2wkhAdrr, err := btcutil.DecodeAddress( + p2wkhAdrr, err := btcaddr.DecodeAddress( p2wkhResp.Address, harnessNetParams, ) require.NoError(ht, err) diff --git a/itest/lnd_single_hop_invoice_test.go b/itest/lnd_single_hop_invoice_test.go index cc29438d6d3..7d753715dc7 100644 --- a/itest/lnd_single_hop_invoice_test.go +++ b/itest/lnd_single_hop_invoice_test.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/hex" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_sweep_test.go b/itest/lnd_sweep_test.go index 2b9c32ec14f..07bae5f01b3 100644 --- a/itest/lnd_sweep_test.go +++ b/itest/lnd_sweep_test.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lncfg" diff --git a/itest/lnd_switch_test.go b/itest/lnd_switch_test.go index 82900c9d342..42e1511e2cf 100644 --- a/itest/lnd_switch_test.go +++ b/itest/lnd_switch_test.go @@ -1,7 +1,7 @@ package itest import ( - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/lntest/node" diff --git a/itest/lnd_taproot_test.go b/itest/lnd_taproot_test.go index 9da9ccb3488..6b34046ee88 100644 --- a/itest/lnd_taproot_test.go +++ b/itest/lnd_taproot_test.go @@ -6,15 +6,16 @@ import ( "encoding/hex" "testing" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnrpc" @@ -1152,7 +1153,7 @@ func testTaprootImportTapscriptFullTree(ht *lntest.HarnessTest, } importResp := alice.RPC.ImportTapscript(req) - calculatedAddr, err := btcutil.NewAddressTaproot( + calculatedAddr, err := btcaddr.NewAddressTaproot( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) require.NoError(ht, err) @@ -1220,7 +1221,7 @@ func testTaprootImportTapscriptPartialReveal(ht *lntest.HarnessTest, } importResp := alice.RPC.ImportTapscript(req) - calculatedAddr, err := btcutil.NewAddressTaproot( + calculatedAddr, err := btcaddr.NewAddressTaproot( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) require.NoError(ht, err) @@ -1277,7 +1278,7 @@ func testTaprootImportTapscriptRootHashOnly(ht *lntest.HarnessTest, } importResp := alice.RPC.ImportTapscript(req) - calculatedAddr, err := btcutil.NewAddressTaproot( + calculatedAddr, err := btcaddr.NewAddressTaproot( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) require.NoError(ht, err) @@ -1334,7 +1335,7 @@ func testTaprootImportTapscriptFullKey(ht *lntest.HarnessTest, } importResp := alice.RPC.ImportTapscript(req) - calculatedAddr, err := btcutil.NewAddressTaproot( + calculatedAddr, err := btcaddr.NewAddressTaproot( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) require.NoError(ht, err) @@ -1392,7 +1393,7 @@ func testTaprootImportTapscriptFullKeyFundPsbt(ht *lntest.HarnessTest, } importResp := alice.RPC.ImportTapscript(req) - calculatedAddr, err := btcutil.NewAddressTaproot( + calculatedAddr, err := btcaddr.NewAddressTaproot( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) require.NoError(ht, err) @@ -1567,7 +1568,7 @@ func testScriptHashLock(t *testing.T, preimage []byte) txscript.TapLeaf { builder := txscript.NewScriptBuilder() builder.AddOp(txscript.OP_DUP) builder.AddOp(txscript.OP_HASH160) - builder.AddData(btcutil.Hash160(preimage)) + builder.AddData(btcaddr.Hash160(preimage)) builder.AddOp(txscript.OP_EQUALVERIFY) script1, err := builder.Script() require.NoError(t, err) @@ -1589,12 +1590,12 @@ func testScriptSchnorrSig(t *testing.T, // newAddrWithScript returns a new address and its pkScript. func newAddrWithScript(ht *lntest.HarnessTest, node *node.HarnessNode, - addrType lnrpc.AddressType) (btcutil.Address, []byte) { + addrType lnrpc.AddressType) (btcaddr.Address, []byte) { p2wkhResp := node.RPC.NewAddress(&lnrpc.NewAddressRequest{ Type: addrType, }) - p2wkhAddr, err := btcutil.DecodeAddress( + p2wkhAddr, err := btcaddr.DecodeAddress( p2wkhResp.Address, harnessNetParams, ) require.NoError(ht, err) @@ -1610,7 +1611,7 @@ func newAddrWithScript(ht *lntest.HarnessTest, node *node.HarnessNode, func sendToTaprootOutput(ht *lntest.HarnessTest, hn *node.HarnessNode, taprootKey *btcec.PublicKey) (wire.OutPoint, []byte) { - tapScriptAddr, err := btcutil.NewAddressTaproot( + tapScriptAddr, err := btcaddr.NewAddressTaproot( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) require.NoError(ht, err) @@ -1749,7 +1750,7 @@ func confirmAddress(ht *lntest.HarnessTest, hn *node.HarnessNode, // Before we confirm the transaction, let's register a confirmation // listener for it, which we expect to fire after mining a block. - parsedAddr, err := btcutil.DecodeAddress(addrString, harnessNetParams) + parsedAddr, err := btcaddr.DecodeAddress(addrString, harnessNetParams) require.NoError(ht, err) addrPkScript, err := txscript.PayToAddrScript(parsedAddr) require.NoError(ht, err) diff --git a/itest/lnd_test.go b/itest/lnd_test.go index e6b25b657f9..0580bb12b94 100644 --- a/itest/lnd_test.go +++ b/itest/lnd_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" diff --git a/itest/lnd_trackpayments_test.go b/itest/lnd_trackpayments_test.go index dc8655a2619..d92a55d8a12 100644 --- a/itest/lnd_trackpayments_test.go +++ b/itest/lnd_trackpayments_test.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_wallet.go b/itest/lnd_wallet.go index 1c07b087b3f..4b40abbc6aa 100644 --- a/itest/lnd_wallet.go +++ b/itest/lnd_wallet.go @@ -1,8 +1,8 @@ package itest import ( - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/lntest/node" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/itest/lnd_wallet_import_test.go b/itest/lnd_wallet_import_test.go index 39774ba192e..5d36d999ac5 100644 --- a/itest/lnd_wallet_import_test.go +++ b/itest/lnd_wallet_import_test.go @@ -6,12 +6,13 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/funding" @@ -123,20 +124,20 @@ func newExternalAddr(ht *lntest.HarnessTest, funder, signer *node.HarnessNode, func assertExternalAddrType(t *testing.T, addrStr string, accountAddrType walletrpc.AddressType) { - addr, err := btcutil.DecodeAddress(addrStr, harnessNetParams) + addr, err := btcaddr.DecodeAddress(addrStr, harnessNetParams) require.NoError(t, err) switch accountAddrType { case walletrpc.AddressType_WITNESS_PUBKEY_HASH: - require.IsType(t, addr, &btcutil.AddressWitnessPubKeyHash{}) + require.IsType(t, addr, &btcaddr.AddressWitnessPubKeyHash{}) case walletrpc.AddressType_NESTED_WITNESS_PUBKEY_HASH, walletrpc.AddressType_HYBRID_NESTED_WITNESS_PUBKEY_HASH: - require.IsType(t, addr, &btcutil.AddressScriptHash{}) + require.IsType(t, addr, &btcaddr.AddressScriptHash{}) case walletrpc.AddressType_TAPROOT_PUBKEY: - require.IsType(t, addr, &btcutil.AddressTaproot{}) + require.IsType(t, addr, &btcaddr.AddressTaproot{}) default: t.Fatalf("unsupported account addr type %v", accountAddrType) diff --git a/itest/lnd_watchtower_test.go b/itest/lnd_watchtower_test.go index 29b45f8fdcf..303ded46bf0 100644 --- a/itest/lnd_watchtower_test.go +++ b/itest/lnd_watchtower_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" diff --git a/itest/lnd_wumbo_channels_test.go b/itest/lnd_wumbo_channels_test.go index 8bf18106e76..74c15691bcc 100644 --- a/itest/lnd_wumbo_channels_test.go +++ b/itest/lnd_wumbo_channels_test.go @@ -1,7 +1,7 @@ package itest import ( - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/funding" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/itest/lnd_zero_conf_close_event_test.go b/itest/lnd_zero_conf_close_event_test.go index 40c06d101e3..bfd6dc70e0e 100644 --- a/itest/lnd_zero_conf_close_event_test.go +++ b/itest/lnd_zero_conf_close_event_test.go @@ -3,7 +3,7 @@ package itest import ( "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/lntest/rpc" diff --git a/itest/lnd_zero_conf_test.go b/itest/lnd_zero_conf_test.go index 84602ec1d2c..ba5eddad4ce 100644 --- a/itest/lnd_zero_conf_test.go +++ b/itest/lnd_zero_conf_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/aliasmgr" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/keychain/btcwallet.go b/keychain/btcwallet.go index cdacef53b31..41167f3c4ea 100644 --- a/keychain/btcwallet.go +++ b/keychain/btcwallet.go @@ -7,8 +7,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/walletdb" diff --git a/keychain/interface_test.go b/keychain/interface_test.go index c88384bacd1..5d66b975146 100644 --- a/keychain/interface_test.go +++ b/keychain/interface_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcwallet/snacl" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" diff --git a/keychain/signer.go b/keychain/signer.go index fa2b70762df..f0fe98f0a24 100644 --- a/keychain/signer.go +++ b/keychain/signer.go @@ -3,7 +3,7 @@ package keychain import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) func NewPubKeyMessageSigner(pubKey *btcec.PublicKey, keyLoc KeyLocator, diff --git a/lnd.go b/lnd.go index 096331a9127..76a6b38366d 100644 --- a/lnd.go +++ b/lnd.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/btcsuite/btcd/btcutil" + btcaddr "github.com/btcsuite/btcd/address/v2" proxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/lightningnetwork/lnd/autopilot" "github.com/lightningnetwork/lnd/build" @@ -571,7 +571,7 @@ func Main(cfg *Config, lisCfg ListenerCfg, implCfg *ImplementationCfg, DB: dbs.TowerServerDB, EpochRegistrar: activeChainControl.ChainNotifier, Net: cfg.net, - NewAddress: func() (btcutil.Address, error) { + NewAddress: func() (btcaddr.Address, error) { return activeChainControl.Wallet.NewAddress( lnwallet.TaprootPubkey, false, lnwallet.DefaultAccountName, diff --git a/lnmock/chain.go b/lnmock/chain.go index bf97b1c73dd..b8daf9d0c1e 100644 --- a/lnmock/chain.go +++ b/lnmock/chain.go @@ -3,10 +3,10 @@ package lnmock import ( "context" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/stretchr/testify/mock" @@ -128,15 +128,15 @@ func (m *MockChain) SendRawTransaction(tx *wire.MsgTx, allowHighFees bool) ( return args.Get(0).(*chainhash.Hash), args.Error(1) } -func (m *MockChain) Rescan(startHash *chainhash.Hash, addrs []btcutil.Address, - outPoints map[wire.OutPoint]btcutil.Address) error { +func (m *MockChain) Rescan(startHash *chainhash.Hash, addrs []btcaddr.Address, + outPoints map[wire.OutPoint]btcaddr.Address) error { args := m.Called(startHash, addrs, outPoints) return args.Error(0) } -func (m *MockChain) NotifyReceived(addrs []btcutil.Address) error { +func (m *MockChain) NotifyReceived(addrs []btcaddr.Address) error { args := m.Called(addrs) return args.Error(0) diff --git a/lnpeer/mock_peer.go b/lnpeer/mock_peer.go index 7fed3e4a04b..35ba8041ebb 100644 --- a/lnpeer/mock_peer.go +++ b/lnpeer/mock_peer.go @@ -4,7 +4,7 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/stretchr/testify/mock" ) diff --git a/lnpeer/peer.go b/lnpeer/peer.go index cb6bc9867a1..51f7f29b05b 100644 --- a/lnpeer/peer.go +++ b/lnpeer/peer.go @@ -4,7 +4,7 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" diff --git a/lnrpc/chainrpc/chain_server.go b/lnrpc/chainrpc/chain_server.go index e42a6843c01..690cd817727 100644 --- a/lnrpc/chainrpc/chain_server.go +++ b/lnrpc/chainrpc/chain_server.go @@ -11,8 +11,8 @@ import ( "path/filepath" "sync" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/lnrpc" diff --git a/lnrpc/devrpc/config_active.go b/lnrpc/devrpc/config_active.go index c5d43c194b3..432117659d4 100644 --- a/lnrpc/devrpc/config_active.go +++ b/lnrpc/devrpc/config_active.go @@ -4,7 +4,7 @@ package devrpc import ( - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/htlcswitch" ) diff --git a/lnrpc/devrpc/dev_server.go b/lnrpc/devrpc/dev_server.go index e338a9b4d89..c0f11f749f5 100644 --- a/lnrpc/devrpc/dev_server.go +++ b/lnrpc/devrpc/dev_server.go @@ -12,9 +12,9 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/lnrpc/invoicesrpc/addinvoice.go b/lnrpc/invoicesrpc/addinvoice.go index b4d39a99c58..35b911c030c 100644 --- a/lnrpc/invoicesrpc/addinvoice.go +++ b/lnrpc/invoicesrpc/addinvoice.go @@ -11,12 +11,13 @@ import ( "sort" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/chanstate" "github.com/lightningnetwork/lnd/graph/db/models" @@ -346,7 +347,7 @@ func AddInvoice(ctx context.Context, cfg *AddInvoiceConfig, // If specified, add a fallback address to the payment request. if len(invoice.FallbackAddr) > 0 { - addr, err := btcutil.DecodeAddress( + addr, err := btcaddr.DecodeAddress( invoice.FallbackAddr, cfg.ChainParams, ) if err != nil { diff --git a/lnrpc/invoicesrpc/addinvoice_test.go b/lnrpc/invoicesrpc/addinvoice_test.go index 41ab63e36db..2352f92f053 100644 --- a/lnrpc/invoicesrpc/addinvoice_test.go +++ b/lnrpc/invoicesrpc/addinvoice_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" diff --git a/lnrpc/invoicesrpc/config_active.go b/lnrpc/invoicesrpc/config_active.go index 233aa59275e..3a162bf7270 100644 --- a/lnrpc/invoicesrpc/config_active.go +++ b/lnrpc/invoicesrpc/config_active.go @@ -4,7 +4,7 @@ package invoicesrpc import ( - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/chanstate" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lnwire" diff --git a/lnrpc/invoicesrpc/htlc_modifier.go b/lnrpc/invoicesrpc/htlc_modifier.go index 00259962cf1..64c39995bd4 100644 --- a/lnrpc/invoicesrpc/htlc_modifier.go +++ b/lnrpc/invoicesrpc/htlc_modifier.go @@ -3,7 +3,7 @@ package invoicesrpc import ( "fmt" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/lnrpc/invoicesrpc/utils.go b/lnrpc/invoicesrpc/utils.go index 096c8305ddc..f59c6dfbb62 100644 --- a/lnrpc/invoicesrpc/utils.go +++ b/lnrpc/invoicesrpc/utils.go @@ -7,7 +7,7 @@ import ( "slices" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/invoices" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwire" diff --git a/lnrpc/marshall_utils.go b/lnrpc/marshall_utils.go index 05a9e9a9027..04cc2c3391f 100644 --- a/lnrpc/marshall_utils.go +++ b/lnrpc/marshall_utils.go @@ -7,10 +7,10 @@ import ( "maps" "slices" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/aliasmgr" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/lnrpc/neutrinorpc/neutrino_server.go b/lnrpc/neutrinorpc/neutrino_server.go index 7154be7dbb3..55df46e93d5 100644 --- a/lnrpc/neutrinorpc/neutrino_server.go +++ b/lnrpc/neutrinorpc/neutrino_server.go @@ -9,8 +9,8 @@ import ( "fmt" "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/lightningnetwork/lnd/lnrpc" "google.golang.org/grpc" diff --git a/lnrpc/routerrpc/router_backend.go b/lnrpc/routerrpc/router_backend.go index 09d60aba589..5b2389e2b0a 100644 --- a/lnrpc/routerrpc/router_backend.go +++ b/lnrpc/routerrpc/router_backend.go @@ -11,9 +11,9 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/wire/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/clock" diff --git a/lnrpc/routerrpc/router_backend_test.go b/lnrpc/routerrpc/router_backend_test.go index b494ffb2267..2ee69784e2e 100644 --- a/lnrpc/routerrpc/router_backend_test.go +++ b/lnrpc/routerrpc/router_backend_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/lnmock" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwire" diff --git a/lnrpc/routerrpc/router_server.go b/lnrpc/routerrpc/router_server.go index 9939c3f680a..0492077402f 100644 --- a/lnrpc/routerrpc/router_server.go +++ b/lnrpc/routerrpc/router_server.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/lightningnetwork/lnd/aliasmgr" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/lnrpc/routerrpc/router_server_test.go b/lnrpc/routerrpc/router_server_test.go index 84c077cb06d..12592a72e29 100644 --- a/lnrpc/routerrpc/router_server_test.go +++ b/lnrpc/routerrpc/router_server_test.go @@ -8,8 +8,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwire" paymentsdb "github.com/lightningnetwork/lnd/payments/db" diff --git a/lnrpc/routerrpc/routing_config.go b/lnrpc/routerrpc/routing_config.go index f113db94ea2..c8393ebff1d 100644 --- a/lnrpc/routerrpc/routing_config.go +++ b/lnrpc/routerrpc/routing_config.go @@ -3,7 +3,7 @@ package routerrpc import ( "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) // RoutingConfig contains the configurable parameters that control routing. diff --git a/lnrpc/rpc_utils.go b/lnrpc/rpc_utils.go index 15e3f2f7622..26164754ef8 100644 --- a/lnrpc/rpc_utils.go +++ b/lnrpc/rpc_utils.go @@ -6,7 +6,7 @@ import ( "fmt" "sort" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/chainfee" "github.com/lightningnetwork/lnd/sweep" diff --git a/lnrpc/signrpc/signer_server.go b/lnrpc/signrpc/signer_server.go index b0b161f13ef..190822edc73 100644 --- a/lnrpc/signrpc/signer_server.go +++ b/lnrpc/signrpc/signer_server.go @@ -14,9 +14,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" diff --git a/lnrpc/walletrpc/config_active.go b/lnrpc/walletrpc/config_active.go index e0c9c684a4f..33917b1c95b 100644 --- a/lnrpc/walletrpc/config_active.go +++ b/lnrpc/walletrpc/config_active.go @@ -4,7 +4,7 @@ package walletrpc import ( - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/chanstate" "github.com/lightningnetwork/lnd/keychain" diff --git a/lnrpc/walletrpc/psbt.go b/lnrpc/walletrpc/psbt.go index 5d8472292b7..5a652aa4f62 100644 --- a/lnrpc/walletrpc/psbt.go +++ b/lnrpc/walletrpc/psbt.go @@ -8,7 +8,7 @@ import ( "math" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" base "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/lnrpc/walletrpc/walletkit_server.go b/lnrpc/walletrpc/walletkit_server.go index e04bcdd6fcc..ffab8b2999e 100644 --- a/lnrpc/walletrpc/walletkit_server.go +++ b/lnrpc/walletrpc/walletkit_server.go @@ -18,15 +18,16 @@ import ( "sort" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" base "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wtxmgr" @@ -1736,7 +1737,7 @@ func (w *WalletKit) FundPsbt(_ context.Context, txOut := make([]*wire.TxOut, 0, len(tpl.Outputs)) for addrStr, amt := range tpl.Outputs { - addr, err := btcutil.DecodeAddress( + addr, err := btcaddr.DecodeAddress( addrStr, w.cfg.ChainParams, ) if err != nil { @@ -2234,7 +2235,7 @@ func (w *WalletKit) handleChange(packet *psbt.Packet, changeIndex int32, // address, which is required for some protocols (such as Taproot // Assets). pOut := psbt.POutput{} - _, isTaprootChangeAddr := changeAddr.(*btcutil.AddressTaproot) + _, isTaprootChangeAddr := changeAddr.(*btcaddr.AddressTaproot) if isTaprootChangeAddr { changeAddrInfo, err := w.cfg.Wallet.AddressInfo(changeAddr) if err != nil { @@ -2725,7 +2726,7 @@ const msgSignaturePrefix = "Bitcoin Signed Message:\n" func (w *WalletKit) SignMessageWithAddr(_ context.Context, req *SignMessageWithAddrRequest) (*SignMessageWithAddrResponse, error) { - addr, err := btcutil.DecodeAddress(req.Addr, w.cfg.ChainParams) + addr, err := btcaddr.DecodeAddress(req.Addr, w.cfg.ChainParams) if err != nil { return nil, fmt.Errorf("unable to decode address: %w", err) } @@ -2812,7 +2813,7 @@ func (w *WalletKit) VerifyMessageWithAddr(_ context.Context, serializedPubkey = pk.SerializeUncompressed() } - addr, err := btcutil.DecodeAddress(req.Addr, w.cfg.ChainParams) + addr, err := btcaddr.DecodeAddress(req.Addr, w.cfg.ChainParams) if err != nil { return nil, fmt.Errorf("unable to decode address: %w", err) } @@ -2823,31 +2824,31 @@ func (w *WalletKit) VerifyMessageWithAddr(_ context.Context, } var ( - address btcutil.Address - pubKeyHash = btcutil.Hash160(serializedPubkey) + address btcaddr.Address + pubKeyHash = btcaddr.Hash160(serializedPubkey) ) // Ensure the address is one of the supported types. switch addr.(type) { - case *btcutil.AddressPubKeyHash: - address, err = btcutil.NewAddressPubKeyHash( + case *btcaddr.AddressPubKeyHash: + address, err = btcaddr.NewAddressPubKeyHash( pubKeyHash, w.cfg.ChainParams, ) if err != nil { return nil, err } - case *btcutil.AddressWitnessPubKeyHash: - address, err = btcutil.NewAddressWitnessPubKeyHash( + case *btcaddr.AddressWitnessPubKeyHash: + address, err = btcaddr.NewAddressWitnessPubKeyHash( pubKeyHash, w.cfg.ChainParams, ) if err != nil { return nil, err } - case *btcutil.AddressScriptHash: + case *btcaddr.AddressScriptHash: // Check if address is a Nested P2WKH (NP2WKH). - address, err = btcutil.NewAddressWitnessPubKeyHash( + address, err = btcaddr.NewAddressWitnessPubKeyHash( pubKeyHash, w.cfg.ChainParams, ) if err != nil { @@ -2859,18 +2860,18 @@ func (w *WalletKit) VerifyMessageWithAddr(_ context.Context, return nil, err } - address, err = btcutil.NewAddressScriptHashFromHash( - btcutil.Hash160(witnessScript), w.cfg.ChainParams, + address, err = btcaddr.NewAddressScriptHashFromHash( + btcaddr.Hash160(witnessScript), w.cfg.ChainParams, ) if err != nil { return nil, err } - case *btcutil.AddressTaproot: + case *btcaddr.AddressTaproot: // Only addresses without a tapscript are allowed because // the verification is using the internal key. tapKey := txscript.ComputeTaprootKeyNoScript(pk) - address, err = btcutil.NewAddressTaproot( + address, err = btcaddr.NewAddressTaproot( schnorr.SerializePubKey(tapKey), w.cfg.ChainParams, ) diff --git a/lnrpc/walletrpc/walletkit_server_test.go b/lnrpc/walletrpc/walletkit_server_test.go index 041a9d1a4e2..803c4d1ba71 100644 --- a/lnrpc/walletrpc/walletkit_server_test.go +++ b/lnrpc/walletrpc/walletkit_server_test.go @@ -11,11 +11,11 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntest/mock" diff --git a/lnrpc/walletrpc/walletkit_util.go b/lnrpc/walletrpc/walletkit_util.go index 6f1c5c9adb4..c6e9e998fe2 100644 --- a/lnrpc/walletrpc/walletkit_util.go +++ b/lnrpc/walletrpc/walletkit_util.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnrpc" ) diff --git a/lntest/bitcoind.go b/lntest/bitcoind.go index 6467164828e..eeb19e3ea0c 100644 --- a/lntest/bitcoind.go +++ b/lntest/bitcoind.go @@ -4,7 +4,7 @@ package lntest import ( - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" ) // NewBackend starts a bitcoind node with the txindex enabled and returns a diff --git a/lntest/bitcoind_common.go b/lntest/bitcoind_common.go index 04f5133d741..b1244b56243 100644 --- a/lntest/bitcoind_common.go +++ b/lntest/bitcoind_common.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcd/rpcclient" "github.com/lightningnetwork/lnd/lntest/node" "github.com/lightningnetwork/lnd/lntest/port" diff --git a/lntest/bitcoind_notxindex.go b/lntest/bitcoind_notxindex.go index 611b89f5ec5..094249f3e15 100644 --- a/lntest/bitcoind_notxindex.go +++ b/lntest/bitcoind_notxindex.go @@ -4,7 +4,7 @@ package lntest import ( - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" ) // NewBackend starts a bitcoind node without the txindex enabled and returns a diff --git a/lntest/bitcoind_rpcpolling.go b/lntest/bitcoind_rpcpolling.go index 1280e6f2f40..be48aee313a 100644 --- a/lntest/bitcoind_rpcpolling.go +++ b/lntest/bitcoind_rpcpolling.go @@ -4,7 +4,7 @@ package lntest import ( - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" ) // NewBackend starts a bitcoind node without the txindex enabled and returns a diff --git a/lntest/btcd.go b/lntest/btcd.go index 21c343243d7..736c692d16d 100644 --- a/lntest/btcd.go +++ b/lntest/btcd.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/btcsuite/btcd/rpcclient" "github.com/lightningnetwork/lnd/lntest/miner" diff --git a/lntest/channels/channels.go b/lntest/channels/channels.go index fbe3487e9c4..9312cc15f52 100644 --- a/lntest/channels/channels.go +++ b/lntest/channels/channels.go @@ -1,8 +1,8 @@ package channels import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" ) var ( diff --git a/lntest/harness.go b/lntest/harness.go index 62cbac37ba8..f8a946debfb 100644 --- a/lntest/harness.go +++ b/lntest/harness.go @@ -9,12 +9,13 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/kvdb/etcd" @@ -1736,7 +1737,7 @@ func (h *HarnessTest) OpenChannelPsbt(srcNode, destNode *node.HarnessNode, // Make sure the channel funding address has the correct type for the // given commitment type. - fundingAddr, err := btcutil.DecodeAddress( + fundingAddr, err := btcaddr.DecodeAddress( upd.PsbtFund.FundingAddress, miner.HarnessNetParams, ) require.NoError(h, err) @@ -1745,11 +1746,11 @@ func (h *HarnessTest) OpenChannelPsbt(srcNode, destNode *node.HarnessNode, case lnrpc.CommitmentType_SIMPLE_TAPROOT, lnrpc.CommitmentType_SIMPLE_TAPROOT_FINAL: - require.IsType(h, &btcutil.AddressTaproot{}, fundingAddr) + require.IsType(h, &btcaddr.AddressTaproot{}, fundingAddr) default: require.IsType( - h, &btcutil.AddressWitnessScriptHash{}, fundingAddr, + h, &btcaddr.AddressWitnessScriptHash{}, fundingAddr, ) } diff --git a/lntest/harness_assertion.go b/lntest/harness_assertion.go index b7579800447..5f4ae105db4 100644 --- a/lntest/harness_assertion.go +++ b/lntest/harness_assertion.go @@ -12,12 +12,13 @@ import ( "strings" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnrpc" @@ -957,8 +958,8 @@ func (h *HarnessTest) RandomPreimage() lntypes.Preimage { } // DecodeAddress decodes a given address and asserts there's no error. -func (h *HarnessTest) DecodeAddress(addr string) btcutil.Address { - resp, err := btcutil.DecodeAddress(addr, miner.HarnessNetParams) +func (h *HarnessTest) DecodeAddress(addr string) btcaddr.Address { + resp, err := btcaddr.DecodeAddress(addr, miner.HarnessNetParams) require.NoError(h, err, "DecodeAddress failed") return resp @@ -966,7 +967,7 @@ func (h *HarnessTest) DecodeAddress(addr string) btcutil.Address { // PayToAddrScript creates a new script from the given address and asserts // there's no error. -func (h *HarnessTest) PayToAddrScript(addr btcutil.Address) []byte { +func (h *HarnessTest) PayToAddrScript(addr btcaddr.Address) []byte { addrScript, err := txscript.PayToAddrScript(addr) require.NoError(h, err, "PayToAddrScript failed") @@ -2181,7 +2182,7 @@ func (h *HarnessTest) AssertNumChannelUpdates(hn *node.HarnessNode, // CreateBurnAddr creates a random burn address of the given type. func (h *HarnessTest) CreateBurnAddr(addrType lnrpc.AddressType) ([]byte, - btcutil.Address) { + btcaddr.Address) { randomPrivKey, err := btcec.NewPrivateKey() require.NoError(h, err) @@ -2189,29 +2190,29 @@ func (h *HarnessTest) CreateBurnAddr(addrType lnrpc.AddressType) ([]byte, randomKeyBytes := randomPrivKey.PubKey().SerializeCompressed() harnessNetParams := miner.HarnessNetParams - var addr btcutil.Address + var addr btcaddr.Address switch addrType { case lnrpc.AddressType_WITNESS_PUBKEY_HASH: - addr, err = btcutil.NewAddressWitnessPubKeyHash( - btcutil.Hash160(randomKeyBytes), harnessNetParams, + addr, err = btcaddr.NewAddressWitnessPubKeyHash( + btcaddr.Hash160(randomKeyBytes), harnessNetParams, ) case lnrpc.AddressType_TAPROOT_PUBKEY: taprootKey := txscript.ComputeTaprootKeyNoScript( randomPrivKey.PubKey(), ) - addr, err = btcutil.NewAddressPubKey( + addr, err = btcaddr.NewAddressPubKey( schnorr.SerializePubKey(taprootKey), harnessNetParams, ) case lnrpc.AddressType_NESTED_PUBKEY_HASH: - var witnessAddr btcutil.Address - witnessAddr, err = btcutil.NewAddressWitnessPubKeyHash( - btcutil.Hash160(randomKeyBytes), harnessNetParams, + var witnessAddr btcaddr.Address + witnessAddr, err = btcaddr.NewAddressWitnessPubKeyHash( + btcaddr.Hash160(randomKeyBytes), harnessNetParams, ) require.NoError(h, err) - addr, err = btcutil.NewAddressScriptHash( + addr, err = btcaddr.NewAddressScriptHash( h.PayToAddrScript(witnessAddr), harnessNetParams, ) diff --git a/lntest/harness_miner.go b/lntest/harness_miner.go index 0445f078ae1..cd0dd453872 100644 --- a/lntest/harness_miner.go +++ b/lntest/harness_miner.go @@ -3,10 +3,11 @@ package lntest import ( "fmt" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lntest/miner" "github.com/lightningnetwork/lnd/lntest/node" "github.com/lightningnetwork/lnd/lntest/wait" @@ -341,7 +342,7 @@ func (h *HarnessTest) GetRawTransaction(txid chainhash.Hash) *btcutil.Tx { } // NewMinerAddress creates a new address for the miner and asserts. -func (h *HarnessTest) NewMinerAddress() btcutil.Address { +func (h *HarnessTest) NewMinerAddress() btcaddr.Address { return h.miner.NewMinerAddress() } diff --git a/lntest/miner/bitcoind_miner.go b/lntest/miner/bitcoind_miner.go index 2c77a9de387..84965d4b78a 100644 --- a/lntest/miner/bitcoind_miner.go +++ b/lntest/miner/bitcoind_miner.go @@ -14,11 +14,12 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lntest/node" "github.com/lightningnetwork/lnd/lntest/port" "github.com/lightningnetwork/lnd/lntest/wait" @@ -276,7 +277,7 @@ func (b *BitcoindMinerBackend) Start(setupChain bool, return fmt.Errorf("unable to parse address: %w", err) } - addr, err := btcutil.DecodeAddress(addrStr, HarnessNetParams) + addr, err := btcaddr.DecodeAddress(addrStr, HarnessNetParams) if err != nil { _ = b.stopProcess() _ = b.cleanup() @@ -756,7 +757,7 @@ func (b *BitcoindMinerBackend) GenerateAndSubmitBlock(txes []*btcutil.Tx, } // NewAddress generates a new address. -func (b *BitcoindMinerBackend) NewAddress() (btcutil.Address, error) { +func (b *BitcoindMinerBackend) NewAddress() (btcaddr.Address, error) { // Use legacy addresses for compatibility with btcd. // // Params: label, address_type. @@ -775,7 +776,7 @@ func (b *BitcoindMinerBackend) NewAddress() (btcutil.Address, error) { return nil, fmt.Errorf("unable to parse address: %w", err) } - return btcutil.DecodeAddress(addrStr, HarnessNetParams) + return btcaddr.DecodeAddress(addrStr, HarnessNetParams) } // P2PAddress returns the P2P address of the miner. diff --git a/lntest/miner/btcd_miner.go b/lntest/miner/btcd_miner.go index 3c919cb385f..66749cc7314 100644 --- a/lntest/miner/btcd_miner.go +++ b/lntest/miner/btcd_miner.go @@ -9,12 +9,13 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lntest/node" "github.com/stretchr/testify/require" ) @@ -216,7 +217,7 @@ func (b *BtcdMinerBackend) GenerateAndSubmitBlock(txes []*btcutil.Tx, } // NewAddress generates a new address. -func (b *BtcdMinerBackend) NewAddress() (btcutil.Address, error) { +func (b *BtcdMinerBackend) NewAddress() (btcaddr.Address, error) { return b.Harness.NewAddress() } diff --git a/lntest/miner/interface.go b/lntest/miner/interface.go index 190d8d10a14..0a194f92ab3 100644 --- a/lntest/miner/interface.go +++ b/lntest/miner/interface.go @@ -3,10 +3,11 @@ package miner import ( "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" ) // MinerBackend defines the interface for different miner backend @@ -77,7 +78,7 @@ type MinerBackend interface { blockTime time.Time) (*btcutil.Block, error) // NewAddress generates a new address. - NewAddress() (btcutil.Address, error) + NewAddress() (btcaddr.Address, error) // P2PAddress returns the P2P address of the miner. P2PAddress() string diff --git a/lntest/miner/miner.go b/lntest/miner/miner.go index f6f759426d9..2647595cf51 100644 --- a/lntest/miner/miner.go +++ b/lntest/miner/miner.go @@ -7,12 +7,13 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/integration/rpctest" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lntest/wait" "github.com/stretchr/testify/require" @@ -617,7 +618,7 @@ func (h *HarnessMiner) GetNumTxsFromMempool(n int) []*wire.MsgTx { } // NewMinerAddress creates a new address for the miner and asserts. -func (h *HarnessMiner) NewMinerAddress() btcutil.Address { +func (h *HarnessMiner) NewMinerAddress() btcaddr.Address { addr, err := h.backend.NewAddress() require.NoError(h, err, "failed to create new miner address") return addr diff --git a/lntest/mock/chainio.go b/lntest/mock/chainio.go index 4dd0868b21c..486d9acbd9b 100644 --- a/lntest/mock/chainio.go +++ b/lntest/mock/chainio.go @@ -1,9 +1,9 @@ package mock import ( - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" ) // ChainIO is a mock implementation of the BlockChainIO interface. diff --git a/lntest/mock/chainnotifier.go b/lntest/mock/chainnotifier.go index 9a9e125bd81..a84898f2c4a 100644 --- a/lntest/mock/chainnotifier.go +++ b/lntest/mock/chainnotifier.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" ) diff --git a/lntest/mock/secretkeyring.go b/lntest/mock/secretkeyring.go index a5a39cc729b..8ee76ad2f34 100644 --- a/lntest/mock/secretkeyring.go +++ b/lntest/mock/secretkeyring.go @@ -4,8 +4,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/lntest/mock/signer.go b/lntest/mock/signer.go index 5857fdd6a81..367bc27a8fd 100644 --- a/lntest/mock/signer.go +++ b/lntest/mock/signer.go @@ -8,9 +8,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/lntest/mock/spendnotifier.go b/lntest/mock/spendnotifier.go index 04c861d913f..2d15a2536c3 100644 --- a/lntest/mock/spendnotifier.go +++ b/lntest/mock/spendnotifier.go @@ -3,7 +3,7 @@ package mock import ( "sync" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" ) diff --git a/lntest/mock/walletcontroller.go b/lntest/mock/walletcontroller.go index fa623bf84dd..9b8816be979 100644 --- a/lntest/mock/walletcontroller.go +++ b/lntest/mock/walletcontroller.go @@ -5,13 +5,14 @@ import ( "sync/atomic" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" base "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wallet/txauthor" @@ -76,28 +77,28 @@ func (w *WalletController) ConfirmedBalance(int32, string) (btcutil.Amount, // NewAddress is called to get new addresses for delivery, change etc. func (w *WalletController) NewAddress(lnwallet.AddressType, bool, - string) (btcutil.Address, error) { + string) (btcaddr.Address, error) { - pkh := btcutil.Hash160(w.RootKey.PubKey().SerializeCompressed()) - addr, _ := btcutil.NewAddressPubKeyHash(pkh, &chaincfg.MainNetParams) + pkh := btcaddr.Hash160(w.RootKey.PubKey().SerializeCompressed()) + addr, _ := btcaddr.NewAddressPubKeyHash(pkh, &chaincfg.MainNetParams) return addr, nil } // LastUnusedAddress currently returns dummy values. func (w *WalletController) LastUnusedAddress(lnwallet.AddressType, - string) (btcutil.Address, error) { + string) (btcaddr.Address, error) { return nil, nil } // IsOurAddress currently returns a dummy value. -func (w *WalletController) IsOurAddress(btcutil.Address) bool { +func (w *WalletController) IsOurAddress(btcaddr.Address) bool { return false } // AddressInfo currently returns a dummy value. func (w *WalletController) AddressInfo( - btcutil.Address) (waddrmgr.ManagedAddress, error) { + btcaddr.Address) (waddrmgr.ManagedAddress, error) { return nil, nil } @@ -124,7 +125,7 @@ func (w *WalletController) ListAddresses(string, // ImportAccount currently returns a dummy value. func (w *WalletController) ImportAccount(string, *hdkeychain.ExtendedKey, uint32, *waddrmgr.AddressType, bool) (*waddrmgr.AccountProperties, - []btcutil.Address, []btcutil.Address, error) { + []btcaddr.Address, []btcaddr.Address, error) { return nil, nil, nil, nil } diff --git a/lntest/neutrino.go b/lntest/neutrino.go index 568007097e9..055daaa3c46 100644 --- a/lntest/neutrino.go +++ b/lntest/neutrino.go @@ -6,7 +6,7 @@ package lntest import ( "fmt" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/lntest/node" ) diff --git a/lntest/node/config.go b/lntest/node/config.go index 7f3b1df7f34..d6b9cf36134 100644 --- a/lntest/node/config.go +++ b/lntest/node/config.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/lightningnetwork/lnd" "github.com/lightningnetwork/lnd/chanbackup" diff --git a/lntest/node/state.go b/lntest/node/state.go index 38f02f3a4c7..eaec3230f15 100644 --- a/lntest/node/state.go +++ b/lntest/node/state.go @@ -6,7 +6,7 @@ import ( "math" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/walletrpc" diff --git a/lntest/node/watcher.go b/lntest/node/watcher.go index 08f1facfecd..1f4d08b0fd1 100644 --- a/lntest/node/watcher.go +++ b/lntest/node/watcher.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest/rpc" "github.com/lightningnetwork/lnd/lntest/wait" diff --git a/lntest/rpc/harness_rpc.go b/lntest/rpc/harness_rpc.go index 2e08a84947c..31de9696639 100644 --- a/lntest/rpc/harness_rpc.go +++ b/lntest/rpc/harness_rpc.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/chainrpc" "github.com/lightningnetwork/lnd/lnrpc/devrpc" diff --git a/lntest/unittest/backend.go b/lntest/unittest/backend.go index 4a10c340f92..ff7795afc54 100644 --- a/lntest/unittest/backend.go +++ b/lntest/unittest/backend.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/btcsuite/btcd/rpcclient" "github.com/btcsuite/btcwallet/chain" diff --git a/lntest/utils.go b/lntest/utils.go index 327abeaef66..f2b5b1ccd93 100644 --- a/lntest/utils.go +++ b/lntest/utils.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest/wait" diff --git a/lnwallet/aux_leaf_store.go b/lnwallet/aux_leaf_store.go index 0a850503780..fb645b1afb0 100644 --- a/lnwallet/aux_leaf_store.go +++ b/lnwallet/aux_leaf_store.go @@ -1,9 +1,9 @@ package lnwallet import ( - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/aux_resolutions.go b/lnwallet/aux_resolutions.go index 14802c57c7b..8891da7d633 100644 --- a/lnwallet/aux_resolutions.go +++ b/lnwallet/aux_resolutions.go @@ -1,8 +1,8 @@ package lnwallet import ( - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/aux_signer.go b/lnwallet/aux_signer.go index 79a7ca1dc09..38f540454f5 100644 --- a/lnwallet/aux_signer.go +++ b/lnwallet/aux_signer.go @@ -1,7 +1,7 @@ package lnwallet import ( - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" diff --git a/lnwallet/btcwallet/blockchain.go b/lnwallet/btcwallet/blockchain.go index 25b51d5e067..f5abda372a1 100644 --- a/lnwallet/btcwallet/blockchain.go +++ b/lnwallet/btcwallet/blockchain.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/lightninglabs/neutrino" "github.com/lightninglabs/neutrino/headerfs" diff --git a/lnwallet/btcwallet/btcwallet.go b/lnwallet/btcwallet/btcwallet.go index 92b5f4017ea..f9400eff20d 100644 --- a/lnwallet/btcwallet/btcwallet.go +++ b/lnwallet/btcwallet/btcwallet.go @@ -10,14 +10,15 @@ import ( "sync" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/waddrmgr" base "github.com/btcsuite/btcwallet/wallet" @@ -481,7 +482,7 @@ func (b *BtcWallet) keyScopeForAccountAddr(accountName string, // // This is a part of the WalletController interface. func (b *BtcWallet) NewAddress(t lnwallet.AddressType, change bool, - accountName string) (btcutil.Address, error) { + accountName string) (btcaddr.Address, error) { // Addresses cannot be derived from the catch-all imported accounts. if accountName == waddrmgr.ImportedAddrAccountName { @@ -507,7 +508,7 @@ func (b *BtcWallet) NewAddress(t lnwallet.AddressType, change bool, // change address. The account parameter must be non-empty as it determines // which account the address should be generated from. func (b *BtcWallet) LastUnusedAddress(addrType lnwallet.AddressType, - accountName string) (btcutil.Address, error) { + accountName string) (btcaddr.Address, error) { // Addresses cannot be derived from the catch-all imported accounts. if accountName == waddrmgr.ImportedAddrAccountName { @@ -525,7 +526,7 @@ func (b *BtcWallet) LastUnusedAddress(addrType lnwallet.AddressType, // IsOurAddress checks if the passed address belongs to this wallet // // This is a part of the WalletController interface. -func (b *BtcWallet) IsOurAddress(a btcutil.Address) bool { +func (b *BtcWallet) IsOurAddress(a btcaddr.Address) bool { result, err := b.wallet.HaveAddress(a) return result && (err == nil) } @@ -534,7 +535,7 @@ func (b *BtcWallet) IsOurAddress(a btcutil.Address) bool { // wallet. // // NOTE: This is a part of the WalletController interface. -func (b *BtcWallet) AddressInfo(a btcutil.Address) (waddrmgr.ManagedAddress, +func (b *BtcWallet) AddressInfo(a btcaddr.Address) (waddrmgr.ManagedAddress, error) { return b.wallet.AddressInfo(a) @@ -807,8 +808,8 @@ func (b *BtcWallet) ListAddresses(name string, // This is a part of the WalletController interface. func (b *BtcWallet) ImportAccount(name string, accountPubKey *hdkeychain.ExtendedKey, masterKeyFingerprint uint32, addrType *waddrmgr.AddressType, - dryRun bool) (*waddrmgr.AccountProperties, []btcutil.Address, - []btcutil.Address, error) { + dryRun bool) (*waddrmgr.AccountProperties, []btcaddr.Address, + []btcaddr.Address, error) { // For custom accounts, we first check if there is no existing account // with the same name. @@ -847,12 +848,12 @@ func (b *BtcWallet) ImportAccount(name string, accountPubKey *hdkeychain.Extende return nil, nil, nil, err } - externalAddrs := make([]btcutil.Address, len(extAddrs)) + externalAddrs := make([]btcaddr.Address, len(extAddrs)) for i := 0; i < len(extAddrs); i++ { externalAddrs[i] = extAddrs[i].Address() } - internalAddrs := make([]btcutil.Address, len(intAddrs)) + internalAddrs := make([]btcaddr.Address, len(intAddrs)) for i := 0; i < len(intAddrs); i++ { internalAddrs[i] = intAddrs[i].Address() } @@ -1355,7 +1356,7 @@ func minedTransactionsToDetails( var outputDetails []lnwallet.OutputDetail for i, txOut := range wireTx.TxOut { - var addresses []btcutil.Address + var addresses []btcaddr.Address sc, outAddresses, _, err := txscript.ExtractPkScriptAddrs( txOut.PkScript, chainParams, ) @@ -1427,7 +1428,7 @@ func unminedTransactionsToDetail( var outputDetails []lnwallet.OutputDetail for i, txOut := range wireTx.TxOut { - var addresses []btcutil.Address + var addresses []btcaddr.Address sc, outAddresses, _, err := txscript.ExtractPkScriptAddrs( txOut.PkScript, chainParams, ) diff --git a/lnwallet/btcwallet/btcwallet_test.go b/lnwallet/btcwallet/btcwallet_test.go index c5bd8905a82..fd7c4b02c1e 100644 --- a/lnwallet/btcwallet/btcwallet_test.go +++ b/lnwallet/btcwallet/btcwallet_test.go @@ -5,7 +5,7 @@ import ( "github.com/btcsuite/btcd/btcjson" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/lnmock" diff --git a/lnwallet/btcwallet/config.go b/lnwallet/btcwallet/config.go index 45abdafcebf..15c717a11e8 100644 --- a/lnwallet/btcwallet/config.go +++ b/lnwallet/btcwallet/config.go @@ -4,8 +4,8 @@ import ( "path/filepath" "time" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/wallet" ) diff --git a/lnwallet/btcwallet/psbt.go b/lnwallet/btcwallet/psbt.go index ec88cd92ff8..df41336ec49 100644 --- a/lnwallet/btcwallet/psbt.go +++ b/lnwallet/btcwallet/psbt.go @@ -8,11 +8,11 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wtxmgr" diff --git a/lnwallet/btcwallet/psbt_test.go b/lnwallet/btcwallet/psbt_test.go index 4423be00c0d..a05f6ce41ab 100644 --- a/lnwallet/btcwallet/psbt_test.go +++ b/lnwallet/btcwallet/psbt_test.go @@ -7,13 +7,13 @@ import ( "fmt" "testing" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" @@ -100,26 +100,26 @@ func (i testInputType) output(t *testing.T, privKey *btcec.PrivateKey) (*wire.TxOut, []byte) { var ( - addr btcutil.Address + addr btcaddr.Address witnessScript []byte err error ) switch i { case plainP2WKH: - h := btcutil.Hash160(privKey.PubKey().SerializeCompressed()) - addr, err = btcutil.NewAddressWitnessPubKeyHash(h, netParams) + h := btcaddr.Hash160(privKey.PubKey().SerializeCompressed()) + addr, err = btcaddr.NewAddressWitnessPubKeyHash(h, netParams) require.NoError(t, err) case tweakedP2WKH: privKey = input.TweakPrivKey(privKey, testTweakSingle) - h := btcutil.Hash160(privKey.PubKey().SerializeCompressed()) - addr, err = btcutil.NewAddressWitnessPubKeyHash(h, netParams) + h := btcaddr.Hash160(privKey.PubKey().SerializeCompressed()) + addr, err = btcaddr.NewAddressWitnessPubKeyHash(h, netParams) require.NoError(t, err) case nestedP2WKH: - h := btcutil.Hash160(privKey.PubKey().SerializeCompressed()) - witnessAddr, err := btcutil.NewAddressWitnessPubKeyHash( + h := btcaddr.Hash160(privKey.PubKey().SerializeCompressed()) + witnessAddr, err := btcaddr.NewAddressWitnessPubKeyHash( h, netParams, ) require.NoError(t, err) @@ -127,7 +127,7 @@ func (i testInputType) output(t *testing.T, witnessProgram, err := txscript.PayToAddrScript(witnessAddr) require.NoError(t, err) - addr, err = btcutil.NewAddressScriptHash( + addr, err = btcaddr.NewAddressScriptHash( witnessProgram, netParams, ) require.NoError(t, err) @@ -145,7 +145,7 @@ func (i testInputType) output(t *testing.T, require.NoError(t, err) h := sha256.Sum256(witnessScript) - addr, err = btcutil.NewAddressWitnessScriptHash(h[:], netParams) + addr, err = btcaddr.NewAddressWitnessScriptHash(h[:], netParams) require.NoError(t, err) case singleKeyDoubleTweakedP2WSH: @@ -163,7 +163,7 @@ func (i testInputType) output(t *testing.T, require.NoError(t, err) h := sha256.Sum256(witnessScript) - addr, err = btcutil.NewAddressWitnessScriptHash(h[:], netParams) + addr, err = btcaddr.NewAddressWitnessScriptHash(h[:], netParams) require.NoError(t, err) default: @@ -189,8 +189,8 @@ func (i testInputType) decorateInput(t *testing.T, privKey *btcec.PrivateKey, }} case nestedP2WKH: - h := btcutil.Hash160(privKey.PubKey().SerializeCompressed()) - witnessAddr, err := btcutil.NewAddressWitnessPubKeyHash( + h := btcaddr.Hash160(privKey.PubKey().SerializeCompressed()) + witnessAddr, err := btcaddr.NewAddressWitnessPubKeyHash( h, netParams, ) require.NoError(t, err) diff --git a/lnwallet/btcwallet/signer.go b/lnwallet/btcwallet/signer.go index eecea0fc04d..7ca33aa87cc 100644 --- a/lnwallet/btcwallet/signer.go +++ b/lnwallet/btcwallet/signer.go @@ -3,15 +3,16 @@ package btcwallet import ( "fmt" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" @@ -210,8 +211,8 @@ func (b *BtcWallet) fetchPrivKey( return b.deriveKeyByLocator(keyDesc.KeyLocator) } - hash160 := btcutil.Hash160(keyDesc.PubKey.SerializeCompressed()) - addr, err := btcutil.NewAddressWitnessPubKeyHash(hash160, b.netParams) + hash160 := btcaddr.Hash160(keyDesc.PubKey.SerializeCompressed()) + addr, err := btcaddr.NewAddressWitnessPubKeyHash(hash160, b.netParams) if err != nil { return nil, err } diff --git a/lnwallet/btcwallet/signer_test.go b/lnwallet/btcwallet/signer_test.go index 803296fa2ff..20c81bd25d5 100644 --- a/lnwallet/btcwallet/signer_test.go +++ b/lnwallet/btcwallet/signer_test.go @@ -8,15 +8,16 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcd/integration/rpctest" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightningnetwork/lnd/blockcache" @@ -229,7 +230,7 @@ func TestScriptImport(t *testing.T) { builder := txscript.NewScriptBuilder() builder.AddOp(txscript.OP_DUP) builder.AddOp(txscript.OP_HASH160) - builder.AddData(btcutil.Hash160([]byte("foobar"))) + builder.AddData(btcaddr.Hash160([]byte("foobar"))) builder.AddOp(txscript.OP_EQUALVERIFY) script1, err := builder.Script() require.NoError(t, err) diff --git a/lnwallet/chainfee/estimator.go b/lnwallet/chainfee/estimator.go index f83cce28512..5f8cb325421 100644 --- a/lnwallet/chainfee/estimator.go +++ b/lnwallet/chainfee/estimator.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/btcsuite/btcd/rpcclient" "github.com/lightningnetwork/lnd/lnutils" ) diff --git a/lnwallet/chainfee/estimator_test.go b/lnwallet/chainfee/estimator_test.go index 67fe6d41b3b..fa37712e1a0 100644 --- a/lnwallet/chainfee/estimator_test.go +++ b/lnwallet/chainfee/estimator_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/stretchr/testify/require" ) diff --git a/lnwallet/chainfee/filtermanager.go b/lnwallet/chainfee/filtermanager.go index 2d6fd0a2e15..dfed4bcf0ef 100644 --- a/lnwallet/chainfee/filtermanager.go +++ b/lnwallet/chainfee/filtermanager.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/btcsuite/btcd/rpcclient" "github.com/lightningnetwork/lnd/fn/v2" ) diff --git a/lnwallet/chainfee/rates.go b/lnwallet/chainfee/rates.go index 735cbd20c5b..8763a9781fa 100644 --- a/lnwallet/chainfee/rates.go +++ b/lnwallet/chainfee/rates.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lntypes" ) diff --git a/lnwallet/chancloser/aux_closer.go b/lnwallet/chancloser/aux_closer.go index e810b360c67..5ee01d4ae89 100644 --- a/lnwallet/chancloser/aux_closer.go +++ b/lnwallet/chancloser/aux_closer.go @@ -1,7 +1,7 @@ package chancloser import ( - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/types" diff --git a/lnwallet/chancloser/chancloser.go b/lnwallet/chancloser/chancloser.go index 28750424d5d..fa47f7f75e1 100644 --- a/lnwallet/chancloser/chancloser.go +++ b/lnwallet/chancloser/chancloser.go @@ -4,12 +4,13 @@ import ( "bytes" "fmt" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/htlcswitch" @@ -1255,7 +1256,7 @@ func ParseUpfrontShutdownAddress(address string, return nil, nil } - addr, err := btcutil.DecodeAddress( + addr, err := btcaddr.DecodeAddress( address, params, ) if err != nil { diff --git a/lnwallet/chancloser/chancloser_test.go b/lnwallet/chancloser/chancloser_test.go index a89a5b90e9a..a13115d6001 100644 --- a/lnwallet/chancloser/chancloser_test.go +++ b/lnwallet/chancloser/chancloser_test.go @@ -8,11 +8,11 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/chancloser/interface.go b/lnwallet/chancloser/interface.go index 1dedeb0b424..99e3ceb07a7 100644 --- a/lnwallet/chancloser/interface.go +++ b/lnwallet/chancloser/interface.go @@ -2,8 +2,8 @@ package chancloser import ( "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/chancloser/mock.go b/lnwallet/chancloser/mock.go index 970c6b03652..6f1fd669f29 100644 --- a/lnwallet/chancloser/mock.go +++ b/lnwallet/chancloser/mock.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/lnwallet/chancloser/rbf_coop_states.go b/lnwallet/chancloser/rbf_coop_states.go index 554dca080bb..48e99812148 100644 --- a/lnwallet/chancloser/rbf_coop_states.go +++ b/lnwallet/chancloser/rbf_coop_states.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/lnwallet/chancloser/rbf_coop_test.go b/lnwallet/chancloser/rbf_coop_test.go index 0c4b937f544..b6c76fb5f7f 100644 --- a/lnwallet/chancloser/rbf_coop_test.go +++ b/lnwallet/chancloser/rbf_coop_test.go @@ -13,12 +13,12 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/mempool" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntest/wait" diff --git a/lnwallet/chancloser/rbf_coop_transitions.go b/lnwallet/chancloser/rbf_coop_transitions.go index a651b37cc35..cf0625bab69 100644 --- a/lnwallet/chancloser/rbf_coop_transitions.go +++ b/lnwallet/chancloser/rbf_coop_transitions.go @@ -6,11 +6,11 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/mempool" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/chanfunding/canned_assembler.go b/lnwallet/chanfunding/canned_assembler.go index e28cbb96d12..1a5f031038c 100644 --- a/lnwallet/chanfunding/canned_assembler.go +++ b/lnwallet/chanfunding/canned_assembler.go @@ -5,9 +5,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" diff --git a/lnwallet/chanfunding/coin_select.go b/lnwallet/chanfunding/coin_select.go index 26fe9b92b16..f4cab3c665f 100644 --- a/lnwallet/chanfunding/coin_select.go +++ b/lnwallet/chanfunding/coin_select.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/lnwallet/chanfunding/coin_select_test.go b/lnwallet/chanfunding/coin_select_test.go index 312ae7d07e0..a742cda2e0a 100644 --- a/lnwallet/chanfunding/coin_select_test.go +++ b/lnwallet/chanfunding/coin_select_test.go @@ -5,8 +5,8 @@ import ( "regexp" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/lnwallet/chanfunding/interface.go b/lnwallet/chanfunding/interface.go index e40c4a1157f..6bb6c543144 100644 --- a/lnwallet/chanfunding/interface.go +++ b/lnwallet/chanfunding/interface.go @@ -3,9 +3,10 @@ package chanfunding import ( "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightningnetwork/lnd/fn/v2" @@ -115,7 +116,7 @@ type Request struct { // ChangeAddr is a closure that will provide the Assembler with a // change address for the funding transaction if needed. - ChangeAddr func() (btcutil.Address, error) + ChangeAddr func() (btcaddr.Address, error) // Musig2 if true, then musig2 will be used to generate the funding // output. By definition, this'll also use segwit v1 (taproot) for the diff --git a/lnwallet/chanfunding/psbt_assembler.go b/lnwallet/chanfunding/psbt_assembler.go index dd1bedd05ac..5bc882dd9d3 100644 --- a/lnwallet/chanfunding/psbt_assembler.go +++ b/lnwallet/chanfunding/psbt_assembler.go @@ -5,14 +5,15 @@ import ( "fmt" "sync" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" @@ -176,7 +177,7 @@ func (i *PsbtIntent) BindTapscriptRoot(root fn.Option[chainhash.Hash]) { // channel output this intent was created for. It returns the P2WSH funding // address, the exact funding amount and a PSBT packet that contains exactly one // output that encodes the previous two parameters. -func (i *PsbtIntent) FundingParams() (btcutil.Address, int64, *psbt.Packet, +func (i *PsbtIntent) FundingParams() (btcaddr.Address, int64, *psbt.Packet, error) { if i.State != PsbtOutputKnown { diff --git a/lnwallet/chanfunding/psbt_assembler_test.go b/lnwallet/chanfunding/psbt_assembler_test.go index 71988e21c04..1f1076a8736 100644 --- a/lnwallet/chanfunding/psbt_assembler_test.go +++ b/lnwallet/chanfunding/psbt_assembler_test.go @@ -10,12 +10,13 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" @@ -69,7 +70,7 @@ func TestPsbtIntent(t *testing.T) { ) require.NoError(t, err, "error calculating script") witnessScriptHash := sha256.Sum256(script) - addr, err := btcutil.NewAddressWitnessScriptHash( + addr, err := btcaddr.NewAddressWitnessScriptHash( witnessScriptHash[:], ¶ms, ) require.NoError(t, err, "unable to encode address") @@ -190,7 +191,7 @@ func TestPsbtIntentBasePsbt(t *testing.T) { ) require.NoError(t, err, "error calculating script") witnessScriptHash := sha256.Sum256(script) - addr, err := btcutil.NewAddressWitnessScriptHash( + addr, err := btcaddr.NewAddressWitnessScriptHash( witnessScriptHash[:], ¶ms, ) require.NoError(t, err, "unable to encode address") diff --git a/lnwallet/chanfunding/wallet_assembler.go b/lnwallet/chanfunding/wallet_assembler.go index ce2b406c689..161840d9c7e 100644 --- a/lnwallet/chanfunding/wallet_assembler.go +++ b/lnwallet/chanfunding/wallet_assembler.go @@ -6,10 +6,10 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/txsort" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/txsort" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/channel.go b/lnwallet/channel.go index e60ebb6f4b1..73446c80de7 100644 --- a/lnwallet/channel.go +++ b/lnwallet/channel.go @@ -15,12 +15,12 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/txsort" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/txsort" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/mempool" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" diff --git a/lnwallet/channel_revoke_nonces_test.go b/lnwallet/channel_revoke_nonces_test.go index 53d614ac606..d0654278dfd 100644 --- a/lnwallet/channel_revoke_nonces_test.go +++ b/lnwallet/channel_revoke_nonces_test.go @@ -3,7 +3,7 @@ package lnwallet import ( "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" "github.com/stretchr/testify/require" diff --git a/lnwallet/channel_test.go b/lnwallet/channel_test.go index 2d04c3092d6..f48f3d7db03 100644 --- a/lnwallet/channel_test.go +++ b/lnwallet/channel_test.go @@ -17,12 +17,12 @@ import ( "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/txsort" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/txsort" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/mempool" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" diff --git a/lnwallet/chanvalidate/validate.go b/lnwallet/chanvalidate/validate.go index 5cf5bbf1001..b36eda8af34 100644 --- a/lnwallet/chanvalidate/validate.go +++ b/lnwallet/chanvalidate/validate.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/lnwallet/chanvalidate/validate_test.go b/lnwallet/chanvalidate/validate_test.go index a1be34a9205..22597cebd27 100644 --- a/lnwallet/chanvalidate/validate_test.go +++ b/lnwallet/chanvalidate/validate_test.go @@ -6,10 +6,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwire" "github.com/stretchr/testify/require" diff --git a/lnwallet/close_test.go b/lnwallet/close_test.go index 7ece3fc4587..bc290a02908 100644 --- a/lnwallet/close_test.go +++ b/lnwallet/close_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lntypes" diff --git a/lnwallet/commit_sort.go b/lnwallet/commit_sort.go index 6fc931515dc..05838297b5a 100644 --- a/lnwallet/commit_sort.go +++ b/lnwallet/commit_sort.go @@ -4,8 +4,8 @@ import ( "bytes" "sort" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" ) // InPlaceCommitSort performs an in-place sort of a commitment transaction, diff --git a/lnwallet/commit_sort_test.go b/lnwallet/commit_sort_test.go index fd4ca6b440e..512a437990d 100644 --- a/lnwallet/commit_sort_test.go +++ b/lnwallet/commit_sort_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnwallet" ) diff --git a/lnwallet/commitment.go b/lnwallet/commitment.go index f715b9336cf..ddb22c07446 100644 --- a/lnwallet/commitment.go +++ b/lnwallet/commitment.go @@ -6,10 +6,10 @@ import ( "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/config.go b/lnwallet/config.go index c60974be6db..c2ccc99c32c 100644 --- a/lnwallet/config.go +++ b/lnwallet/config.go @@ -1,7 +1,7 @@ package lnwallet import ( - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" diff --git a/lnwallet/confscale.go b/lnwallet/confscale.go index 6e2b010e607..5b58f6f54b0 100644 --- a/lnwallet/confscale.go +++ b/lnwallet/confscale.go @@ -1,7 +1,7 @@ package lnwallet import ( - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/lnwallet/confscale_integration.go b/lnwallet/confscale_integration.go index 4e78b968a39..99d7938eb9b 100644 --- a/lnwallet/confscale_integration.go +++ b/lnwallet/confscale_integration.go @@ -3,7 +3,7 @@ package lnwallet -import "github.com/btcsuite/btcd/btcutil" +import "github.com/btcsuite/btcd/btcutil/v2" // CloseConfsForCapacity returns the number of confirmations to wait // before signaling a cooperative close. Under integration tests, we diff --git a/lnwallet/confscale_prod.go b/lnwallet/confscale_prod.go index 898810739f7..378af19c9ca 100644 --- a/lnwallet/confscale_prod.go +++ b/lnwallet/confscale_prod.go @@ -3,7 +3,7 @@ package lnwallet -import "github.com/btcsuite/btcd/btcutil" +import "github.com/btcsuite/btcd/btcutil/v2" // CloseConfsForCapacity returns the number of confirmations to wait before // signaling a channel close, scaled by channel capacity. This is used for both diff --git a/lnwallet/confscale_test.go b/lnwallet/confscale_test.go index 2b50b28aef9..377b29e0b82 100644 --- a/lnwallet/confscale_test.go +++ b/lnwallet/confscale_test.go @@ -3,7 +3,7 @@ package lnwallet import ( "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/stretchr/testify/require" "pgregory.net/rapid" diff --git a/lnwallet/errors.go b/lnwallet/errors.go index e21af48f324..fc78d0bda66 100644 --- a/lnwallet/errors.go +++ b/lnwallet/errors.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/lnwallet/interface.go b/lnwallet/interface.go index f5a717d3f55..5484729c3ff 100644 --- a/lnwallet/interface.go +++ b/lnwallet/interface.go @@ -6,15 +6,16 @@ import ( "sync" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" base "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wallet/txauthor" @@ -135,7 +136,7 @@ type Utxo struct { // OutputDetail contains additional information on a destination address. type OutputDetail struct { OutputType txscript.ScriptClass - Addresses []btcutil.Address + Addresses []btcaddr.Address PkScript []byte OutputIndex int Value btcutil.Amount @@ -267,7 +268,7 @@ type WalletController interface { // p2wsh, etc. The account parameter must be non-empty as it determines // which account the address should be generated from. NewAddress(addrType AddressType, change bool, - account string) (btcutil.Address, error) + account string) (btcaddr.Address, error) // LastUnusedAddress returns the last *unused* address known by the // wallet. An address is unused if it hasn't received any payments. @@ -278,14 +279,14 @@ type WalletController interface { // The account parameter must be non-empty as it determines which // account the address should be generated from. LastUnusedAddress(addrType AddressType, - account string) (btcutil.Address, error) + account string) (btcaddr.Address, error) // IsOurAddress checks if the passed address belongs to this wallet - IsOurAddress(a btcutil.Address) bool + IsOurAddress(a btcaddr.Address) bool // AddressInfo returns the information about an address, if it's known // to this wallet. - AddressInfo(a btcutil.Address) (waddrmgr.ManagedAddress, error) + AddressInfo(a btcaddr.Address) (waddrmgr.ManagedAddress, error) // ListAccounts retrieves all accounts belonging to the wallet by // default. A name and key scope filter can be provided to filter @@ -325,8 +326,8 @@ type WalletController interface { // (nested pubkeys externally, witness pubkeys internally). ImportAccount(name string, accountPubKey *hdkeychain.ExtendedKey, masterKeyFingerprint uint32, addrType *waddrmgr.AddressType, - dryRun bool) (*waddrmgr.AccountProperties, []btcutil.Address, - []btcutil.Address, error) + dryRun bool) (*waddrmgr.AccountProperties, []btcaddr.Address, + []btcaddr.Address, error) // ImportPublicKey imports a single derived public key into the wallet. // The address type can usually be inferred from the key's version, but @@ -631,7 +632,7 @@ func InternalKeyForAddr(wallet WalletController, netParams *chaincfg.Params, // If it's not a taproot address, we don't require to know the internal // key in the first place. So we don't return an error here, but also no // internal key. - _, isTaproot := addr.(*btcutil.AddressTaproot) + _, isTaproot := addr.(*btcaddr.AddressTaproot) if !isTaproot { return none, nil } diff --git a/lnwallet/mock.go b/lnwallet/mock.go index 39e520d2760..9542acb150d 100644 --- a/lnwallet/mock.go +++ b/lnwallet/mock.go @@ -5,13 +5,14 @@ import ( "sync/atomic" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" base "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wallet/txauthor" @@ -83,9 +84,9 @@ func (w *mockWalletController) ConfirmedBalance(int32, string) (btcutil.Amount, // NewAddress is called to get new addresses for delivery, change etc. func (w *mockWalletController) NewAddress(AddressType, bool, - string) (btcutil.Address, error) { + string) (btcaddr.Address, error) { - addr, _ := btcutil.NewAddressPubKey( + addr, _ := btcaddr.NewAddressPubKey( w.RootKey.PubKey().SerializeCompressed(), &chaincfg.MainNetParams, ) @@ -95,19 +96,19 @@ func (w *mockWalletController) NewAddress(AddressType, bool, // LastUnusedAddress currently returns dummy values. func (w *mockWalletController) LastUnusedAddress(AddressType, - string) (btcutil.Address, error) { + string) (btcaddr.Address, error) { return nil, nil } // IsOurAddress currently returns a dummy value. -func (w *mockWalletController) IsOurAddress(btcutil.Address) bool { +func (w *mockWalletController) IsOurAddress(btcaddr.Address) bool { return false } // AddressInfo currently returns a dummy value. func (w *mockWalletController) AddressInfo( - btcutil.Address) (waddrmgr.ManagedAddress, error) { + btcaddr.Address) (waddrmgr.ManagedAddress, error) { return nil, nil } @@ -134,7 +135,7 @@ func (w *mockWalletController) ListAddresses(string, // ImportAccount currently returns a dummy value. func (w *mockWalletController) ImportAccount(string, *hdkeychain.ExtendedKey, uint32, *waddrmgr.AddressType, bool) (*waddrmgr.AccountProperties, - []btcutil.Address, []btcutil.Address, error) { + []btcaddr.Address, []btcaddr.Address, error) { return nil, nil, nil, nil } diff --git a/lnwallet/musig_session.go b/lnwallet/musig_session.go index 0434b9bc240..f2f4e843578 100644 --- a/lnwallet/musig_session.go +++ b/lnwallet/musig_session.go @@ -8,9 +8,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" diff --git a/lnwallet/musig_session_test.go b/lnwallet/musig_session_test.go index 52de69b4d97..9ecc3127a82 100644 --- a/lnwallet/musig_session_test.go +++ b/lnwallet/musig_session_test.go @@ -5,7 +5,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" "github.com/stretchr/testify/require" diff --git a/lnwallet/parameters.go b/lnwallet/parameters.go index 41509ef9a6a..bb2a51b78b9 100644 --- a/lnwallet/parameters.go +++ b/lnwallet/parameters.go @@ -1,9 +1,9 @@ package lnwallet import ( - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/btcsuite/btcd/mempool" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/lnwallet/parameters_test.go b/lnwallet/parameters_test.go index eef7e3640c1..cd7dbfc1248 100644 --- a/lnwallet/parameters_test.go +++ b/lnwallet/parameters_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwire" "github.com/stretchr/testify/require" diff --git a/lnwallet/rebroadcaster.go b/lnwallet/rebroadcaster.go index bb139f0a6b3..fdd2961685a 100644 --- a/lnwallet/rebroadcaster.go +++ b/lnwallet/rebroadcaster.go @@ -1,8 +1,8 @@ package lnwallet import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" ) // Rebroadcaster is an abstract rebroadcaster instance that'll continually diff --git a/lnwallet/rebroadcaster_test.go b/lnwallet/rebroadcaster_test.go index 2e6f1bbfc2b..927c9617798 100644 --- a/lnwallet/rebroadcaster_test.go +++ b/lnwallet/rebroadcaster_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/lnutils" "github.com/stretchr/testify/require" diff --git a/lnwallet/reservation.go b/lnwallet/reservation.go index 83a0829afaf..61addc1098d 100644 --- a/lnwallet/reservation.go +++ b/lnwallet/reservation.go @@ -8,9 +8,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/revocation_producer_itest.go b/lnwallet/revocation_producer_itest.go index a1b6a055112..0b64fd44e6a 100644 --- a/lnwallet/revocation_producer_itest.go +++ b/lnwallet/revocation_producer_itest.go @@ -3,7 +3,7 @@ package lnwallet import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/shachain" diff --git a/lnwallet/rpcwallet/rpcwallet.go b/lnwallet/rpcwallet/rpcwallet.go index 196e5c5c41a..a507f35c6cb 100644 --- a/lnwallet/rpcwallet/rpcwallet.go +++ b/lnwallet/rpcwallet/rpcwallet.go @@ -10,16 +10,16 @@ import ( "os" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" basewallet "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/fn/v2" @@ -107,7 +107,7 @@ func NewRPCKeyRing(watchOnlyKeyRing keychain.SecretKeyRing, // p2wsh, etc. The account parameter must be non-empty as it determines // which account the address should be generated from. func (r *RPCKeyRing) NewAddress(addrType lnwallet.AddressType, change bool, - account string) (btcutil.Address, error) { + account string) (btcaddr.Address, error) { return r.WalletController.NewAddress(addrType, change, account) } @@ -984,8 +984,8 @@ func (r *RPCKeyRing) remoteSign(tx *wire.MsgTx, signDesc *input.SignDescriptor, // internally stored as p2wkh addresses. case signDesc.KeyDesc.PubKey != nil && signDesc.KeyDesc.IsEmpty(): pubKeyBytes := signDesc.KeyDesc.PubKey.SerializeCompressed() - addr, err := btcutil.NewAddressWitnessPubKeyHash( - btcutil.Hash160(pubKeyBytes), r.netParams, + addr, err := btcaddr.NewAddressWitnessPubKeyHash( + btcaddr.Hash160(pubKeyBytes), r.netParams, ) if err != nil { return nil, fmt.Errorf("error deriving address from "+ diff --git a/lnwallet/rpcwallet/rpcwallet_test.go b/lnwallet/rpcwallet/rpcwallet_test.go index bd98b29915c..63dadf32699 100644 --- a/lnwallet/rpcwallet/rpcwallet_test.go +++ b/lnwallet/rpcwallet/rpcwallet_test.go @@ -5,10 +5,10 @@ import ( "errors" "testing" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet" "github.com/stretchr/testify/require" diff --git a/lnwallet/sigpool.go b/lnwallet/sigpool.go index 2296e170317..e76a465af26 100644 --- a/lnwallet/sigpool.go +++ b/lnwallet/sigpool.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/lnwallet/taproot_test_vectors_test.go b/lnwallet/taproot_test_vectors_test.go index 7e3dcf8e6a0..fcf3fd2dc1e 100644 --- a/lnwallet/taproot_test_vectors_test.go +++ b/lnwallet/taproot_test_vectors_test.go @@ -15,10 +15,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/test/test_interface.go b/lnwallet/test/test_interface.go index 90ea46d7552..33b1e3cb079 100644 --- a/lnwallet/test/test_interface.go +++ b/lnwallet/test/test_interface.go @@ -14,17 +14,18 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/btcsuite/btcd/mempool" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/walletdb" @@ -245,7 +246,7 @@ func loadTestCredits(miner *rpctest.Harness, w *lnwallet.LightningWallet, return err } expectedBalance += btcutil.Amount(int64(satoshiPerOutput) * int64(numOutputs)) - addrs := make([]btcutil.Address, 0, numOutputs) + addrs := make([]btcaddr.Address, 0, numOutputs) for i := 0; i < numOutputs; i++ { // Grab a fresh address from the wallet to house this output. walletAddr, err := w.NewAddress( @@ -1588,8 +1589,8 @@ func testTransactionSubscriptions(miner *rpctest.Harness, // scriptFromKey creates a P2WKH script from the given pubkey. func scriptFromKey(pubkey *btcec.PublicKey) ([]byte, error) { - pubkeyHash := btcutil.Hash160(pubkey.SerializeCompressed()) - keyAddr, err := btcutil.NewAddressWitnessPubKeyHash( + pubkeyHash := btcaddr.Hash160(pubkey.SerializeCompressed()) + keyAddr, err := btcaddr.NewAddressWitnessPubKeyHash( pubkeyHash, &chaincfg.RegressionNetParams, ) if err != nil { @@ -2037,8 +2038,8 @@ func testSignOutputUsingTweaks(r *rpctest.Harness, // Using the given key for the current iteration, we'll // generate a regular p2wkh from that. - pubkeyHash := btcutil.Hash160(tweakedKey.SerializeCompressed()) - keyAddr, err := btcutil.NewAddressWitnessPubKeyHash(pubkeyHash, + pubkeyHash := btcaddr.Hash160(tweakedKey.SerializeCompressed()) + keyAddr, err := btcaddr.NewAddressWitnessPubKeyHash(pubkeyHash, &chaincfg.RegressionNetParams) if err != nil { t.Fatalf("unable to create addr: %v", err) @@ -3163,7 +3164,7 @@ func testSingleFunderExternalFundingTx(miner *rpctest.Harness, LocalAmt: btcutil.Amount(chanAmt), MinConfs: 1, FeeRate: 253, - ChangeAddr: func() (btcutil.Address, error) { + ChangeAddr: func() (btcaddr.Address, error) { return alice.NewAddress( lnwallet.WitnessPubKey, true, lnwallet.DefaultAccountName, @@ -3210,7 +3211,7 @@ func testSingleFunderExternalFundingTx(miner *rpctest.Harness, LocalAmt: btcutil.Amount(chanAmt), MinConfs: 1, FeeRate: 253, - ChangeAddr: func() (btcutil.Address, error) { + ChangeAddr: func() (btcaddr.Address, error) { return bob.NewAddress( lnwallet.WitnessPubKey, true, lnwallet.DefaultAccountName, diff --git a/lnwallet/test_utils.go b/lnwallet/test_utils.go index 738558e224f..1edc92ea028 100644 --- a/lnwallet/test_utils.go +++ b/lnwallet/test_utils.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/transactions.go b/lnwallet/transactions.go index da86650bc63..397f2413a64 100644 --- a/lnwallet/transactions.go +++ b/lnwallet/transactions.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/input" ) diff --git a/lnwallet/transactions_test.go b/lnwallet/transactions_test.go index 42639a4e6bb..41fb23b349d 100644 --- a/lnwallet/transactions_test.go +++ b/lnwallet/transactions_test.go @@ -16,10 +16,10 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/lnwallet/types/close_types.go b/lnwallet/types/close_types.go index 490b08f249e..59d0002cd05 100644 --- a/lnwallet/types/close_types.go +++ b/lnwallet/types/close_types.go @@ -2,8 +2,8 @@ package types import ( "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tlv" diff --git a/lnwallet/wallet.go b/lnwallet/wallet.go index 09cfca1e881..197248eb53e 100644 --- a/lnwallet/wallet.go +++ b/lnwallet/wallet.go @@ -10,16 +10,17 @@ import ( "sync" "sync/atomic" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/btcutil/txsort" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/txsort" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" @@ -977,7 +978,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *InitFundingReserveMsg MinConfs: req.MinConfs, SubtractFees: req.SubtractFees, FeeRate: req.FundingFeePerKw, - ChangeAddr: func() (btcutil.Address, error) { + ChangeAddr: func() (btcaddr.Address, error) { return l.NewAddress( TaprootPubkey, true, DefaultAccountName, ) diff --git a/lnwire/accept_channel.go b/lnwire/accept_channel.go index afb2f141221..c8be147932e 100644 --- a/lnwire/accept_channel.go +++ b/lnwire/accept_channel.go @@ -5,7 +5,7 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/channel_announcement.go b/lnwire/channel_announcement.go index cab8407283a..bc053bc8ec3 100644 --- a/lnwire/channel_announcement.go +++ b/lnwire/channel_announcement.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // ChannelAnnouncement1 message is used to announce the existence of a channel diff --git a/lnwire/channel_announcement_2.go b/lnwire/channel_announcement_2.go index 9227584b6f5..c300dbc7f85 100644 --- a/lnwire/channel_announcement_2.go +++ b/lnwire/channel_announcement_2.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/channel_id.go b/lnwire/channel_id.go index 5c9eca34fbd..22f3de4136e 100644 --- a/lnwire/channel_id.go +++ b/lnwire/channel_id.go @@ -6,8 +6,8 @@ import ( "io" "math" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/channel_reestablish.go b/lnwire/channel_reestablish.go index d6f4cb57a73..348b0ede82b 100644 --- a/lnwire/channel_reestablish.go +++ b/lnwire/channel_reestablish.go @@ -6,7 +6,7 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/channel_update.go b/lnwire/channel_update.go index 09b8044bdab..73e8e3ad789 100644 --- a/lnwire/channel_update.go +++ b/lnwire/channel_update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/channel_update_2.go b/lnwire/channel_update_2.go index 3fba2470df3..434cdb85b8e 100644 --- a/lnwire/channel_update_2.go +++ b/lnwire/channel_update_2.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/closing_complete.go b/lnwire/closing_complete.go index c062689e300..ad9420fa7c9 100644 --- a/lnwire/closing_complete.go +++ b/lnwire/closing_complete.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/closing_sig.go b/lnwire/closing_sig.go index 919a329109d..3409fbe2673 100644 --- a/lnwire/closing_sig.go +++ b/lnwire/closing_sig.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/closing_signed.go b/lnwire/closing_signed.go index c247cfe0a55..a4d0b6a0c8f 100644 --- a/lnwire/closing_signed.go +++ b/lnwire/closing_signed.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/dyn_commit.go b/lnwire/dyn_commit.go index 2cb1047b019..0aa877656d7 100644 --- a/lnwire/dyn_commit.go +++ b/lnwire/dyn_commit.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/dyn_propose.go b/lnwire/dyn_propose.go index 2771e790f3a..0c260fbda34 100644 --- a/lnwire/dyn_propose.go +++ b/lnwire/dyn_propose.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/funding_created.go b/lnwire/funding_created.go index 82d0ff87c69..8668ac09133 100644 --- a/lnwire/funding_created.go +++ b/lnwire/funding_created.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/gossip_timestamp_range.go b/lnwire/gossip_timestamp_range.go index 45ff1f939af..ef76555d013 100644 --- a/lnwire/gossip_timestamp_range.go +++ b/lnwire/gossip_timestamp_range.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/interfaces.go b/lnwire/interfaces.go index 115b07d7bf3..2b8d64e1fdc 100644 --- a/lnwire/interfaces.go +++ b/lnwire/interfaces.go @@ -3,7 +3,7 @@ package lnwire import ( "fmt" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // GossipVersion is a version number that describes the version of the diff --git a/lnwire/lnwire.go b/lnwire/lnwire.go index 938240b3060..aa636493afa 100644 --- a/lnwire/lnwire.go +++ b/lnwire/lnwire.go @@ -11,9 +11,9 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tor" ) diff --git a/lnwire/lnwire_test.go b/lnwire/lnwire_test.go index dbd483f1070..02c282e0920 100644 --- a/lnwire/lnwire_test.go +++ b/lnwire/lnwire_test.go @@ -10,8 +10,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tor" "github.com/stretchr/testify/require" "pgregory.net/rapid" diff --git a/lnwire/local_nonces.go b/lnwire/local_nonces.go index 8403aa2a01c..3846d225d6b 100644 --- a/lnwire/local_nonces.go +++ b/lnwire/local_nonces.go @@ -6,7 +6,7 @@ import ( "sort" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/local_nonces_test.go b/lnwire/local_nonces_test.go index 1652f042421..b5dcec1b014 100644 --- a/lnwire/local_nonces_test.go +++ b/lnwire/local_nonces_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/stretchr/testify/require" ) diff --git a/lnwire/message_test.go b/lnwire/message_test.go index 340c7987f8f..11b3b1fc4a2 100644 --- a/lnwire/message_test.go +++ b/lnwire/message_test.go @@ -14,7 +14,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tlv" "github.com/lightningnetwork/lnd/tor" diff --git a/lnwire/msat.go b/lnwire/msat.go index 7d6d581e1a2..609df7e3828 100644 --- a/lnwire/msat.go +++ b/lnwire/msat.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/msat_test.go b/lnwire/msat_test.go index 50e51f554cf..3c328b17511 100644 --- a/lnwire/msat_test.go +++ b/lnwire/msat_test.go @@ -3,7 +3,7 @@ package lnwire import ( "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) func TestMilliSatoshiConversion(t *testing.T) { diff --git a/lnwire/netaddress.go b/lnwire/netaddress.go index dd5a7c57b82..0b9311b3c91 100644 --- a/lnwire/netaddress.go +++ b/lnwire/netaddress.go @@ -5,7 +5,7 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) // NetAddress represents information pertaining to the identity and network diff --git a/lnwire/open_channel.go b/lnwire/open_channel.go index 1751f748be9..6973aede316 100644 --- a/lnwire/open_channel.go +++ b/lnwire/open_channel.go @@ -5,8 +5,8 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/outpoint.go b/lnwire/outpoint.go index ec893ee654a..c1a9786961b 100644 --- a/lnwire/outpoint.go +++ b/lnwire/outpoint.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/outpoint_test.go b/lnwire/outpoint_test.go index b8ac1a70d15..65671497846 100644 --- a/lnwire/outpoint_test.go +++ b/lnwire/outpoint_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tlv" "github.com/stretchr/testify/require" "pgregory.net/rapid" diff --git a/lnwire/query_channel_range.go b/lnwire/query_channel_range.go index c816a005086..cdacdf16e54 100644 --- a/lnwire/query_channel_range.go +++ b/lnwire/query_channel_range.go @@ -5,7 +5,7 @@ import ( "io" "math" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/query_short_chan_ids.go b/lnwire/query_short_chan_ids.go index 37a73ab7c7f..0460b2ed216 100644 --- a/lnwire/query_short_chan_ids.go +++ b/lnwire/query_short_chan_ids.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) const ( diff --git a/lnwire/reply_channel_range.go b/lnwire/reply_channel_range.go index c3a744ebd06..63ffd21f417 100644 --- a/lnwire/reply_channel_range.go +++ b/lnwire/reply_channel_range.go @@ -7,7 +7,7 @@ import ( "math" "sort" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/lnwire/reply_short_chan_ids_end.go b/lnwire/reply_short_chan_ids_end.go index 2e50d840fd7..ef43e8f77d9 100644 --- a/lnwire/reply_short_chan_ids_end.go +++ b/lnwire/reply_short_chan_ids_end.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // ReplyShortChanIDsEnd is a message that marks the end of a streaming message diff --git a/lnwire/test_message.go b/lnwire/test_message.go index 8734440a0f2..469b6208a94 100644 --- a/lnwire/test_message.go +++ b/lnwire/test_message.go @@ -8,8 +8,8 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/tlv" "github.com/lightningnetwork/lnd/tor" diff --git a/lnwire/test_utils.go b/lnwire/test_utils.go index ef0aaf0a3e2..6b0c872b4b5 100644 --- a/lnwire/test_utils.go +++ b/lnwire/test_utils.go @@ -7,8 +7,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/stretchr/testify/require" "pgregory.net/rapid" diff --git a/lnwire/writer.go b/lnwire/writer.go index 57517eb0deb..63d43ca9332 100644 --- a/lnwire/writer.go +++ b/lnwire/writer.go @@ -10,8 +10,8 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tor" ) diff --git a/lnwire/writer_test.go b/lnwire/writer_test.go index 4f15ba52d79..b67745e6712 100644 --- a/lnwire/writer_test.go +++ b/lnwire/writer_test.go @@ -8,9 +8,9 @@ import ( "net" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tor" "github.com/stretchr/testify/require" ) diff --git a/netann/chan_status_manager.go b/netann/chan_status_manager.go index b21aeb18a58..f1b592fcdc1 100644 --- a/netann/chan_status_manager.go +++ b/netann/chan_status_manager.go @@ -7,7 +7,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/keychain" diff --git a/netann/chan_status_manager_test.go b/netann/chan_status_manager_test.go index 02669ce4adc..aaaf9344b8a 100644 --- a/netann/chan_status_manager_test.go +++ b/netann/chan_status_manager_test.go @@ -13,8 +13,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/netann/channel_announcement.go b/netann/channel_announcement.go index 14f65c3f549..f8b225c2b90 100644 --- a/netann/channel_announcement.go +++ b/netann/channel_announcement.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tlv" @@ -73,7 +73,7 @@ func CreateChanAnnouncement(chanInfo *models.ChannelEdgeInfo, // FetchPkScript defines a function that can be used to fetch the output script // for the transaction with the given SCID. type FetchPkScript func(lnwire.ShortChannelID) (txscript.ScriptClass, - btcutil.Address, error) + btcaddr.Address, error) // ValidateChannelAnn validates the channel announcement. func ValidateChannelAnn(a lnwire.ChannelAnnouncement, @@ -275,7 +275,7 @@ func chanAnn2P2WSHMuSig2Keys(a *lnwire.ChannelAnnouncement2) ( // lnwire.ChannelAnnouncement2 message should be verified against in the case // where the channel being announced is a P2TR channel. func chanAnn2P2TRMuSig2Keys(a *lnwire.ChannelAnnouncement2, - scriptAddr btcutil.Address) ([]*btcec.PublicKey, error) { + scriptAddr btcaddr.Address) ([]*btcec.PublicKey, error) { nodeKey1, err := btcec.ParsePubKey(a.NodeID1.Val[:]) if err != nil { diff --git a/netann/channel_announcement_test.go b/netann/channel_announcement_test.go index 11e72bb4a00..59d412b4eae 100644 --- a/netann/channel_announcement_test.go +++ b/netann/channel_announcement_test.go @@ -4,13 +4,14 @@ import ( "bytes" "testing" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwire" @@ -175,7 +176,7 @@ func test4of4MuSig2P2WSHChanAnnouncement(t *testing.T) { scriptHash, err := input.WitnessScriptHash(multiSigScript) require.NoError(t, err) - pkAddr, err := btcutil.NewAddressScriptHash( + pkAddr, err := btcaddr.NewAddressScriptHash( scriptHash, &chaincfg.MainNetParams, ) require.NoError(t, err) @@ -183,7 +184,7 @@ func test4of4MuSig2P2WSHChanAnnouncement(t *testing.T) { // Create a mock tx fetcher that returns the expected script class and // pk address. fetchTx := func(lnwire.ShortChannelID) (txscript.ScriptClass, - btcutil.Address, error) { + btcaddr.Address, error) { return txscript.WitnessV0ScriptHashTy, pkAddr, nil } @@ -278,7 +279,7 @@ func test4of4MuSig2P2TRChanAnnouncement(t *testing.T) { ) require.NoError(t, err) - pkAddr, err := btcutil.NewAddressTaproot( + pkAddr, err := btcaddr.NewAddressTaproot( combinedKey.FinalKey.SerializeCompressed()[1:], &chaincfg.MainNetParams, ) @@ -287,7 +288,7 @@ func test4of4MuSig2P2TRChanAnnouncement(t *testing.T) { // Create a mock tx fetcher that returns the expected script class and // pk address. fetchTx := func(lnwire.ShortChannelID) (txscript.ScriptClass, - btcutil.Address, error) { + btcaddr.Address, error) { return txscript.WitnessV1TaprootTy, pkAddr, nil } @@ -348,7 +349,7 @@ func test3of3MuSig2ChanAnnouncement(t *testing.T) { }) require.NoError(t, err) - pkAddr, err := btcutil.NewAddressTaproot( + pkAddr, err := btcaddr.NewAddressTaproot( outputKey.SerializeCompressed()[1:], &chaincfg.MainNetParams, ) require.NoError(t, err) @@ -356,7 +357,7 @@ func test3of3MuSig2ChanAnnouncement(t *testing.T) { // Create a mock tx fetcher that returns the expected script class // and pk address. fetchTx := func(lnwire.ShortChannelID) (txscript.ScriptClass, - btcutil.Address, error) { + btcaddr.Address, error) { return txscript.WitnessV1TaprootTy, pkAddr, nil } diff --git a/netann/channel_state.go b/netann/channel_state.go index 904196331a1..a17c80869e8 100644 --- a/netann/channel_state.go +++ b/netann/channel_state.go @@ -3,7 +3,7 @@ package netann import ( "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" ) // ChanStatus is a type that enumerates the possible states a ChanStatusManager diff --git a/netann/channel_update.go b/netann/channel_update.go index 7e87fd77bf6..cf9978d990b 100644 --- a/netann/channel_update.go +++ b/netann/channel_update.go @@ -6,8 +6,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnutils" diff --git a/netann/interface.go b/netann/interface.go index 78acc24cdd8..291eb01cc9e 100644 --- a/netann/interface.go +++ b/netann/interface.go @@ -3,7 +3,7 @@ package netann import ( "context" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/graph/db/models" ) diff --git a/netann/msg_hash.go b/netann/msg_hash.go index 3c4806f9b49..562b1cdf3af 100644 --- a/netann/msg_hash.go +++ b/netann/msg_hash.go @@ -1,7 +1,7 @@ package netann import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // MsgHashTag will prefix the message name and the field name in order to diff --git a/netann/node_announcement.go b/netann/node_announcement.go index b2d288bf755..79553cd6fb2 100644 --- a/netann/node_announcement.go +++ b/netann/node_announcement.go @@ -9,7 +9,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" diff --git a/netann/node_announcement_test.go b/netann/node_announcement_test.go index 370ddf6b673..6b3659e650d 100644 --- a/netann/node_announcement_test.go +++ b/netann/node_announcement_test.go @@ -7,7 +7,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/netann" diff --git a/payments/db/kv_store.go b/payments/db/kv_store.go index b3fffe1e182..15d270ed15a 100644 --- a/payments/db/kv_store.go +++ b/payments/db/kv_store.go @@ -13,7 +13,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" diff --git a/payments/db/kv_store_test.go b/payments/db/kv_store_test.go index 136d3a73314..8e086b832a8 100644 --- a/payments/db/kv_store_test.go +++ b/payments/db/kv_store_test.go @@ -13,7 +13,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/walletdb" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" diff --git a/payments/db/migration1/codec.go b/payments/db/migration1/codec.go index 64225d17041..8e9a0c81e12 100644 --- a/payments/db/migration1/codec.go +++ b/payments/db/migration1/codec.go @@ -6,7 +6,7 @@ import ( "io" "time" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/payments/db/migration1/lnwire" ) diff --git a/payments/db/migration1/kv_store.go b/payments/db/migration1/kv_store.go index eda1945bc9d..95a8266a967 100644 --- a/payments/db/migration1/kv_store.go +++ b/payments/db/migration1/kv_store.go @@ -13,7 +13,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/lntypes" diff --git a/payments/db/migration1/lnwire/channel_id.go b/payments/db/migration1/lnwire/channel_id.go index 5c9eca34fbd..22f3de4136e 100644 --- a/payments/db/migration1/lnwire/channel_id.go +++ b/payments/db/migration1/lnwire/channel_id.go @@ -6,8 +6,8 @@ import ( "io" "math" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/payments/db/migration1/lnwire/channel_update.go b/payments/db/migration1/lnwire/channel_update.go index 09b8044bdab..73e8e3ad789 100644 --- a/payments/db/migration1/lnwire/channel_update.go +++ b/payments/db/migration1/lnwire/channel_update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/payments/db/migration1/lnwire/interfaces.go b/payments/db/migration1/lnwire/interfaces.go index 115b07d7bf3..2b8d64e1fdc 100644 --- a/payments/db/migration1/lnwire/interfaces.go +++ b/payments/db/migration1/lnwire/interfaces.go @@ -3,7 +3,7 @@ package lnwire import ( "fmt" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // GossipVersion is a version number that describes the version of the diff --git a/payments/db/migration1/lnwire/lnwire.go b/payments/db/migration1/lnwire/lnwire.go index 09057dae4cb..ae40e629a55 100644 --- a/payments/db/migration1/lnwire/lnwire.go +++ b/payments/db/migration1/lnwire/lnwire.go @@ -8,7 +8,7 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) const ( diff --git a/payments/db/migration1/lnwire/msat.go b/payments/db/migration1/lnwire/msat.go index 7d6d581e1a2..609df7e3828 100644 --- a/payments/db/migration1/lnwire/msat.go +++ b/payments/db/migration1/lnwire/msat.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/payments/db/migration1/lnwire/writer.go b/payments/db/migration1/lnwire/writer.go index db575663edb..301dd875e1f 100644 --- a/payments/db/migration1/lnwire/writer.go +++ b/payments/db/migration1/lnwire/writer.go @@ -6,7 +6,7 @@ import ( "errors" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" ) var ( diff --git a/payments/db/payment_test.go b/payments/db/payment_test.go index e77a1522a1e..c87efa9f77b 100644 --- a/payments/db/payment_test.go +++ b/payments/db/payment_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" diff --git a/peer/brontide.go b/peer/brontide.go index 2a06e6fb9b5..0a22005c830 100644 --- a/peer/brontide.go +++ b/peer/brontide.go @@ -14,10 +14,10 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/connmgr" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/actor" "github.com/lightningnetwork/lnd/aliasmgr" diff --git a/peer/brontide_test.go b/peer/brontide_test.go index 0dc218d5cc5..a7666c583b8 100644 --- a/peer/brontide_test.go +++ b/peer/brontide_test.go @@ -6,11 +6,12 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/contractcourt" @@ -1013,7 +1014,7 @@ func TestStaticRemoteDowngrade(t *testing.T) { // be a valid address. func genScript(t *testing.T, address string) lnwire.DeliveryAddress { // Generate an address which can be used for testing. - deliveryAddr, err := btcutil.DecodeAddress( + deliveryAddr, err := btcaddr.DecodeAddress( address, &chaincfg.TestNet3Params, ) diff --git a/peer/chan_observer.go b/peer/chan_observer.go index dcdc3c3cefd..5482dd073b3 100644 --- a/peer/chan_observer.go +++ b/peer/chan_observer.go @@ -1,7 +1,7 @@ package peer import ( - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/htlcswitch" diff --git a/peer/daemon_adapters.go b/peer/daemon_adapters.go index 3c5bfe9f85b..dc14efd15c0 100644 --- a/peer/daemon_adapters.go +++ b/peer/daemon_adapters.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/protofsm" diff --git a/peer/musig_nonce_order_test.go b/peer/musig_nonce_order_test.go index 13918649c68..962223e08d8 100644 --- a/peer/musig_nonce_order_test.go +++ b/peer/musig_nonce_order_test.go @@ -6,11 +6,11 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/peer/rbf_close_wrapper_actor.go b/peer/rbf_close_wrapper_actor.go index 5200f64140c..9cb1cdebe17 100644 --- a/peer/rbf_close_wrapper_actor.go +++ b/peer/rbf_close_wrapper_actor.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/actor" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/peer/rbf_close_wrapper_actor_test.go b/peer/rbf_close_wrapper_actor_test.go index 56fe3afcfe9..62b14292f5d 100644 --- a/peer/rbf_close_wrapper_actor_test.go +++ b/peer/rbf_close_wrapper_actor_test.go @@ -3,7 +3,7 @@ package peer import ( "testing" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/actor" "github.com/stretchr/testify/require" ) diff --git a/peer/test_utils.go b/peer/test_utils.go index 670af094605..a823b8274e6 100644 --- a/peer/test_utils.go +++ b/peer/test_utils.go @@ -12,9 +12,9 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channelnotifier" diff --git a/pilot.go b/pilot.go index d425991cb03..58d971ca8e4 100644 --- a/pilot.go +++ b/pilot.go @@ -6,8 +6,8 @@ import ( "net" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/autopilot" "github.com/lightningnetwork/lnd/chainreg" "github.com/lightningnetwork/lnd/funding" diff --git a/protofsm/daemon_events.go b/protofsm/daemon_events.go index 3b4ca9b4d3b..99108078866 100644 --- a/protofsm/daemon_events.go +++ b/protofsm/daemon_events.go @@ -2,8 +2,8 @@ package protofsm import ( "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwire" diff --git a/protofsm/state_machine.go b/protofsm/state_machine.go index b0c376c3066..5d3d87a0bea 100644 --- a/protofsm/state_machine.go +++ b/protofsm/state_machine.go @@ -8,8 +8,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/protofsm/state_machine_test.go b/protofsm/state_machine_test.go index ca060614f3b..ca4fdfac135 100644 --- a/protofsm/state_machine_test.go +++ b/protofsm/state_machine_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwire" diff --git a/routing/bandwidth_test.go b/routing/bandwidth_test.go index ff5529f3457..8c08d298643 100644 --- a/routing/bandwidth_test.go +++ b/routing/bandwidth_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/routing/blindedpath/blinded_path.go b/routing/blindedpath/blinded_path.go index ce5a1420c2e..77676e3ac1d 100644 --- a/routing/blindedpath/blinded_path.go +++ b/routing/blindedpath/blinded_path.go @@ -8,7 +8,7 @@ import ( "sort" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/graph/db/models" diff --git a/routing/chainview/bitcoind.go b/routing/chainview/bitcoind.go index 61b6d45ef05..33a6a96eacb 100644 --- a/routing/chainview/bitcoind.go +++ b/routing/chainview/bitcoind.go @@ -9,8 +9,8 @@ import ( "sync/atomic" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightningnetwork/lnd/blockcache" diff --git a/routing/chainview/btcd.go b/routing/chainview/btcd.go index 2a06fd179fa..78b4448b915 100644 --- a/routing/chainview/btcd.go +++ b/routing/chainview/btcd.go @@ -7,11 +7,12 @@ import ( "sync" "sync/atomic" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/blockcache" graphdb "github.com/lightningnetwork/lnd/graph/db" ) @@ -343,7 +344,7 @@ func (b *BtcdFilteredChainView) chainFilterer() { // Apply the new TX filter to btcd, which will cause // all following notifications from and calls to it // return blocks filtered with the new filter. - b.btcdConn.LoadTxFilter(false, []btcutil.Address{}, + b.btcdConn.LoadTxFilter(false, []btcaddr.Address{}, update.newUtxos) // All blocks gotten after we loaded the filter will diff --git a/routing/chainview/interface.go b/routing/chainview/interface.go index 454c2ee6199..67a8954be9f 100644 --- a/routing/chainview/interface.go +++ b/routing/chainview/interface.go @@ -1,8 +1,8 @@ package chainview import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" ) diff --git a/routing/chainview/interface_test.go b/routing/chainview/interface_test.go index 21b8fa3b49e..19184cf8c34 100644 --- a/routing/chainview/interface_test.go +++ b/routing/chainview/interface_test.go @@ -8,15 +8,16 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/integration/rpctest" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/walletdb" _ "github.com/btcsuite/btcwallet/walletdb/bdb" // Required to register the boltdb walletdb implementation. "github.com/lightninglabs/neutrino" @@ -39,7 +40,7 @@ var ( } privKey, pubKey = btcec.PrivKeyFromBytes(testPrivKey) - addrPk, _ = btcutil.NewAddressPubKey(pubKey.SerializeCompressed(), + addrPk, _ = btcaddr.NewAddressPubKey(pubKey.SerializeCompressed(), netParams) testAddr = addrPk.AddressPubKeyHash() diff --git a/routing/chainview/neutrino.go b/routing/chainview/neutrino.go index 8a6d4183639..b05d75df44e 100644 --- a/routing/chainview/neutrino.go +++ b/routing/chainview/neutrino.go @@ -5,11 +5,11 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/gcs/builder" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/gcs/builder" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightninglabs/neutrino" "github.com/lightningnetwork/lnd/blockcache" graphdb "github.com/lightningnetwork/lnd/graph/db" diff --git a/routing/graph.go b/routing/graph.go index b245d404eb7..e79a69bf6a4 100644 --- a/routing/graph.go +++ b/routing/graph.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/routing/integrated_routing_test.go b/routing/integrated_routing_test.go index 035c228fd7f..1ad96860413 100644 --- a/routing/integrated_routing_test.go +++ b/routing/integrated_routing_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/zpay32" diff --git a/routing/localchans/manager.go b/routing/localchans/manager.go index 6dd30b0ae3c..0eda6041139 100644 --- a/routing/localchans/manager.go +++ b/routing/localchans/manager.go @@ -9,7 +9,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/discovery" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/routing/localchans/manager_test.go b/routing/localchans/manager_test.go index 92d8ce05102..a23499f8a6c 100644 --- a/routing/localchans/manager_test.go +++ b/routing/localchans/manager_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/discovery" "github.com/lightningnetwork/lnd/funding" diff --git a/routing/missioncontrol.go b/routing/missioncontrol.go index c31a223bf73..80b55323387 100644 --- a/routing/missioncontrol.go +++ b/routing/missioncontrol.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/btcsuite/btclog/v2" "github.com/btcsuite/btcwallet/walletdb" "github.com/lightningnetwork/lnd/clock" diff --git a/routing/mock_graph_test.go b/routing/mock_graph_test.go index 210551471f0..ee50419be26 100644 --- a/routing/mock_graph_test.go +++ b/routing/mock_graph_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" diff --git a/routing/mock_test.go b/routing/mock_test.go index 472f1261623..212ff30a99b 100644 --- a/routing/mock_test.go +++ b/routing/mock_test.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/htlcswitch" diff --git a/routing/pathfind.go b/routing/pathfind.go index e2ae5d4caa3..0507df929a4 100644 --- a/routing/pathfind.go +++ b/routing/pathfind.go @@ -10,7 +10,7 @@ import ( "sort" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/feature" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/routing/pathfind_test.go b/routing/pathfind_test.go index f43a5c8952a..6b6d2cc1314 100644 --- a/routing/pathfind_test.go +++ b/routing/pathfind_test.go @@ -18,10 +18,10 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/fn/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" diff --git a/routing/probability_apriori.go b/routing/probability_apriori.go index d37e3875ece..eb72b53426a 100644 --- a/routing/probability_apriori.go +++ b/routing/probability_apriori.go @@ -6,7 +6,7 @@ import ( "math" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/probability_apriori_test.go b/routing/probability_apriori_test.go index 0527d2d4102..94579477e19 100644 --- a/routing/probability_apriori_test.go +++ b/routing/probability_apriori_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" "github.com/stretchr/testify/require" diff --git a/routing/probability_bimodal.go b/routing/probability_bimodal.go index 748a8d1c177..87740f5a603 100644 --- a/routing/probability_bimodal.go +++ b/routing/probability_bimodal.go @@ -6,7 +6,7 @@ import ( "math" "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/probability_estimator.go b/routing/probability_estimator.go index c110b748d34..25387827537 100644 --- a/routing/probability_estimator.go +++ b/routing/probability_estimator.go @@ -3,7 +3,7 @@ package routing import ( "time" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" ) diff --git a/routing/router.go b/routing/router.go index 956bc125e4b..7a0b81b706b 100644 --- a/routing/router.go +++ b/routing/router.go @@ -12,7 +12,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/amp" "github.com/lightningnetwork/lnd/clock" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/routing/router_test.go b/routing/router_test.go index 7dd340c2a4e..de99af84134 100644 --- a/routing/router_test.go +++ b/routing/router_test.go @@ -16,9 +16,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/davecgh/go-spew/spew" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/clock" diff --git a/routing/unified_edges.go b/routing/unified_edges.go index 7966f673450..7195de17cee 100644 --- a/routing/unified_edges.go +++ b/routing/unified_edges.go @@ -4,7 +4,7 @@ import ( "context" "math" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" graphdb "github.com/lightningnetwork/lnd/graph/db" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" diff --git a/routing/unified_edges_test.go b/routing/unified_edges_test.go index 6faf2efe783..f19fa587589 100644 --- a/routing/unified_edges_test.go +++ b/routing/unified_edges_test.go @@ -3,7 +3,7 @@ package routing import ( "testing" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/graph/db/models" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/route" diff --git a/rpcperms/middleware_handler.go b/rpcperms/middleware_handler.go index fa1e8510f5e..00d0463bd92 100644 --- a/rpcperms/middleware_handler.go +++ b/rpcperms/middleware_handler.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/macaroons" "google.golang.org/grpc/metadata" diff --git a/rpcserver.go b/rpcserver.go index da164bdc1e0..7acebdd0b27 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -21,15 +21,16 @@ import ( "sync/atomic" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/psbt" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/psbt/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wallet/txauthor" @@ -1050,7 +1051,7 @@ func addrPairsToOutputs(addrPairs map[string]int64, outputs := make([]*wire.TxOut, 0, len(addrPairs)) for addr, amt := range addrPairs { - addr, err := btcutil.DecodeAddress(addr, params) + addr, err := btcaddr.DecodeAddress(addr, params) if err != nil { return nil, err } @@ -1387,7 +1388,7 @@ func (r *rpcServer) SendCoins(ctx context.Context, // Decode the address receiving the coins, we need to check whether the // address is valid for this network. - targetAddr, err := btcutil.DecodeAddress( + targetAddr, err := btcaddr.DecodeAddress( in.Addr, r.cfg.ActiveNetParams.Params, ) if err != nil { @@ -1681,7 +1682,7 @@ func (r *rpcServer) NewAddress(ctx context.Context, // Translate the gRPC proto address type to the wallet controller's // available address types. var ( - addr btcutil.Address + addr btcaddr.Address err error ) switch in.Type { @@ -2963,7 +2964,7 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest, // If a delivery address to close out to was specified, decode it. if len(in.DeliveryAddress) > 0 { // Decode the address provided. - addr, err := btcutil.DecodeAddress( + addr, err := btcaddr.DecodeAddress( in.DeliveryAddress, r.cfg.ActiveNetParams.Params, ) if err != nil { diff --git a/server.go b/server.go index 9eb2b2a08e7..078f9299f87 100644 --- a/server.go +++ b/server.go @@ -19,12 +19,12 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/connmgr" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btclog/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/actor" diff --git a/shachain/element.go b/shachain/element.go index 21f714295d5..1550d027847 100644 --- a/shachain/element.go +++ b/shachain/element.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "errors" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // element represents the entity which contains the hash and index diff --git a/shachain/producer.go b/shachain/producer.go index c633d8994ad..0d708c00799 100644 --- a/shachain/producer.go +++ b/shachain/producer.go @@ -3,7 +3,7 @@ package shachain import ( "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // Producer is an interface which serves as an abstraction over the data diff --git a/shachain/producer_test.go b/shachain/producer_test.go index 1806706e821..798cb24530b 100644 --- a/shachain/producer_test.go +++ b/shachain/producer_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // TestShaChainProducerRestore checks the ability of shachain producer to be diff --git a/shachain/store.go b/shachain/store.go index 8582e62cc2f..511479001c9 100644 --- a/shachain/store.go +++ b/shachain/store.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // Store is an interface which serves as an abstraction over data structure diff --git a/shachain/store_test.go b/shachain/store_test.go index d76b4949b9f..58b1504c557 100644 --- a/shachain/store_test.go +++ b/shachain/store_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) type testInsert struct { diff --git a/shachain/utils.go b/shachain/utils.go index aeb3bd59869..60036ca6106 100644 --- a/shachain/utils.go +++ b/shachain/utils.go @@ -3,7 +3,7 @@ package shachain import ( "encoding/hex" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // getBit return bit on index at position. diff --git a/subrpcserver_config.go b/subrpcserver_config.go index 856553c38fd..8bd4b027017 100644 --- a/subrpcserver_config.go +++ b/subrpcserver_config.go @@ -6,7 +6,7 @@ import ( "net" "reflect" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/aliasmgr" "github.com/lightningnetwork/lnd/autopilot" diff --git a/sweep/aggregator.go b/sweep/aggregator.go index e97ccb9a210..9bc6ca315ef 100644 --- a/sweep/aggregator.go +++ b/sweep/aggregator.go @@ -3,8 +3,8 @@ package sweep import ( "sort" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" diff --git a/sweep/aggregator_test.go b/sweep/aggregator_test.go index 41d0b44faf8..bd674e08f0e 100644 --- a/sweep/aggregator_test.go +++ b/sweep/aggregator_test.go @@ -5,9 +5,9 @@ import ( "errors" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" diff --git a/sweep/fee_bumper.go b/sweep/fee_bumper.go index e0d5d751616..6088094ffe8 100644 --- a/sweep/fee_bumper.go +++ b/sweep/fee_bumper.go @@ -6,11 +6,11 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/rpcclient" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/lightningnetwork/lnd/chainio" "github.com/lightningnetwork/lnd/chainntnfs" diff --git a/sweep/fee_bumper_test.go b/sweep/fee_bumper_test.go index cccb9b4229f..c2653d795c2 100644 --- a/sweep/fee_bumper_test.go +++ b/sweep/fee_bumper_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/chain" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/sweep/fee_function.go b/sweep/fee_function.go index eb2ed4d6b13..85ad6242262 100644 --- a/sweep/fee_function.go +++ b/sweep/fee_function.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/btcutil" + "github.com/btcsuite/btcd/btcutil/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwallet/chainfee" "github.com/lightningnetwork/lnd/lnwire" diff --git a/sweep/interface.go b/sweep/interface.go index 6c8c2cfad28..e9a562823c6 100644 --- a/sweep/interface.go +++ b/sweep/interface.go @@ -1,9 +1,9 @@ package sweep import ( - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" diff --git a/sweep/mock_test.go b/sweep/mock_test.go index e6e254e8e11..88d63ef6e6f 100644 --- a/sweep/mock_test.go +++ b/sweep/mock_test.go @@ -1,9 +1,9 @@ package sweep import ( - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" diff --git a/sweep/store.go b/sweep/store.go index e3e97908bc3..fa44830d08b 100644 --- a/sweep/store.go +++ b/sweep/store.go @@ -6,8 +6,8 @@ import ( "errors" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/sweep/store_test.go b/sweep/store_test.go index e9d4db125ab..f3868378cd4 100644 --- a/sweep/store_test.go +++ b/sweep/store_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/kvdb" "github.com/stretchr/testify/require" diff --git a/sweep/sweeper.go b/sweep/sweeper.go index 379300e9635..547a92c47fb 100644 --- a/sweep/sweeper.go +++ b/sweep/sweeper.go @@ -6,9 +6,9 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainio" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/fn/v2" diff --git a/sweep/sweeper_test.go b/sweep/sweeper_test.go index 917119e008f..0d22a6dd7b0 100644 --- a/sweep/sweeper_test.go +++ b/sweep/sweeper_test.go @@ -7,9 +7,9 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/sweep/test_utils.go b/sweep/test_utils.go index bd4b91bee05..ab46c3e92df 100644 --- a/sweep/test_utils.go +++ b/sweep/test_utils.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" ) diff --git a/sweep/tx_input_set.go b/sweep/tx_input_set.go index 7b533c232f2..33f837894de 100644 --- a/sweep/tx_input_set.go +++ b/sweep/tx_input_set.go @@ -5,9 +5,9 @@ import ( "math" "sort" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/sweep/tx_input_set_test.go b/sweep/tx_input_set_test.go index 15982487853..d2b222f64fa 100644 --- a/sweep/tx_input_set_test.go +++ b/sweep/tx_input_set_test.go @@ -5,9 +5,9 @@ import ( "math" "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/sweep/txgenerator.go b/sweep/txgenerator.go index 995949b15aa..0b8d783066f 100644 --- a/sweep/txgenerator.go +++ b/sweep/txgenerator.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/sweep/txgenerator_test.go b/sweep/txgenerator_test.go index bedb3e70705..53e8ddb0b1b 100644 --- a/sweep/txgenerator_test.go +++ b/sweep/txgenerator_test.go @@ -3,8 +3,8 @@ package sweep import ( "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/stretchr/testify/require" ) diff --git a/sweep/walletsweep.go b/sweep/walletsweep.go index d814d3b3ba3..f654a6e1f94 100644 --- a/sweep/walletsweep.go +++ b/sweep/walletsweep.go @@ -8,9 +8,10 @@ import ( "slices" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" @@ -209,7 +210,7 @@ type WalletSweepPackage struct { // paying to more than one specified address. type DeliveryAddr struct { // Addr is the address to pay to. - Addr btcutil.Address + Addr btcaddr.Address // Amt is the amount to pay to the given address. Amt btcutil.Amount @@ -223,7 +224,7 @@ type DeliveryAddr struct { // utxoSource and outputLeaser as sources for wallet funds. func CraftSweepAllTx(feeRate, maxFeeRate chainfee.SatPerKWeight, blockHeight uint32, deliveryAddrs []DeliveryAddr, - changeAddr btcutil.Address, coinSelectLocker CoinSelectionLocker, + changeAddr btcaddr.Address, coinSelectLocker CoinSelectionLocker, utxoSource UtxoSource, outputLeaser OutputLeaser, signer input.Signer, minConfs int32, selectUtxos fn.Set[wire.OutPoint]) (*WalletSweepPackage, error) { diff --git a/sweep/walletsweep_test.go b/sweep/walletsweep_test.go index b6bed3b9b8f..ae5d99c2cba 100644 --- a/sweep/walletsweep_test.go +++ b/sweep/walletsweep_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/btcsuite/btcwallet/wtxmgr" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lntest/mock" @@ -219,7 +219,7 @@ var sweepScript = []byte{ 0xe, 0x6e, 0xf8, 0xef, } -var deliveryAddr = func() btcutil.Address { +var deliveryAddr = func() btcaddr.Address { _, addrs, _, err := txscript.ExtractPkScriptAddrs( sweepScript, &chaincfg.TestNet3Params, ) diff --git a/sweep/weight_estimator.go b/sweep/weight_estimator.go index 429b36ee5d7..7e5fd3a337a 100644 --- a/sweep/weight_estimator.go +++ b/sweep/weight_estimator.go @@ -1,9 +1,9 @@ package sweep import ( - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/sweep/weight_estimator_test.go b/sweep/weight_estimator_test.go index 513aa01cc42..31433bd9ab8 100644 --- a/sweep/weight_estimator_test.go +++ b/sweep/weight_estimator_test.go @@ -3,10 +3,10 @@ package sweep import ( "testing" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet/chainfee" @@ -129,7 +129,7 @@ func TestWeightEstimatorMaxFee(t *testing.T) { func TestWeightEstimatorAddOutput(t *testing.T) { testFeeRate := chainfee.SatPerKWeight(20000) - p2wkhAddr, err := btcutil.NewAddressWitnessPubKeyHash( + p2wkhAddr, err := btcaddr.NewAddressWitnessPubKeyHash( make([]byte, 20), &chaincfg.MainNetParams, ) require.NoError(t, err) diff --git a/sweeper_wallet.go b/sweeper_wallet.go index 7d429c13527..9f21637e288 100644 --- a/sweeper_wallet.go +++ b/sweeper_wallet.go @@ -1,7 +1,7 @@ package lnd import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lnwallet" ) diff --git a/types.go b/types.go index bb446de3a82..f5a125b624f 100644 --- a/types.go +++ b/types.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lnrpc" ) diff --git a/walletunlocker/service.go b/walletunlocker/service.go index bde5c7a560c..6de28453264 100644 --- a/walletunlocker/service.go +++ b/walletunlocker/service.go @@ -8,8 +8,8 @@ import ( "os" "time" - "github.com/btcsuite/btcd/btcutil/hdkeychain" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/btcutil/v2/hdkeychain" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" "github.com/lightningnetwork/lnd/aezeed" diff --git a/walletunlocker/service_test.go b/walletunlocker/service_test.go index 3572b22249d..82911dc3a6f 100644 --- a/walletunlocker/service_test.go +++ b/walletunlocker/service_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/btcsuite/btcwallet/snacl" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wallet" diff --git a/watchtower/blob/commitments.go b/watchtower/blob/commitments.go index 40daa08fc6e..952d7626475 100644 --- a/watchtower/blob/commitments.go +++ b/watchtower/blob/commitments.go @@ -3,7 +3,7 @@ package blob import ( "fmt" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/watchtower/blob/derivation.go b/watchtower/blob/derivation.go index fdd74de428f..f4f7b5a404e 100644 --- a/watchtower/blob/derivation.go +++ b/watchtower/blob/derivation.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "encoding/hex" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" ) // BreachHintSize is the length of the identifier used to detect remote diff --git a/watchtower/blob/justice_kit.go b/watchtower/blob/justice_kit.go index 90e6e947302..b7d9ba29131 100644 --- a/watchtower/blob/justice_kit.go +++ b/watchtower/blob/justice_kit.go @@ -6,9 +6,9 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" secp "github.com/decred/dcrd/dcrec/secp256k1/v4" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/watchtower/blob/justice_kit_packet.go b/watchtower/blob/justice_kit_packet.go index fd799cd1fd8..65ddc6e58c9 100644 --- a/watchtower/blob/justice_kit_packet.go +++ b/watchtower/blob/justice_kit_packet.go @@ -10,7 +10,7 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/lnwire" "golang.org/x/crypto/chacha20poly1305" ) diff --git a/watchtower/blob/justice_kit_test.go b/watchtower/blob/justice_kit_test.go index 0934c4e0959..af022302a7d 100644 --- a/watchtower/blob/justice_kit_test.go +++ b/watchtower/blob/justice_kit_test.go @@ -10,8 +10,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet" diff --git a/watchtower/config.go b/watchtower/config.go index 2fba58f3708..48844a62fd4 100644 --- a/watchtower/config.go +++ b/watchtower/config.go @@ -5,9 +5,9 @@ import ( "net" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/tor" "github.com/lightningnetwork/lnd/watchtower/lookout" @@ -61,7 +61,7 @@ type Config struct { // NewAddress is used to generate reward addresses, where a cut of // successfully sent funds can be received. - NewAddress func() (btcutil.Address, error) + NewAddress func() (btcaddr.Address, error) // NodeKeyECDH is the ECDH capable wrapper of the key to be used in // accepting new brontide connections. diff --git a/watchtower/lookout/interface.go b/watchtower/lookout/interface.go index a84f22b035f..552fc54bcbd 100644 --- a/watchtower/lookout/interface.go +++ b/watchtower/lookout/interface.go @@ -1,8 +1,8 @@ package lookout import ( - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/watchtower/blob" "github.com/lightningnetwork/lnd/watchtower/wtdb" diff --git a/watchtower/lookout/justice_descriptor.go b/watchtower/lookout/justice_descriptor.go index e4a095a2585..5895e722f72 100644 --- a/watchtower/lookout/justice_descriptor.go +++ b/watchtower/lookout/justice_descriptor.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/txsort" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/txsort" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnutils" diff --git a/watchtower/lookout/justice_descriptor_test.go b/watchtower/lookout/justice_descriptor_test.go index ded2cd6031d..c3cbea03f02 100644 --- a/watchtower/lookout/justice_descriptor_test.go +++ b/watchtower/lookout/justice_descriptor_test.go @@ -6,10 +6,10 @@ import ( "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/txsort" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/txsort" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" secp "github.com/decred/dcrd/dcrec/secp256k1/v4" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" diff --git a/watchtower/lookout/lookout.go b/watchtower/lookout/lookout.go index b4091199536..8d7dbea2162 100644 --- a/watchtower/lookout/lookout.go +++ b/watchtower/lookout/lookout.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/watchtower/blob" ) diff --git a/watchtower/lookout/lookout_test.go b/watchtower/lookout/lookout_test.go index 64d182aa213..bcd7ac20a5e 100644 --- a/watchtower/lookout/lookout_test.go +++ b/watchtower/lookout/lookout_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" diff --git a/watchtower/lookout/mock.go b/watchtower/lookout/mock.go index 84c3a004ff3..3b633864d0e 100644 --- a/watchtower/lookout/mock.go +++ b/watchtower/lookout/mock.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" ) diff --git a/watchtower/lookout/punisher.go b/watchtower/lookout/punisher.go index 0c8f8bb89fb..956a868da1c 100644 --- a/watchtower/lookout/punisher.go +++ b/watchtower/lookout/punisher.go @@ -1,7 +1,7 @@ package lookout import ( - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/labels" ) diff --git a/watchtower/wtclient/backup_task.go b/watchtower/wtclient/backup_task.go index 5119a8530b9..3cc470af70b 100644 --- a/watchtower/wtclient/backup_task.go +++ b/watchtower/wtclient/backup_task.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/btcutil/txsort" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/btcutil/v2/txsort" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/watchtower/blob" diff --git a/watchtower/wtclient/backup_task_internal_test.go b/watchtower/wtclient/backup_task_internal_test.go index afdb4545c71..b0ba2cc1d6b 100644 --- a/watchtower/wtclient/backup_task_internal_test.go +++ b/watchtower/wtclient/backup_task_internal_test.go @@ -4,11 +4,12 @@ import ( "encoding/binary" "testing" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/input" @@ -305,14 +306,14 @@ var ( blobTypeCommitReward = (blob.FlagCommitOutputs | blob.FlagReward).Type() - addr, _ = btcutil.DecodeAddress( + addr, _ = btcaddr.DecodeAddress( "tb1pw8gzj8clt3v5lxykpgacpju5n8xteskt7gxhmudu6pa70nwfhe6s3unsyk", &chaincfg.TestNet3Params, ) addrScript, _ = txscript.PayToAddrScript(addr) - sweepAddrScript, _ = btcutil.DecodeAddress( + sweepAddrScript, _ = btcaddr.DecodeAddress( "tb1qs3jyc9sf5kak3x0w99cav9u605aeu3t600xxx0", &chaincfg.TestNet3Params, ) diff --git a/watchtower/wtclient/client_test.go b/watchtower/wtclient/client_test.go index 5b4753977e4..9b8c6b0c69f 100644 --- a/watchtower/wtclient/client_test.go +++ b/watchtower/wtclient/client_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channelnotifier" @@ -67,7 +67,7 @@ var ( } // addr is the server's reward address given to watchtower clients. - addr, _ = btcutil.DecodeAddress( + addr, _ = btcaddr.DecodeAddress( "tb1pw8gzj8clt3v5lxykpgacpju5n8xteskt7gxhmudu6pa70nwfhe6s3unsyk", &chaincfg.TestNet3Params, ) @@ -956,7 +956,7 @@ func newServerHarness(t *testing.T, mockNet *mockNet, netAddr string, ReadTimeout: timeout, WriteTimeout: timeout, NodeKeyECDH: privKeyECDH, - NewAddress: func() (btcutil.Address, error) { + NewAddress: func() (btcaddr.Address, error) { return addr, nil }, } diff --git a/watchtower/wtclient/manager.go b/watchtower/wtclient/manager.go index 7a39c8ff73e..03a344a15d8 100644 --- a/watchtower/wtclient/manager.go +++ b/watchtower/wtclient/manager.go @@ -8,7 +8,7 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channelnotifier" diff --git a/watchtower/wtclient/session_negotiator.go b/watchtower/wtclient/session_negotiator.go index 4cba7de62cd..01184657f3a 100644 --- a/watchtower/wtclient/session_negotiator.go +++ b/watchtower/wtclient/session_negotiator.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" diff --git a/watchtower/wtclient/session_queue.go b/watchtower/wtclient/session_queue.go index 4ee1597637a..1cfd98fa83a 100644 --- a/watchtower/wtclient/session_queue.go +++ b/watchtower/wtclient/session_queue.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btclog/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" diff --git a/watchtower/wtdb/migration8/codec.go b/watchtower/wtdb/migration8/codec.go index 9c8dca1a365..38768ba343e 100644 --- a/watchtower/wtdb/migration8/codec.go +++ b/watchtower/wtdb/migration8/codec.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/tlv" ) diff --git a/watchtower/wtdb/tower_db.go b/watchtower/wtdb/tower_db.go index fa43b5bdd89..9f6bad1fec5 100644 --- a/watchtower/wtdb/tower_db.go +++ b/watchtower/wtdb/tower_db.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/watchtower/blob" diff --git a/watchtower/wtdb/tower_db_test.go b/watchtower/wtdb/tower_db_test.go index f829a793af5..3b0c71de566 100644 --- a/watchtower/wtdb/tower_db_test.go +++ b/watchtower/wtdb/tower_db_test.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "testing" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/kvdb" "github.com/lightningnetwork/lnd/watchtower" diff --git a/watchtower/wtmock/signer.go b/watchtower/wtmock/signer.go index fa1bda1c319..b43304451e1 100644 --- a/watchtower/wtmock/signer.go +++ b/watchtower/wtmock/signer.go @@ -9,8 +9,8 @@ import ( "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcec/v2/schnorr/musig2" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/txscript/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/input" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/watchtower/wtpolicy/policy.go b/watchtower/wtpolicy/policy.go index 89804685b19..be410544ab2 100644 --- a/watchtower/wtpolicy/policy.go +++ b/watchtower/wtpolicy/policy.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/btcutil/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/chainfee" diff --git a/watchtower/wtserver/create_session.go b/watchtower/wtserver/create_session.go index 3fd58dbd2e2..8b9787b3457 100644 --- a/watchtower/wtserver/create_session.go +++ b/watchtower/wtserver/create_session.go @@ -1,7 +1,7 @@ package wtserver import ( - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/txscript/v2" "github.com/lightningnetwork/lnd/watchtower/blob" "github.com/lightningnetwork/lnd/watchtower/wtdb" "github.com/lightningnetwork/lnd/watchtower/wtpolicy" diff --git a/watchtower/wtserver/server.go b/watchtower/wtserver/server.go index 01234f9d0cd..70bb32fb13f 100644 --- a/watchtower/wtserver/server.go +++ b/watchtower/wtserver/server.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg/chainhash" + btcaddr "github.com/btcsuite/btcd/address/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/btcsuite/btcd/connmgr" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" @@ -51,7 +51,7 @@ type Config struct { // NewAddress is used to generate reward addresses, where a cut of // successfully sent funds can be received. - NewAddress func() (btcutil.Address, error) + NewAddress func() (btcaddr.Address, error) // ChainHash identifies the network that the server is watching. ChainHash chainhash.Hash diff --git a/watchtower/wtserver/server_test.go b/watchtower/wtserver/server_test.go index fa1dfa036b0..cb51b812c69 100644 --- a/watchtower/wtserver/server_test.go +++ b/watchtower/wtserver/server_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/txscript/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/watchtower/blob" "github.com/lightningnetwork/lnd/watchtower/wtdb" @@ -21,7 +21,7 @@ import ( var ( // addr is the server's reward address given to watchtower clients. - addr, _ = btcutil.DecodeAddress( + addr, _ = btcaddr.DecodeAddress( "tb1pw8gzj8clt3v5lxykpgacpju5n8xteskt7gxhmudu6pa70nwfhe6s3unsyk", &chaincfg.TestNet3Params, ) @@ -61,7 +61,7 @@ func initServer(t *testing.T, db wtserver.DB, DB: db, ReadTimeout: timeout, WriteTimeout: timeout, - NewAddress: func() (btcutil.Address, error) { + NewAddress: func() (btcaddr.Address, error) { return addr, nil }, ChainHash: testnetChainHash, diff --git a/watchtower/wtwire/init.go b/watchtower/wtwire/init.go index 4d5ec34bdb7..fa5a4033e5b 100644 --- a/watchtower/wtwire/init.go +++ b/watchtower/wtwire/init.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/feature" "github.com/lightningnetwork/lnd/lnwire" ) diff --git a/watchtower/wtwire/init_test.go b/watchtower/wtwire/init_test.go index c0b0fa75117..34f8e6f68fc 100644 --- a/watchtower/wtwire/init_test.go +++ b/watchtower/wtwire/init_test.go @@ -3,8 +3,8 @@ package wtwire_test import ( "testing" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/feature" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/watchtower/wtwire" diff --git a/watchtower/wtwire/wtwire.go b/watchtower/wtwire/wtwire.go index 5b10fee3302..d49e020a289 100644 --- a/watchtower/wtwire/wtwire.go +++ b/watchtower/wtwire/wtwire.go @@ -6,8 +6,8 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/wire/v2" "github.com/lightningnetwork/lnd/lnwallet/chainfee" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/watchtower/blob" diff --git a/watchtower/wtwire/wtwire_test.go b/watchtower/wtwire/wtwire_test.go index e9b37a55929..785c89250c4 100644 --- a/watchtower/wtwire/wtwire_test.go +++ b/watchtower/wtwire/wtwire_test.go @@ -8,7 +8,7 @@ import ( "testing/quick" "time" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/watchtower/wtwire" diff --git a/zpay32/decode.go b/zpay32/decode.go index 577f6a6d13d..9f0228dcfe5 100644 --- a/zpay32/decode.go +++ b/zpay32/decode.go @@ -9,13 +9,13 @@ import ( "time" "unicode/utf8" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil/bech32" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" + "github.com/btcsuite/btcd/txscript/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwire" ) @@ -527,13 +527,13 @@ func parseMinFinalCLTVExpiry(data []byte) (*uint64, error) { // parseFallbackAddr converts the data (encoded in base32) into a fallback // on-chain address. -func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, error) { // nolint:dupl +func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcaddr.Address, error) { // nolint:dupl // Checks if the data is empty or contains a version without an address. if len(data) < 2 { return nil, fmt.Errorf("empty fallback address field") } - var addr btcutil.Address + var addr btcaddr.Address version := data[0] switch version { @@ -545,9 +545,9 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro switch len(witness) { case 20: - addr, err = btcutil.NewAddressWitnessPubKeyHash(witness, net) + addr, err = btcaddr.NewAddressWitnessPubKeyHash(witness, net) case 32: - addr, err = btcutil.NewAddressWitnessScriptHash(witness, net) + addr, err = btcaddr.NewAddressWitnessScriptHash(witness, net) default: return nil, fmt.Errorf("unknown witness program length %d", len(witness)) @@ -561,7 +561,7 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro if err != nil { return nil, err } - addr, err = btcutil.NewAddressTaproot(witness, net) + addr, err = btcaddr.NewAddressTaproot(witness, net) if err != nil { return nil, err } @@ -571,7 +571,7 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro return nil, err } - addr, err = btcutil.NewAddressPubKeyHash(pubKeyHash, net) + addr, err = btcaddr.NewAddressPubKeyHash(pubKeyHash, net) if err != nil { return nil, err } @@ -581,7 +581,7 @@ func parseFallbackAddr(data []byte, net *chaincfg.Params) (btcutil.Address, erro return nil, err } - addr, err = btcutil.NewAddressScriptHashFromHash(scriptHash, net) + addr, err = btcaddr.NewAddressScriptHashFromHash(scriptHash, net) if err != nil { return nil, err } diff --git a/zpay32/encode.go b/zpay32/encode.go index 50f294e51c4..7a6f24888ef 100644 --- a/zpay32/encode.go +++ b/zpay32/encode.go @@ -5,10 +5,10 @@ import ( "encoding/binary" "fmt" - "github.com/btcsuite/btcd/btcutil" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcutil/bech32" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwire" ) @@ -201,15 +201,15 @@ func writeTaggedFields(bufferBase32 *bytes.Buffer, invoice *Invoice) error { if invoice.FallbackAddr != nil { var version byte switch addr := invoice.FallbackAddr.(type) { - case *btcutil.AddressPubKeyHash: + case *btcaddr.AddressPubKeyHash: version = fallbackVersionPubkeyHash - case *btcutil.AddressScriptHash: + case *btcaddr.AddressScriptHash: version = fallbackVersionScriptHash - case *btcutil.AddressWitnessPubKeyHash: + case *btcaddr.AddressWitnessPubKeyHash: version = addr.WitnessVersion() - case *btcutil.AddressWitnessScriptHash: + case *btcaddr.AddressWitnessScriptHash: version = addr.WitnessVersion() - case *btcutil.AddressTaproot: + case *btcaddr.AddressTaproot: version = addr.WitnessVersion() default: return fmt.Errorf("unknown fallback address type") diff --git a/zpay32/fuzz_test.go b/zpay32/fuzz_test.go index 9855b8c1ae3..c5c95e8d26b 100644 --- a/zpay32/fuzz_test.go +++ b/zpay32/fuzz_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" ) // getPrefixAndChainParams selects network chain parameters based on the fuzzer- diff --git a/zpay32/invoice.go b/zpay32/invoice.go index 9c5d86ce2f1..a46033a1213 100644 --- a/zpay32/invoice.go +++ b/zpay32/invoice.go @@ -5,9 +5,9 @@ import ( "fmt" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwire" ) @@ -183,7 +183,7 @@ type Invoice struct { // FallbackAddr is an on-chain address that can be used for payment in // case the Lightning payment fails. // Optional. - FallbackAddr btcutil.Address + FallbackAddr btcaddr.Address // RouteHints represents one or more different route hints. Each route // hint can be individually used to reach the destination. These usually @@ -266,7 +266,7 @@ func Expiry(expiry time.Duration) func(*Invoice) { // FallbackAddr is a functional option that allows callers of NewInvoice to set // the Invoice's fallback on-chain address that can be used for payment in case // the Lightning payment fails -func FallbackAddr(fallbackAddr btcutil.Address) func(*Invoice) { +func FallbackAddr(fallbackAddr btcaddr.Address) func(*Invoice) { return func(i *Invoice) { i.FallbackAddr = fallbackAddr } diff --git a/zpay32/invoice_internal_test.go b/zpay32/invoice_internal_test.go index c2729e8c61c..4f11d6e9139 100644 --- a/zpay32/invoice_internal_test.go +++ b/zpay32/invoice_internal_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" - "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil/bech32" - "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/v2" "github.com/lightningnetwork/lnd/lnwire" "github.com/stretchr/testify/require" ) @@ -626,7 +626,7 @@ func TestParseFallbackAddr(t *testing.T) { data []byte net *chaincfg.Params valid bool - result btcutil.Address + result btcaddr.Address }{ { data: []byte{}, diff --git a/zpay32/invoice_test.go b/zpay32/invoice_test.go index cec6bfd741d..ab8c7da3344 100644 --- a/zpay32/invoice_test.go +++ b/zpay32/invoice_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" + btcaddr "github.com/btcsuite/btcd/address/v2" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/btcec/v2/ecdsa" - "github.com/btcsuite/btcd/btcutil" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/v2" + "github.com/btcsuite/btcd/chainhash/v2" sphinx "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/fn/v2" "github.com/lightningnetwork/lnd/lnwire" @@ -66,12 +66,12 @@ var ( testExpiry0 = time.Duration(0) * time.Second testExpiry60 = time.Duration(60) * time.Second - testAddrTestnet, _ = btcutil.DecodeAddress("mk2QpYatsKicvFVuTAQLBryyccRXMUaGHP", &chaincfg.TestNet3Params) - testRustyAddr, _ = btcutil.DecodeAddress("1RustyRX2oai4EYYDpQGWvEL62BBGqN9T", &chaincfg.MainNetParams) - testAddrMainnetP2SH, _ = btcutil.DecodeAddress("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX", &chaincfg.MainNetParams) - testAddrMainnetP2WPKH, _ = btcutil.DecodeAddress("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4", &chaincfg.MainNetParams) - testAddrMainnetP2WSH, _ = btcutil.DecodeAddress("bc1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3qccfmv3", &chaincfg.MainNetParams) - testAddrMainnetP2TR, _ = btcutil.DecodeAddress("bc1pptdvg0d2nj99568"+ + testAddrTestnet, _ = btcaddr.DecodeAddress("mk2QpYatsKicvFVuTAQLBryyccRXMUaGHP", &chaincfg.TestNet3Params) + testRustyAddr, _ = btcaddr.DecodeAddress("1RustyRX2oai4EYYDpQGWvEL62BBGqN9T", &chaincfg.MainNetParams) + testAddrMainnetP2SH, _ = btcaddr.DecodeAddress("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX", &chaincfg.MainNetParams) + testAddrMainnetP2WPKH, _ = btcaddr.DecodeAddress("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4", &chaincfg.MainNetParams) + testAddrMainnetP2WSH, _ = btcaddr.DecodeAddress("bc1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3qccfmv3", &chaincfg.MainNetParams) + testAddrMainnetP2TR, _ = btcaddr.DecodeAddress("bc1pptdvg0d2nj99568"+ "qn6ssdy4cygnwuxgw2ukmnwgwz7jpqjz2kszse2s3lm", &chaincfg.MainNetParams)