aitos-io · PanHH · Dec 6, 2022 · Oct 8, 2022 · Oct 8, 2022 · Oct 8, 2022
diff --git a/Makefile b/Makefile
@@ -16,9 +16,10 @@ BOAT_PROTOCOL_USE_CHAINMAKER ?= 1
 BOAT_DISCOVERY_PEER_QUERY    ?= 1
 BOAT_PROTOCOL_USE_VENACHAIN  ?= 1
 BOAT_PROTOCOL_USE_QUORUM     ?= 1
+BOAT_PROTOCOL_USE_CITA       ?= 1
 
 # Chain config check
-ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM)_$(BOAT_PROTOCOL_USE_PLATON)_$(BOAT_PROTOCOL_USE_PLATONE)_$(BOAT_PROTOCOL_USE_FISCOBCOS)_$(BOAT_PROTOCOL_USE_HLFABRIC)_$(BOAT_PROTOCOL_USE_HWBCS)_$(BOAT_PROTOCOL_USE_CHAINMAKER)_$(BOAT_PROTOCOL_USE_VENACHAIN)_$(BOAT_PROTOCOL_USE_QUORUM), 0_0_0_0_0_0_0_0)
+ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM)_$(BOAT_PROTOCOL_USE_PLATON)_$(BOAT_PROTOCOL_USE_PLATONE)_$(BOAT_PROTOCOL_USE_FISCOBCOS)_$(BOAT_PROTOCOL_USE_HLFABRIC)_$(BOAT_PROTOCOL_USE_HWBCS)_$(BOAT_PROTOCOL_USE_CHAINMAKER)_$(BOAT_PROTOCOL_USE_VENACHAIN)_$(BOAT_PROTOCOL_USE_QUORUM)_$(BOAT_PROTOCOL_USE_CITA), 0_0_0_0_0_0_0_0_0)
     $(error Select at least one chain)
 endif
 ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM)_$(BOAT_PROTOCOL_USE_FISCOBCOS), 0_1)
@@ -40,7 +41,6 @@ ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM)_$(BOAT_PROTOCOL_USE_QUORUM), 0_1)
     $(error QUORUM depends on ETHEREUM, set 'BOAT_PROTOCOL_USE_ETHEREUM' to 1 if enable QUORUM)
 endif
 
-
 # Set parameter to scripts
 SCRIPTS_PARAM += "BOAT_PROTOCOL_USE_ETHEREUM=$(BOAT_PROTOCOL_USE_ETHEREUM)" \
                  "BOAT_PROTOCOL_USE_PLATON=$(BOAT_PROTOCOL_USE_PLATON)" \
@@ -51,7 +51,8 @@ SCRIPTS_PARAM += "BOAT_PROTOCOL_USE_ETHEREUM=$(BOAT_PROTOCOL_USE_ETHEREUM)" \
 		         "BOAT_PROTOCOL_USE_CHAINMAKER=$(BOAT_PROTOCOL_USE_CHAINMAKER)" \
                  "BOAT_DISCOVERY_PEER_QUERY=$(BOAT_DISCOVERY_PEER_QUERY)" \
                  "BOAT_PROTOCOL_USE_VENACHAIN=$(BOAT_PROTOCOL_USE_VENACHAIN)" \
-                 "BOAT_PROTOCOL_USE_QUORUM=$(BOAT_PROTOCOL_USE_QUORUM)" 
+                 "BOAT_PROTOCOL_USE_QUORUM=$(BOAT_PROTOCOL_USE_QUORUM)" \
+                 "BOAT_PROTOCOL_USE_CITA=$(BOAT_PROTOCOL_USE_CITA)" 
 
 
 # Platform target
@@ -115,6 +116,8 @@ BOAT_INCLUDE :=   -I$(BOAT_BASE_DIR)/include \
                   -I$(BOAT_SDK_DIR)/protocol/boatvenachain \
 				  -I$(BOAT_SDK_DIR)/protocol/boatfiscobcos \
                   -I$(BOAT_SDK_DIR)/protocol/boatquorum \
+                  -I$(BOAT_SDK_DIR)/protocol/boatcita/protos \
+                  -I$(BOAT_SDK_DIR)/protocol/boatcita \
                   -I$(BOAT_SDK_DIR)/third-party/nghttp2/include \
                   -I$(BOAT_SDK_DIR)/third-party/protobuf-c/include \
                   -I$(BOAT_BASE_DIR)/vendor/platform/include \
@@ -256,6 +259,7 @@ export BOAT_PROTOCOL_USE_HWBCS
 export BOAT_PROTOCOL_USE_CHAINMAKER
 export BOAT_PROTOCOL_USE_VENACHAIN
 export BOAT_PROTOCOL_USE_QUORUM
+export BOAT_PROTOCOL_USE_CITA
 export BOAT_DISCOVERY_PEER_QUERY
 export BOAT_USE_DEFAULT_CJSON
 

diff --git a/demo/Makefile b/demo/Makefile
@@ -3,8 +3,8 @@
 # Generate sub-directory list
 OBJECTS_DIR = $(BOAT_BUILD_DIR)/demo
 
-.PHONY: all demo_ethereum demo_platon demo_platone demo_fiscobcos demo_fabric demo_hw_bcs demo_chainmaker demo_venachain demo_quorum
-all: $(OBJECTS_DIR) demo_ethereum demo_platon demo_platone demo_fiscobcos demo_fabric demo_hw_bcs demo_chainmaker demo_venachain demo_quorum
+.PHONY: all demo_ethereum demo_platon demo_platone demo_fiscobcos demo_fabric demo_hw_bcs demo_chainmaker demo_venachain demo_quorum demo_cita
+all: $(OBJECTS_DIR) demo_ethereum demo_platon demo_platone demo_fiscobcos demo_fabric demo_hw_bcs demo_chainmaker demo_venachain demo_quorum demo_cita
 
 demo_ethereum:
 ifeq ($(BOAT_PROTOCOL_USE_ETHEREUM), 1)
@@ -51,6 +51,11 @@ ifeq ($(BOAT_PROTOCOL_USE_QUORUM), 1)
 	make -C $(BOAT_BASE_DIR)/demo/demo_quorum all
 endif
 
+demo_cita:
+ifeq ($(BOAT_PROTOCOL_USE_CITA), 1)
+	make -C $(BOAT_BASE_DIR)/demo/demo_cita all
+endif
+
 $(OBJECTS_DIR):
 	$(BOAT_MKDIR) -p $(OBJECTS_DIR)
 
@@ -81,5 +86,10 @@ ifeq ($(BOAT_PROTOCOL_USE_VENACHAIN), 1)
 endif
 ifeq ($(BOAT_PROTOCOL_USE_QUORUM), 1)
 	make -C $(BOAT_BASE_DIR)/demo/demo_quorum clean
+endif
+ifeq ($(BOAT_PROTOCOL_USE_CITA), 1)
+	make -C $(BOAT_BASE_DIR)/demo/demo_cita clean
 endif
 	-$(BOAT_RM) $(BOAT_BUILD_DIR)/demo
+
+
diff --git a/demo/README.md b/demo/README.md
@@ -109,5 +109,5 @@ $file \<lib或obj文件名\>
 mkdir… 命令语法不正确。  
 FIND: 参数格式不正确  
 
-该问题一般是因为在Windows下进行编译，但未安装Cygwin，或者未在Makefile中正确配置BOAT_RM、BOAT_MKDIR、BOAT_FIND的路径。请参照[以Windows为编译环境](####以Windows为编译环境)章节安装Cygwin和配置Makefile。
+该问题一般是因为在Windows下进行编译，但未安装Cygwin，或者未在Makefile中正确配置BOAT_RM、BOAT_MKDIR、BOAT_FIND的路径。请参照[BoAT用户手册中以Windows为编译环境](../docs/zh-cn/BoAT_User_Guide_cn.md#以Windows为编译环境)章节安装Cygwin和配置Makefile。
 
diff --git a/demo/README_en.md b/demo/README_en.md
@@ -97,5 +97,5 @@ Common tips:
 mkdir… command syntax is incorrect.  
 FIND: The parameter format is incorrect  
 
-This problem is generally caused by compiling under Windows, but Cygwin is not installed, or the paths of BOAT_RM, BOAT_MKDIR, and BOAT_FIND are not correctly configured in the Makefile. Please refer to section [Use Windows as Compiler Environment](#Use-Windows-as-Compiler-Environment) to install Cygwin and configure Makefile.
+This problem is generally caused by compiling under Windows, but Cygwin is not installed, or the paths of BOAT_RM, BOAT_MKDIR, and BOAT_FIND are not correctly configured in the Makefile. Please refer to the section [Use Windows as Compiler Environment](../docs/en-us/BoAT_User_Guide_en.md#use-windows-as-the-compilation-environment) in BoAT User Guide to install Cygwin and configure Makefile.
 
diff --git a/demo/demo_chainmaker/demo_chainmaker.c b/demo/demo_chainmaker/demo_chainmaker.c
@@ -67,7 +67,7 @@ BCHAR *chainmaker_chain_id   = "chain1";
 BCHAR *chainmaker_org_id     = "wx-org1.chainmaker.org";
 
 BoatHlchainmakerWallet *g_chaninmaker_wallet_ptr;
-BoatHlchainmakerWalletConfig wallet_config = {0};
+BoatHlchainmakerWalletConfig wallet_config;
 
 __BOATSTATIC BOAT_RESULT chainmakerWalletPrepare(void)
 {
@@ -140,6 +140,8 @@ int main(int argc, char *argv[])
 	BoatResponseData      response_data;
 	boat_try_declare;
 
+	memset(&wallet_config,0U,sizeof(BoatHlchainmakerWalletConfig));
+
 	/* step-1: Boat SDK initialization */
     BoatIotSdkInit();
 

diff --git a/demo/demo_cita/CMakeLists.txt b/demo/demo_cita/CMakeLists.txt
@@ -0,0 +1,84 @@
+
+
+
+set(CITA_DEMO_SRC         demo_cita_SimpleStorage.c)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/demo/demo_cita/runtime)
+
+if(BOAT_PYTHON_EXECUTABLE)
+    execute_process(COMMAND ${BOAT_PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/cita2c.py ${PROJECT_SOURCE_DIR}/demo/demo_cita/demo_contract/SimpleStorage.json
+                    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/demo/demo_cita/demo_contract
+                    RESULT_VARIABLE result)
+    if(${result} EQUAL 1)
+        message(FATAL_ERROR "run python gen.py boatconfig.h error")
+    endif()
+else()
+    message(FATAL_ERROR "not fund python3, please install python3")
+endif()
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+include_directories(${PROJECT_SOURCE_DIR}/vendor/platform/include)
+add_subdirectory(demo_contract)
+
+##############
+
+add_executable(demo_cita_SimpleStorage_onetime_internalGen ${CITA_DEMO_SRC})
+target_compile_options(demo_cita_SimpleStorage_onetime_internalGen PRIVATE -DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_INTERNAL_GENERATION)
+target_link_libraries(demo_cita_SimpleStorage_onetime_internalGen
+                        boatwallet
+                        boatvendor
+                        curl
+                        cita_obj)
+
+add_executable(demo_cita_SimpleStorage_onetime_pkcs ${CITA_DEMO_SRC})
+target_compile_options(demo_cita_SimpleStorage_onetime_pkcs PRIVATE -DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_PKCS)
+target_link_libraries(demo_ecita_SimpleStorage_onetime_pkcs
+                        boatwallet
+                        boatvendor
+                        curl
+                        cita_obj)
+
+add_executable(demo_cita_SimpleStorage_onetime_native ${CITA_DEMO_SRC})
+target_compile_options(demo_cita_SimpleStorage_onetime_native PRIVATE -DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_NATIVE)
+target_link_libraries(demo_cita_SimpleStorage_onetime_native
+                        boatwallet
+                        boatvendor
+                        curl
+                        cita_obj)
+
+add_executable(demo_cita_SimpleStorage_create_internalGen ${CITA_DEMO_SRC})
+target_compile_options(demo_cita_SimpleStorage_create_internalGen PRIVATE -DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_INTERNAL_GENERATION)
+target_link_libraries(demo_cita_SimpleStorage_create_internalGen
+                        boatwallet
+                        boatvendor
+                        curl
+                        cita_obj)
+
+add_executable(demo_cita_SimpleStorage_create_pkcs ${CITA_DEMO_SRC})
+target_compile_options(demo_cita_SimpleStorage_create_pkcs PRIVATE -DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_PKCS )
+target_link_libraries(demo_cita_SimpleStorage_create_pkcs
+                        boatwallet
+                        boatvendor
+                        curl
+                        cita_obj)
+
+add_executable(demo_cita_SimpleStorage_create_native ${CITA_DEMO_SRC})
+target_compile_options(demo_cita_SimpleStorage_create_native PRIVATE -DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_NATIVE)
+target_link_libraries(demo_cita_SimpleStorage_create_native
+                        boatwallet
+                        boatvendor
+                        curl
+                        cita_obj)
+
+add_executable(demo_cita_SimpleStorage_load ${CITA_DEMO_SRC})
+target_compile_options(demo_cita_SimpleStorage_load PRIVATE -DUSE_LOAD_PERSIST_WALLET)
+target_link_libraries(demo_cita_SimpleStorage_load
+                        boatwallet
+                        boatvendor
+                        curl
+                        cita_obj)
+
+
+
+
+
diff --git a/demo/demo_cita/Makefile b/demo/demo_cita/Makefile
@@ -0,0 +1,51 @@
+# Source and Objects
+
+# Specify demo folder name
+DEMO_FOLDER    = demo_cita
+
+# Source and Objects
+CONTRACT_SRC_DIR     = $(BOAT_BASE_DIR)/demo/$(DEMO_FOLDER)/demo_contract
+OBJECTS_DIR          = $(BOAT_BUILD_DIR)/demo/$(DEMO_FOLDER)
+CONTRACT_OBJECTS_DIR = $(BOAT_BUILD_DIR)/demo/$(DEMO_FOLDER)/demo_contract
+DEMO_SOURCES         = $(wildcard *.c) 
+CONTRACT_SOURCES     = $(wildcard $(CONTRACT_OBJECTS_DIR)/*.c)
+CONTRACT_INCLUDE     = -I$(BOAT_BUILD_DIR)/demo/$(DEMO_FOLDER)/demo_contract
+
+#dependence libs
+DEPENDENCE_LIBS = $(BOAT_LIB_DIR)/libboatwallet.a \
+				  $(BOAT_LIB_DIR)/libboatvendor.a \
+				  $(LINK_LIBS)
+
+.PHONY: all contract_generate
+all: $(OBJECTS_DIR) contract_generate
+	$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
+		-DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_INTERNAL_GENERATION \
+		$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_onetime_internalGen
+	$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
+		-DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_PKCS \
+		$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_onetime_pkcs
+	$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
+		-DUSE_ONETIME_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_NATIVE \
+		$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_onetime_native
+	$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
+		-DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_INTERNAL_GENERATION \
+		$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_create_internalGen
+	$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
+		-DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_PKCS \
+		$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_create_pkcs		
+	$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
+		-DUSE_CREATE_PERSIST_WALLET -DUSE_PRIKEY_FORMAT_EXTERNAL_INJECTION_NATIVE \
+		$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_create_native
+	$(CC) $(BOAT_CFLAGS) $(BOAT_LFLAGS) $(CONTRACT_INCLUDE) $(CONTRACT_SOURCES) demo_cita_SimpleStorage.c \
+		-DUSE_LOAD_PERSIST_WALLET \
+		$(DEPENDENCE_LIBS) -o $(OBJECTS_DIR)/demo_cita_SimpleStorage_load		 
+
+contract_generate:
+	make -C $(CONTRACT_SRC_DIR) all
+
+$(OBJECTS_DIR):
+	$(BOAT_MKDIR) -p $(OBJECTS_DIR)
+	$(BOAT_MKDIR) -p $(OBJECTS_DIR)/demo_contract
+
+clean:
+	-$(BOAT_RM) $(OBJECTS_DIR)/*