Bug fixes

Cargo.toml

@@ -1,116 +1,115 @@
-cargo-features = ["resolver"]
-
-[workspace]
-members = [
-	"node",
-	"node/cli",
-	"node/service",
-
-	"lib-serml/airdrop",
-	"lib-serml/bridges/*",
-	"lib-serml/democracy",
-	"lib-serml/dex/*",
-	"lib-serml/evm/*",
-	"lib-serml/example",
-	"lib-serml/serp/*",
-	"lib-serml/settmint/*",
-	"lib-serml/support",
-	"lib-serml/tokens/*",
-	"lib-serml/transaction-payment",
-
-	"inspect",
-	"primitives",
-	"rpc",
-
-	"runtime/common",
-	"runtime/newrome",
-	"runtime/setheum",
-
-	"lib-openrml/auction",
-	"lib-openrml/authority",
-	"lib-openrml/bencher",
-	"lib-openrml/benchmarking",
-	"lib-openrml/currencies",
-	"lib-openrml/nft",
-	"lib-openrml/oracle",
-	"lib-openrml/oracle/rpc",
- 	"lib-openrml/oracle/rpc/runtime-api",
-	"lib-openrml/rewards",
-	"lib-openrml/tokens",
-	"lib-openrml/traits",
-	"lib-openrml/utilities",
-	"lib-openrml/vesting",
-	"lib-openrml/weight-gen",
-	"lib-openrml/weight-meter",
-]
-
-resolver = "2"
-
-[profile.dev]
-split-debuginfo = "unpacked"
-
-[profile.release]
-# Setheum runtime requires unwinding.
-panic = "unwind"
-
-# The list of dependencies below (which can be both direct and indirect dependencies) are crates
-# that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
-# their debug info might be missing) or to require to be frequently recompiled. We compile these
-# dependencies with `opt-level=3` even in "dev" mode in order to make "dev" mode more usable.
-# The majority of these crates are cryptographic libraries.
-#
-# Note that this does **not** affect crates that depend on Substrate. In other words, if you add
-# a dependency on Substrate, you have to copy-paste this list in your own `Cargo.toml` (assuming
-# that you want the same list). This list is only relevant when running `cargo build` from within
-# the Substrate workspace.
-#
-# If you see an error mentioning "profile package spec ... did not match any packages", it
-# probably concerns this list.
-#
-# This list is ordered alphabetically.
-[profile.dev.package]
-aes-soft = { opt-level = 3 }
-aesni = { opt-level = 3 }
-blake2 = { opt-level = 3 }
-blake2-rfc = { opt-level = 3 }
-blake2b_simd = { opt-level = 3 }
-chacha20poly1305 = { opt-level = 3 }
-cranelift-codegen = { opt-level = 3 }
-cranelift-wasm = { opt-level = 3 }
-crc32fast = { opt-level = 3 }
-crossbeam-deque = { opt-level = 3 }
-crossbeam-queue = { opt-level = 3 }
-crypto-mac = { opt-level = 3 }
-curve25519-dalek = { opt-level = 3 }
-ed25519-dalek = { opt-level = 3 }
-flate2 = { opt-level = 3 }
-futures-channel = { opt-level = 3 }
-hashbrown = { opt-level = 3 }
-h2 = { opt-level = 3 }
-hash-db = { opt-level = 3 }
-hmac = { opt-level = 3 }
-httparse = { opt-level = 3 }
-integer-sqrt = { opt-level = 3 }
-keccak = { opt-level = 3 }
-libm = { opt-level = 3 }
-librocksdb-sys = { opt-level = 3 }
-libsecp256k1 = { opt-level = 3 }
-libz-sys = { opt-level = 3 }
-mio = { opt-level = 3 }
-nalgebra = { opt-level = 3 }
-num-bigint = { opt-level = 3 }
-parking_lot = { opt-level = 3 }
-parking_lot_core = { opt-level = 3 }
-percent-encoding = { opt-level = 3 }
-ring = { opt-level = 3 }
-rustls = { opt-level = 3 }
-sha2 = { opt-level = 3 }
-sha3 = { opt-level = 3 }
-smallvec = { opt-level = 3 }
-snow = { opt-level = 3 }
-twox-hash = { opt-level = 3 }
-uint = { opt-level = 3 }
-wasmi = { opt-level = 3 }
-x25519-dalek = { opt-level = 3 }
-yamux = { opt-level = 3 }
-zeroize = { opt-level = 3 }
+
+[workspace]
+members = [
+	"node",
+	"node/cli",
+	"node/service",
+
+	"lib-serml/airdrop",
+	"lib-serml/bridges/*",
+	"lib-serml/democracy",
+	"lib-serml/dex/*",
+	"lib-serml/evm/*",
+	"lib-serml/example",
+	"lib-serml/serp/*",
+	"lib-serml/settmint/*",
+	"lib-serml/support",
+	"lib-serml/tokens/*",
+	"lib-serml/transaction-payment",
+
+	"inspect",
+	"primitives",
+	"rpc",
+
+	"runtime/common",
+	"runtime/newrome",
+	"runtime/setheum",
+
+	"lib-openrml/auction",
+	"lib-openrml/authority",
+	"lib-openrml/bencher",
+	"lib-openrml/benchmarking",
+	"lib-openrml/currencies",
+	"lib-openrml/nft",
+	"lib-openrml/oracle",
+	"lib-openrml/oracle/rpc",
+ 	"lib-openrml/oracle/rpc/runtime-api",
+	"lib-openrml/rewards",
+	"lib-openrml/tokens",
+	"lib-openrml/traits",
+	"lib-openrml/utilities",
+	"lib-openrml/vesting",
+	"lib-openrml/weight-gen",
+	"lib-openrml/weight-meter",
+]
+
+resolver = "2"
+
+[profile.dev]
+split-debuginfo = "unpacked"
+
+[profile.release]
+# Setheum runtime requires unwinding.
+panic = "unwind"
+
+# The list of dependencies below (which can be both direct and indirect dependencies) are crates
+# that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
+# their debug info might be missing) or to require to be frequently recompiled. We compile these
+# dependencies with `opt-level=3` even in "dev" mode in order to make "dev" mode more usable.
+# The majority of these crates are cryptographic libraries.
+#
+# Note that this does **not** affect crates that depend on Substrate. In other words, if you add
+# a dependency on Substrate, you have to copy-paste this list in your own `Cargo.toml` (assuming
+# that you want the same list). This list is only relevant when running `cargo build` from within
+# the Substrate workspace.
+#
+# If you see an error mentioning "profile package spec ... did not match any packages", it
+# probably concerns this list.
+#
+# This list is ordered alphabetically.
+[profile.dev.package]
+aes-soft = { opt-level = 3 }
+aesni = { opt-level = 3 }
+blake2 = { opt-level = 3 }
+blake2-rfc = { opt-level = 3 }
+blake2b_simd = { opt-level = 3 }
+chacha20poly1305 = { opt-level = 3 }
+cranelift-codegen = { opt-level = 3 }
+cranelift-wasm = { opt-level = 3 }
+crc32fast = { opt-level = 3 }
+crossbeam-deque = { opt-level = 3 }
+crossbeam-queue = { opt-level = 3 }
+crypto-mac = { opt-level = 3 }
+curve25519-dalek = { opt-level = 3 }
+ed25519-dalek = { opt-level = 3 }
+flate2 = { opt-level = 3 }
+futures-channel = { opt-level = 3 }
+hashbrown = { opt-level = 3 }
+h2 = { opt-level = 3 }
+hash-db = { opt-level = 3 }
+hmac = { opt-level = 3 }
+httparse = { opt-level = 3 }
+integer-sqrt = { opt-level = 3 }
+keccak = { opt-level = 3 }
+libm = { opt-level = 3 }
+librocksdb-sys = { opt-level = 3 }
+libsecp256k1 = { opt-level = 3 }
+libz-sys = { opt-level = 3 }
+mio = { opt-level = 3 }
+nalgebra = { opt-level = 3 }
+num-bigint = { opt-level = 3 }
+parking_lot = { opt-level = 3 }
+parking_lot_core = { opt-level = 3 }
+percent-encoding = { opt-level = 3 }
+ring = { opt-level = 3 }
+rustls = { opt-level = 3 }
+sha2 = { opt-level = 3 }
+sha3 = { opt-level = 3 }
+smallvec = { opt-level = 3 }
+snow = { opt-level = 3 }
+twox-hash = { opt-level = 3 }
+uint = { opt-level = 3 }
+wasmi = { opt-level = 3 }
+x25519-dalek = { opt-level = 3 }
+yamux = { opt-level = 3 }
+zeroize = { opt-level = 3 }

Makefile

@@ -15,27 +15,27 @@ toolchain:
 	./scripts/init.sh
 
 .PHONY: build
-build: githooks
+build: 
 	SKIP_WASM_BUILD= cargo build --features with-newrome-runtime
 
 .PHONY: build-full
-build-full: githooks
+build-full:
 	cargo build --features with-newrome-runtime
 
 .PHONY: build-all
 build-all:
 	cargo build --locked --features with-all-runtime
 
 .PHONY: check
-check: githooks
+check:
 	SKIP_WASM_BUILD= cargo check --features with-newrome-runtime
 
 .PHONY: check
-check-setheum: githooks
+check-setheum: 
 	SKIP_WASM_BUILD= cargo check --features with-setheum-runtime
 
 .PHONY: check-tests
-check-tests: githooks
+check-tests: 
 	SKIP_WASM_BUILD= cargo check --features with-all-runtime --tests --all
 
 .PHONY: check-all
@@ -59,11 +59,11 @@ check-try-runtime:
 	SKIP_WASM_BUILD= cargo check --features try-runtime --features with-all-runtime
 
 .PHONY: test
-test: githooks
+test: 
 	SKIP_WASM_BUILD= cargo test --features with-newrome-runtime --all
 
 .PHONY: test-sevm
-test: githooks
+test: 
 	SKIP_WASM_BUILD= cargo test --all --features with-sevm test_setheum_evm
 	SKIP_WASM_BUILD= cargo test --all --features with-sevm should_not_kill_contract_on_transfer_all
 	SKIP_WASM_BUILD= cargo test --all --features with-sevm schedule_call_precompile_should_work
@@ -91,31 +91,19 @@ target/debug/setheum:
 	SKIP_WASM_BUILD= cargo build --features with-newrome-runtime
 
 .PHONY: build-newrome
-build: githooks
+build: 
 	SKIP_WASM_BUILD= cargo build --features with-newrome-runtime
 
 .PHONY: build-setheum
-build: githooks
+build: 
 	SKIP_WASM_BUILD= cargo build --features with-setheum-runtime
 
 .PHONY: build-all
-build: githooks
+build: 
 	SKIP_WASM_BUILD= cargo build --features with-all-runtime
 
-GITHOOKS_SRC = $(wildcard githooks/*)
-GITHOOKS_DEST = $(patsubst githooks/%, .git/hooks/%, $(GITHOOKS_SRC))
-
-.git/hooks:
-	mkdir .git/hooks
-
-.git/hooks/%: githooks/%
-	cp $^ $@
-
-.PHONY: githooks
-githooks: .git/hooks $(GITHOOKS_DEST)
-
-.PHONY: init
-init: toolchain submodule build-full
+.PHONY: start
+start: toolchain submodule build-full
 
 .PHONY: submodule
 submodule:

README.md

@@ -92,7 +92,7 @@ git config --global submodule.recurse true
 Install required tools and install git hooks:
 
 ```bash
-make init
+make start
 ```
 
 Build all native code:

lib-serml/airdrop/Cargo.toml

@@ -10,9 +10,9 @@ serde = { version = "1.0.124", optional = true }
 codec = { default-features = false, package = "parity-scale-codec", version = "2.0.0" }
 
 # Substrate dependencies
-sp-runtime = { version = "3.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
-frame-support = { version = "3.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
-frame-system = { version = "3.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
 
 # local dependencies
 primitives = { package = "setheum-primitives", path = "../../primitives", default-features = false }