Skip to content

Commit 3d5853e

Browse files
authored
Bump version to v1.0.0 (#36)
1 parent 42036e3 commit 3d5853e

File tree

5 files changed

+49
-56
lines changed

5 files changed

+49
-56
lines changed

Cargo.lock

Lines changed: 15 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ members = [
1212
exclude = ["deps/ckb-vm"]
1313

1414
[workspace.package]
15-
version = "0.203.0"
15+
version = "1.0.0"
1616
license = "MIT"
1717
edition = "2024"
1818
authors = ["Nervos Core Dev <[email protected]>"]
@@ -22,18 +22,18 @@ authors = ["Nervos Core Dev <[email protected]>"]
2222
ckb-chain-spec = "1.0.0"
2323
ckb-jsonrpc-types = "1.0.0"
2424
ckb-script = "1.0.0"
25-
ckb-std = { version = "=0.18.0", features = ["stub-syscalls"] }
25+
ckb-std = { version = "=1.0.1", features = ["stub-syscalls"] }
2626
ckb-traits = "1.0.0"
2727
ckb-types = "1.0.0"
2828
ckb-vm = { version = "=0.24.14", features=["pprof"] }
2929

3030
# Crates defined in current workspace
3131
ckb-mock-tx-types = { path = "ckb-mock-tx-types", version = "1.0.0" }
32-
ckb-script-size-analyzer = { path = "ckb-script-size-analyzer", version = "0.203.0" }
33-
ckb-vm-fuzzing-utils = { path = "ckb-vm-fuzzing-utils", version = "0.203.0" }
34-
ckb-vm-syscall-tracer = { path = "ckb-vm-syscall-tracer", version = "0.203.0" }
35-
ckb-x64-simulator = { path = "ckb-x64-simulator", version = "0.203.0" }
36-
protobuf-ckb-syscalls = { path = "protobuf-ckb-syscalls", version = "0.203.0" }
32+
ckb-script-size-analyzer = { path = "ckb-script-size-analyzer", version = "1.0.0" }
33+
ckb-vm-fuzzing-utils = { path = "ckb-vm-fuzzing-utils", version = "1.0.0" }
34+
ckb-vm-syscall-tracer = { path = "ckb-vm-syscall-tracer", version = "1.0.0" }
35+
ckb-x64-simulator = { path = "ckb-x64-simulator", version = "1.0.0" }
36+
protobuf-ckb-syscalls = { path = "protobuf-ckb-syscalls", version = "1.0.0" }
3737

3838
# Other common crates
3939
clap = { version = "4.5.40", features = ["cargo", "derive"] }

ckb-mock-tx-types/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "ckb-mock-tx-types"
33
description = "CKB mock transaction types"
4-
version = "1.0.0"
4+
version.workspace = true
55
license.workspace = true
66
edition.workspace = true
77
authors.workspace = true

ckb-vm-fuzzing-utils/src/lib.rs

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ extern crate alloc;
55

66
use alloc::{ffi::CString, vec::Vec};
77
use ckb_std::{
8-
ckb_constants::Source,
9-
syscalls::traits::{Error, IoResult, SyscallImpls},
8+
ckb_constants::{Place, Source},
9+
syscalls::traits::{Bounds, Error, IoResult, SyscallImpls},
1010
};
1111
use ckb_vm::{
1212
Error as VMError, Memory, Register, SupportMachine, Syscalls,
@@ -253,7 +253,13 @@ where
253253
}
254254
let argv_refs: Vec<_> = argv.iter().map(|arg| arg.as_c_str()).collect();
255255

256-
let result = self.impls.exec(index, source, place, bounds, &argv_refs);
256+
let result = self.impls.exec(
257+
index,
258+
source,
259+
Place::try_from(place as u64).unwrap(),
260+
Bounds::from(bounds as u64),
261+
&argv_refs,
262+
);
257263
// In case of success, a new binary will be loaded
258264
if result.is_err() {
259265
self.set_return(result, machine);
@@ -296,7 +302,14 @@ where
296302
}
297303

298304
// For now we assume synchronous operation
299-
let result = self.impls.spawn(index, source, place, bounds, &argv_refs, &fds);
305+
let result = self.impls.spawn(
306+
index,
307+
source,
308+
Place::try_from(place as u64).unwrap(),
309+
Bounds::from(bounds as u64),
310+
&argv_refs,
311+
&fds,
312+
);
300313
if let Ok(process_id) = result {
301314
machine.memory_mut().store64(&process_id_addr, &M::REG::from_u64(process_id))?;
302315
}

protobuf-ckb-syscalls/src/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ pub mod generated {
1919
use crate::generated::traces;
2020
use alloc::{boxed::Box, collections::VecDeque, vec::Vec};
2121
use ckb_std::{
22-
ckb_constants::{CellField, HeaderField, InputField, Source},
23-
syscalls::traits::{Error, IoResult, SyscallImpls},
22+
ckb_constants::{CellField, HeaderField, InputField, Place, Source},
23+
syscalls::traits::{Bounds, Error, IoResult, SyscallImpls},
2424
};
2525
use ckb_vm::SupportMachine;
2626
use ckb_vm_fuzzing_utils::{CkbvmRunnerImpls, exit_with_panic, flatten_args};
@@ -263,8 +263,8 @@ impl SyscallImpls for ProtobufImpls {
263263
&self,
264264
_index: usize,
265265
_source: Source,
266-
_place: usize,
267-
_bounds: usize,
266+
_place: Place,
267+
_bounds: Bounds,
268268
_argv: &[&CStr],
269269
) -> Result<(), Error> {
270270
match self.syscall() {
@@ -282,8 +282,8 @@ impl SyscallImpls for ProtobufImpls {
282282
&self,
283283
_index: usize,
284284
_source: Source,
285-
_place: usize,
286-
_bounds: usize,
285+
_place: Place,
286+
_bounds: Bounds,
287287
_argv: &[&CStr],
288288
_inherited_fds: &[u64],
289289
) -> Result<u64, Error> {
@@ -509,16 +509,16 @@ impl<M> SyscallImpls for ProtobufVmRunnerImpls<M> {
509509
self.inner.current_cycles()
510510
}
511511

512-
fn exec(&self, index: usize, source: Source, place: usize, bounds: usize, argv: &[&CStr]) -> Result<(), Error> {
512+
fn exec(&self, index: usize, source: Source, place: Place, bounds: Bounds, argv: &[&CStr]) -> Result<(), Error> {
513513
self.inner.exec(index, source, place, bounds, argv)
514514
}
515515

516516
fn spawn(
517517
&self,
518518
index: usize,
519519
source: Source,
520-
place: usize,
521-
bounds: usize,
520+
place: Place,
521+
bounds: Bounds,
522522
argv: &[&CStr],
523523
inherited_fds: &[u64],
524524
) -> Result<u64, Error> {

0 commit comments

Comments
 (0)