From 0af7b306a717fd57bb22bbf828fdeb148e4790f3 Mon Sep 17 00:00:00 2001 From: cyjseagull Date: Mon, 9 Dec 2024 00:12:26 +0800 Subject: [PATCH] update change log --- .github/workflows/cpp_full_node_workflow.yml | 5 ++- .github/workflows/docker.yml | 15 +++++-- .github/workflows/vcpkg_docker_image.yml | 8 +++- ChangeLog.md | 44 +++++++++++++------- cpp/cmake/Version.cmake | 4 +- cpp/vcpkg-configuration.json | 2 +- docker-files/cpp/Dockerfile | 8 ++-- docker-files/cpp/vcpkg/Dockerfile | 8 ++-- docker-files/model/base/Dockerfile | 2 +- docker-files/model/model/Dockerfile | 2 +- 10 files changed, 64 insertions(+), 34 deletions(-) diff --git a/.github/workflows/cpp_full_node_workflow.yml b/.github/workflows/cpp_full_node_workflow.yml index 40bad517..22c46c96 100644 --- a/.github/workflows/cpp_full_node_workflow.yml +++ b/.github/workflows/cpp_full_node_workflow.yml @@ -86,7 +86,8 @@ jobs: if: runner.os == 'macOS' run: | bash -x cpp/tools/install_depends.sh -o macos - mkdir -p cpp/build && cd cpp/build && cmake -DCMAKE_PREFIX_PATH=/opt/local -DBUILD_STATIC=ON -DTESTS=ON -DCOVERAGE=ON -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake ../ + mkdir -p cpp/build && cd cpp/build + export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk && cmake -DCMAKE_PREFIX_PATH=/opt/local -DBUILD_STATIC=ON -DTESTS=ON -DCOVERAGE=ON -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake ../ make -j3 - name: Publish Error if: always() @@ -177,7 +178,7 @@ jobs: yum update -y yum install -y epel-release centos-release-scl centos-release-scl-rh yum install -y https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm - yum install -y wget java-11-openjdk-devel git make gcc gcc-c++ glibc-static glibc-devel cmake3 ccache devtoolset-11 libzstd-devel zlib-devel flex bison python-devel python3-devel + yum install -y wget java-11-openjdk-devel git autoconf automake make gcc gcc-c++ glibc-static glibc-devel cmake3 ccache devtoolset-11 libzstd-devel zlib-devel flex bison python-devel python3-devel - uses: actions-rs/toolchain@v1 with: toolchain: nightly-2022-07-28 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e61b2259..b68cde3c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,9 +7,12 @@ on: - "README.md" tags: - 'v3.*.*' - branches: - - main - - feature-milestone2-gateway + pull_request: + paths-ignore: + - "docs/**" + - "python/**" + - "Changelog.md" + - "README.md" release: types: [prereleased] @@ -22,9 +25,12 @@ env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION: node16 ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16 + # Use docker.io for Docker Hub if empty + REGISTRY: ghcr.io jobs: build-docker: + if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - name: Checkout @@ -35,8 +41,9 @@ jobs: run: | git fetch --tags --force - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3 with: + registry: ${{ env.REGISTRY }} username: ${{ secrets.DOCKER_FISCOPR_USER }} password: ${{ secrets.DOCKER_FISCOPR_TOKEN }} - name: Get git tag diff --git a/.github/workflows/vcpkg_docker_image.yml b/.github/workflows/vcpkg_docker_image.yml index 50cb219d..33c03299 100644 --- a/.github/workflows/vcpkg_docker_image.yml +++ b/.github/workflows/vcpkg_docker_image.yml @@ -37,4 +37,10 @@ jobs: docker build --build-arg SOURCE_BRANCH=${BRANCH_NAME} -t ${DOCKER_TAG} . echo "* Build ${DOCKER_TAG} success" docker push ${DOCKER_TAG} - echo "* Push ${DOCKER_TAG} success" \ No newline at end of file + echo "* Push ${DOCKER_TAG} success" + - name: Publish Error + if: always() + uses: actions/upload-artifact@v4 + with: + name: autoconf-x64-linux-err.log + path: /WeDPR-Component/cpp/vcpkg/buildtrees/gsasl/autoconf-x64-linux-err.log \ No newline at end of file diff --git a/ChangeLog.md b/ChangeLog.md index 8b7b54d4..67c02c6f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,21 +1,37 @@ -### 1.0.0-rc1 -(2024-08-21) +# 3.0.0 +(2024-12-9) -**新增** +### 新增 -#### 隐私计算组件 +**隐私计算组件** -- **PSI**: 实现多种类型隐私求交集算法，包括CM2020, RA2018, ECDH-PSI, ECDH-Multi-PSI等 -- **MPC**: 安全多方计算相关组件 -- **MPCSQL**: 基于安全多方计算协议，支持联合分析查询任务 -- **PIR**: 匿踪查询组件 +- PSI: 实现多种类型隐私求交集算法，包括CM2020, RA2018, ECDH-PSI, ECDH-Multi-PSI等 +- MPC: 安全多方计算 +- PIR: 匿踪查询核心组件 -#### 隐私计算互联互通 +**联合建模组件** -- ECDH PSI算法与隐语互联互通 +- 2+方的多方联合XGB/LR建模组件（训练 + 离线预测） +- 2+方多方特征工程组件（特征分箱，WOE/IV计算等） +- 多方数据预处理组件 -#### 隐私建模组件 +**统一网关** + +- 支持基于最短路径的消息路由转发 +- 支持按节点ID、服务名、机构名进行路由寻址 +- 支持服务注册和服务发现 + +**统一网关SDK** + +- 提供Java/Python网关SDK，支持接入网关与其他节点、服务或者机构进行通信 +- 可向网关注册服务 +- 可从网关拉取服务信息 + +**专家模式SDK** + +- `wedpr-ml-toolkit`: 可通过python sdk向WeDPR隐私计算平台发起各类任务，并获取对应的结果，扩展了WeDPR隐私计算系统功能的可扩展性，可在不侵入式修改系统的前提下，实现数据开发人员的各类数据分析需求 + +**密码学组件** + +- 实现了各种同态算法，包括`Paillier`, `IHC`等 -- 2+方的多方联合XGB组件（训练 + 离线预测） -- 2+方多方特征工程组件（特征分箱，WOE/IV计算等） -- 预处理组件 \ No newline at end of file diff --git a/cpp/cmake/Version.cmake b/cpp/cmake/Version.cmake index 206620b2..8259d91c 100644 --- a/cpp/cmake/Version.cmake +++ b/cpp/cmake/Version.cmake @@ -1,2 +1,2 @@ -set(VERSION "1.0.0") -set(PYTHON_TOOLKIT_VERSION "1.0.0") +set(VERSION "3.0.0") +set(PYTHON_TOOLKIT_VERSION "3.0.0") diff --git a/cpp/vcpkg-configuration.json b/cpp/vcpkg-configuration.json index 57d11737..e62c646e 100644 --- a/cpp/vcpkg-configuration.json +++ b/cpp/vcpkg-configuration.json @@ -2,7 +2,7 @@ "registries": [ { "kind": "git", - "repository": "https://mirror.ghproxy.com/github.com/FISCO-BCOS/registry", + "repository": "https://github.com/FISCO-BCOS/registry", "baseline": "d45a1d99c6b01713252bcb734c03f2c1ac0e44b8", "packages": [ "openssl", diff --git a/docker-files/cpp/Dockerfile b/docker-files/cpp/Dockerfile index 15cb5d67..88b161d2 100644 --- a/docker-files/cpp/Dockerfile +++ b/docker-files/cpp/Dockerfile @@ -1,6 +1,6 @@ FROM fiscoorg/wedpr-component-vcpkg-cache:v3.0.0 as builder -LABEL maintainer service@webank.com +LABEL maintainer=service@webank.com WORKDIR / @@ -16,7 +16,7 @@ RUN cd WeDPR-Component/cpp && rm -rf vcpkg && ln -s /vcpkg \ && make -j8 FROM ubuntu:22.04 as wedpr-gateway-service -LABEL maintainer service@webank.com +LABEL maintainer=service@webank.com RUN apt-get -q update && apt-get install -qy --no-install-recommends vim \ && ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ @@ -31,7 +31,7 @@ COPY --from=builder /WeDPR-Component/cpp/build/bin/ppc-gateway-service /data/hom ENTRYPOINT ["/data/home/wedpr/wedpr-gateway-service/ppc-gateway-service", "-c", "config.ini"] FROM ubuntu:22.04 as wedpr-pro-node-service -LABEL maintainer service@webank.com +LABEL maintainer=service@webank.com RUN apt-get -q update && apt-get install -qy --no-install-recommends vim libkrb5-dev krb5-user \ && ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ @@ -46,7 +46,7 @@ COPY --from=builder /WeDPR-Component/cpp/build/bin/ppc-pro-node /data/home/wedpr ENTRYPOINT ["/data/home/wedpr/wedpr-pro-node-service/ppc-pro-node", "-c", "config.ini"] FROM ubuntu:22.04 as wedpr-mpc-service -LABEL maintainer service@webank.com +LABEL maintainer=service@webank.com RUN apt-get -q update && apt-get install -qy --no-install-recommends vim libkrb5-dev krb5-user \ && ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ diff --git a/docker-files/cpp/vcpkg/Dockerfile b/docker-files/cpp/vcpkg/Dockerfile index b0ebba0f..8d6a86dc 100644 --- a/docker-files/cpp/vcpkg/Dockerfile +++ b/docker-files/cpp/vcpkg/Dockerfile @@ -1,17 +1,17 @@ FROM ubuntu:22.04 as wedpr-component-vcpkg-cache -LABEL maintainer service@webank.com +LABEL maintainer=service@webank.com WORKDIR / ARG SOURCE_BRANCH ENV DEBIAN_FRONTEND=noninteractive \ SOURCE=${SOURCE_BRANCH:-main} - +# Note: depends on python3; default jdk for jni RUN apt-get -q update && apt-get install -qy --no-install-recommends \ - vim curl git make build-essential cmake ca-certificates \ + vim curl lcov git make nasm build-essential cmake wget libtool ca-certificates python3.11 python3-dev \ libgmp-dev flex bison patch libzstd-dev unzip ninja-build pkg-config zip tar ccache uuid-runtime automake autoconf \ - m4 tcpdump net-tools libkrb5-dev default-libmysqlclient-dev gcc g++ \ + m4 tcpdump net-tools gcc g++ default-jdk \ && ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && apt-get install -qy --no-install-recommends tzdata \ && dpkg-reconfigure --frontend noninteractive tzdata \ diff --git a/docker-files/model/base/Dockerfile b/docker-files/model/base/Dockerfile index 914280c3..05c5a433 100644 --- a/docker-files/model/base/Dockerfile +++ b/docker-files/model/base/Dockerfile @@ -1,6 +1,6 @@ FROM fiscoorg/wedpr-image:v3.0.0 as wedpr-model-service-base-image -LABEL maintainer service@webank.com +LABEL maintainer=service@webank.com RUN apt-get install -qy --no-install-recommends pkg-config default-libmysqlclient-dev RUN mkdir -p /data/home/wedpr diff --git a/docker-files/model/model/Dockerfile b/docker-files/model/model/Dockerfile index 96a4a0bb..ea69413a 100644 --- a/docker-files/model/model/Dockerfile +++ b/docker-files/model/model/Dockerfile @@ -1,5 +1,5 @@ FROM wedpr-model-service-base-image:v3.0.0 as wedpr-model-service -LABEL maintainer service@webank.com +LABEL maintainer=service@webank.com ENV LANG zh_CN.UTF-8 ENV LANGUAGE zh_CN.UTF-8