fix unit tests

.github/workflows/e2e.yml

@@ -12,7 +12,7 @@ on:
       - "*"
 
 env:
-  GO_VERSION: "1.20.8"
+  GO_VERSION: "1.20.10"
 
 jobs:
   e2e_tests:

.github/workflows/linter.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.20.7'
+        go-version: '1.20.10'
         check-latest: true
 
     - name: golangci-lint

.github/workflows/test.yml

@@ -9,7 +9,7 @@ on:
       - "*"
 
 env:
-  GO_VERSION: "1.20.8"
+  GO_VERSION: "1.20.10"
 
 jobs:
   test_relayer:

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/ava-labs/avalanchego v1.10.14
 	github.com/ava-labs/subnet-evm v0.5.8
-	github.com/ava-labs/teleporter v0.0.0-20231031160542-c70dd03b7f3f
+	github.com/ava-labs/teleporter v0.0.0-20231101155634-746d643eaeb1
 	github.com/ethereum/go-ethereum v1.12.0
 	github.com/onsi/ginkgo/v2 v2.13.0
 	github.com/onsi/gomega v1.29.0

go.sum

@@ -69,8 +69,8 @@ github.com/ava-labs/coreth v0.12.7-rc.1 h1:fvjow2Jqkq1RNtW4v2Kx0DdTVp+3+fCY421Tx
 github.com/ava-labs/coreth v0.12.7-rc.1/go.mod h1:sNbwitXv4AhLvWpSqy6V8yzkhGFeWBQFD31/xiRDJ5M=
 github.com/ava-labs/subnet-evm v0.5.8 h1:CHDCgZFpvKcgAGTiYDOrDXC5My09L8DNct6NsNiEK/U=
 github.com/ava-labs/subnet-evm v0.5.8/go.mod h1:gT3NSswQqopAaJ1UVtB/TiViE6H5Ib684M9FCsy7+D8=
-github.com/ava-labs/teleporter v0.0.0-20231031160542-c70dd03b7f3f h1:LFJx9bIxGtNj5eIGYxHIrP9SmtUF37fsQ1jmOw4Qm+o=
-github.com/ava-labs/teleporter v0.0.0-20231031160542-c70dd03b7f3f/go.mod h1:2f5nUzPKKA670kPMUvNtqu9f2l8RmZLPTOhrarvXJjE=
+github.com/ava-labs/teleporter v0.0.0-20231101155634-746d643eaeb1 h1:dSfUTDLqbZ5WZxPblWtOCmnlT8r2RqIRnwZmvke0+Rc=
+github.com/ava-labs/teleporter v0.0.0-20231101155634-746d643eaeb1/go.mod h1:2f5nUzPKKA670kPMUvNtqu9f2l8RmZLPTOhrarvXJjE=
 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=

messages/teleporter/message_manager_test.go

@@ -79,11 +79,6 @@ func TestShouldSendMessage(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	feeInfo := teleportermessenger.TeleporterFeeInfo{
-		ContractAddress: common.Address{},
-		Amount:          big.NewInt(0),
-	}
-
 	messageNotDelivered, err := teleportermessenger.PackMessageReceivedOutput(false)
 	require.NoError(t, err)
 
@@ -154,10 +149,7 @@ func TestShouldSendMessage(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			validTeleporterMessage.DestinationChainID, err = getChainIDBytes(test.destinationChainID.String())
 			require.NoError(t, err)
-			validMessageBytes, err := teleportermessenger.PackSendCrossChainMessageEvent(
-				common.HexToHash(destinationChainID.Hex()),
-				validTeleporterMessage,
-				feeInfo)
+			validMessageBytes, err := teleportermessenger.PackTeleporterMessage(validTeleporterMessage)
 			require.NoError(t, err)
 			test.warpMessageInfo.WarpUnsignedMessage, err = warp.NewUnsignedMessage(0, ids.Empty, validMessageBytes)
 			require.NoError(t, err)
@@ -168,7 +160,10 @@ func TestShouldSendMessage(t *testing.T) {
 			mockClient.EXPECT().SenderAddress().Return(test.senderAddressResult).Times(test.senderAddressTimes)
 			mockClient.EXPECT().Client().Return(test.clientResult).Times(test.clientTimes)
 			if test.clientResult != nil {
-				test.clientResult.EXPECT().CallContract(gomock.Any(), gomock.Any(), gomock.Any()).Return(test.callContractResult, nil).Times(test.callContractTimes)
+				test.clientResult.EXPECT().
+					CallContract(gomock.Any(), gomock.Any(), gomock.Any()).
+					Return(test.callContractResult, nil).
+					Times(test.callContractTimes)
 			}
 			result, destinationChainID, err := messageManager.ShouldSendMessage(test.warpMessageInfo)
 			if test.expectedError {

tests/utils/UniversalTeleporterDeployerAddress.txt

@@ -1 +1 @@
-0xeaAf9677e7f80A00CA67444A20faa16e5A168255
+0x092842781d1cdf7FF253128f0CaB5c446c657C90

tests/utils/UniversalTeleporterMessengerContractAddress.txt

@@ -1 +1 @@
-0x6d505066f5589F5476Fc999D467d0831D92596cA
+0x52718d4Ea91A6dD9A68940DBd687eFA32315D116

vms/evm/contract_message_test.go

@@ -53,15 +53,15 @@ func TestUnpack(t *testing.T) {
 	}{
 		{
 			name:          "valid",
-			input:         "0000000000007fc93d85c6d62c5b2ac0b519c87010ea5294012d1e407030d6acd0021cac10d50000005200000000000027ae10273d17cd7e80de8580a51f476960626e5f0000000000000000000000000000000000000000000000000000000000000000123412341234123412341234123412341234123400000000",
-			networkID:     0,
+			input:         "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000024c00000000053968786a235cbcfb6e57321b94378e95939b773a9626acf7a8cc440075c02c7268000002220000000000010000001452718d4ea91a6dd9a68940dbd687efa32315d11600000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000008db97c7cece249c2b98bdc0226cc4c2a57bf52fcb1d32d469938520383696931c26b9753662db74ad33c012f41e337aa828f1b74000000000000000000000000abcedf1234abcedf1234abcedf1234abcedf12340000000000000000000000000000000000000000000000000000000000002710000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a100ff48a37cab9f87c8b5da933da46ea1a5fb80000000000000000000000000000000000000000000000000000000000000002acafebabecafebabecafebabecafebabecafebabecafebabecafebabecafebabecafebabecafebabecafe000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+			networkID:     0x539,
 			errorLogTimes: 0,
 			expectError:   false,
 		},
 		{
 			name:          "invalid",
 			errorLogTimes: 1,
-			input:         "1000000000007fc93d85c6d62c5b2ac0b519c87010ea5294012d1e407030d6acd0021cac10d50000005200000000000027ae10273d17cd7e80de8580a51f476960626e5f0000000000000000000000000000000000000000000000000000000000000000123412341234123412341234123412341234123400000000",
+			input:         "1000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000024c00000000053968786a235cbcfb6e57321b94378e95939b773a9626acf7a8cc440075c02c7268000002220000000000010000001452718d4ea91a6dd9a68940dbd687efa32315d11600000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000008db97c7cece249c2b98bdc0226cc4c2a57bf52fcb1d32d469938520383696931c26b9753662db74ad33c012f41e337aa828f1b74000000000000000000000000abcedf1234abcedf1234abcedf1234abcedf12340000000000000000000000000000000000000000000000000000000000002710000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000a100ff48a37cab9f87c8b5da933da46ea1a5fb80000000000000000000000000000000000000000000000000000000000000002acafebabecafebabecafebabecafebabecafebabecafebabecafebabecafebabecafebabecafebabecafe000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 			expectError:   true,
 		},
 	}