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

chore: upgrade ckb-std #44

Closed
wants to merge 1 commit into from
Closed

chore: upgrade ckb-std #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The feature allocator is missing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we didn't use default_alloc fn in this crate, no need to enable this feature of ckb-std.

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
43 changes: 21 additions & 22 deletions tests/auth-c-tests/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 17 additions & 26 deletions tests/auth-rust-lock/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/auth-rust-lock/contracts/auth-rust-demo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ckb2023 = ["ckb-auth-rs/ckb2023", "ckb-std/ckb2023"]
enable-dynamic-library = ["ckb-auth-rs/dynamic-library-memory-600"]

[dependencies]
ckb-std = "0.14.3"
ckb-std = { version = "0.15", default-features = false, features = ["allocator", "ckb-types"] }
ckb-auth-rs = { path = "../../../../ckb-auth-rs", default-features = false }
log = { version = "0.4.17", default-features = false }
hex = { version = "0.4.3", default-features = false, features = ["alloc"]}
2 changes: 1 addition & 1 deletion tests/auth-rust-lock/contracts/auth-rust-demo/src/entry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub fn main() -> Result<(), Error> {
0 => ScriptHashType::Data,
1 => ScriptHashType::Type,
2 => ScriptHashType::Data1,
4 => ScriptHashType::Data1, // TODO ckb-std 0.14.3 does not support Data2 yet
4 => ScriptHashType::Data2,
_ => {
return Err(Error::ArgsError);
}
Expand Down
Loading