From 1e8e40b9ba89094dfaca8e95fb1ad7dc692a0013 Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Fri, 29 Mar 2024 16:53:23 -0700 Subject: [PATCH 01/10] Updating env images for v0.11.0 --- env/env.images | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/env/env.images b/env/env.images index 73b66d2..ad40199 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:0.11.0 +TESTNET_IMAGE=ghcr.io/delvtech/hyperdrive/testnet:0.11.0 # 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:edge # Frontend FRONTEND_IMAGE=ghcr.io/delvtech/hyperdrive-frontend/hyperdrive-frontend:0.18.1 From 7e825a049b2c198b80fbdf98e7eae82dcc375ce8 Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Mon, 8 Apr 2024 13:36:45 -0700 Subject: [PATCH 02/10] Adding fuzz and checkpoint containers for steth --- docker-compose.anvil.yaml | 12 ++++++++++-- docker-compose.fuzz-bot.yaml | 31 +++++++++++++++++++++++++++---- test/test_compose.sh | 10 ++++++++-- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/docker-compose.anvil.yaml b/docker-compose.anvil.yaml index f1376e0..bc198f8 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" + env_file: + - .env + + checkpoint-bot-steth: + image: ${AGENT0_IMAGE} + command: | + /bin/sh -c "sleep 1; python scripts/checkpoint_bot.py --pool steth_hyperdrive" env_file: - .env diff --git a/docker-compose.fuzz-bot.yaml b/docker-compose.fuzz-bot.yaml index 04cad63..6dda325 100644 --- a/docker-compose.fuzz-bot.yaml +++ b/docker-compose.fuzz-bot.yaml @@ -1,22 +1,45 @@ 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-invariant-check-erc4626: image: ${AGENT0_IMAGE} profiles: - "fuzz" working_dir: /app/ - command: /bin/sh -c "python scripts/fuzz_bot_invariant_checks.py" + command: /bin/sh -c "python scripts/fuzz_bot_invariant_checks.py --pool erc4626_hyperdrive" + env_file: + - .env + volumes: + - .crash_report:/app/.crash_report + + fuzz-steth: + image: ${AGENT0_IMAGE} + profiles: + - "fuzz" + working_dir: /app/ + 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-steth: + image: ${AGENT0_IMAGE} + profiles: + - "fuzz" + working_dir: /app/ + command: /bin/sh -c "python scripts/fuzz_bot_invariant_checks.py --pool steth_hyperdrive" env_file: - .env volumes: 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 From 7689a21248ab26d7b0d9038d7c8125c18dad4cfe Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Mon, 8 Apr 2024 16:52:36 -0700 Subject: [PATCH 03/10] Adding sleep to fuzz bots invariant check --- docker-compose.fuzz-bot.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docker-compose.fuzz-bot.yaml b/docker-compose.fuzz-bot.yaml index 6dda325..5027cd9 100644 --- a/docker-compose.fuzz-bot.yaml +++ b/docker-compose.fuzz-bot.yaml @@ -12,34 +12,35 @@ services: volumes: - .crash_report:/app/.crash_report - fuzz-invariant-check-erc4626: + fuzz-steth: image: ${AGENT0_IMAGE} profiles: - "fuzz" working_dir: /app/ - command: /bin/sh -c "python scripts/fuzz_bot_invariant_checks.py --pool erc4626_hyperdrive" + command: /bin/sh -c "DEVELOP=true python scripts/fuzz_bots.py --pool steth_hyperdrive" env_file: - .env volumes: - .crash_report:/app/.crash_report - fuzz-steth: + fuzz-invariant-check-erc4626: image: ${AGENT0_IMAGE} profiles: - "fuzz" working_dir: /app/ - command: /bin/sh -c "DEVELOP=true python scripts/fuzz_bots.py --pool steth_hyperdrive" + 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 "python scripts/fuzz_bot_invariant_checks.py --pool steth_hyperdrive" + command: /bin/sh -c "sleep 1; python scripts/fuzz_bot_invariant_checks.py --pool steth_hyperdrive" env_file: - .env volumes: From 4207a79060a18cc2b1e6fa9582c35fd766e85cf7 Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Mon, 8 Apr 2024 17:25:21 -0700 Subject: [PATCH 04/10] Bumping hyperdrive to v0.13.0 --- env/env.images | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env/env.images b/env/env.images index ad40199..0efe603 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.11.0 -TESTNET_IMAGE=ghcr.io/delvtech/hyperdrive/testnet:0.11.0 +DEVNET_IMAGE=ghcr.io/delvtech/hyperdrive/devnet:0.13.0 +TESTNET_IMAGE=ghcr.io/delvtech/hyperdrive/testnet:0.13.0 # Infra ARTIFACTS_IMAGE=ghcr.io/delvtech/infra/artifacts:0.0.8 From 7eae3c71125da0f3e27f370c7ab00a06380ec9b9 Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Tue, 9 Apr 2024 10:05:14 -0700 Subject: [PATCH 05/10] Bumping images to 1.0.0 --- env/env.images | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env/env.images b/env/env.images index 0efe603..9d24100 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.13.0 -TESTNET_IMAGE=ghcr.io/delvtech/hyperdrive/testnet:0.13.0 +DEVNET_IMAGE=ghcr.io/delvtech/hyperdrive/devnet:1.0.0 +TESTNET_IMAGE=ghcr.io/delvtech/hyperdrive/testnet:1.0.0 # Infra ARTIFACTS_IMAGE=ghcr.io/delvtech/infra/artifacts:0.0.8 From db47cde3fcbf8bc409c50bef0df0ed32c18396c9 Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Tue, 9 Apr 2024 13:15:40 -0700 Subject: [PATCH 06/10] Setting fund flag for checkpoint bot in infra --- docker-compose.anvil.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.anvil.yaml b/docker-compose.anvil.yaml index bc198f8..c40ed28 100644 --- a/docker-compose.anvil.yaml +++ b/docker-compose.anvil.yaml @@ -45,14 +45,14 @@ services: checkpoint-bot-erc4626: image: ${AGENT0_IMAGE} command: | - /bin/sh -c "sleep 1; python scripts/checkpoint_bot.py --pool erc4626_hyperdrive" + /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" + /bin/sh -c "sleep 1; python scripts/checkpoint_bot.py --pool steth_hyperdrive --fund" env_file: - .env From 622c746708922ce2bc30a97671d8ba782f21c20d Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Mon, 15 Apr 2024 11:31:00 -0700 Subject: [PATCH 07/10] Setting agent0 version --- env/env.images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/env.images b/env/env.images index 9d24100..d65926f 100644 --- a/env/env.images +++ b/env/env.images @@ -15,7 +15,7 @@ RATE_BOT_IMAGE=ghcr.io/delvtech/infra/rate-bot:0.0.8 # Agent0 (bots) # TODO cut release and set here -AGENT0_IMAGE=ghcr.io/delvtech/agent0/agent0:edge +AGENT0_IMAGE=ghcr.io/delvtech/agent0/agent0:0.18.0 # Frontend FRONTEND_IMAGE=ghcr.io/delvtech/hyperdrive-frontend/hyperdrive-frontend:0.18.1 From 6a2586c2960f44a20ef390c42015fa7d8db18627 Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Tue, 16 Apr 2024 17:41:45 -0700 Subject: [PATCH 08/10] Version bumps --- env/env.images | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/env/env.images b/env/env.images index d65926f..60c0bae 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:1.0.0 -TESTNET_IMAGE=ghcr.io/delvtech/hyperdrive/testnet:1.0.0 +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 @@ -15,7 +15,7 @@ RATE_BOT_IMAGE=ghcr.io/delvtech/infra/rate-bot:0.0.8 # Agent0 (bots) # TODO cut release and set here -AGENT0_IMAGE=ghcr.io/delvtech/agent0/agent0:0.18.0 +AGENT0_IMAGE=ghcr.io/delvtech/agent0/agent0:0.18.1 # Frontend FRONTEND_IMAGE=ghcr.io/delvtech/hyperdrive-frontend/hyperdrive-frontend:0.18.1 From 7c6817de8d076fc199a4de09daeeadacd05c055f Mon Sep 17 00:00:00 2001 From: Sheng Lundquist Date: Tue, 16 Apr 2024 17:45:18 -0700 Subject: [PATCH 09/10] Bumping frontend version --- env/env.images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/env.images b/env/env.images index 60c0bae..ae2a50a 100644 --- a/env/env.images +++ b/env/env.images @@ -18,4 +18,4 @@ RATE_BOT_IMAGE=ghcr.io/delvtech/infra/rate-bot:0.0.8 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.6 From 784fcc64166bfb5cb33dd1aac7e59cfc872b34c3 Mon Sep 17 00:00:00 2001 From: Ryan Goree Date: Wed, 17 Apr 2024 08:52:22 -0500 Subject: [PATCH 10/10] Update FE tag and env --- docker-compose.frontend.yaml | 3 ++- env/env.frontend | 10 ++++++---- env/env.images | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) 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/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 ae2a50a..566ed3d 100644 --- a/env/env.images +++ b/env/env.images @@ -18,4 +18,4 @@ RATE_BOT_IMAGE=ghcr.io/delvtech/infra/rate-bot:0.0.8 AGENT0_IMAGE=ghcr.io/delvtech/agent0/agent0:0.18.1 # Frontend -FRONTEND_IMAGE=ghcr.io/delvtech/hyperdrive-frontend/hyperdrive-frontend:1.0.6 +FRONTEND_IMAGE=ghcr.io/delvtech/hyperdrive-frontend/hyperdrive-frontend:1.0.7