Merge pull request #161 from LucasLi1024/release-3.3.0

sync release-3.3.0 code && add changeLog for release-3.3.0

.github/workflows/workflow.yml

@@ -161,16 +161,11 @@ jobs:
           . /opt/rh/llvm-toolset-7.0/enable
           alias cmake='cmake3'
           java -version
-          mkdir -p build && cd build
           export CFLAGS="${CFLAGS} -fPIC"
           export CXXFLAGS="${CXXFLAGS} -fPIC"
+          mkdir -p build && cd build
           cmake3 ../ -DHUNTER_STATUS_DEBUG=ON -DBUILD_JNI=ON -DBUILD_SAMPLE=ON
-      - name: compile
-        run: |
-          export CFLAGS="${CFLAGS} -fPIC"
-          export CXXFLAGS="${CXXFLAGS} -fPIC"
-          cd build && make -j4
-          # CTEST_OUTPUT_ON_FAILURE=TRUE make test
+          make -j4
       - uses: actions/upload-artifact@v2
         with:
           name: libbcos-c-sdk.so.zip

ChangeLog.md

@@ -1,3 +1,27 @@
+### 3.3.0
+
+(2023-04-18)
+
+#### bcos-sdk-jni
+**新增**
+- 新增密码机支持：配置keyindex使用内置密钥、签名验签
+- 添加 `sendTransaction` 接口，支持同时编码/签名/发送交易功能
+
+**更新**
+- 更新 `bcos-boostssl` 以支持域名
+- 更新 `jackson-databind` 到 `2.14.2` 版本
+
+#### bcos-c-sdk
+
+**新增**
+- 新增密码机支持：配置keyindex使用内置密钥、签名验签
+- 添加 `sendTransaction` 接口，支持同时编码/签名/发送交易功能
+
+**更新**
+- 更新 `jackson-databind` 到 `2.14.2` 版本
+- 合并 `bcos-sdk-jni`
+- 添加发送RPC请求时是否根据块高发送的开关
+
 ### 3.2.0
 
 (2023-01-03)

cmake/config.cmake

@@ -51,8 +51,8 @@ hunter_config(bcos-boostssl
 
 hunter_config(bcos-cpp-sdk
     VERSION 3.3.0-local
-    URL https://${URL_BASE}/FISCO-BCOS/bcos-cpp-sdk/archive/58f0efc1ad08e740955d0a389833b962b63f5644.tar.gz
-    SHA1 0d63f5d4cf6384d9c34380c7c3d337ca4df8a217
+    URL https://${URL_BASE}/FISCO-BCOS/bcos-cpp-sdk/archive/d47a751fe5f840fd22b38bcf9bedd61e1b1ad478.tar.gz
+    SHA1 debd13410b98474dc0e4d55b7b08d233999fa0e5
 )
 
 hunter_config(range-v3 VERSION 1.0.0

sample/tx/CMakeLists.txt

@@ -1,5 +1,8 @@
 add_executable(hello_sample hello_sample.c)
 target_link_libraries(hello_sample PUBLIC ${BCOS_C_SDK_STATIC_TARGET})
 
+add_executable(hello_sample_hsm hello_sample_hsm.c)
+target_link_libraries(hello_sample_hsm PUBLIC ${BCOS_C_SDK_STATIC_TARGET})
+
 # add_executable(tx_sign_perf tx_sign_perf.cpp)
 # target_link_libraries(tx_sign_perf PUBLIC ${BCOS_C_SDK_STATIC_TARGET})