Rename binary name to omni-executor

.github/workflows/ci.yml

@@ -299,7 +299,7 @@ jobs:
           context: .
           file: tee-worker/omni-executor/Dockerfile
           tags: litentry/omni-executor:latest
-          target: executor-worker
+          target: omni-executor
           build-args: |
             CARGO_FEATURES=mock-server
 

tee-worker/omni-executor/Dockerfile

@@ -23,7 +23,7 @@ RUN if [ -n "$CARGO_FEATURES" ]; then \
 
 ### Deploy image (for CI - No Gramine)
 ##################################################
-FROM node:20-bookworm-slim AS executor-worker
+FROM node:20-bookworm-slim AS omni-executor
 
 ENV SRC_DIR=/home/ubuntu/tee-worker/omni-executor
 ENV BIN_DIR=/usr/local/bin
@@ -32,13 +32,13 @@ WORKDIR $BIN_DIR
 RUN apt update && apt install -y ca-certificates curl
 RUN corepack enable && corepack prepare pnpm@8.7.6 --activate && corepack enable pnpm
 
-COPY --from=plain-builder $SRC_DIR/target/release/executor-worker $BIN_DIR/executor-worker
+COPY --from=plain-builder $SRC_DIR/target/release/omni-executor $BIN_DIR/omni-executor
 COPY --from=plain-builder $SRC_DIR/local/keystore $BIN_DIR/local/keystore
 
-RUN chmod +x $BIN_DIR/executor-worker
+RUN chmod +x $BIN_DIR/omni-executor
 RUN ls -al $BIN_DIR
-RUN ldd $BIN_DIR/executor-worker && $BIN_DIR/executor-worker --version
-CMD ["$BIN_DIR/executor-worker"]
+RUN ldd $BIN_DIR/omni-executor && $BIN_DIR/omni-executor --version
+CMD ["$BIN_DIR/omni-executor"]
 
 
 ### Builder Stage - With Gramine (SGX Hardware)

tee-worker/omni-executor/Dockerfile.local

@@ -2,19 +2,19 @@
 
 ### Local binary deployment image
 ##################################################
-FROM ubuntu:24.04 AS executor-worker
+FROM ubuntu:24.04 AS omni-executor
 
 ENV BIN_DIR=/usr/local/bin
 WORKDIR $BIN_DIR
 
 RUN apt update && apt install -y ca-certificates curl
 
 # Copy the pre-built binary from local target directory
-COPY target/release/executor-worker $BIN_DIR/executor-worker
+COPY target/release/omni-executor $BIN_DIR/omni-executor
 COPY local/keystore $BIN_DIR/local/keystore
 
-RUN chmod +x $BIN_DIR/executor-worker
+RUN chmod +x $BIN_DIR/omni-executor
 RUN ls -al $BIN_DIR
-RUN ldd $BIN_DIR/executor-worker && $BIN_DIR/executor-worker --version
+RUN ldd $BIN_DIR/omni-executor && $BIN_DIR/omni-executor --version
 
-CMD ["executor-worker"]
+CMD ["omni-executor"]

tee-worker/omni-executor/LOCAL_DEV.md

@@ -180,7 +180,7 @@ RUST_LOG=debug
 
 1. Check if the binary was built with mock-server feature:
    ```bash
-   ./target/release/executor-worker --help | grep mock
+   ./target/release/omni-executor --help | grep mock
    ```
 
 2. Check if mock server is starting:
@@ -241,7 +241,7 @@ For even faster development, you can run the omni-executor directly without Dock
 
 3. Run omni-executor:
    ```bash
-   ./target/release/executor-worker run --enable-mock-server
+   ./target/release/omni-executor run --enable-mock-server
    ```
 
 ## Account Funding and EntryPoint Deposits

tee-worker/omni-executor/Makefile

@@ -25,7 +25,7 @@ endif
 .PHONY: $(BIN_NAME)
 $(BIN_NAME):
 	cargo build --release --locked --features=$(COMPILATION_FEATURES)
-	cp target/release/executor-worker $(BIN_NAME)
+	cp target/release/omni-executor $(BIN_NAME)
 
 
 ifeq ($(DEBUG),1)
@@ -77,7 +77,7 @@ clean-data:
 
 .PHONY: build-docker
 build-docker:
-	docker build --target executor-worker -t litentry/$(BIN_NAME):latest -f $(OMNI_DIR)/Dockerfile $(ROOTDIR)
+	docker build --target omni-executor -t litentry/$(BIN_NAME):latest -f $(OMNI_DIR)/Dockerfile $(ROOTDIR)
 
 .PHONY: start-local
 start-local:
@@ -94,7 +94,7 @@ stop-local:
 
 .PHONY: build-docker-test
 build-docker-test:
-	docker build --build-arg CARGO_FEATURES="mock-server,test-endpoints" --target executor-worker -t litentry/$(BIN_NAME):latest -f $(OMNI_DIR)/Dockerfile $(ROOTDIR)
+	docker build --build-arg CARGO_FEATURES="mock-server,test-endpoints" --target omni-executor -t litentry/$(BIN_NAME):latest -f $(OMNI_DIR)/Dockerfile $(ROOTDIR)
 
 .PHONY: rebuild-docker-dev
 rebuild-docker-dev:

tee-worker/omni-executor/bin/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "executor-worker"
+name = "omni-executor"
 version = "0.1.0"
 authors = ['Trust Computing GmbH <info@litentry.com>']
 edition.workspace = true

tee-worker/omni-executor/docker/docker-compose.test.yml

@@ -2,7 +2,7 @@ services:
   omni-executor:
     env_file:
       - ../.env.test
-    command: ["executor-worker", "run", "--enable-mock-server"]
+    command: ["omni-executor", "run", "--enable-mock-server"]
     ports:
       - "2100:2100"
       - "3456:3456"

tee-worker/omni-executor/docker/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     build:
       context: ..
       dockerfile: Dockerfile.local
-      target: executor-worker
+      target: omni-executor
     volumes:
       - ../local/keystore:/local/keystore
       - shared_contracts:/shared:ro
@@ -31,7 +31,7 @@ services:
       aa-contracts-deploy:
         condition: service_completed_successfully
     entrypoint: ["/entrypoint.sh"]
-    command: ["executor-worker", "run", "--enable-mock-server"]
+    command: ["omni-executor", "run", "--enable-mock-server"]
     privileged: true
     restart: unless-stopped
     networks:

tee-worker/omni-executor/docker/jsonrpc-mock-tests.yml

@@ -5,18 +5,18 @@ services:
     volumes:
       - ../ts-tests:/ts-tests
       - ../../client-api:/client-api
-      - ../ts-tests/cli:/usr/local/executor-worker-cli
+      - ../ts-tests/cli:/usr/local/omni-executor-cli
     build:
       context: ${PWD}/../../
       dockerfile: tee-worker/omni-executor/Dockerfile
-      target: executor-worker
+      target: omni-executor
     depends_on:
       omni-executor:
         condition: service_healthy
         restart: true
     networks:
       - litentry-test-network
-    entrypoint: "sh -c '/usr/local/executor-worker-cli/ts_jsonrpc_mock_test.sh 3>&1' "
+    entrypoint: "sh -c '/usr/local/omni-executor-cli/ts_jsonrpc_mock_test.sh 3>&1' "
     restart: "no"
 networks:
   litentry-test-network:

tee-worker/omni-executor/docker/omni-account-test.yml

@@ -5,18 +5,18 @@ services:
         volumes:
             - ../ts-tests:/ts-tests
             - ../../client-api:/client-api
-            - ../ts-tests/cli:/usr/local/executor-worker-cli
+            - ../ts-tests/cli:/usr/local/omni-executor-cli
         build:
             context: ${PWD}/../../
             dockerfile: tee-worker/omni-executor/Dockerfile
-            target: executor-worker
+            target: omni-executor
         depends_on:
           omni-executor:
             condition: service_healthy
             restart: true
         networks:
             - litentry-test-network
-        entrypoint: "sh -c '/usr/local/executor-worker-cli/ts_integration_test.sh omni_account.test.ts 3>&1' "
+        entrypoint: "sh -c '/usr/local/omni-executor-cli/ts_integration_test.sh omni_account.test.ts 3>&1' "
         restart: "no"
 networks:
     litentry-test-network:

tee-worker/omni-executor/docker/omni-client-sdk-test.yml

@@ -5,18 +5,18 @@ services:
     volumes:
       - ../client-sdk:/client-sdk
       - ../../client-api:/client-api
-      - ../ts-tests/cli:/usr/local/executor-worker-cli
+      - ../ts-tests/cli:/usr/local/omni-executor-cli
     build:
       context: ${PWD}/../../
       dockerfile: tee-worker/omni-executor/Dockerfile
-      target: executor-worker
+      target: omni-executor
     depends_on:
       omni-executor:
         condition: service_healthy
         restart: true
     networks:
       - litentry-test-network
-    entrypoint: "sh -c '/usr/local/executor-worker-cli/ts_client_sdk_test.sh 3>&1' "
+    entrypoint: "sh -c '/usr/local/omni-executor-cli/ts_client_sdk_test.sh 3>&1' "
     restart: "no"
 networks:
   litentry-test-network:

tee-worker/omni-executor/docker/submit-user-op-tests.yml

@@ -5,12 +5,12 @@ services:
     volumes:
       - ../ts-tests:/ts-tests
       - ../../client-api:/client-api
-      - ../ts-tests/cli:/usr/local/executor-worker-cli
+      - ../ts-tests/cli:/usr/local/omni-executor-cli
       - shared-data:/shared
     build:
       context: ${PWD}/../../
       dockerfile: tee-worker/omni-executor/Dockerfile
-      target: executor-worker
+      target: omni-executor
     depends_on:
       omni-executor:
         condition: service_healthy
@@ -19,7 +19,7 @@ services:
         condition: service_completed_successfully
     networks:
       - litentry-test-network
-    entrypoint: "sh -c '/usr/local/executor-worker-cli/ts_submit_user_op_test.sh 3>&1' "
+    entrypoint: "sh -c '/usr/local/omni-executor-cli/ts_submit_user_op_test.sh 3>&1' "
     restart: "no"
 volumes:
   shared-data: