From 11d7fd9b8c17abe121f0f652c32e33cb4ad26385 Mon Sep 17 00:00:00 2001
From: Ian Suvak <ian.suvak@avalabs.org>
Date: Fri, 6 Sep 2024 16:04:29 -0400
Subject: [PATCH] update teleporter

---
 go.mod              | 2 +-
 go.sum              | 4 ++--
 scripts/versions.sh | 3 +--
 tests/e2e_test.go   | 4 ++++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index d01717b5..7ffd3293 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/ava-labs/avalanchego v1.11.11
 	github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240815193440-a96bc921e732
 	github.com/ava-labs/subnet-evm v0.6.9
-	github.com/ava-labs/teleporter v1.0.6
+	github.com/ava-labs/teleporter v1.0.7-0.20240906195543-f23da2da8fdd
 	github.com/aws/aws-sdk-go-v2 v1.30.5
 	github.com/aws/aws-sdk-go-v2/config v1.27.9
 	github.com/aws/aws-sdk-go-v2/service/kms v1.35.6
diff --git a/go.sum b/go.sum
index f8ab404e..605a7fad 100644
--- a/go.sum
+++ b/go.sum
@@ -64,8 +64,8 @@ github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240815193440-a96bc9
 github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240815193440-a96bc921e732/go.mod h1:RkQLaQ961Xe/sUb3ycn4Qi18vPPuEetTqDf2eDcquAs=
 github.com/ava-labs/subnet-evm v0.6.9 h1:0FSPjbysSudOlMD/d0ivkli50d2ixpX3sXCi7XHfPbc=
 github.com/ava-labs/subnet-evm v0.6.9/go.mod h1:dw4kg0o58dvYlndj2ZcwB7hioRc1kjg00yXYrcSmnj8=
-github.com/ava-labs/teleporter v1.0.6 h1:buZULenvJLUUMyPihiSvGMag5/rm6oF8zL8YUw7NXxE=
-github.com/ava-labs/teleporter v1.0.6/go.mod h1:JRfVZzLrb4qFZz2M5/c8L7cdN4A4JWJd7GIEzVeC+sg=
+github.com/ava-labs/teleporter v1.0.7-0.20240906195543-f23da2da8fdd h1:vuVGcZvIdRtO9lRprPEX4Z+2Ilbri9kXaEoe0rTGk3k=
+github.com/ava-labs/teleporter v1.0.7-0.20240906195543-f23da2da8fdd/go.mod h1:wgCgU6vU5MtP83otpjEin8jL2jrflVBNQCTxVXMx/kU=
 github.com/aws/aws-sdk-go-v2 v1.30.5 h1:mWSRTwQAb0aLE17dSzztCVJWI9+cRMgqebndjwDyK0g=
 github.com/aws/aws-sdk-go-v2 v1.30.5/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0=
 github.com/aws/aws-sdk-go-v2/config v1.27.9 h1:gRx/NwpNEFSk+yQlgmk1bmxxvQ5TyJ76CWXs9XScTqg=
diff --git a/scripts/versions.sh b/scripts/versions.sh
index 641974a9..b7818bba 100755
--- a/scripts/versions.sh
+++ b/scripts/versions.sh
@@ -21,8 +21,7 @@ AVALANCHEGO_VERSION=${AVALANCHEGO_VERSION:-$(getDepVersion github.com/ava-labs/a
 GINKGO_VERSION=${GINKGO_VERSION:-$(getDepVersion github.com/onsi/ginkgo/v2)}
 
 # TODO: undo this hack once go.mod is referring to a tag rather than a commit
-#SUBNET_EVM_VERSION=${SUBNET_EVM_VERSION:-$(getDepVersion github.com/ava-labs/subnet-evm)}
-SUBNET_EVM_VERSION=${SUBNET_EVM_VERSION:-update-avago-teleporter}
+SUBNET_EVM_VERSION=${SUBNET_EVM_VERSION:-$(getDepVersion github.com/ava-labs/subnet-evm)}
 
 # Set golangci-lint version
 GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION:-'v1.60'}
diff --git a/tests/e2e_test.go b/tests/e2e_test.go
index 48a61808..9d49bbb5 100644
--- a/tests/e2e_test.go
+++ b/tests/e2e_test.go
@@ -13,6 +13,7 @@ import (
 	"os/signal"
 	"syscall"
 	"testing"
+	"time"
 
 	testUtils "github.com/ava-labs/awm-relayer/tests/utils"
 	"github.com/ava-labs/awm-relayer/utils"
@@ -78,7 +79,10 @@ var _ = ginkgo.BeforeSuite(func() {
 		utils.SanitizeHexString(teleporterDeployerTransactionStr),
 	)
 	Expect(err).Should(BeNil())
+	networkStartCtx, networkStartCancel := context.WithTimeout(ctx, 120*time.Second)
+	defer networkStartCancel()
 	localNetworkInstance = local.NewLocalNetwork(
+		networkStartCtx,
 		"icm-off-chain-services-e2e-test",
 		warpGenesisTemplateFile,
 		[]local.SubnetSpec{