Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Manta] Integrate v0.9.13 upstream changes #294

Merged
merged 30 commits into from
Dec 22, 2021
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0c36a9a
Refactor for 0.9.13 upstream changes
ghzlatarev Dec 4, 2021
71ffe8e
Fix docker files
ghzlatarev Dec 4, 2021
c5738ce
Add 30 second sleeps to docker tests
ghzlatarev Dec 5, 2021
de61b94
Export xcm config with safe version 0. Add more sleep to integration …
ghzlatarev Dec 5, 2021
5e2a02c
Revert xcm name change, try re-enabling runtime upgrade test and bump…
ghzlatarev Dec 5, 2021
5a5699a
Disable runtime upgrade test again
ghzlatarev Dec 5, 2021
391cf68
Use 0.9.13 polkadot binary in CI
ghzlatarev Dec 5, 2021
c65d7a1
Revert spec version bump for now. Fix frame-weight-template.hbs. Add …
ghzlatarev Dec 6, 2021
5370970
Updatge weights for new runtime
ghzlatarev Dec 6, 2021
b2dc82a
Bump spec version to 3120
ghzlatarev Dec 6, 2021
d3c512a
Bump spec version to 3110
ghzlatarev Dec 6, 2021
5fffdc9
Bump client to 3.1.1
ghzlatarev Dec 6, 2021
9f887c8
Clean up para-id use in CLI
ghzlatarev Dec 6, 2021
93aecd5
Remove tryinto/tryfrom; Add MSRV in README
ghzlatarev Dec 13, 2021
317f7b3
Remove para-id mentions in code base
ghzlatarev Dec 14, 2021
8c1f137
Remove para-id mentions in code base
ghzlatarev Dec 14, 2021
3233a3d
Use correct polkadot-launch config for genesis
ghzlatarev Dec 17, 2021
4312a62
Fix merge conflicts with manta branch
ghzlatarev Dec 17, 2021
907aaf6
Fix merge conflicts with manta branch
ghzlatarev Dec 20, 2021
2e47653
Fix merge conflicts with manta branch
ghzlatarev Dec 20, 2021
ab4199a
Merge branch 'ghzlatarev/polkadot-v0.9.13' of https://github.com/Mant…
ghzlatarev Dec 20, 2021
416b537
Add missing file
ghzlatarev Dec 20, 2021
83e883e
Fix merge conflicts with manta branch
ghzlatarev Dec 20, 2021
c0316fd
Fix compilation errors
ghzlatarev Dec 20, 2021
a438714
Switch check_runtim_version.js exit codes
ghzlatarev Dec 20, 2021
bfb556d
Disable manta parachain runtime upgrade test temporarily
ghzlatarev Dec 20, 2021
a6bf4c4
Use correct ci resource
ghzlatarev Dec 20, 2021
1885456
Use correct folder
ghzlatarev Dec 20, 2021
25a056e
Use variable instead of hard-coded value
ghzlatarev Dec 21, 2021
685aae0
Merge branch 'manta' into ghzlatarev/polkadot-v0.9.13
ghzlatarev Dec 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions .github/resources/frame-weight-template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}

// Executed Command:
{{#each args as |arg|~}}
{{#each args as |arg|}}
// {{arg}}
{{/each}}

Expand All @@ -34,80 +34,80 @@ use sp_std::marker::PhantomData;

/// Weight functions needed for {{pallet}}.
pub trait WeightInfo {
{{~#each benchmarks as |benchmark|}}
{{#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{c.name}}: u32, {{/each~}}
) -> Weight;
{{~/each}}
{{/each}}
}

/// Weights for {{pallet}} using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
{{~#if (eq pallet "frame_system")}}
impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
{{~else}}
impl<T: frame_system::Config> {{pallet}}::WeightInfo for SubstrateWeight<T> {
{{~/if}}
{{~#each benchmarks as |benchmark|}}
{{~#each benchmark.comments as |comment|}}
{{#if (eq pallet "frame_system")}}
impl<T: crate::Config> {{pallet}}::WeightInfo for SubstrateWeight<T> {
{{else}}
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
{{/if}}
{{#each benchmarks as |benchmark|}}
{{#each benchmark.comments as |comment|}}
// {{comment}}
{{~/each}}
{{/each}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
{{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
{{~/each}}
{{~#if (ne benchmark.base_reads "0")}}
{{/each}}
{{#if (ne benchmark.base_reads "0")}}
.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
{{~/if}}
{{~#each benchmark.component_reads as |cr|}}
{{/if}}
{{#each benchmark.component_reads as |cr|}}
.saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
{{~/each}}
{{~#if (ne benchmark.base_writes "0")}}
{{/each}}
{{#if (ne benchmark.base_writes "0")}}
.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
{{~/if}}
{{~#each benchmark.component_writes as |cw|}}
{{/if}}
{{#each benchmark.component_writes as |cw|}}
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
{{~/each}}
{{/each}}
}
{{~/each}}
{{/each}}
}

// For backwards compatibility and tests
impl WeightInfo for () {
{{~#each benchmarks as |benchmark|}}
{{~#each benchmark.comments as |comment|}}
{{#each benchmarks as |benchmark|}}
{{#each benchmark.comments as |comment|}}
// {{comment}}
{{~/each}}
{{/each}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
{{#each benchmark.component_weight as |cw|}}
// Standard Error: {{underscore cw.error}}
.saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
{{~/each}}
{{~#if (ne benchmark.base_reads "0")}}
{{/each}}
{{#if (ne benchmark.base_reads "0")}}
.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
{{~/if}}
{{~#each benchmark.component_reads as |cr|}}
{{/if}}
{{#each benchmark.component_reads as |cr|}}
.saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
{{~/each}}
{{~#if (ne benchmark.base_writes "0")}}
{{/each}}
{{#if (ne benchmark.base_writes "0")}}
.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
{{~/if}}
{{~#each benchmark.component_writes as |cw|}}
{{/if}}
{{#each benchmark.component_writes as |cw|}}
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
{{~/each}}
{{/each}}
}
{{~/each}}
{{/each}}
}
1 change: 1 addition & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
name: run docker image
run: |
sudo docker run -d mantanetwork/${{ matrix.runtime.name }}:latest > docker_id.log
sleep 30
-
name: check syncing
run: |
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/generate_calamari_weights_files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# yamllint disable rule:line-length

name: Benchmark Clamari Runtime & Generate Weights Files
name: Benchmark Calamari Runtime & Generate Weights Files

# yamllint disable-line rule:truthy
on:
Expand Down Expand Up @@ -192,6 +192,14 @@ jobs:
id: pallet_utility
name: pallet_utility
iterations: 20
-
extrinsic:
id: '*'
name: pallet_timestamp
pallet:
id: pallet_timestamp
name: pallet_timestamp
iterations: 20
steps:
-
uses: actions/download-artifact@v2
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/publish-draft-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ jobs:
if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
name: fetch and chmod polkadot
run: |
curl -L -o $HOME/.local/bin/polkadot https://github.com/paritytech/polkadot/releases/download/v0.9.12/polkadot
curl -L -o $HOME/.local/bin/polkadot https://github.com/paritytech/polkadot/releases/download/v0.9.13/polkadot
chmod +x $HOME/.local/bin/polkadot
ls -ahl $HOME/.local/bin/
-
Expand Down Expand Up @@ -528,7 +528,7 @@ jobs:
-
name: fetch and chmod polkadot
run: |
curl -L -o $HOME/.local/bin/polkadot https://github.com/paritytech/polkadot/releases/download/v0.9.12/polkadot
curl -L -o $HOME/.local/bin/polkadot https://github.com/paritytech/polkadot/releases/download/v0.9.13/polkadot
chmod +x $HOME/.local/bin/polkadot
ls -ahl $HOME/.local/bin/
-
Expand Down Expand Up @@ -650,7 +650,7 @@ jobs:
name: run test suites
run: |
# todo: implement moonbeam-like js test suite triggers here
sleep 210
sleep 300
-
name: stop testnet
run: |
Expand Down Expand Up @@ -1245,6 +1245,7 @@ jobs:
name: run docker image
run: |
sudo docker run -d ${{ matrix.runtime.name }} > docker_id.log
sleep 30
-
name: check syncing
run: |
Expand Down
Loading