diff --git a/docker-compose.anvil.yaml b/docker-compose.anvil.yaml index f1376e0..c40ed28 100644 --- a/docker-compose.anvil.yaml +++ b/docker-compose.anvil.yaml @@ -41,10 +41,18 @@ services: volumes: - artifacts:/var/www/artifacts/ - checkpoint-bot: + # TODO make single container for all pools + checkpoint-bot-erc4626: image: ${AGENT0_IMAGE} command: | - /bin/sh -c "sleep 1; python scripts/checkpoint_bot.py" + /bin/sh -c "sleep 1; python scripts/checkpoint_bot.py --pool erc4626_hyperdrive --fund" + env_file: + - .env + + checkpoint-bot-steth: + image: ${AGENT0_IMAGE} + command: | + /bin/sh -c "sleep 1; python scripts/checkpoint_bot.py --pool steth_hyperdrive --fund" env_file: - .env diff --git a/docker-compose.frontend.yaml b/docker-compose.frontend.yaml index ee748eb..a15d627 100644 --- a/docker-compose.frontend.yaml +++ b/docker-compose.frontend.yaml @@ -9,6 +9,7 @@ services: - VITE_CUSTOM_CHAIN_NODE_RPC_URL=${UI_RPC_URL} - VITE_CUSTOM_CHAIN_ADDRESSES_URL=${UI_ADDRESSES_URL} - VITE_CUSTOM_CHAIN_CHAIN_ID=${UI_CHAIN_ID} - - VITE_ALCHEMY_GOERLI_RPC_KEY=${UI_ALCHEMY_GOERLI_RPC_KEY} - VITE_WALLET_CONNECT_PROJECT_ID=${UI_WALLET_CONNECT_PROJECT_ID} + - VITE_CAPSULE_API_KEY=${UI_CAPSULE_API_KEY} + - VITE_CAPSULE_ENV=${UI_CAPSULE_ENV} command: "yarn workspace hyperdrive-trading dev --host 0.0.0.0" diff --git a/docker-compose.fuzz-bot.yaml b/docker-compose.fuzz-bot.yaml index 04cad63..5027cd9 100644 --- a/docker-compose.fuzz-bot.yaml +++ b/docker-compose.fuzz-bot.yaml @@ -1,22 +1,46 @@ version: "3.9" services: - fuzz: + # TODO make single container for all pools + fuzz-erc4626: image: ${AGENT0_IMAGE} profiles: - "fuzz" working_dir: /app/ - command: /bin/sh -c "DEVELOP=true python scripts/fuzz_bots.py" + command: /bin/sh -c "DEVELOP=true python scripts/fuzz_bots.py --pool erc4626_hyperdrive" env_file: - .env volumes: - .crash_report:/app/.crash_report - fuzz-invariant-check: + fuzz-steth: image: ${AGENT0_IMAGE} profiles: - "fuzz" working_dir: /app/ - command: /bin/sh -c "python scripts/fuzz_bot_invariant_checks.py" + command: /bin/sh -c "DEVELOP=true python scripts/fuzz_bots.py --pool steth_hyperdrive" + env_file: + - .env + volumes: + - .crash_report:/app/.crash_report + + fuzz-invariant-check-erc4626: + image: ${AGENT0_IMAGE} + profiles: + - "fuzz" + working_dir: /app/ + command: /bin/sh -c "sleep 1; python scripts/fuzz_bot_invariant_checks.py --pool erc4626_hyperdrive" + env_file: + - .env + volumes: + - .crash_report:/app/.crash_report + + + fuzz-invariant-check-steth: + image: ${AGENT0_IMAGE} + profiles: + - "fuzz" + working_dir: /app/ + command: /bin/sh -c "sleep 1; python scripts/fuzz_bot_invariant_checks.py --pool steth_hyperdrive" env_file: - .env volumes: diff --git a/env/env.frontend b/env/env.frontend index 9267a87..1153c8b 100644 --- a/env/env.frontend +++ b/env/env.frontend @@ -3,8 +3,10 @@ UI_RPC_URL=http://localhost:8545 UI_ADDRESSES_URL=http://localhost:8080 UI_CHAIN_ID=42069 -# Optional API key from Alchemy if using Goerli -UI_ALCHEMY_GOERLI_RPC_KEY= +# Optional WalletConnect integration +UI_WALLET_CONNECT_PROJECT_ID=0 + +# Optional Capsule wallet integration +VITE_CAPSULE_API_KEY= +VITE_CAPSULE_ENV=PROD -# Optional wallet connect project ID to make Wallet Connect work -UI_WALLET_CONNECT_PROJECT_ID= diff --git a/env/env.images b/env/env.images index 73b66d2..566ed3d 100644 --- a/env/env.images +++ b/env/env.images @@ -5,8 +5,8 @@ # - edge = The newest image regardless of stability # Anvil -DEVNET_IMAGE=ghcr.io/delvtech/hyperdrive/devnet:0.10.1 -TESTNET_IMAGE=ghcr.io/delvtech/hyperdrive/testnet:0.10.1 +DEVNET_IMAGE=ghcr.io/delvtech/hyperdrive/devnet:1.0.1 +TESTNET_IMAGE=ghcr.io/delvtech/hyperdrive/testnet:1.0.1 # Infra ARTIFACTS_IMAGE=ghcr.io/delvtech/infra/artifacts:0.0.8 @@ -14,7 +14,8 @@ FUND_ACCOUNTS_IMAGE=ghcr.io/delvtech/infra/fund-accounts:0.0.8 RATE_BOT_IMAGE=ghcr.io/delvtech/infra/rate-bot:0.0.8 # Agent0 (bots) -AGENT0_IMAGE=ghcr.io/delvtech/agent0/agent0:0.17.1 +# TODO cut release and set here +AGENT0_IMAGE=ghcr.io/delvtech/agent0/agent0:0.18.1 # Frontend -FRONTEND_IMAGE=ghcr.io/delvtech/hyperdrive-frontend/hyperdrive-frontend:0.18.1 +FRONTEND_IMAGE=ghcr.io/delvtech/hyperdrive-frontend/hyperdrive-frontend:1.0.7 diff --git a/test/test_compose.sh b/test/test_compose.sh index 3218144..b59cffa 100644 --- a/test/test_compose.sh +++ b/test/test_compose.sh @@ -39,9 +39,15 @@ if [ -z "$(docker compose ps -q artifacts)" ]; then fi # The checkpoint-bot service should be running. -if [ -z "$(docker compose ps -q checkpoint-bot)" ]; then +if [ -z "$(docker compose ps -q checkpoint-bot-erc4626)" ]; then echo "Checkpoint bot service exited unexpectedly:" - docker logs $dirname-checkpoint-bot-1 + docker logs $dirname-checkpoint-bot-erc4626-1 + exit 1 +fi + +if [ -z "$(docker compose ps -q checkpoint-bot-steth)" ]; then + echo "Checkpoint bot service exited unexpectedly:" + docker logs $dirname-checkpoint-bot-steth-1 exit 1 fi