Merge branch 'main' into anr_1.7.3

Author: felipemadero

scripts/tests.e2e.sh

@@ -12,9 +12,12 @@ fi
 
 ANR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
 
-DEFAULT_VERSION_1=v1.10.10
-DEFAULT_VERSION_2=v1.10.9
-DEFAULT_SUBNET_EVM_VERSION=v0.5.5
+# this avago and subnet-evm versions must have compatibility at rpc protocol level
+DEFAULT_VERSION_1=v1.10.15
+DEFAULT_SUBNET_EVM_VERSION=v0.5.9
+
+# used standalone, without interaction with subnet-evm, no compatibility needed
+DEFAULT_VERSION_2=v1.10.14
 
 if [ $# == 0 ]; then
     VERSION_1=$DEFAULT_VERSION_1

server/network.go

@@ -17,6 +17,7 @@ import (
 	"github.com/ava-labs/avalanche-network-runner/network"
 	"github.com/ava-labs/avalanche-network-runner/network/node"
 	"github.com/ava-labs/avalanche-network-runner/rpcpb"
+	"github.com/ava-labs/avalanche-network-runner/utils"
 	"github.com/ava-labs/avalanche-network-runner/utils/constants"
 	"github.com/ava-labs/avalanche-network-runner/ux"
 	"github.com/ava-labs/avalanchego/config"
@@ -165,22 +166,29 @@ func (lc *localNetwork) createConfig() error {
 
 	cfg.NetworkID = lc.options.networkID
 
+	for k, v := range lc.options.chainConfigs {
+		ov, ok := cfg.ChainConfigFiles[k]
+		if ok {
+			v, err = utils.CombineJSONs(ov, v)
+			if err != nil {
+				return err
+			}
+		}
+		cfg.ChainConfigFiles[k] = v
+	}
+	for k, v := range lc.options.upgradeConfigs {
+		cfg.UpgradeConfigFiles[k] = v
+	}
+	for k, v := range lc.options.subnetConfigs {
+		cfg.SubnetConfigFiles[k] = v
+	}
+
 	for i := range cfg.NodeConfigs {
 		// NOTE: Naming convention for node names is currently `node` + number, i.e. `node1,node2,node3,...node101`
 		nodeName := fmt.Sprintf("node%d", i+1)
 
 		cfg.NodeConfigs[i].Name = nodeName
 
-		for k, v := range lc.options.chainConfigs {
-			cfg.NodeConfigs[i].ChainConfigFiles[k] = v
-		}
-		for k, v := range lc.options.upgradeConfigs {
-			cfg.NodeConfigs[i].UpgradeConfigFiles[k] = v
-		}
-		for k, v := range lc.options.subnetConfigs {
-			cfg.NodeConfigs[i].SubnetConfigFiles[k] = v
-		}
-
 		if cfg.NodeConfigs[i].Flags == nil {
 			cfg.NodeConfigs[i].Flags = map[string]interface{}{}
 		}

tests/e2e/e2e_test.go

@@ -277,7 +277,7 @@ var _ = ginkgo.Describe("[Start/Remove/Restart/Add/Stop]", func() {
 		})
 
 		ginkgo.By("can save snapshot", func() {
-			ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 			_, err := cli.SaveSnapshot(ctx, "test")
 			cancel()
 			gomega.Ω(err).Should(gomega.BeNil())
@@ -483,7 +483,7 @@ var _ = ginkgo.Describe("[Start/Remove/Restart/Add/Stop]", func() {
 		})
 
 		ginkgo.By("stop the network", func() {
-			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+			ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
 			_, err := cli.Stop(ctx)
 			cancel()
 			gomega.Ω(err).Should(gomega.BeNil())

utils/json.go

@@ -26,3 +26,22 @@ func SetJSONKey(jsonBody string, k string, v string) (string, error) {
 	}
 	return string(updatedJSON), nil
 }
+
+func CombineJSONs(baseJSON string, addedJSON string) (string, error) {
+	var baseConfig map[string]interface{}
+	if err := json.Unmarshal([]byte(baseJSON), &baseConfig); err != nil {
+		return "", err
+	}
+	var addedConfig map[string]interface{}
+	if err := json.Unmarshal([]byte(addedJSON), &addedConfig); err != nil {
+		return "", err
+	}
+	for k, v := range addedConfig {
+		baseConfig[k] = v
+	}
+	updatedJSON, err := json.Marshal(baseConfig)
+	if err != nil {
+		return "", err
+	}
+	return string(updatedJSON), nil
+}