WIP: continue work on merge

src/bin/dashboard_src/send_screen.rs

@@ -8,7 +8,7 @@ use crossterm::event::Event;
 use crossterm::event::KeyCode;
 use crossterm::event::KeyEventKind;
 use neptune_core::config_models::network::Network;
-use neptune_core::models::blockchain::transaction::UtxoNotifyMethod;
+use neptune_core::models::blockchain::transaction::transaction_output::UtxoNotifyMethod;
 use neptune_core::models::blockchain::type_scripts::neptune_coins::NeptuneCoins;
 use neptune_core::models::state::wallet::address::ReceivingAddress;
 use neptune_core::rpc_server::RPCClient;

src/bin/neptune-cli.rs

@@ -14,7 +14,7 @@ use clap_complete::Shell;
 use neptune_core::config_models::data_directory::DataDirectory;
 use neptune_core::config_models::network::Network;
 use neptune_core::models::blockchain::block::block_selector::BlockSelector;
-use neptune_core::models::blockchain::transaction::UtxoNotifyMethod;
+use neptune_core::models::blockchain::transaction::transaction_output::UtxoNotifyMethod;
 use neptune_core::models::blockchain::type_scripts::neptune_coins::NeptuneCoins;
 use neptune_core::models::state::wallet::address::KeyType;
 use neptune_core::models::state::wallet::address::ReceivingAddress;

src/main_loop.rs

@@ -37,6 +37,7 @@ use crate::models::peer::HandshakeData;
 use crate::models::peer::PeerInfo;
 use crate::models::peer::PeerSynchronizationState;
 use crate::models::peer::TransactionNotification;
+use crate::models::state::wallet::expected_utxo;
 use crate::models::state::GlobalStateLock;
 use crate::prelude::twenty_first;
 
@@ -1011,7 +1012,7 @@ impl MainLoopHandler {
     /// after handling this message.
     async fn handle_rpc_server_message(&mut self, msg: RPCServerToMain) -> Result<bool> {
         match msg {
-            RPCServerToMain::Send(transaction) => {
+            RPCServerToMain::BroadcastTx(transaction) => {
                 debug!(
                     "`main` received following transaction from RPC Server. {} inputs, {} outputs. Synced to mutator set hash: {}",
                     transaction.kernel.inputs.len(),

src/mine_loop.rs

@@ -291,7 +291,7 @@ pub(crate) fn make_coinbase_transaction(
         vec![coinbase_utxo.clone()],
         vec![sender_randomness],
         vec![receiver_digest],
-        &kernel,
+        kernel,
         mutator_set_accumulator,
     );
 
@@ -310,7 +310,7 @@ pub(crate) fn make_coinbase_transaction(
 
     (
         Transaction {
-            kernel,
+            kernel: primitive_witness.kernel,
             proof: TransactionProof::SingleProof(proof),
         },
         utxo_info_for_coinbase,

src/models/blockchain/transaction/mod.rs

@@ -8,7 +8,7 @@ use crate::prelude::twenty_first;
 pub mod lock_script;
 pub mod primitive_witness;
 pub mod transaction_kernel;
-pub(crate) mod transaction_output;
+pub mod transaction_output;
 pub mod utxo;
 pub mod validity;