Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ckb-std to 0.15 #45

Merged
merged 10 commits into from
Apr 3, 2024
Merged

Upgrade ckb-std to 0.15 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5778037
chore: upgrade ckb-std
quake Mar 20, 2024
a453dc3
Fix CI error and remove some dependencies on auth-spawn-tests
joii2020 Apr 2, 2024
b279e29
Update auth-rust-lock dependencies
joii2020 Apr 2, 2024
6e4337a
Remove unused code and dependencies in auth-c-tests
joii2020 Apr 2, 2024
848972e
Optimize Cargo.toml dependencies
joii2020 Apr 3, 2024
48000b1
Fix IC error
joii2020 Apr 3, 2024
6993262
Remove molecule on CI install
joii2020 Apr 3, 2024
36d8b00
Upgrade rust-toolchain on tests/auto-rust-lock
joii2020 Apr 3, 2024
ae57c27
Use the release of capsule as the test bin
joii2020 Apr 3, 2024
3927639
Fix CI about capsule test
joii2020 Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ckb-auth-rs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion deps/ckb-c-stdlib-2023
Open in desktop
Submodule ckb-c-stdlib-2023 updated 8 files
+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
16 changes: 8 additions & 8 deletions tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -86,7 +90,6 @@ install-all: \
install-ckb-tools: \
bin \
install-ckb-debugger \
install-moleculec \
install-capsule \
install-cross

Expand All @@ -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 ./
Expand Down
Loading
Loading