Skip to content

Commit

Permalink
update change log
Browse files Browse the repository at this point in the history
  • Loading branch information
cyjseagull committed Dec 9, 2024
1 parent 7508afe commit 0af7b30
Show file tree
Hide file tree
Showing 10 changed files with 64 additions and 34 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/cpp_full_node_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/vcpkg_docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
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
44 changes: 30 additions & 14 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -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计算等)
- 预处理组件
4 changes: 2 additions & 2 deletions cpp/cmake/Version.cmake
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion cpp/vcpkg-configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions docker-files/cpp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM fiscoorg/wedpr-component-vcpkg-cache:v3.0.0 as builder

LABEL maintainer [email protected]
LABEL maintainer=[email protected]

WORKDIR /

Expand All @@ -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 [email protected]
LABEL maintainer=[email protected]

RUN apt-get -q update && apt-get install -qy --no-install-recommends vim \
&& ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
Expand All @@ -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 [email protected]
LABEL maintainer=[email protected]

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 \
Expand All @@ -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 [email protected]
LABEL maintainer=[email protected]

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 \
Expand Down
8 changes: 4 additions & 4 deletions docker-files/cpp/vcpkg/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM ubuntu:22.04 as wedpr-component-vcpkg-cache

LABEL maintainer [email protected]
LABEL maintainer=[email protected]

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 \
Expand Down
2 changes: 1 addition & 1 deletion docker-files/model/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM fiscoorg/wedpr-image:v3.0.0 as wedpr-model-service-base-image

LABEL maintainer [email protected]
LABEL maintainer=[email protected]

RUN apt-get install -qy --no-install-recommends pkg-config default-libmysqlclient-dev
RUN mkdir -p /data/home/wedpr
Expand Down
2 changes: 1 addition & 1 deletion docker-files/model/model/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM wedpr-model-service-base-image:v3.0.0 as wedpr-model-service
LABEL maintainer [email protected]
LABEL maintainer=[email protected]

ENV LANG zh_CN.UTF-8
ENV LANGUAGE zh_CN.UTF-8
Expand Down

0 comments on commit 0af7b30

Please sign in to comment.