Skip to content

Commit

Permalink
dns: more record changes, <1K fee bug: fix
Browse files Browse the repository at this point in the history
  • Loading branch information
hayzamjs committed Jul 31, 2023
1 parent 9ae889e commit a2a06dd
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 22 deletions.
17 changes: 3 additions & 14 deletions src/debug_utilities/dns_checks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,9 @@ int main(int argc, char* argv[])
mlog_configure("", true);
mlog_set_categories("+" scala_DEFAULT_LOG_CATEGORY ":INFO");

lookup(LOOKUP_A, {"seeds.scalaseeds.se", "seeds.scalaseeds.ae.org", "seeds.scalaseeds.ch", "seeds.scalaseeds.li"});

lookup(LOOKUP_TXT, {"updates.scalapulse.org", "updates.scalapulse.net", "updates.scalapulse.co", "updates.scalapulse.se", "updates.scalapulse.fr", "updates.scalapulse.de", "updates.scalapulse.no", "updates.scalapulse.ch"});

lookup(LOOKUP_TXT, {"checkpoints.scalapulse.org", "checkpoints.scalapulse.net", "checkpoints.scalapulse.co", "checkpoints.scalapulse.se"});

// those are in the code, but don't seem to actually exist
#if 0
lookup(LOOKUP_TXT, {"testpoints.scalapulse.org", "testpoints.scalapulse.net", "testpoints.scalapulse.co", "testpoints.scalapulse.se");

lookup(LOOKUP_TXT, {"stagenetpoints.scalapulse.org", "stagenetpoints.scalapulse.net", "stagenetpoints.scalapulse.co", "stagenetpoints.scalapulse.se"});
#endif

lookup(LOOKUP_TXT, {"segheights.scalapulse.org", "segheights.scalapulse.net", "segheights.scalapulse.co", "segheights.scalapulse.se"});
lookup(LOOKUP_A, {});
lookup(LOOKUP_TXT, {"updates.scalaproject.io"});
lookup(LOOKUP_TXT, {"checkpoints.scalaproject.io"});

return 0;
CATCH_ENTRY_L0("main", 1);
Expand Down
6 changes: 1 addition & 5 deletions src/p2p/net_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,7 @@ namespace nodetool

private:
const std::vector<std::string> m_seed_nodes_list =
{ "seeds.scalaseeds.se"
, "seeds.scalaseeds.ae.org"
, "seeds.scalaseeds.ch"
, "seeds.scalaseeds.li"
};
{};

bool islimitup=false;
bool islimitdown=false;
Expand Down
4 changes: 1 addition & 3 deletions src/wallet/wallet2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9545,10 +9545,8 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
// early out if we know we can't make it anyway
// we could also check for being within FEE_PER_KB, but if the fee calculation
// ever changes, this might be missed, so let this go through
//const uint64_t min_fee = (base_fee * estimate_tx_size(use_rct, 1, fake_outs_count, 2, extra.size(), bulletproof, clsag, bulletproof_plus, use_view_tags));
//Quick hack
const uint64_t fee_multiplier = get_fee_multiplier(priority, get_fee_algorithm());
const uint64_t min_fee = (base_fee * uint64_t(1700));
const uint64_t min_fee = ((base_fee / 1000) * estimate_tx_size(use_rct, 1, fake_outs_count, 2, extra.size(), bulletproof, clsag, bulletproof_plus, use_view_tags));

uint64_t balance_subtotal = 0;
uint64_t unlocked_balance_subtotal = 0;
Expand Down

0 comments on commit a2a06dd

Please sign in to comment.