diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b839a3ede..50b216626d 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/tee-worker/omni-executor/Cargo.lock b/tee-worker/omni-executor/Cargo.lock index 3dce5c46ee..108772ccf8 100644 --- a/tee-worker/omni-executor/Cargo.lock +++ b/tee-worker/omni-executor/Cargo.lock @@ -2027,9 +2027,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" dependencies = [ "serde", ] @@ -2122,9 +2122,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.45" +version = "1.2.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" +checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36" dependencies = [ "find-msvc-tools", "jobserver", @@ -3856,44 +3856,6 @@ dependencies = [ "sha3", ] -[[package]] -name = "executor-worker" -version = "0.1.0" -dependencies = [ - "alloy", - "clap", - "cross-chain-intent-executor", - "ethers", - "hex", - "jsonrpsee", - "metrics-exporter-prometheus", - "mock-server", - "oe-client-aa", - "oe-client-accounting", - "oe-client-binance", - "oe-client-ethereum", - "oe-client-pumpx", - "oe-client-signer", - "oe-client-solana", - "oe-client-wildmeta", - "oe-core", - "oe-crypto", - "oe-primitives", - "oe-storage", - "rand 0.8.5", - "rpc-server", - "rsa", - "rust_decimal", - "scale-encode", - "serde", - "serde_json", - "sha2 0.10.9", - "tokio", - "tracing", - "tracing-subscriber", - "url", -] - [[package]] name = "expander" version = "2.2.1" @@ -3993,9 +3955,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "five8_const" @@ -6897,6 +6859,44 @@ dependencies = [ "uuid 1.18.1", ] +[[package]] +name = "omni-executor" +version = "0.1.0" +dependencies = [ + "alloy", + "clap", + "cross-chain-intent-executor", + "ethers", + "hex", + "jsonrpsee", + "metrics-exporter-prometheus", + "mock-server", + "oe-client-aa", + "oe-client-accounting", + "oe-client-binance", + "oe-client-ethereum", + "oe-client-pumpx", + "oe-client-signer", + "oe-client-solana", + "oe-client-wildmeta", + "oe-core", + "oe-crypto", + "oe-primitives", + "oe-storage", + "rand 0.8.5", + "rpc-server", + "rsa", + "rust_decimal", + "scale-encode", + "serde", + "serde_json", + "sha2 0.10.9", + "tokio", + "tracing", + "tracing-subscriber", + "url", +] + [[package]] name = "once_cell" version = "1.21.3" diff --git a/tee-worker/omni-executor/Dockerfile b/tee-worker/omni-executor/Dockerfile index 6dfdab9cf5..3a0868cf69 100644 --- a/tee-worker/omni-executor/Dockerfile +++ b/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) diff --git a/tee-worker/omni-executor/Dockerfile.local b/tee-worker/omni-executor/Dockerfile.local index 61139ae9a0..af454181b7 100644 --- a/tee-worker/omni-executor/Dockerfile.local +++ b/tee-worker/omni-executor/Dockerfile.local @@ -2,7 +2,7 @@ ### 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 @@ -10,11 +10,11 @@ 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"] \ No newline at end of file +CMD ["omni-executor"] \ No newline at end of file diff --git a/tee-worker/omni-executor/LOCAL_DEV.md b/tee-worker/omni-executor/LOCAL_DEV.md index cc4ad9bceb..f81da3de6c 100644 --- a/tee-worker/omni-executor/LOCAL_DEV.md +++ b/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 diff --git a/tee-worker/omni-executor/Makefile b/tee-worker/omni-executor/Makefile index 4c7737d4ec..fd6243a86d 100644 --- a/tee-worker/omni-executor/Makefile +++ b/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: diff --git a/tee-worker/omni-executor/bin/Cargo.toml b/tee-worker/omni-executor/bin/Cargo.toml index b84c47f77f..dacf93ad07 100644 --- a/tee-worker/omni-executor/bin/Cargo.toml +++ b/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 '] edition.workspace = true diff --git a/tee-worker/omni-executor/docker/docker-compose.test.yml b/tee-worker/omni-executor/docker/docker-compose.test.yml index e7b577cc26..cf2fbbda31 100644 --- a/tee-worker/omni-executor/docker/docker-compose.test.yml +++ b/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" diff --git a/tee-worker/omni-executor/docker/docker-compose.yml b/tee-worker/omni-executor/docker/docker-compose.yml index 2756c133d9..908f90a29c 100644 --- a/tee-worker/omni-executor/docker/docker-compose.yml +++ b/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: diff --git a/tee-worker/omni-executor/docker/jsonrpc-mock-tests.yml b/tee-worker/omni-executor/docker/jsonrpc-mock-tests.yml index 1bab9360aa..b3cada7e2d 100644 --- a/tee-worker/omni-executor/docker/jsonrpc-mock-tests.yml +++ b/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: diff --git a/tee-worker/omni-executor/docker/omni-account-test.yml b/tee-worker/omni-executor/docker/omni-account-test.yml index 81dcc2968d..38a2b388e6 100644 --- a/tee-worker/omni-executor/docker/omni-account-test.yml +++ b/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: diff --git a/tee-worker/omni-executor/docker/omni-client-sdk-test.yml b/tee-worker/omni-executor/docker/omni-client-sdk-test.yml index cb0f58758f..30b27513c3 100644 --- a/tee-worker/omni-executor/docker/omni-client-sdk-test.yml +++ b/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: diff --git a/tee-worker/omni-executor/docker/submit-user-op-tests.yml b/tee-worker/omni-executor/docker/submit-user-op-tests.yml index ea81611557..a27b63aa73 100644 --- a/tee-worker/omni-executor/docker/submit-user-op-tests.yml +++ b/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: