Merge branch 'main' into consolidate-e2e

.github/workflows/e2e.yml

@@ -12,7 +12,7 @@ on:
       - "*"
 
 env:
-  GO_VERSION: "1.20.7"
+  GO_VERSION: "1.20.8"
 
 jobs:
   e2e_tests:
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: ava-labs/subnet-evm
-          ref: v0.5.4
+          ref: v0.5.6
 
       - name: Setup Go
         uses: actions/setup-go@v4

.github/workflows/release.yaml

@@ -21,7 +21,7 @@ jobs:
       # Needed for multi-platform builds
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -31,6 +31,7 @@ jobs:
       - name: Build and Push to Docker Hub
         uses: docker/build-push-action@v5
         with:
+          context: .
           platforms: linux/amd64,linux/arm64
           push: true
           tags: avaplatform/awm-relayer:${{ github.event.release.tag_name }}, avaplatform/awm-relayer:latest

.github/workflows/test.yml

@@ -6,10 +6,10 @@ name: Tests
 on:
   push:
     branches:
-      - '*'
+      - "*"
 
 env:
-  GO_VERSION: "1.20.7"
+  GO_VERSION: "1.20.8"
 
 jobs:
   test_relayer:

Dockerfile

@@ -1,5 +1,5 @@
 ### Build Stage ###
-FROM golang:1.20.7-bullseye as build
+FROM golang:1.20.8-bullseye as build
 
 WORKDIR /go/src
 # Copy the code into the container
@@ -9,7 +9,7 @@ RUN go mod tidy
 RUN bash ./scripts/build.sh
 
 ### RUN Stage ###
-FROM golang:1.20.7
+FROM golang:1.20.8
 COPY --from=build /go/src/build/awm-relayer /usr/bin/awm-relayer
 EXPOSE 8080
 USER 1001

go.mod

@@ -3,10 +3,10 @@ module github.com/ava-labs/awm-relayer
 go 1.18
 
 require (
-	github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825150237-723bc7b31724
-	github.com/ava-labs/avalanchego v1.10.9
-	github.com/ava-labs/coreth v0.12.5-rc.3
-	github.com/ava-labs/subnet-evm v0.5.4
+	github.com/ava-labs/avalanche-network-runner v1.7.2
+	github.com/ava-labs/avalanchego v1.10.10
+	github.com/ava-labs/subnet-evm v0.5.6
+	github.com/ava-labs/teleporter v0.0.0-20230928210512-04688bb14788
 	github.com/ethereum/go-ethereum v1.12.0
 	github.com/onsi/ginkgo/v2 v2.12.0
 	github.com/onsi/gomega v1.27.10
@@ -21,7 +21,7 @@ require (
 
 require (
 	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/ava-labs/teleporter v0.0.0-20230926154828-4cab08966a53 // indirect
+	github.com/ava-labs/coreth v0.12.5-rc.6 // indirect
 	github.com/cockroachdb/errors v1.9.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect

go.sum

@@ -61,26 +61,16 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825150237-723bc7b31724 h1:ptqFgQtJ5DyLb2lvuvawLJNlvo1A1qv+JXYTneNeg14=
-github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825150237-723bc7b31724/go.mod h1:euKHwZ77sGvGfhVj4v9WPM4jD2b5N80ldE2XHqO7lwA=
-github.com/ava-labs/avalanchego v1.10.9 h1:qxhp3YoD2Wm/iIKP6Wb1isbkUPWmIrJxWgivDoL0obM=
-github.com/ava-labs/avalanchego v1.10.9/go.mod h1:C8R5uiltpc8MQ62ixxgODR+15mesWF0aAw3H+Qrl9Iw=
-github.com/ava-labs/coreth v0.12.5-rc.3 h1:cpmC+fSZMsO4gaFWqXHzAHrJACf05u5HPAYmwh7nmkU=
-github.com/ava-labs/coreth v0.12.5-rc.3/go.mod h1:HI+jTIflnDFBd0bledgkgid1Uurwr8q1h7zb3LsFsSo=
-github.com/ava-labs/subnet-evm v0.5.4 h1:4+UHva8rhGlvH4gDYpI0Lt6/J5ie1DqQa6kEmbebArI=
-github.com/ava-labs/subnet-evm v0.5.4/go.mod h1:PAyhfYnECzA17N62i7OAdKazjfSsN2l8KR5nOspg39I=
-github.com/ava-labs/teleporter v0.0.0-20230925192902-bd6f6520e257 h1:m6X0DP8IGtuXbaggmMeKWrkAd5NSSHpRHgdLgX7tIbw=
-github.com/ava-labs/teleporter v0.0.0-20230925192902-bd6f6520e257/go.mod h1:hK/p4P7DckpwCc9AwvKId6EMGFTEevoF6BlpeZlCxY0=
-github.com/ava-labs/teleporter v0.0.0-20230925194238-36c22e7ed8bc h1:Qc1ZjO6b7BQt7kqUdDIozjnx51wNVbgn+tX9FR6ibWg=
-github.com/ava-labs/teleporter v0.0.0-20230925194238-36c22e7ed8bc/go.mod h1:hK/p4P7DckpwCc9AwvKId6EMGFTEevoF6BlpeZlCxY0=
-github.com/ava-labs/teleporter v0.0.0-20230925195539-ed4340646b6b h1:C9cQ7cNhSB8Y0qEgTDuP+3WtqG1Fkj/yioUXql5NI8o=
-github.com/ava-labs/teleporter v0.0.0-20230925195539-ed4340646b6b/go.mod h1:hK/p4P7DckpwCc9AwvKId6EMGFTEevoF6BlpeZlCxY0=
-github.com/ava-labs/teleporter v0.0.0-20230925201328-8b8c9abc32cd h1:hyhu7x+0i+HZ9mk9W98H4+KGoqqKqcUxgG/FSuuUDj4=
-github.com/ava-labs/teleporter v0.0.0-20230925201328-8b8c9abc32cd/go.mod h1:hK/p4P7DckpwCc9AwvKId6EMGFTEevoF6BlpeZlCxY0=
-github.com/ava-labs/teleporter v0.0.0-20230925203622-f24fe9bc9e34 h1:VLHIAEw9jakT+QXzMc/HIFdrx/Y9WwnqXjmB9+XaDFw=
-github.com/ava-labs/teleporter v0.0.0-20230925203622-f24fe9bc9e34/go.mod h1:hK/p4P7DckpwCc9AwvKId6EMGFTEevoF6BlpeZlCxY0=
-github.com/ava-labs/teleporter v0.0.0-20230926154828-4cab08966a53 h1:ar+mKvr5icijtLuckSJEsuqKsb2Bp92tF7zx+TZHTwE=
-github.com/ava-labs/teleporter v0.0.0-20230926154828-4cab08966a53/go.mod h1:hK/p4P7DckpwCc9AwvKId6EMGFTEevoF6BlpeZlCxY0=
+github.com/ava-labs/avalanche-network-runner v1.7.2 h1:XFad/wZfYzDnqbLzPAPPRYU3a1Zc8QT8x5dtLTS3lUo=
+github.com/ava-labs/avalanche-network-runner v1.7.2/go.mod h1:naLveusSrP7YgTAqRykD1SyLOAUilCp9jGjk3MDxoPI=
+github.com/ava-labs/avalanchego v1.10.10 h1:EYX4LVotcfdtIQ0nJSBTcoisubx/Bzk2tM1aP3yiYiw=
+github.com/ava-labs/avalanchego v1.10.10/go.mod h1:6UA0nxxTvvpyuCbP2DSzx9+7uWQfQx9DPApK8JptLiE=
+github.com/ava-labs/coreth v0.12.5-rc.6 h1:OajGUyKkO5Q82XSuMa8T5UD6QywtCHUiZ4Tv3RFmRBU=
+github.com/ava-labs/coreth v0.12.5-rc.6/go.mod h1:s5wVyy+5UCCk2m0Tq3jVmy0UqOpKBDYqRE13gInCJVs=
+github.com/ava-labs/subnet-evm v0.5.6 h1:u+xBvEExOa362Up02hgSgeF+aqDona57whhRIeEIim8=
+github.com/ava-labs/subnet-evm v0.5.6/go.mod h1:desGY3ghT+Ner+oqxeovwF37eM4dmMQbYZECONPQU9w=
+github.com/ava-labs/teleporter v0.0.0-20230928210512-04688bb14788 h1:j8/W3VE1Em3UGJSQ/sh9E1TDyv6PyveMrNM/wGIpWYw=
+github.com/ava-labs/teleporter v0.0.0-20230928210512-04688bb14788/go.mod h1:nyjuYCBefAGCkKDhmJIxh8iTAczapQxwxj/7FC4g9sU=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=