Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Companion PR to Substrate #5680#1028

Closed
apopiak wants to merge 2 commits intomasterfrom
apopiak-weight-params
Closed

Companion PR to Substrate #5680#1028
apopiak wants to merge 2 commits intomasterfrom
apopiak-weight-params

Conversation

@apopiak
Copy link
Contributor

@apopiak apopiak commented Apr 23, 2020

@parity-cla-bot
Copy link

It looks like @apopiak signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

@apopiak
Copy link
Contributor Author

apopiak commented Apr 23, 2020

This branch builds fine locally (with cargo build) except for this diff:

diff --git a/parachain/src/wasm_executor/mod.rs b/parachain/src/wasm_executor/mod.rs
index 64c27278..a7fd92c4 100644
--- a/parachain/src/wasm_executor/mod.rs
+++ b/parachain/src/wasm_executor/mod.rs
@@ -183,7 +183,6 @@ pub fn validate_candidate_internal<E: Externalities + 'static>(
 		// TODO: Make sure we don't use more than 1GB: https://github.com/paritytech/polkadot/issues/699
 		Some(1024),
 		HostFunctions::host_functions(),
-		false,
 		8
 	);
 	let res = executor.call_in_wasm(
@@ -192,6 +191,7 @@ pub fn validate_candidate_internal<E: Externalities + 'static>(
 		"validate_block",
 		encoded_call_data,
 		&mut ext,
+		sp_core::traits::MissingHostFunctions::Allow
 	)?;
 
 	ValidationResult::decode(&mut &res[..]).map_err(|_| Error::BadReturn.into())

which seems unrelated to my changes.
Seems related to #1026

@andresilva
Copy link
Contributor

Merge master into your branch once #1026 is merged and it should be fixed.

@apopiak apopiak requested a review from gavofyork April 24, 2020 09:53
@andresilva
Copy link
Contributor

Added this to #1012 as there was a cyclic dependency here.

@andresilva andresilva closed this Apr 24, 2020
@apopiak
Copy link
Contributor Author

apopiak commented Apr 24, 2020

sure

@shawntabrizi shawntabrizi deleted the apopiak-weight-params branch April 24, 2020 15:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants