Merge branch 'feature/malleability' into jord/json-block-id

Author: jordanschalm

.github/workflows/ci.yml

@@ -295,6 +295,10 @@ jobs:
     runs-on: buildjet-16vcpu-ubuntu-2204
     env:
       CADENCE_DEPLOY_KEY: ${{ secrets.CADENCE_DEPLOY_KEY }}
+    # Set the environment based on the author association of the pull request.
+    # This is used to determine whether the build should be run in an internal or external environment.
+    # If the author is a member or collaborator, use the internal environment; otherwise, use the external environment that will require approval
+    environment: ${{ (github.event_name == 'merge_group' || (github.event.pull_request && (github.event.pull_request.author_association == 'MEMBER' || github.event.pull_request.author_association == 'COLLABORATOR'))) && 'internal-ci' || 'external-ci' }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -314,6 +318,15 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
           cache: true
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        if: ${{ (github.event_name == 'merge_group' || (github.event.pull_request && (github.event.pull_request.author_association == 'MEMBER' || github.event.pull_request.author_association == 'COLLABORATOR'))) }}
+
+
       - name: Docker build
         env:
           CADENCE_DEPLOY_KEY: ${{ secrets.CADENCE_DEPLOY_KEY }}

.github/workflows/image_builds.yml

@@ -93,6 +93,12 @@ jobs:
       - name: Setup Google Cloud Authentication
         run: gcloud auth configure-docker ${{ env.PRIVATE_REGISTRY_HOST }}
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Execute ${{ matrix.build_command }} command to build and push images
         env:
           IMAGE_TAG: ${{ inputs.tag }}

cmd/util/cmd/check-storage/evm_account_storage_health_test.go

@@ -8,11 +8,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/maps"
 
+	gethCommon "github.com/ethereum/go-ethereum/common"
 	"github.com/onflow/atree"
 	"github.com/onflow/cadence/common"
 	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/cadence/runtime"
-	gethCommon "github.com/onflow/go-ethereum/common"
 
 	"github.com/onflow/flow-go/cmd/util/ledger/util"
 	"github.com/onflow/flow-go/cmd/util/ledger/util/registers"