From 64b5cd6796fe7a7d7b2f17329fa193aea85d47f2 Mon Sep 17 00:00:00 2001 From: DanL0 Date: Wed, 8 Jan 2025 14:22:00 +0100 Subject: [PATCH] remove aptos and ton dockers --- .../workflows/reusable-publish-docker.yaml | 134 ----------- .github/workflows/reusable-test.yaml | 2 - Dockerfile | 220 +----------------- docker-compose.local.yaml | 7 - docker-compose.templates.yaml | 30 +-- docker-compose.yaml | 25 -- package.json | 2 +- packages/toolbox-foundry/src/forge-std | 2 +- 8 files changed, 9 insertions(+), 413 deletions(-) diff --git a/.github/workflows/reusable-publish-docker.yaml b/.github/workflows/reusable-publish-docker.yaml index ea8c9aea0..2704ad895 100644 --- a/.github/workflows/reusable-publish-docker.yaml +++ b/.github/workflows/reusable-publish-docker.yaml @@ -50,47 +50,6 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # - # Build the Aptos node image and push it as digests - # - # We build the node images after we're done with the base so that we can use the docker layer cache - # instead of rebuilding the whole thing from scratch - # - build-node-aptos: - name: Build Aptos node image - runs-on: ubuntu-latest-16xlarge - needs: - - build-base - - permissions: - contents: read - packages: write - - strategy: - fail-fast: false - matrix: - platform: - - linux/amd64 - - linux/arm64 - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Build image & push the digest - uses: ./.github/workflows/actions/docker-build-image - with: - # The name of the image - image: devtools-dev-node-aptos-local-testnet - # The target stage of the Dockerfile - target: node-aptos-local-testnet - # Since the digests will be shared across jobs as artifacts, - # we need a unique name (per workflow) for these artifacts - digest-name: node-aptos-local-testnet - platform: ${{ matrix.platform }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - # # Build the EVM node image and push it as digests # @@ -173,47 +132,6 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # - # Build the TON node image and push it as digests - # - # We build the node images after we're done with the base so that we can use the docker layer cache - # instead of rebuilding the whole thing from scratch - # - build-node-ton: - name: Build TON node image - runs-on: ubuntu-latest-16xlarge - needs: - - build-base - - permissions: - contents: read - packages: write - - strategy: - fail-fast: false - matrix: - platform: - - linux/amd64 - - linux/arm64 - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Build image & push the digest - uses: ./.github/workflows/actions/docker-build-image - with: - # The name of the image - image: devtools-dev-node-ton-my-local-ton - # The target stage of the Dockerfile - target: node-ton-my-local-ton - # Since the digests will be shared across jobs as artifacts, - # we need a unique name (per workflow) for these artifacts - digest-name: node-ton-my-local-ton - platform: ${{ matrix.platform }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - # # Collect the base image digests and push them to GHCR # @@ -240,32 +158,6 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # - # Collect the Aptos node image digests and push them to GHCR - # - push-node-aptos: - name: Push Aptos node image - runs-on: ubuntu-latest-4xlarge - needs: - - build-node-aptos - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Push image - uses: ./.github/workflows/actions/docker-push-image - with: - # The name of the image - image: devtools-dev-node-aptos-local-testnet - # Since the digests will be shared across jobs as artifacts, - # we need a unique name (per workflow) for these artifacts - # - # This needs to match the digest name of the build stage - digest-name: node-aptos-local-testnet - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - # # Collect the EVM node image digests and push them to GHCR # @@ -317,29 +209,3 @@ jobs: digest-name: node-solana-test-validator username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - # - # Collect the TON node image digests and push them to GHCR - # - push-node-ton: - name: Push TON node image - runs-on: ubuntu-latest-4xlarge - needs: - - build-node-ton - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Push image - uses: ./.github/workflows/actions/docker-push-image - with: - # The name of the image - image: devtools-dev-node-ton-my-local-ton - # Since the digests will be shared across jobs as artifacts, - # we need a unique name (per workflow) for these artifacts - # - # This needs to match the digest name of the build stage - digest-name: node-ton-my-local-ton - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/reusable-test.yaml b/.github/workflows/reusable-test.yaml index 0420c50f7..755c7312c 100644 --- a/.github/workflows/reusable-test.yaml +++ b/.github/workflows/reusable-test.yaml @@ -86,8 +86,6 @@ jobs: DEVTOOLS_BASE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-base:main # And the prebuilt hardhat EVM node image DEVTOOLS_EVM_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-evm-hardhat:main - # And the prebuilt TON node image - DEVTOOLS_TON_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-ton-my-local-ton:main # Provided we have good quality Solana RPCs, we can enable Solana tests # # FIXME The Solana tests need to be ported to either use a stable deployment diff --git a/Dockerfile b/Dockerfile index 05b5d8b9f..374dc4bcc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,12 +26,6 @@ ARG NODE_VERSION=20.10.0 # e.g. ghcr.io/layerzero-labs/devtools-dev-base:main ARG BASE_IMAGE=base -# We will provide a way for consumers to override the default Aptos node image -# -# This will allow CI environments to supply the prebuilt EVM node image -# while not breaking the flow for local development -ARG APTOS_NODE_IMAGE=node-aptos-local-testnet - # We will provide a way for consumers to override the default EVM node image # # This will allow CI environments to supply the prebuilt EVM node image @@ -44,12 +38,6 @@ ARG EVM_NODE_IMAGE=node-evm-hardhat # while not breaking the flow for local development ARG SOLANA_NODE_IMAGE=node-solana-test-validator -# We will provide a way for consumers to override the default TON node image -# -# This will allow CI environments to supply the prebuilt TON node image -# while not breaking the flow for local development -ARG TON_NODE_IMAGE=node-ton-my-local-ton - # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' @@ -78,62 +66,15 @@ RUN apt-get install --yes \ # Parallel is a utilit we use to parallelize the BATS (user) tests parallel \ # Utilities required to build solana - pkg-config libudev-dev llvm libclang-dev protobuf-compiler \ - # Utilities required to build aptos CLI - libssl-dev libdw-dev lld \ - # Required for TON to run - libatomic1 libssl-dev + pkg-config libudev-dev llvm libclang-dev protobuf-compiler # Install rust -ARG RUST_TOOLCHAIN_VERSION=1.83.0 +ARG RUST_TOOLCHAIN_VERSION=1.75.0 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${RUST_TOOLCHAIN_VERSION} # Install docker RUN curl -sSL https://get.docker.com/ | sh -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -# -# Image that builds Aptos developer tooling -# -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -FROM machine AS aptos - -WORKDIR /app/aptos - -ARG APTOS_VERSION=4.2.3 -RUN \ - (\ - # We download the source code and extract the archive - curl -s -L https://github.com/aptos-labs/aptos-core/archive/refs/tags/aptos-cli-v${APTOS_VERSION}.tar.gz | tar -xz && \ - # Then rename the directory just for convenience - mv ./aptos-core-aptos-cli-v${APTOS_VERSION} ./src \ - ) - -# Switch to the project -WORKDIR /app/aptos/src - -# Configure cargo. We want to provide a way of limiting cargo resources -# on the github runner since it is not large enough to support multiple cargo builds -ARG CARGO_BUILD_JOBS=default -ENV CARGO_BUILD_JOBS=$CARGO_BUILD_JOBS - -# Install aptos from source -RUN cargo build --package aptos --profile cli - -# Copy the build artifacts -RUN mkdir -p /root/.aptos/bin/ && cp -R ./target/cli/aptos /root/.aptos/bin/ - -# Delete the source files -RUN rm -rf /app/aptos/aptos-core - -# Make sure we can execute the binary -ENV PATH="/root/.aptos/bin:$PATH" -RUN aptos --version - # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' @@ -153,7 +94,7 @@ ARG CARGO_BUILD_JOBS=default ENV CARGO_BUILD_JOBS=$CARGO_BUILD_JOBS # Install AVM - Anchor version manager for Solana -RUN cargo install --git https://github.com/coral-xyz/anchor avm --tag v0.30.1 +RUN cargo install --git https://github.com/coral-xyz/anchor avm --tag v0.29.0 # Install anchor ARG ANCHOR_VERSION=0.29.0 @@ -207,35 +148,6 @@ RUN \ ENV PATH="/root/.solana/bin:$PATH" RUN solana --version -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -# -# Image that builds TON developer tooling -# -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -FROM machine AS ton - -WORKDIR /app/ton - -RUN apt-get install -y \ - curl \ - unzip - -RUN <<-EOF - case "$(uname -m)" in - aarch64) TON_ARCH="arm64" ;; - x86_64) TON_ARCH="x86_64" ;; - *) exit 1 ;; - esac - - curl -sSLf https://github.com/ton-blockchain/ton/releases/latest/download/ton-linux-${TON_ARCH}.zip > ton.zip - unzip -qq -d bin ton - chmod a+x bin/* -EOF - # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' @@ -285,11 +197,7 @@ WORKDIR /app # We'll add an empty NPM_TOKEN to suppress any warnings ENV NPM_TOKEN= ENV NPM_CONFIG_STORE_DIR=/pnpm -ENV TON_PATH="/root/.ton/bin" -ENV PATH="/root/.aptos/bin:/root/.avm/bin:/root/.foundry/bin:/root/.solana/bin:$TON_PATH:$PATH" - -# Get aptos CLI -COPY --from=aptos /root/.aptos/bin /root/.aptos/bin +ENV PATH="/root/.avm/bin:/root/.foundry/bin:/root/.solana/bin:$PATH" # Get solana tooling COPY --from=avm /root/.cargo/bin/anchor /root/.cargo/bin/anchor @@ -297,9 +205,6 @@ COPY --from=avm /root/.cargo/bin/avm /root/.cargo/bin/avm COPY --from=avm /root/.avm /root/.avm COPY --from=solana /root/.solana/bin /root/.solana/bin -# Get TON tooling -COPY --from=ton /app/ton/bin /root/.ton/bin - # Get EVM tooling COPY --from=evm /root/.cargo/bin/solc /root/.cargo/bin/solc COPY --from=evm /root/.cargo/bin/svm /root/.cargo/bin/svm @@ -317,14 +222,12 @@ RUN pnpm --version RUN git --version RUN anchor --version RUN avm --version -RUN aptos --version RUN forge --version RUN anvil --version RUN chisel --version RUN cast --version RUN solc --version RUN solana --version -RUN func -V RUN docker compose version # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- @@ -359,34 +262,6 @@ RUN \ # Install dependencies (fail if we forgot to update the lockfile) pnpm install --recursive --offline --frozen-lockfile -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -# -# Image that builds an Aptos node -# -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -FROM machine AS node-aptos-local-testnet - -ENV PATH="/root/.aptos/bin:$PATH" - -# Get aptos CLI -COPY --from=aptos /root/.aptos/bin /root/.aptos/bin - -# We'll provide a default healthcheck by asking for the chain information -HEALTHCHECK --interval=2s --retries=20 CMD curl -f http://0.0.0.0:8080/v1 || exit 1 - -# By default, Aptos exposes the following ports: -# -# Node API 8080 -# Transaction stream 50051 -# Faucet is ready 8081 -ENTRYPOINT aptos - -CMD ["node", "run-local-testnet", "--force-restart", "--assume-yes"] - # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' @@ -434,10 +309,10 @@ COPY --from=node-evm-hardhat-builder /build /app # See more here https://nodejs.org/api/corepack.html RUN corepack enable -# We want to keep the internals of the EVM node images encapsulated so we supply the healthcheckk as a part of the definition +# We want to keep the internals of the EVM node images encapsulated so we supply the healthcheck as a part of the definition HEALTHCHECK --interval=2s --retries=20 CMD curl -f http://0.0.0.0:8545 || exit 1 -# Run the shit +# Run ENTRYPOINT pnpm start # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- @@ -451,67 +326,6 @@ ENTRYPOINT pnpm start # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' FROM $EVM_NODE_IMAGE AS node-evm -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -# -# Image that builds a MyLocalTON TON node -# -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -FROM ubuntu:24.04 AS node-ton-my-local-ton - -ENV PYTHONUNBUFFERED=1 - -WORKDIR /app - -# Update system packages -RUN apt-get update -RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install --yes \ - curl \ - # Java - openjdk-17-jdk \ - # Python - python3-pip \ - # Build tools - # - # gcc-13 and gcc-13-aarch64-linux-gnu are required for the arm64 platform - # since without them glibc version incompatibility will prevent ton-http-api from running - gcc-13 gcc-13-aarch64-linux-gnu libc6 libc6-dev \ - # TON complains about not having this - lsb-release tzdata - - -# Install Ton HTTP API -# -# Ubuntu 24 introduced a preventive measure that prevents installation of -# system wide pip packages. Unfortunately no workarounds (apt-get install python3-ton-http-api; pipx install ton-http-api) -# seem to be working in this case so we'll just add --break-system-packages and hope for the best -RUN pip install --user --break-system-packages ton-http-api - -# Download MyLocalTon -# -# The TON jars are separated by architecture, currently there is the x86-64 one and the arm64 one -# but unfortunately the release URLs don't match the output from uname so we need to do a bit of plumbing -# -# TODO We might need to use the testnet version (not sure whether the mainnet one allows us to fund accounts) -RUN <<-EOF - case "$(uname -m)" in - aarch64) TON_ARCH="arm64" ;; - x86_64) TON_ARCH="x86-64" ;; - *) exit 1 ;; - esac - - curl -sLf https://github.com/neodix42/MyLocalTon/releases/download/v120/MyLocalTon-${TON_ARCH}.jar --output MyLocalTon.jar -EOF - -# We want to keep the internals of the EVM node images encapsulated so we supply the healthcheckk as a part of the definition -HEALTHCHECK --start-period=30s --interval=5s --retries=30 CMD curl -sSf http://127.0.0.1:8081 - -# Run the shit -ENTRYPOINT ["java", "-jar", "MyLocalTon.jar", "nogui", "ton-http-api"] - # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' @@ -538,17 +352,6 @@ RUN solana-test-validator --version # WebSocket: 8900 ENTRYPOINT ["solana-test-validator"] -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -# -# Image that runs an Aptos node -# -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -FROM $APTOS_NODE_IMAGE AS node-aptos - # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' @@ -560,17 +363,6 @@ FROM $APTOS_NODE_IMAGE AS node-aptos # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' FROM $SOLANA_NODE_IMAGE AS node-solana -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -# -# Image that runs a TON node -# -# .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- -# / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ -# `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' -FROM $TON_NODE_IMAGE AS node-ton - # .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.-. .-.- # / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ \ / / \ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' diff --git a/docker-compose.local.yaml b/docker-compose.local.yaml index cf499e987..7b893f10a 100644 --- a/docker-compose.local.yaml +++ b/docker-compose.local.yaml @@ -14,13 +14,6 @@ services: # Expose nodes on host ports # # .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo. - network-aptos: - ports: - # The Node API - - "10004:8080" - # The faucet API - - "10005:8081" - network-vengaboys: ports: - "10001:8545" diff --git a/docker-compose.templates.yaml b/docker-compose.templates.yaml index 2a0843971..60cc5b452 100644 --- a/docker-compose.templates.yaml +++ b/docker-compose.templates.yaml @@ -33,20 +33,6 @@ services: max-size: "5m" compress: "false" - # Aptos node for testing purposes - aptos-node: - build: - dockerfile: Dockerfile - target: node-aptos - args: - APTOS_NODE_IMAGE: ${DEVTOOLS_APTOS_NODE_IMAGE:-node-aptos-local-testnet} - - logging: - driver: local - options: - max-size: "5m" - compress: "false" - # EVM node for testing purposes evm-node: extends: @@ -54,18 +40,4 @@ services: build: target: node-evm args: - EVM_NODE_IMAGE: ${DEVTOOLS_EVM_NODE_IMAGE:-node-evm-hardhat} - - # TON node for testing purposes - ton-node: - build: - dockerfile: Dockerfile - target: node-ton - args: - TON_NODE_IMAGE: ${DEVTOOLS_TON_NODE_IMAGE:-node-ton-my-local-ton} - - logging: - driver: local - options: - max-size: "5m" - compress: "false" + EVM_NODE_IMAGE: ${DEVTOOLS_EVM_NODE_IMAGE:-node-evm-hardhat} \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index a930dbfd5..883117a98 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -9,18 +9,6 @@ # `-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' `-`-' services: - # ~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~ - # - # The Aptos local node - # - # .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo. - # TODO This node is not yet made a dependency of the tests container - # since we don't have any tests running against Aptos - network-aptos: - extends: - file: docker-compose.templates.yaml - service: aptos-node - # ~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~ # # EVM Network nodes, one for every hardhat network @@ -41,16 +29,6 @@ services: file: docker-compose.templates.yaml service: evm-node - # ~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~ - # - # The TON local node - # - # .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo. - network-ton: - extends: - file: docker-compose.templates.yaml - service: ton-node - # ~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~ # # The actual tests @@ -67,8 +45,6 @@ services: condition: service_healthy network-tango: condition: service_healthy - network-ton: - condition: service_healthy logging: driver: none # The default containerized setup will specify the network URLs @@ -84,7 +60,6 @@ services: - NETWORK_URL_BRITNEY=http://network-britney:8545 - NETWORK_URL_VENGABOYS=http://network-vengaboys:8545 - NETWORK_URL_TANGO=http://network-tango:8545 - - NETWORK_URL_TON=http://network-ton:8081/jsonRPC - DOCKER_COMPOSE_RUN_TESTS_TURBO_ARGS=$DOCKER_COMPOSE_RUN_TESTS_TURBO_ARGS # Passing environment variables that control the solana tests - RPC_URL_SOLANA_MAINNET=${RPC_URL_SOLANA_MAINNET} diff --git a/package.json b/package.json index 54bf2c186..9186ea709 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "registry:stop": "docker compose -f docker-compose.registry.yaml down", "release:publish": "$npm_execpath changeset publish", "release:version": "$npm_execpath changeset version && $npm_execpath install --lockfile-only --prefer-offline --ignore-scripts", - "start": "docker compose -f docker-compose.yaml -f docker-compose.local.yaml up network-britney network-vengaboys network-tango network-ton --wait $DOCKER_COMPOSE_ARGS", + "start": "docker compose -f docker-compose.yaml -f docker-compose.local.yaml up network-britney network-vengaboys network-tango --wait $DOCKER_COMPOSE_ARGS", "stop": "docker compose down", "test": "$npm_execpath turbo run test $DOCKER_COMPOSE_RUN_TESTS_TURBO_ARGS", "test:ci": "docker compose run --build --rm $DOCKER_COMPOSE_ARGS tests", diff --git a/packages/toolbox-foundry/src/forge-std b/packages/toolbox-foundry/src/forge-std index 051fb65fc..ae570fec0 160000 --- a/packages/toolbox-foundry/src/forge-std +++ b/packages/toolbox-foundry/src/forge-std @@ -1 +1 @@ -Subproject commit 051fb65fc46013dff64e46ca410445d63ea5620a +Subproject commit ae570fec082bfe1c1f45b0acca4a2b4f84d345ce