Update according to reviews (#38)

* Remove all "20210801". Include: submodules(ckb-c-stdlib, secp256k1), secp256k1_data * Remove clang makefile * Use compiled __builtin_ctzl
cryptape · Feb 27, 2024 · 7045a2f · 7045a2f
1 parent e754bd1
commit 7045a2f
Show file tree

Hide file tree

Showing 22 changed files with 40 additions and 211 deletions.
diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,10 @@
-[submodule "deps/ckb-c-stdlib-20210801"]
-	path = deps/ckb-c-stdlib-20210801
-	url = https://github.com/nervosnetwork/ckb-c-stdlib.git
-	branch = master
 [submodule "deps/sparse-merkle-tree"]
 	path = deps/sparse-merkle-tree
 	url = https://github.com/nervosnetwork/sparse-merkle-tree.git
 	branch = master
-[submodule "deps/secp256k1-20210801"]
-	path = deps/secp256k1-20210801
+[submodule "deps/ckb-c-stdlib"]
+	path = deps/ckb-c-stdlib
+	url = https://github.com/nervosnetwork/ckb-c-stdlib.git
+[submodule "deps/secp256k1"]
+	path = deps/secp256k1
 	url = https://github.com/nervosnetwork/secp256k1.git
-	branch = schnorr
diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile
@@ -2,13 +2,12 @@ TARGET := riscv64-unknown-linux-gnu
 CC := $(TARGET)-gcc
 LD := $(TARGET)-gcc
 OBJCOPY := $(TARGET)-objcopy
-CFLAGS := -fPIC -O3 -fno-builtin-printf -fno-builtin-memcmp -nostdinc -nostdlib -nostartfiles -fvisibility=hidden -fdata-sections -ffunction-sections -I deps/secp256k1/src -I deps/secp256k1 -I deps/ckb-c-std-lib -I deps/ckb-c-std-lib/libc -I deps/ckb-c-std-lib/molecule -I c -I build -Wall -Werror -Wno-nonnull -Wno-nonnull-compare -Wno-unused-function -g
+CFLAGS := -fPIC -O3 -fno-builtin-printf -fno-builtin-memcmp -nostdinc -nostdlib -nostartfiles -fvisibility=hidden -fdata-sections -ffunction-sections -I deps/secp256k1/src -I deps/secp256k1 -I deps/ckb-c-stdlib -I deps/ckb-c-stdlib/libc -I deps/ckb-c-stdlib/molecule -I c -I build -Wall -Werror -Wno-nonnull -Wno-nonnull-compare -Wno-unused-function -g
 LDFLAGS := -nostdlib -nostartfiles -fno-builtin -Wl,-static -Wl,--gc-sections
-SECP256K1_SRC_20210801 := deps/secp256k1-20210801/src/ecmult_static_pre_context.h
+SECP256K1_SRC := deps/secp256k1/src/ecmult_static_pre_context.h
 
 
-OMNI_LOCK_CFLAGS :=$(subst ckb-c-std-lib,ckb-c-stdlib-20210801,$(CFLAGS)) -I deps/sparse-merkle-tree/c
-OMNI_LOCK_CFLAGS := $(subst secp256k1,secp256k1-20210801,$(OMNI_LOCK_CFLAGS))
+OMNI_LOCK_CFLAGS :=$(CFLAGS) -I deps/sparse-merkle-tree/c
 # enable log
 OMNI_LOCK_CFLAGS += -DCKB_C_STDLIB_PRINTF -DCKB_C_STDLIB_PRINTF_BUFFER_SIZE=1024
 
@@ -35,16 +34,16 @@ build/always_success: c/always_success.c
 	$(OBJCOPY) --only-keep-debug $@ $@.debug
 	$(OBJCOPY) --strip-debug --strip-all $@
 
-build/secp256k1_data_info_20210801.h: build/dump_secp256k1_data_20210801
+build/secp256k1_data_info.h: build/dump_secp256k1_data
 	$<
 
-build/dump_secp256k1_data_20210801: c/dump_secp256k1_data_20210801.c $(SECP256K1_SRC_20210801)
+build/dump_secp256k1_data: c/dump_secp256k1_data.c $(SECP256K1_SRC)
 	mkdir -p build
-	gcc -I deps/secp256k1-20210801/src -I deps/secp256k1-20210801 -o $@ $<
+	gcc -I deps/secp256k1/src -I deps/secp256k1 -o $@ $<
 
 
-$(SECP256K1_SRC_20210801):
-	cd deps/secp256k1-20210801 && \
+$(SECP256K1_SRC):
+	cd deps/secp256k1 && \
 		./autogen.sh && \
 		CC=$(CC) LD=$(LD) ./configure --enable-ecmult-static-precomputation --with-ecmult-window=6 --enable-module-recovery --host=$(TARGET) && \
 		make src/ecmult_static_pre_context.h src/ecmult_static_context.h
@@ -80,7 +79,7 @@ omni_lock_mol:
 build/cobuild.o: c/cobuild.c c/cobuild.h
 	$(CC) -c $(OMNI_LOCK_CFLAGS) -o $@ $<
 
-build/omni_lock.o: c/omni_lock.c c/omni_lock_supply.h c/omni_lock_acp.h build/secp256k1_data_info_20210801.h $(SECP256K1_SRC_20210801) c/ckb_identity.h
+build/omni_lock.o: c/omni_lock.c c/omni_lock_supply.h c/omni_lock_acp.h build/secp256k1_data_info.h $(SECP256K1_SRC) c/ckb_identity.h
 	$(CC) -c $(OMNI_LOCK_CFLAGS) -o $@ $<
 
 build/omni_lock: build/omni_lock.o build/cobuild.o
@@ -95,9 +94,9 @@ cobuild_mol:
 	moleculec-c2 --input build/cobuild_basic_mol2.json | clang-format -style=Google > c/cobuild_basic_mol2.h
 
 clean: clean2
-	rm -rf build/secp256k1_data_info_20210801.h build/dump_secp256k1_data_20210801
-	rm -f build/secp256k1_data_20210801
-	cd deps/secp256k1-20210801 && [ -f "Makefile" ] && make clean
+	rm -rf build/secp256k1_data_info.h build/dump_secp256k1_data
+	rm -f build/secp256k1_data
+	cd deps/secp256k1 && [ -f "Makefile" ] && make clean
 
 clean2:
 	rm -rf build/*.debug

diff --git a/Makefile.clang b/Makefile.clang
diff --git a/c/dump_secp256k1_data_20210801.c → c/dump_secp256k1_data.c b/c/dump_secp256k1_data_20210801.c → c/dump_secp256k1_data.c
@@ -15,15 +15,15 @@ int main(int argc, char* argv[]) {
   size_t pre_size = sizeof(secp256k1_ecmult_static_pre_context);
   size_t pre128_size = sizeof(secp256k1_ecmult_static_pre128_context);
 
-  FILE* fp_data = fopen("build/secp256k1_data_20210801", "wb");
+  FILE* fp_data = fopen("build/secp256k1_data", "wb");
   if (!fp_data) {
     return ERROR_IO;
   }
   fwrite(secp256k1_ecmult_static_pre_context, pre_size, 1, fp_data);
   fwrite(secp256k1_ecmult_static_pre128_context, pre128_size, 1, fp_data);
   fclose(fp_data);
 
-  FILE* fp = fopen("build/secp256k1_data_info_20210801.h", "w");
+  FILE* fp = fopen("build/secp256k1_data_info.h", "w");
   if (!fp) {
     return ERROR_IO;
   }

diff --git a/c/omni_lock.c b/c/omni_lock.c
@@ -1,5 +1,3 @@
-// in secp256k1_ctz64_var: we don't have __builtin_ctzl in gcc for RISC-V
-#define __builtin_ctzl secp256k1_ctz64_var_debruijn
 // clang-format off
 #include <stdio.h>
 // it's used by blockchain-api2.h, the behavior when panic
@@ -20,9 +18,9 @@ int ckb_exit(signed char);
 #else
 #include "ckb_syscalls.h"
 #endif
-// secp256k1_helper_20210801.h is not part of ckb-c-stdlib, can't be included in ckb_identity.h
+// secp256k1_helper.h is not part of ckb-c-stdlib, can't be included in ckb_identity.h
 // An upgraded version is provided.
-#include "secp256k1_helper_20210801.h"
+#include "secp256k1_helper.h"
 #include "ckb_swappable_signatures.h"
 
 #include "ckb_identity.h"

diff --git a/c/secp256k1_helper_20210801.h → c/secp256k1_helper.h b/c/secp256k1_helper_20210801.h → c/secp256k1_helper.h
@@ -2,7 +2,7 @@
 #define CKB_SECP256K1_HELPER_H_
 
 #include "ckb_syscalls.h"
-#include "secp256k1_data_info_20210801.h"
+#include "secp256k1_data_info.h"
 
 #define CKB_SECP256K1_HELPER_ERROR_LOADING_DATA -101
 #define CKB_SECP256K1_HELPER_ERROR_ILLEGAL_CALLBACK -102

diff --git a/deps/ckb-c-stdlib-20210801 → deps/ckb-c-stdlib b/deps/ckb-c-stdlib-20210801 → deps/ckb-c-stdlib
diff --git a/deps/secp256k1-20210801 → deps/secp256k1 b/deps/secp256k1-20210801 → deps/secp256k1
diff --git a/test-vectors/tx_btc_P2PKH_compressed.json b/test-vectors/tx_btc_P2PKH_compressed.json
@@ -80,7 +80,7 @@
                     },
                     "type": null
                 },
-                "data": "0x{{ data ../build/secp256k1_data_20210801 }}",
+                "data": "0x{{ data ../build/secp256k1_data }}",
                 "header": null
             },
             {

diff --git a/test-vectors/tx_btc_P2PKH_uncompressed.json b/test-vectors/tx_btc_P2PKH_uncompressed.json
@@ -80,7 +80,7 @@
                     },
                     "type": null
                 },
-                "data": "0x{{ data ../build/secp256k1_data_20210801 }}",
+                "data": "0x{{ data ../build/secp256k1_data }}",
                 "header": null
             },
             {

diff --git a/test-vectors/tx_btc_Segwit_Bech32.json b/test-vectors/tx_btc_Segwit_Bech32.json
@@ -80,7 +80,7 @@
                     },
                     "type": null
                 },
-                "data": "0x{{ data ../build/secp256k1_data_20210801 }}",
+                "data": "0x{{ data ../build/secp256k1_data }}",
                 "header": null
             },
             {

diff --git a/test-vectors/tx_btc_Segwit_P2SH.json b/test-vectors/tx_btc_Segwit_P2SH.json
@@ -80,7 +80,7 @@
                     },
                     "type": null
                 },
-                "data": "0x{{ data ../build/secp256k1_data_20210801 }}",
+                "data": "0x{{ data ../build/secp256k1_data }}",
                 "header": null
             },
             {

diff --git a/test-vectors/tx_cobuild_btc_compressed.json b/test-vectors/tx_cobuild_btc_compressed.json
@@ -80,7 +80,7 @@
                     },
                     "type": null
                 },
-                "data": "0x{{ data ../build/secp256k1_data_20210801 }}",
+                "data": "0x{{ data ../build/secp256k1_data }}",
                 "header": null
             },
             {

diff --git a/test-vectors/tx_eth.json b/test-vectors/tx_eth.json
@@ -80,7 +80,7 @@
                     },
                     "type": null
                 },
-                "data": "0x{{ data ../build/secp256k1_data_20210801 }}",
+                "data": "0x{{ data ../build/secp256k1_data }}",
                 "header": null
             },
             {

diff --git a/test-vectors/tx_eth_displaying.json b/test-vectors/tx_eth_displaying.json
@@ -80,7 +80,7 @@
                     },
                     "type": null
                 },
-                "data": "0x{{ data ../build/secp256k1_data_20210801 }}",
+                "data": "0x{{ data ../build/secp256k1_data }}",
                 "header": null
             },
             {

diff --git a/tests/omni_lock/CMakeLists.txt b/tests/omni_lock/CMakeLists.txt
@@ -18,17 +18,17 @@ add_definitions(-DCKB_USE_SIM)
 add_definitions(-DSECP256K1_BUILD)
 
 include_directories(../../tests/omni_lock)
-include_directories(../../deps/ckb-c-stdlib-20210801)
+include_directories(../../deps/ckb-c-stdlib)
 include_directories(../../deps/sparse-merkle-tree/c)
 # include_directories(deps/ckb-c-stdlib/libc)
 # on simulator, we don't use own "libc"
-include_directories(../../deps/secp256k1-20210801/src)
-include_directories(../../deps/secp256k1-20210801)
-include_directories(../../deps/ckb-c-stdlib-20210801/molecule)
+include_directories(../../deps/secp256k1/src)
+include_directories(../../deps/secp256k1)
+include_directories(../../deps/ckb-c-stdlib/molecule)
 include_directories(../../c)
 include_directories(../../build)
 
 add_executable(omni_lock_simulator ../../tests/omni_lock/omni_lock_sim.c)
 target_compile_definitions(omni_lock_simulator PUBLIC -D_FILE_OFFSET_BITS=64 -DCKB_DECLARATION_ONLY)
-target_include_directories(omni_lock_simulator PUBLIC deps/ckb-c-stdlib-20210801/libc)
+target_include_directories(omni_lock_simulator PUBLIC deps/ckb-c-stdlib/libc)
 target_link_libraries(omni_lock_simulator dl)
diff --git a/tests/omni_lock/ckb_syscall_omni_lock_sim.h b/tests/omni_lock/ckb_syscall_omni_lock_sim.h
@@ -657,7 +657,7 @@ int ckb_load_cell_data(void* addr, uint64_t* len, size_t offset, size_t index,
                        size_t source) {
   if (source == CKB_SOURCE_CELL_DEP && index == SPECIAL_SECP256K1_INDEX) {
     ASSERT(*len == 1048576);
-    FILE* input = fopen("build/secp256k1_data_20210801", "rb");
+    FILE* input = fopen("build/secp256k1_data", "rb");
     size_t read_item = fread(addr, *len, 1, input);
     ASSERT(read_item == 1);