Pre v0.6 dependency updates #215

notlesh · 2021-01-29T17:02:38Z

What does it do?

Updates frontier, substrate, cumulus, polkadot.

This updates:

cumulus -> 6438d328b8ac09f43d19df65a2cf8e31a524d78f
polkadot -> 71a528e822af63b96bdb03efac9b4927fb11a25e
substrate -> 93b231e79f5b4e551c34234e89fa4a2e5e9c1510
frontier -> v0.6-moonbeam (22464288585eb23c04036ef1afa5d1d7794fa378) https://github.com/PureStake/frontier/commits/v0.6-moonbeam

This PR should be in good shape now, but it depends on some upstream PRs:

Clean up Frontier branch duplicates
This ethereum PR needs to be merged and needs a version bump itself: Bump parity-scale-codec and ethereum-types versions rust-ethereum/ethereum#8
Then this evm PR needs to be updated to point to the updated ethereum, then get a version bump: Bump parity-scale-codec and primitive-types versions rust-ethereum/evm#10
Then Frontier will need to be updated to reflect these new ethereum and evm versions

Also:

Fix logging init code (see comments)
CI green

This reverts commit 15c6218. The change this was meant to addressed isn't introduced in Cumulus until commit b5f6580.

notlesh · 2021-02-02T22:57:48Z

node/parachain/src/command.rs

 			sc_cli::init_logger(InitLoggerParams {
 				tracing_receiver: sc_tracing::TracingReceiver::Log,
 				..Default::default()
 			})?;
+			*/



Need to properly fix this (and same issue 20 lines lower)

https://github.com/paritytech/cumulus/blob/6438d328b8ac09f43/rococo-parachains/src/command.rs#L219-L222

node/parachain/Cargo.toml

crystalin · 2021-02-03T01:42:50Z

runtime/src/lib.rs

@@ -257,11 +257,11 @@ pub const WEIGHT_PER_GAS: u64 = WEIGHT_PER_SECOND / GAS_PER_SECOND;
 pub struct MoonbeamGasWeightMapping;

 impl pallet_evm::GasWeightMapping for MoonbeamGasWeightMapping {
-	fn gas_to_weight(gas: usize) -> Weight {
+	fn gas_to_weight(gas: u64) -> Weight {
 		Weight::try_from((gas as u64).saturating_mul(WEIGHT_PER_GAS)).unwrap_or(Weight::MAX)


Yeah finally a correct type for gas.
You can remove the as 64 here and maybe most of the rest too as both the Weight and the gas are 64 I think

I kept u32::MAX as u64 in hopes of being consistent with our previous fallback. Is this ever useful, anyway, and would u64::MAX somehow be better? (or were you merely suggesting that 'as u64' was redundant?)

Suggested change

Weight::try_from((gas as u64).saturating_mul(WEIGHT_PER_GAS)).unwrap_or(Weight::MAX)

gas.saturating_mul(WEIGHT_PER_GAS)

Does this do the same thing? I think so.

runtime/src/lib.rs

crystalin

Good work.
Left few comments

Co-authored-by: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>

tgmichel · 2021-02-03T14:29:48Z

Would be great to have frontier's 52cfbc4e88ad5c36db68891f20a6540613b81141 on this iteration, as it solves some The Graph requirements and we can remove the skipped test at 7890e51.

JoshOrndorff

Looks awesome! Made a few little comments.

Feedback on the Frontier part:

I like the branch name v0.6-moonbeam
Thanks for de-duping parity-scale-codec
The commit history is so nice and clean. I like the idea of keeping all the changes that we made to stock frontier right at the tip.
I don't think 2246428858 is necessary.
~~@tgmichel could you take a look at https://github.com/purestake/frontier/commits/v0.6-moonbeam and confirm it has all the important stuff?~~ nvm, you just did :)

runtime/src/lib.rs

JoshOrndorff · 2021-02-03T13:37:37Z

node/parachain/src/command.rs

 			sc_cli::init_logger(InitLoggerParams {
 				tracing_receiver: sc_tracing::TracingReceiver::Log,
 				..Default::default()
 			})?;
+			*/



https://github.com/paritytech/cumulus/blob/6438d328b8ac09f43/rococo-parachains/src/command.rs#L219-L222

runtime/precompiles/src/lib.rs

JoshOrndorff · 2021-02-03T13:50:50Z

runtime/src/lib.rs

@@ -257,11 +257,11 @@ pub const WEIGHT_PER_GAS: u64 = WEIGHT_PER_SECOND / GAS_PER_SECOND;
 pub struct MoonbeamGasWeightMapping;

 impl pallet_evm::GasWeightMapping for MoonbeamGasWeightMapping {
-	fn gas_to_weight(gas: usize) -> Weight {
+	fn gas_to_weight(gas: u64) -> Weight {
 		Weight::try_from((gas as u64).saturating_mul(WEIGHT_PER_GAS)).unwrap_or(Weight::MAX)


Suggested change

Weight::try_from((gas as u64).saturating_mul(WEIGHT_PER_GAS)).unwrap_or(Weight::MAX)

gas.saturating_mul(WEIGHT_PER_GAS)

Does this do the same thing? I think so.

JoshOrndorff · 2021-02-03T14:38:38Z

runtime/src/lib.rs

-	fn weight_to_gas(weight: Weight) -> usize {
-		usize::try_from(weight.wrapping_div(WEIGHT_PER_GAS)).unwrap_or(usize::MAX)
+	fn weight_to_gas(weight: Weight) -> u64 {
+		u64::try_from(weight.wrapping_div(WEIGHT_PER_GAS)).unwrap_or(u32::MAX as u64)


Suggested change

u64::try_from(weight.wrapping_div(WEIGHT_PER_GAS)).unwrap_or(u32::MAX as u64)

weight.wrapping_div(WEIGHT_PER_GAS)

Both input values are u64, so the result will certainly be a u64. The try_from cannot possibly fail.

runtime/src/lib.rs

runtime/src/parachain.rs

tgmichel · 2021-02-03T15:19:09Z

We are missing stuff related to the new EthFilterApi. An example is available in frontier's template:

We need to extend the rpc server:
https://github.com/PureStake/frontier/blob/v0.6-moonbeam/template/node/src/rpc.rs#L118

Update the service, for example:
https://github.com/PureStake/frontier/blob/v0.6-moonbeam/template/node/src/service.rs#L99
https://github.com/PureStake/frontier/blob/v0.6-moonbeam/template/node/src/service.rs#L123

And setup the maintenance task:
https://github.com/PureStake/frontier/blob/v0.6-moonbeam/template/node/src/service.rs#L237

@notlesh I can do this in this same branch if you want.
Edit: @notlesh I will also check our v0.6 frontier branch, probably we want to use the StorageProvider instead the runtime api in this new Rpc module.

tgmichel · 2021-02-03T16:54:23Z

Also we want to include the tests for the EthFilterApi in:
https://github.com/PureStake/frontier/blob/v0.6-moonbeam/ts-tests/tests/test-filter-api.ts

… sec

…nto notlesh-pre-v0.6-dependency-updates

notlesh · 2021-02-09T18:55:40Z

tests/tests/test-balance.ts

-          expect(context.polkadotApi.events.ethereum.Executed.is(events[2])).to.be.true;
-          expect(context.polkadotApi.events.system.ExtrinsicSuccess.is(events[3])).to.be.true;
+          // TODO: what event was inserted here?
+          expect(context.polkadotApi.events.ethereum.Executed.is(events[3])).to.be.true;


@joelamouche Is this obvious to you, or do you have some documentation handy that you could share?

crystalin · 2021-02-11T02:49:33Z

runtime/src/lib.rs

-/// Given the 500ms Weight, from which 75% only are used for transactions,
-/// the total EVM execution gas limit is: GAS_PER_SECOND * 0.500 * 0.75 => 6_000_000.
-pub const GAS_PER_SECOND: u64 = 16_000_000;
+/// Given the 500ms Weight, from which 65% only are used for transactions,


@notlesh This was correct before.
A block has 75% dedicated to tx.
65% is for the max of a single transaction

notlesh added 14 commits January 28, 2021 14:59

Bump polkadot and substrate versions

9e6d826

cumulus-parachain-upgrade renamed to cumulus-parachain-system

15c6218

Update frontier branch v0.5-hotfixes -> v0.6-moonbeam

5a71e14

Resolve parity-util-mem dependency conflicts

cc3d154

Revert "cumulus-parachain-upgrade renamed to cumulus-parachain-system"

3137dc0

This reverts commit 15c6218. The change this was meant to addressed isn't introduced in Cumulus until commit b5f6580.

Don't specify frontier commit

7355275

Cargo wants to play rough

b4bdc11

Bump cumulus and polkadot versions

369d144

Reintroduce upgrade -> system renaming

4da2991

Bump parity-scale-codec and related intermediate dependencies

6dedfef

Remove deadbeef precompile

c11bcda

Make it compile

be336f7

Revert substrate 9659509 -> 93b231e

bd686cb

Reflect upstream changes in Cumulus

fabdbae

notlesh requested review from tgmichel and JoshOrndorff February 2, 2021 22:35

notlesh commented Feb 2, 2021

View reviewed changes

crystalin reviewed Feb 3, 2021

View reviewed changes

node/parachain/Cargo.toml Outdated Show resolved Hide resolved

crystalin reviewed Feb 3, 2021

View reviewed changes

runtime/src/lib.rs Outdated Show resolved Hide resolved

crystalin approved these changes Feb 3, 2021

View reviewed changes

notlesh and others added 2 commits February 2, 2021 21:26

Don't specify git rev in toml file

3418eca

Properly specify BlockGasLimit

4a3bdee

Co-authored-by: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>

JoshOrndorff approved these changes Feb 3, 2021

View reviewed changes

notlesh added 3 commits February 3, 2021 14:02

Add EthFilterApi

197096f

Add filter pool maintenance task

d8406ed

Add filter pool test

2aef8bb

notlesh and others added 19 commits February 8, 2021 13:28

Upstream changes for newly merged code

7f1149b

Add FilterPool to dev_service

963a302

Revert map_err() change

2c0acfd

Fixes node command error returned

4a29ee2

Format command.rs

8d03909

Reduce max ethereum txn gas and bump GAS_PER_SECOND to target 12.5M /…

a440ab4

… sec

Update comment about gas limits

8db531e

s/Upgrade/System/

9e84d6f

Update gas constants in test-gas.ts

18e1b7e

Update gas values in test based on observed values

cf3ff5e

Update gasLimit in tests; comment about gas calculation

b031fc1

Add EthFilterApi maintenance task to dev-service

9aba1a0

Pass graph to EthApi

59d7856

rustfmt

da3670b

kill processes on exit and sigint

099f129

retyped events and updated api

c0478eb

Merge branch 'master' into notlesh-pre-v0.6-dependency-updates

7d8c897

Merge remote-tracking branch 'upstream/antoine-kill-processes-test' i…

bc073c1

…nto notlesh-pre-v0.6-dependency-updates

Reflect changes to event ordering in test-balance.ts

204c7a2

notlesh commented Feb 9, 2021

View reviewed changes

notlesh added 6 commits February 9, 2021 12:22

s/upgrade/system/ AGAIN

50e5df5

Fix compiler warnings

a3a8ede

log--

c774d23

Bump GAS_PER_SECOND to 40M

7b68956

Chop long line

3dd9923

Update gasLimit expectations in tests

3e32199

crystalin approved these changes Feb 9, 2021

View reviewed changes

notlesh merged commit 5308f49 into master Feb 9, 2021

notlesh deleted the notlesh-pre-v0.6-dependency-updates branch February 9, 2021 21:05

crystalin reviewed Feb 11, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pre v0.6 dependency updates #215

Pre v0.6 dependency updates #215

notlesh commented Jan 29, 2021 •

edited

Loading

notlesh Feb 2, 2021

JoshOrndorff Feb 3, 2021

crystalin Feb 3, 2021

notlesh Feb 3, 2021

JoshOrndorff Feb 3, 2021

crystalin left a comment

tgmichel commented Feb 3, 2021

JoshOrndorff left a comment •

edited

Loading

JoshOrndorff Feb 3, 2021

JoshOrndorff Feb 3, 2021

JoshOrndorff Feb 3, 2021

tgmichel commented Feb 3, 2021 •

edited

Loading

tgmichel commented Feb 3, 2021

notlesh Feb 9, 2021

notlesh Feb 9, 2021

crystalin Feb 11, 2021

	Weight::try_from((gas as u64).saturating_mul(WEIGHT_PER_GAS)).unwrap_or(Weight::MAX)
	gas.saturating_mul(WEIGHT_PER_GAS)

	u64::try_from(weight.wrapping_div(WEIGHT_PER_GAS)).unwrap_or(u32::MAX as u64)
	weight.wrapping_div(WEIGHT_PER_GAS)

Pre v0.6 dependency updates #215

Pre v0.6 dependency updates #215

Conversation

notlesh commented Jan 29, 2021 • edited Loading

What does it do?

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

crystalin left a comment

Choose a reason for hiding this comment

tgmichel commented Feb 3, 2021

JoshOrndorff left a comment • 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

tgmichel commented Feb 3, 2021 • edited Loading

tgmichel commented Feb 3, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

notlesh commented Jan 29, 2021 •

edited

Loading

JoshOrndorff left a comment •

edited

Loading

tgmichel commented Feb 3, 2021 •

edited

Loading