Merge pull request ethereum#1341 from cffls/develop

Backporting master to develop

Author: cffls

.github/workflows/ci.yml

@@ -107,7 +107,7 @@ jobs:
         - name: Test
           run: make test
 
-        - uses: actions/upload-artifact@v4
+        - uses: actions/upload-artifact@v4.4.0
           with:
             name: unitTest-coverage
             path: cover.out
@@ -158,7 +158,7 @@ jobs:
         - name: test-integration
           run: make test-integration
 
-        - uses: actions/upload-artifact@v4
+        - uses: actions/upload-artifact@v4.4.0
           with:
             name: integrationTest-coverage
             path: cover.out
@@ -174,7 +174,7 @@ jobs:
         - name: Checkout
           uses: actions/checkout@v4
         - name: Download artifacts
-          uses: actions/download-artifact@v4
+          uses: actions/download-artifact@v4.1.8
         - name: Upload coverage to Codecov
           uses: codecov/codecov-action@v3
 
@@ -258,7 +258,7 @@ jobs:
 
         - name: Upload logs
           if: always()
-          uses: actions/upload-artifact@v4
+          uses: actions/upload-artifact@v4.4.0
           with:
             name: logs_${{ github.run_id }}
             path: |
@@ -277,7 +277,7 @@ jobs:
 
         - name: Upload code and chain data
           if: always()
-          uses: actions/upload-artifact@v4
+          uses: actions/upload-artifact@v4.4.0
           with:
             name: code_${{ github.run_id }}
             path: code.tar.gz

.github/workflows/govuln.yml

@@ -19,7 +19,7 @@ jobs:
           fail-on-vuln: true
 
       - name: Upload govulncheck report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: raw-report
           path: raw-report.json

accounts/abi/bind/base_test.go

@@ -29,9 +29,12 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/internal/ethapi"
 	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -94,6 +97,10 @@ func (mc *mockCaller) CallContract(ctx context.Context, call ethereum.CallMsg, b
 	return mc.callContractBytes, mc.callContractErr
 }
 
+func (mc *mockCaller) CallWithState(ctx context.Context, args ethapi.TransactionArgs, blockNrOrHash *rpc.BlockNumberOrHash, state *state.StateDB, overrides *ethapi.StateOverride, blockOverrides *ethapi.BlockOverrides) (hexutil.Bytes, error) {
+	return mc.CallContract(ctx, ethereum.CallMsg{}, nil)
+}
+
 type mockPendingCaller struct {
 	*mockCaller
 	pendingCodeAtBytes        []byte

builder/files/genesis-amoy.json

@@ -2019,7 +2019,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		}
 	}
 
-	log.Info("flags", "genesis", cfg.Genesis)
 	// Set any dangling config values
 	if ctx.String(CryptoKZGFlag.Name) != "gokzg" && ctx.String(CryptoKZGFlag.Name) != "ckzg" {
 		Fatalf("--%s flag must be 'gokzg' or 'ckzg'", CryptoKZGFlag.Name)
@@ -2095,7 +2094,6 @@ func RegisterFilterAPI(stack *node.Node, backend ethapi.Backend, ethcfg *ethconf
 	}})
 
 	// avoiding constructor changed by introducing new method to set genesis
-	log.Info("filterAPI", "genesis", ethcfg.Genesis)
 	filterAPI.SetChainConfig(ethcfg.Genesis.Config)
 
 	return filterSystem

builder/files/genesis-mainnet-v1.json

@@ -4,11 +4,13 @@ import (
 	"context"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/internal/ethapi"
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
 //go:generate mockgen -destination=./caller_mock.go -package=api . Caller
 type Caller interface {
 	Call(ctx context.Context, args ethapi.TransactionArgs, blockNrOrHash *rpc.BlockNumberOrHash, overrides *ethapi.StateOverride, blockOverrides *ethapi.BlockOverrides) (hexutil.Bytes, error)
+	CallWithState(ctx context.Context, args ethapi.TransactionArgs, blockNrOrHash *rpc.BlockNumberOrHash, state *state.StateDB, overrides *ethapi.StateOverride, blockOverrides *ethapi.BlockOverrides) (hexutil.Bytes, error)
 }

cmd/utils/flags.go

@@ -119,13 +119,13 @@ func (gc *GenesisContractsClient) LastStateId(state *state.StateDB, number uint6
 	toAddress := common.HexToAddress(gc.StateReceiverContract)
 	gas := (hexutil.Uint64)(uint64(math.MaxUint64 / 2))
 
-	// Do a call with state so that we can fetch the last state ID from a given (incoming)
-	// state instead of local(canonical) chain.
-	result, err := gc.ethAPI.Call(context.Background(), ethapi.TransactionArgs{
+	// BOR: Do a 'CallWithState' so that we can fetch the last state ID from a given (incoming)
+	// state instead of local(canonical) chain's state.
+	result, err := gc.ethAPI.CallWithState(context.Background(), ethapi.TransactionArgs{
 		Gas:  &gas,
 		To:   &toAddress,
 		Data: &msgData,
-	}, &rpc.BlockNumberOrHash{BlockNumber: &blockNr, BlockHash: &hash}, nil, nil)
+	}, &rpc.BlockNumberOrHash{BlockNumber: &blockNr, BlockHash: &hash}, state, nil, nil)
 	if err != nil {
 		return nil, err
 	}

consensus/bor/api/caller.go

@@ -355,10 +355,13 @@ func MVRead[T any](s *StateDB, k blockstm.Key, defaultV T, readStorage func(s *S
 		return defaultV
 	}
 
-	// TODO: I assume we don't want to overwrite an existing read because this could - for example - change a storage
-	//  read to map if the same value is read multiple times.
-	if _, ok := s.readMap[k]; !ok {
+	if prevRd, ok := s.readMap[k]; !ok {
 		s.readMap[k] = rd
+	} else {
+		if prevRd.Kind != rd.Kind || prevRd.V.TxnIndex != rd.V.TxnIndex || prevRd.V.Incarnation != rd.V.Incarnation {
+			s.dep = rd.V.TxnIndex
+			panic("Read conflict detected")
+		}
 	}
 
 	return