Merge pull request #304 from bit-country/master

Upgrade subwasm build and missing std
bit-country · Jan 7, 2024 · d924c1c · d924c1c
2 parents 61dc316 + 96259e3
commit d924c1c
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 67 deletions.
diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
@@ -5,7 +5,7 @@ name: Publish Release
 # - Build WASM using Substrate Runtime Tool
 
 env:
-  SUBWASM_VERSION: 0.17.0
+  SUBWASM_VERSION: 0.20.0
 
 on:
   workflow_dispatch:
@@ -37,7 +37,7 @@ jobs:
       # Build WASM with Substrate Runtime Tool
       - name: Srtool build
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.4.0
+        uses: chevdor/srtool-actions@v0.7.0
         with:
           chain: ${{ github.event.inputs.chain }}
           tag: ${{ github.event.inputs.srtool_image }}

diff --git a/Cargo.toml b/Cargo.toml
diff --git a/primitives/precompiles/Cargo.toml b/primitives/precompiles/Cargo.toml
@@ -10,7 +10,6 @@ log = { workspace = true, default-features = true }
 num_enum = { workspace = true }
 sha3 = { version = "0.9", default-features = false }
 similar-asserts = { workspace = true, optional = true }
-
 # Moonbeam
 precompile-utils-macro = { path = "macro" }
 
@@ -32,17 +31,18 @@ xcm = { workspace = true }
 
 [dev-dependencies]
 hex-literal = { workspace = true }
+#assert_matches = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
-	"codec/std",
-	"fp-evm/std",
-	"frame-support/std",
-	"frame-system/std",
-	"pallet-evm/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-std/std",
+    "codec/std",
+    "fp-evm/std",
+    "frame-support/std",
+    "frame-system/std",
+    "pallet-evm/std",
+    "sp-core/std",
+    "sp-io/std",
+    "sp-std/std",
 ]
 #testing = [ "similar-asserts", "std" ]
diff --git a/primitives/precompiles/src/lib.rs b/primitives/precompiles/src/lib.rs
@@ -15,24 +15,25 @@
 // along with Utils.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![feature(assert_matches)]
 
 extern crate alloc;
 
+use fp_evm::{ExitError, ExitRevert, ExitSucceed, PrecompileFailure, PrecompileHandle, PrecompileOutput};
+
+use crate::alloc::borrow::ToOwned;
+
 pub mod costs;
 pub mod handle;
 pub mod logs;
 pub mod modifier;
 pub mod precompile_set;
 pub mod substrate;
+#[cfg(feature = "testing")]
 pub mod testing;
 
 #[cfg(test)]
 mod tests;
 
-use crate::alloc::borrow::ToOwned;
-use fp_evm::{ExitError, ExitRevert, ExitSucceed, PrecompileFailure, PrecompileHandle, PrecompileOutput};
-
 pub mod data;
 
 // pub use data::{Address, Bytes, EvmData, EvmDataReader, EvmDataWriter};

diff --git a/primitives/precompiles/src/testing.rs b/primitives/precompiles/src/testing.rs
@@ -17,7 +17,7 @@
 use {
 	alloc::format,
 	alloc::string::String,
-	core::assert_matches::assert_matches,
+	assert_matches::assert_matches,
 	fp_evm::{
 		Context, ExitError, ExitReason, ExitSucceed, Log, PrecompileFailure, PrecompileHandle, PrecompileOutput,
 		PrecompileResult, PrecompileSet, Transfer,

diff --git a/runtime/continuum/Cargo.toml b/runtime/continuum/Cargo.toml
@@ -4,15 +4,16 @@ description = "Continuum Runtime"
 version = "0.0.7"
 edition = '2021'
 
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-substrate-wasm-builder = { workspace = true, default-features = true }
+substrate-wasm-builder = { workspace = true }
 
 [dependencies]
-codec = { workspace = true, package = "parity-scale-codec" }
-serde = { workspace = true, optional = true, features = ['derive'] }
+codec = { workspace = true, package = "parity-scale-codec", default-features = false, features = ['derive'] }
 log = { workspace = true }
+serde = { workspace = true, optional = true, features = ['derive'] }
 scale-info = { workspace = true }
 smallvec = { workspace = true }
 hex-literal = { workspace = true }
@@ -148,11 +149,13 @@ std = [
     "frame-support/std",
     "frame-executive/std",
     "frame-system/std",
+    "frame-system-rpc-runtime-api/std",
     "pallet-balances/std",
     "pallet-insecure-randomness-collective-flip/std",
     "pallet-timestamp/std",
     "pallet-sudo/std",
     "pallet-transaction-payment/std",
+    "pallet-transaction-payment-rpc-runtime-api/std",
     "pallet-collective/std",
     "pallet-session/std",
     "pallet-scheduler/std",
@@ -162,6 +165,8 @@ std = [
     "pallet-membership/std",
     "pallet-utility/std",
     "pallet-proxy/std",
+    "pallet-grandpa/std",
+    "pallet-democracy/std",
     "parachain-info/std",
     "cumulus-pallet-aura-ext/std",
     "cumulus-pallet-parachain-system/std",

diff --git a/runtime/pioneer/Cargo.toml b/runtime/pioneer/Cargo.toml
@@ -7,7 +7,7 @@ edition = '2021'
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-substrate-wasm-builder = { workspace = true, default-features = true }
+substrate-wasm-builder = { workspace = true }
 
 [dependencies]
 codec = { workspace = true, package = "parity-scale-codec" }
@@ -149,12 +149,16 @@ std = [
     "frame-support/std",
     "frame-executive/std",
     "frame-system/std",
+    "frame-system-rpc-runtime-api/std",
     "pallet-balances/std",
     "pallet-insecure-randomness-collective-flip/std",
     "pallet-timestamp/std",
     "pallet-sudo/std",
+    "pallet-grandpa/std",
     "pallet-transaction-payment/std",
+    "pallet-transaction-payment-rpc-runtime-api/std",
     "pallet-collective/std",
+    "pallet-democracy/std",
     "pallet-session/std",
     "pallet-scheduler/std",
     "pallet-vesting/std",