Merge pull request #301 from ckb-devrel/develop

Merge v0.4.0 into master

Author: RetricSu

.gitignore

@@ -6,3 +6,4 @@ data/
 dist/
 .vscode
 templates/temp-clone-folder
+build/

.gitmodules

@@ -10,3 +10,18 @@
 [submodule "ckb/spore-contract"]
 	path = ckb/spore-contract
 	url = https://github.com/sporeprotocol/spore-contract.git
+[submodule "ckb/ckb-js-vm"]
+	path = ckb/ckb-js-vm
+	url = https://github.com/nervosnetwork/ckb-js-vm.git
+[submodule "ckb/nostr-binding"]
+	path = ckb/nostr-binding
+	url = https://github.com/cryptape/nostr-binding.git
+[submodule "ckb/ckb-standalone-debugger"]
+	path = ckb/ckb-standalone-debugger
+	url = https://github.com/nervosnetwork/ckb-standalone-debugger.git
+[submodule "ckb/pw-lock"]
+	path = ckb/pw-lock
+	url = https://github.com/nervosnetwork/pw-lock.git
+[submodule "ckb/ckb-system-scripts"]
+	path = ckb/ckb-system-scripts
+	url = https://github.com/nervosnetwork/ckb-system-scripts.git

Makefile

@@ -1,6 +1,6 @@
-.PHONY: all omnilock anyone-can-pay xudt spore
+.PHONY: all omnilock anyone-can-pay xudt spore ckb-js-vm nostr-lock ckb-debugger apply-debugger-patches clean-debugger-patches
 
-all: omnilock anyone-can-pay xudt spore
+all: omnilock anyone-can-pay xudt spore ckb-js-vm nostr-lock pw-lock secp256k1_multisig_v2 ckb-debugger
 
 omnilock:
 	@echo "Building omnilock via submodule"
@@ -28,3 +28,49 @@ spore:
 	cp ckb/spore-contract/build/release/cluster_agent ckb/devnet/specs/spore-scripts/
 	cp ckb/spore-contract/build/release/cluster_proxy ckb/devnet/specs/spore-scripts/
 	cp ckb/spore-contract/build/release/spore_extension_lua ckb/devnet/specs/spore-scripts/
+
+ckb-js-vm:
+	@echo "Building ckb-js-vm via submodule"
+	cd ckb/ckb-js-vm && git submodule update --init && make all
+	cp ckb/ckb-js-vm/build/ckb-js-vm ckb/devnet/specs/ckb_js_vm
+
+nostr-lock:
+	@echo "Building nostr-lock via submodule"
+	cd ckb/nostr-binding && make build
+	cp ckb/nostr-binding/build/release/nostr-lock ckb/devnet/specs/nostr_lock
+
+pw-lock:
+	@echo "Building pw-lock via submodule"
+	cp patches/pw-lock-protocol.h ckb/pw-lock/protocol.h
+	mkdir -p ckb/pw-lock/build
+	cd ckb/pw-lock && make all-via-docker
+	mkdir -p ckb/devnet/specs/pw-lock/
+	cp ckb/pw-lock/specs/cells/secp256k1_keccak256_sighash_all ckb/devnet/specs/pw-lock/
+	cp ckb/pw-lock/specs/cells/secp256k1_keccak256_sighash_all_acpl ckb/devnet/specs/pw-lock/
+
+secp256k1_multisig_v2:
+	@echo "Building secp256k1_multisig_v2 via submodule"
+	cd ckb/ckb-system-scripts/  && make all-via-docker
+	cp ckb/ckb-system-scripts/specs/cells/secp256k1_blake160_multisig_all ckb/devnet/specs/secp256k1_blake160_multisig_all_v2
+
+ckb-debugger:
+	@echo "Building ckb-debugger via submodule"
+	@echo "Applying patches to ckb-standalone-debugger..."
+	$(MAKE) apply-debugger-patches
+	cd ckb/ckb-standalone-debugger/ckb-debugger && cargo build --target wasm32-wasip1 --release
+	cp -r ckb/ckb-standalone-debugger/target/wasm32-wasip1/release/ckb-debugger.wasm src/tools/ckb-debugger.wasm
+
+apply-debugger-patches:
+	@echo "Checking if patches need to be applied..."
+	@cd ckb/ckb-standalone-debugger && \
+	if ! git diff --quiet HEAD -- ckb-debugger/src/syscall_file_operation.rs 2>/dev/null; then \
+		echo "Patches already applied."; \
+	else \
+		echo "Applying WASM FileOperation patches..."; \
+		git apply ../../patches/0001-Add-WASM-FileOperation-syscalls-implementation.patch; \
+	fi
+
+clean-debugger-patches:
+	@echo "Reverting ckb-debugger patches..."
+	@cd ckb/ckb-standalone-debugger && git reset --hard origin/develop && git clean -fd
+