feat: testcontainers integration

.changeset/clever-mails-agree.md

@@ -0,0 +1,6 @@
+---
+'@fuel-bridge/solidity-contracts': minor
+'@fuel-bridge/test-utils': minor
+---
+
+testcontainer integration for all intergration tests

.github/workflows/upgrade-test-suite.yml

@@ -17,6 +17,8 @@ concurrency:
 jobs:
   upgrade-test-suite:
     runs-on: ubuntu-latest
+    env:
+      RPC_URL: ${{ secrets.TENDERLY_RPC_URL }}
     if: github.event_name == 'pull_request'
     steps:
       - uses: actions/checkout@v3
@@ -31,16 +33,6 @@ jobs:
       - uses: ./.github/actions/setup-rust
       - name: Build project
         run: pnpm build
-      - name: Sets the tenderly rpc endpoint in the L1 docker container env and sets forking variable for fuel core setup
-        run: |
-          cat << EOF > l1_chain.env
-          TENDERLY_RPC_URL=${{ secrets.TENDERLY_RPC_URL }}
-          EOF
-
-          cat << EOF > fuel_core.env
-          FORKING=true
-          EOF
-        working-directory: docker/envs
       - name: Run integration tests on a L1 fork after upgrading contracts
         run: |
-          pnpm run test:fork
+          pnpm run test:integration:fork

docker/block-committer/Dockerfile

@@ -17,5 +17,5 @@ ENV PORT="${COMMITER_PORT}"
 EXPOSE ${PORT}
 
 # copy over script and run
-COPY ./block-committer.sh .
+COPY ./docker/block-committer/block-committer.sh .
 ENTRYPOINT ["sh", "./block-committer.sh"]

docker/block-committer/block-committer.sh

@@ -4,7 +4,6 @@ set -euo
 RETRIES=${RETRIES:-60}
 DELAY=${DELAY:-10}
 JSON='{"jsonrpc":"2.0","id":0,"method":"net_version","params":[]}'
-HEALTH_URL=${HEALTH_URL:-"http://fuel_core:4001/v1/health"}
 
 if [ -z "$COMMITTER__ETH__RPC" ]; then
     echo "Must specify \$ETHEREUM_RPC."
@@ -47,12 +46,6 @@ curl \
     -o addresses.json
 echo "Got l1 chain deployment data."
 
-# pull data from deployer dump
-export COMMITTER__ETH__STATE_CONTRACT_ADDRESS=$(cat "./addresses.json" | jq -r .FuelChainState)
-export COMMITTER__APP__DB__USERNAME=${DB__USERNAME}
-export COMMITTER__APP__DB__PASSWORD=${DB__PASSWORD}
-export COMMITTER__ETH__L1_KEYS__MAIN=${COMMITTER__ETH__L1_KEYS__MAIN}
-export COMMITTER__ETH__L1_KEYS__BLOB=${COMMITTER__ETH__L1_KEYS__BLOB}
 echo "COMMITTER__ETH__STATE_CONTRACT_ADDRESS: $COMMITTER__ETH__STATE_CONTRACT_ADDRESS"
 echo "ETHEREUM_RPC: $COMMITTER__ETH__RPC"
 echo "FUEL_GRAPHQL_ENDPOINT: $COMMITTER__FUEL__GRAPHQL_ENDPOINT"