Merge remote-tracking branch 'origin/master' into jeremy-construct-ta…

…nssi-runtime-macro

.github/workflows/release.yml

@@ -130,7 +130,7 @@ jobs:
               run: rustup show
 
             - name: Install zepter
-              run: cargo install --locked -f zepter
+              run: cargo install --locked -f zepter --version 1.1.0
 
             - name: Run zepter
               run: zepter run check

.github/workflows/version-bump.yml

@@ -0,0 +1,35 @@
+name: Create version bump ticket
+on:
+  workflow_dispatch:
+    inputs:
+      from:
+        description: "Polkadot version to bump from (ex: v0.9.40)"
+        required: true
+      to:
+        description: "Polkadot version to bump to (ex: v0.9.42)"
+        required: true
+
+jobs:
+  create_bump_ticket:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.10.0
+      - name: Generate version bump issue
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          cd tools
+          yarn install
+          yarn --silent run print-version-bump-info -- --from ${{ github.event.inputs.from }} --to ${{ github.event.inputs.to }} | tee ../version-bump.md
+      - name: Create version bump issue
+        uses: peter-evans/create-issue-from-file@v3
+        with:
+          title: Update polkadot-sdk from ${{ github.event.inputs.from }} to ${{ github.event.inputs.to }}
+          content-filepath: ./version-bump.md
+          labels: |
+            automated issue

Cargo.toml

@@ -35,6 +35,7 @@ pallet-pooled-staking = { path = "pallets/pooled-staking", default-features = fa
 pallet-registrar = { path = "pallets/registrar", default-features = false }
 pallet-registrar-runtime-api = { path = "pallets/registrar/rpc/runtime-api", default-features = false }
 pallet-services-payment = { path = "pallets/services-payment", default-features = false }
+pallet-stream-payment = { path = "pallets/stream-payment", default-features = false }
 
 container-chain-template-frontier-runtime = { path = "container-chains/templates/frontier/runtime", default-features = false }
 container-chain-template-simple-runtime = { path = "container-chains/templates/simple/runtime", default-features = false }
@@ -43,10 +44,12 @@ dancebox-runtime = { path = "runtime/dancebox", default-features = false }
 flashbox-runtime = { path = "runtime/flashbox", default-features = false }
 manual-xcm-rpc = { path = "client/manual-xcm" }
 node-common = { path = "client/node-common" }
+runtime-common = { path = "runtime/common", default-features = false }
 tc-consensus = { path = "client/consensus" }
 tp-author-noting-inherent = { path = "primitives/author-noting-inherent", default-features = false }
 tp-consensus = { path = "primitives/consensus", default-features = false }
 tp-container-chain-genesis-data = { path = "primitives/container-chain-genesis-data", default-features = false }
+tp-fungibles-ext = { path = "primitives/fungibles-ext", default-features = false }
 tp-impl-tanssi-pallets-config = { path = "primitives/impl-tanssi-pallets-config", default-features = false }
 tp-maths = { path = "primitives/maths", default-features = false }
 tp-traits = { path = "primitives/traits", default-features = false }
@@ -253,6 +256,7 @@ num_enum = { version = "0.7.1", default-features = false }
 rand_chacha = { version = "0.3.1", default-features = false }
 serde = { version = "1.0.152", default-features = false }
 smallvec = "1.10.0"
+tap = "1.0.1"
 
 # General (client)
 async-io = "1.3"

client/consensus/src/lib.rs

@@ -20,11 +20,10 @@
 //! slot_author returns the author based on the slot number and authorities provided (aura-like)
 //! authorities retrieves the current set of authorities based on the first eligible key found in the keystore
 
-use {sp_consensus_slots::Slot, sp_core::crypto::Pair};
-
 pub mod collators;
 mod consensus_orchestrator;
 mod manual_seal;
+
 #[cfg(test)]
 mod tests;
 
@@ -52,6 +51,8 @@ pub use {
     tp_consensus::TanssiAuthorityAssignmentApi,
 };
 
+use {sp_consensus_slots::Slot, sp_core::crypto::Pair};
+
 const LOG_TARGET: &str = "aura::tanssi";
 
 type AuthorityId<P> = <P as Pair>::Public;

client/node-common/src/service.rs

@@ -35,8 +35,9 @@ use {
         run_manual_seal, ConsensusDataProvider, EngineCommand, ManualSealParams,
     },
     sc_executor::{
-        HeapAllocStrategy, NativeElseWasmExecutor, NativeExecutionDispatch, WasmExecutor,
-        DEFAULT_HEAP_ALLOC_STRATEGY,
+        sp_wasm_interface::{ExtendedHostFunctions, HostFunctions},
+        HeapAllocStrategy, NativeElseWasmExecutor, NativeExecutionDispatch, RuntimeVersionOf,
+        WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY,
     },
     sc_network::{config::FullNetworkConfiguration, NetworkBlock, NetworkService},
     sc_network_sync::SyncingService,
@@ -52,6 +53,7 @@ use {
     sp_api::ConstructRuntimeApi,
     sp_block_builder::BlockBuilder,
     sp_consensus::SelectChain,
+    sp_core::traits::CodeExecutor,
     sp_inherents::CreateInherentDataProviders,
     sp_offchain::OffchainWorkerApi,
     sp_runtime::Percent,
@@ -64,7 +66,7 @@ use {
 pub trait NodeBuilderConfig {
     type Block;
     type RuntimeApi;
-    type ParachainNativeExecutor;
+    type ParachainExecutor;
 
     /// Create a new `NodeBuilder` using the types of this `Config`, along
     /// with the parachain `Configuration` and an optional `HwBench`.
@@ -75,7 +77,8 @@ pub trait NodeBuilderConfig {
     where
         Self: Sized,
         BlockOf<Self>: cumulus_primitives_core::BlockT,
-        ParachainNativeExecutorOf<Self>: NativeExecutionDispatch + 'static,
+        ExecutorOf<Self>:
+            Clone + CodeExecutor + RuntimeVersionOf + TanssiExecutorExt + Sync + Send + 'static,
         RuntimeApiOf<Self>:
             ConstructRuntimeApi<BlockOf<Self>, ClientOf<Self>> + Sync + Send + 'static,
         ConstructedRuntimeApiOf<Self>:
@@ -89,8 +92,7 @@ pub type BlockOf<T> = <T as NodeBuilderConfig>::Block;
 pub type BlockHashOf<T> = <BlockOf<T> as cumulus_primitives_core::BlockT>::Hash;
 pub type BlockHeaderOf<T> = <BlockOf<T> as cumulus_primitives_core::BlockT>::Header;
 pub type RuntimeApiOf<T> = <T as NodeBuilderConfig>::RuntimeApi;
-pub type ParachainNativeExecutorOf<T> = <T as NodeBuilderConfig>::ParachainNativeExecutor;
-pub type ExecutorOf<T> = NativeElseWasmExecutor<ParachainNativeExecutorOf<T>>;
+pub type ExecutorOf<T> = <T as NodeBuilderConfig>::ParachainExecutor;
 pub type ClientOf<T> = TFullClient<BlockOf<T>, RuntimeApiOf<T>, ExecutorOf<T>>;
 pub type BackendOf<T> = TFullBackend<BlockOf<T>>;
 pub type ConstructedRuntimeApiOf<T> =
@@ -130,7 +132,7 @@ pub struct NodeBuilder<
     SImportQueueService = (),
 > where
     BlockOf<T>: cumulus_primitives_core::BlockT,
-    ParachainNativeExecutorOf<T>: NativeExecutionDispatch + 'static,
+    ExecutorOf<T>: Clone + CodeExecutor + RuntimeVersionOf + Sync + Send + 'static,
     RuntimeApiOf<T>: ConstructRuntimeApi<BlockOf<T>, ClientOf<T>> + Sync + Send + 'static,
     ConstructedRuntimeApiOf<T>: TaggedTransactionQueue<BlockOf<T>> + BlockBuilder<BlockOf<T>>,
 {
@@ -157,13 +159,39 @@ pub struct Network<Block: cumulus_primitives_core::BlockT> {
     pub sync_service: Arc<SyncingService<Block>>,
 }
 
+/// Allows to create a parachain-defined executor from a `WasmExecutor`
+pub trait TanssiExecutorExt {
+    type HostFun: HostFunctions;
+    fn new_with_wasm_executor(wasm_executor: WasmExecutor<Self::HostFun>) -> Self;
+}
+
+impl TanssiExecutorExt for WasmExecutor<sp_io::SubstrateHostFunctions> {
+    type HostFun = sp_io::SubstrateHostFunctions;
+
+    fn new_with_wasm_executor(wasm_executor: WasmExecutor<Self::HostFun>) -> Self {
+        wasm_executor
+    }
+}
+
+impl<D> TanssiExecutorExt for NativeElseWasmExecutor<D>
+where
+    D: NativeExecutionDispatch,
+{
+    type HostFun = ExtendedHostFunctions<sp_io::SubstrateHostFunctions, D::ExtendHostFunctions>;
+
+    fn new_with_wasm_executor(wasm_executor: WasmExecutor<Self::HostFun>) -> Self {
+        NativeElseWasmExecutor::new_with_wasm_executor(wasm_executor)
+    }
+}
+
 // `new` function doesn't take self, and the Rust compiler cannot infer that
 // only one type T implements `TypeIdentity`. With thus need a separate impl
 // block with concrete types `()`.
 impl<T: NodeBuilderConfig> NodeBuilder<T>
 where
     BlockOf<T>: cumulus_primitives_core::BlockT,
-    ParachainNativeExecutorOf<T>: NativeExecutionDispatch + 'static,
+    ExecutorOf<T>:
+        Clone + CodeExecutor + RuntimeVersionOf + TanssiExecutorExt + Sync + Send + 'static,
     RuntimeApiOf<T>: ConstructRuntimeApi<BlockOf<T>, ClientOf<T>> + Sync + Send + 'static,
     ConstructedRuntimeApiOf<T>: TaggedTransactionQueue<BlockOf<T>> + BlockBuilder<BlockOf<T>>,
 {
@@ -255,7 +283,7 @@ impl<T: NodeBuilderConfig, SNetwork, STxHandler, SImportQueueService>
     NodeBuilder<T, SNetwork, STxHandler, SImportQueueService>
 where
     BlockOf<T>: cumulus_primitives_core::BlockT,
-    ParachainNativeExecutorOf<T>: NativeExecutionDispatch + 'static,
+    ExecutorOf<T>: Clone + CodeExecutor + RuntimeVersionOf + Sync + Send + 'static,
     RuntimeApiOf<T>: ConstructRuntimeApi<BlockOf<T>, ClientOf<T>> + Sync + Send + 'static,
     ConstructedRuntimeApiOf<T>: TaggedTransactionQueue<BlockOf<T>>
         + BlockBuilder<BlockOf<T>>

container-chains/templates/frontier/node/src/service.rs

@@ -60,7 +60,7 @@ pub struct NodeConfig;
 impl NodeBuilderConfig for NodeConfig {
     type Block = Block;
     type RuntimeApi = RuntimeApi;
-    type ParachainNativeExecutor = TemplateRuntimeExecutor;
+    type ParachainExecutor = ParachainExecutor;
 }
 
 pub fn frontier_database_dir(config: &Configuration, path: &str) -> std::path::PathBuf {

container-chains/templates/simple/node/src/service.rs

@@ -65,7 +65,7 @@ pub struct NodeConfig;
 impl NodeBuilderConfig for NodeConfig {
     type Block = Block;
     type RuntimeApi = RuntimeApi;
-    type ParachainNativeExecutor = ParachainNativeExecutor;
+    type ParachainExecutor = ParachainExecutor;
 }
 
 thread_local!(static TIMESTAMP: std::cell::RefCell<u64> = std::cell::RefCell::new(0));

node/src/chain_spec/dancebox.rs

@@ -212,9 +212,10 @@ fn testnet_genesis(
         )
         .collect();
     // Assign 1000 block credits to all container chains registered in genesis
+    // Assign 100 collator assignment credits to all container chains registered in genesis
     let para_id_credits: Vec<_> = para_ids
         .iter()
-        .map(|(para_id, _genesis_data, _boot_nodes)| (*para_id, 1000))
+        .map(|(para_id, _genesis_data, _boot_nodes)| (*para_id, 1000, 100).into())
         .collect();
     let para_id_boot_nodes: Vec<_> = para_ids
         .iter()

node/src/chain_spec/flashbox.rs

@@ -212,9 +212,10 @@ fn testnet_genesis(
         )
         .collect();
     // Assign 1000 block credits to all container chains registered in genesis
+    // Assign 100 collator assignment credits to all container chains registered in genesis
     let para_id_credits: Vec<_> = para_ids
         .iter()
-        .map(|(para_id, _genesis_data, _boot_nodes)| (*para_id, 1000))
+        .map(|(para_id, _genesis_data, _boot_nodes)| (*para_id, 1000, 100).into())
         .collect();
     let para_id_boot_nodes: Vec<_> = para_ids
         .iter()

node/src/container_chain_monitor.rs

@@ -17,7 +17,7 @@
 use {
     crate::{
         container_chain_spawner::{CcSpawnMsg, ContainerChainSpawnerState},
-        service::{ParachainBackend, ParachainClient},
+        service::{ContainerChainBackend, ContainerChainClient},
     },
     cumulus_primitives_core::ParaId,
     std::{
@@ -57,9 +57,9 @@ pub struct SpawnedContainer {
     /// This won't be precise because it is checked using polling with a high period.
     pub stop_refcount_time: Cell<Option<Instant>>,
     /// Used to check the reference count, if it's 0 it means the database has been closed
-    pub backend: std::sync::Weak<ParachainBackend>,
+    pub backend: std::sync::Weak<ContainerChainBackend>,
     /// Used to check the reference count, if it's 0 it means that the client has been closed.
-    pub client: std::sync::Weak<ParachainClient>,
+    pub client: std::sync::Weak<ContainerChainClient>,
 }
 
 impl SpawnedContainer {