repo-sync-2024-12-23T18:41:54+0800 (#421)

secretflow · Dec 23, 2024 · e4412d5 · e4412d5
1 parent 00e8678
commit e4412d5
Show file tree

Hide file tree

Showing 258 changed files with 20,808 additions and 8,749 deletions.
diff --git a/.ci/broker-docker-compose/docker-compose.yml.template b/.ci/broker-docker-compose/docker-compose.yml.template
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   engine-alice:
     command:
@@ -62,10 +61,10 @@ services:
     volumes:
       - ./broker/conf/carol/:/home/admin/configs/
   mysql:
-    image: mysql:latest
+    image: mysql:8.0.39
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - TZ=Asia/Shanghai
+      - TZ=UTC
     healthcheck:
       retries: 10
       test:
@@ -96,7 +95,7 @@ services:
     environment:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_USER=root
-      - TZ=Asia/Shanghai
+      - TZ=UTC
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready" ]
       interval: 10s

diff --git a/.ci/broker-docker-compose/setup.py b/.ci/broker-docker-compose/setup.py
@@ -218,9 +218,9 @@ def generate_regtest_config():
     mysql_port = os.getenv(MYSQL_PORT_ENV_NAME)
     project_conf = os.getenv(PROJECT_CONF_ENV_NAME)
     spu_protocol = os.getenv(SPU_PROTOCOL_ENV_NAME)
-    conf["mysql_conn_str"] = (
-        f"root:{MYSQL_ROOT_PASSWORD}@tcp(localhost:{mysql_port})/alice?charset=utf8mb4&parseTime=True&loc=Local&interpolateParams=true"
-    )
+    conf[
+        "mysql_conn_str"
+    ] = f"root:{MYSQL_ROOT_PASSWORD}@tcp(localhost:{mysql_port})/alice?charset=utf8mb4&parseTime=True&loc=Local&interpolateParams=true"
     conf["spu_protocol"] = spu_protocol
     conf["project_conf"] = project_conf
     conf_path = os.path.join(CUR_PATH, "regtest.yml")

diff --git a/.ci/docker-compose/docker-compose-tmpl/datasource.template b/.ci/docker-compose/docker-compose-tmpl/datasource.template
@@ -1,8 +1,8 @@
   mysql:
-    image: mysql:latest
+    image: mysql:8.0.39
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - TZ=Asia/Shanghai
+      - TZ=UTC
     healthcheck:
       retries: 10
       test:
@@ -30,7 +30,7 @@
     environment:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_USER=root
-      - TZ=Asia/Shanghai
+      - TZ=UTC
     healthcheck:
       test: ["CMD-SHELL", "pg_isready"]
       interval: 10s

diff --git a/.ci/docker-compose/docker-compose-tmpl/docker-compose.template b/.ci/docker-compose/docker-compose-tmpl/docker-compose.template
@@ -1,5 +1,4 @@
-version: '3.8'
 services:
 ${ENGINE}
 ${SCDB}
-${DATASOURCE}
+${DATASOURCE}
diff --git a/.ci/docker-compose/setup.py b/.ci/docker-compose/setup.py
@@ -231,9 +231,9 @@ def generate_regtest_config():
     conf["mpc_protocols"] = os.getenv(PROTOCOLS_ENV_NAME)
 
     mysql_port = os.getenv(MYSQL_PORT_ENV_NAME)
-    conf["mysql_conn_str"] = (
-        f"root:{MYSQL_ROOT_PASSWORD}@tcp(localhost:{mysql_port})/scdb?charset=utf8mb4&parseTime=True&loc=Local&interpolateParams=true"
-    )
+    conf[
+        "mysql_conn_str"
+    ] = f"root:{MYSQL_ROOT_PASSWORD}@tcp(localhost:{mysql_port})/scdb?charset=utf8mb4&parseTime=True&loc=Local&interpolateParams=true"
     for p in PARTY:
         pem_path = os.path.join(CUR_PATH, f"engine/{p}/conf/ed25519key.pem")
         conf["parties"][p]["private_key"] = pem_path

diff --git a/.ci/script/ensure_binary_safety.sh b/.ci/script/ensure_binary_safety.sh
@@ -18,7 +18,7 @@
 set -ex
 set -o pipefail
 
-pip install --root-user-action=ignore pwntools "pyelftools==0.29"
+pip install --root-user-action=ignore pwntools "pyelftools==0.29" "unicorn==2.0.1.post1"
 
 BINARY=$1