Skip to content

Commit 005a6c4

Browse files
authored
Merge pull request #510 from nervosnetwork/v2
feat: merge v2.14.0 into develop
2 parents f9fe51b + 59a5b69 commit 005a6c4

File tree

87 files changed

+5030
-2536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+5030
-2536
lines changed

examples/ckb-js-script/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ In this project, we show different ways to integrate CKB-js-vm into your smart c
1212
called spawn, where you can call CKB-js-vm from your script use `ckb_spawn` systcall and one is to
1313
use Script structure to load and execute your JavaScript script in a live cell.
1414

15-
There is also a full tutorial covering all the details for yout to run JavaScript smart contracts
16-
on CKB in the official docs webesite: [docs.nervos.org](https://docs.nervos.org).
15+
There is also a full tutorial covering all the details for you to run JavaScript smart contracts
16+
on CKB in the official docs website: [docs.nervos.org](https://docs.nervos.org).
1717

1818
*This project was bootstrapped with [ckb-script-templates].*
1919

examples/ckb-js-script/contracts/run-js/Cargo.toml

Lines changed: 0 additions & 10 deletions
This file was deleted.

examples/ckb-js-script/contracts/run-js/src/main.rs

Lines changed: 0 additions & 44 deletions
This file was deleted.

examples/ckb-js-script/deps/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
ckb-js-vm is a binary built for javascript engine on CKB-VM, you can rebuild it from https://github.com/nervosnetwork/ckb-js-vm
1+
# ckb-js-vm
2+
3+
`ckb-js-vm` is a binary built for javascript engine on CKB-VM, you can rebuild it from https://github.com/nervosnetwork/ckb-js-vm
4+
5+
This binary is locked with the commit hash [c158de314783151b6fb023420dd5d5bff2bc2772](https://github.com/nervosnetwork/ckb-js-vm/commit/c158de314783151b6fb023420dd5d5bff2bc2772)
6+
7+
`compile.awk` is copied from https://github.com/nervosnetwork/ckb-js-vm/blob/c158de314783151b6fb023420dd5d5bff2bc2772/tools/compile.awk and used to compile js source code into binary for CKB-VM.

examples/ckb-js-script/deps/ckb-js-vm

-49.3 KB
Binary file not shown.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/awk -f
2+
3+
{
4+
# Check if the line starts with "Script log: "
5+
if ($0 ~ /^Script log: /) {
6+
# Remove "Script log: " from the line
7+
line_data = gensub(/^Script log: /, "", "g")
8+
9+
# If the remaining line is not empty, print it
10+
if (line_data != "") {
11+
print line_data
12+
}
13+
}
14+
}
-1.95 KB
Binary file not shown.

examples/ckb-js-script/tests/Cargo.toml

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)