From 8ab87421d9321d0b61992c924cfa6e3918118ad0 Mon Sep 17 00:00:00 2001 From: qvqc Date: Wed, 11 Aug 2021 00:21:13 -0400 Subject: [PATCH] w0w denominations --- .../cryptonote_format_utils.cpp | 20 +++++++++---------- src/simplewallet/simplewallet.cpp | 18 ++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp index 80b266a47..07cc58f64 100644 --- a/src/cryptonote_basic/cryptonote_format_utils.cpp +++ b/src/cryptonote_basic/cryptonote_format_utils.cpp @@ -1013,9 +1013,9 @@ namespace cryptonote switch (decimal_point) { case 11: - case 9: - case 6: - case 3: + case 8: + case 5: + case 2: case 0: default_decimal_point = decimal_point; break; @@ -1037,14 +1037,14 @@ namespace cryptonote { case 11: return "wownero"; - case 9: - return "millinero"; - case 6: - return "micronero"; - case 3: - return "nanonero"; + case 8: + return "verywow"; + case 5: + return "muchwow"; + case 2: + return "suchwow"; case 0: - return "piconero"; + return "dust"; default: ASSERT_MES_AND_THROW("Invalid decimal point specification: " << decimal_point); } diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 3f2d58199..b76ebe3b5 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -2683,13 +2683,13 @@ bool simple_wallet::set_unit(const std::vector &args/* = std::vecto if (unit == "wownero") decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT; - else if (unit == "millinero") - decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT - 3; - else if (unit == "micronero") - decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT - 6; - else if (unit == "nanonero") - decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT - 9; - else if (unit == "piconero") + else if (unit == "verywow") + decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT - 4; + else if (unit == "muchwow") + decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT - 7; + else if (unit == "suchwow") + decimal_point = CRYPTONOTE_DISPLAY_DECIMAL_POINT - 10; + else if (unit == "dust") decimal_point = 0; else { @@ -3355,7 +3355,7 @@ simple_wallet::simple_wallet() "ask-password <0|1|2 (or never|action|decrypt)>\n " " action: ask the password before many actions such as transfer, etc\n " " decrypt: same as action, but keeps the spend key encrypted in memory when not needed\n " - "unit \n " + "unit \n " " Set the default wownero (sub-)unit.\n " "min-outputs-count [n]\n " " Try to keep at least that many outputs of value at least min-outputs-value.\n " @@ -3854,7 +3854,7 @@ bool simple_wallet::set_variable(const std::vector &args) CHECK_SIMPLE_VARIABLE("refresh-type", set_refresh_type, tr("full (slowest, no assumptions); optimize-coinbase (fast, assumes the whole coinbase is paid to a single address); no-coinbase (fastest, assumes we receive no coinbase transaction), default (same as optimize-coinbase)")); CHECK_SIMPLE_VARIABLE("priority", set_default_priority, tr("0, 1, 2, 3, or 4, or one of ") << join_priority_strings(", ")); CHECK_SIMPLE_VARIABLE("ask-password", set_ask_password, tr("0|1|2 (or never|action|decrypt)")); - CHECK_SIMPLE_VARIABLE("unit", set_unit, tr("wownero, millinero, micronero, nanonero, piconero")); + CHECK_SIMPLE_VARIABLE("unit", set_unit, tr("wownero, verywow, muchwow, suchwow, dust")); CHECK_SIMPLE_VARIABLE("min-outputs-count", set_min_output_count, tr("unsigned integer")); CHECK_SIMPLE_VARIABLE("min-outputs-value", set_min_output_value, tr("amount")); CHECK_SIMPLE_VARIABLE("merge-destinations", set_merge_destinations, tr("0 or 1"));