Even more minimal version #4

stoffu · 2018-02-11T14:33:39Z

This is a variation of my earlier PR #2 with the main difference being that I didn't bother changing most of the constants in cryptonote_config.h such as CURRENT_TRANSACTION_VERSION and CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V2 in favor of even smaller changes. The main benefit of this is that the existing tests pass without much changes. ~~Except that I observe a strange RingCT verification failure on core tests, which I'm investigating now.~~ EDIT: Fixed now. All the tests pass.

The main changes regarding the hardfork is condensed into a single commit 21c2492 while the rest are more compact and self-contained.

Also, testnet is supported with two seed nodes I've set up (162.210.173.150:21180 & 162.210.173.151:21180).

Because the way Aeon did the 592000 hardfork was quite different from how Monero handles hardforks, I made the following compromise: the 592000 hardfork is still seen as running on the same network version 1, but the difficulty target changes after the height 592000. ~~This means that the testnet chain also needs to follow the same path as the main chain with the same hardfork at the height 592000.~~ EDIT: This isn't necessarily the case; the switch to the 240s diff target gets triggered either when the protocol version is incremented to v2 or the block height reaches 592000.

Going forward, we should adopt the more flexible hardfork mechanism of Monero.

ghost · 2018-02-13T22:29:46Z

I think you're approach is best. Especially things like not renaming every constant from MONERO to AEON. if we don't take a minimal approach, then rebasing again is going to be another big project because of the merge conflicts that will be present everywhere.

wyattp11 · 2018-02-14T08:12:20Z

Build success on El Capitan first try, thank you.

moneromooo-monero · 2018-02-14T10:27:25Z

src/cryptonote_basic/cryptonote_basic_impl.cpp

@@ -86,11 +86,12 @@ namespace cryptonote {
    return CRYPTONOTE_MAX_TX_SIZE;
  }
  //-----------------------------------------------------------------------------------------------
-  bool get_block_reward(size_t median_size, size_t current_block_size, uint64_t already_generated_coins, uint64_t &reward, uint8_t version) {
+  bool get_block_reward(size_t median_size, size_t current_block_size, uint64_t already_generated_coins, uint64_t &reward, uint8_t version, size_t height) {


uint64_t height

moneromooo-monero · 2018-02-14T10:28:06Z

src/checkpoints/checkpoints.cpp

@@ -167,38 +167,17 @@ namespace cryptonote
      ADD_CHECKPOINT(1000000, "46b690b710a07ea051bc4a6b6842ac37be691089c0f7758cfeec4d5fc0b4a258");


Testnet checjpoint ought to be removed too, no ?

moneromooo-monero · 2018-02-14T10:35:08Z

src/cryptonote_basic/cryptonote_basic_impl.cpp

    const int target_minutes = target / 60;
-    const int emission_speed_factor = EMISSION_SPEED_FACTOR_PER_MINUTE - (target_minutes-1);
+    assert(target_minutes & (target_minutes - 1) == 0);     // assume target_minutes to be power of 2
+    const int emission_speed_factor = EMISSION_SPEED_FACTOR_PER_MINUTE - (int)std::log2(target_minutes);


This might be OK in practice, but I'd make my own that works on powers of 2 instead of using a floating point lib function.

moneromooo-monero · 2018-02-14T10:36:36Z

src/cryptonote_basic/cryptonote_format_utils.cpp

@@ -1045,15 +1038,15 @@ namespace cryptonote
  crypto::secret_key encrypt_key(crypto::secret_key key, const epee::wipeable_string &passphrase)
  {
    crypto::hash hash;
-    crypto::cn_slow_hash(passphrase.data(), passphrase.size(), hash);
+    crypto::cn_slow_hash_2m(passphrase.data(), passphrase.size(), hash);


These aren't used for anything in aeon yet. Maybe using the light variant is prefered in these cases ?

moneromooo-monero · 2018-02-14T10:38:39Z

src/cryptonote_basic/difficulty.cpp

@@ -119,7 +119,7 @@ namespace cryptonote {
    return !carry;
  }

-  difficulty_type next_difficulty(std::vector<std::uint64_t> timestamps, std::vector<difficulty_type> cumulative_difficulties, size_t target_seconds) {
+  difficulty_type next_difficulty(std::vector<std::uint64_t> timestamps, std::vector<difficulty_type> cumulative_difficulties, size_t target_seconds, size_t height) {


uint64_t height

moneromooo-monero · 2018-02-14T10:49:51Z

src/cryptonote_core/tx_pool.cpp

@@ -969,7 +969,7 @@ namespace cryptonote
  }
  //---------------------------------------------------------------------------------
  //TODO: investigate whether boolean return is appropriate
-  bool tx_memory_pool::fill_block_template(block &bl, size_t median_size, uint64_t already_generated_coins, size_t &total_size, uint64_t &fee, uint64_t &expected_reward, uint8_t version)
+  bool tx_memory_pool::fill_block_template(block &bl, size_t median_size, uint64_t already_generated_coins, size_t &total_size, uint64_t &fee, uint64_t &expected_reward, uint8_t version, size_t height)


uint64_t height

moneromooo-monero · 2018-02-14T10:50:42Z

src/cryptonote_protocol/cryptonote_protocol_handler.inl

+    if (m_core.get_testnet())
+    {
+      // TODO: relace (uint64_t)-1 with (H-1) where H is the v2 fork height on testnet. Or remove this line altogether if H >= HARDFORK_1_HEIGHT
+      last_block_v1 = std::min<uint64_t>(last_block_v1, (uint64_t)-1);


That's a noop isn't it ?

As in the comment, my intention is to replace (uint64-t)-1 later if we decide to introduce a v2 testnet fork at a height lower than HARDFORK_1_HEIGHT . So it is a no-op currently, but it might change in the future.

I've updated this part slightly so that it's a bit simpler.

moneromooo-monero · 2018-02-14T10:52:33Z

tests/core_tests/rct.cpp

@@ -57,7 +57,7 @@ bool gen_rct_tx_validation_base::generate_with(std::vector<test_event_entry>& ev
    miner_accounts[n].generate();
    CHECK_AND_ASSERT_MES(generator.construct_block_manually(blocks[n], *prev_block, miner_accounts[n],
        test_generator::bf_major_ver | test_generator::bf_minor_ver | test_generator::bf_timestamp | test_generator::bf_hf_version,
-        2, 2, prev_block->timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 2, // v2 has blocks twice as long
+        2, 2, prev_block->timestamp + DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN * 4, // v2 has blocks four times as long


That seems predicated on height though, not block version AFAICT, from your code above

As in get_block_reward bf320b8#diff-1a57d4e6013984c420da98d1adde0eafR91 , I made a little trick in the logic such that the block time becomes V2 (i.e. 240s) either when:

the network version is 1 2, or

the block height reaches HARDFORK_1_HEIGHT .

Because we explicitly set the hf version to 2, the block time should be 240s. Do I make sense?

moneromooo-monero · 2018-02-14T10:53:27Z

tests/core_tests/rct.cpp

    std::vector<tx_destination_entry> destinations;
    destinations.push_back(td);
    destinations.push_back(td);
    destinations.push_back(td);
-    destinations.push_back(td); // 30 -> 7.39 * 4
+    destinations.push_back(td); // 70 -> 17.39 * 4


Out of curiosity, I'm guessing something broke with those initial values, what was it ?

The block reward on V2 fork doubled due to the block time changing from 120s to 240s, so the numbers needed to be adjusted.

moneromooo-monero · 2018-02-14T10:56:32Z

tests/difficulty/difficulty.cpp

@@ -64,7 +64,7 @@ int main(int argc, char *argv[]) {
        }
        uint64_t res = cryptonote::next_difficulty(
            vector<uint64_t>(timestamps.begin() + begin, timestamps.begin() + end),
-            vector<uint64_t>(cumulative_difficulties.begin() + begin, cumulative_difficulties.begin() + end), DEFAULT_TEST_DIFFICULTY_TARGET);
+            vector<uint64_t>(cumulative_difficulties.begin() + begin, cumulative_difficulties.begin() + end), DEFAULT_TEST_DIFFICULTY_TARGET, 1);


n + 1 ? Guess it doesn't matter as long as < threshold though

I'd rather have it this way, since the height is used to conditionally make an adjustment to the output diff value; see the end of next_difficulty():

difficulty_type new_diff = (low + time_span - 1) / time_span; if (height >= HARDFORK_1_HEIGHT && height < HARDFORK_1_HEIGHT+HARDFORK_1_DIFFADJ_WINDOW) { new_diff += new_diff*(HARDFORK_1_HEIGHT+HARDFORK_1_DIFFADJ_WINDOW-height)*(HARDFORK_1_DIFFADJ-1)/HARDFORK_1_DIFFADJ_WINDOW; } return new_diff;

It doesn't matter because the maximum height stored in tests/difficulty/data.txt is only 29000, but the test may fail if someone added some bad numbers to data.txt. I'd rather have the test completely ignore this adjustment by always setting the height to 1.

because the maximum height stored in tests/difficulty/data.txt is only 29000

I was wrong here, 29000 represents a timestamp. The height corresponds to the number of lines in data.txt, which is 1000. Anyway, the reason of not using n+1 as the height parameter to next_difficulty remains the same.

* src/cryptnote_config.h: The constant `config::testnet::GENESIS_TX` was changed to be the same as `config::GENESIS_TX` (the mainnet's transaction) because the mainnet's transaction was being used for both networks. * src/cryptonote_core/cryptonote_tx_utils.cpp: The `generate_genesis_block` function was ignoring the `genesis_tx` parameter, and instead it was using the `config::GENESIS_TX` constant. That's why the testnet genesis transaction was changed. Also five lines of unused code were removed. Signed-off-by: Jean Pierre Dudey <jeandudey@hotmail.com>

iamsmooth · 2018-02-15T05:31:26Z

Noting for the benefit of people contributing to this PR and the previous one that the current plan is to declare this method the winner both for bounty purposes (as decided by bounty sponsors) and also accepted for eventual adoption as the main AEON codebase.

Other submissions will be declared runners up, will also receive a portion of the bounty, and are encouraged to submit their value-add, if any, as individual PRs following the conclusion of the rebase task.

wyattp11 · 2018-02-17T06:01:35Z

Will we be voting on a name for the rebase? Since previous was Phoenix... first mention of Phoenix was by Hesiod? Or move on from/to another mythical creature?

ghost · 2018-02-17T21:14:14Z

What can we do to finalize the rebase? Do we need to update readme files, do more testing, etc? Not rushing, just making sure there's nothing else we can do.

…ine below-std fee transactions only half the time (1e743dc)

This is the first variant of many, with the intent to improve Monero's resistance to ASICs and encourage mining decentralization.

Remove CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V5 Remove DYNAMIC_FEE_PER_KB_BASE_FEE_V5

Set BLOCKS_SYNCHRONIZING_DEFAULT_COUNT to 200

…f_version 4

Prohibit ringsize 2

Giving ring size 0 (whether explicitly or implicitly) means using wallet's saved default ring size. If the saved default ring size is also 0, the predefined DEFAULT_RING_SIZE (=3) is used.

stoffu · 2018-03-21T05:51:32Z

@iamsmooth
Agreed about keeping the per-kb fee. The relevant commits have been dropped.

stoffu · 2018-04-01T13:38:57Z

Closing and moving to https://github.com/stoffu/monero/tree/aeon-rebase-new so that the rebase point is at the latest master of Monero.

stoffu force-pushed the aeon-rebase-min branch 6 times, most recently from b933892 to fda8753 Compare February 12, 2018 01:57

stoffu mentioned this pull request Feb 12, 2018

[WIP/POC] Functional daemon/simplewallet with minimal changes #2

Closed

stoffu force-pushed the aeon-rebase-min branch 4 times, most recently from 0d9c42f to 98151d8 Compare February 12, 2018 13:03

stoffu force-pushed the aeon-rebase-min branch 2 times, most recently from 9e8dcd1 to 112b3a9 Compare February 14, 2018 09:56

moneromooo-monero reviewed Feb 14, 2018

View reviewed changes

stoffu force-pushed the aeon-rebase-min branch 4 times, most recently from 00557ba to 4033e3c Compare February 14, 2018 23:40

stoffu force-pushed the aeon-rebase-min branch 4 times, most recently from d5906a8 to b41251e Compare February 15, 2018 01:58

iamsmooth mentioned this pull request Feb 15, 2018

[RC1] Functionally Complete Rebase #3

Closed

stoffu force-pushed the aeon-rebase-min branch from 03fce4a to 620bb6a Compare February 19, 2018 07:30

stoffu force-pushed the aeon-rebase-min branch 4 times, most recently from 2cae7f8 to 5bb306b Compare March 21, 2018 05:31

stoffu and others added 20 commits March 21, 2018 14:48

Principal changes

f42344c

Lower mining priority for anon-impairing (<2 mixins) tx (c6432ac) + M…

04d3f27

…ine below-std fee transactions only half the time (1e743dc)

Multisig for pre-ringct (unofficial, disabled)

6b45c52

Monero Cryptonight variants, and add one for v7 /monero#3253

8217da2

This is the first variant of many, with the intent to improve Monero's resistance to ASICs and encourage mining decentralization.

slow-hash: optimized version /monero#3253

2351800

tweaks to the monerov1 cryptonight algorithm /monero#3253

80de15a

Remove CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V2

32da5f8

Remove CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V5 Remove DYNAMIC_FEE_PER_KB_BASE_FEE_V5

Revert /monero#2023: Remove 1.25x multiplier from tx_pool

40dc8ab

Remove BLOCKS_SYNCHRONIZING_DEFAULT_COUNT_PRE_V4

951660d

Set BLOCKS_SYNCHRONIZING_DEFAULT_COUNT to 200

blockchain: remove sorted ins

735e9a4

Remove minimum mixin 4

696d6e0

Remove enforce rct

70f6bc5

Disable RingCT by #defining HF_VERSION_ALLOW_RCT 255 which replaces h…

f740ef3

…f_version 4

Allow bulletproofs as soon as RingCT is allowed

1c4e8b8

simplewallet: disable fee command

9fa6cc0

blockchain: require miner tx to have well behaved outs /monero#763

e599f05

get_block_longhash: on testnet etc, switch to cn-lite at v2

6ff68d7

Allow 10% of txs in a block to be of ringsize 1

4f36837

Prohibit ringsize 2

wallet: replace default mixin semantics with default ring size semantics

b35e265

Giving ring size 0 (whether explicitly or implicitly) means using wallet's saved default ring size. If the saved default ring size is also 0, the predefined DEFAULT_RING_SIZE (=3) is used.

Set testnet v7 fork height to 44000 (24 March 2018)

40c3949

stoffu force-pushed the aeon-rebase-min branch from 5bb306b to 40c3949 Compare March 21, 2018 05:50

stoffu closed this Apr 1, 2018

Quanatee mentioned this pull request Apr 5, 2018

Support for Cryptonight Heavy oliverw/miningcore#298

Closed

ghost mentioned this pull request Feb 14, 2021

Aeon minimum fee is unfair and arbitrary #213

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Even more minimal version #4

Even more minimal version #4

stoffu commented Feb 11, 2018 •

edited

Loading

ghost commented Feb 13, 2018

wyattp11 commented Feb 14, 2018

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018 •

edited

Loading

stoffu Feb 14, 2018

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018 •

edited

Loading

moneromooo-monero Feb 14, 2018

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018 •

edited

Loading

moneromooo-monero Feb 14, 2018

stoffu Feb 14, 2018

stoffu Feb 14, 2018

iamsmooth commented Feb 15, 2018 •

edited

Loading

wyattp11 commented Feb 17, 2018

ghost commented Feb 17, 2018

stoffu commented Mar 21, 2018 •

edited

Loading

stoffu commented Apr 1, 2018

		@@ -167,38 +167,17 @@ namespace cryptonote
		ADD_CHECKPOINT(1000000, "46b690b710a07ea051bc4a6b6842ac37be691089c0f7758cfeec4d5fc0b4a258");

Even more minimal version #4

Even more minimal version #4

Conversation

stoffu commented Feb 11, 2018 • edited Loading

ghost commented Feb 13, 2018

wyattp11 commented Feb 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stoffu Feb 14, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stoffu Feb 14, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stoffu Feb 14, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iamsmooth commented Feb 15, 2018 • edited Loading

wyattp11 commented Feb 17, 2018

ghost commented Feb 17, 2018

stoffu commented Mar 21, 2018 • edited Loading

stoffu commented Apr 1, 2018

stoffu commented Feb 11, 2018 •

edited

Loading

stoffu Feb 14, 2018 •

edited

Loading

stoffu Feb 14, 2018 •

edited

Loading

stoffu Feb 14, 2018 •

edited

Loading

iamsmooth commented Feb 15, 2018 •

edited

Loading

stoffu commented Mar 21, 2018 •

edited

Loading