.github/workflows/tests.yaml

@@ -12,9 +12,9 @@ on:
       - ci-test
 
 env:
-  SO_VERSION: roysc/fetch-from-insecure-registry
+  SO_VERSION: v1.1.0-36d4969-202407091537
   FIXTURENET_ETH_STACKS_REF: roysc/set-validator-creds
-  SYSTEM_TESTS_REF: roysc/test-blob-tx
+  SYSTEM_TESTS_REF: roysc/test-withdrawals
 
 jobs:
   test:
@@ -51,15 +51,7 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: apt-get update && apt-get install -y jq
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: 3.11
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
+      - name: Install Python
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
@@ -81,7 +73,6 @@ jobs:
       - name: Run testnet stack
         env:
           CERC_GO_AUTH_TOKEN: ${{ secrets.CICD_REPO_TOKEN }}
-          SKIP_BUILD: fetch
         run: ./scripts/run-test-stack.sh ./fixturenet-eth-stacks/stack-orchestrator/stacks/fixturenet-plugeth
       - name: Run server
         env:
@@ -106,12 +97,12 @@ jobs:
         run: |
           pip install pytest
           pip install -r requirements.txt
-          pytest -vv -m "not blob_data"
+          pytest -vv
 
       - name: Run testnet stack without statediff
         env:
           CERC_RUN_STATEDIFF: false
-          SKIP_BUILD: fetch
+          SKIP_BUILD: 1
         run: ./scripts/run-test-stack.sh ./fixturenet-eth-stacks/stack-orchestrator/stacks/fixturenet-plugeth
       - name: Run server with call forwarding
         env:

pkg/eth/api.go

@@ -660,12 +660,6 @@ func (pea *PublicEthAPI) localGetTransactionReceipt(ctx context.Context, hash co
 	if receipt.Logs == nil {
 		fields["logs"] = []*types.Log{}
 	}
-
-	if tx.Type() == types.BlobTxType {
-		fields["blobGasUsed"] = hexutil.Uint64(receipt.BlobGasUsed)
-		fields["blobGasPrice"] = (*hexutil.Big)(receipt.BlobGasPrice)
-	}
-
 	// If the ContractAddress is 20 0x0 bytes, assume it is not a contract creation
 	if receipt.ContractAddress != (common.Address{}) {
 		fields["contractAddress"] = receipt.ContractAddress

scripts/run-test-stack.sh

@@ -1,22 +1,21 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 stack_dir=$(readlink -f "$1")
 [[ -d "$stack_dir" ]]
 
-laconic_so="laconic-so --verbose --stack $stack_dir"
-
 CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}")
 # By default assume we are running in the project root.
 export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-$(git rev-parse --show-toplevel)/..}"
 
+laconic_so="laconic-so --verbose --stack $stack_dir"
+
 # Don't run geth/plugeth in the debugger, it will swallow error backtraces
 echo CERC_REMOTE_DEBUG=false >> $CONFIG_DIR/stack.env
 # Passing this lets us run eth_call forwarding tests without running ipld-eth-db
 echo CERC_RUN_STATEDIFF=${CERC_RUN_STATEDIFF:-true} >> $CONFIG_DIR/stack.env
 
-set -x
 
 if [[ -z $SKIP_BUILD ]]; then
   # Prevent conflicting tty output
@@ -24,8 +23,6 @@ if [[ -z $SKIP_BUILD ]]; then
 
   $laconic_so setup-repositories
   $laconic_so build-containers
-elif [[ $SKIP_BUILD = fetch ]]; then
-  $laconic_so fetch-containers --image-registry gitea.local:5555
 fi
 
 if ! $laconic_so deploy \
@@ -38,7 +35,7 @@ fi
 
 set +x
 
-# Get IPv4 endpoint of geth bootnode file server
+# Get IPv4 endpoint of geth file server
 bootnode_endpoint=$(docker port test-fixturenet-eth-bootnode-geth-1 9898 | head -1)
 
 # Extract the chain config and ID from genesis file

test/compose-server.yml

@@ -4,8 +4,6 @@ services:
   ipld-eth-server:
     restart: unless-stopped
     image: cerc/ipld-eth-server:local
-    build:
-      context: ..
     networks:
       - test_default
     environment: