Cleanup prior commits

Cargo.toml

@@ -91,10 +91,8 @@ pallet-contracts = { version = "31.0.0", default-features = false }
 pallet-balances = { version = "33.0.0", default-features = false }
 pallet-timestamp = { version = "31.0.0", default-features = false }
 pallet-contracts-uapi = { version = "9.0.0", default-features = false }
-# TODO: pop-node revive fork exposes host fn `to_account_id`
- pallet-revive-uapi = { git = "https://github.com/paritytech/polkadot-sdk" }
-# pallet-revive-uapi = { git = "https://github.com/r0gue-io/pop-node", branch = "sub0" }
-# pallet-revive-uapi = { version  = "0.1.1" }
+pallet-revive-uapi = { git = "https://github.com/paritytech/polkadot-sdk" }
+# TODO include mock-network for revive
 pallet-contracts-mock-network = { version = "7.0.0", default-features = false }
 sp-externalities = { version = "0.28.0", default-features = false }
 sp-io = { version = "34.0.0", default-features = false }
@@ -105,7 +103,7 @@ sp-runtime = { version = "35.0.0", default-features = false }
 sp-weights = { version = "31.0.0", default-features = false }
 xcm = { package = "staging-xcm", version = "11.0.0", default-features = false }
 
-# Polkavm dependencies
+# PolkaVM dependencies
 polkavm-derive = "0.17.1"
 
 # Local dependencies

crates/e2e/Cargo.toml

@@ -77,3 +77,7 @@ sandbox = [
     "pallet-contracts-mock-network",
     "ink_e2e_macro/sandbox",
 ]
+revive = [
+    "ink/revive",
+    "ink_env/revive"
+]

crates/env/Cargo.toml

@@ -1,35 +1,35 @@
 [package]
+name = "ink_env"
+version.workspace = true
 authors = ["Use Ink <ink@use.ink>"]
 edition.workspace = true
-name = "ink_env"
 rust-version = "1.68"
-version.workspace = true
 
-categories.workspace = true
-description = "[ink!] Low-level interface for interacting with the smart contract Wasm executor."
-documentation = "https://docs.rs/ink_env/"
-homepage.workspace = true
-include = ["Cargo.toml", "LICENSE", "README.md", "src/**/*.rs"]
-keywords.workspace = true
 license.workspace = true
 readme = "README.md"
 repository.workspace = true
+documentation = "https://docs.rs/ink_env/"
+homepage.workspace = true
+description = "[ink!] Low-level interface for interacting with the smart contract Wasm executor."
+keywords.workspace = true
+categories.workspace = true
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 
 [dependencies]
 ink_allocator = { workspace = true }
+ink_storage_traits = { workspace = true }
 ink_prelude = { workspace = true }
 ink_primitives = { workspace = true }
-ink_storage_traits = { workspace = true }
 pallet-contracts-uapi = { workspace = true }
 pallet-revive-uapi = { workspace = true }
 
-cfg-if = { workspace = true }
-const_env = { workspace = true }
-derive_more = { workspace = true, features = ["display", "from"] }
+scale = { workspace = true, features = ["max-encoded-len"] }
+derive_more = { workspace = true, features = ["from", "display"] }
 num-traits = { workspace = true, features = ["i128"] }
+cfg-if = { workspace = true }
 paste = { workspace = true }
-scale = { workspace = true, features = ["max-encoded-len"] }
 static_assertions = { workspace = true }
+const_env = { workspace = true }
 xcm = { workspace = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -38,19 +38,16 @@ rlibc = "1"
 [target.'cfg(target_arch = "riscv32")'.dependencies]
 polkavm-derive = { workspace = true }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+[target.'cfg(all(not(target_arch = "wasm32"), not(target_arch = "risc32")))'.dependencies]
 ink_engine = { workspace = true, default-features = true, optional = true }
 
 # Hashes for the off-chain environment.
-blake2 = { workspace = true, optional = true }
 sha2 = { workspace = true, optional = true }
 sha3 = { workspace = true, optional = true }
+blake2 = { workspace = true, optional = true }
 
 # ECDSA for the off-chain environment.
-secp256k1 = { workspace = true, features = [
-	"global-context",
-	"recovery",
-], optional = true }
+secp256k1 = { workspace = true, features = ["recovery", "global-context"], optional = true }
 
 # schnorrkel for the off-chain environment.
 schnorrkel = { version = "0.11.4", optional = true }
@@ -67,37 +64,39 @@ scale-info = { workspace = true, features = ["derive"], optional = true }
 ink = { path = "../ink" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
 	"blake2",
-    "derive_more/std",
 	"ink_allocator/std",
-	"ink_engine/std",
 	"ink_prelude/std",
 	"ink_primitives/std",
 	"ink_storage_traits/std",
-	"num-traits/std",
+	"ink_engine/std",
+	"scale/std",
 	"scale-decode",
 	"scale-encode",
 	"scale-info/std",
-	"scale/std",
-	"schnorrkel",
 	"secp256k1",
-    "xcm/std",
+	"schnorrkel",
+	"num-traits/std",
 	# Enables hashing crates for off-chain environment.
 	"sha2",
-	"sha3"
+	"sha3",
+	"scale-decode?/std",
+	"scale-encode?/std",
+	"xcm/std",
+	"derive_more/std"
 ]
 
 # Enable contract debug messages via `debug_print!` and `debug_println!`.
 ink-debug = []
 
 # Disable the ink! provided global memory allocator.
-no-allocator = ["ink_allocator/no-allocator"]
+no-allocator = [ "ink_allocator/no-allocator" ]
 
 # Disable the ink! provided panic handler.
 no-panic-handler = []
 
 revive = [
-    "ink_engine/revive"
+	"ink_engine/revive"
 ]