Merge branch 'master' of github.com:ava-labs/subnet-evm into geth-v1.13.14-sq

Author: Darioush Jalali

.github/workflows/publish_docker.yml

@@ -2,20 +2,19 @@ name: Publish Docker Image
 
 on:
   workflow_dispatch:
-  push:
-    tags:
-      - "*"
-    branches:
-      - master
-
-  workflow_call:
     inputs:
       vm_id:
         description: 'The ID of the VM (binary dst in Docker image)'
         default: ''
         required: false
         type: string
 
+  push:
+    tags:
+      - "*"
+    branches:
+      - master
+
 jobs:
   publish_docker_image:
     name: Publish Docker Image

.github/workflows/publish_docker_image.sh

@@ -16,7 +16,6 @@ SUBNET_EVM_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd ../.. && pwd )
 source "$SUBNET_EVM_PATH"/scripts/versions.sh
 
 # Set the vm id if provided
-VM_ID="mDtV8ES8wRL1j2m6Kvc1qRFAvnpq4kufhueAY1bwbzVhk336o" # dispatch vm id
 if [[ $# -eq 1 ]]; then
     VM_ID=$1
 fi

.golangci.yml

@@ -8,8 +8,6 @@ run:
   skip-dirs-use-default: true
   # Include non-test files tagged as test-only.
   # Context: https://github.com/ava-labs/avalanchego/pull/3173
-  build-tags:
-    - test
 
 linters:
   disable-all: true

core/blockchain_test.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/ava-labs/avalanchego/upgrade"
 	"github.com/ava-labs/subnet-evm/consensus/dummy"
 	"github.com/ava-labs/subnet-evm/core/rawdb"
 	"github.com/ava-labs/subnet-evm/core/state"
@@ -1016,7 +1017,7 @@ func TestEIP3651(t *testing.T) {
 		funds   = new(big.Int).Mul(common.Big1, big.NewInt(params.Ether))
 		gspec   = &Genesis{
 			Config:    params.TestChainConfig,
-			Timestamp: uint64(params.DefaultGenesisTime.Unix()),
+			Timestamp: uint64(upgrade.InitiallyActiveTime.Unix()),
 			Alloc: types.GenesisAlloc{
 				addr1: {Balance: funds},
 				addr2: {Balance: funds},

core/state_processor_test.go

@@ -31,6 +31,7 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/ava-labs/avalanchego/upgrade"
 	"github.com/ava-labs/subnet-evm/consensus"
 	"github.com/ava-labs/subnet-evm/consensus/dummy"
 	"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
@@ -111,9 +112,9 @@ func TestStateProcessorErrors(t *testing.T) {
 			db    = rawdb.NewMemoryDatabase()
 			gspec = &Genesis{
 				Config:    config,
-				Timestamp: uint64(params.DefaultGenesisTime.Unix()),
+				Timestamp: uint64(upgrade.InitiallyActiveTime.Unix()),
 				Alloc: types.GenesisAlloc{
-					common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7"): types.Account{
+					common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7"): GenesisAccount{
 						Balance: big.NewInt(4000000000000000000), // 4 ether
 						Nonce:   0,
 					},

eth/backend.go

@@ -275,6 +275,7 @@ func New(
 		log.Info("Unprotected transactions allowed")
 	}
 	gpoParams := config.GPO
+	gpoParams.MinPrice = new(big.Int).SetUint64(config.TxPool.PriceLimit)
 	eth.APIBackend.gpo, err = gasprice.NewOracle(eth.APIBackend, gpoParams)
 	if err != nil {
 		return nil, err

internal/ethapi/api_test.go

@@ -41,6 +41,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ava-labs/avalanchego/upgrade"
 	"github.com/ava-labs/subnet-evm/accounts"
 	"github.com/ava-labs/subnet-evm/accounts/keystore"
 	"github.com/ava-labs/subnet-evm/commontype"
@@ -1797,7 +1798,7 @@ func setupReceiptBackend(t *testing.T, genBlocks int) (*testBackend, []common.Ha
 			Config:        &config,
 			ExcessBlobGas: new(uint64),
 			BlobGasUsed:   new(uint64),
-			Timestamp:     uint64(params.DefaultGenesisTime.Unix()),
+			Timestamp:     uint64(upgrade.InitiallyActiveTime.Unix()),
 			Alloc: types.GenesisAlloc{
 				acc1Addr: {Balance: big.NewInt(params.Ether)},
 				acc2Addr: {Balance: big.NewInt(params.Ether)},