Update everything to latest master (#247)

This commit is contained in:
Bastian Köcher
2020-11-25 15:45:49 +01:00
committed by GitHub
parent 35c2609b8b
commit e6f37cb7cf
10 changed files with 426 additions and 339 deletions
+384 -287
View File
File diff suppressed because it is too large Load Diff
-1
View File
@@ -125,7 +125,6 @@ where
verifier, verifier,
Box::new(block_import), Box::new(block_import),
None, None,
None,
spawner, spawner,
registry, registry,
)) ))
+1 -1
View File
@@ -43,7 +43,7 @@ cumulus-message-broker = { path = "../../message-broker", default-features = fal
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" }
[build-dependencies] [build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } substrate-wasm-builder = "3.0.0"
[features] [features]
default = [ "std" ] default = [ "std" ]
+1 -2
View File
@@ -14,12 +14,11 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>. // along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
use wasm_builder_runner::WasmBuilder; use substrate_wasm_builder::WasmBuilder;
fn main() { fn main() {
WasmBuilder::new() WasmBuilder::new()
.with_current_project() .with_current_project()
.with_wasm_builder_from_crates("2.0.0")
.export_heap_base() .export_heap_base()
.import_memory() .import_memory()
.build() .build()
-2
View File
@@ -147,8 +147,6 @@ where
import_queue, import_queue,
on_demand: None, on_demand: None,
block_announce_validator_builder: Some(Box::new(|_| block_announce_validator)), block_announce_validator_builder: Some(Box::new(|_| block_announce_validator)),
finality_proof_request_builder: None,
finality_proof_provider: None,
})?; })?;
let rpc_client = client.clone(); let rpc_client = client.clone();
@@ -43,7 +43,7 @@ use sp_trie::MemoryDB;
type StorageValue = Vec<u8>; type StorageValue = Vec<u8>;
type StorageKey = Vec<u8>; type StorageKey = Vec<u8>;
type Ext<'a, B: BlockT> = sp_state_machine::Ext< type Ext<'a, B> = sp_state_machine::Ext<
'a, 'a,
HashFor<B>, HashFor<B>,
NumberFor<B>, NumberFor<B>,
@@ -93,45 +93,43 @@ pub fn validate_block<B: BlockT, E: ExecuteBlock<B>>(params: ValidationParams) -
params: &params, params: &params,
}; };
let _guard = unsafe { let _guard = (
( // Replace storage calls with our own implementations
// Replace storage calls with our own implementations sp_io::storage::host_read.replace_implementation(host_storage_read),
sp_io::storage::host_read.replace_implementation(host_storage_read), sp_io::storage::host_set.replace_implementation(host_storage_set),
sp_io::storage::host_set.replace_implementation(host_storage_set), sp_io::storage::host_get.replace_implementation(host_storage_get),
sp_io::storage::host_get.replace_implementation(host_storage_get), sp_io::storage::host_exists.replace_implementation(host_storage_exists),
sp_io::storage::host_exists.replace_implementation(host_storage_exists), sp_io::storage::host_clear.replace_implementation(host_storage_clear),
sp_io::storage::host_clear.replace_implementation(host_storage_clear), sp_io::storage::host_root.replace_implementation(host_storage_root),
sp_io::storage::host_root.replace_implementation(host_storage_root), sp_io::storage::host_clear_prefix.replace_implementation(host_storage_clear_prefix),
sp_io::storage::host_clear_prefix.replace_implementation(host_storage_clear_prefix), sp_io::storage::host_changes_root.replace_implementation(host_storage_changes_root),
sp_io::storage::host_changes_root.replace_implementation(host_storage_changes_root), sp_io::storage::host_append.replace_implementation(host_storage_append),
sp_io::storage::host_append.replace_implementation(host_storage_append), sp_io::storage::host_next_key.replace_implementation(host_storage_next_key),
sp_io::storage::host_next_key.replace_implementation(host_storage_next_key), sp_io::storage::host_start_transaction
sp_io::storage::host_start_transaction .replace_implementation(host_storage_start_transaction),
.replace_implementation(host_storage_start_transaction), sp_io::storage::host_rollback_transaction
sp_io::storage::host_rollback_transaction .replace_implementation(host_storage_rollback_transaction),
.replace_implementation(host_storage_rollback_transaction), sp_io::storage::host_commit_transaction
sp_io::storage::host_commit_transaction .replace_implementation(host_storage_commit_transaction),
.replace_implementation(host_storage_commit_transaction), sp_io::default_child_storage::host_get
sp_io::default_child_storage::host_get .replace_implementation(host_default_child_storage_get),
.replace_implementation(host_default_child_storage_get), sp_io::default_child_storage::host_read
sp_io::default_child_storage::host_read .replace_implementation(host_default_child_storage_read),
.replace_implementation(host_default_child_storage_read), sp_io::default_child_storage::host_set
sp_io::default_child_storage::host_set .replace_implementation(host_default_child_storage_set),
.replace_implementation(host_default_child_storage_set), sp_io::default_child_storage::host_clear
sp_io::default_child_storage::host_clear .replace_implementation(host_default_child_storage_clear),
.replace_implementation(host_default_child_storage_clear), sp_io::default_child_storage::host_storage_kill
sp_io::default_child_storage::host_storage_kill .replace_implementation(host_default_child_storage_storage_kill),
.replace_implementation(host_default_child_storage_storage_kill), sp_io::default_child_storage::host_exists
sp_io::default_child_storage::host_exists .replace_implementation(host_default_child_storage_exists),
.replace_implementation(host_default_child_storage_exists), sp_io::default_child_storage::host_clear_prefix
sp_io::default_child_storage::host_clear_prefix .replace_implementation(host_default_child_storage_clear_prefix),
.replace_implementation(host_default_child_storage_clear_prefix), sp_io::default_child_storage::host_root
sp_io::default_child_storage::host_root .replace_implementation(host_default_child_storage_root),
.replace_implementation(host_default_child_storage_root), sp_io::default_child_storage::host_next_key
sp_io::default_child_storage::host_next_key .replace_implementation(host_default_child_storage_next_key),
.replace_implementation(host_default_child_storage_next_key), );
)
};
set_and_run_with_externalities(&mut ext, || { set_and_run_with_externalities(&mut ext, || {
E::execute_block(block); E::execute_block(block);
-1
View File
@@ -305,7 +305,6 @@ pub fn build_polkadot_full_node(
config, config,
polkadot_service::IsCollator::Yes(collator_id), polkadot_service::IsCollator::Yes(collator_id),
None, None,
None,
) )
} }
} }
+1 -1
View File
@@ -38,7 +38,7 @@ cumulus-runtime = { path = "../../runtime", default-features = false }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" }
[build-dependencies] [build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" } substrate-wasm-builder = "3.0.0"
[features] [features]
default = [ "std" ] default = [ "std" ]
+1 -2
View File
@@ -14,12 +14,11 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>. // along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
use wasm_builder_runner::WasmBuilder; use substrate_wasm_builder::WasmBuilder;
fn main() { fn main() {
WasmBuilder::new() WasmBuilder::new()
.with_current_project() .with_current_project()
.with_wasm_builder_from_crates("2.0.0")
.export_heap_base() .export_heap_base()
.import_memory() .import_memory()
.build() .build()
-2
View File
@@ -181,8 +181,6 @@ where
import_queue, import_queue,
on_demand: None, on_demand: None,
block_announce_validator_builder: Some(Box::new(block_announce_validator_builder)), block_announce_validator_builder: Some(Box::new(block_announce_validator_builder)),
finality_proof_request_builder: None,
finality_proof_provider: None,
})?; })?;
let rpc_extensions_builder = { let rpc_extensions_builder = {