From 9b722b8669109ebb4c80127dd101fd5e143b6918 Mon Sep 17 00:00:00 2001 From: Lazzeruz Date: Sat, 9 Dec 2023 21:18:29 +0100 Subject: [PATCH] More changes yay Renamed a bunch of stuff to the right Github. Hope it works. --- CONTRIBUTING.md | 4 +++ app/appmessage/domainconverters.go | 10 +++++++- app/appmessage/p2p_msgblock_test.go | 11 ++++++++ app/appmessage/p2p_msgblockwithtrusteddata.go | 5 ++++ app/protocol/common/common.go | 6 +++++ app/protocol/flowcontext/blocks.go | 8 ++++++ app/protocol/flowcontext/network.go | 8 ++++++ app/protocol/flowcontext/orphans.go | 8 ++++++ app/protocol/flows/handshake/handshake.go | 6 +++++ .../flows/handshake/receiveversion.go | 9 +++++++ app/protocol/flows/handshake/sendversion.go | 9 +++++++ app/protocol/flows/ready/ready.go | 11 ++++++++ .../flows/v5/blockrelay/batch_size_test.go | 5 ++++ .../blockrelay/handle_ibd_block_requests.go | 7 ++++++ .../handle_ibd_request_chain_block_locator.go | 9 +++++++ ...pruning_point_and_its_anticone_requests.go | 11 ++++++++ .../blockrelay/handle_relay_block_requests.go | 8 ++++++ .../flows/v5/blockrelay/handle_relay_invs.go | 16 ++++++++++++ .../v5/blockrelay/handle_request_anticone.go | 11 ++++++++ .../handle_request_pruning_point_utxo_set.go | 4 +++ app/protocol/flows/v5/blockrelay/ibd.go | 16 ++++++++++++ .../v5/blockrelay/ibd_with_headers_proof.go | 11 ++++++++ app/protocol/flows/v5/ping/send.go | 9 +++++++ app/protocol/flows/v5/testing/common_test.go | 4 +++ .../flows/v5/testing/receiveaddresses_test.go | 8 ++++++ .../handle_relayed_transactions.go | 13 ++++++++++ .../handle_relayed_transactions_test.go | 18 +++++++++++++ .../handle_requested_transactions_test.go | 19 ++++++++++++++ app/protocol/protocol.go | 18 +++++++++++++ app/protocol/protocolerrors/protocolerrors.go | 4 +++ app/rpc/manager.go | 14 +++++++++++ app/rpc/rpc.go | 8 ++++++ app/rpc/rpccontext/notificationmanager.go | 6 +++++ app/rpc/rpccontext/utxos_by_addresses.go | 8 ++++++ app/rpc/rpccontext/verbosedata.go | 4 +++ app/rpc/rpchandlers/ban.go | 7 ++++++ app/rpc/rpchandlers/get_balance_by_address.go | 8 ++++++ .../rpchandlers/get_balances_by_addresses.go | 6 +++++ app/rpc/rpchandlers/get_block.go | 7 ++++++ app/rpc/rpchandlers/submit_block.go | 10 ++++++++ app/rpc/rpchandlers/submit_transaction.go | 8 ++++++ app/rpc/rpchandlers/unban.go | 7 ++++++ cmd/genkeypair/main.go | 4 +++ cmd/{kaspactl => zoomyctl}/README.md | 0 cmd/{kaspactl => zoomyctl}/command_parser.go | 4 +++ cmd/{kaspactl => zoomyctl}/commands.go | 0 cmd/{kaspactl => zoomyctl}/config.go | 4 +++ cmd/{kaspactl => zoomyctl}/docker/Dockerfile | 8 ++++++ cmd/{kaspactl => zoomyctl}/main.go | 8 ++++++ .../reflection_helpers.go | 0 cmd/{kaspaminer => zoomyminer}/README.md | 0 cmd/{kaspaminer => zoomyminer}/client.go | 8 ++++++ cmd/{kaspaminer => zoomyminer}/config.go | 4 +++ .../docker/Dockerfile | 9 +++++++ cmd/{kaspaminer => zoomyminer}/log.go | 6 +++++ cmd/{kaspaminer => zoomyminer}/main.go | 0 cmd/{kaspaminer => zoomyminer}/mineloop.go | 15 +++++++++++ .../templatemanager/templatemanager.go | 7 ++++++ cmd/{kaspawallet => zoomywallet}/balance.go | 0 cmd/{kaspawallet => zoomywallet}/broadcast.go | 5 ++++ cmd/{kaspawallet => zoomywallet}/common.go | 0 cmd/{kaspawallet => zoomywallet}/config.go | 4 +++ cmd/{kaspawallet => zoomywallet}/create.go | 6 +++++ .../create_unsigned_tx.go | 0 .../daemon/client/client.go | 5 ++++ .../daemon/pb/generate.go | 0 .../daemon/pb/kaspawalletd.pb.go | 0 .../daemon/pb/kaspawalletd.proto | 4 +++ .../daemon/pb/kaspawalletd_grpc.pb.go | 0 .../daemon/server/address.go | 6 +++++ .../daemon/server/balance.go | 0 .../daemon/server/broadcast.go | 11 ++++++++ .../daemon/server/common.go | 0 .../server/create_unsigned_transaction.go | 7 ++++++ .../daemon/server/external_spendable_utxos.go | 0 .../daemon/server/log.go | 0 .../daemon/server/rpc.go | 0 .../daemon/server/send.go | 0 .../daemon/server/server.go | 9 +++++++ .../daemon/server/shutdown.go | 4 +++ .../daemon/server/sign.go | 0 .../daemon/server/split_transaction.go | 0 .../daemon/server/split_transaction_test.go | 0 .../daemon/server/sync.go | 4 +++ .../docker/Dockerfile | 9 +++++++ .../dump_unencrypted_data.go | 0 .../keys/create.go | 6 +++++ .../keys/get_password.go | 0 cmd/{kaspawallet => zoomywallet}/keys/keys.go | 10 +++++++- .../libkaspawallet/bip32/base58/alphabet.go | 0 .../libkaspawallet/bip32/base58/base58.go | 0 .../bip32/base58/base58_test.go | 0 .../bip32/base58/base58bench_test.go | 0 .../bip32/base58/base58check.go | 0 .../bip32/base58/base58check_test.go | 0 .../libkaspawallet/bip32/base58/cov_report.sh | 0 .../libkaspawallet/bip32/base58/doc.go | 0 .../bip32/base58/example_test.go | 0 .../libkaspawallet/bip32/bip32.go | 0 .../libkaspawallet/bip32/bip32_test.go | 0 .../bip32/child_key_derivation.go | 1 + .../libkaspawallet/bip32/extended_key.go | 0 .../libkaspawallet/bip32/hash.go | 0 .../libkaspawallet/bip32/path.go | 0 .../libkaspawallet/bip32/serialization.go | 5 ++++ .../libkaspawallet/bip32/version.go | 0 .../libkaspawallet/bip39.go | 5 ++++ .../libkaspawallet/converters.go | 0 .../libkaspawallet/keychains.go | 0 .../libkaspawallet/keypair.go | 6 +++++ .../protoserialization/generate.go | 0 .../protoserialization/wallet.pb.go | 0 .../protoserialization/wallet.proto | 0 .../serialization/serialization.go | 6 +++++ .../libkaspawallet/sign.go | 10 ++++++++ .../libkaspawallet/transaction.go | 10 ++++++++ .../libkaspawallet/transaction_test.go | 8 ++++++ cmd/{kaspawallet => zoomywallet}/main.go | 0 .../new_address.go | 4 +++ cmd/{kaspawallet => zoomywallet}/parse.go | 9 +++++++ cmd/{kaspawallet => zoomywallet}/send.go | 8 ++++++ .../show_addresses.go | 4 +++ cmd/{kaspawallet => zoomywallet}/sign.go | 5 ++++ .../start_daemon.go | 0 cmd/{kaspawallet => zoomywallet}/sweep.go | 18 +++++++++++++ .../transactions_hex_encoding.go | 0 .../utils/format_kas.go | 0 .../utils/readline.go | 0 docker/Dockerfile | 5 ++++ domain/consensus/consensus.go | 9 +++++++ domain/consensus/consensus_test.go | 8 ++++++ .../database/binaryserialization/hash.go | 4 +++ domain/consensus/database/cursor.go | 5 ++++ .../serialization/block_ghostdag_data.go | 5 ++++ .../database/serialization/blockheader.go | 7 ++++++ .../serialization/blues_anticone_sizes.go | 4 +++ .../blues_anticone_sizes_test.go | 5 ++++ .../database/serialization/transaction.go | 4 +++ .../database/serialization/utxo_entry.go | 7 ++++++ .../datastructures/blockstore/block_store.go | 8 ++++++ .../block_window_heap_slice_store.go | 8 ++++++ .../consensusstatestore/utxo.go | 6 +++++ .../consensusstatestore/virtual_utxo_set.go | 5 ++++ .../daawindowstore/daa_window_store.go | 10 ++++++++ .../headers_selected_chain_store.go | 12 +++++++++ .../pruningstore/imported_pruning_point.go | 6 +++++ .../pruningstore/pruning_store.go | 11 ++++++++ .../reachability_data_store.go | 9 +++++++ .../utxodiffstore/utxo_diff_store.go | 8 ++++++ domain/consensus/factory.go | 11 ++++++++ domain/consensus/finality_test.go | 10 ++++++++ .../processes/blockbuilder/block_builder.go | 5 ++++ .../blockbuilder/test_block_builder.go | 11 ++++++++ .../blockparentbuilder/blockparentbuilder.go | 7 ++++++ .../validate_and_insert_block.go | 13 ++++++++++ .../validate_and_insert_block_test.go | 12 +++++++++ ...idate_and_insert_imported_pruning_point.go | 6 +++++ ..._and_insert_imported_pruning_point_test.go | 10 ++++++++ .../blockprocessor/validate_block.go | 8 ++++++ .../blockvalidator/block_body_in_context.go | 9 +++++++ .../block_body_in_context_test.go | 9 +++++++ .../blockvalidator/block_body_in_isolation.go | 11 ++++++++ .../block_body_in_isolation_test.go | 15 +++++++++++ .../blockvalidator/block_header_in_context.go | 8 ++++++ .../block_header_in_isolation.go | 10 ++++++++ .../block_header_in_isolation_test.go | 10 ++++++++ .../blockvalidator/header_pruning_point.go | 6 +++++ ..._violation_proof_of_work_and_difficulty.go | 10 ++++++++ ...ation_proof_of_work_and_difficulty_test.go | 15 +++++++++++ .../coinbasemanager/coinbasemanager.go | 10 ++++++++ .../processes/coinbasemanager/payload.go | 5 ++++ .../calculate_past_utxo.go | 6 +++++ .../import_pruning_utxo_set.go | 11 ++++++++ .../pick_virtual_parents.go | 5 ++++ .../consensusstatemanager/resolve.go | 9 +++++++ .../resolve_block_status.go | 7 ++++++ .../resolve_block_status_test.go | 13 ++++++++++ .../resolve_virtual_test.go | 11 ++++++++ .../verify_and_build_utxo.go | 6 +++++ .../dagtopologymanager/dagtopologymanager.go | 5 ++++ .../processes/dagtraversalmanager/anticone.go | 6 +++++ .../dagtraversalmanager.go | 5 ++++ .../selected_child_iterator.go | 5 ++++ .../dagtraversalmanager/window_test.go | 8 ++++++ .../processes/difficultymanager/hashrate.go | 6 +++++ .../processes/ghostdagmanager/ghostdag.go | 6 +++++ .../ghostdagmanager/ghostdag_test.go | 12 +++++++++ .../headersselectedtipmanager_test.go | 7 ++++++ .../mergedepthmanager/merge_depth_manager.go | 7 ++++++ .../pastmediantimemanager.go | 5 ++++ .../pruningmanager/pruningmanager.go | 12 +++++++++ .../pruningproofmanager.go | 20 +++++++++++++++ .../processes/reachabilitymanager/fetch.go | 7 ++++++ .../processes/reachabilitymanager/interval.go | 4 +++ .../reachability_stretch_test.go | 7 ++++++ .../reachabilitymanager/reindex_context.go | 5 ++++ .../processes/syncmanager/antipast.go | 5 ++++ .../processes/syncmanager/blocklocator.go | 6 +++++ .../syncmanager/blocklocator_test.go | 8 ++++++ .../processes/syncmanager/syncmanager.go | 6 +++++ .../transaction_in_context.go | 10 ++++++++ .../transaction_in_isolation.go | 8 ++++++ .../transaction_in_isolation_test.go | 10 ++++++++ .../transactionvalidator_test.go | 7 ++++++ domain/consensus/ruleerrors/rule_error.go | 5 ++++ domain/consensus/test_consensus.go | 8 ++++++ .../consensus/utils/consensushashing/block.go | 5 ++++ .../calculate_signature_hash.go | 7 ++++++ .../utils/consensushashing/transaction.go | 7 ++++++ domain/consensus/utils/hashes/writers.go | 4 +++ domain/consensus/utils/mining/solve.go | 5 ++++ domain/consensus/utils/multiset/multiset.go | 5 ++++ .../consensus/utils/serialization/common.go | 5 ++++ .../consensus/utils/subnetworks/from_bytes.go | 4 +++ .../utils/testutils/op_true_script.go | 6 +++++ .../utils/txscript/reference_test.go | 5 ++++ domain/consensus/utils/txscript/sign.go | 5 ++++ domain/consensus/utils/txscript/sign_test.go | 4 +++ domain/consensus/utils/txscript/standard.go | 5 ++++ domain/consensus/utils/utxo/diff_algebra.go | 4 +++ .../utils/utxo/immutable_utxo_diff.go | 4 +++ .../consensus/utils/utxo/mutable_utxo_diff.go | 6 +++++ domain/consensus/utils/utxo/serialization.go | 6 +++++ domain/consensus/utils/utxo/utxo_iterator.go | 4 +++ .../utils/utxo/utxo_iterator_with_diff.go | 4 +++ domain/dagconfig/consensus_defaults.go | 5 ++++ domain/dagconfig/genesis.go | 9 +++++++ domain/domain.go | 10 ++++++++ domain/migrate.go | 4 +++ .../blocktemplatebuilder.go | 18 +++++++++++++ domain/miningmanager/factory.go | 8 ++++++ .../check_transaction_standard_test.go | 6 +++++ .../fill_inputs_and_get_missing_parents.go | 8 ++++++ domain/miningmanager/mempool/mempool.go | 10 ++++++++ domain/miningmanager/mempool/orphan_pool.go | 5 ++++ .../validate_and_insert_transaction.go | 6 +++++ .../mempool/validate_transaction.go | 6 +++++ domain/miningmanager/miningmanager_test.go | 25 +++++++++++++++++++ domain/utxoindex/serialization.go | 8 ++++++ domain/utxoindex/serialization_test.go | 6 +++++ domain/utxoindex/store.go | 7 ++++++ domain/utxoindex/utxoindex.go | 8 ++++++ infrastructure/config/config.go | 9 +++++++ infrastructure/config/network.go | 5 ++++ infrastructure/db/database/ldb/cursor.go | 4 +++ infrastructure/db/database/ldb/leveldb.go | 4 +++ infrastructure/db/database/ldb/transaction.go | 4 +++ .../network/addressmanager/addressmanager.go | 4 +++ .../addressmanager/localaddressmanager.go | 4 +++ .../network/addressmanager/store.go | 6 +++++ .../network/addressmanager/test_utils.go | 5 ++++ .../network/connmanager/connmanager.go | 5 ++++ .../network/netadapter/netadapter.go | 9 +++++++ .../network/netadapter/netconnection.go | 5 ++++ .../network/netadapter/router/route.go | 4 +++ .../network/netadapter/router/router.go | 4 +++ .../server/grpcserver/connection_loops.go | 4 +++ .../server/grpcserver/grpc_connection.go | 5 ++++ .../server/grpcserver/grpc_server.go | 5 ++++ .../netadapter/server/grpcserver/p2pserver.go | 6 +++++ .../server/grpcserver/protowire/common.go | 5 ++++ .../grpcserver/protowire/p2p_addresses.go | 4 +++ .../server/grpcserver/protowire/p2p_block.go | 4 +++ .../grpcserver/protowire/p2p_block_headers.go | 4 +++ .../grpcserver/protowire/p2p_block_locator.go | 5 ++++ .../protowire/p2p_block_with_trusted_data.go | 5 ++++ .../p2p_block_with_trusted_data_v4.go | 4 +++ .../p2p_done_blocks_with_trusted_data.go | 4 +++ .../grpcserver/protowire/p2p_done_headers.go | 4 +++ .../p2p_done_pruning_point_utxo_set_chunks.go | 4 +++ .../server/grpcserver/protowire/p2p_header.go | 6 +++++ .../grpcserver/protowire/p2p_ibd_block.go | 4 +++ .../protowire/p2p_ibd_block_locator.go | 4 +++ .../p2p_ibd_block_locator_highest_hash.go | 4 +++ ...bd_block_locator_highest_hash_not_found.go | 4 +++ .../protowire/p2p_ibd_chain_block_locator.go | 4 +++ .../protowire/p2p_inv_relay_block.go | 4 +++ .../protowire/p2p_inv_transactions.go | 4 +++ .../server/grpcserver/protowire/p2p_ping.go | 4 +++ .../server/grpcserver/protowire/p2p_pong.go | 4 +++ .../protowire/p2p_pruning_point_proof.go | 4 +++ .../p2p_pruning_point_utxo_set_chunk.go | 4 +++ .../protowire/p2p_pruning_points.go | 4 +++ .../server/grpcserver/protowire/p2p_ready.go | 4 +++ .../server/grpcserver/protowire/p2p_reject.go | 4 +++ .../protowire/p2p_request_addresses.go | 4 +++ .../protowire/p2p_request_anticone.go | 4 +++ .../protowire/p2p_request_block_locator.go | 4 +++ .../protowire/p2p_request_headers.go | 4 +++ .../protowire/p2p_request_ibd_blocks.go | 4 +++ .../p2p_request_ibd_chain_block_locator.go | 5 ++++ .../protowire/p2p_request_next_headers.go | 4 +++ ...t_pruning_point_and_its_anticone_blocks.go | 4 +++ ...quest_next_pruning_point_utxo_set_chunk.go | 4 +++ ..._request_pruning_point_and_its_anticone.go | 4 +++ .../p2p_request_pruning_point_proof.go | 4 +++ ...equest_pruning_point_utxo_set_and_block.go | 4 +++ .../protowire/p2p_request_relay_blocks.go | 4 +++ .../protowire/p2p_request_transactions.go | 4 +++ .../grpcserver/protowire/p2p_transaction.go | 4 +++ .../protowire/p2p_transaction_not_found.go | 4 +++ .../grpcserver/protowire/p2p_trusted_data.go | 4 +++ .../server/grpcserver/protowire/p2p_verack.go | 4 +++ .../grpcserver/protowire/p2p_version.go | 6 +++++ .../grpcserver/protowire/rpc_add_peer.go | 4 +++ .../server/grpcserver/protowire/rpc_ban.go | 4 +++ .../server/grpcserver/protowire/rpc_error.go | 4 +++ .../rpc_estimate_network_hashes_per_second.go | 4 +++ .../protowire/rpc_get_balance_by_address.go | 4 +++ .../rpc_get_balances_by_addresses.go | 4 +++ .../grpcserver/protowire/rpc_get_block.go | 4 +++ .../protowire/rpc_get_block_count.go | 4 +++ .../protowire/rpc_get_block_dag_info.go | 4 +++ .../protowire/rpc_get_block_template.go | 4 +++ .../grpcserver/protowire/rpc_get_blocks.go | 4 +++ .../protowire/rpc_get_connected_peer_info.go | 4 +++ .../protowire/rpc_get_current_network.go | 4 +++ .../grpcserver/protowire/rpc_get_headers.go | 4 +++ .../grpcserver/protowire/rpc_get_info.go | 4 +++ .../protowire/rpc_get_mempool_entries.go | 4 +++ .../rpc_get_mempool_entries_by_addresses.go | 4 +++ .../protowire/rpc_get_mempool_entry.go | 4 +++ .../protowire/rpc_get_peer_addresses.go | 4 +++ .../protowire/rpc_get_selected_tip_hash.go | 4 +++ .../protowire/rpc_get_subnetwork.go | 4 +++ .../grpcserver/protowire/rpc_get_supply.go | 4 +++ .../protowire/rpc_get_utxos_by_addresses.go | 4 +++ ..._get_virtual_selected_parent_blue_score.go | 4 +++ ...irtual_selected_parent_chain_from_block.go | 4 +++ .../protowire/rpc_notify_block_added.go | 4 +++ .../rpc_notify_finality_conflicts.go | 4 +++ .../rpc_notify_new_block_template.go | 4 +++ ..._notify_pruning_point_utxo_set_override.go | 4 +++ .../protowire/rpc_notify_utxos_changed.go | 4 +++ .../rpc_notify_virtual_daa_score_changed.go | 4 +++ ...tual_selected_parent_blue_score_changed.go | 4 +++ ...y_virtual_selected_parent_chain_changed.go | 4 +++ .../rpc_resolve_finality_conflict.go | 4 +++ .../grpcserver/protowire/rpc_shut_down.go | 4 +++ .../rpc_stop_notifying_utxos_changed.go | 4 +++ .../grpcserver/protowire/rpc_submit_block.go | 4 +++ .../protowire/rpc_submit_transaction.go | 4 +++ .../server/grpcserver/protowire/rpc_unban.go | 4 +++ .../server/grpcserver/protowire/wire.go | 4 +++ .../rpcclient/grpcclient/grpcclient.go | 7 ++++++ .../network/rpcclient/grpcclient/post.go | 5 ++++ .../network/rpcclient/rpc_on_block_added.go | 5 ++++ .../network/rpcclient/rpc_on_chain_changed.go | 5 ++++ .../rpcclient/rpc_on_finality_conflicts.go | 5 ++++ .../rpcclient/rpc_on_new_block_template.go | 5 ++++ .../rpc_on_pruning_point_utxo_set_override.go | 5 ++++ .../network/rpcclient/rpc_on_utxos_changed.go | 5 ++++ .../rpc_on_virtual_daa_score_changed.go | 5 ++++ ...tual_selected_parent_blue_score_changed.go | 5 ++++ infrastructure/network/rpcclient/rpcclient.go | 9 +++++++ .../application-level-garbage/read.go | 5 ++++ .../application-level-garbage/send.go | 8 ++++++ stability-tests/common/cmd.go | 5 ++++ stability-tests/common/mine/mine.go | 10 ++++++++ stability-tests/infra-level-garbage/send.go | 4 +++ stability-tests/kaspadsanity/commandloop.go | 5 ++++ stability-tests/kaspadsanity/main.go | 4 +++ stability-tests/many-tips/main.go | 7 ++++++ stability-tests/minejson/main.go | 9 +++++++ .../netsync/chain_generator/main.go | 5 ++++ .../netsync/check_resolve_virtual.go | 5 ++++ stability-tests/netsync/main.go | 6 +++++ stability-tests/netsync/node.go | 9 +++++++ stability-tests/orphans/check_top_is_tip.go | 6 +++++ stability-tests/orphans/prepare_blocks.go | 9 +++++++ stability-tests/orphans/send_blocks.go | 7 ++++++ stability-tests/rpc-idle-clients/main.go | 7 ++++++ stability-tests/rpc-stability/main.go | 7 ++++++ stability-tests/rpc-stability/send.go | 4 +++ stability-tests/simple-sync/main.go | 7 ++++++ stability-tests/simple-sync/mineloop.go | 7 ++++++ stability-tests/simple-sync/start-nodes.go | 5 ++++ util/amount.go | 4 +++ 378 files changed, 2154 insertions(+), 2 deletions(-) rename cmd/{kaspactl => zoomyctl}/README.md (100%) rename cmd/{kaspactl => zoomyctl}/command_parser.go (96%) rename cmd/{kaspactl => zoomyctl}/commands.go (100%) rename cmd/{kaspactl => zoomyctl}/config.go (92%) rename cmd/{kaspactl => zoomyctl}/docker/Dockerfile (64%) rename cmd/{kaspactl => zoomyctl}/main.go (95%) rename cmd/{kaspactl => zoomyctl}/reflection_helpers.go (100%) rename cmd/{kaspaminer => zoomyminer}/README.md (100%) rename cmd/{kaspaminer => zoomyminer}/client.go (82%) rename cmd/{kaspaminer => zoomyminer}/config.go (94%) rename cmd/{kaspaminer => zoomyminer}/docker/Dockerfile (60%) rename cmd/{kaspaminer => zoomyminer}/log.go (84%) rename cmd/{kaspaminer => zoomyminer}/main.go (100%) rename cmd/{kaspaminer => zoomyminer}/mineloop.go (91%) rename cmd/{kaspaminer => zoomyminer}/templatemanager/templatemanager.go (76%) rename cmd/{kaspawallet => zoomywallet}/balance.go (100%) rename cmd/{kaspawallet => zoomywallet}/broadcast.go (86%) rename cmd/{kaspawallet => zoomywallet}/common.go (100%) rename cmd/{kaspawallet => zoomywallet}/config.go (98%) rename cmd/{kaspawallet => zoomywallet}/create.go (89%) rename cmd/{kaspawallet => zoomywallet}/create_unsigned_tx.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/client/client.go (82%) rename cmd/{kaspawallet => zoomywallet}/daemon/pb/generate.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/pb/kaspawalletd.pb.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/pb/kaspawalletd.proto (94%) rename cmd/{kaspawallet => zoomywallet}/daemon/pb/kaspawalletd_grpc.pb.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/address.go (92%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/balance.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/broadcast.go (77%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/common.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/create_unsigned_transaction.go (91%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/external_spendable_utxos.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/log.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/rpc.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/send.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/server.go (89%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/shutdown.go (68%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/sign.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/split_transaction.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/split_transaction_test.go (100%) rename cmd/{kaspawallet => zoomywallet}/daemon/server/sync.go (97%) rename cmd/{kaspawallet => zoomywallet}/docker/Dockerfile (60%) rename cmd/{kaspawallet => zoomywallet}/dump_unencrypted_data.go (100%) rename cmd/{kaspawallet => zoomywallet}/keys/create.go (92%) rename cmd/{kaspawallet => zoomywallet}/keys/get_password.go (100%) rename cmd/{kaspawallet => zoomywallet}/keys/keys.go (97%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/base58/alphabet.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/base58/base58.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/base58/base58_test.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/base58/base58bench_test.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/base58/base58check.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/base58/base58check_test.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/base58/cov_report.sh (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/base58/doc.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/base58/example_test.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/bip32.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/bip32_test.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/child_key_derivation.go (99%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/extended_key.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/hash.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/path.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/serialization.go (95%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip32/version.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/bip39.go (89%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/converters.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/keychains.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/keypair.go (94%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/serialization/protoserialization/generate.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/serialization/protoserialization/wallet.pb.go (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/serialization/protoserialization/wallet.proto (100%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/serialization/serialization.go (96%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/sign.go (84%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/transaction.go (93%) rename cmd/{kaspawallet => zoomywallet}/libkaspawallet/transaction_test.go (98%) rename cmd/{kaspawallet => zoomywallet}/main.go (100%) rename cmd/{kaspawallet => zoomywallet}/new_address.go (83%) rename cmd/{kaspawallet => zoomywallet}/parse.go (87%) rename cmd/{kaspawallet => zoomywallet}/send.go (88%) rename cmd/{kaspawallet => zoomywallet}/show_addresses.go (88%) rename cmd/{kaspawallet => zoomywallet}/sign.go (91%) rename cmd/{kaspawallet => zoomywallet}/start_daemon.go (100%) rename cmd/{kaspawallet => zoomywallet}/sweep.go (87%) rename cmd/{kaspawallet => zoomywallet}/transactions_hex_encoding.go (100%) rename cmd/{kaspawallet => zoomywallet}/utils/format_kas.go (100%) rename cmd/{kaspawallet => zoomywallet}/utils/readline.go (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c3dae6ae0..968659c51 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,11 @@ Any contribution to Zoomyd is very welcome. ## Getting started +<<<<<<< Updated upstream If you want to start contributing to Zoomyd and don't know where to start, you can pick an issue from +======= +If you want to start contributing to Kaspad and don't know where to start, you can pick an issue from +>>>>>>> Stashed changes the [list](https://github.com/zoomy-network/zoomyd/issues). If you want to make a big change it's better to discuss it first by opening an issue or talk about it in diff --git a/app/appmessage/domainconverters.go b/app/appmessage/domainconverters.go index 2e6583bd5..528cbaaa8 100644 --- a/app/appmessage/domainconverters.go +++ b/app/appmessage/domainconverters.go @@ -2,13 +2,21 @@ package appmessage import ( "encoding/hex" - "github.com/pkg/errors" "math/big" +<<<<<<< Updated upstream + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + +======= + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionid" diff --git a/app/appmessage/p2p_msgblock_test.go b/app/appmessage/p2p_msgblock_test.go index eec84e21e..b071e2fa3 100644 --- a/app/appmessage/p2p_msgblock_test.go +++ b/app/appmessage/p2p_msgblock_test.go @@ -5,14 +5,25 @@ package appmessage import ( +<<<<<<< Updated upstream "github.com/davecgh/go-spew/spew" "github.com/zoomy-network/zoomyd/util/mstime" +======= +>>>>>>> Stashed changes "math" "reflect" "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" +======= + "github.com/davecgh/go-spew/spew" + "github.com/zoomy-network/zoomyd/util/mstime" + + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) diff --git a/app/appmessage/p2p_msgblockwithtrusteddata.go b/app/appmessage/p2p_msgblockwithtrusteddata.go index 8149b4167..a058a453b 100644 --- a/app/appmessage/p2p_msgblockwithtrusteddata.go +++ b/app/appmessage/p2p_msgblockwithtrusteddata.go @@ -1,8 +1,13 @@ package appmessage import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "math/big" + + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // MsgBlockWithTrustedData represents a kaspa BlockWithTrustedData message diff --git a/app/protocol/common/common.go b/app/protocol/common/common.go index b5ef8a124..b61745dfe 100644 --- a/app/protocol/common/common.go +++ b/app/protocol/common/common.go @@ -1,10 +1,16 @@ package common import ( +<<<<<<< Updated upstream peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "time" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" + "github.com/pkg/errors" ) diff --git a/app/protocol/flowcontext/blocks.go b/app/protocol/flowcontext/blocks.go index a4faaed66..2d13dfd53 100644 --- a/app/protocol/flowcontext/blocks.go +++ b/app/protocol/flowcontext/blocks.go @@ -3,12 +3,20 @@ package flowcontext import ( "time" +<<<<<<< Updated upstream peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/app/appmessage" ) diff --git a/app/protocol/flowcontext/network.go b/app/protocol/flowcontext/network.go index 90fd6dff7..888ae36a4 100644 --- a/app/protocol/flowcontext/network.go +++ b/app/protocol/flowcontext/network.go @@ -1,12 +1,20 @@ package flowcontext import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/infrastructure/network/connmanager" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/common" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/infrastructure/network/connmanager" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" ) // NetAdapter returns the net adapter that is associated to the flow context. diff --git a/app/protocol/flowcontext/orphans.go b/app/protocol/flowcontext/orphans.go index 090acbf50..5be04d7ea 100644 --- a/app/protocol/flowcontext/orphans.go +++ b/app/protocol/flowcontext/orphans.go @@ -1,12 +1,20 @@ package flowcontext import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) // maxOrphans is the maximum amount of orphans allowed in the diff --git a/app/protocol/flows/handshake/handshake.go b/app/protocol/flows/handshake/handshake.go index 98f4b2046..809740d16 100644 --- a/app/protocol/flows/handshake/handshake.go +++ b/app/protocol/flows/handshake/handshake.go @@ -12,10 +12,16 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/config" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // HandleHandshakeContext is the interface for the context needed for the HandleHandshake flow. diff --git a/app/protocol/flows/handshake/receiveversion.go b/app/protocol/flows/handshake/receiveversion.go index 2df2ba6eb..b2390b96a 100644 --- a/app/protocol/flows/handshake/receiveversion.go +++ b/app/protocol/flows/handshake/receiveversion.go @@ -1,13 +1,22 @@ package handshake import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/common" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) var ( diff --git a/app/protocol/flows/handshake/sendversion.go b/app/protocol/flows/handshake/sendversion.go index b5e27c67f..26fcda657 100644 --- a/app/protocol/flows/handshake/sendversion.go +++ b/app/protocol/flows/handshake/sendversion.go @@ -1,13 +1,22 @@ package handshake import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/zoomy-network/zoomyd/version" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/common" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" + "github.com/zoomy-network/zoomyd/version" ) var ( diff --git a/app/protocol/flows/ready/ready.go b/app/protocol/flows/ready/ready.go index 03d9e96ad..31935f751 100644 --- a/app/protocol/flows/ready/ready.go +++ b/app/protocol/flows/ready/ready.go @@ -1,6 +1,7 @@ package ready import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" "sync/atomic" @@ -8,7 +9,17 @@ import ( peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= + "sync/atomic" + + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/common" + +>>>>>>> Stashed changes "github.com/pkg/errors" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // HandleReady notify the other peer that peer is ready for messages, and wait for the other peer diff --git a/app/protocol/flows/v5/blockrelay/batch_size_test.go b/app/protocol/flows/v5/blockrelay/batch_size_test.go index 0b5eb79a9..095013d44 100644 --- a/app/protocol/flows/v5/blockrelay/batch_size_test.go +++ b/app/protocol/flows/v5/blockrelay/batch_size_test.go @@ -1,8 +1,13 @@ package blockrelay import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "testing" + + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) func TestIBDBatchSizeLessThanRouteCapacity(t *testing.T) { diff --git a/app/protocol/flows/v5/blockrelay/handle_ibd_block_requests.go b/app/protocol/flows/v5/blockrelay/handle_ibd_block_requests.go index 457876b95..e990d84ea 100644 --- a/app/protocol/flows/v5/blockrelay/handle_ibd_block_requests.go +++ b/app/protocol/flows/v5/blockrelay/handle_ibd_block_requests.go @@ -1,11 +1,18 @@ package blockrelay import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" "github.com/zoomy-network/zoomyd/domain" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // HandleIBDBlockRequestsContext is the interface for the context needed for the HandleIBDBlockRequests flow. diff --git a/app/protocol/flows/v5/blockrelay/handle_ibd_request_chain_block_locator.go b/app/protocol/flows/v5/blockrelay/handle_ibd_request_chain_block_locator.go index d5c1ffaff..a763c93e2 100644 --- a/app/protocol/flows/v5/blockrelay/handle_ibd_request_chain_block_locator.go +++ b/app/protocol/flows/v5/blockrelay/handle_ibd_request_chain_block_locator.go @@ -1,13 +1,22 @@ package blockrelay import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" "github.com/zoomy-network/zoomyd/domain" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RequestIBDChainBlockLocatorContext is the interface for the context needed for the HandleRequestBlockLocator flow. diff --git a/app/protocol/flows/v5/blockrelay/handle_pruning_point_and_its_anticone_requests.go b/app/protocol/flows/v5/blockrelay/handle_pruning_point_and_its_anticone_requests.go index 720edf764..0f83d6245 100644 --- a/app/protocol/flows/v5/blockrelay/handle_pruning_point_and_its_anticone_requests.go +++ b/app/protocol/flows/v5/blockrelay/handle_pruning_point_and_its_anticone_requests.go @@ -1,6 +1,7 @@ package blockrelay import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" @@ -8,7 +9,17 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/config" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "sync/atomic" + + "github.com/zoomy-network/zoomyd/app/appmessage" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/config" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // PruningPointAndItsAnticoneRequestsContext is the interface for the context needed for the HandlePruningPointAndItsAnticoneRequests flow. diff --git a/app/protocol/flows/v5/blockrelay/handle_relay_block_requests.go b/app/protocol/flows/v5/blockrelay/handle_relay_block_requests.go index 164694187..fae0f052a 100644 --- a/app/protocol/flows/v5/blockrelay/handle_relay_block_requests.go +++ b/app/protocol/flows/v5/blockrelay/handle_relay_block_requests.go @@ -1,12 +1,20 @@ package blockrelay import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" "github.com/zoomy-network/zoomyd/domain" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RelayBlockRequestsContext is the interface for the context needed for the HandleRelayBlockRequests flow. diff --git a/app/protocol/flows/v5/blockrelay/handle_relay_invs.go b/app/protocol/flows/v5/blockrelay/handle_relay_invs.go index cbadda46a..440ff8f56 100644 --- a/app/protocol/flows/v5/blockrelay/handle_relay_invs.go +++ b/app/protocol/flows/v5/blockrelay/handle_relay_invs.go @@ -1,6 +1,7 @@ package blockrelay import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" @@ -14,7 +15,22 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" "github.com/zoomy-network/zoomyd/infrastructure/config" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/common" + "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" + "github.com/zoomy-network/zoomyd/infrastructure/config" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // orphanResolutionRange is the maximum amount of blockLocator hashes diff --git a/app/protocol/flows/v5/blockrelay/handle_request_anticone.go b/app/protocol/flows/v5/blockrelay/handle_request_anticone.go index 3bf5bc596..517c2a3da 100644 --- a/app/protocol/flows/v5/blockrelay/handle_request_anticone.go +++ b/app/protocol/flows/v5/blockrelay/handle_request_anticone.go @@ -1,6 +1,7 @@ package blockrelay import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" @@ -8,7 +9,17 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/config" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "sort" + + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/config" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RequestAnticoneContext is the interface for the context needed for the HandleRequestHeaders flow. diff --git a/app/protocol/flows/v5/blockrelay/handle_request_pruning_point_utxo_set.go b/app/protocol/flows/v5/blockrelay/handle_request_pruning_point_utxo_set.go index e9a472b13..66563b409 100644 --- a/app/protocol/flows/v5/blockrelay/handle_request_pruning_point_utxo_set.go +++ b/app/protocol/flows/v5/blockrelay/handle_request_pruning_point_utxo_set.go @@ -2,6 +2,10 @@ package blockrelay import ( "errors" +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" diff --git a/app/protocol/flows/v5/blockrelay/ibd.go b/app/protocol/flows/v5/blockrelay/ibd.go index 7b03b874a..d4b3b6b8e 100644 --- a/app/protocol/flows/v5/blockrelay/ibd.go +++ b/app/protocol/flows/v5/blockrelay/ibd.go @@ -2,6 +2,7 @@ package blockrelay import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" @@ -14,7 +15,22 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/pkg/errors" +======= +>>>>>>> Stashed changes "time" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/common" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/infrastructure/config" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // IBDContext is the interface for the context needed for the HandleIBD flow. diff --git a/app/protocol/flows/v5/blockrelay/ibd_with_headers_proof.go b/app/protocol/flows/v5/blockrelay/ibd_with_headers_proof.go index 7cfdc202f..c4a88fbc6 100644 --- a/app/protocol/flows/v5/blockrelay/ibd_with_headers_proof.go +++ b/app/protocol/flows/v5/blockrelay/ibd_with_headers_proof.go @@ -2,6 +2,7 @@ package blockrelay import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" @@ -9,7 +10,17 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/pkg/errors" +======= +>>>>>>> Stashed changes "time" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/common" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" ) func (flow *handleIBDFlow) ibdWithHeadersProof( diff --git a/app/protocol/flows/v5/ping/send.go b/app/protocol/flows/v5/ping/send.go index 59548ae35..ba3959556 100644 --- a/app/protocol/flows/v5/ping/send.go +++ b/app/protocol/flows/v5/ping/send.go @@ -1,11 +1,20 @@ package ping import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/protocol/common" "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" "github.com/pkg/errors" "time" +======= + "time" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/protocol/common" + "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/app/appmessage" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" diff --git a/app/protocol/flows/v5/testing/common_test.go b/app/protocol/flows/v5/testing/common_test.go index 191993550..faceba792 100644 --- a/app/protocol/flows/v5/testing/common_test.go +++ b/app/protocol/flows/v5/testing/common_test.go @@ -4,8 +4,12 @@ import ( "strings" "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" ) func checkFlowError(t *testing.T, err error, isProtocolError bool, shouldBan bool, contains string) { diff --git a/app/protocol/flows/v5/testing/receiveaddresses_test.go b/app/protocol/flows/v5/testing/receiveaddresses_test.go index fca818aea..c307c1e7f 100644 --- a/app/protocol/flows/v5/testing/receiveaddresses_test.go +++ b/app/protocol/flows/v5/testing/receiveaddresses_test.go @@ -1,10 +1,18 @@ package testing import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/protocol/flows/v5/addressexchange" "testing" "time" +======= + "testing" + "time" + + "github.com/zoomy-network/zoomyd/app/protocol/flows/v5/addressexchange" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/app/appmessage" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/domain/consensus" diff --git a/app/protocol/flows/v5/transactionrelay/handle_relayed_transactions.go b/app/protocol/flows/v5/transactionrelay/handle_relayed_transactions.go index f182b126f..55d222cb9 100644 --- a/app/protocol/flows/v5/transactionrelay/handle_relayed_transactions.go +++ b/app/protocol/flows/v5/transactionrelay/handle_relayed_transactions.go @@ -1,6 +1,7 @@ package transactionrelay import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" @@ -11,7 +12,19 @@ import ( "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/common" + "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // TransactionsRelayContext is the interface for the context needed for the diff --git a/app/protocol/flows/v5/transactionrelay/handle_relayed_transactions_test.go b/app/protocol/flows/v5/transactionrelay/handle_relayed_transactions_test.go index 946508cb5..369c22e07 100644 --- a/app/protocol/flows/v5/transactionrelay/handle_relayed_transactions_test.go +++ b/app/protocol/flows/v5/transactionrelay/handle_relayed_transactions_test.go @@ -2,6 +2,7 @@ package transactionrelay_test import ( "errors" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" "github.com/zoomy-network/zoomyd/app/protocol/flows/v5/transactionrelay" "strings" @@ -16,6 +17,23 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/panics" +======= + "strings" + "testing" + + "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" + "github.com/zoomy-network/zoomyd/app/protocol/flows/v5/transactionrelay" + + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/panics" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/infrastructure/config" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" diff --git a/app/protocol/flows/v5/transactionrelay/handle_requested_transactions_test.go b/app/protocol/flows/v5/transactionrelay/handle_requested_transactions_test.go index 1b03b2314..5e4acdbc3 100644 --- a/app/protocol/flows/v5/transactionrelay/handle_requested_transactions_test.go +++ b/app/protocol/flows/v5/transactionrelay/handle_requested_transactions_test.go @@ -1,6 +1,7 @@ package transactionrelay_test import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" "github.com/zoomy-network/zoomyd/app/protocol/flows/v5/transactionrelay" "testing" @@ -16,7 +17,25 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/zoomy-network/zoomyd/util/panics" +======= + "testing" + + "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" + "github.com/zoomy-network/zoomyd/app/protocol/flows/v5/transactionrelay" + +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" + "github.com/zoomy-network/zoomyd/infrastructure/config" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" + "github.com/zoomy-network/zoomyd/util/panics" ) // TestHandleRequestedTransactionsNotFound tests the flow of HandleRequestedTransactions diff --git a/app/protocol/protocol.go b/app/protocol/protocol.go index 74817394f..656d994ab 100644 --- a/app/protocol/protocol.go +++ b/app/protocol/protocol.go @@ -1,6 +1,7 @@ package protocol import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/protocol/common" "github.com/zoomy-network/zoomyd/app/protocol/flows/ready" "github.com/zoomy-network/zoomyd/app/protocol/flows/v5" @@ -15,7 +16,24 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/network/connmanager" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= + "sync" + "sync/atomic" + + "github.com/zoomy-network/zoomyd/app/protocol/common" + "github.com/zoomy-network/zoomyd/app/protocol/flows/ready" + v5 "github.com/zoomy-network/zoomyd/app/protocol/flows/v5" + +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/flows/handshake" + peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/infrastructure/network/addressmanager" + "github.com/zoomy-network/zoomyd/infrastructure/network/connmanager" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) func (m *Manager) routerInitializer(router *routerpkg.Router, netConnection *netadapter.NetConnection) { diff --git a/app/protocol/protocolerrors/protocolerrors.go b/app/protocol/protocolerrors/protocolerrors.go index 5c8ec7796..618b4db83 100644 --- a/app/protocol/protocolerrors/protocolerrors.go +++ b/app/protocol/protocolerrors/protocolerrors.go @@ -1,8 +1,12 @@ package protocolerrors import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" ) // ProtocolError is an error that signifies a violation diff --git a/app/rpc/manager.go b/app/rpc/manager.go index bb3228d44..35ab2f914 100644 --- a/app/rpc/manager.go +++ b/app/rpc/manager.go @@ -1,6 +1,7 @@ package rpc import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol" "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" @@ -12,7 +13,20 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/network/addressmanager" "github.com/zoomy-network/zoomyd/infrastructure/network/connmanager" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol" + "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/utxoindex" + "github.com/zoomy-network/zoomyd/infrastructure/config" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/infrastructure/network/addressmanager" + "github.com/zoomy-network/zoomyd/infrastructure/network/connmanager" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" ) // Manager is an RPC manager diff --git a/app/rpc/rpc.go b/app/rpc/rpc.go index 423ce441f..b63f1eacf 100644 --- a/app/rpc/rpc.go +++ b/app/rpc/rpc.go @@ -1,12 +1,20 @@ package rpc import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" "github.com/zoomy-network/zoomyd/app/rpc/rpchandlers" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" + "github.com/zoomy-network/zoomyd/app/rpc/rpchandlers" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) type handler func(context *rpccontext.Context, router *router.Router, request appmessage.Message) (appmessage.Message, error) diff --git a/app/rpc/rpccontext/notificationmanager.go b/app/rpc/rpccontext/notificationmanager.go index 7e835635e..19141715b 100644 --- a/app/rpc/rpccontext/notificationmanager.go +++ b/app/rpc/rpccontext/notificationmanager.go @@ -8,10 +8,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/utxoindex" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain/utxoindex" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // NotificationManager manages notifications for the RPC diff --git a/app/rpc/rpccontext/utxos_by_addresses.go b/app/rpc/rpccontext/utxos_by_addresses.go index 960299a62..b962e49e5 100644 --- a/app/rpc/rpccontext/utxos_by_addresses.go +++ b/app/rpc/rpccontext/utxos_by_addresses.go @@ -2,10 +2,18 @@ package rpccontext import ( "encoding/hex" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" "github.com/zoomy-network/zoomyd/util" "github.com/pkg/errors" +======= + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" + "github.com/zoomy-network/zoomyd/util" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/utxoindex" ) diff --git a/app/rpc/rpccontext/verbosedata.go b/app/rpc/rpccontext/verbosedata.go index 09b166444..94974f5e4 100644 --- a/app/rpc/rpccontext/verbosedata.go +++ b/app/rpc/rpccontext/verbosedata.go @@ -5,8 +5,12 @@ import ( "math" "math/big" +<<<<<<< Updated upstream difficultyPackage "github.com/zoomy-network/zoomyd/util/difficulty" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + difficultyPackage "github.com/zoomy-network/zoomyd/util/difficulty" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" diff --git a/app/rpc/rpchandlers/ban.go b/app/rpc/rpchandlers/ban.go index f841c4ae2..1f32a0675 100644 --- a/app/rpc/rpchandlers/ban.go +++ b/app/rpc/rpchandlers/ban.go @@ -1,10 +1,17 @@ package rpchandlers import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "net" + + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // HandleBan handles the respectively named RPC command diff --git a/app/rpc/rpchandlers/get_balance_by_address.go b/app/rpc/rpchandlers/get_balance_by_address.go index 66eb622e2..02c3ebb59 100644 --- a/app/rpc/rpchandlers/get_balance_by_address.go +++ b/app/rpc/rpchandlers/get_balance_by_address.go @@ -1,12 +1,20 @@ package rpchandlers import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/zoomy-network/zoomyd/util" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" + "github.com/zoomy-network/zoomyd/util" ) // HandleGetBalanceByAddress handles the respectively named RPC command diff --git a/app/rpc/rpchandlers/get_balances_by_addresses.go b/app/rpc/rpchandlers/get_balances_by_addresses.go index 5180f28f1..19166a37b 100644 --- a/app/rpc/rpchandlers/get_balances_by_addresses.go +++ b/app/rpc/rpchandlers/get_balances_by_addresses.go @@ -1,10 +1,16 @@ package rpchandlers import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // HandleGetBalancesByAddresses handles the respectively named RPC command diff --git a/app/rpc/rpchandlers/get_block.go b/app/rpc/rpchandlers/get_block.go index 9dd711a98..421b927fe 100644 --- a/app/rpc/rpchandlers/get_block.go +++ b/app/rpc/rpchandlers/get_block.go @@ -1,11 +1,18 @@ package rpchandlers import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // HandleGetBlock handles the respectively named RPC command diff --git a/app/rpc/rpchandlers/submit_block.go b/app/rpc/rpchandlers/submit_block.go index e8c40ed8a..7a03e0cf0 100644 --- a/app/rpc/rpchandlers/submit_block.go +++ b/app/rpc/rpchandlers/submit_block.go @@ -2,13 +2,23 @@ package rpchandlers import ( "encoding/json" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= + +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" + "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // HandleSubmitBlock handles the respectively named RPC command diff --git a/app/rpc/rpchandlers/submit_transaction.go b/app/rpc/rpchandlers/submit_transaction.go index 43012c53b..62872ddde 100644 --- a/app/rpc/rpchandlers/submit_transaction.go +++ b/app/rpc/rpchandlers/submit_transaction.go @@ -1,12 +1,20 @@ package rpchandlers import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // HandleSubmitTransaction handles the respectively named RPC command diff --git a/app/rpc/rpchandlers/unban.go b/app/rpc/rpchandlers/unban.go index 4cd7580a0..a9ef00cee 100644 --- a/app/rpc/rpchandlers/unban.go +++ b/app/rpc/rpchandlers/unban.go @@ -1,10 +1,17 @@ package rpchandlers import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "net" + + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/rpc/rpccontext" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // HandleUnban handles the respectively named RPC command diff --git a/cmd/genkeypair/main.go b/cmd/genkeypair/main.go index 7f0253c33..4c5a20269 100644 --- a/cmd/genkeypair/main.go +++ b/cmd/genkeypair/main.go @@ -2,6 +2,10 @@ package main import ( "fmt" +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" "github.com/zoomy-network/zoomyd/util" ) diff --git a/cmd/kaspactl/README.md b/cmd/zoomyctl/README.md similarity index 100% rename from cmd/kaspactl/README.md rename to cmd/zoomyctl/README.md diff --git a/cmd/kaspactl/command_parser.go b/cmd/zoomyctl/command_parser.go similarity index 96% rename from cmd/kaspactl/command_parser.go rename to cmd/zoomyctl/command_parser.go index 37c510890..379d38058 100644 --- a/cmd/kaspactl/command_parser.go +++ b/cmd/zoomyctl/command_parser.go @@ -8,8 +8,12 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" +<<<<<<< Updated upstream:cmd/kaspactl/command_parser.go "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" +======= +>>>>>>> Stashed changes:cmd/zoomyctl/command_parser.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" ) func parseCommand(args []string, commandDescs []*commandDescription) (*protowire.ZoomydMessage, error) { diff --git a/cmd/kaspactl/commands.go b/cmd/zoomyctl/commands.go similarity index 100% rename from cmd/kaspactl/commands.go rename to cmd/zoomyctl/commands.go diff --git a/cmd/kaspactl/config.go b/cmd/zoomyctl/config.go similarity index 92% rename from cmd/kaspactl/config.go rename to cmd/zoomyctl/config.go index 19b2c2d44..03e11f36a 100644 --- a/cmd/kaspactl/config.go +++ b/cmd/zoomyctl/config.go @@ -2,8 +2,12 @@ package main import ( "github.com/jessevdk/go-flags" +<<<<<<< Updated upstream:cmd/kaspactl/config.go "github.com/zoomy-network/zoomyd/infrastructure/config" +======= +>>>>>>> Stashed changes:cmd/zoomyctl/config.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/config" ) var ( diff --git a/cmd/kaspactl/docker/Dockerfile b/cmd/zoomyctl/docker/Dockerfile similarity index 64% rename from cmd/kaspactl/docker/Dockerfile rename to cmd/zoomyctl/docker/Dockerfile index d93ddd6d8..00c8e7bbf 100644 --- a/cmd/kaspactl/docker/Dockerfile +++ b/cmd/zoomyctl/docker/Dockerfile @@ -14,7 +14,11 @@ RUN go mod download COPY . . +<<<<<<< Updated upstream:cmd/kaspactl/docker/Dockerfile WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/zoomyctl +======= +WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/kaspactl +>>>>>>> Stashed changes:cmd/zoomyctl/docker/Dockerfile RUN GOOS=linux go build -a -installsuffix cgo -o zoomyctl . @@ -24,7 +28,11 @@ WORKDIR /app RUN apk add --no-cache ca-certificates tini +<<<<<<< Updated upstream:cmd/kaspactl/docker/Dockerfile COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/zoomyctl/zoomyctl /app/ +======= +COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/kaspactl/kaspactl /app/ +>>>>>>> Stashed changes:cmd/zoomyctl/docker/Dockerfile USER nobody ENTRYPOINT [ "/sbin/tini", "--" ] diff --git a/cmd/kaspactl/main.go b/cmd/zoomyctl/main.go similarity index 95% rename from cmd/kaspactl/main.go rename to cmd/zoomyctl/main.go index d7ae04084..ae3f168fd 100644 --- a/cmd/kaspactl/main.go +++ b/cmd/zoomyctl/main.go @@ -2,10 +2,18 @@ package main import ( "fmt" +<<<<<<< Updated upstream:cmd/kaspactl/main.go "github.com/zoomy-network/zoomyd/version" "os" "time" +======= + "os" + "time" + + "github.com/zoomy-network/zoomyd/version" + +>>>>>>> Stashed changes:cmd/zoomyctl/main.go "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" "github.com/pkg/errors" diff --git a/cmd/kaspactl/reflection_helpers.go b/cmd/zoomyctl/reflection_helpers.go similarity index 100% rename from cmd/kaspactl/reflection_helpers.go rename to cmd/zoomyctl/reflection_helpers.go diff --git a/cmd/kaspaminer/README.md b/cmd/zoomyminer/README.md similarity index 100% rename from cmd/kaspaminer/README.md rename to cmd/zoomyminer/README.md diff --git a/cmd/kaspaminer/client.go b/cmd/zoomyminer/client.go similarity index 82% rename from cmd/kaspaminer/client.go rename to cmd/zoomyminer/client.go index 2060ef3bd..dc4f6d18b 100644 --- a/cmd/kaspaminer/client.go +++ b/cmd/zoomyminer/client.go @@ -1,11 +1,19 @@ package main import ( +<<<<<<< Updated upstream:cmd/kaspaminer/client.go "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient" "github.com/pkg/errors" +======= +>>>>>>> Stashed changes:cmd/zoomyminer/client.go "time" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient" ) const minerTimeout = 10 * time.Second diff --git a/cmd/kaspaminer/config.go b/cmd/zoomyminer/config.go similarity index 94% rename from cmd/kaspaminer/config.go rename to cmd/zoomyminer/config.go index 87c657c6f..44f3c8ec1 100644 --- a/cmd/kaspaminer/config.go +++ b/cmd/zoomyminer/config.go @@ -9,8 +9,12 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/config" +<<<<<<< Updated upstream:cmd/kaspaminer/config.go "github.com/zoomy-network/zoomyd/util" +======= +>>>>>>> Stashed changes:cmd/zoomyminer/config.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/util" "github.com/jessevdk/go-flags" "github.com/zoomy-network/zoomyd/version" diff --git a/cmd/kaspaminer/docker/Dockerfile b/cmd/zoomyminer/docker/Dockerfile similarity index 60% rename from cmd/kaspaminer/docker/Dockerfile rename to cmd/zoomyminer/docker/Dockerfile index 5c9e0f356..08740e4e5 100644 --- a/cmd/kaspaminer/docker/Dockerfile +++ b/cmd/zoomyminer/docker/Dockerfile @@ -14,8 +14,13 @@ RUN go mod download COPY . . +<<<<<<< Updated upstream:cmd/kaspaminer/docker/Dockerfile WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/zoomyminer RUN GOOS=linux go build -a -installsuffix cgo -o zoomyminer . +======= +WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/kaspaminer +RUN GOOS=linux go build -a -installsuffix cgo -o kaspaminer . +>>>>>>> Stashed changes:cmd/zoomyminer/docker/Dockerfile # --- multistage docker build: stage #2: runtime image FROM alpine @@ -23,7 +28,11 @@ WORKDIR /app RUN apk add --no-cache ca-certificates tini +<<<<<<< Updated upstream:cmd/kaspaminer/docker/Dockerfile COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/zoomyminer/zoomyminer /app/ +======= +COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/kaspaminer/kaspaminer /app/ +>>>>>>> Stashed changes:cmd/zoomyminer/docker/Dockerfile USER nobody ENTRYPOINT [ "/sbin/tini", "--" ] diff --git a/cmd/kaspaminer/log.go b/cmd/zoomyminer/log.go similarity index 84% rename from cmd/kaspaminer/log.go rename to cmd/zoomyminer/log.go index 9e663b765..51de1405a 100644 --- a/cmd/kaspaminer/log.go +++ b/cmd/zoomyminer/log.go @@ -2,9 +2,15 @@ package main import ( "fmt" +<<<<<<< Updated upstream:cmd/kaspaminer/log.go "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/panics" +======= +>>>>>>> Stashed changes:cmd/zoomyminer/log.go "os" + + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/panics" ) var ( diff --git a/cmd/kaspaminer/main.go b/cmd/zoomyminer/main.go similarity index 100% rename from cmd/kaspaminer/main.go rename to cmd/zoomyminer/main.go diff --git a/cmd/kaspaminer/mineloop.go b/cmd/zoomyminer/mineloop.go similarity index 91% rename from cmd/kaspaminer/mineloop.go rename to cmd/zoomyminer/mineloop.go index f881571b4..323f9de09 100644 --- a/cmd/kaspaminer/mineloop.go +++ b/cmd/zoomyminer/mineloop.go @@ -2,11 +2,15 @@ package main import ( nativeerrors "errors" +<<<<<<< Updated upstream:cmd/kaspaminer/mineloop.go "github.com/zoomy-network/zoomyd/version" +======= +>>>>>>> Stashed changes:cmd/zoomyminer/mineloop.go "math/rand" "sync/atomic" "time" +<<<<<<< Updated upstream:cmd/kaspaminer/mineloop.go "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/cmd/zoomyminer/templatemanager" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" @@ -14,7 +18,18 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/pow" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/zoomy-network/zoomyd/util" +======= + "github.com/zoomy-network/zoomyd/version" + +>>>>>>> Stashed changes:cmd/zoomyminer/mineloop.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/cmd/zoomyminer/templatemanager" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/pow" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" + "github.com/zoomy-network/zoomyd/util" ) var hashesTried uint64 diff --git a/cmd/kaspaminer/templatemanager/templatemanager.go b/cmd/zoomyminer/templatemanager/templatemanager.go similarity index 76% rename from cmd/kaspaminer/templatemanager/templatemanager.go rename to cmd/zoomyminer/templatemanager/templatemanager.go index 38aaf1bc9..2d1613090 100644 --- a/cmd/kaspaminer/templatemanager/templatemanager.go +++ b/cmd/zoomyminer/templatemanager/templatemanager.go @@ -1,10 +1,17 @@ package templatemanager import ( +<<<<<<< Updated upstream:cmd/kaspaminer/templatemanager/templatemanager.go "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/pow" +======= +>>>>>>> Stashed changes:cmd/zoomyminer/templatemanager/templatemanager.go "sync" + + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/pow" ) var currentTemplate *externalapi.DomainBlock diff --git a/cmd/kaspawallet/balance.go b/cmd/zoomywallet/balance.go similarity index 100% rename from cmd/kaspawallet/balance.go rename to cmd/zoomywallet/balance.go diff --git a/cmd/kaspawallet/broadcast.go b/cmd/zoomywallet/broadcast.go similarity index 86% rename from cmd/kaspawallet/broadcast.go rename to cmd/zoomywallet/broadcast.go index 2cd0a1818..0b2f8ab9f 100644 --- a/cmd/kaspawallet/broadcast.go +++ b/cmd/zoomywallet/broadcast.go @@ -6,9 +6,14 @@ import ( "io/ioutil" "strings" +<<<<<<< Updated upstream:cmd/kaspawallet/broadcast.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/broadcast.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" ) func broadcast(conf *broadcastConfig) error { diff --git a/cmd/kaspawallet/common.go b/cmd/zoomywallet/common.go similarity index 100% rename from cmd/kaspawallet/common.go rename to cmd/zoomywallet/common.go diff --git a/cmd/kaspawallet/config.go b/cmd/zoomywallet/config.go similarity index 98% rename from cmd/kaspawallet/config.go rename to cmd/zoomywallet/config.go index 6da1e2ffe..bebd4f096 100644 --- a/cmd/kaspawallet/config.go +++ b/cmd/zoomywallet/config.go @@ -3,8 +3,12 @@ package main import ( "os" +<<<<<<< Updated upstream:cmd/kaspawallet/config.go "github.com/zoomy-network/zoomyd/infrastructure/config" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/config.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/config" "github.com/jessevdk/go-flags" ) diff --git a/cmd/kaspawallet/create.go b/cmd/zoomywallet/create.go similarity index 89% rename from cmd/kaspawallet/create.go rename to cmd/zoomywallet/create.go index bcc406a86..e712dce45 100644 --- a/cmd/kaspawallet/create.go +++ b/cmd/zoomywallet/create.go @@ -5,10 +5,16 @@ import ( "fmt" "os" +<<<<<<< Updated upstream:cmd/kaspawallet/create.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/create.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys" ) diff --git a/cmd/kaspawallet/create_unsigned_tx.go b/cmd/zoomywallet/create_unsigned_tx.go similarity index 100% rename from cmd/kaspawallet/create_unsigned_tx.go rename to cmd/zoomywallet/create_unsigned_tx.go diff --git a/cmd/kaspawallet/daemon/client/client.go b/cmd/zoomywallet/daemon/client/client.go similarity index 82% rename from cmd/kaspawallet/daemon/client/client.go rename to cmd/zoomywallet/daemon/client/client.go index 02870fd11..3551aeecf 100644 --- a/cmd/kaspawallet/daemon/client/client.go +++ b/cmd/zoomywallet/daemon/client/client.go @@ -2,9 +2,14 @@ package client import ( "context" +<<<<<<< Updated upstream:cmd/kaspawallet/daemon/client/client.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/server" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/daemon/client/client.go "time" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/server" + "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" diff --git a/cmd/kaspawallet/daemon/pb/generate.go b/cmd/zoomywallet/daemon/pb/generate.go similarity index 100% rename from cmd/kaspawallet/daemon/pb/generate.go rename to cmd/zoomywallet/daemon/pb/generate.go diff --git a/cmd/kaspawallet/daemon/pb/kaspawalletd.pb.go b/cmd/zoomywallet/daemon/pb/kaspawalletd.pb.go similarity index 100% rename from cmd/kaspawallet/daemon/pb/kaspawalletd.pb.go rename to cmd/zoomywallet/daemon/pb/kaspawalletd.pb.go diff --git a/cmd/kaspawallet/daemon/pb/kaspawalletd.proto b/cmd/zoomywallet/daemon/pb/kaspawalletd.proto similarity index 94% rename from cmd/kaspawallet/daemon/pb/kaspawalletd.proto rename to cmd/zoomywallet/daemon/pb/kaspawalletd.proto index ad71d496f..6c9bee4dc 100644 --- a/cmd/kaspawallet/daemon/pb/kaspawalletd.proto +++ b/cmd/zoomywallet/daemon/pb/kaspawalletd.proto @@ -1,7 +1,11 @@ syntax = "proto3"; option go_package = "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"; +<<<<<<< Updated upstream:cmd/kaspawallet/daemon/pb/kaspawalletd.proto package zoomywalletd; +======= +package kaspawalletd; +>>>>>>> Stashed changes:cmd/zoomywallet/daemon/pb/kaspawalletd.proto service zoomywalletd { rpc GetBalance (GetBalanceRequest) returns (GetBalanceResponse) {} diff --git a/cmd/kaspawallet/daemon/pb/kaspawalletd_grpc.pb.go b/cmd/zoomywallet/daemon/pb/kaspawalletd_grpc.pb.go similarity index 100% rename from cmd/kaspawallet/daemon/pb/kaspawalletd_grpc.pb.go rename to cmd/zoomywallet/daemon/pb/kaspawalletd_grpc.pb.go diff --git a/cmd/kaspawallet/daemon/server/address.go b/cmd/zoomywallet/daemon/server/address.go similarity index 92% rename from cmd/kaspawallet/daemon/server/address.go rename to cmd/zoomywallet/daemon/server/address.go index e796b8c5b..573754227 100644 --- a/cmd/kaspawallet/daemon/server/address.go +++ b/cmd/zoomywallet/daemon/server/address.go @@ -4,10 +4,16 @@ import ( "context" "fmt" +<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/address.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" "github.com/zoomy-network/zoomyd/util" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/address.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" + "github.com/zoomy-network/zoomyd/util" ) func (s *server) changeAddress(useExisting bool, fromAddresses []*walletAddress) (util.Address, *walletAddress, error) { diff --git a/cmd/kaspawallet/daemon/server/balance.go b/cmd/zoomywallet/daemon/server/balance.go similarity index 100% rename from cmd/kaspawallet/daemon/server/balance.go rename to cmd/zoomywallet/daemon/server/balance.go diff --git a/cmd/kaspawallet/daemon/server/broadcast.go b/cmd/zoomywallet/daemon/server/broadcast.go similarity index 77% rename from cmd/kaspawallet/daemon/server/broadcast.go rename to cmd/zoomywallet/daemon/server/broadcast.go index 2690b750e..24dd42d7a 100644 --- a/cmd/kaspawallet/daemon/server/broadcast.go +++ b/cmd/zoomywallet/daemon/server/broadcast.go @@ -2,6 +2,7 @@ package server import ( "context" +<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/broadcast.go "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" @@ -9,7 +10,17 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient" "github.com/pkg/errors" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/broadcast.go "time" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient" ) func (s *server) Broadcast(_ context.Context, request *pb.BroadcastRequest) (*pb.BroadcastResponse, error) { diff --git a/cmd/kaspawallet/daemon/server/common.go b/cmd/zoomywallet/daemon/server/common.go similarity index 100% rename from cmd/kaspawallet/daemon/server/common.go rename to cmd/zoomywallet/daemon/server/common.go diff --git a/cmd/kaspawallet/daemon/server/create_unsigned_transaction.go b/cmd/zoomywallet/daemon/server/create_unsigned_transaction.go similarity index 91% rename from cmd/kaspawallet/daemon/server/create_unsigned_transaction.go rename to cmd/zoomywallet/daemon/server/create_unsigned_transaction.go index 71a4cb7e6..081ca2686 100644 --- a/cmd/kaspawallet/daemon/server/create_unsigned_transaction.go +++ b/cmd/zoomywallet/daemon/server/create_unsigned_transaction.go @@ -5,11 +5,18 @@ import ( "fmt" "time" +<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/create_unsigned_transaction.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/util" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/create_unsigned_transaction.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/util" "golang.org/x/exp/slices" ) diff --git a/cmd/kaspawallet/daemon/server/external_spendable_utxos.go b/cmd/zoomywallet/daemon/server/external_spendable_utxos.go similarity index 100% rename from cmd/kaspawallet/daemon/server/external_spendable_utxos.go rename to cmd/zoomywallet/daemon/server/external_spendable_utxos.go diff --git a/cmd/kaspawallet/daemon/server/log.go b/cmd/zoomywallet/daemon/server/log.go similarity index 100% rename from cmd/kaspawallet/daemon/server/log.go rename to cmd/zoomywallet/daemon/server/log.go diff --git a/cmd/kaspawallet/daemon/server/rpc.go b/cmd/zoomywallet/daemon/server/rpc.go similarity index 100% rename from cmd/kaspawallet/daemon/server/rpc.go rename to cmd/zoomywallet/daemon/server/rpc.go diff --git a/cmd/kaspawallet/daemon/server/send.go b/cmd/zoomywallet/daemon/server/send.go similarity index 100% rename from cmd/kaspawallet/daemon/server/send.go rename to cmd/zoomywallet/daemon/server/send.go diff --git a/cmd/kaspawallet/daemon/server/server.go b/cmd/zoomywallet/daemon/server/server.go similarity index 89% rename from cmd/kaspawallet/daemon/server/server.go rename to cmd/zoomywallet/daemon/server/server.go index 240e20a1d..3ce37757b 100644 --- a/cmd/kaspawallet/daemon/server/server.go +++ b/cmd/zoomywallet/daemon/server/server.go @@ -13,13 +13,22 @@ import ( "github.com/zoomy-network/zoomyd/util/profiling" +<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/server.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient" "github.com/zoomy-network/zoomyd/infrastructure/os/signal" "github.com/zoomy-network/zoomyd/util/panics" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/server.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys" + "github.com/zoomy-network/zoomyd/domain/dagconfig" + "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient" + "github.com/zoomy-network/zoomyd/infrastructure/os/signal" + "github.com/zoomy-network/zoomyd/util/panics" "google.golang.org/grpc" ) diff --git a/cmd/kaspawallet/daemon/server/shutdown.go b/cmd/zoomywallet/daemon/server/shutdown.go similarity index 68% rename from cmd/kaspawallet/daemon/server/shutdown.go rename to cmd/zoomywallet/daemon/server/shutdown.go index 85cb1e56f..573c094bd 100644 --- a/cmd/kaspawallet/daemon/server/shutdown.go +++ b/cmd/zoomywallet/daemon/server/shutdown.go @@ -2,6 +2,10 @@ package server import ( "context" +<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/shutdown.go +======= + +>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/shutdown.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" ) diff --git a/cmd/kaspawallet/daemon/server/sign.go b/cmd/zoomywallet/daemon/server/sign.go similarity index 100% rename from cmd/kaspawallet/daemon/server/sign.go rename to cmd/zoomywallet/daemon/server/sign.go diff --git a/cmd/kaspawallet/daemon/server/split_transaction.go b/cmd/zoomywallet/daemon/server/split_transaction.go similarity index 100% rename from cmd/kaspawallet/daemon/server/split_transaction.go rename to cmd/zoomywallet/daemon/server/split_transaction.go diff --git a/cmd/kaspawallet/daemon/server/split_transaction_test.go b/cmd/zoomywallet/daemon/server/split_transaction_test.go similarity index 100% rename from cmd/kaspawallet/daemon/server/split_transaction_test.go rename to cmd/zoomywallet/daemon/server/split_transaction_test.go diff --git a/cmd/kaspawallet/daemon/server/sync.go b/cmd/zoomywallet/daemon/server/sync.go similarity index 97% rename from cmd/kaspawallet/daemon/server/sync.go rename to cmd/zoomywallet/daemon/server/sync.go index 10ea57047..d8d85a9a0 100644 --- a/cmd/kaspawallet/daemon/server/sync.go +++ b/cmd/zoomywallet/daemon/server/sync.go @@ -7,8 +7,12 @@ import ( "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" +<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/sync.go "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/sync.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) var keyChains = []uint8{libkaspawallet.ExternalKeychain, libkaspawallet.InternalKeychain} diff --git a/cmd/kaspawallet/docker/Dockerfile b/cmd/zoomywallet/docker/Dockerfile similarity index 60% rename from cmd/kaspawallet/docker/Dockerfile rename to cmd/zoomywallet/docker/Dockerfile index afa65a3d6..d1fa3d6f1 100644 --- a/cmd/kaspawallet/docker/Dockerfile +++ b/cmd/zoomywallet/docker/Dockerfile @@ -14,8 +14,13 @@ RUN go mod download COPY . . +<<<<<<< Updated upstream:cmd/kaspawallet/docker/Dockerfile WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/zoomywallet RUN GOOS=linux go build -a -installsuffix cgo -o zoomywallet . +======= +WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/kaspawallet +RUN GOOS=linux go build -a -installsuffix cgo -o kaspawallet . +>>>>>>> Stashed changes:cmd/zoomywallet/docker/Dockerfile # --- multistage docker build: stage #2: runtime image FROM alpine @@ -23,7 +28,11 @@ WORKDIR /app RUN apk add --no-cache ca-certificates tini +<<<<<<< Updated upstream:cmd/kaspawallet/docker/Dockerfile COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/zoomywallet/zoomywallet /app/ +======= +COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/kaspawallet/kaspawallet /app/ +>>>>>>> Stashed changes:cmd/zoomywallet/docker/Dockerfile USER nobody ENTRYPOINT [ "/sbin/tini", "--" ] diff --git a/cmd/kaspawallet/dump_unencrypted_data.go b/cmd/zoomywallet/dump_unencrypted_data.go similarity index 100% rename from cmd/kaspawallet/dump_unencrypted_data.go rename to cmd/zoomywallet/dump_unencrypted_data.go diff --git a/cmd/kaspawallet/keys/create.go b/cmd/zoomywallet/keys/create.go similarity index 92% rename from cmd/kaspawallet/keys/create.go rename to cmd/zoomywallet/keys/create.go index 2d61ddf6c..8f1dbac0f 100644 --- a/cmd/kaspawallet/keys/create.go +++ b/cmd/zoomywallet/keys/create.go @@ -7,11 +7,17 @@ import ( "fmt" "os" +<<<<<<< Updated upstream:cmd/kaspawallet/keys/create.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils" "github.com/zoomy-network/zoomyd/domain/dagconfig" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/keys/create.go "github.com/pkg/errors" "github.com/tyler-smith/go-bip39" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils" + "github.com/zoomy-network/zoomyd/domain/dagconfig" ) // CreateMnemonics generates `numKeys` number of mnemonics. diff --git a/cmd/kaspawallet/keys/get_password.go b/cmd/zoomywallet/keys/get_password.go similarity index 100% rename from cmd/kaspawallet/keys/get_password.go rename to cmd/zoomywallet/keys/get_password.go diff --git a/cmd/kaspawallet/keys/keys.go b/cmd/zoomywallet/keys/keys.go similarity index 97% rename from cmd/kaspawallet/keys/keys.go rename to cmd/zoomywallet/keys/keys.go index 126700e48..ff4f53ee9 100644 --- a/cmd/kaspawallet/keys/keys.go +++ b/cmd/zoomywallet/keys/keys.go @@ -6,17 +6,25 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/gofrs/flock" "os" "path/filepath" "runtime" "strings" +<<<<<<< Updated upstream:cmd/kaspawallet/keys/keys.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/util" +======= + "github.com/gofrs/flock" + + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils" + +>>>>>>> Stashed changes:cmd/zoomywallet/keys/keys.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/dagconfig" + "github.com/zoomy-network/zoomyd/util" "golang.org/x/crypto/argon2" "golang.org/x/crypto/chacha20poly1305" ) diff --git a/cmd/kaspawallet/libkaspawallet/bip32/base58/alphabet.go b/cmd/zoomywallet/libkaspawallet/bip32/base58/alphabet.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/base58/alphabet.go rename to cmd/zoomywallet/libkaspawallet/bip32/base58/alphabet.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/base58/base58.go b/cmd/zoomywallet/libkaspawallet/bip32/base58/base58.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/base58/base58.go rename to cmd/zoomywallet/libkaspawallet/bip32/base58/base58.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/base58/base58_test.go b/cmd/zoomywallet/libkaspawallet/bip32/base58/base58_test.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/base58/base58_test.go rename to cmd/zoomywallet/libkaspawallet/bip32/base58/base58_test.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/base58/base58bench_test.go b/cmd/zoomywallet/libkaspawallet/bip32/base58/base58bench_test.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/base58/base58bench_test.go rename to cmd/zoomywallet/libkaspawallet/bip32/base58/base58bench_test.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/base58/base58check.go b/cmd/zoomywallet/libkaspawallet/bip32/base58/base58check.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/base58/base58check.go rename to cmd/zoomywallet/libkaspawallet/bip32/base58/base58check.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/base58/base58check_test.go b/cmd/zoomywallet/libkaspawallet/bip32/base58/base58check_test.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/base58/base58check_test.go rename to cmd/zoomywallet/libkaspawallet/bip32/base58/base58check_test.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/base58/cov_report.sh b/cmd/zoomywallet/libkaspawallet/bip32/base58/cov_report.sh similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/base58/cov_report.sh rename to cmd/zoomywallet/libkaspawallet/bip32/base58/cov_report.sh diff --git a/cmd/kaspawallet/libkaspawallet/bip32/base58/doc.go b/cmd/zoomywallet/libkaspawallet/bip32/base58/doc.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/base58/doc.go rename to cmd/zoomywallet/libkaspawallet/bip32/base58/doc.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/base58/example_test.go b/cmd/zoomywallet/libkaspawallet/bip32/base58/example_test.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/base58/example_test.go rename to cmd/zoomywallet/libkaspawallet/bip32/base58/example_test.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/bip32.go b/cmd/zoomywallet/libkaspawallet/bip32/bip32.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/bip32.go rename to cmd/zoomywallet/libkaspawallet/bip32/bip32.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/bip32_test.go b/cmd/zoomywallet/libkaspawallet/bip32/bip32_test.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/bip32_test.go rename to cmd/zoomywallet/libkaspawallet/bip32/bip32_test.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/child_key_derivation.go b/cmd/zoomywallet/libkaspawallet/bip32/child_key_derivation.go similarity index 99% rename from cmd/kaspawallet/libkaspawallet/bip32/child_key_derivation.go rename to cmd/zoomywallet/libkaspawallet/bip32/child_key_derivation.go index e92927ccd..07a95a098 100644 --- a/cmd/kaspawallet/libkaspawallet/bip32/child_key_derivation.go +++ b/cmd/zoomywallet/libkaspawallet/bip32/child_key_derivation.go @@ -2,6 +2,7 @@ package bip32 import ( "encoding/binary" + "github.com/kaspanet/go-secp256k1" "github.com/pkg/errors" ) diff --git a/cmd/kaspawallet/libkaspawallet/bip32/extended_key.go b/cmd/zoomywallet/libkaspawallet/bip32/extended_key.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/extended_key.go rename to cmd/zoomywallet/libkaspawallet/bip32/extended_key.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/hash.go b/cmd/zoomywallet/libkaspawallet/bip32/hash.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/hash.go rename to cmd/zoomywallet/libkaspawallet/bip32/hash.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/path.go b/cmd/zoomywallet/libkaspawallet/bip32/path.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/path.go rename to cmd/zoomywallet/libkaspawallet/bip32/path.go diff --git a/cmd/kaspawallet/libkaspawallet/bip32/serialization.go b/cmd/zoomywallet/libkaspawallet/bip32/serialization.go similarity index 95% rename from cmd/kaspawallet/libkaspawallet/bip32/serialization.go rename to cmd/zoomywallet/libkaspawallet/bip32/serialization.go index 986cb2bb2..99968c130 100644 --- a/cmd/kaspawallet/libkaspawallet/bip32/serialization.go +++ b/cmd/zoomywallet/libkaspawallet/bip32/serialization.go @@ -2,9 +2,14 @@ package bip32 import ( "encoding/binary" + "github.com/kaspanet/go-secp256k1" +<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/bip32/serialization.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32/base58" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/bip32/serialization.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32/base58" ) const ( diff --git a/cmd/kaspawallet/libkaspawallet/bip32/version.go b/cmd/zoomywallet/libkaspawallet/bip32/version.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/bip32/version.go rename to cmd/zoomywallet/libkaspawallet/bip32/version.go diff --git a/cmd/kaspawallet/libkaspawallet/bip39.go b/cmd/zoomywallet/libkaspawallet/bip39.go similarity index 89% rename from cmd/kaspawallet/libkaspawallet/bip39.go rename to cmd/zoomywallet/libkaspawallet/bip39.go index 771f6763f..c5f90528f 100644 --- a/cmd/kaspawallet/libkaspawallet/bip39.go +++ b/cmd/zoomywallet/libkaspawallet/bip39.go @@ -3,10 +3,15 @@ package libkaspawallet import ( "fmt" +<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/bip39.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" "github.com/zoomy-network/zoomyd/domain/dagconfig" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/bip39.go "github.com/pkg/errors" "github.com/tyler-smith/go-bip39" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" + "github.com/zoomy-network/zoomyd/domain/dagconfig" ) // CreateMnemonic creates a new bip-39 compatible mnemonic diff --git a/cmd/kaspawallet/libkaspawallet/converters.go b/cmd/zoomywallet/libkaspawallet/converters.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/converters.go rename to cmd/zoomywallet/libkaspawallet/converters.go diff --git a/cmd/kaspawallet/libkaspawallet/keychains.go b/cmd/zoomywallet/libkaspawallet/keychains.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/keychains.go rename to cmd/zoomywallet/libkaspawallet/keychains.go diff --git a/cmd/kaspawallet/libkaspawallet/keypair.go b/cmd/zoomywallet/libkaspawallet/keypair.go similarity index 94% rename from cmd/kaspawallet/libkaspawallet/keypair.go rename to cmd/zoomywallet/libkaspawallet/keypair.go index fae5062f3..674481a9b 100644 --- a/cmd/kaspawallet/libkaspawallet/keypair.go +++ b/cmd/zoomywallet/libkaspawallet/keypair.go @@ -6,10 +6,16 @@ import ( "strings" "github.com/kaspanet/go-secp256k1" +<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/keypair.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/util" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/keypair.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" + "github.com/zoomy-network/zoomyd/domain/dagconfig" + "github.com/zoomy-network/zoomyd/util" ) // CreateKeyPair generates a private-public key pair diff --git a/cmd/kaspawallet/libkaspawallet/serialization/protoserialization/generate.go b/cmd/zoomywallet/libkaspawallet/serialization/protoserialization/generate.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/serialization/protoserialization/generate.go rename to cmd/zoomywallet/libkaspawallet/serialization/protoserialization/generate.go diff --git a/cmd/kaspawallet/libkaspawallet/serialization/protoserialization/wallet.pb.go b/cmd/zoomywallet/libkaspawallet/serialization/protoserialization/wallet.pb.go similarity index 100% rename from cmd/kaspawallet/libkaspawallet/serialization/protoserialization/wallet.pb.go rename to cmd/zoomywallet/libkaspawallet/serialization/protoserialization/wallet.pb.go diff --git a/cmd/kaspawallet/libkaspawallet/serialization/protoserialization/wallet.proto b/cmd/zoomywallet/libkaspawallet/serialization/protoserialization/wallet.proto similarity index 100% rename from cmd/kaspawallet/libkaspawallet/serialization/protoserialization/wallet.proto rename to cmd/zoomywallet/libkaspawallet/serialization/protoserialization/wallet.proto diff --git a/cmd/kaspawallet/libkaspawallet/serialization/serialization.go b/cmd/zoomywallet/libkaspawallet/serialization/serialization.go similarity index 96% rename from cmd/kaspawallet/libkaspawallet/serialization/serialization.go rename to cmd/zoomywallet/libkaspawallet/serialization/serialization.go index cea7db232..0c31f7f44 100644 --- a/cmd/kaspawallet/libkaspawallet/serialization/serialization.go +++ b/cmd/zoomywallet/libkaspawallet/serialization/serialization.go @@ -3,10 +3,16 @@ package serialization import ( "math" +<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/serialization/serialization.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization/protoserialization" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/serialization/serialization.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization/protoserialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "google.golang.org/protobuf/proto" ) diff --git a/cmd/kaspawallet/libkaspawallet/sign.go b/cmd/zoomywallet/libkaspawallet/sign.go similarity index 84% rename from cmd/kaspawallet/libkaspawallet/sign.go rename to cmd/zoomywallet/libkaspawallet/sign.go index 9ad9b06fc..4b132a641 100644 --- a/cmd/kaspawallet/libkaspawallet/sign.go +++ b/cmd/zoomywallet/libkaspawallet/sign.go @@ -1,6 +1,7 @@ package libkaspawallet import ( +<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/sign.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" @@ -8,7 +9,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" "github.com/zoomy-network/zoomyd/domain/dagconfig" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/sign.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + "github.com/zoomy-network/zoomyd/domain/dagconfig" ) func rawTxInSignature(extendedKey *bip32.ExtendedKey, tx *externalapi.DomainTransaction, idx int, hashType consensushashing.SigHashType, diff --git a/cmd/kaspawallet/libkaspawallet/transaction.go b/cmd/zoomywallet/libkaspawallet/transaction.go similarity index 93% rename from cmd/kaspawallet/libkaspawallet/transaction.go rename to cmd/zoomywallet/libkaspawallet/transaction.go index c3fcc0ebe..897eea2f5 100644 --- a/cmd/kaspawallet/libkaspawallet/transaction.go +++ b/cmd/zoomywallet/libkaspawallet/transaction.go @@ -1,6 +1,7 @@ package libkaspawallet import ( +<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/transaction.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" @@ -8,7 +9,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" "github.com/zoomy-network/zoomyd/util" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/transaction.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" + "github.com/zoomy-network/zoomyd/util" ) // Payment contains a recipient payment details diff --git a/cmd/kaspawallet/libkaspawallet/transaction_test.go b/cmd/zoomywallet/libkaspawallet/transaction_test.go similarity index 98% rename from cmd/kaspawallet/libkaspawallet/transaction_test.go rename to cmd/zoomywallet/libkaspawallet/transaction_test.go index 4c443a422..04982d512 100644 --- a/cmd/kaspawallet/libkaspawallet/transaction_test.go +++ b/cmd/zoomywallet/libkaspawallet/transaction_test.go @@ -2,10 +2,18 @@ package libkaspawallet_test import ( "fmt" +<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/transaction_test.go "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "strings" "testing" +======= + "strings" + "testing" + + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + +>>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/transaction_test.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" diff --git a/cmd/kaspawallet/main.go b/cmd/zoomywallet/main.go similarity index 100% rename from cmd/kaspawallet/main.go rename to cmd/zoomywallet/main.go diff --git a/cmd/kaspawallet/new_address.go b/cmd/zoomywallet/new_address.go similarity index 83% rename from cmd/kaspawallet/new_address.go rename to cmd/zoomywallet/new_address.go index 7ebbfa765..39d718c53 100644 --- a/cmd/kaspawallet/new_address.go +++ b/cmd/zoomywallet/new_address.go @@ -3,6 +3,10 @@ package main import ( "context" "fmt" +<<<<<<< Updated upstream:cmd/kaspawallet/new_address.go +======= + +>>>>>>> Stashed changes:cmd/zoomywallet/new_address.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" ) diff --git a/cmd/kaspawallet/parse.go b/cmd/zoomywallet/parse.go similarity index 87% rename from cmd/kaspawallet/parse.go rename to cmd/zoomywallet/parse.go index b6ed335ee..817ff9c3c 100644 --- a/cmd/kaspawallet/parse.go +++ b/cmd/zoomywallet/parse.go @@ -3,13 +3,22 @@ package main import ( "encoding/hex" "fmt" +<<<<<<< Updated upstream:cmd/kaspawallet/parse.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" "github.com/pkg/errors" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/parse.go "io/ioutil" "strings" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" ) func parse(conf *parseConfig) error { diff --git a/cmd/kaspawallet/send.go b/cmd/zoomywallet/send.go similarity index 88% rename from cmd/kaspawallet/send.go rename to cmd/zoomywallet/send.go index 9d38d80e8..3c39ad2c6 100644 --- a/cmd/kaspawallet/send.go +++ b/cmd/zoomywallet/send.go @@ -6,12 +6,20 @@ import ( "os" "strings" +<<<<<<< Updated upstream:cmd/kaspawallet/send.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/send.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" ) func send(conf *sendConfig) error { diff --git a/cmd/kaspawallet/show_addresses.go b/cmd/zoomywallet/show_addresses.go similarity index 88% rename from cmd/kaspawallet/show_addresses.go rename to cmd/zoomywallet/show_addresses.go index 8c2fef00c..a26746aa9 100644 --- a/cmd/kaspawallet/show_addresses.go +++ b/cmd/zoomywallet/show_addresses.go @@ -3,6 +3,10 @@ package main import ( "context" "fmt" +<<<<<<< Updated upstream:cmd/kaspawallet/show_addresses.go +======= + +>>>>>>> Stashed changes:cmd/zoomywallet/show_addresses.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" ) diff --git a/cmd/kaspawallet/sign.go b/cmd/zoomywallet/sign.go similarity index 91% rename from cmd/kaspawallet/sign.go rename to cmd/zoomywallet/sign.go index d4a049eed..c1698fcd7 100644 --- a/cmd/kaspawallet/sign.go +++ b/cmd/zoomywallet/sign.go @@ -6,9 +6,14 @@ import ( "os" "strings" +<<<<<<< Updated upstream:cmd/kaspawallet/sign.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/sign.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" ) func sign(conf *signConfig) error { diff --git a/cmd/kaspawallet/start_daemon.go b/cmd/zoomywallet/start_daemon.go similarity index 100% rename from cmd/kaspawallet/start_daemon.go rename to cmd/zoomywallet/start_daemon.go diff --git a/cmd/kaspawallet/sweep.go b/cmd/zoomywallet/sweep.go similarity index 87% rename from cmd/kaspawallet/sweep.go rename to cmd/zoomywallet/sweep.go index f9a8cc59b..760ad4c62 100644 --- a/cmd/kaspawallet/sweep.go +++ b/cmd/zoomywallet/sweep.go @@ -6,6 +6,7 @@ import ( "fmt" "github.com/kaspanet/go-secp256k1" +<<<<<<< Updated upstream:cmd/kaspawallet/sweep.go "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" @@ -21,7 +22,24 @@ import ( "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" "github.com/zoomy-network/zoomyd/util" "github.com/zoomy-network/zoomyd/util/txmass" +======= +>>>>>>> Stashed changes:cmd/zoomywallet/sweep.go "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization" + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + "github.com/zoomy-network/zoomyd/domain/dagconfig" + "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" + "github.com/zoomy-network/zoomyd/util" + "github.com/zoomy-network/zoomyd/util/txmass" ) const feePerInput = 10000 diff --git a/cmd/kaspawallet/transactions_hex_encoding.go b/cmd/zoomywallet/transactions_hex_encoding.go similarity index 100% rename from cmd/kaspawallet/transactions_hex_encoding.go rename to cmd/zoomywallet/transactions_hex_encoding.go diff --git a/cmd/kaspawallet/utils/format_kas.go b/cmd/zoomywallet/utils/format_kas.go similarity index 100% rename from cmd/kaspawallet/utils/format_kas.go rename to cmd/zoomywallet/utils/format_kas.go diff --git a/cmd/kaspawallet/utils/readline.go b/cmd/zoomywallet/utils/readline.go similarity index 100% rename from cmd/kaspawallet/utils/readline.go rename to cmd/zoomywallet/utils/readline.go diff --git a/docker/Dockerfile b/docker/Dockerfile index c608f6699..ede877750 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,8 +24,13 @@ WORKDIR /app RUN apk add --no-cache ca-certificates tini +<<<<<<< Updated upstream COPY --from=build /go/src/github.com/zoomy-network/zoomyd/zoomyd /app/ COPY --from=build /go/src/github.com/zoomy-network/zoomyd/infrastructure/config/sample-zoomyd.conf /app/ +======= +COPY --from=build /go/src/github.com/zoomy-network/zoomyd/kaspad /app/ +COPY --from=build /go/src/github.com/zoomy-network/zoomyd/infrastructure/config/sample-kaspad.conf /app/ +>>>>>>> Stashed changes USER nobody ENTRYPOINT [ "/sbin/tini", "--" ] diff --git a/domain/consensus/consensus.go b/domain/consensus/consensus.go index 5d9d7b15b..268d3d81f 100644 --- a/domain/consensus/consensus.go +++ b/domain/consensus/consensus.go @@ -6,13 +6,22 @@ import ( "github.com/zoomy-network/zoomyd/util/mstime" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/staging" ) type consensus struct { diff --git a/domain/consensus/consensus_test.go b/domain/consensus/consensus_test.go index 8ef21af1b..6a01a093e 100644 --- a/domain/consensus/consensus_test.go +++ b/domain/consensus/consensus_test.go @@ -3,12 +3,20 @@ package consensus_test import ( "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" ) func TestConsensus_GetBlockInfo(t *testing.T) { diff --git a/domain/consensus/database/binaryserialization/hash.go b/domain/consensus/database/binaryserialization/hash.go index f08913ce9..4e8b79a5a 100644 --- a/domain/consensus/database/binaryserialization/hash.go +++ b/domain/consensus/database/binaryserialization/hash.go @@ -1,8 +1,12 @@ package binaryserialization import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // SerializeHash serializes hash to a slice of bytes diff --git a/domain/consensus/database/cursor.go b/domain/consensus/database/cursor.go index 983a2b16c..7b5ba7c7d 100644 --- a/domain/consensus/database/cursor.go +++ b/domain/consensus/database/cursor.go @@ -1,9 +1,14 @@ package database import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" ) type dbCursor struct { diff --git a/domain/consensus/database/serialization/block_ghostdag_data.go b/domain/consensus/database/serialization/block_ghostdag_data.go index 3e47897cd..1f059ef2d 100644 --- a/domain/consensus/database/serialization/block_ghostdag_data.go +++ b/domain/consensus/database/serialization/block_ghostdag_data.go @@ -1,8 +1,13 @@ package serialization import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "math/big" + + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // BlockGHOSTDAGDataToDBBlockGHOSTDAGData converts BlockGHOSTDAGData to DbBlockGhostdagData diff --git a/domain/consensus/database/serialization/blockheader.go b/domain/consensus/database/serialization/blockheader.go index c709842ee..fe87727c6 100644 --- a/domain/consensus/database/serialization/blockheader.go +++ b/domain/consensus/database/serialization/blockheader.go @@ -1,11 +1,18 @@ package serialization import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" "github.com/pkg/errors" +======= +>>>>>>> Stashed changes "math" "math/big" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" ) // DomainBlockHeaderToDbBlockHeader converts BlockHeader to DbBlockHeader diff --git a/domain/consensus/database/serialization/blues_anticone_sizes.go b/domain/consensus/database/serialization/blues_anticone_sizes.go index 4e4e4b03c..326843c32 100644 --- a/domain/consensus/database/serialization/blues_anticone_sizes.go +++ b/domain/consensus/database/serialization/blues_anticone_sizes.go @@ -1,8 +1,12 @@ package serialization import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) func bluesAnticoneSizesToDBBluesAnticoneSizes(bluesAnticoneSizes map[externalapi.DomainHash]externalapi.KType) []*DbBluesAnticoneSizes { diff --git a/domain/consensus/database/serialization/blues_anticone_sizes_test.go b/domain/consensus/database/serialization/blues_anticone_sizes_test.go index cb2b62e5e..6b30e99e3 100644 --- a/domain/consensus/database/serialization/blues_anticone_sizes_test.go +++ b/domain/consensus/database/serialization/blues_anticone_sizes_test.go @@ -1,8 +1,13 @@ package serialization import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "testing" + + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // TestBlueAnticoneSizesSize tests that no data can be loss when converting externalapi.KType to the corresponding type in diff --git a/domain/consensus/database/serialization/transaction.go b/domain/consensus/database/serialization/transaction.go index 74ccccaa7..913875504 100644 --- a/domain/consensus/database/serialization/transaction.go +++ b/domain/consensus/database/serialization/transaction.go @@ -3,8 +3,12 @@ package serialization import ( "math" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // DomainTransactionToDbTransaction converts DomainTransaction to DbTransaction diff --git a/domain/consensus/database/serialization/utxo_entry.go b/domain/consensus/database/serialization/utxo_entry.go index 7c96cfbc8..9ed77d670 100644 --- a/domain/consensus/database/serialization/utxo_entry.go +++ b/domain/consensus/database/serialization/utxo_entry.go @@ -1,10 +1,17 @@ package serialization import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" "github.com/pkg/errors" +======= +>>>>>>> Stashed changes "math" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" ) // ScriptPublicKeyToDBScriptPublicKey converts ScriptPublicKey to DBScriptPublicKey diff --git a/domain/consensus/datastructures/blockstore/block_store.go b/domain/consensus/datastructures/blockstore/block_store.go index 753a1b278..f89706b4e 100644 --- a/domain/consensus/datastructures/blockstore/block_store.go +++ b/domain/consensus/datastructures/blockstore/block_store.go @@ -2,12 +2,20 @@ package blockstore import ( "github.com/golang/protobuf/proto" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache" + "github.com/zoomy-network/zoomyd/util/staging" ) var bucketName = []byte("blocks") diff --git a/domain/consensus/datastructures/blockwindowheapslicestore/block_window_heap_slice_store.go b/domain/consensus/datastructures/blockwindowheapslicestore/block_window_heap_slice_store.go index 7dcbf3ca0..f65d3c4f8 100644 --- a/domain/consensus/datastructures/blockwindowheapslicestore/block_window_heap_slice_store.go +++ b/domain/consensus/datastructures/blockwindowheapslicestore/block_window_heap_slice_store.go @@ -1,12 +1,20 @@ package blockwindowheapslicestore import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucachehashandwindowsizetoblockghostdagdatahashpairs" "github.com/zoomy-network/zoomyd/infrastructure/db/database" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucachehashandwindowsizetoblockghostdagdatahashpairs" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/util/staging" ) type blockWindowHeapSliceStore struct { diff --git a/domain/consensus/datastructures/consensusstatestore/utxo.go b/domain/consensus/datastructures/consensusstatestore/utxo.go index 2f667fa58..36dd18b1e 100644 --- a/domain/consensus/datastructures/consensusstatestore/utxo.go +++ b/domain/consensus/datastructures/consensusstatestore/utxo.go @@ -1,10 +1,16 @@ package consensusstatestore import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" ) var utxoSetBucketName = []byte("virtual-utxo-set") diff --git a/domain/consensus/datastructures/consensusstatestore/virtual_utxo_set.go b/domain/consensus/datastructures/consensusstatestore/virtual_utxo_set.go index 8d870b6ca..7538fc775 100644 --- a/domain/consensus/datastructures/consensusstatestore/virtual_utxo_set.go +++ b/domain/consensus/datastructures/consensusstatestore/virtual_utxo_set.go @@ -1,9 +1,14 @@ package consensusstatestore import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) func (css *consensusStateStore) StartImportingPruningPointUTXOSet(dbContext model.DBWriter) error { diff --git a/domain/consensus/datastructures/daawindowstore/daa_window_store.go b/domain/consensus/datastructures/daawindowstore/daa_window_store.go index 769792d41..065032814 100644 --- a/domain/consensus/datastructures/daawindowstore/daa_window_store.go +++ b/domain/consensus/datastructures/daawindowstore/daa_window_store.go @@ -2,14 +2,24 @@ package daawindowstore import ( "encoding/binary" + "github.com/golang/protobuf/proto" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucachehashpairtoblockghostdagdatahashpair" "github.com/zoomy-network/zoomyd/infrastructure/db/database" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucachehashpairtoblockghostdagdatahashpair" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/util/staging" ) var bucketName = []byte("daa-window") diff --git a/domain/consensus/datastructures/headersselectedchainstore/headers_selected_chain_store.go b/domain/consensus/datastructures/headersselectedchainstore/headers_selected_chain_store.go index c924d233b..9d3e0ffe6 100644 --- a/domain/consensus/datastructures/headersselectedchainstore/headers_selected_chain_store.go +++ b/domain/consensus/datastructures/headersselectedchainstore/headers_selected_chain_store.go @@ -2,6 +2,7 @@ package headersselectedchainstore import ( "encoding/binary" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/util/staging" "github.com/zoomy-network/zoomyd/domain/consensus/database" @@ -10,7 +11,18 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache" "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucacheuint64tohash" +======= + + "github.com/zoomy-network/zoomyd/util/staging" + +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database" + "github.com/zoomy-network/zoomyd/domain/consensus/database/binaryserialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucacheuint64tohash" ) var bucketChainBlockHashByIndexName = []byte("chain-block-hash-by-index") diff --git a/domain/consensus/datastructures/pruningstore/imported_pruning_point.go b/domain/consensus/datastructures/pruningstore/imported_pruning_point.go index 15cb085f9..cb3da3dd9 100644 --- a/domain/consensus/datastructures/pruningstore/imported_pruning_point.go +++ b/domain/consensus/datastructures/pruningstore/imported_pruning_point.go @@ -2,10 +2,16 @@ package pruningstore import ( "github.com/golang/protobuf/proto" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) var importedPruningPointUTXOsBucketName = []byte("imported-pruning-point-utxos") diff --git a/domain/consensus/datastructures/pruningstore/pruning_store.go b/domain/consensus/datastructures/pruningstore/pruning_store.go index ddb2ec97d..dc7511dc6 100644 --- a/domain/consensus/datastructures/pruningstore/pruning_store.go +++ b/domain/consensus/datastructures/pruningstore/pruning_store.go @@ -2,7 +2,9 @@ package pruningstore import ( "encoding/binary" + "github.com/golang/protobuf/proto" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database" "github.com/zoomy-network/zoomyd/domain/consensus/database/binaryserialization" "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" @@ -10,7 +12,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucacheuint64tohash" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database" + "github.com/zoomy-network/zoomyd/domain/consensus/database/binaryserialization" + "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucacheuint64tohash" + "github.com/zoomy-network/zoomyd/util/staging" ) var currentPruningPointIndexKeyName = []byte("pruning-block-index") diff --git a/domain/consensus/datastructures/reachabilitydatastore/reachability_data_store.go b/domain/consensus/datastructures/reachabilitydatastore/reachability_data_store.go index fa35dbc83..1eb875b9b 100644 --- a/domain/consensus/datastructures/reachabilitydatastore/reachability_data_store.go +++ b/domain/consensus/datastructures/reachabilitydatastore/reachability_data_store.go @@ -2,13 +2,22 @@ package reachabilitydatastore import ( "github.com/golang/protobuf/proto" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache" "github.com/zoomy-network/zoomyd/infrastructure/db/database" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/util/staging" ) var reachabilityDataBucketName = []byte("reachability-data") diff --git a/domain/consensus/datastructures/utxodiffstore/utxo_diff_store.go b/domain/consensus/datastructures/utxodiffstore/utxo_diff_store.go index 09aafb998..bd3f101ff 100644 --- a/domain/consensus/datastructures/utxodiffstore/utxo_diff_store.go +++ b/domain/consensus/datastructures/utxodiffstore/utxo_diff_store.go @@ -2,12 +2,20 @@ package utxodiffstore import ( "github.com/golang/protobuf/proto" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache" + "github.com/zoomy-network/zoomyd/util/staging" ) var utxoDiffBucketName = []byte("utxo-diffs") diff --git a/domain/consensus/factory.go b/domain/consensus/factory.go index 44346f657..61d84cea2 100644 --- a/domain/consensus/factory.go +++ b/domain/consensus/factory.go @@ -5,6 +5,7 @@ import ( "os" "sync" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/blockwindowheapslicestore" "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/daawindowstore" "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/mergedepthrootstore" @@ -13,7 +14,17 @@ import ( parentssanager "github.com/zoomy-network/zoomyd/domain/consensus/processes/parentsmanager" "github.com/zoomy-network/zoomyd/domain/consensus/processes/pruningproofmanager" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/blockwindowheapslicestore" + "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/daawindowstore" + "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/mergedepthrootstore" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/processes/blockparentbuilder" + parentssanager "github.com/zoomy-network/zoomyd/domain/consensus/processes/parentsmanager" + "github.com/zoomy-network/zoomyd/domain/consensus/processes/pruningproofmanager" + "github.com/zoomy-network/zoomyd/util/staging" "github.com/zoomy-network/zoomyd/domain/prefixmanager/prefix" "github.com/zoomy-network/zoomyd/util/txmass" diff --git a/domain/consensus/finality_test.go b/domain/consensus/finality_test.go index 1f3d24609..98b41468e 100644 --- a/domain/consensus/finality_test.go +++ b/domain/consensus/finality_test.go @@ -2,6 +2,7 @@ package consensus_test import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" @@ -9,7 +10,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "math" "math/rand" "testing" diff --git a/domain/consensus/processes/blockbuilder/block_builder.go b/domain/consensus/processes/blockbuilder/block_builder.go index a429e765b..e6901d93f 100644 --- a/domain/consensus/processes/blockbuilder/block_builder.go +++ b/domain/consensus/processes/blockbuilder/block_builder.go @@ -4,9 +4,14 @@ import ( "math/big" "sort" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" diff --git a/domain/consensus/processes/blockbuilder/test_block_builder.go b/domain/consensus/processes/blockbuilder/test_block_builder.go index 8baf0232e..6239d8e06 100644 --- a/domain/consensus/processes/blockbuilder/test_block_builder.go +++ b/domain/consensus/processes/blockbuilder/test_block_builder.go @@ -2,6 +2,7 @@ package blockbuilder import ( "encoding/binary" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" @@ -10,7 +11,17 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" + "github.com/zoomy-network/zoomyd/infrastructure/logger" "math/big" "sort" ) diff --git a/domain/consensus/processes/blockparentbuilder/blockparentbuilder.go b/domain/consensus/processes/blockparentbuilder/blockparentbuilder.go index 276751c42..869c4baf8 100644 --- a/domain/consensus/processes/blockparentbuilder/blockparentbuilder.go +++ b/domain/consensus/processes/blockparentbuilder/blockparentbuilder.go @@ -1,11 +1,18 @@ package blockparentbuilder import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" ) type blockParentBuilder struct { diff --git a/domain/consensus/processes/blockprocessor/validate_and_insert_block.go b/domain/consensus/processes/blockprocessor/validate_and_insert_block.go index fd4e8de10..fcaeed127 100644 --- a/domain/consensus/processes/blockprocessor/validate_and_insert_block.go +++ b/domain/consensus/processes/blockprocessor/validate_and_insert_block.go @@ -4,6 +4,7 @@ import ( // we need to embed the utxoset of mainnet genesis here _ "embed" "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" @@ -14,7 +15,19 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/difficulty" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/multiset" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/difficulty" + "github.com/zoomy-network/zoomyd/util/staging" ) func (bp *blockProcessor) setBlockStatusAfterBlockValidation( diff --git a/domain/consensus/processes/blockprocessor/validate_and_insert_block_test.go b/domain/consensus/processes/blockprocessor/validate_and_insert_block_test.go index 5df3bf516..96588fcd1 100644 --- a/domain/consensus/processes/blockprocessor/validate_and_insert_block_test.go +++ b/domain/consensus/processes/blockprocessor/validate_and_insert_block_test.go @@ -4,6 +4,7 @@ import ( "strings" "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" @@ -13,7 +14,18 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" ) func TestBlockStatus(t *testing.T) { diff --git a/domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point.go b/domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point.go index 1ebb46ebe..5dbd04639 100644 --- a/domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point.go +++ b/domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point.go @@ -1,10 +1,16 @@ package blockprocessor import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" ) func (bp *blockProcessor) validateAndInsertImportedPruningPoint( diff --git a/domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point_test.go b/domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point_test.go index 9dc3ae988..3041ca270 100644 --- a/domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point_test.go +++ b/domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" @@ -16,7 +17,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" ) func addBlock(tc testapi.TestConsensus, parentHashes []*externalapi.DomainHash, t *testing.T) *externalapi.DomainHash { diff --git a/domain/consensus/processes/blockprocessor/validate_block.go b/domain/consensus/processes/blockprocessor/validate_block.go index d99d34bc7..fc9ceb1e1 100644 --- a/domain/consensus/processes/blockprocessor/validate_block.go +++ b/domain/consensus/processes/blockprocessor/validate_block.go @@ -1,12 +1,20 @@ package blockprocessor import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/util/staging" ) func (bp *blockProcessor) validateBlock(stagingArea *model.StagingArea, block *externalapi.DomainBlock, isBlockWithTrustedData bool) error { diff --git a/domain/consensus/processes/blockvalidator/block_body_in_context.go b/domain/consensus/processes/blockvalidator/block_body_in_context.go index a6402ec51..98d27bcac 100644 --- a/domain/consensus/processes/blockvalidator/block_body_in_context.go +++ b/domain/consensus/processes/blockvalidator/block_body_in_context.go @@ -1,13 +1,22 @@ package blockvalidator import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" "github.com/zoomy-network/zoomyd/domain/consensus/utils/virtual" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/virtual" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) // ValidateBodyInContext validates block bodies in the context of the current diff --git a/domain/consensus/processes/blockvalidator/block_body_in_context_test.go b/domain/consensus/processes/blockvalidator/block_body_in_context_test.go index a401a761e..6e2bc9690 100644 --- a/domain/consensus/processes/blockvalidator/block_body_in_context_test.go +++ b/domain/consensus/processes/blockvalidator/block_body_in_context_test.go @@ -5,13 +5,22 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" ) func TestCheckBlockIsNotPruned(t *testing.T) { diff --git a/domain/consensus/processes/blockvalidator/block_body_in_isolation.go b/domain/consensus/processes/blockvalidator/block_body_in_isolation.go index b5c91ece3..0abe18bfb 100644 --- a/domain/consensus/processes/blockvalidator/block_body_in_isolation.go +++ b/domain/consensus/processes/blockvalidator/block_body_in_isolation.go @@ -1,6 +1,7 @@ package blockvalidator import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" @@ -9,7 +10,17 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) // ValidateBodyInIsolation validates block bodies in isolation from the current diff --git a/domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go b/domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go index f33c01ee3..698ff07ff 100644 --- a/domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go +++ b/domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go @@ -8,6 +8,7 @@ import ( "runtime" "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" @@ -20,7 +21,21 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" ) func TestBlockValidator_ValidateBodyInIsolation(t *testing.T) { diff --git a/domain/consensus/processes/blockvalidator/block_header_in_context.go b/domain/consensus/processes/blockvalidator/block_header_in_context.go index 33b38a40d..9ccd7c131 100644 --- a/domain/consensus/processes/blockvalidator/block_header_in_context.go +++ b/domain/consensus/processes/blockvalidator/block_header_in_context.go @@ -2,12 +2,20 @@ package blockvalidator import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) // ValidateHeaderInContext validates block headers in the context of the current diff --git a/domain/consensus/processes/blockvalidator/block_header_in_isolation.go b/domain/consensus/processes/blockvalidator/block_header_in_isolation.go index 2c3e30af6..ef9e2b831 100644 --- a/domain/consensus/processes/blockvalidator/block_header_in_isolation.go +++ b/domain/consensus/processes/blockvalidator/block_header_in_isolation.go @@ -1,6 +1,7 @@ package blockvalidator import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" @@ -8,7 +9,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/mstime" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/mstime" ) // ValidateHeaderInIsolation validates block headers in isolation from the current diff --git a/domain/consensus/processes/blockvalidator/block_header_in_isolation_test.go b/domain/consensus/processes/blockvalidator/block_header_in_isolation_test.go index e9d8bd3e8..664434cb3 100644 --- a/domain/consensus/processes/blockvalidator/block_header_in_isolation_test.go +++ b/domain/consensus/processes/blockvalidator/block_header_in_isolation_test.go @@ -6,6 +6,7 @@ import ( "runtime" "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" @@ -13,7 +14,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/util/mstime" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/util/mstime" ) func TestBlockValidator_ValidateHeaderInIsolation(t *testing.T) { diff --git a/domain/consensus/processes/blockvalidator/header_pruning_point.go b/domain/consensus/processes/blockvalidator/header_pruning_point.go index 51a992594..d94491f1a 100644 --- a/domain/consensus/processes/blockvalidator/header_pruning_point.go +++ b/domain/consensus/processes/blockvalidator/header_pruning_point.go @@ -1,10 +1,16 @@ package blockvalidator import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" ) func (v *blockValidator) validateHeaderPruningPoint(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) error { diff --git a/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty.go b/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty.go index 6997cd678..178348f16 100644 --- a/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty.go +++ b/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty.go @@ -1,6 +1,7 @@ package blockvalidator import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" @@ -8,7 +9,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/virtual" "github.com/zoomy-network/zoomyd/infrastructure/db/database" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/pow" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/virtual" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) func (v *blockValidator) ValidatePruningPointViolationAndProofOfWorkAndDifficulty(stagingArea *model.StagingArea, diff --git a/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go b/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go index e13c8da48..42ee37f31 100644 --- a/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go +++ b/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" @@ -19,7 +20,21 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/pow" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/util/difficulty" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/mining" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/pow" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/util/difficulty" ) // TestPOW tests the validation of the block's POW. diff --git a/domain/consensus/processes/coinbasemanager/coinbasemanager.go b/domain/consensus/processes/coinbasemanager/coinbasemanager.go index b62376b4b..aa92d76b2 100644 --- a/domain/consensus/processes/coinbasemanager/coinbasemanager.go +++ b/domain/consensus/processes/coinbasemanager/coinbasemanager.go @@ -1,6 +1,7 @@ package coinbasemanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" @@ -8,7 +9,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" "math" ) diff --git a/domain/consensus/processes/coinbasemanager/payload.go b/domain/consensus/processes/coinbasemanager/payload.go index 06dfe692d..528416597 100644 --- a/domain/consensus/processes/coinbasemanager/payload.go +++ b/domain/consensus/processes/coinbasemanager/payload.go @@ -3,9 +3,14 @@ package coinbasemanager import ( "encoding/binary" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" ) const uint64Len = 8 diff --git a/domain/consensus/processes/consensusstatemanager/calculate_past_utxo.go b/domain/consensus/processes/consensusstatemanager/calculate_past_utxo.go index edb0d6fd1..c605b3774 100644 --- a/domain/consensus/processes/consensusstatemanager/calculate_past_utxo.go +++ b/domain/consensus/processes/consensusstatemanager/calculate_past_utxo.go @@ -1,10 +1,16 @@ package consensusstatemanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" diff --git a/domain/consensus/processes/consensusstatemanager/import_pruning_utxo_set.go b/domain/consensus/processes/consensusstatemanager/import_pruning_utxo_set.go index 1fd812bd3..b827062ef 100644 --- a/domain/consensus/processes/consensusstatemanager/import_pruning_utxo_set.go +++ b/domain/consensus/processes/consensusstatemanager/import_pruning_utxo_set.go @@ -1,6 +1,7 @@ package consensusstatemanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" @@ -9,7 +10,17 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/staging" ) func (csm *consensusStateManager) ImportPruningPointUTXOSet(stagingArea *model.StagingArea, newPruningPoint *externalapi.DomainHash) error { diff --git a/domain/consensus/processes/consensusstatemanager/pick_virtual_parents.go b/domain/consensus/processes/consensusstatemanager/pick_virtual_parents.go index c358a2bc9..f34cf60eb 100644 --- a/domain/consensus/processes/consensusstatemanager/pick_virtual_parents.go +++ b/domain/consensus/processes/consensusstatemanager/pick_virtual_parents.go @@ -1,9 +1,14 @@ package consensusstatemanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/math" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/math" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" diff --git a/domain/consensus/processes/consensusstatemanager/resolve.go b/domain/consensus/processes/consensusstatemanager/resolve.go index 8247eebc5..7e041a446 100644 --- a/domain/consensus/processes/consensusstatemanager/resolve.go +++ b/domain/consensus/processes/consensusstatemanager/resolve.go @@ -1,12 +1,21 @@ package consensusstatemanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/staging" "github.com/pkg/errors" +======= +>>>>>>> Stashed changes "sort" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/staging" ) // tipsInDecreasingGHOSTDAGParentSelectionOrder returns the current DAG tips in decreasing parent selection order. diff --git a/domain/consensus/processes/consensusstatemanager/resolve_block_status.go b/domain/consensus/processes/consensusstatemanager/resolve_block_status.go index cbc4f8e79..ddba17298 100644 --- a/domain/consensus/processes/consensusstatemanager/resolve_block_status.go +++ b/domain/consensus/processes/consensusstatemanager/resolve_block_status.go @@ -5,11 +5,18 @@ import ( "github.com/zoomy-network/zoomyd/util/staging" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) func (csm *consensusStateManager) resolveBlockStatus(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash, diff --git a/domain/consensus/processes/consensusstatemanager/resolve_block_status_test.go b/domain/consensus/processes/consensusstatemanager/resolve_block_status_test.go index d00470792..413163a0c 100644 --- a/domain/consensus/processes/consensusstatemanager/resolve_block_status_test.go +++ b/domain/consensus/processes/consensusstatemanager/resolve_block_status_test.go @@ -2,6 +2,7 @@ package consensusstatemanager_test import ( "errors" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" "testing" @@ -11,6 +12,18 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" +======= + "testing" + + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + + "github.com/zoomy-network/zoomyd/domain/consensus/model" + + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" diff --git a/domain/consensus/processes/consensusstatemanager/resolve_virtual_test.go b/domain/consensus/processes/consensusstatemanager/resolve_virtual_test.go index 1b214ff10..7edff3342 100644 --- a/domain/consensus/processes/consensusstatemanager/resolve_virtual_test.go +++ b/domain/consensus/processes/consensusstatemanager/resolve_virtual_test.go @@ -2,6 +2,7 @@ package consensusstatemanager_test import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" @@ -9,6 +10,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= + "testing" + + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" ) diff --git a/domain/consensus/processes/consensusstatemanager/verify_and_build_utxo.go b/domain/consensus/processes/consensusstatemanager/verify_and_build_utxo.go index a47b5ed1e..8cd6e9dca 100644 --- a/domain/consensus/processes/consensusstatemanager/verify_and_build_utxo.go +++ b/domain/consensus/processes/consensusstatemanager/verify_and_build_utxo.go @@ -9,10 +9,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" ) func (csm *consensusStateManager) verifyUTXO(stagingArea *model.StagingArea, block *externalapi.DomainBlock, diff --git a/domain/consensus/processes/dagtopologymanager/dagtopologymanager.go b/domain/consensus/processes/dagtopologymanager/dagtopologymanager.go index 937e2803d..36170dd0b 100644 --- a/domain/consensus/processes/dagtopologymanager/dagtopologymanager.go +++ b/domain/consensus/processes/dagtopologymanager/dagtopologymanager.go @@ -1,9 +1,14 @@ package dagtopologymanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // dagTopologyManager exposes methods for querying relationships diff --git a/domain/consensus/processes/dagtraversalmanager/anticone.go b/domain/consensus/processes/dagtraversalmanager/anticone.go index 0fdada223..8cdabfaaf 100644 --- a/domain/consensus/processes/dagtraversalmanager/anticone.go +++ b/domain/consensus/processes/dagtraversalmanager/anticone.go @@ -1,10 +1,16 @@ package dagtraversalmanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" ) func (dtm *dagTraversalManager) AnticoneFromVirtualPOV(stagingArea *model.StagingArea, blockHash *externalapi.DomainHash) ( diff --git a/domain/consensus/processes/dagtraversalmanager/dagtraversalmanager.go b/domain/consensus/processes/dagtraversalmanager/dagtraversalmanager.go index d38680527..fff581c9d 100644 --- a/domain/consensus/processes/dagtraversalmanager/dagtraversalmanager.go +++ b/domain/consensus/processes/dagtraversalmanager/dagtraversalmanager.go @@ -1,9 +1,14 @@ package dagtraversalmanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // dagTraversalManager exposes methods for traversing blocks diff --git a/domain/consensus/processes/dagtraversalmanager/selected_child_iterator.go b/domain/consensus/processes/dagtraversalmanager/selected_child_iterator.go index 8d22a021a..1bc0c2e3b 100644 --- a/domain/consensus/processes/dagtraversalmanager/selected_child_iterator.go +++ b/domain/consensus/processes/dagtraversalmanager/selected_child_iterator.go @@ -1,9 +1,14 @@ package dagtraversalmanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) type selectedChildIterator struct { diff --git a/domain/consensus/processes/dagtraversalmanager/window_test.go b/domain/consensus/processes/dagtraversalmanager/window_test.go index b3998ce7d..ad92c6ba4 100644 --- a/domain/consensus/processes/dagtraversalmanager/window_test.go +++ b/domain/consensus/processes/dagtraversalmanager/window_test.go @@ -7,12 +7,20 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/domain/dagconfig" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/domain/dagconfig" ) func TestBlockWindow(t *testing.T) { diff --git a/domain/consensus/processes/difficultymanager/hashrate.go b/domain/consensus/processes/difficultymanager/hashrate.go index 4053313a2..c0d9ca508 100644 --- a/domain/consensus/processes/difficultymanager/hashrate.go +++ b/domain/consensus/processes/difficultymanager/hashrate.go @@ -3,10 +3,16 @@ package difficultymanager import ( "math/big" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) func (dm *difficultyManager) EstimateNetworkHashesPerSecond(startHash *externalapi.DomainHash, windowSize int) (uint64, error) { diff --git a/domain/consensus/processes/ghostdagmanager/ghostdag.go b/domain/consensus/processes/ghostdagmanager/ghostdag.go index 7cd402ca4..e092c32f9 100644 --- a/domain/consensus/processes/ghostdagmanager/ghostdag.go +++ b/domain/consensus/processes/ghostdagmanager/ghostdag.go @@ -3,10 +3,16 @@ package ghostdagmanager import ( "math/big" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/util/difficulty" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/util/difficulty" ) type blockGHOSTDAGData struct { diff --git a/domain/consensus/processes/ghostdagmanager/ghostdag_test.go b/domain/consensus/processes/ghostdagmanager/ghostdag_test.go index d89272ef0..14d62bb18 100644 --- a/domain/consensus/processes/ghostdagmanager/ghostdag_test.go +++ b/domain/consensus/processes/ghostdagmanager/ghostdag_test.go @@ -9,6 +9,7 @@ import ( "reflect" "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" @@ -18,7 +19,18 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/util/difficulty" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/processes/ghostdag2" + "github.com/zoomy-network/zoomyd/domain/consensus/processes/ghostdagmanager" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/util/difficulty" ) type block struct { diff --git a/domain/consensus/processes/headersselectedtipmanager/headersselectedtipmanager_test.go b/domain/consensus/processes/headersselectedtipmanager/headersselectedtipmanager_test.go index 66364ae38..113267408 100644 --- a/domain/consensus/processes/headersselectedtipmanager/headersselectedtipmanager_test.go +++ b/domain/consensus/processes/headersselectedtipmanager/headersselectedtipmanager_test.go @@ -5,11 +5,18 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" ) func TestAddHeaderTip(t *testing.T) { diff --git a/domain/consensus/processes/mergedepthmanager/merge_depth_manager.go b/domain/consensus/processes/mergedepthmanager/merge_depth_manager.go index db2d21d39..e07d2a9ad 100644 --- a/domain/consensus/processes/mergedepthmanager/merge_depth_manager.go +++ b/domain/consensus/processes/mergedepthmanager/merge_depth_manager.go @@ -1,11 +1,18 @@ package mergedepthmanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" ) type mergeDepthManager struct { diff --git a/domain/consensus/processes/pastmediantimemanager/pastmediantimemanager.go b/domain/consensus/processes/pastmediantimemanager/pastmediantimemanager.go index 52fb9d8a6..42086a6a9 100644 --- a/domain/consensus/processes/pastmediantimemanager/pastmediantimemanager.go +++ b/domain/consensus/processes/pastmediantimemanager/pastmediantimemanager.go @@ -5,9 +5,14 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/sorters" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // pastMedianTimeManager provides a method to resolve the diff --git a/domain/consensus/processes/pruningmanager/pruningmanager.go b/domain/consensus/processes/pruningmanager/pruningmanager.go index 584331ebc..49a2a1c8b 100644 --- a/domain/consensus/processes/pruningmanager/pruningmanager.go +++ b/domain/consensus/processes/pruningmanager/pruningmanager.go @@ -1,6 +1,7 @@ package pruningmanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" @@ -10,7 +11,18 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/db/database" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/multiset" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/virtual" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/staging" "sort" ) diff --git a/domain/consensus/processes/pruningproofmanager/pruningproofmanager.go b/domain/consensus/processes/pruningproofmanager/pruningproofmanager.go index df4e750e8..b58fcb3b9 100644 --- a/domain/consensus/processes/pruningproofmanager/pruningproofmanager.go +++ b/domain/consensus/processes/pruningproofmanager/pruningproofmanager.go @@ -1,6 +1,7 @@ package pruningproofmanager import ( +<<<<<<< Updated upstream consensusDB "github.com/zoomy-network/zoomyd/domain/consensus/database" "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/blockheaderstore" "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/blockrelationstore" @@ -18,7 +19,26 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/db/database" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util/staging" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + consensusDB "github.com/zoomy-network/zoomyd/domain/consensus/database" + "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/blockheaderstore" + "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/blockrelationstore" + "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/ghostdagdatastore" + "github.com/zoomy-network/zoomyd/domain/consensus/datastructures/reachabilitydatastore" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/processes/dagtopologymanager" + "github.com/zoomy-network/zoomyd/domain/consensus/processes/dagtraversalmanager" + "github.com/zoomy-network/zoomyd/domain/consensus/processes/ghostdagmanager" + "github.com/zoomy-network/zoomyd/domain/consensus/processes/reachabilitymanager" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util/staging" "math/big" ) diff --git a/domain/consensus/processes/reachabilitymanager/fetch.go b/domain/consensus/processes/reachabilitymanager/fetch.go index 8b58a0a93..e981972ee 100644 --- a/domain/consensus/processes/reachabilitymanager/fetch.go +++ b/domain/consensus/processes/reachabilitymanager/fetch.go @@ -1,11 +1,18 @@ package reachabilitymanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/reachabilitydata" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/reachabilitydata" ) func (rt *reachabilityManager) reachabilityDataForInsertion(stagingArea *model.StagingArea, diff --git a/domain/consensus/processes/reachabilitymanager/interval.go b/domain/consensus/processes/reachabilitymanager/interval.go index 8bfa939ae..887d4552c 100644 --- a/domain/consensus/processes/reachabilitymanager/interval.go +++ b/domain/consensus/processes/reachabilitymanager/interval.go @@ -1,8 +1,12 @@ package reachabilitymanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" "math" ) diff --git a/domain/consensus/processes/reachabilitymanager/reachability_stretch_test.go b/domain/consensus/processes/reachabilitymanager/reachability_stretch_test.go index 31b9de244..2a515d567 100644 --- a/domain/consensus/processes/reachabilitymanager/reachability_stretch_test.go +++ b/domain/consensus/processes/reachabilitymanager/reachability_stretch_test.go @@ -10,11 +10,18 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/model" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" "github.com/zoomy-network/zoomyd/domain/dagconfig" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" + "github.com/zoomy-network/zoomyd/domain/dagconfig" ) // Test configuration diff --git a/domain/consensus/processes/reachabilitymanager/reindex_context.go b/domain/consensus/processes/reachabilitymanager/reindex_context.go index 7df3d8fd4..0f7e0267a 100644 --- a/domain/consensus/processes/reachabilitymanager/reindex_context.go +++ b/domain/consensus/processes/reachabilitymanager/reindex_context.go @@ -1,9 +1,14 @@ package reachabilitymanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) var ( diff --git a/domain/consensus/processes/syncmanager/antipast.go b/domain/consensus/processes/syncmanager/antipast.go index 49fe97984..8a5f6a4ba 100644 --- a/domain/consensus/processes/syncmanager/antipast.go +++ b/domain/consensus/processes/syncmanager/antipast.go @@ -1,9 +1,14 @@ package syncmanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // antiPastHashesBetween returns the hashes of the blocks between the diff --git a/domain/consensus/processes/syncmanager/blocklocator.go b/domain/consensus/processes/syncmanager/blocklocator.go index ee833d7b6..22d894040 100644 --- a/domain/consensus/processes/syncmanager/blocklocator.go +++ b/domain/consensus/processes/syncmanager/blocklocator.go @@ -1,10 +1,16 @@ package syncmanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // createBlockLocator creates a block locator for the passed high and low hashes. diff --git a/domain/consensus/processes/syncmanager/blocklocator_test.go b/domain/consensus/processes/syncmanager/blocklocator_test.go index d93caa8c9..b591c7f88 100644 --- a/domain/consensus/processes/syncmanager/blocklocator_test.go +++ b/domain/consensus/processes/syncmanager/blocklocator_test.go @@ -4,12 +4,20 @@ import ( "strings" "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" ) func TestCreateBlockLocator(t *testing.T) { diff --git a/domain/consensus/processes/syncmanager/syncmanager.go b/domain/consensus/processes/syncmanager/syncmanager.go index fbebde798..c385fd2ce 100644 --- a/domain/consensus/processes/syncmanager/syncmanager.go +++ b/domain/consensus/processes/syncmanager/syncmanager.go @@ -1,10 +1,16 @@ package syncmanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) type syncManager struct { diff --git a/domain/consensus/processes/transactionvalidator/transaction_in_context.go b/domain/consensus/processes/transactionvalidator/transaction_in_context.go index dd877abc6..77f1f25bc 100644 --- a/domain/consensus/processes/transactionvalidator/transaction_in_context.go +++ b/domain/consensus/processes/transactionvalidator/transaction_in_context.go @@ -3,6 +3,7 @@ package transactionvalidator import ( "math" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" @@ -10,7 +11,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" ) // IsFinalizedTransaction determines whether or not a transaction is finalized. diff --git a/domain/consensus/processes/transactionvalidator/transaction_in_isolation.go b/domain/consensus/processes/transactionvalidator/transaction_in_isolation.go index 72aa86508..b42bbfcfe 100644 --- a/domain/consensus/processes/transactionvalidator/transaction_in_isolation.go +++ b/domain/consensus/processes/transactionvalidator/transaction_in_isolation.go @@ -1,12 +1,20 @@ package transactionvalidator import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" ) // ValidateTransactionInIsolation validates the parts of the transaction that can be validated context-free diff --git a/domain/consensus/processes/transactionvalidator/transaction_in_isolation_test.go b/domain/consensus/processes/transactionvalidator/transaction_in_isolation_test.go index d693dafb1..9e33ea4d2 100644 --- a/domain/consensus/processes/transactionvalidator/transaction_in_isolation_test.go +++ b/domain/consensus/processes/transactionvalidator/transaction_in_isolation_test.go @@ -3,6 +3,7 @@ package transactionvalidator_test import ( "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" @@ -10,7 +11,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" ) type txSubnetworkData struct { diff --git a/domain/consensus/processes/transactionvalidator/transactionvalidator_test.go b/domain/consensus/processes/transactionvalidator/transactionvalidator_test.go index 59d879380..3c4427db5 100644 --- a/domain/consensus/processes/transactionvalidator/transactionvalidator_test.go +++ b/domain/consensus/processes/transactionvalidator/transactionvalidator_test.go @@ -12,11 +12,18 @@ import ( "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" ) func TestValidateTransactionInContextAndPopulateFee(t *testing.T) { diff --git a/domain/consensus/ruleerrors/rule_error.go b/domain/consensus/ruleerrors/rule_error.go index 9c9c28fdc..dce8af300 100644 --- a/domain/consensus/ruleerrors/rule_error.go +++ b/domain/consensus/ruleerrors/rule_error.go @@ -3,9 +3,14 @@ package ruleerrors import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" ) // These constants are used to identify a specific RuleError. diff --git a/domain/consensus/test_consensus.go b/domain/consensus/test_consensus.go index f576c8b5e..05145cde1 100644 --- a/domain/consensus/test_consensus.go +++ b/domain/consensus/test_consensus.go @@ -8,12 +8,20 @@ import ( "github.com/zoomy-network/zoomyd/util/staging" "io" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/dagconfig" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" ) type testConsensus struct { diff --git a/domain/consensus/utils/consensushashing/block.go b/domain/consensus/utils/consensushashing/block.go index 2db0684de..c0be2c384 100644 --- a/domain/consensus/utils/consensushashing/block.go +++ b/domain/consensus/utils/consensushashing/block.go @@ -5,9 +5,14 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/serialization" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" ) // BlockHash returns the given block's hash diff --git a/domain/consensus/utils/consensushashing/calculate_signature_hash.go b/domain/consensus/utils/consensushashing/calculate_signature_hash.go index d99b3b962..15376f42d 100644 --- a/domain/consensus/utils/consensushashing/calculate_signature_hash.go +++ b/domain/consensus/utils/consensushashing/calculate_signature_hash.go @@ -1,11 +1,18 @@ package consensushashing import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" "github.com/zoomy-network/zoomyd/domain/consensus/utils/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" ) // SigHashType represents hash type bits at the end of a signature. diff --git a/domain/consensus/utils/consensushashing/transaction.go b/domain/consensus/utils/consensushashing/transaction.go index a02fbc41a..393616385 100644 --- a/domain/consensus/utils/consensushashing/transaction.go +++ b/domain/consensus/utils/consensushashing/transaction.go @@ -5,11 +5,18 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/serialization" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" "github.com/zoomy-network/zoomyd/util/binaryserializer" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" + "github.com/zoomy-network/zoomyd/util/binaryserializer" ) // txEncoding is a bitmask defining which transaction fields we diff --git a/domain/consensus/utils/hashes/writers.go b/domain/consensus/utils/hashes/writers.go index fbc034972..4cb6e0cac 100644 --- a/domain/consensus/utils/hashes/writers.go +++ b/domain/consensus/utils/hashes/writers.go @@ -1,10 +1,14 @@ package hashes import ( +<<<<<<< Updated upstream "hash" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "golang.org/x/crypto/sha3" "lukechampine.com/blake3" ) diff --git a/domain/consensus/utils/mining/solve.go b/domain/consensus/utils/mining/solve.go index 0666f5e75..e5038c891 100644 --- a/domain/consensus/utils/mining/solve.go +++ b/domain/consensus/utils/mining/solve.go @@ -4,9 +4,14 @@ import ( "math" "math/rand" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/pow" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/pow" ) // SolveBlock increments the given block's nonce until it matches the difficulty requirements in its bits field diff --git a/domain/consensus/utils/multiset/multiset.go b/domain/consensus/utils/multiset/multiset.go index aa921226d..2b1d45a89 100644 --- a/domain/consensus/utils/multiset/multiset.go +++ b/domain/consensus/utils/multiset/multiset.go @@ -2,9 +2,14 @@ package multiset import ( "github.com/kaspanet/go-muhash" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) type multiset struct { diff --git a/domain/consensus/utils/serialization/common.go b/domain/consensus/utils/serialization/common.go index 3408a989e..ee174bb58 100644 --- a/domain/consensus/utils/serialization/common.go +++ b/domain/consensus/utils/serialization/common.go @@ -3,9 +3,14 @@ package serialization import ( "io" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/util/binaryserializer" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/util/binaryserializer" ) // errNoEncodingForType signifies that there's no encoding for the given type. diff --git a/domain/consensus/utils/subnetworks/from_bytes.go b/domain/consensus/utils/subnetworks/from_bytes.go index 47612cb92..68cb9fb7a 100644 --- a/domain/consensus/utils/subnetworks/from_bytes.go +++ b/domain/consensus/utils/subnetworks/from_bytes.go @@ -1,8 +1,12 @@ package subnetworks import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // FromBytes creates a DomainSubnetworkID from the given byte slice diff --git a/domain/consensus/utils/testutils/op_true_script.go b/domain/consensus/utils/testutils/op_true_script.go index 715035aad..c588b5bda 100644 --- a/domain/consensus/utils/testutils/op_true_script.go +++ b/domain/consensus/utils/testutils/op_true_script.go @@ -1,10 +1,16 @@ package testutils import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" ) // OpTrueScript returns a P2SH script paying to an anyone-can-spend address, diff --git a/domain/consensus/utils/txscript/reference_test.go b/domain/consensus/utils/txscript/reference_test.go index d054d18e7..1b2dd72b7 100644 --- a/domain/consensus/utils/txscript/reference_test.go +++ b/domain/consensus/utils/txscript/reference_test.go @@ -17,9 +17,14 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) // scriptTestName returns a descriptive test name for the given reference script diff --git a/domain/consensus/utils/txscript/sign.go b/domain/consensus/utils/txscript/sign.go index 167bdf79a..a00aa2ad7 100644 --- a/domain/consensus/utils/txscript/sign.go +++ b/domain/consensus/utils/txscript/sign.go @@ -6,9 +6,14 @@ package txscript import ( "github.com/kaspanet/go-secp256k1" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/util" diff --git a/domain/consensus/utils/txscript/sign_test.go b/domain/consensus/utils/txscript/sign_test.go index d68763d07..c1deeefbb 100644 --- a/domain/consensus/utils/txscript/sign_test.go +++ b/domain/consensus/utils/txscript/sign_test.go @@ -13,8 +13,12 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/kaspanet/go-secp256k1" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/util" diff --git a/domain/consensus/utils/txscript/standard.go b/domain/consensus/utils/txscript/standard.go index aa5be0413..cbe7905b5 100644 --- a/domain/consensus/utils/txscript/standard.go +++ b/domain/consensus/utils/txscript/standard.go @@ -7,9 +7,14 @@ package txscript import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/util" diff --git a/domain/consensus/utils/utxo/diff_algebra.go b/domain/consensus/utils/utxo/diff_algebra.go index 1927d0728..6f6780bc0 100644 --- a/domain/consensus/utils/utxo/diff_algebra.go +++ b/domain/consensus/utils/utxo/diff_algebra.go @@ -1,8 +1,12 @@ package utxo import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // checkIntersection checks if there is an intersection between two utxoCollections diff --git a/domain/consensus/utils/utxo/immutable_utxo_diff.go b/domain/consensus/utils/utxo/immutable_utxo_diff.go index 1cef202e5..2653a49a3 100644 --- a/domain/consensus/utils/utxo/immutable_utxo_diff.go +++ b/domain/consensus/utils/utxo/immutable_utxo_diff.go @@ -1,8 +1,12 @@ package utxo import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) type immutableUTXODiff struct { diff --git a/domain/consensus/utils/utxo/mutable_utxo_diff.go b/domain/consensus/utils/utxo/mutable_utxo_diff.go index 438ed5e98..c7632fa2e 100644 --- a/domain/consensus/utils/utxo/mutable_utxo_diff.go +++ b/domain/consensus/utils/utxo/mutable_utxo_diff.go @@ -3,10 +3,16 @@ package utxo import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" ) type mutableUTXODiff struct { diff --git a/domain/consensus/utils/utxo/serialization.go b/domain/consensus/utils/utxo/serialization.go index 83dd15b2f..ddb0a0b33 100644 --- a/domain/consensus/utils/utxo/serialization.go +++ b/domain/consensus/utils/utxo/serialization.go @@ -4,10 +4,16 @@ import ( "bytes" "io" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionid" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionid" ) // SerializeUTXO returns the byte-slice representation for given UTXOEntry-outpoint pair diff --git a/domain/consensus/utils/utxo/utxo_iterator.go b/domain/consensus/utils/utxo/utxo_iterator.go index dc11e7e54..f5b64ceb8 100644 --- a/domain/consensus/utils/utxo/utxo_iterator.go +++ b/domain/consensus/utils/utxo/utxo_iterator.go @@ -1,8 +1,12 @@ package utxo import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) type utxoOutpointEntryPair struct { diff --git a/domain/consensus/utils/utxo/utxo_iterator_with_diff.go b/domain/consensus/utils/utxo/utxo_iterator_with_diff.go index c3fa3e38d..859b1a99c 100644 --- a/domain/consensus/utils/utxo/utxo_iterator_with_diff.go +++ b/domain/consensus/utils/utxo/utxo_iterator_with_diff.go @@ -1,8 +1,12 @@ package utxo import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) type readOnlyUTXOIteratorWithDiff struct { diff --git a/domain/dagconfig/consensus_defaults.go b/domain/dagconfig/consensus_defaults.go index 96df0d921..024089582 100644 --- a/domain/dagconfig/consensus_defaults.go +++ b/domain/dagconfig/consensus_defaults.go @@ -1,8 +1,13 @@ package dagconfig import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" +======= +>>>>>>> Stashed changes "time" + + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" ) // The documentation refers to the following constants which aren't explicated in the code: diff --git a/domain/dagconfig/genesis.go b/domain/dagconfig/genesis.go index 185ff0fc2..4a683a27a 100644 --- a/domain/dagconfig/genesis.go +++ b/domain/dagconfig/genesis.go @@ -5,12 +5,21 @@ package dagconfig import ( +<<<<<<< Updated upstream "github.com/kaspanet/go-muhash" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" +======= +>>>>>>> Stashed changes "math/big" + + "github.com/kaspanet/go-muhash" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" ) var genesisTxOuts = []*externalapi.DomainTransactionOutput{} diff --git a/domain/domain.go b/domain/domain.go index 3a2f2f56e..fa10ffcce 100644 --- a/domain/domain.go +++ b/domain/domain.go @@ -7,6 +7,7 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensusreference" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/miningmanager" @@ -14,7 +15,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/prefixmanager" "github.com/zoomy-network/zoomyd/domain/prefixmanager/prefix" infrastructuredatabase "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/miningmanager" + "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" + "github.com/zoomy-network/zoomyd/domain/prefixmanager" + "github.com/zoomy-network/zoomyd/domain/prefixmanager/prefix" + infrastructuredatabase "github.com/zoomy-network/zoomyd/infrastructure/db/database" ) // Domain provides a reference to the domain's external aps diff --git a/domain/migrate.go b/domain/migrate.go index 7d486abde..84b16dc02 100644 --- a/domain/migrate.go +++ b/domain/migrate.go @@ -1,8 +1,12 @@ package domain import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "math" ) diff --git a/domain/miningmanager/blocktemplatebuilder/blocktemplatebuilder.go b/domain/miningmanager/blocktemplatebuilder/blocktemplatebuilder.go index 980cc75d1..f9e180e56 100644 --- a/domain/miningmanager/blocktemplatebuilder/blocktemplatebuilder.go +++ b/domain/miningmanager/blocktemplatebuilder/blocktemplatebuilder.go @@ -1,6 +1,7 @@ package blocktemplatebuilder import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/processes/coinbasemanager" "github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" @@ -15,7 +16,24 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" miningmanagerapi "github.com/zoomy-network/zoomyd/domain/miningmanager/model" +======= + "math" + "sort" + + "github.com/zoomy-network/zoomyd/domain/consensus/processes/coinbasemanager" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" + "github.com/zoomy-network/zoomyd/domain/consensusreference" + "github.com/zoomy-network/zoomyd/util/mstime" + + "github.com/zoomy-network/zoomyd/util/difficulty" + +>>>>>>> Stashed changes "github.com/pkg/errors" + consensusexternalapi "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + miningmanagerapi "github.com/zoomy-network/zoomyd/domain/miningmanager/model" ) type candidateTx struct { diff --git a/domain/miningmanager/factory.go b/domain/miningmanager/factory.go index 0664d31fd..904d4076a 100644 --- a/domain/miningmanager/factory.go +++ b/domain/miningmanager/factory.go @@ -1,12 +1,20 @@ package miningmanager import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensusreference" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/domain/miningmanager/blocktemplatebuilder" mempoolpkg "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" +======= +>>>>>>> Stashed changes "sync" "time" + + "github.com/zoomy-network/zoomyd/domain/consensusreference" + "github.com/zoomy-network/zoomyd/domain/dagconfig" + "github.com/zoomy-network/zoomyd/domain/miningmanager/blocktemplatebuilder" + mempoolpkg "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" ) // Factory instantiates new mining managers diff --git a/domain/miningmanager/mempool/check_transaction_standard_test.go b/domain/miningmanager/mempool/check_transaction_standard_test.go index 767caac97..6685e802c 100644 --- a/domain/miningmanager/mempool/check_transaction_standard_test.go +++ b/domain/miningmanager/mempool/check_transaction_standard_test.go @@ -17,10 +17,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" "github.com/zoomy-network/zoomyd/util" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" + "github.com/zoomy-network/zoomyd/util" ) func TestCalcMinRequiredTxRelayFee(t *testing.T) { diff --git a/domain/miningmanager/mempool/fill_inputs_and_get_missing_parents.go b/domain/miningmanager/mempool/fill_inputs_and_get_missing_parents.go index d2de7fcae..4251c7793 100644 --- a/domain/miningmanager/mempool/fill_inputs_and_get_missing_parents.go +++ b/domain/miningmanager/mempool/fill_inputs_and_get_missing_parents.go @@ -1,12 +1,20 @@ package mempool import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool/model" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool/model" ) func (mp *mempool) fillInputsAndGetMissingParents(transaction *externalapi.DomainTransaction) ( diff --git a/domain/miningmanager/mempool/mempool.go b/domain/miningmanager/mempool/mempool.go index 3f8d9f98b..288ee66b2 100644 --- a/domain/miningmanager/mempool/mempool.go +++ b/domain/miningmanager/mempool/mempool.go @@ -1,12 +1,22 @@ package mempool import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "sync" "github.com/zoomy-network/zoomyd/domain/consensusreference" +======= + "sync" + + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + + "github.com/zoomy-network/zoomyd/domain/consensusreference" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" miningmanagermodel "github.com/zoomy-network/zoomyd/domain/miningmanager/model" ) diff --git a/domain/miningmanager/mempool/orphan_pool.go b/domain/miningmanager/mempool/orphan_pool.go index 6f3836598..984193fa1 100644 --- a/domain/miningmanager/mempool/orphan_pool.go +++ b/domain/miningmanager/mempool/orphan_pool.go @@ -11,9 +11,14 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool/model" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool/model" ) type idToOrphanMap map[externalapi.DomainTransactionID]*model.OrphanTransaction diff --git a/domain/miningmanager/mempool/validate_and_insert_transaction.go b/domain/miningmanager/mempool/validate_and_insert_transaction.go index 248fb275c..032ae6d96 100644 --- a/domain/miningmanager/mempool/validate_and_insert_transaction.go +++ b/domain/miningmanager/mempool/validate_and_insert_transaction.go @@ -2,8 +2,14 @@ package mempool import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= + + "github.com/zoomy-network/zoomyd/infrastructure/logger" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" ) diff --git a/domain/miningmanager/mempool/validate_transaction.go b/domain/miningmanager/mempool/validate_transaction.go index 46f95603e..68863ebd6 100644 --- a/domain/miningmanager/mempool/validate_transaction.go +++ b/domain/miningmanager/mempool/validate_transaction.go @@ -2,8 +2,14 @@ package mempool import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" +======= + + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + +>>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" ) diff --git a/domain/miningmanager/miningmanager_test.go b/domain/miningmanager/miningmanager_test.go index e80d508f8..39b626c02 100644 --- a/domain/miningmanager/miningmanager_test.go +++ b/domain/miningmanager/miningmanager_test.go @@ -1,15 +1,19 @@ package miningmanager_test import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/cmd/kaspawallet/libkaspawallet" "github.com/zoomy-network/zoomyd/domain/consensusreference" "github.com/zoomy-network/zoomyd/domain/miningmanager/model" "github.com/zoomy-network/zoomyd/util" "github.com/zoomy-network/zoomyd/version" +======= +>>>>>>> Stashed changes "reflect" "strings" "testing" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" "github.com/zoomy-network/zoomyd/domain/consensus" @@ -23,7 +27,28 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" "github.com/zoomy-network/zoomyd/domain/miningmanager" +======= + "github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet" + "github.com/zoomy-network/zoomyd/domain/consensusreference" + "github.com/zoomy-network/zoomyd/domain/miningmanager/model" + "github.com/zoomy-network/zoomyd/util" + "github.com/zoomy-network/zoomyd/version" + + "github.com/zoomy-network/zoomyd/domain/miningmanager/mempool" + +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" + "github.com/zoomy-network/zoomyd/domain/miningmanager" ) // TestValidateAndInsertTransaction verifies that valid transactions were successfully inserted into the mempool. diff --git a/domain/utxoindex/serialization.go b/domain/utxoindex/serialization.go index c7363151e..fa6abc772 100644 --- a/domain/utxoindex/serialization.go +++ b/domain/utxoindex/serialization.go @@ -2,11 +2,19 @@ package utxoindex import ( "encoding/binary" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/pkg/errors" "google.golang.org/protobuf/proto" +======= +>>>>>>> Stashed changes "io" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database/serialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "google.golang.org/protobuf/proto" ) func serializeOutpoint(outpoint *externalapi.DomainOutpoint) ([]byte, error) { diff --git a/domain/utxoindex/serialization_test.go b/domain/utxoindex/serialization_test.go index c1e992062..4c22c05c3 100644 --- a/domain/utxoindex/serialization_test.go +++ b/domain/utxoindex/serialization_test.go @@ -2,11 +2,17 @@ package utxoindex import ( "encoding/binary" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/pkg/errors" +======= +>>>>>>> Stashed changes "io" "math/rand" "testing" + + "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) func Test_serializeHashes(t *testing.T) { diff --git a/domain/utxoindex/store.go b/domain/utxoindex/store.go index e42d8e160..0b5848f9b 100644 --- a/domain/utxoindex/store.go +++ b/domain/utxoindex/store.go @@ -3,11 +3,18 @@ package utxoindex import ( "encoding/binary" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/database/binaryserialization" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/db/database" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/database/binaryserialization" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) var utxoIndexBucket = database.MakeBucket([]byte("utxo-index")) diff --git a/domain/utxoindex/utxoindex.go b/domain/utxoindex/utxoindex.go index 10ecc47c9..17ecc83b2 100644 --- a/domain/utxoindex/utxoindex.go +++ b/domain/utxoindex/utxoindex.go @@ -1,11 +1,19 @@ package utxoindex import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/infrastructure/db/database" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "sync" + + "github.com/zoomy-network/zoomyd/domain" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) // UTXOIndex maintains an index between transaction scriptPublicKeys diff --git a/infrastructure/config/config.go b/infrastructure/config/config.go index 526e5def1..15a2481c2 100644 --- a/infrastructure/config/config.go +++ b/infrastructure/config/config.go @@ -18,13 +18,22 @@ import ( "github.com/btcsuite/go-socks/socks" "github.com/jessevdk/go-flags" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/util" "github.com/zoomy-network/zoomyd/util/network" "github.com/zoomy-network/zoomyd/version" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/dagconfig" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/util" + "github.com/zoomy-network/zoomyd/util/network" + "github.com/zoomy-network/zoomyd/version" ) const ( diff --git a/infrastructure/config/network.go b/infrastructure/config/network.go index 3e70a622d..030b85c9f 100644 --- a/infrastructure/config/network.go +++ b/infrastructure/config/network.go @@ -9,9 +9,14 @@ import ( "time" "github.com/jessevdk/go-flags" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/util/difficulty" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/dagconfig" + "github.com/zoomy-network/zoomyd/util/difficulty" ) // NetworkFlags holds the network configuration, that is which network is selected. diff --git a/infrastructure/db/database/ldb/cursor.go b/infrastructure/db/database/ldb/cursor.go index 8f31292aa..a7bcf0cbd 100644 --- a/infrastructure/db/database/ldb/cursor.go +++ b/infrastructure/db/database/ldb/cursor.go @@ -3,10 +3,14 @@ package ldb import ( "bytes" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/util" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" ) // LevelDBCursor is a thin wrapper around native leveldb iterators. diff --git a/infrastructure/db/database/ldb/leveldb.go b/infrastructure/db/database/ldb/leveldb.go index df0edcaad..b8c275f6b 100644 --- a/infrastructure/db/database/ldb/leveldb.go +++ b/infrastructure/db/database/ldb/leveldb.go @@ -1,12 +1,16 @@ package ldb import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb" ldbErrors "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" ) // LevelDB defines a thin wrapper around leveldb. diff --git a/infrastructure/db/database/ldb/transaction.go b/infrastructure/db/database/ldb/transaction.go index 6b98cd77c..3254d0bf5 100644 --- a/infrastructure/db/database/ldb/transaction.go +++ b/infrastructure/db/database/ldb/transaction.go @@ -1,9 +1,13 @@ package ldb import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/db/database" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" "github.com/syndtr/goleveldb/leveldb" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" ) // LevelDBTransaction is a thin wrapper around native leveldb diff --git a/infrastructure/network/addressmanager/addressmanager.go b/infrastructure/network/addressmanager/addressmanager.go index 661f35ddf..032900adb 100644 --- a/infrastructure/network/addressmanager/addressmanager.go +++ b/infrastructure/network/addressmanager/addressmanager.go @@ -11,8 +11,12 @@ import ( "sync" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) const ( diff --git a/infrastructure/network/addressmanager/localaddressmanager.go b/infrastructure/network/addressmanager/localaddressmanager.go index 4d60f7a5e..fb60e4cd2 100644 --- a/infrastructure/network/addressmanager/localaddressmanager.go +++ b/infrastructure/network/addressmanager/localaddressmanager.go @@ -7,8 +7,12 @@ import ( "strings" "sync" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) // AddressPriority type is used to describe the hierarchy of local address diff --git a/infrastructure/network/addressmanager/store.go b/infrastructure/network/addressmanager/store.go index f8fa480c6..85d911f69 100644 --- a/infrastructure/network/addressmanager/store.go +++ b/infrastructure/network/addressmanager/store.go @@ -2,10 +2,16 @@ package addressmanager import ( "encoding/binary" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/infrastructure/db/database" "github.com/zoomy-network/zoomyd/util/mstime" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/infrastructure/db/database" + "github.com/zoomy-network/zoomyd/util/mstime" "net" ) diff --git a/infrastructure/network/addressmanager/test_utils.go b/infrastructure/network/addressmanager/test_utils.go index 5073cdbb1..88a7fa571 100644 --- a/infrastructure/network/addressmanager/test_utils.go +++ b/infrastructure/network/addressmanager/test_utils.go @@ -4,9 +4,14 @@ import ( "net" "strconv" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) // AddAddressByIP adds an address where we are given an ip:port and not a diff --git a/infrastructure/network/connmanager/connmanager.go b/infrastructure/network/connmanager/connmanager.go index e41006ca0..edea3254a 100644 --- a/infrastructure/network/connmanager/connmanager.go +++ b/infrastructure/network/connmanager/connmanager.go @@ -6,9 +6,14 @@ import ( "sync/atomic" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/infrastructure/network/dnsseed" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/infrastructure/network/dnsseed" "github.com/zoomy-network/zoomyd/infrastructure/network/addressmanager" diff --git a/infrastructure/network/netadapter/netadapter.go b/infrastructure/network/netadapter/netadapter.go index c36528113..ef28ed1d6 100644 --- a/infrastructure/network/netadapter/netadapter.go +++ b/infrastructure/network/netadapter/netadapter.go @@ -4,13 +4,22 @@ import ( "sync" "sync/atomic" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/infrastructure/config" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/id" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/infrastructure/config" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/id" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver" ) // RouterInitializer is a function that initializes a new diff --git a/infrastructure/network/netadapter/netconnection.go b/infrastructure/network/netadapter/netconnection.go index e7c116725..39575d4eb 100644 --- a/infrastructure/network/netadapter/netconnection.go +++ b/infrastructure/network/netadapter/netconnection.go @@ -2,9 +2,14 @@ package netadapter import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "sync/atomic" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/id" diff --git a/infrastructure/network/netadapter/router/route.go b/infrastructure/network/netadapter/router/route.go index 1c7fd3af5..2a22ad22a 100644 --- a/infrastructure/network/netadapter/router/route.go +++ b/infrastructure/network/netadapter/router/route.go @@ -6,8 +6,12 @@ import ( "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) const ( diff --git a/infrastructure/network/netadapter/router/router.go b/infrastructure/network/netadapter/router/router.go index f85c79958..aabc91f8f 100644 --- a/infrastructure/network/netadapter/router/router.go +++ b/infrastructure/network/netadapter/router/router.go @@ -4,8 +4,12 @@ import ( "fmt" "sync" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) const outgoingRouteMaxMessages = appmessage.MaxInvPerMsg + DefaultMaxMessages diff --git a/infrastructure/network/netadapter/server/grpcserver/connection_loops.go b/infrastructure/network/netadapter/server/grpcserver/connection_loops.go index aa19bd2ae..8d151dc7d 100644 --- a/infrastructure/network/netadapter/server/grpcserver/connection_loops.go +++ b/infrastructure/network/netadapter/server/grpcserver/connection_loops.go @@ -10,8 +10,12 @@ import ( "sync" "time" +<<<<<<< Updated upstream routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" ) diff --git a/infrastructure/network/netadapter/server/grpcserver/grpc_connection.go b/infrastructure/network/netadapter/server/grpcserver/grpc_connection.go index f7f073f82..a7dbcceaa 100644 --- a/infrastructure/network/netadapter/server/grpcserver/grpc_connection.go +++ b/infrastructure/network/netadapter/server/grpcserver/grpc_connection.go @@ -5,9 +5,14 @@ import ( "sync" "sync/atomic" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/infrastructure/network/netadapter/server/grpcserver/grpc_server.go b/infrastructure/network/netadapter/server/grpcserver/grpc_server.go index 2eb62948b..f69ece46f 100644 --- a/infrastructure/network/netadapter/server/grpcserver/grpc_server.go +++ b/infrastructure/network/netadapter/server/grpcserver/grpc_server.go @@ -3,9 +3,14 @@ package grpcserver import ( "context" "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server" "github.com/zoomy-network/zoomyd/util/panics" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server" + "github.com/zoomy-network/zoomyd/util/panics" "google.golang.org/grpc" "google.golang.org/grpc/peer" "net" diff --git a/infrastructure/network/netadapter/server/grpcserver/p2pserver.go b/infrastructure/network/netadapter/server/grpcserver/p2pserver.go index c574d13c3..4f97aec7d 100644 --- a/infrastructure/network/netadapter/server/grpcserver/p2pserver.go +++ b/infrastructure/network/netadapter/server/grpcserver/p2pserver.go @@ -2,10 +2,16 @@ package grpcserver import ( "context" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" "github.com/zoomy-network/zoomyd/util/panics" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" + "github.com/zoomy-network/zoomyd/util/panics" "google.golang.org/grpc" "google.golang.org/grpc/encoding/gzip" "google.golang.org/grpc/peer" diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/common.go b/infrastructure/network/netadapter/server/grpcserver/protowire/common.go index 50f3952c8..ee3e968e3 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/common.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/common.go @@ -7,9 +7,14 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionid" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/util/mstime" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/util/mstime" ) var errorNil = errors.New("a required field is nil") diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_addresses.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_addresses.go index 84b205aad..a7aec6924 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_addresses.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_addresses.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_Addresses) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block.go index 7f8b49a2d..a4195348a 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_Block) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_headers.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_headers.go index 821e3113c..ad38bd849 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_headers.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_headers.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_BlockHeaders) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_locator.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_locator.go index 8dce77eea..e2ac26916 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_locator.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_locator.go @@ -1,9 +1,14 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) func (x *KaspadMessage_BlockLocator) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_with_trusted_data.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_with_trusted_data.go index 341b33c89..fb5dfc774 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_with_trusted_data.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_with_trusted_data.go @@ -1,9 +1,14 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "math/big" ) diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_with_trusted_data_v4.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_with_trusted_data_v4.go index a2a3898ab..4f7c0323b 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_with_trusted_data_v4.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block_with_trusted_data_v4.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_BlockWithTrustedDataV4) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_blocks_with_trusted_data.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_blocks_with_trusted_data.go index 51d219302..1c4cad34a 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_blocks_with_trusted_data.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_blocks_with_trusted_data.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_DoneBlocksWithTrustedData) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_headers.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_headers.go index 61f7bd9b2..55ed091bd 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_headers.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_headers.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_DoneHeaders) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_pruning_point_utxo_set_chunks.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_pruning_point_utxo_set_chunks.go index a4903a0d6..a10485aeb 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_pruning_point_utxo_set_chunks.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_done_pruning_point_utxo_set_chunks.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_DonePruningPointUtxoSetChunks) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_header.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_header.go index f5652dddd..dac9e1130 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_header.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_header.go @@ -1,10 +1,16 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/util/mstime" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/util/mstime" "math" "math/big" ) diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block.go index 143ce30da..7cfad972d 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_IbdBlock) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator.go index 445ec3928..8390dc564 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_IbdBlockLocator) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator_highest_hash.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator_highest_hash.go index ea6babdcb..2f60043a1 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator_highest_hash.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator_highest_hash.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_IbdBlockLocatorHighestHash) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator_highest_hash_not_found.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator_highest_hash_not_found.go index 5823a2812..3dce95fd7 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator_highest_hash_not_found.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_block_locator_highest_hash_not_found.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_IbdBlockLocatorHighestHashNotFound) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_chain_block_locator.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_chain_block_locator.go index 7c3daf552..5652da3d5 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_chain_block_locator.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ibd_chain_block_locator.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_IbdChainBlockLocator) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_inv_relay_block.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_inv_relay_block.go index 0310ff1c7..dae7d6950 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_inv_relay_block.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_inv_relay_block.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_InvRelayBlock) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_inv_transactions.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_inv_transactions.go index ab773ecf9..d6fbe8d06 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_inv_transactions.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_inv_transactions.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_InvTransactions) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ping.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ping.go index 98af985a4..bebfbc32f 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ping.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ping.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_Ping) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pong.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pong.go index b632f2755..f13d7766b 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pong.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pong.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_Pong) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_proof.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_proof.go index d42d05c72..fbe5c2e9a 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_proof.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_proof.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_PruningPointProof) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_utxo_set_chunk.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_utxo_set_chunk.go index c0afb0645..40c9aac59 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_utxo_set_chunk.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_point_utxo_set_chunk.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_PruningPointUtxoSetChunk) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_points.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_points.go index 4b6419092..00e8c8113 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_points.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_pruning_points.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_PruningPoints) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ready.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ready.go index 8090528c2..b8a09fa31 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ready.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_ready.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_Ready) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_reject.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_reject.go index c0a111de9..670cc7fac 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_reject.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_reject.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_Reject) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_addresses.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_addresses.go index d54737aca..30d7d96e3 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_addresses.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_addresses.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestAddresses) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_anticone.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_anticone.go index ae78eeef1..01296f7c1 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_anticone.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_anticone.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestAnticone) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_block_locator.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_block_locator.go index beb1f826b..1bf3b020a 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_block_locator.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_block_locator.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestBlockLocator) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_headers.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_headers.go index 6effd1a8c..c70a54b18 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_headers.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_headers.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestHeaders) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_ibd_blocks.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_ibd_blocks.go index f60f176f1..f1d370f47 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_ibd_blocks.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_ibd_blocks.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestIBDBlocks) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_ibd_chain_block_locator.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_ibd_chain_block_locator.go index 436de5d33..2745d1fd3 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_ibd_chain_block_locator.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_ibd_chain_block_locator.go @@ -1,9 +1,14 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) func (x *KaspadMessage_RequestIBDChainBlockLocator) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_headers.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_headers.go index 028937737..2ea838edf 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_headers.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_headers.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestNextHeaders) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_pruning_point_and_its_anticone_blocks.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_pruning_point_and_its_anticone_blocks.go index d0a9d7f07..fb81d40b3 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_pruning_point_and_its_anticone_blocks.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_pruning_point_and_its_anticone_blocks.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestNextPruningPointAndItsAnticoneBlocks) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_pruning_point_utxo_set_chunk.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_pruning_point_utxo_set_chunk.go index 0ca96650b..f09a266cf 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_pruning_point_utxo_set_chunk.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_next_pruning_point_utxo_set_chunk.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestNextPruningPointUtxoSetChunk) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_and_its_anticone.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_and_its_anticone.go index d6cc57668..92ff794a8 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_and_its_anticone.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_and_its_anticone.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestPruningPointAndItsAnticone) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_proof.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_proof.go index abe674a0f..050bf8241 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_proof.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_proof.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestPruningPointProof) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_utxo_set_and_block.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_utxo_set_and_block.go index d92ca0f37..5d5d2463c 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_utxo_set_and_block.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_pruning_point_utxo_set_and_block.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestPruningPointUTXOSet) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_relay_blocks.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_relay_blocks.go index 733b22f58..38edcd3a9 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_relay_blocks.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_relay_blocks.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestRelayBlocks) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_transactions.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_transactions.go index b519ef82a..a32c920e2 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_transactions.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_request_transactions.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_RequestTransactions) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_transaction.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_transaction.go index b8628f728..43ff6ae04 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_transaction.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_transaction.go @@ -3,8 +3,12 @@ package protowire import ( "math" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_Transaction) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_transaction_not_found.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_transaction_not_found.go index 8c84546f8..b497f1080 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_transaction_not_found.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_transaction_not_found.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_TransactionNotFound) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_trusted_data.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_trusted_data.go index 86c85d7e3..6704f9ec9 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_trusted_data.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_trusted_data.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_TrustedData) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_verack.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_verack.go index a65fd17f4..1df6fc99b 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_verack.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_verack.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_Verack) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_version.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_version.go index e90541c58..2985d6d5f 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_version.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_version.go @@ -1,10 +1,16 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/id" "github.com/zoomy-network/zoomyd/util/mstime" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/id" + "github.com/zoomy-network/zoomyd/util/mstime" ) func (x *KaspadMessage_Version) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_add_peer.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_add_peer.go index 1266a7d5e..d4868445f 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_add_peer.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_add_peer.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_AddPeerRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_ban.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_ban.go index dec04025e..e2476b1be 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_ban.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_ban.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_BanRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_error.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_error.go index 532c51314..aa7772162 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_error.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_error.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *RPCError) toAppMessage() (*appmessage.RPCError, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_estimate_network_hashes_per_second.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_estimate_network_hashes_per_second.go index 2693f82fc..cfea16aca 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_estimate_network_hashes_per_second.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_estimate_network_hashes_per_second.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_EstimateNetworkHashesPerSecondRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_balance_by_address.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_balance_by_address.go index 1b0a85467..cec116992 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_balance_by_address.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_balance_by_address.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetBalanceByAddressRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_balances_by_addresses.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_balances_by_addresses.go index 000c20cf2..a9bc27d76 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_balances_by_addresses.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_balances_by_addresses.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetBalancesByAddressesRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block.go index 3bad4fdba..eb0e4bf3b 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetBlockRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_count.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_count.go index 4a773685c..728c551b5 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_count.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_count.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetBlockCountRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_dag_info.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_dag_info.go index 2f10b1ad4..ab32816a8 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_dag_info.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_dag_info.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetBlockDagInfoRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_template.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_template.go index ac08b80f3..f7993c627 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_template.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_block_template.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetBlockTemplateRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_blocks.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_blocks.go index 1b7b87909..495459508 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_blocks.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_blocks.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetBlocksRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_connected_peer_info.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_connected_peer_info.go index d093a3b9c..89d14810c 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_connected_peer_info.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_connected_peer_info.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetConnectedPeerInfoRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_current_network.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_current_network.go index 885ddf223..1f844490e 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_current_network.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_current_network.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetCurrentNetworkRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_headers.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_headers.go index 13b147aea..53fb0f166 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_headers.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_headers.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetHeadersRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_info.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_info.go index bc3b4a11b..9da86d72e 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_info.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_info.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetInfoRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entries.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entries.go index 6959a0817..467aa62b6 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entries.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entries.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetMempoolEntriesRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entries_by_addresses.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entries_by_addresses.go index fea264f23..d9ad8a77a 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entries_by_addresses.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entries_by_addresses.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetMempoolEntriesByAddressesRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entry.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entry.go index 5fb377b73..079946040 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entry.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_mempool_entry.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetMempoolEntryRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_peer_addresses.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_peer_addresses.go index 2c9848e01..ea654d5f2 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_peer_addresses.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_peer_addresses.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetPeerAddressesRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_selected_tip_hash.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_selected_tip_hash.go index a133908fc..d872a49e5 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_selected_tip_hash.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_selected_tip_hash.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetSelectedTipHashRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_subnetwork.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_subnetwork.go index bb5d6ab05..3fec414f3 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_subnetwork.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_subnetwork.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetSubnetworkRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_supply.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_supply.go index 4de6ff07f..3c088c159 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_supply.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_supply.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetCoinSupplyRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_utxos_by_addresses.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_utxos_by_addresses.go index 5f89340eb..3a2bcf35b 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_utxos_by_addresses.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_utxos_by_addresses.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetUtxosByAddressesRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_virtual_selected_parent_blue_score.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_virtual_selected_parent_blue_score.go index 77b8d17b9..981ba3756 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_virtual_selected_parent_blue_score.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_virtual_selected_parent_blue_score.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetVirtualSelectedParentBlueScoreRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_virtual_selected_parent_chain_from_block.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_virtual_selected_parent_chain_from_block.go index 635be5489..19be1e5bc 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_virtual_selected_parent_chain_from_block.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_get_virtual_selected_parent_chain_from_block.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_GetVirtualSelectedParentChainFromBlockRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_block_added.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_block_added.go index ea401c169..9e0faaca9 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_block_added.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_block_added.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_NotifyBlockAddedRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_finality_conflicts.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_finality_conflicts.go index fe0268dfe..0e323e0df 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_finality_conflicts.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_finality_conflicts.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_NotifyFinalityConflictsRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_new_block_template.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_new_block_template.go index 219c5781e..8916997bf 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_new_block_template.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_new_block_template.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_NotifyNewBlockTemplateRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_pruning_point_utxo_set_override.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_pruning_point_utxo_set_override.go index 8226550ee..6d0b48f80 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_pruning_point_utxo_set_override.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_pruning_point_utxo_set_override.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_NotifyPruningPointUTXOSetOverrideRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_utxos_changed.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_utxos_changed.go index 9142efe19..5e1611664 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_utxos_changed.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_utxos_changed.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_NotifyUtxosChangedRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_daa_score_changed.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_daa_score_changed.go index 17c19198e..d0b9df2f1 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_daa_score_changed.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_daa_score_changed.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_NotifyVirtualDaaScoreChangedRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_selected_parent_blue_score_changed.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_selected_parent_blue_score_changed.go index db52ac22a..cb0e6ee16 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_selected_parent_blue_score_changed.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_selected_parent_blue_score_changed.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_NotifyVirtualSelectedParentBlueScoreChangedRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_selected_parent_chain_changed.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_selected_parent_chain_changed.go index 6e9a6456d..73d1f5c90 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_selected_parent_chain_changed.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_notify_virtual_selected_parent_chain_changed.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_NotifyVirtualSelectedParentChainChangedRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_resolve_finality_conflict.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_resolve_finality_conflict.go index 72852b35f..dbb7bba6c 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_resolve_finality_conflict.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_resolve_finality_conflict.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_ResolveFinalityConflictRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_shut_down.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_shut_down.go index 31c89544c..a873ab4a8 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_shut_down.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_shut_down.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_ShutDownRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_stop_notifying_utxos_changed.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_stop_notifying_utxos_changed.go index cf3e5f40a..24987a95a 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_stop_notifying_utxos_changed.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_stop_notifying_utxos_changed.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_StopNotifyingUtxosChangedRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_submit_block.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_submit_block.go index 0c0c3a7b0..14f3f14bc 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_submit_block.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_submit_block.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" "math" ) diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_submit_transaction.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_submit_transaction.go index 3e2bb0133..b944422fc 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_submit_transaction.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_submit_transaction.go @@ -3,8 +3,12 @@ package protowire import ( "math" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_SubmitTransactionRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_unban.go b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_unban.go index e2e7bb7e7..0e06df185 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_unban.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/rpc_unban.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) func (x *KaspadMessage_UnbanRequest) toAppMessage() (appmessage.Message, error) { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/wire.go b/infrastructure/network/netadapter/server/grpcserver/protowire/wire.go index adce1c449..f8fda1cca 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/wire.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/wire.go @@ -1,8 +1,12 @@ package protowire import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" ) type converter interface { diff --git a/infrastructure/network/rpcclient/grpcclient/grpcclient.go b/infrastructure/network/rpcclient/grpcclient/grpcclient.go index 30fcd014a..153fd0479 100644 --- a/infrastructure/network/rpcclient/grpcclient/grpcclient.go +++ b/infrastructure/network/rpcclient/grpcclient/grpcclient.go @@ -2,11 +2,18 @@ package grpcclient import ( "context" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" "google.golang.org/grpc" "google.golang.org/grpc/encoding/gzip" "io" diff --git a/infrastructure/network/rpcclient/grpcclient/post.go b/infrastructure/network/rpcclient/grpcclient/post.go index a6f1903f3..4442f76e9 100644 --- a/infrastructure/network/rpcclient/grpcclient/post.go +++ b/infrastructure/network/rpcclient/grpcclient/post.go @@ -1,9 +1,14 @@ package grpcclient import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/infrastructure/network/rpcclient/rpc_on_block_added.go b/infrastructure/network/rpcclient/rpc_on_block_added.go index d45cce128..048039ad3 100644 --- a/infrastructure/network/rpcclient/rpc_on_block_added.go +++ b/infrastructure/network/rpcclient/rpc_on_block_added.go @@ -1,9 +1,14 @@ package rpcclient import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RegisterForBlockAddedNotifications sends an RPC request respective to the function's name and returns the RPC server's response. diff --git a/infrastructure/network/rpcclient/rpc_on_chain_changed.go b/infrastructure/network/rpcclient/rpc_on_chain_changed.go index b185288bb..2e8901378 100644 --- a/infrastructure/network/rpcclient/rpc_on_chain_changed.go +++ b/infrastructure/network/rpcclient/rpc_on_chain_changed.go @@ -1,9 +1,14 @@ package rpcclient import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RegisterForVirtualSelectedParentChainChangedNotifications sends an RPC request respective to the function's name and returns the RPC server's response. diff --git a/infrastructure/network/rpcclient/rpc_on_finality_conflicts.go b/infrastructure/network/rpcclient/rpc_on_finality_conflicts.go index 426ad2379..14f7c5f86 100644 --- a/infrastructure/network/rpcclient/rpc_on_finality_conflicts.go +++ b/infrastructure/network/rpcclient/rpc_on_finality_conflicts.go @@ -1,9 +1,14 @@ package rpcclient import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RegisterForFinalityConflictsNotifications sends an RPC request respective to the function's name and returns the RPC server's response. diff --git a/infrastructure/network/rpcclient/rpc_on_new_block_template.go b/infrastructure/network/rpcclient/rpc_on_new_block_template.go index 22732dce6..ad7fd0816 100644 --- a/infrastructure/network/rpcclient/rpc_on_new_block_template.go +++ b/infrastructure/network/rpcclient/rpc_on_new_block_template.go @@ -1,9 +1,14 @@ package rpcclient import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RegisterForNewBlockTemplateNotifications sends an RPC request respective to the function's name and returns the RPC server's response. diff --git a/infrastructure/network/rpcclient/rpc_on_pruning_point_utxo_set_override.go b/infrastructure/network/rpcclient/rpc_on_pruning_point_utxo_set_override.go index b09e46d81..edeaf361a 100644 --- a/infrastructure/network/rpcclient/rpc_on_pruning_point_utxo_set_override.go +++ b/infrastructure/network/rpcclient/rpc_on_pruning_point_utxo_set_override.go @@ -1,9 +1,14 @@ package rpcclient import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RegisterPruningPointUTXOSetNotifications sends an RPC request respective to the function's name and returns the RPC server's response. diff --git a/infrastructure/network/rpcclient/rpc_on_utxos_changed.go b/infrastructure/network/rpcclient/rpc_on_utxos_changed.go index 4786d0511..33b51bacf 100644 --- a/infrastructure/network/rpcclient/rpc_on_utxos_changed.go +++ b/infrastructure/network/rpcclient/rpc_on_utxos_changed.go @@ -1,9 +1,14 @@ package rpcclient import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RegisterForUTXOsChangedNotifications sends an RPC request respective to the function's name and returns the RPC server's response. diff --git a/infrastructure/network/rpcclient/rpc_on_virtual_daa_score_changed.go b/infrastructure/network/rpcclient/rpc_on_virtual_daa_score_changed.go index 3d599291c..c175ec375 100644 --- a/infrastructure/network/rpcclient/rpc_on_virtual_daa_score_changed.go +++ b/infrastructure/network/rpcclient/rpc_on_virtual_daa_score_changed.go @@ -1,9 +1,14 @@ package rpcclient import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RegisterForVirtualDaaScoreChangedNotifications sends an RPC request respective to the function's diff --git a/infrastructure/network/rpcclient/rpc_on_virtual_selected_parent_blue_score_changed.go b/infrastructure/network/rpcclient/rpc_on_virtual_selected_parent_blue_score_changed.go index 75ae3511e..9dbec1f51 100644 --- a/infrastructure/network/rpcclient/rpc_on_virtual_selected_parent_blue_score_changed.go +++ b/infrastructure/network/rpcclient/rpc_on_virtual_selected_parent_blue_score_changed.go @@ -1,9 +1,14 @@ package rpcclient import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" ) // RegisterForVirtualSelectedParentBlueScoreChangedNotifications sends an RPC request respective to the function's diff --git a/infrastructure/network/rpcclient/rpcclient.go b/infrastructure/network/rpcclient/rpcclient.go index 06016df7b..cf7baf9c7 100644 --- a/infrastructure/network/rpcclient/rpcclient.go +++ b/infrastructure/network/rpcclient/rpcclient.go @@ -4,13 +4,22 @@ import ( "sync/atomic" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/infrastructure/logger" routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient/grpcclient" "github.com/zoomy-network/zoomyd/util/panics" "github.com/zoomy-network/zoomyd/version" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" + "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient/grpcclient" + "github.com/zoomy-network/zoomyd/util/panics" + "github.com/zoomy-network/zoomyd/version" ) const defaultTimeout = 30 * time.Second diff --git a/stability-tests/application-level-garbage/read.go b/stability-tests/application-level-garbage/read.go index db77cb545..5f84040fe 100644 --- a/stability-tests/application-level-garbage/read.go +++ b/stability-tests/application-level-garbage/read.go @@ -3,9 +3,14 @@ package main import ( "encoding/json" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/stability-tests/common" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/stability-tests/common" ) var blockBuffer []byte diff --git a/stability-tests/application-level-garbage/send.go b/stability-tests/application-level-garbage/send.go index cffcf0ad2..67cf4ca27 100644 --- a/stability-tests/application-level-garbage/send.go +++ b/stability-tests/application-level-garbage/send.go @@ -1,12 +1,20 @@ package main import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/standalone" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/app/protocol/common" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/standalone" ) func sendBlocks(address string, minimalNetAdapter *standalone.MinimalNetAdapter, blocksChan <-chan *externalapi.DomainBlock) error { diff --git a/stability-tests/common/cmd.go b/stability-tests/common/cmd.go index bc5d3efa4..42d02fabb 100644 --- a/stability-tests/common/cmd.go +++ b/stability-tests/common/cmd.go @@ -5,9 +5,14 @@ import ( "os/exec" "strings" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/infrastructure/logger" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/dagconfig" + "github.com/zoomy-network/zoomyd/infrastructure/logger" ) // StartCmd runs a command as a separate process. diff --git a/stability-tests/common/mine/mine.go b/stability-tests/common/mine/mine.go index 5613705f8..76b211e5e 100644 --- a/stability-tests/common/mine/mine.go +++ b/stability-tests/common/mine/mine.go @@ -6,6 +6,7 @@ import ( "strings" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" @@ -13,7 +14,16 @@ import ( "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/domain/consensus/utils/mining" "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/model/testapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/mining" + "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" ) // FromFile mines all blocks as described by `jsonFile` diff --git a/stability-tests/infra-level-garbage/send.go b/stability-tests/infra-level-garbage/send.go index 9844dee92..ee563e241 100644 --- a/stability-tests/infra-level-garbage/send.go +++ b/stability-tests/infra-level-garbage/send.go @@ -5,8 +5,12 @@ import ( "net" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/protocol/common" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/protocol/common" ) func sendMessages(address string, messagesChan <-chan []byte) error { diff --git a/stability-tests/kaspadsanity/commandloop.go b/stability-tests/kaspadsanity/commandloop.go index 6ccf36b36..a18387edc 100644 --- a/stability-tests/kaspadsanity/commandloop.go +++ b/stability-tests/kaspadsanity/commandloop.go @@ -7,9 +7,14 @@ import ( "strings" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/logger" "github.com/zoomy-network/zoomyd/stability-tests/common" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/logger" + "github.com/zoomy-network/zoomyd/stability-tests/common" ) type commandFailure struct { diff --git a/stability-tests/kaspadsanity/main.go b/stability-tests/kaspadsanity/main.go index c44e040e9..a6fbbfc79 100644 --- a/stability-tests/kaspadsanity/main.go +++ b/stability-tests/kaspadsanity/main.go @@ -7,8 +7,12 @@ import ( "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/util/profiling" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/util/panics" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/util/panics" ) func main() { diff --git a/stability-tests/many-tips/main.go b/stability-tests/many-tips/main.go index e362a3980..c55e9cb9d 100644 --- a/stability-tests/many-tips/main.go +++ b/stability-tests/many-tips/main.go @@ -15,11 +15,18 @@ import ( "syscall" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" "github.com/zoomy-network/zoomyd/util/panics" "github.com/zoomy-network/zoomyd/util/profiling" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" + "github.com/zoomy-network/zoomyd/util/panics" + "github.com/zoomy-network/zoomyd/util/profiling" ) const rpcAddress = "localhost:9000" diff --git a/stability-tests/minejson/main.go b/stability-tests/minejson/main.go index 3bc9a3ece..103018e0b 100644 --- a/stability-tests/minejson/main.go +++ b/stability-tests/minejson/main.go @@ -1,13 +1,22 @@ package main import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/stability-tests/common/mine" "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" "github.com/zoomy-network/zoomyd/util/panics" "github.com/zoomy-network/zoomyd/util/profiling" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/stability-tests/common/mine" + "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" + "github.com/zoomy-network/zoomyd/util/panics" + "github.com/zoomy-network/zoomyd/util/profiling" ) func main() { diff --git a/stability-tests/netsync/chain_generator/main.go b/stability-tests/netsync/chain_generator/main.go index 29207cecf..b276bc211 100644 --- a/stability-tests/netsync/chain_generator/main.go +++ b/stability-tests/netsync/chain_generator/main.go @@ -5,9 +5,14 @@ import ( "os" "strconv" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/stability-tests/common/mine" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/stability-tests/common/mine" ) func main() { diff --git a/stability-tests/netsync/check_resolve_virtual.go b/stability-tests/netsync/check_resolve_virtual.go index 97e5d3e52..bd471199a 100644 --- a/stability-tests/netsync/check_resolve_virtual.go +++ b/stability-tests/netsync/check_resolve_virtual.go @@ -2,9 +2,14 @@ package main import ( "fmt" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" "time" ) diff --git a/stability-tests/netsync/main.go b/stability-tests/netsync/main.go index b245dffa8..634b1777b 100644 --- a/stability-tests/netsync/main.go +++ b/stability-tests/netsync/main.go @@ -3,10 +3,16 @@ package main import ( "sync/atomic" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/util/panics" "github.com/zoomy-network/zoomyd/util/profiling" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/util/panics" + "github.com/zoomy-network/zoomyd/util/profiling" ) func main() { diff --git a/stability-tests/netsync/node.go b/stability-tests/netsync/node.go index 87d5e96b5..5b55463bc 100644 --- a/stability-tests/netsync/node.go +++ b/stability-tests/netsync/node.go @@ -9,13 +9,22 @@ import ( "syscall" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/stability-tests/common/mine" "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" "github.com/zoomy-network/zoomyd/util" "github.com/zoomy-network/zoomyd/util/panics" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/stability-tests/common/mine" + "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" + "github.com/zoomy-network/zoomyd/util" + "github.com/zoomy-network/zoomyd/util/panics" ) const ( diff --git a/stability-tests/orphans/check_top_is_tip.go b/stability-tests/orphans/check_top_is_tip.go index 7d9592791..ff8f6105d 100644 --- a/stability-tests/orphans/check_top_is_tip.go +++ b/stability-tests/orphans/check_top_is_tip.go @@ -1,10 +1,16 @@ package main import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" ) func checkTopBlockIsTip(rpcClient *rpc.Client, topBlock *externalapi.DomainBlock) error { diff --git a/stability-tests/orphans/prepare_blocks.go b/stability-tests/orphans/prepare_blocks.go index c41174f71..b41bfd4a4 100644 --- a/stability-tests/orphans/prepare_blocks.go +++ b/stability-tests/orphans/prepare_blocks.go @@ -1,13 +1,22 @@ package main import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/infrastructure/db/database/ldb" "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/stability-tests/common/mine" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/infrastructure/db/database/ldb" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/stability-tests/common/mine" ) const leveldbCacheSizeMiB = 256 diff --git a/stability-tests/orphans/send_blocks.go b/stability-tests/orphans/send_blocks.go index a1dca6141..4f2a81d89 100644 --- a/stability-tests/orphans/send_blocks.go +++ b/stability-tests/orphans/send_blocks.go @@ -1,11 +1,18 @@ package main import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/standalone" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" + "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/standalone" ) func sendBlocks(routes *standalone.Routes, blocks []*externalapi.DomainBlock, topBlock *externalapi.DomainBlock) error { diff --git a/stability-tests/rpc-idle-clients/main.go b/stability-tests/rpc-idle-clients/main.go index e1545b2ee..ea4926871 100644 --- a/stability-tests/rpc-idle-clients/main.go +++ b/stability-tests/rpc-idle-clients/main.go @@ -3,11 +3,18 @@ package main import ( "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" "github.com/zoomy-network/zoomyd/util/panics" "github.com/zoomy-network/zoomyd/util/profiling" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" + "github.com/zoomy-network/zoomyd/util/panics" + "github.com/zoomy-network/zoomyd/util/profiling" ) func main() { diff --git a/stability-tests/rpc-stability/main.go b/stability-tests/rpc-stability/main.go index d44ca5927..79f137af5 100644 --- a/stability-tests/rpc-stability/main.go +++ b/stability-tests/rpc-stability/main.go @@ -1,11 +1,18 @@ package main import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient/grpcclient" "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/util/panics" "github.com/zoomy-network/zoomyd/util/profiling" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient/grpcclient" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/util/panics" + "github.com/zoomy-network/zoomyd/util/profiling" ) func main() { diff --git a/stability-tests/rpc-stability/send.go b/stability-tests/rpc-stability/send.go index 23014000f..04080ec4b 100644 --- a/stability-tests/rpc-stability/send.go +++ b/stability-tests/rpc-stability/send.go @@ -1,8 +1,12 @@ package main import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient/grpcclient" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient/grpcclient" ) func sendCommands(rpcClient *grpcclient.GRPCClient, commandsChan <-chan string) error { diff --git a/stability-tests/simple-sync/main.go b/stability-tests/simple-sync/main.go index 89d094b57..cde60adf0 100644 --- a/stability-tests/simple-sync/main.go +++ b/stability-tests/simple-sync/main.go @@ -4,11 +4,18 @@ import ( "os" "sync/atomic" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" "github.com/zoomy-network/zoomyd/util/panics" "github.com/zoomy-network/zoomyd/util/profiling" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" + "github.com/zoomy-network/zoomyd/util/panics" + "github.com/zoomy-network/zoomyd/util/profiling" ) func main() { diff --git a/stability-tests/simple-sync/mineloop.go b/stability-tests/simple-sync/mineloop.go index 341c857b3..0f04e82d1 100644 --- a/stability-tests/simple-sync/mineloop.go +++ b/stability-tests/simple-sync/mineloop.go @@ -4,11 +4,18 @@ import ( "time" "github.com/kaspanet/go-secp256k1" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" "github.com/zoomy-network/zoomyd/util" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/app/appmessage" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/stability-tests/common/rpc" + "github.com/zoomy-network/zoomyd/util" ) func mineLoop(syncerRPCClient, syncedRPCClient *rpc.Client) error { diff --git a/stability-tests/simple-sync/start-nodes.go b/stability-tests/simple-sync/start-nodes.go index 7c561df8d..e57fda249 100644 --- a/stability-tests/simple-sync/start-nodes.go +++ b/stability-tests/simple-sync/start-nodes.go @@ -7,9 +7,14 @@ import ( "sync/atomic" "time" +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/stability-tests/common" "github.com/zoomy-network/zoomyd/util/panics" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/stability-tests/common" + "github.com/zoomy-network/zoomyd/util/panics" ) const ( diff --git a/util/amount.go b/util/amount.go index cf28aab6d..cadc713f4 100644 --- a/util/amount.go +++ b/util/amount.go @@ -5,8 +5,12 @@ package util import ( +<<<<<<< Updated upstream "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" +======= +>>>>>>> Stashed changes "github.com/pkg/errors" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/constants" "math" "strconv" )