Skip to content

Commit

Permalink
Revert changes made in cb3ed79, we will test full cycles for now
Browse files Browse the repository at this point in the history
  • Loading branch information
@who-biz
who-biz committed Nov 30, 2023
1 parent 4e0e1b7 commit 6392022
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/cryptonote_core/blockchain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4170,8 +4170,8 @@ bool Blockchain::handle_block_to_main_chain(const block& bl, const crypto::hash&
if (btc_ht != current_height)
{
MWARNING("Attempting to add duplicate btc_tx_data at a subsequent height! btcindex height: " << btc_ht << ", current ht: " << current_height);
MWARNING("Normally, this breaks consensus, continuing for testing sake");
//goto leave;
//MWARNING("Normally, this breaks consensus, continuing for testing sake");
goto leave;
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/cryptonote_core/cryptonote_tx_utils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ namespace cryptonote
return true;
}
//---------------------------------------------------------------
bool construct_ntz_tx_with_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, std::string& kmd_tx_data, bool rct, bool bulletproof, rct::multisig_out *msout)
bool construct_ntz_tx_with_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, std::string const& kmd_tx_data, bool rct, bool bulletproof, rct::multisig_out *msout)
{
hw::device &hwdev = sender_account_keys.get_device();

Expand Down Expand Up @@ -709,9 +709,9 @@ namespace cryptonote
if (!kmd_tx_data.empty()) {
MWARNING("---> in construct_ntz_tx_with_keys: \n" << kmd_tx_data << "\n");
} else {
kmd_tx_data = "0200000001a0a89b8918a22833c4b2e78291e552d1d7a3300b7c668e8b33eb062bc514b117010000006a47304402202a76f9e59c55f1c311e966a8404a24871fda721a91998bf19641075b2da03553022069cf893435e51eac89131b1856f838ff65525ac9cd22abaf01415cb5aea60bcf012103521b4ff796c5bed14f1809d643045c0c958580763afc048cdcb18ec5dada39f0ffffffff02d23b05000000000017a914383989ff759dbaa9b5924b877b01c5ce466cf5ff8799a90b00000000001976a9149c3226a30ece15b4f2de69eb3fa54aff8afc009a88ac00000000";
MWARNING("Notarization data from iguana not yet received - inserting mock data to proceed");
//return false;
//kmd_tx_data = "0200000001a0a89b8918a22833c4b2e78291e552d1d7a3300b7c668e8b33eb062bc514b117010000006a47304402202a76f9e59c55f1c311e966a8404a24871fda721a91998bf19641075b2da03553022069cf893435e51eac89131b1856f838ff65525ac9cd22abaf01415cb5aea60bcf012103521b4ff796c5bed14f1809d643045c0c958580763afc048cdcb18ec5dada39f0ffffffff02d23b05000000000017a914383989ff759dbaa9b5924b877b01c5ce466cf5ff8799a90b00000000001976a9149c3226a30ece15b4f2de69eb3fa54aff8afc009a88ac00000000";
MWARNING("Notarization data from iguana not yet received - waiting until KMD notarization cycle completes");
return false;
}

if (!add_ntz_txn_to_extra(extra_to_parse, kmd_tx_data)) {
Expand Down Expand Up @@ -1058,7 +1058,7 @@ namespace cryptonote
return r;
}
//---------------------------------------------------------------
bool construct_ntz_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, std::string& kmd_tx_data, bool rct, bool bulletproof, rct::multisig_out *msout)
bool construct_ntz_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, std::string const& kmd_tx_data, bool rct, bool bulletproof, rct::multisig_out *msout)
{
hw::device &hwdev = sender_account_keys.get_device();
hwdev.open_tx(tx_key);
Expand Down
4 changes: 2 additions & 2 deletions src/cryptonote_core/cryptonote_tx_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ namespace cryptonote
bool get_ntz_signer_index(account_keys const& keys, int& signer_index);
bool construct_tx(const account_keys& sender_account_keys, std::vector<tx_source_entry> &sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time);
bool construct_tx_with_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, bool rct = false, bool bulletproof = false, rct::multisig_out *msout = NULL);
bool construct_ntz_tx_with_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, std::string& kmd_tx_data, bool rct = false, bool bulletproof = false, rct::multisig_out *msout = NULL);
bool construct_ntz_tx_with_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, std::string const& kmd_tx_data, bool rct = false, bool bulletproof = false, rct::multisig_out *msout = NULL);
bool construct_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, bool rct = false, bool bulletproof = false, rct::multisig_out *msout = NULL);
bool construct_ntz_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, std::string& kmd_tx_data, bool rct = false, bool bulletproof = false, rct::multisig_out *msout = NULL);
bool construct_ntz_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, std::string const& kmd_tx_data, bool rct = false, bool bulletproof = false, rct::multisig_out *msout = NULL);
// bool construct_ntz_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses,std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, bool rct = false, bool bulletproof = false);
bool generate_genesis_block(block& bl, network_type nettype);
}
Expand Down

0 comments on commit 6392022

Please sign in to comment.