Merge branch 'master' into illia-malachyn/6617-new-ws-handler

Author: illia-malachyn

.github/workflows/ci.yml

@@ -55,13 +55,19 @@ jobs:
         # https://github.com/golangci/golangci-lint-action/issues/244
         skip-cache: true
 
-
   tidy:
     name: Tidy
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
+
+      - name: Setup private build environment
+        if: ${{ vars.PRIVATE_BUILDS_SUPPORTED == 'true' }} 
+        uses: ./actions/private-setup
+        with:
+          cadence_deploy_key: ${{ secrets.CADENCE_DEPLOY_KEY }}
+
       - name: Setup Go
         uses: actions/setup-go@v4
         timeout-minutes: 10 # fail fast. sometimes this step takes an extremely long time
@@ -139,6 +145,13 @@ jobs:
     steps:
     - name: Checkout repo
       uses: actions/checkout@v3
+
+    - name: Setup private build environment
+      if: ${{ vars.PRIVATE_BUILDS_SUPPORTED == 'true' }} 
+      uses: ./actions/private-setup
+      with:
+        cadence_deploy_key: ${{ secrets.CADENCE_DEPLOY_KEY }}
+
     - name: Setup Go
       uses: actions/setup-go@v4
       timeout-minutes: 10 # fail fast. sometimes this step takes an extremely long time
@@ -178,6 +191,13 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
+
+      - name: Setup private build environment
+        if: ${{ vars.PRIVATE_BUILDS_SUPPORTED == 'true' }} 
+        uses: ./actions/private-setup
+        with:
+          cadence_deploy_key: ${{ secrets.CADENCE_DEPLOY_KEY }}
+
       - name: Setup Go
         uses: actions/setup-go@v4
         timeout-minutes: 10 # fail fast. sometimes this step takes an extremely long time
@@ -216,6 +236,13 @@ jobs:
         with:
           # all tags are needed for integration tests
           fetch-depth: 0
+
+      - name: Setup private build environment
+        if: ${{ vars.PRIVATE_BUILDS_SUPPORTED == 'true' }} 
+        uses: ./actions/private-setup
+        with:
+          cadence_deploy_key: ${{ secrets.CADENCE_DEPLOY_KEY }}
+
       - name: Setup Go
         uses: actions/setup-go@v4
         timeout-minutes: 10 # fail fast. sometimes this step takes an extremely long time
@@ -255,9 +282,17 @@ jobs:
         targets: ${{ fromJSON(needs.create-integration-dynamic-test-matrix.outputs.dynamic-matrix)}}
     ## need to set image explicitly due to GitHub logging issue as described in https://github.com/onflow/flow-go/pull/3087#issuecomment-1234383202
     runs-on: ${{ matrix.targets.runner }}
+
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
+      
+      - name: Setup private build environment
+        if: ${{ vars.PRIVATE_BUILDS_SUPPORTED == 'true' }} 
+        uses: ./actions/private-setup
+        with:
+          cadence_deploy_key: ${{ secrets.CADENCE_DEPLOY_KEY }}
+
       - name: Setup Go
         uses: actions/setup-go@v4
         timeout-minutes: 10 # fail fast. sometimes this step takes an extremely long time
@@ -348,6 +383,13 @@ jobs:
       with:
           # all tags are needed for integration tests
           fetch-depth: 0
+
+    - name: Setup private build environment
+      if: ${{ vars.PRIVATE_BUILDS_SUPPORTED == 'true' }} 
+      uses: ./actions/private-setup
+      with:
+        cadence_deploy_key: ${{ secrets.CADENCE_DEPLOY_KEY }}
+
     - name: Setup Go
       uses: actions/setup-go@v4
       timeout-minutes: 10 # fail fast. sometimes this step takes an extremely long time

Makefile

@@ -26,7 +26,7 @@ IMAGE_TAG_ARM := $(IMAGE_TAG)-arm
 # Name of the cover profile
 COVER_PROFILE := coverage.txt
 # Disable go sum database lookup for private repos
-GOPRIVATE=github.com/dapperlabs/*
+GOPRIVATE=github.com/onflow/*-internal
 # OS
 UNAME := $(shell uname)
 

actions/private-setup/action.yml

@@ -0,0 +1,29 @@
+name: "Private Build Setup"
+description: "Checks and configures the environment for building private dependencies"
+inputs:
+  cadence_deploy_key:
+    description: "Deploy Key for Private Cadence Repo"
+    required: true
+  go_private_value:
+    description: "The value for GOPRIVATE"
+    required: false
+    default: "github.com/onflow/*-internal"
+runs:
+  using: "composite"
+  steps:
+    - name: Load deploy key
+      uses: webfactory/[email protected]
+      with:
+        ssh-private-key: "${{ inputs.cadence_deploy_key }}"
+        known-hosts: "github.com"
+
+    - name: Configure git for SSH
+      shell: bash
+      run: |
+        git config --global url."[email protected]:".insteadOf "https://github.com/"
+
+    - name: Configure GOPRIVATE env  
+      shell: bash
+      run: |
+        echo "GOPRIVATE=${{ inputs.go_private_value }}" >> $GITHUB_ENV
+

fvm/evm/handler/blockHashList.go

@@ -84,6 +84,7 @@ func (bhl *BlockHashList) Push(height uint64, bh gethCommon.Hash) error {
 	if !bhl.IsEmpty() && height != bhl.height+1 {
 		return fmt.Errorf("out of the order block hash, expected: %d, got: %d", bhl.height+1, height)
 	}
+
 	// updates the block hash stored at index
 	err := bhl.updateBlockHashAt(bhl.tail, bh)
 	if err != nil {
@@ -150,16 +151,20 @@ func (bhl *BlockHashList) updateBlockHashAt(idx int, bh gethCommon.Hash) error {
 	if err != nil {
 		return err
 	}
+
+	cpy := make([]byte, len(bucket))
+	copy(cpy, bucket)
+
 	// update the block hash
 	start := (idx % hashCountPerBucket) * hashEncodingSize
 	end := start + hashEncodingSize
-	copy(bucket[start:end], bh.Bytes())
+	copy(cpy[start:end], bh.Bytes())
 
 	// store bucket
 	return bhl.backend.SetValue(
 		bhl.rootAddress[:],
 		[]byte(fmt.Sprintf(blockHashListBucketKeyFormat, bucketNumber)),
-		bucket,
+		cpy,
 	)
 }
 

fvm/fvm_test.go

@@ -3,6 +3,7 @@ package fvm_test
 import (
 	"context"
 	"crypto/rand"
+	"encoding/binary"
 	"encoding/hex"
 	"fmt"
 	"math"
@@ -38,6 +39,7 @@ import (
 	envMock "github.com/onflow/flow-go/fvm/environment/mock"
 	"github.com/onflow/flow-go/fvm/errors"
 	"github.com/onflow/flow-go/fvm/evm/events"
+	"github.com/onflow/flow-go/fvm/evm/handler"
 	"github.com/onflow/flow-go/fvm/evm/stdlib"
 	"github.com/onflow/flow-go/fvm/evm/types"
 	"github.com/onflow/flow-go/fvm/meter"
@@ -3587,3 +3589,106 @@ func Test_MinimumRequiredVersion(t *testing.T) {
 			require.Equal(t, cadenceVersion1.String(), getVersion(ctx, snapshotTree))
 		}))
 }
+
+func Test_BlockHashListShouldWriteOnPush(t *testing.T) {
+
+	chain := flow.Emulator.Chain()
+	sc := systemcontracts.SystemContractsForChain(chain.ChainID())
+
+	push := func(bhl *handler.BlockHashList, height uint64) {
+		buffer := make([]byte, 32)
+		pos := 0
+
+		// encode height as block hash
+		binary.BigEndian.PutUint64(buffer[pos:], height)
+		err := bhl.Push(height, [32]byte(buffer))
+		require.NoError(t, err)
+	}
+
+	t.Run("block hash list write on push", newVMTest().
+		withContextOptions(
+			fvm.WithChain(chain),
+			fvm.WithEVMEnabled(true),
+		).
+		run(func(
+			t *testing.T,
+			vm fvm.VM,
+			chain flow.Chain,
+			ctx fvm.Context,
+			snapshotTree snapshot.SnapshotTree,
+		) {
+			capacity := 256
+
+			// for the setup we make sure all the block hash list buckets exist
+
+			ts := state.NewTransactionState(snapshotTree, state.DefaultParameters())
+			accounts := environment.NewAccounts(ts)
+			envMeter := environment.NewMeter(ts)
+
+			valueStore := environment.NewValueStore(
+				tracing.NewMockTracerSpan(),
+				envMeter,
+				accounts,
+			)
+
+			bhl, err := handler.NewBlockHashList(valueStore, sc.EVMStorage.Address, capacity)
+			require.NoError(t, err)
+
+			// fill the block hash list
+			height := uint64(0)
+			for ; height < uint64(capacity); height++ {
+				push(bhl, height)
+			}
+
+			es, err := ts.FinalizeMainTransaction()
+			require.NoError(t, err)
+			snapshotTree = snapshotTree.Append(es)
+
+			// end of test setup
+
+			ts = state.NewTransactionState(snapshotTree, state.DefaultParameters())
+			accounts = environment.NewAccounts(ts)
+			envMeter = environment.NewMeter(ts)
+
+			valueStore = environment.NewValueStore(
+				tracing.NewMockTracerSpan(),
+				envMeter,
+				accounts,
+			)
+
+			bhl, err = handler.NewBlockHashList(valueStore, sc.EVMStorage.Address, capacity)
+			require.NoError(t, err)
+
+			// after we push the changes should be applied and the first block hash in the bucket should be capacity+1 instead of 0
+			push(bhl, height)
+
+			es, err = ts.FinalizeMainTransaction()
+			require.NoError(t, err)
+
+			// the write set should have both block metadata and block hash list bucket
+			require.Len(t, es.WriteSet, 2)
+			newBlockHashListBucket, ok := es.WriteSet[flow.NewRegisterID(sc.EVMStorage.Address, "BlockHashListBucket0")]
+			require.True(t, ok)
+			// full expected block hash list bucket split by individual block hashes
+			// first block hash is the capacity+1 instead of 0 (00 00 00 00 00 00 01 00)
+			expectedBlockHashListBucket, err := hex.DecodeString(
+				"0000000000000100000000000000000000000000000000000000000000000000" +
+					"0000000000000001000000000000000000000000000000000000000000000000" +
+					"0000000000000002000000000000000000000000000000000000000000000000" +
+					"0000000000000003000000000000000000000000000000000000000000000000" +
+					"0000000000000004000000000000000000000000000000000000000000000000" +
+					"0000000000000005000000000000000000000000000000000000000000000000" +
+					"0000000000000006000000000000000000000000000000000000000000000000" +
+					"0000000000000007000000000000000000000000000000000000000000000000" +
+					"0000000000000008000000000000000000000000000000000000000000000000" +
+					"0000000000000009000000000000000000000000000000000000000000000000" +
+					"000000000000000a000000000000000000000000000000000000000000000000" +
+					"000000000000000b000000000000000000000000000000000000000000000000" +
+					"000000000000000c000000000000000000000000000000000000000000000000" +
+					"000000000000000d000000000000000000000000000000000000000000000000" +
+					"000000000000000e000000000000000000000000000000000000000000000000" +
+					"000000000000000f000000000000000000000000000000000000000000000000")
+			require.NoError(t, err)
+			require.Equal(t, expectedBlockHashListBucket, newBlockHashListBucket)
+		}))
+}