Contract add feature: native-simulator

 * Contracts support native-simulator by default.
 * native-simulator project no longer requires scripts to add code to contracts.
 * simulator renamed to native-simulator.

Author: joii2020

contract/Cargo.toml

@@ -5,3 +5,6 @@ edition = "2021"
 
 [dependencies]
 ckb-std = "0.15.3"
+
+[features]
+native-simulator = ["ckb-std/native-simulator"]

contract/src/lib.rs

@@ -0,0 +1,7 @@
+#![cfg_attr(not(feature = "native-simulator"), no_std)]
+#![allow(special_module_name)]
+#![allow(unused_attributes)]
+#[cfg(feature = "native-simulator")]
+mod main;
+#[cfg(feature = "native-simulator")]
+pub use main::program_entry;

contract/src/main.rs

@@ -1,15 +1,13 @@
-#![no_std]
+#![cfg_attr(not(feature = "native-simulator"), no_std)]
 #![cfg_attr(not(test), no_main)]
 
-#[cfg(test)]
+#[cfg(any(feature = "native-simulator", test))]
 extern crate alloc;
 
-#[cfg(not(test))]
-use ckb_std::default_alloc;
-#[cfg(not(test))]
+#[cfg(not(any(feature = "native-simulator", test)))]
 ckb_std::entry!(program_entry);
-#[cfg(not(test))]
-default_alloc!();
+#[cfg(not(any(feature = "native-simulator", test)))]
+ckb_std::default_alloc!();
 
 pub fn program_entry() -> i8 {
     ckb_std::debug!("This is a sample contract!");

native-simulator/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-{{contract_name}} = { path = "../../contracts/{{contract_name}}", features = ["simulator"] }
-ckb-std = { version = "0.15.3", features = ["simulator"] }
+{{contract_name}} = { path = "../../contracts/{{contract_name}}", features = ["native-simulator"] }
+ckb-std = { version = "0.15.3", features = ["native-simulator"] }
 
 [lib]
 crate-type = ["cdylib"]

native-simulator/src/contract-lib.rs

@@ -16,4 +16,4 @@ debug = true
 
 # TODO: Will be deleted after release
 [replace]
-"ckb-std:0.15.3" = { git = "https://github.com/nervosnetwork/ckb-std.git", rev = "36942aa" }
+"ckb-std:0.15.3" = { git = "https://github.com/joii2020/ckb-std.git", rev = "76f1ac3" }

workspace/Cargo.toml

@@ -129,17 +129,6 @@ generate-native-simulator:
 		--destination native-simulators \
 		-d contract_name=$(CRATE) \
 		-d contract_crate_name=`echo "$(CRATE)" | tr '-' '_'`; \
-	mv native-simulators/$(CRATE)-sim/src/contract-lib.rs contracts/$(CRATE)/src/lib.rs; \
-	FILE=contracts/$(CRATE)/Cargo.toml; \
-	if grep -q "\\[features\\]" "$$FILE"; then \
-		sed -i '/\[features\]/a\\simulator = \[\"ckb-std/simulator\"\]' $$FILE; \
-	else \
-		echo "\\n[features]\\nsimulator = [\"ckb-std/simulator\"]\\n" >> $$FILE ; \
-	fi; \
-	FILE=contracts/$(CRATE)/src/main.rs; \
-	sed -i 's/#!\[no_std\]/#!\[cfg_attr(not(feature = "simulator"), no_std)\]/' $$FILE; \
-	sed -i 's/#\[cfg(test)\]/#\[cfg(any(feature = "simulator", test))\]/' $$FILE; \
-	sed -i 's/#\[cfg(not(test))\]/#\[cfg(not(any(feature = "simulator", test)))\]/' $$FILE; \
 	sed '/@@INSERTION_POINT@@/s/$$/\n  "native-simulators\/$(CRATE)-sim",/' Cargo.toml > Cargo.toml.new; \
 	mv Cargo.toml.new Cargo.toml;