fix(template): bump ckb-script-templates and frontend deps (#220)

* fix(template): bump ckb-script-templates and frontend deps

* chore: fmt

Author: RetricSu

templates/v3/next-js-template/Cargo.lock

@@ -11,5 +11,6 @@ members = [
 
 [profile.release]
 overflow-checks = true
-strip = true
+strip = false
 codegen-units = 1
+debug = true

templates/v3/next-js-template/Cargo.toml

@@ -1,12 +1,12 @@
 # We cannot use $(shell pwd), which will return unix path format on Windows,
 # making it hard to use.
-cur_dir = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+cur_dir = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
 
 TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug-assertions
 # Additional cargo args to append here. For example, one can use
 # make test CARGO_ARGS="-- --nocapture" so as to inspect data emitted to
 # stdout in unit tests
@@ -23,6 +23,10 @@ CONTRACT :=
 CLEAN_BUILD_DIR_FIRST := true
 BUILD_DIR := build/$(MODE)
 
+ifeq (release,$(MODE))
+	MODE_ARGS := --release
+endif
+
 # Pass setups to child make processes
 export CUSTOM_RUSTFLAGS
 export TOP
@@ -44,9 +48,16 @@ build:
 		for contract in $(wildcard contracts/*); do \
 			$(MAKE) -e -C $$contract build; \
 		done; \
+		for crate in $(wildcard crates/*); do \
+			cargo build -p $$(basename $$crate) $(MODE_ARGS) $(CARGO_ARGS); \
+		done; \
+		for sim in $(wildcard native-simulators/*); do \
+			cargo build -p $$(basename $$sim) $(CARGO_ARGS); \
+		done; \
 	else \
 		$(MAKE) -e -C contracts/$(CONTRACT) build; \
-	fi
+		cargo build -p $(CONTRACT)-sim; \
+	fi;
 
 # Run a single make task for a specific contract. For example:
 #
@@ -91,6 +102,7 @@ DESTINATION := contracts
 generate:
 	@set -eu; \
 	if [ "x$(CRATE)" = "x" ]; then \
+		mkdir -p $(DESTINATION); \
 		cargo generate $(TEMPLATE_TYPE) $(TEMPLATE_REPO) $(TEMPLATE) \
 			--destination $(DESTINATION); \
 		GENERATED_DIR=$$(ls -dt $(DESTINATION)/* | head -n 1); \
@@ -101,6 +113,7 @@ generate:
 		sed "s,@@INSERTION_POINT@@,@@INSERTION_POINT@@\n  \"$$GENERATED_DIR\"\,," Cargo.toml > Cargo.toml.new; \
 		mv Cargo.toml.new Cargo.toml; \
 	else \
+		mkdir -p $(DESTINATION); \
 		cargo generate $(TEMPLATE_TYPE) $(TEMPLATE_REPO) $(TEMPLATE) \
 			--destination $(DESTINATION) \
 			--name $(CRATE); \
@@ -110,7 +123,24 @@ generate:
 		fi; \
 		sed '/@@INSERTION_POINT@@/s/$$/\n  "$(DESTINATION)\/$(CRATE)",/' Cargo.toml > Cargo.toml.new; \
 		mv Cargo.toml.new Cargo.toml; \
-	fi
+	fi;
+
+generate-native-simulator:
+	@set -eu; \
+	if [ -z "$(CRATE)" ]; then \
+		echo "Error: Must have CRATE=<Contract Name>"; \
+		exit 1; \
+	fi; \
+	mkdir -p native-simulators; \
+	cargo generate $(TEMPLATE_TYPE) $(TEMPLATE_REPO) native-simulator \
+		-n $(CRATE)-sim \
+		--destination native-simulators; \
+	sed '/@@INSERTION_POINT@@/s/$$/\n  "native-simulators\/$(CRATE)-sim",/' Cargo.toml > Cargo.toml.new; \
+	mv Cargo.toml.new Cargo.toml; \
+	if [ ! -f "contracts/$(CRATE)/Cargo.toml" ]; then \
+		echo "Warning: This is a non-existent contract and needs to be processed manually"; \
+		echo "		Otherwise compilation may fail."; \
+	fi;
 
 prepare:
 	rustup target add riscv64imac-unknown-none-elf

templates/v3/next-js-template/Makefile

@@ -1,118 +1,7 @@
-# offckb-template
+# next-js-template-1
 
-This is a Minimal Template for CKB Full-Stack Dapps generated by [offckb](https://github.com/RetricSu/offckb).
+TODO: Write this readme
 
-Offckb does not do the magic. It just wraps the new CKB smart contract template and the CKB javascript Dapp framework into one mono-repo. Under the hook, it uses:
+_This project was bootstrapped with [ckb-script-templates]._
 
-- [ckb-scripts-template](https://github.com/cryptape/ckb-script-templates) for smart contract development
-- [next-js](https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app) and [Lumos](https://github.com/ckb-js/lumos) for frontend development
-
-## Smart contract development
-
-By default, this template comes with a single simple smart contract `hello-world`: `contracts/hello-world/src/main.rs`.
-
-The smart contract is written in Rust lang. In order to develop, the following dependencies are required:
-
-- `git`, `make`, `sed`, `bash`, `sha256sum` and others Unix utilities.
-- `Rust` with `riscv64 target`: `rustup target add riscv64imac-unknown-none-elf`
-- `Clang 16+`
-- `cargo-generate`
-
-Check out the ckb-script-templates for more [detail](https://github.com/cryptape/ckb-script-templates/blob/main/README.md#dependencies)
-
-### Usage
-
-add a new smart-contract:
-
-```sh
-make generate
-```
-
-build smart-contract:
-
-```sh
-make build
-```
-
-run test:
-
-```sh
-make test
-```
-
-For more detail, check out [ckb-script-templates](https://github.com/cryptape/ckb-script-templates)
-
-## dApp frontend development
-
-first, enter the frontend workspace:
-
-```sh
-cd frontend
-```
-
-start the app:
-
-```sh
-npm i && npm run dev
-```
-
-change the CKB blockchain network:
-
-edit `.env` file:
-
-```bash
-NEXT_PUBLIC_NETWORK=devnet # devnet, testnet or mainnet
-```
-
-## Deploy to devnet/testnet with offckb
-
-Once you build your smart contracts, you can deploy them to CKB blockchain with [ckb-cli](https://github.com/nervosnetwork/ckb-cli) or any other tools.
-
-If you want to test them in devnet/testnet blockchain, then `offckb` might be the ideal selection.
-
-`offckb` will look for the `offckb.config.ts` file to read config information. so you will need to enter the frontend workspace to do the instruction:
-
-```sh
-cd frontend
-offckb deploy --network devnet
-```
-
-If successfully deployed, you will see the deploy script info for your smart contract recorded in the `offckb.config.ts` file. You can then directly import and use your smart contract in your frontend Dapp like this:
-
-```ts
-import offckb from 'offckb.config';
-import { CellDep } from '@ckb-lumos/lumos';
-
-const lumosConfig = offckb.lumosConfig;
-const myContractDep: CellDep = {
-  outPoint: {
-    txHash: lumosConfig.SCRIPTS.YOUR_SCRIPT_NAME!.TX_HASH,
-    index: lumosConfig.SCRIPTS.YOUR_SCRIPT_NAME!.INDEX,
-  },
-  depType: lumosConfig.SCRIPTS.YOUR_SCRIPT_NAME!.DEP_TYPE,
-};
-```
-
-Every time you deploy a new version of your smart contracts, those script infos will be updated by `offckb` in the `offckb.config.ts` and work out-of-box in your frontend.
-
-You can also deploy smart contracts to the CKB Testnet like this:
-
-```sh
-cd frontend
-offckb deploy --network testnet
-```
-
-and start your frontend Dapp targeting Testnet:
-
-edit `.env` file:
-
-```bash
-NEXT_PUBLIC_NETWORK=testnet # devnet, testnet or mainnet
-```
-
-```bash
-cd frontend
-npm run dev
-```
-
-Note that the `mainnet` network is not supported in `offckb` since `offckb` is focusing on building a friendly development environment for CKB. To gain better security, it is recommended to use production tools like [ckb-cli](https://github.com/nervosnetwork/ckb-cli) to deploy smart contracts and do transactions for the CKB mainnet.
+[ckb-script-templates]: https://github.com/cryptape/ckb-script-templates

templates/v3/next-js-template/README.md

@@ -4,4 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ckb-std = "0.15.1"
+ckb-std = "0.17.0"
+
+[features]
+library = []
+native-simulator = ["library", "ckb-std/native-simulator"]

templates/v3/next-js-template/contracts/hello-world/Cargo.toml

@@ -1,15 +1,15 @@
 # We cannot use $(shell pwd), which will return unix path format on Windows,
 # making it hard to use.
-cur_dir = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+cur_dir = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
 
 TOP := $(cur_dir)
 # RUSTFLAGS that are likely to be tweaked by developers. For example,
 # while we enable debug logs by default here, some might want to strip them
 # for minimal code size / consumed cycles.
-CUSTOM_RUSTFLAGS := --cfg debug_assertions
+CUSTOM_RUSTFLAGS := -C debug-assertions
 # RUSTFLAGS that are less likely to be tweaked by developers. Most likely
 # one would want to keep the default values here.
-FULL_RUSTFLAGS := -C target-feature=+zba,+zbb,+zbc,+zbs $(CUSTOM_RUSTFLAGS)
+FULL_RUSTFLAGS := -C target-feature=+zba,+zbb,+zbc,+zbs,-a $(CUSTOM_RUSTFLAGS)
 # Additional cargo args to append here. For example, one can use
 # make test CARGO_ARGS="-- --nocapture" so as to inspect data emitted to
 # stdout in unit tests
@@ -19,6 +19,7 @@ MODE := release
 # we use a bash script with somes heuristics to find clang in current system.
 CLANG := $(shell $(TOP)/scripts/find_clang)
 AR := $(subst clang,llvm-ar,$(CLANG))
+OBJCOPY := $(subst clang,llvm-objcopy,$(CLANG))
 # When this is set to some value, the generated binaries will be copied over
 BUILD_DIR :=
 # Generated binaries to copy. By convention, a Rust crate's directory name will
@@ -41,6 +42,8 @@ build:
 		for binary in $(BINARIES); do \
 			echo "Copying binary $$binary to build directory"; \
 			cp $(TOP)/target/riscv64imac-unknown-none-elf/$(MODE)/$$binary $(TOP)/$(BUILD_DIR); \
+			cp $(TOP)/$(BUILD_DIR)/$$binary $(TOP)/$(BUILD_DIR)/$$binary.debug; \
+			$(OBJCOPY) --strip-debug --strip-all $(TOP)/$(BUILD_DIR)/$$binary; \
 		done \
 	fi
 

templates/v3/next-js-template/contracts/hello-world/Makefile

@@ -0,0 +1,9 @@
+#![cfg_attr(not(feature = "library"), no_std)]
+#![allow(special_module_name)]
+#![allow(unused_attributes)]
+#[cfg(feature = "library")]
+mod main;
+#[cfg(feature = "library")]
+pub use main::program_entry;
+
+extern crate alloc;

templates/v3/next-js-template/contracts/hello-world/src/lib.rs

@@ -1,18 +1,22 @@
-#![no_std]
+#![cfg_attr(not(any(feature = "library", test)), no_std)]
 #![cfg_attr(not(test), no_main)]
 
-#[cfg(test)]
+#[cfg(any(feature = "library", test))]
 extern crate alloc;
 
-#[cfg(not(test))]
-use ckb_std::default_alloc;
-#[cfg(not(test))]
+#[cfg(not(any(feature = "library", test)))]
 ckb_std::entry!(program_entry);
-#[cfg(not(test))]
-default_alloc!();
+#[cfg(not(any(feature = "library", test)))]
+// By default, the following heap configuration is used:
+// * 16KB fixed heap
+// * 1.2MB(rounded up to be 16-byte aligned) dynamic heap
+// * Minimal memory block in dynamic heap is 64 bytes
+// For more details, please refer to ckb-std's default_alloc macro
+// and the buddy-alloc alloc implementation.
+ckb_std::default_alloc!(16384, 1258306, 64);
 
 pub fn program_entry() -> i8 {
-    ckb_std::debug!("Hello world! This is a sample contract!");
+    ckb_std::debug!("This is a sample contract!");
 
     0
 }