Upgrade chain simulator #3358

radrow · 2020-09-15T13:12:57Z

More features, serious block representation, no event discrimination

gorbak25

Setting the PrevKeyHash is bugged.

gorbak25 · 2020-10-21T10:39:18Z

apps/aechannel/test/aesc_chain_watcher_SUITE.erl

-    ok = push(CreateTx),
+    SignedTx = create_tx(Config),
+    TxHash = aetx_sign:hash(SignedTx),
+    ct:log("TxHash ~p", [TxHash]),


This log message wasn't here before.

gorbak25 · 2020-10-21T10:54:33Z

apps/aechannel/test/aesc_chain_watcher_SUITE.erl

@@ -674,8 +677,16 @@ init_per_group(GrpName, Config) ->
            Config;
        _ ->
            {ok, ChainP} = start_chain_process(),
+            {ok, #{pubkey := Initiator, privkey := InitiatorSK}} = aec_chain_sim:new_account(1000000000000000000000000000000000000000000000000000000000000000),


please define multipliers:

100000000000000000000000000000000000000000000000 -> ... * ?AE_MULT

gorbak25 · 2020-10-21T10:54:50Z

apps/aechannel/test/aesc_chain_watcher_SUITE.erl

@@ -674,8 +677,16 @@ init_per_group(GrpName, Config) ->
            Config;
        _ ->
            {ok, ChainP} = start_chain_process(),
+            {ok, #{pubkey := Initiator, privkey := InitiatorSK}} = aec_chain_sim:new_account(1000000000000000000000000000000000000000000000000000000000000000),
+            {ok, #{pubkey := Responder, privkey := ResponderSK}} = aec_chain_sim:new_account(1000000000000000000000000000000000000000000000000000000000000000),


How many AE is that?

gorbak25 · 2020-10-21T10:55:57Z

apps/aecore/test/aec_chain_sim.erl

 %%
 %% Equivalent to add_keyblock(main)
 %%
 add_keyblock() ->
    add_keyblock(main).

-spec block_by_hash(block_hash()) -> {ok, sim_keyblock() |sim_microblock()}.
+-spec block_by_hash(block_hash()) -> {ok, aec_blocks:key_block() |aec_blocks:micro_block()}.


Suggested change

-spec block_by_hash(block_hash()) -> {ok, aec_blocks:key_block() |aec_blocks:micro_block()}.

-spec block_by_hash(block_hash()) -> {ok, aec_blocks:block()}.

gorbak25 · 2020-10-21T11:05:53Z

apps/aecore/test/aec_chain_sim.erl

-    #{hash := PrevHash, header := TopHdr} = hd(Blocks),
+    #{block := B} = hd(Blocks),
+    TopHdr = aec_blocks:to_header(B),
+    {ok, PrevHash} = aec_headers:hash_header(TopHdr),
    ?LOG("PrevHash = ~p", [PrevHash]),
    PrevKeyHash = aec_headers:prev_key_hash(TopHdr),


@uwiger @radrow It seems that the original chain simulator also sets the PrevKeyHash improperly.
This will always point to the genesis hash.
Let me demonstrate:

1. Genesis 2. Genesis <- Gen1Micro1(Prev: Genesis, PrevKey: Genesis) <- ... 3. Genesis <- ... <- Key1(Prev: Gen1MicroN, PrevKey: Genesis) 4. Genesis <- ... <- Key1(Prev: Gen1MicroN, PrevKey: Genesis) <- Gen2Micro1(Prev: Key1, PrevKey: **Genesis**

The correct code:

PrevKeyHash = case aec_headers:is_key(TopHdr) of true -> TopHdrHash; false -> aec_headers:prev_key_hash(TopHdr) end,

uwiger

LGTM

erlmachinedev · 2020-10-21T15:40:09Z

The simulator is getting mature and becomes an efficient tool and from my perspective, that deserves for some kind of refactoring later (@gorbak25, @radrow, @uwiger your thoughts about?). Also glad to see aec_trees, aec_headers for now it's more real).

In the future, it could be nice to see some refactoring here like:

To arrange simulator into the separated dir and to decouple into 3 parts: simulator process module, parameterizing API module, internal implementation module;
To provide instantiation facilities. We have to provide modelling for different scenarios, especially for the HC parent chains modelling facility;
To provide parameterizing API (at least to able to set up some stuff like BIG_AMOUNT :) before the run)

P.S. We just got a small merge conflict here, after you merge I am going to fix my part too. (We have to pass predefined chain state here (I do in the parent manager, as we have configurated genesis pointer before sim is run)

* First edits to the chain sim. Added staking contract. * Txs are passing * Fixed some SC tests, HTTP is failing * checkpoint * typo * Fix event type * Fix events * Fix the upgrade * Chain sim is finally fully operational * Fix some mismatches * Cleanup * Fix header hash, push aesophia, minor sanity * Minor fix Co-authored-by: Grzegorz Uriasz <gorbak25@gmail.com>

…n branch (#2938) Upgrade chain simulator (#3358) * First edits to the chain sim. Added staking contract. * Txs are passing * Fixed some SC tests, HTTP is failing * checkpoint * typo * Fix event type * Fix events * Fix the upgrade * Chain sim is finally fully operational * Fix some mismatches * Cleanup * Fix header hash, push aesophia, minor sanity * Minor fix Co-authored-by: Grzegorz Uriasz <gorbak25@gmail.com>

Upgrade chain simulator (#3358) * First edits to the chain sim. Added staking contract. * Txs are passing * Fixed some SC tests, HTTP is failing * checkpoint * typo * Fix event type * Fix events * Fix the upgrade * Chain sim is finally fully operational * Fix some mismatches * Cleanup * Fix header hash, push aesophia, minor sanity * Minor fix Co-authored-by: Grzegorz Uriasz <gorbak25@gmail.com>

gorbak25 force-pushed the hyperchains-master branch from 34cdb68 to 80f52da Compare September 29, 2020 13:32

gorbak25 force-pushed the hyperchains-master branch 2 times, most recently from 4068053 to 72475d5 Compare October 16, 2020 08:30

radrow force-pushed the hyperchains-master branch from 72475d5 to 50f95fa Compare October 19, 2020 09:13

radrow and others added 10 commits October 19, 2020 11:34

First edits to the chain sim. Added staking contract.

5a720b4

Txs are passing

d5c54bb

Fixed some SC tests, HTTP is failing

f92681f

checkpoint

89d57c6

typo

3e2c60f

Fix event type

79d351d

Fix events

be75b67

Fix the upgrade

bca0004

Chain sim is finally fully operational

37cd78a

Fix some mismatches

c586fc3

radrow force-pushed the hyperchains-chain-sim branch from 425a4da to c586fc3 Compare October 19, 2020 15:13

Cleanup

2ad48b4

radrow requested a review from uwiger October 20, 2020 09:20

radrow marked this pull request as ready for review October 20, 2020 10:05

radrow requested review from erlmachinedev and gorbak25 October 20, 2020 10:07

gorbak25 suggested changes Oct 21, 2020

View reviewed changes

Fix header hash, push aesophia, minor sanity

227e76c

uwiger reviewed Oct 21, 2020

View reviewed changes

Minor fix

030fcef

erlmachinedev approved these changes Oct 21, 2020

View reviewed changes

gorbak25 approved these changes Oct 21, 2020

View reviewed changes

radrow merged commit dc68bdd into hyperchains-master Oct 22, 2020

cytadela8 deleted the hyperchains-chain-sim branch March 23, 2021 09:03

myotp mentioned this pull request May 3, 2021

[2938] cherry pick aec_chain_sim improvements #3605

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade chain simulator #3358

Upgrade chain simulator #3358

radrow commented Sep 15, 2020 •

edited

gorbak25 left a comment

gorbak25 Oct 21, 2020

gorbak25 Oct 21, 2020

gorbak25 Oct 21, 2020

radrow Oct 21, 2020

gorbak25 Oct 21, 2020

gorbak25 Oct 21, 2020

uwiger left a comment

erlmachinedev commented Oct 21, 2020

	-spec block_by_hash(block_hash()) -> {ok, aec_blocks:key_block() \|aec_blocks:micro_block()}.
	-spec block_by_hash(block_hash()) -> {ok, aec_blocks:block()}.

Upgrade chain simulator #3358

Upgrade chain simulator #3358

Conversation

radrow commented Sep 15, 2020 • edited

gorbak25 left a comment

Choose a reason for hiding this comment

gorbak25 Oct 21, 2020

Choose a reason for hiding this comment

gorbak25 Oct 21, 2020

Choose a reason for hiding this comment

gorbak25 Oct 21, 2020

Choose a reason for hiding this comment

radrow Oct 21, 2020

Choose a reason for hiding this comment

gorbak25 Oct 21, 2020

Choose a reason for hiding this comment

gorbak25 Oct 21, 2020

Choose a reason for hiding this comment

uwiger left a comment

Choose a reason for hiding this comment

erlmachinedev commented Oct 21, 2020

radrow commented Sep 15, 2020 •

edited