Upgrade ckb-std to 0.15 (#45)

* chore: upgrade ckb-std * Optimize Cargo.toml dependencies --------- Co-authored-by: quake <[email protected]>
nervosnetwork · Apr 3, 2024 · 4253ba8 · 4253ba8
1 parent a4497ed
commit 4253ba8
Show file tree

Hide file tree

Showing 23 changed files with 1,239 additions and 1,793 deletions.
diff --git a/ckb-auth-rs/Cargo.toml b/ckb-auth-rs/Cargo.toml
@@ -9,14 +9,14 @@ edition = "2021"
 default = ["dynamic-library-memory-200"]
 ckb2023 = ["ckb-std/ckb2023"]
 
-enable-dynamic-library = ["lazy_static"]
+enable-dynamic-library = ["lazy_static", "ckb-std/dlopen-c", "ckb-std/ckb-types"]
 dynamic-library-memory-200 = ["enable-dynamic-library"]
 # enable these features when memory is not enough
 dynamic-library-memory-400 = ["enable-dynamic-library"]
 dynamic-library-memory-600 = ["enable-dynamic-library"]
 
 [dependencies]
-ckb-std = "0.14.3"
+ckb-std = { version = "0.15", default-features = false }
 lazy_static = { version = "1.4.0", optional = true, features = ["spin_no_std"] }
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]

diff --git a/deps/ckb-c-stdlib-2023 b/deps/ckb-c-stdlib-2023
diff --git a/tests/Makefile b/tests/Makefile
@@ -43,29 +43,33 @@ clean-c-tests:
 	rm -rf auth-c-tests/target
 
 rust-demo-tests:
-	export PATH=$(shell pwd)/bin/:"$(PATH)" && cd auth-rust-lock/ && capsule build && capsule test
+	export PATH=$(shell pwd)/bin/:"$(PATH)" && \
+	cd auth-rust-lock/ && \
+	capsule build --release && \
+	cd tests && \
+	cargo test
 
 clean-rust-demo-tests:
 	export PATH=$(shell pwd)/bin/:"$(PATH)" && cd auth-rust-lock/ && capsule clean
 
 rust-demo-tests-no-def-features: clean-rust-demo-tests
 	export PATH=$(shell pwd)/bin/:"$(PATH)" && \
 	cd auth-rust-lock && \
-	capsule build -- --no-default-features && \
+	capsule build --release -- --no-default-features && \
 	cd tests && \
 	cargo test --no-default-features
 
 rust-demo-tests-only-ckb2023: clean-rust-demo-tests
 	export PATH=$(shell pwd)/bin/:"$(PATH)" && \
 	cd auth-rust-lock && \
-	capsule build -- --no-default-features --features="ckb2023" && \
+	capsule build --release -- --no-default-features --features="ckb2023" && \
 	cd tests && \
 	cargo test --no-default-features --features="ckb2023"
 
 rust-demo-tests-only-dl: clean-rust-demo-tests
 	export PATH=$(shell pwd)/bin/:"$(PATH)" && \
 	cd auth-rust-lock && \
-	capsule build -- --no-default-features --features="enable-dynamic-library" && \
+	capsule build --release -- --no-default-features --features="enable-dynamic-library" && \
 	cd tests && \
 	cargo test --no-default-features --features="enable-dynamic-library"
 
@@ -86,7 +90,6 @@ install-all: \
 install-ckb-tools: \
 	bin \
 	install-ckb-debugger \
-	install-moleculec \
 	install-capsule \
 	install-cross
 
@@ -100,9 +103,6 @@ else ifeq ($(shell uname),Linux)
 	rm -rf LICENSE ckb-debugger-linux-x64.tar.gz
 endif
 
-install-moleculec:
-	cargo install moleculec --version 0.7.3 --root ./
-
 install-capsule:
 ifeq ($(shell uname),Darwin)
 	cargo install ckb-capsule --version "0.10.2" --root ./
+1 −1		ckb_dlfcn.h
+4 −2		ckb_syscalls.h
+21 −20		libc/src/impl.c
+0 −3		molecule/blockchain-api2.h
+2,038 −1,838		molecule/blockchain.h
+0 −17		molecule/molecule2_reader.h
+248 −179		molecule/molecule_builder.h
+128 −112		molecule/molecule_reader.h