Merge pull request #1254 from ava-labs/bump-avago-version

Update AvalancheGo to v1.14.2

Author: ylg-avalabs

go.mod

@@ -9,8 +9,8 @@ tool (
 
 require (
 	github.com/alexliesenfeld/health v0.8.1
-	github.com/ava-labs/avalanchego v1.14.1
-	github.com/ava-labs/avalanchego/graft/subnet-evm v0.8.2
+	github.com/ava-labs/avalanchego v1.14.2
+	github.com/ava-labs/avalanchego/graft/subnet-evm v1.14.2
 	github.com/ava-labs/libevm v1.13.15-0.20251215154636-865e03ca6a28
 	github.com/aws/aws-sdk-go-v2 v1.41.5
 	github.com/aws/aws-sdk-go-v2/config v1.32.14
@@ -40,14 +40,14 @@ require (
 
 // This is a placeholder require directive since the replacement below is necessary and for replacement to work, the require directive must be present. Separating it out here since it's an indirect requirement.
 
-require github.com/ava-labs/avalanchego/graft/evm v0.0.0-00010101000000-000000000000 // indirect
+require github.com/ava-labs/avalanchego/graft/evm v1.14.2 // indirect
 
 // These are manual replacements pointing to the same commit as the avalanchego module. They must be updated whenever the avalanchego version is updated. Version is ignored but the short commit hash and the timestamp must be accepted by go mod tidy.
-replace github.com/ava-labs/avalanchego/graft/subnet-evm => github.com/ava-labs/avalanchego/graft/subnet-evm v0.0.0-20260105172535-1a59a6f646ef
+replace github.com/ava-labs/avalanchego/graft/subnet-evm => github.com/ava-labs/avalanchego/graft/subnet-evm v0.0.0-20260326183716-6e5acf909c7a
 
-replace github.com/ava-labs/avalanchego/graft/evm => github.com/ava-labs/avalanchego/graft/evm v0.0.0-20260105172535-1a59a6f646ef
+replace github.com/ava-labs/avalanchego/graft/evm => github.com/ava-labs/avalanchego/graft/evm v0.0.0-20260326183716-6e5acf909c7a
 
-replace github.com/ava-labs/avalanchego/graft/coreth => github.com/ava-labs/avalanchego/graft/coreth v0.0.0-20260105172535-1a59a6f646ef
+replace github.com/ava-labs/avalanchego/graft/coreth => github.com/ava-labs/avalanchego/graft/coreth v0.0.0-20260326183716-6e5acf909c7a
 
 require (
 	4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
@@ -84,7 +84,7 @@ require (
 	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
-	github.com/StephenButtolph/canoto v0.17.3 // indirect
+	github.com/StephenButtolph/canoto v0.18.0 // indirect
 	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
 	github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
 	github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
@@ -94,8 +94,8 @@ require (
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/ashanbrown/forbidigo v1.6.0 // indirect
 	github.com/ashanbrown/makezero v1.2.0 // indirect
-	github.com/ava-labs/avalanchego/graft/coreth v0.0.0-20260105172535-70148edc6eca // indirect
-	github.com/ava-labs/firewood-go-ethhash/ffi v0.0.18 // indirect
+	github.com/ava-labs/avalanchego/graft/coreth v1.14.2 // indirect
+	github.com/ava-labs/firewood-go-ethhash/ffi v0.3.1 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.19.14 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
@@ -149,7 +149,7 @@ require (
 	github.com/denis-tingaikin/go-header v0.5.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/dlclark/regexp2 v1.11.0 // indirect
+	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/docker/cli v29.2.0+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker v28.5.1+incompatible // indirect
@@ -203,7 +203,7 @@ require (
 	github.com/golangci/plugin-module-register v0.1.1 // indirect
 	github.com/golangci/revgrep v0.8.0 // indirect
 	github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
-	github.com/google/btree v1.1.2 // indirect
+	github.com/google/btree v1.1.3 // indirect
 	github.com/google/cel-go v0.26.1 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect

go.sum

@@ -73,8 +73,8 @@ github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA
 github.com/OpenPeeDeeP/depguard/v2 v2.2.1 h1:vckeWVESWp6Qog7UZSARNqfu/cZqvki8zsuj3piCMx4=
 github.com/OpenPeeDeeP/depguard/v2 v2.2.1/go.mod h1:q4DKzC4UcVaAvcfd41CZh0PWpGgzrVxUYBlgKNGquUo=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
-github.com/StephenButtolph/canoto v0.17.3 h1:lvsnYD4b96vD1knnmp1xCmZqfYpY/jSeRozGdOfdvGI=
-github.com/StephenButtolph/canoto v0.17.3/go.mod h1:IcnAHC6nJUfQFVR9y60ko2ecUqqHHSB6UwI9NnBFZnE=
+github.com/StephenButtolph/canoto v0.18.0 h1:czLis9aEly5R/ExPwB5X0PJLhXi7Sv4PpffaAJV3KnE=
+github.com/StephenButtolph/canoto v0.18.0/go.mod h1:01RsiQp1gnV1eJ6LwygP6buPCLUoAz7jKadQSB0FI0o=
 github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40=
 github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
@@ -106,16 +106,16 @@ github.com/ashanbrown/forbidigo v1.6.0 h1:D3aewfM37Yb3pxHujIPSpTf6oQk9sc9WZi8ger
 github.com/ashanbrown/forbidigo v1.6.0/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU=
 github.com/ashanbrown/makezero v1.2.0 h1:/2Lp1bypdmK9wDIq7uWBlDF1iMUpIIS4A+pF6C9IEUU=
 github.com/ashanbrown/makezero v1.2.0/go.mod h1:dxlPhHbDMC6N6xICzFBSK+4njQDdK8euNO0qjQMtGY4=
-github.com/ava-labs/avalanchego v1.14.1 h1:955YG175dhyFibiPr1LA1rDw9x8Vt1UcLuNwRLOk1kM=
-github.com/ava-labs/avalanchego v1.14.1/go.mod h1:TWuYmX/Wmfdd+9KvFZJHGldQ6SXq0jZ334T0kUOaJsM=
-github.com/ava-labs/avalanchego/graft/coreth v0.0.0-20260105172535-1a59a6f646ef h1:nEkBQEvAJYn2XR8k+fErTCzT+M/3ieERZ6o28pL46i4=
-github.com/ava-labs/avalanchego/graft/coreth v0.0.0-20260105172535-1a59a6f646ef/go.mod h1:4MyhlWkDuSoIuEiYH5ROkdxqMoVZq7r7uQc5TtoeTBw=
-github.com/ava-labs/avalanchego/graft/evm v0.0.0-20260105172535-1a59a6f646ef h1:0gxnb3e52FIQuFEnd3xEt+X2RHAK86EohJHEaUzo6eU=
-github.com/ava-labs/avalanchego/graft/evm v0.0.0-20260105172535-1a59a6f646ef/go.mod h1:md/bvhc+ackO3enSZxN+i+gv/5hj6EoZT/Slh2S7anA=
-github.com/ava-labs/avalanchego/graft/subnet-evm v0.0.0-20260105172535-1a59a6f646ef h1:u5cOcD3LbMjceJCo0BprUNq6Agl1vG25dROtXxToBXo=
-github.com/ava-labs/avalanchego/graft/subnet-evm v0.0.0-20260105172535-1a59a6f646ef/go.mod h1:abXA3WHk4X3mqXSqp/pXfvCHb3F1DQ0gxQ9n2Gl07SY=
-github.com/ava-labs/firewood-go-ethhash/ffi v0.0.18 h1:Lk4yxNL3iZMRxKZlTKVCHp0Rg7i5QclRei0ZKCgtPac=
-github.com/ava-labs/firewood-go-ethhash/ffi v0.0.18/go.mod h1:hR/JSGXxST9B9olwu/NpLXHAykfAyNGfyKnYQqiiOeE=
+github.com/ava-labs/avalanchego v1.14.2 h1:li3Ky2Mz6b5as/1C1xHmDmUqweaMtp+6LMVkeT2j9/A=
+github.com/ava-labs/avalanchego v1.14.2/go.mod h1:yscKaxEqRep24ZsM+O9ZQ0N7OwkChG3mk5XB02FTeRM=
+github.com/ava-labs/avalanchego/graft/coreth v0.0.0-20260326183716-6e5acf909c7a h1:CbHUxdjqKnH4+eenL2gi3jwA6Z95HgmlXNYs9SxG+xo=
+github.com/ava-labs/avalanchego/graft/coreth v0.0.0-20260326183716-6e5acf909c7a/go.mod h1:dp6gM+2b7SdWEqZwxi+4SnfJvgMj0wW9y6WKCHMlmEc=
+github.com/ava-labs/avalanchego/graft/evm v0.0.0-20260326183716-6e5acf909c7a h1:iOxbUn8tkHD47p5uPQ8I9GBplGOqqZHyY7ZuJICGYeg=
+github.com/ava-labs/avalanchego/graft/evm v0.0.0-20260326183716-6e5acf909c7a/go.mod h1:OW1I/KEO9StVafcdgwmRWvY4xsBzWJyZtNZNlUdgDJ4=
+github.com/ava-labs/avalanchego/graft/subnet-evm v0.0.0-20260326183716-6e5acf909c7a h1:5I5+R0DBQDNpHZ/M3mRwLQW1N7YUKUml5k6+4PuRVzE=
+github.com/ava-labs/avalanchego/graft/subnet-evm v0.0.0-20260326183716-6e5acf909c7a/go.mod h1:F1ihP1mHIzVR0dqXSIN8vkigj33Rn3rX0NU/a4Hz/WU=
+github.com/ava-labs/firewood-go-ethhash/ffi v0.3.1 h1:2LXaw0vQ/nSjSKyNil2NoNXXuH+nFSSrlUUBl1x6Jcg=
+github.com/ava-labs/firewood-go-ethhash/ffi v0.3.1/go.mod h1:0Z60sYkUFvvOlOc0XHGbP+271EjP5KjaaOA0EQxCCSA=
 github.com/ava-labs/libevm v1.13.15-0.20251215154636-865e03ca6a28 h1:HgSr7pbKlzqCfXryyzla0mXG1LDgDqPXcybciLmU2bI=
 github.com/ava-labs/libevm v1.13.15-0.20251215154636-865e03ca6a28/go.mod h1:DqSotSn4Dx/UJV+d3svfW8raR+cH7+Ohl9BpsQ5HlGU=
 github.com/aws/aws-sdk-go-v2 v1.41.5 h1:dj5kopbwUsVUVFgO4Fi5BIT3t4WyqIDjGKCangnV/yY=
@@ -299,8 +299,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
+github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/docker/cli v29.2.0+incompatible h1:9oBd9+YM7rxjZLfyMGxjraKBKE4/nVyvVfN4qNl9XRM=
 github.com/docker/cli v29.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
@@ -481,8 +481,8 @@ github.com/golangci/revgrep v0.8.0/go.mod h1:U4R/s9dlXZsg8uJmaR1GrloUr14D7qDl8gi
 github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed h1:IURFTjxeTfNFP0hTEi1YKjB/ub8zkpaOqFFMApi2EAs=
 github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed/go.mod h1:XLXN8bNw4CGRPaqgl3bv/lhz7bsGPh4/xSaMTbo2vkQ=
 github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
-github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
+github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/cel-go v0.26.1 h1:iPbVVEdkhTX++hpe3lzSk7D3G3QSYqLGoHOcEio+UXQ=
 github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
 github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
@@ -631,8 +631,8 @@ github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zt
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
 github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -1006,6 +1006,10 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo=
 github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
+github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
+github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=

icm-contracts/tests/network/local_avalanche_network.go

@@ -92,22 +92,22 @@ func newTmpnetNetwork(
 ) *tmpnet.Network {
 	var l1s []*tmpnet.Subnet
 
-	bootstrapNodes := subnetEvmTestUtils.NewTmpnetNodes(numPrimaryNetworkValidators)
+	bootstrapNodes := tmpnet.NewNodesOrPanic(numPrimaryNetworkValidators)
 	for i, l1Spec := range l1Specs {
 		// Create a single bootstrap node. This will be removed from the L1 validator set after it is converted,
 		// but will remain a primary network validator
 		initialL1Bootstrapper := bootstrapNodes[i] // One bootstrap node per L1
 
 		l1 := subnetEvmTestUtils.NewTmpnetSubnet(
 			l1Spec.Name,
-			utils.InstantiateGenesisTemplate(
+			[]byte(utils.InstantiateGenesisTemplate(
 				warpGenesisTemplateFile,
 				l1Spec.EVMChainID,
 				l1Spec.TeleporterContractAddress,
 				l1Spec.TeleporterDeployedBytecode,
 				l1Spec.TeleporterDeployerAddress,
 				l1Spec.RequirePrimaryNetworkSigners,
-			),
+			)),
 			maps.Clone(utils.DefaultChainConfig()),
 			initialL1Bootstrapper,
 		)
@@ -165,10 +165,10 @@ func NewLocalAvalancheNetwork(
 	Expect(numPrimaryNetworkValidators).Should(BeNumerically(">=", len(l1Specs)))
 
 	// Create extra nodes to be used to add more validators later
-	extraNodes := subnetEvmTestUtils.NewTmpnetNodes(extraNodeCount)
+	extraNodes := tmpnet.NewNodesOrPanic(extraNodeCount)
 
 	for _, l1Spec := range l1Specs {
-		initialVdrNodes := subnetEvmTestUtils.NewTmpnetNodes(l1Spec.NodeCount)
+		initialVdrNodes := tmpnet.NewNodesOrPanic(l1Spec.NodeCount)
 		extraNodes = append(extraNodes, initialVdrNodes...)
 	}
 
@@ -630,10 +630,13 @@ func (n *LocalAvalancheNetwork) GetFundedAccountInfo() (common.Address, *ecdsa.P
 }
 
 func (n *LocalAvalancheNetwork) TearDownNetwork() {
+	ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
+	defer cancel()
+
 	log.Info("Tearing down network")
 	Expect(n).ShouldNot(BeNil())
 	Expect(n.Network).ShouldNot(BeNil())
-	Expect(n.Network.Stop(context.Background())).Should(BeNil())
+	Expect(n.Network.Stop(ctx)).Should(BeNil())
 }
 
 func (n *LocalAvalancheNetwork) SetChainConfigs(chainConfigs map[string]string) {

icm-contracts/tests/rpc-client/rpc_client.go

@@ -6,19 +6,17 @@ import (
 	"math/big"
 	"strings"
 
-	subnetevmRPC "github.com/ava-labs/avalanchego/graft/subnet-evm/rpc"
 	"github.com/ava-labs/avalanchego/ids"
-	rpcclient "github.com/ava-labs/icm-services/icm-contracts/tests/rpc-client"
 	"github.com/ava-labs/libevm/ethclient"
-	libevmRPC "github.com/ava-labs/libevm/rpc"
+	"github.com/ava-labs/libevm/rpc"
 	. "github.com/onsi/gomega"
 )
 
 // NetworkTestInfo Abstraction over the info for Avalanche L1s and Ethereum networks.
 type NetworkTestInfo interface {
 	GetEVMTestInfo() *EVMTestInfo
 	ChainID() ids.ID
-	RPCClient(ctx context.Context) rpcclient.RpcClient
+	RPCClient(ctx context.Context) *rpc.Client
 }
 
 type EVMTestInfo struct {
@@ -44,8 +42,8 @@ func (l1 *L1TestInfo) ChainID() ids.ID {
 	return l1.BlockchainID
 }
 
-func (l1 *L1TestInfo) RPCClient(ctx context.Context) rpcclient.RpcClient {
-	rpcClient, err := subnetevmRPC.DialContext(
+func (l1 *L1TestInfo) RPCClient(ctx context.Context) *rpc.Client {
+	rpcClient, err := rpc.DialContext(
 		ctx,
 		fmt.Sprintf(
 			"http://%s/ext/bc/%s/rpc",
@@ -54,7 +52,7 @@ func (l1 *L1TestInfo) RPCClient(ctx context.Context) rpcclient.RpcClient {
 		),
 	)
 	Expect(err).Should(BeNil())
-	return &rpcclient.SubnetEvmRpcClient{Client: rpcClient}
+	return rpcClient
 }
 
 // EthereumTestInfo Tracks information about a test Ethereum network used for executing tests against.
@@ -73,8 +71,8 @@ func (e *EthereumTestInfo) ChainID() ids.ID {
 	return blockchainID
 }
 
-func (e *EthereumTestInfo) RPCClient(ctx context.Context) rpcclient.RpcClient {
-	rpcClient, err := libevmRPC.DialContext(ctx, e.BaseURL)
+func (e *EthereumTestInfo) RPCClient(ctx context.Context) *rpc.Client {
+	rpcClient, err := rpc.DialContext(ctx, e.BaseURL)
 	Expect(err).Should(BeNil())
-	return &rpcclient.LibevmRPC{Client: rpcClient}
+	return rpcClient
 }

icm-contracts/tests/test-info/test_info.go

@@ -516,9 +516,8 @@ func GetChainConfigWithOffChainMessages(offChainMessages []avalancheWarp.Unsigne
 	return string(offChainMessageJson)
 }
 
-// read in the template file, make the substitutions declared at the beginning
-// of the function, write out the instantiation to a temp file, and then return
-// the path to that temp file.
+// InstantiateGenesisTemplate reads the template file, performs variable
+// substitutions, and returns the resulting genesis JSON content.
 func InstantiateGenesisTemplate(
 	templateFileName string,
 	chainID uint64,
@@ -566,19 +565,12 @@ func InstantiateGenesisTemplate(
 	templateFileBytes, err := os.ReadFile(templateFileName)
 	Expect(err).Should(BeNil())
 
-	l1GenesisFile, err := os.CreateTemp(os.TempDir(), "")
-	Expect(err).Should(BeNil())
-
-	defer l1GenesisFile.Close()
-
-	var replaced string = string(templateFileBytes[:])
+	replaced := string(templateFileBytes)
 	for _, s := range substitutions {
 		replaced = strings.ReplaceAll(replaced, s.Target, s.Value)
 	}
 
-	l1GenesisFile.WriteString(replaced)
-
-	return l1GenesisFile.Name()
+	return replaced
 }
 
 // Native minter utils

icm-contracts/tests/utils/chain.go

@@ -127,7 +127,7 @@ func (s *SignatureAggregator) CreateSignedMessage(
 ) (*avalancheWarp.Message, error) {
 	var err error
 	var signedMessage *avalancheWarp.Message
-	for i := 0; i < 3; i++ {
+	for i := 0; i < 6; i++ {
 		signedMessage, err = s.createSignedMessage(
 			unsignedMessage,
 			justification,
@@ -138,7 +138,7 @@ func (s *SignatureAggregator) CreateSignedMessage(
 		if err == nil {
 			return signedMessage, nil
 		}
-		time.Sleep(time.Second * 1)
+		time.Sleep(10 * time.Second)
 	}
 	return nil, err
 }
@@ -165,7 +165,7 @@ func (s *SignatureAggregator) createSignedMessage(
 	}
 
 	client := &http.Client{
-		Timeout: 20 * time.Second,
+		Timeout: 40 * time.Second,
 	}
 	requestURL := fmt.Sprintf("http://localhost:%d%s", DEFAULT_API_PORT, SIG_AGG_API_PATH)
 	reqBody := AggregateSignaturesRequest{

icm-contracts/tests/utils/signature_aggregator.go

@@ -1210,6 +1210,9 @@ func InitiateAndCompleteEndPoSValidation(
 
 	var receipt *types.Receipt
 	if includeUptime {
+		// Without this sleep we're signing an uptime proof is ~2 seconds of uptime.
+		// This shouldn't cause an issue, but it is for unclear reasons.
+		time.Sleep(10 * time.Second)
 		uptime := uint64(time.Since(validatorStartTime).Seconds())
 		receipt = ForceInitiateEndPoSValidationWithUptime(
 			ctx,

icm-contracts/tests/utils/validator_manager.go

@@ -106,13 +106,9 @@ source "$REPO_PATH"/scripts/versions.sh
 
 BASEDIR=${BASEDIR:-"$HOME/.teleporter-deps"}
 
-# Install the avalanchego and subnet-evm binaries
+# Install the avalanchego binary and subnet-evm plugin
 rm -rf $BASEDIR/avalanchego
 BASEDIR=$BASEDIR AVALANCHEGO_BUILD_PATH=$BASEDIR/avalanchego "${REPO_PATH}/scripts/install_avalanchego_release.sh"
-BASEDIR=$BASEDIR "${REPO_PATH}/scripts/install_subnetevm_release.sh"
-
-cp ${BASEDIR}/subnet-evm/subnet-evm ${BASEDIR}/avalanchego/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy
-echo "Copied ${BASEDIR}/subnet-evm/subnet-evm binary to ${BASEDIR}/avalanchego/plugins/"
 
 export AVALANCHEGO_BUILD_PATH=$BASEDIR/avalanchego
 export AVALANCHEGO_PATH=$AVALANCHEGO_BUILD_PATH/avalanchego