Skip to content

Commit

Permalink
chore: upgrade ckb to 0.115-rc2, bump to 0.115-rc2 (nervosnetwork#127)
Browse files Browse the repository at this point in the history
  • Loading branch information
driftluo authored Mar 21, 2024
1 parent 87daa11 commit 25e5a45
Show file tree
Hide file tree
Showing 11 changed files with 139 additions and 95 deletions.
157 changes: 100 additions & 57 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
"ckb-debugger",
"ckb-debugger-api",
Expand All @@ -8,5 +9,5 @@ members = [
"ckb-vm-pprof",
"ckb-vm-pprof-converter",
"ckb-vm-pprof-protos",
"ckb-vm-signal-profiler"
"ckb-vm-signal-profiler",
]
18 changes: 9 additions & 9 deletions ckb-debugger-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ckb-debugger-api"
description = "Standalone debugger for Nervos CKB"
version = "0.114.0"
version = "0.115.0-rc2"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2021"
Expand All @@ -10,16 +10,16 @@ edition = "2021"
crate-type = ["cdylib", "rlib"]

[dependencies]
ckb-hash = "=0.114.0"
ckb-chain-spec = "=0.114.0"
ckb-jsonrpc-types = "=0.114.0"
ckb-mock-tx-types = { path = "../ckb-mock-tx-types", version="0.114.0" }
ckb-script = { version = "=0.114.0", default-features = false }
ckb-types = "=0.114.0"
ckb-vm = "=0.24.8"
ckb-hash = "=0.115.0-rc2"
ckb-chain-spec = "=0.115.0-rc2"
ckb-jsonrpc-types = "=0.115.0-rc2"
ckb-mock-tx-types = { path = "../ckb-mock-tx-types", version = "0.115.0-rc2" }
ckb-script = { version = "=0.115.0-rc2", default-features = false }
ckb-types = "=0.115.0-rc2"
ckb-vm = "=0.24.9"
hex = "0.4"
regex = "1"
serde = { version="1.0", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_plain = "1.0"
wasm-bindgen = "=0.2.50"
Expand Down
22 changes: 11 additions & 11 deletions ckb-debugger/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ckb-debugger"
description = "Standalone debugger for Nervos CKB"
version = "0.114.0"
version = "0.115.0-rc2"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2021"
Expand All @@ -13,17 +13,17 @@ probes = ["probe", "ckb-script/flatmemory"]

[dependencies]
clap = "2.33.0"
ckb-chain-spec = "=0.114.0"
ckb-debugger-api = { path = "../ckb-debugger-api", version="0.114.0" }
ckb-hash = "=0.114.0"
ckb-mock-tx-types = { path = "../ckb-mock-tx-types", version="0.114.0" }
ckb-script = { version = "=0.114.0", default-features = false }
ckb-types = "=0.114.0"
ckb-vm = { version = "=0.24.8" }
ckb-vm-debug-utils = { path = "../ckb-vm-debug-utils", version="0.114.0" }
ckb-vm-pprof = { path = "../ckb-vm-pprof", version="0.114.0" }
ckb-chain-spec = "=0.115.0-rc2"
ckb-debugger-api = { path = "../ckb-debugger-api", version = "0.115.0-rc2" }
ckb-hash = "=0.115.0-rc2"
ckb-mock-tx-types = { path = "../ckb-mock-tx-types", version = "0.115.0-rc2" }
ckb-script = { version = "=0.115.0-rc2", default-features = false }
ckb-types = "=0.115.0-rc2"
ckb-vm = { version = "=0.24.9" }
ckb-vm-debug-utils = { path = "../ckb-vm-debug-utils", version = "0.115.0-rc2" }
ckb-vm-pprof = { path = "../ckb-vm-pprof", version = "0.115.0-rc2" }
env_logger = "0.4.3"
ckb-gdb-remote-protocol = { path = "../ckb-gdb-remote-protocol", version="0.114.0" }
ckb-gdb-remote-protocol = { path = "../ckb-gdb-remote-protocol", version = "0.115.0-rc2" }
gdbstub = "0.6.6"
gdbstub_arch = "0.2.4"
hex = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion ckb-gdb-remote-protocol/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ckb-gdb-remote-protocol"
edition = "2021"
version = "0.114.0"
version = "0.115.0-rc2"
description = "An implementation of the GDB remote protocol"
authors = ["Ted Mielczarek <[email protected]>"]
license = "Apache-2.0/MIT"
Expand Down
10 changes: 5 additions & 5 deletions ckb-mock-tx-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "ckb-mock-tx-types"
description = "CKB mock transaction types"
version = "0.114.0"
version = "0.115.0-rc2"
license = "MIT"
edition = "2021"
authors = ["Nervos Core Dev <[email protected]>"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
ckb-types = "=0.114.0"
ckb-jsonrpc-types = "=0.114.0"
ckb-traits = "=0.114.0"
serde = { version = "1.0", features=["derive"] }
ckb-types = "=0.115.0-rc2"
ckb-jsonrpc-types = "=0.115.0-rc2"
ckb-traits = "=0.115.0-rc2"
serde = { version = "1.0", features = ["derive"] }
6 changes: 3 additions & 3 deletions ckb-vm-debug-utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-vm-debug-utils"
version = "0.114.0"
version = "0.115.0-rc2"
authors = ["Xuejie Xiao <[email protected]>"]
edition = "2021"
description = "Utils for ckb-debugger"
Expand All @@ -13,8 +13,8 @@ stdio = ["libc", "nix"]
[dependencies]
byteorder = "1"
bytes = "1.0.0"
ckb-vm = "=0.24.8"
ckb-gdb-remote-protocol = { path = "../ckb-gdb-remote-protocol", version="0.114.0" }
ckb-vm = "=0.24.9"
ckb-gdb-remote-protocol = { path = "../ckb-gdb-remote-protocol", version = "0.115.0-rc2" }
libc = { version = "0.2.47", optional = true }
log = "0.4.0"
nix = { version = "0.26.2", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions ckb-vm-pprof-converter/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-vm-pprof-converter"
version = "0.114.0"
version = "0.115.0-rc2"
edition = "2021"
description = "Convert raw data generated by ckb-vm-pprof to proto format accepted by Google's pprof tool"
license = "MIT"
Expand All @@ -11,4 +11,4 @@ authors = ["Nervos Core Dev <[email protected]>"]
[dependencies]
clap = { version = "4.0.27", features = ["cargo"] }
protobuf = { version = "2.25.1", features = ["with-bytes", "with-serde"] }
ckb-vm-pprof-protos = { path = "../ckb-vm-pprof-protos", version = "0.114.0" }
ckb-vm-pprof-protos = { path = "../ckb-vm-pprof-protos", version = "0.115.0-rc2" }
2 changes: 1 addition & 1 deletion ckb-vm-pprof-protos/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-vm-pprof-protos"
version = "0.114.0"
version = "0.115.0-rc2"
edition = "2021"
description = "Crate for generating Rust definitions from pprof proto"
license = "MIT"
Expand Down
4 changes: 2 additions & 2 deletions ckb-vm-pprof/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-vm-pprof"
version = "0.114.0"
version = "0.115.0-rc2"
authors = ["mohanson <[email protected]>"]
edition = "2021"
description = "Statistical CKB script cycles consumption flame graph"
Expand All @@ -9,5 +9,5 @@ license = "MIT"
[dependencies]
addr2line = "0.17.0"
clap = "2.33"
ckb-vm = { version = "=0.24.8", features=["pprof"] }
ckb-vm = { version = "=0.24.9", features = ["pprof"] }
goblin = "0.4"
6 changes: 3 additions & 3 deletions ckb-vm-signal-profiler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-vm-signal-profiler"
version = "0.114.0"
version = "0.115.0-rc2"
edition = "2021"
description = "Linux signal based profiler for ckb-vm, note this is profiling ckb-vm itself, not the programs running in ckb-vm"
license = "MIT"
Expand All @@ -13,9 +13,9 @@ env_logger = "0.9.0"

[dependencies]
addr2line = "0.17.0"
ckb-vm = { version = "=0.24.8", features = ["asm"] }
ckb-vm = { version = "=0.24.9", features = ["asm"] }
log = "0.4.16"
nix = "0.23.1"
lazy_static = "1.4.0"
protobuf = { version = "2.25.1", features = ["with-bytes", "with-serde"] }
ckb-vm-pprof-protos = { path = "../ckb-vm-pprof-protos", version="0.114.0" }
ckb-vm-pprof-protos = { path = "../ckb-vm-pprof-protos", version = "0.115.0-rc2" }

0 comments on commit 25e5a45

Please sign in to comment.