Skip to content
This repository has been archived by the owner on Mar 13, 2023. It is now read-only.

Fix WASM Execution #879

Merged
merged 3 commits into from
Oct 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
with:
repository: l2ust/subalfred
ref: main
- name: Install Rust nightly-2021-09-01 toolchain
- name: Install Rust nightly-2021-04-22 toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-09-01
toolchain: nightly-2021-04-22
default: true
- name: Build
uses: actions-rs/cargo@v1
Expand All @@ -43,10 +43,10 @@ jobs:
steps:
- name: Fetch latest code
uses: actions/checkout@v2
- name: Install Rust nightly-2021-09-01 toolchain
- name: Install Rust nightly-2021-04-22 toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-09-01
toolchain: nightly-2021-04-22
target: wasm32-unknown-unknown
default: true
- name: Run checker
Expand All @@ -61,10 +61,10 @@ jobs:
steps:
- name: Fetch latest code
uses: actions/checkout@v2
- name: Install Rust nightly-2021-09-01 toolchain
- name: Install Rust nightly-2021-04-22 toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-09-01
toolchain: nightly-2021-04-22
target: wasm32-unknown-unknown
default: true
- name: Build
Expand Down
30 changes: 15 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions node/service/src/service/pangoro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,15 @@ where
select_chain.clone(),
move |_, ()| async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();

let slot =
sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
slot_duration,
);
let uncles =
sp_authorship::InherentDataProvider::<<Block as BlockT>::Header>::check_inherents();

Ok((timestamp, slot))
Ok((timestamp, slot, uncles))
},
&task_manager.spawn_essential_handle(),
config.prometheus_registry(),
Expand Down Expand Up @@ -369,9 +370,7 @@ where
&*client_clone,
parent,
)?;

let timestamp = sp_timestamp::InherentDataProvider::from_system_time();

let slot =
sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2021-09-01"
channel = "nightly-2021-04-22"
components = ["cargo", "clippy", "rustc", "rustfmt", "rust-src"]
profile = "minimal"
targets = ["wasm32-unknown-unknown"]