fix: set `difficulty` default to 1 and add `totalDifficulty` #771

eggplantzzz · 2021-02-05T14:54:48Z

Currently Ganache sets all block headers to have difficulty and totalDifficulty hard-coded to 0. This PR causes Ganache to set the difficulty of each block (by default) to 1 (the user can specify their own block difficulty on the command line). The totalDifficulty is also now calculated based on the previous block's totalDifficulty and the block difficulty.

davidmurdoch

Really Awesome work. I committed a change, if you wouldn't mind reviewing it.

The gist of the change I made was because:

totalDifficulty shouldn't be included in block size calculations
totalDifficulty shouldn't be included in the block hash (which it previously was, because it was included in the raw array)

It seems to work now, and as a bonus, I figured out why our block size calculations were always off a little (PR for that coming soon!)

I also requested some more tests :-D

Thanks

src/chains/ethereum/options/src/miner-options.ts

davidmurdoch · 2021-02-12T23:33:10Z

src/chains/ethereum/ethereum/src/blockchain.ts

-      Quantity.from(timestamp)
+      Quantity.from(timestamp),
+      this.#options.miner.difficulty,
+      Quantity.from(0) // we start the totalDifficulty at 0


Use

Suggested change

Quantity.from(0) // we start the totalDifficulty at 0

RPCQUANTITY_ZERO // we start the totalDifficulty at 0

src/chains/ethereum/ethereum/tests/api/eth/getBlockByNumber.test.ts

fixes #787 depends on #771

davidmurdoch · 2021-02-17T23:13:20Z

src/chains/ethereum/ethereum/tests/api/eth/getBlockByNumber.test.ts

+    await provider.send("eth_subscribe", ["newHeads"]);
+
+    await provider.send("eth_sendTransaction", [{ from, to: from }]);
+
+    await provider.once("message");


If you don't need the transaction itself, you can do await provider.send("evm_mine") instead.

Oh, actually... now that #793 is merged (as of yesterday), you can do await provider.send("evm_mine", [{blocks: number}]), no (backwards 😄) loop needed!

Oh cool! I'll merge in develop and update this!

I like deleting code.

davidmurdoch · 2021-02-17T23:19:20Z

src/chains/ethereum/ethereum/tests/api/eth/getBlockByNumber.test.ts

+            const block = await provider.send("eth_getBlockByNumber", ["0x0"]);
+            assert.strictEqual(
+              block.totalDifficulty,
+              `0x${DEFAULT_DIFFICULTY}`


If DEFAULT_DIFFICULTY is ever greater than 9 in the future this test will fail.

Other ways of solving this:

assert.strictEqual( block.totalDifficulty, Quantity.from(DEFAULT_DIFFICULTY).toString() );

or

assert.strictEqual( parseInt(block.totalDifficulty, 16), DEFAULT_DIFFICULTY );

or

assert.strictEqual( BigInt(block.totalDifficulty), DEFAULT_DIFFICULTY // change DEFAULT_DIFFICULTY to a BigInt );

and lots of others, I'm sure.

Can you also update other places that use the 0x{number} pattern in these tests? Thanks!

Sorry, I meant to update these but must have overlooked them. Updated!

…ader

… current block's difficulty

…te test

I had to store totalDifficulty in a different way so it wasn't included in the `raw` fields (which messes with the hash).

Co-authored-by: David Murdoch <[email protected]>

davidmurdoch

Two more little "suggestions" and it's good to go!

src/chains/ethereum/ethereum/tests/api/eth/getBlockByNumber.test.ts

…st.ts

fixes #787 depends on #771

…ys-archive#771) Co-authored-by: David Murdoch <[email protected]>

eggplantzzz mentioned this pull request Feb 5, 2021

Block difficulty is always '0' (zero) #662

Closed

davidmurdoch suggested changes Feb 13, 2021

View reviewed changes

davidmurdoch added a commit that referenced this pull request Feb 13, 2021

fix: calculate block size correctly

1fa00e9

fixes #787 depends on #771

davidmurdoch mentioned this pull request Feb 13, 2021

fix: calculate block size correctly #790

Merged

davidmurdoch reviewed Feb 17, 2021

View reviewed changes

eggplantzzz force-pushed the develop-difficulty-fields branch from f27b613 to 609c25c Compare February 18, 2021 14:53

eggplantzzz and others added 14 commits February 18, 2021 11:10

Initialize with a block difficulty of 1 by default

b308507

Hook up the rest of the plumbing for creating blocks with difficulty

5e1ea5c

Use the options to determine difficulty and not the previous block he…

2b1e662

…ader

Actually calculate totalDifficulty using previous totalDifficulty and…

630558e

… current block's difficulty

Make difficulty option a number rather than a string

c1d628e

Add a couple of simple tests for totalDifficulty and difficulty; upda…

e501ffb

…te test

Use constant for difficulty in test

62e3787

fix block size calculation

2c4369a

I had to store totalDifficulty in a different way so it wasn't included in the `raw` fields (which messes with the hash).

Update src/chains/ethereum/options/src/miner-options.ts

929b766

Co-authored-by: David Murdoch <[email protected]>

Use constant and update comment

6ebe1b0

Update src/chains/ethereum/options/src/miner-options.ts

0554ab7

Co-authored-by: David Murdoch <[email protected]>

Use constant for miner options default

4d2d162

Update some tests

f77d256

Use HEX

1c90485

eggplantzzz force-pushed the develop-difficulty-fields branch from 609c25c to 1c90485 Compare February 18, 2021 16:10

Get rid of helper method and use evm_mine in tests

3366b1f

davidmurdoch suggested changes Feb 19, 2021

View reviewed changes

src/chains/ethereum/ethereum/tests/api/eth/getBlockByNumber.test.ts Outdated Show resolved Hide resolved

src/chains/ethereum/ethereum/tests/api/eth/getBlockByNumber.test.ts Outdated Show resolved Hide resolved

davidmurdoch added 2 commits February 22, 2021 16:57

Update src/chains/ethereum/ethereum/tests/api/eth/getBlockByNumber.te…

82582c1

…st.ts

Update src/chains/ethereum/ethereum/tests/api/eth/getBlockByNumber.te…

72fa711

…st.ts

davidmurdoch closed this Feb 22, 2021

davidmurdoch deleted the develop-difficulty-fields branch February 22, 2021 22:04

davidmurdoch restored the develop-difficulty-fields branch February 22, 2021 22:04

davidmurdoch reopened this Feb 22, 2021

davidmurdoch changed the title ~~Update difficulty and totalDifficulty~~ fix: set difficulty default to 1 and add totalDifficulty Feb 22, 2021

davidmurdoch merged commit 7d4f43d into develop Feb 22, 2021

davidmurdoch added a commit that referenced this pull request Feb 22, 2021

fix: calculate block size correctly

6ae3db9

fixes #787 depends on #771

davidmurdoch deleted the develop-difficulty-fields branch February 26, 2021 02:24

sambacha pushed a commit to contractshark/ganache-core that referenced this pull request Apr 15, 2021

fix: set difficulty default to 1 and add totalDifficulty (ConsenS…

21df288

…ys-archive#771) Co-authored-by: David Murdoch <[email protected]>

	Quantity.from(0) // we start the totalDifficulty at 0
	RPCQUANTITY_ZERO // we start the totalDifficulty at 0

fix: set difficulty default to 1 and add totalDifficulty #771

fix: set difficulty default to 1 and add totalDifficulty #771

Uh oh!

Conversation

eggplantzzz commented Feb 5, 2021

Uh oh!

davidmurdoch left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

davidmurdoch Feb 12, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

davidmurdoch Feb 17, 2021

Choose a reason for hiding this comment

Uh oh!

eggplantzzz Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

eggplantzzz Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

davidmurdoch Feb 17, 2021

Choose a reason for hiding this comment

Uh oh!

davidmurdoch Feb 17, 2021

Choose a reason for hiding this comment

Uh oh!

eggplantzzz Feb 18, 2021

Choose a reason for hiding this comment

Uh oh!

davidmurdoch left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fix: set `difficulty` default to 1 and add `totalDifficulty` #771

fix: set `difficulty` default to 1 and add `totalDifficulty` #771

davidmurdoch left a comment •

edited

Loading