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.

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

feat: merge v2.14.0 into develop #510

Merged
merged 26 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3b332b7
fix(examples): system-scripts.json (#483)
RetricSu Oct 29, 2024
7009ad0
add installation guide & update tutorial overview (#482)
yfeng2824 Oct 31, 2024
b9b95bd
refactor: split cli-tool and bump 0ffckb v0.3.0 (#485)
RetricSu Nov 25, 2024
7ab4f56
Update ckb js vm tutorial (#462)
RetricSu Nov 25, 2024
b19aa0d
doc: Add intro to hard fork (#491)
yfeng2824 Nov 29, 2024
61d800f
Add spawn tutorial (#490)
RetricSu Nov 29, 2024
878e1b1
fix: redirect /docs/basics/tools#neuron-wallet (#493)
RetricSu Dec 2, 2024
9220b13
spawn: direct cross-script calling
linnnsss Dec 3, 2024
9199727
Apply suggestions from code review
RetricSu Dec 5, 2024
0a16b27
Merge pull request #494 from nervosnetwork/spawn_direct_cross-script_…
RetricSu Dec 5, 2024
01f4325
chore: adjust the child item pos of script section (#496)
RetricSu Dec 5, 2024
f22a9d4
chore(scripts): order/file name consistance (#497)
RetricSu Dec 5, 2024
103be46
update the definition of hash_type for Meepo (#501)
linnnsss Dec 5, 2024
8441572
docs: CKB Hard Fork History (#495)
yfeng2824 Dec 6, 2024
760d37f
doc: add vm-selection under scripts (#498)
RetricSu Dec 9, 2024
3cc2b28
doc: add rethinking forks (#500)
RetricSu Dec 9, 2024
22d7559
doc: add vm-history in hardforks (#499)
RetricSu Dec 9, 2024
a3f5770
docs: script_debugging_additional_methods (#502)
linnnsss Dec 9, 2024
70301d4
add meepo upgrade checklist (#504)
linnnsss Dec 9, 2024
352170c
chore: update meepo testnet time (#507)
RetricSu Dec 12, 2024
3e06da4
chore: ccc mini version (#508)
RetricSu Dec 12, 2024
9272af2
doc: add script upgrade workflow (#505)
RetricSu Dec 12, 2024
e39fd3b
doc: add fee-estimator in tech-explan and node (#506)
RetricSu Dec 12, 2024
7716eea
bump v2.14.0 (#509)
RetricSu Dec 13, 2024
5374619
chore wording (#514)
RetricSu Dec 16, 2024
59a5b69
apply review suggestion (#515)
RetricSu Dec 17, 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 examples/ckb-js-script/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ In this project, we show different ways to integrate CKB-js-vm into your smart c
called spawn, where you can call CKB-js-vm from your script use `ckb_spawn` systcall and one is to
use Script structure to load and execute your JavaScript script in a live cell.

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

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

Expand Down
10 changes: 0 additions & 10 deletions examples/ckb-js-script/contracts/run-js/Cargo.toml

This file was deleted.

44 changes: 0 additions & 44 deletions examples/ckb-js-script/contracts/run-js/src/main.rs

This file was deleted.

8 changes: 7 additions & 1 deletion examples/ckb-js-script/deps/README.md
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
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
# ckb-js-vm

`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

This binary is locked with the commit hash [c158de314783151b6fb023420dd5d5bff2bc2772](https://github.com/nervosnetwork/ckb-js-vm/commit/c158de314783151b6fb023420dd5d5bff2bc2772)

`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.
Binary file modified examples/ckb-js-script/deps/ckb-js-vm
Binary file not shown.
14 changes: 14 additions & 0 deletions examples/ckb-js-script/deps/compile.awk
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/awk -f

{
# Check if the line starts with "Script log: "
if ($0 ~ /^Script log: /) {
# Remove "Script log: " from the line
line_data = gensub(/^Script log: /, "", "g")

# If the remaining line is not empty, print it
if (line_data != "") {
print line_data
}
}
}
Binary file modified examples/ckb-js-script/js/build/sudt.bc
Binary file not shown.
9 changes: 0 additions & 9 deletions examples/ckb-js-script/tests/Cargo.toml

This file was deleted.

Loading
Loading