From ed0d1287024394ea450818fd0347234a3e7b311d Mon Sep 17 00:00:00 2001 From: cam-schultz Date: Thu, 12 Dec 2024 13:45:15 -0600 Subject: [PATCH] partial sync test l1s --- go.mod | 4 ++-- go.sum | 8 ++++---- tests/contracts/lib/teleporter | 2 +- tests/e2e_test.go | 26 ++++++++++++++------------ tests/utils/warp-genesis-template.json | 3 ++- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 98160ed4..6e5cd019 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/alexliesenfeld/health v0.8.0 github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88 github.com/ava-labs/coreth v0.13.9-rc.1 - github.com/ava-labs/icm-contracts v1.0.9-0.20241210181701-a4bd5c92b056 + github.com/ava-labs/icm-contracts v1.0.9-0.20241212194240-fc146e9f2342 github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35 github.com/aws/aws-sdk-go-v2 v1.32.6 github.com/aws/aws-sdk-go-v2/config v1.28.6 @@ -14,7 +14,7 @@ require ( github.com/ethereum/go-ethereum v1.13.14 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/onsi/ginkgo/v2 v2.22.0 - github.com/onsi/gomega v1.36.0 + github.com/onsi/gomega v1.36.1 github.com/pingcap/errors v0.11.4 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.20.5 diff --git a/go.sum b/go.sum index 292d076c..617b886d 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88 h1:tZdtOPF github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU= github.com/ava-labs/coreth v0.13.9-rc.1/go.mod h1:7aMsRIo/3GBE44qWZMjnfqdqfcfZ5yShTTm2LObLaYo= -github.com/ava-labs/icm-contracts v1.0.9-0.20241210181701-a4bd5c92b056 h1:VJDtg5UW4SWBeEMtv6qdWgEohdZxEp3jGDAllH6f8eI= -github.com/ava-labs/icm-contracts v1.0.9-0.20241210181701-a4bd5c92b056/go.mod h1:b6Hr01e5LWPua+nuZrSjjCyqfEhgFFdjBmKoJMoWTZo= +github.com/ava-labs/icm-contracts v1.0.9-0.20241212194240-fc146e9f2342 h1:vuGh2uqYnQ3cki5M8R+fv6wcLXmOtT4mk+RW8L4ztAk= +github.com/ava-labs/icm-contracts v1.0.9-0.20241212194240-fc146e9f2342/go.mod h1:W7S2SNzJ0JjySld9s2rplsqEYmuEyapjWVDRTM9eBd0= github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35 h1:CbXWon0fwGDEDCCiChx2VeIIwO3UML9+8OUTyNwPsxA= github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35/go.mod h1:SfAF4jjYPkezKWShPY/T31WQdD/UHrDyqy0kxA0LE0w= github.com/aws/aws-sdk-go-v2 v1.32.6 h1:7BokKRgRPuGmKkFMhEg/jSul+tB9VvXhcViILtfG8b4= @@ -531,8 +531,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y= -github.com/onsi/gomega v1.36.0/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= +github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= +github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= diff --git a/tests/contracts/lib/teleporter b/tests/contracts/lib/teleporter index 57796c8d..fc146e9f 160000 --- a/tests/contracts/lib/teleporter +++ b/tests/contracts/lib/teleporter @@ -1 +1 @@ -Subproject commit 57796c8d6c5fc7ac984b492b93233cf083ea8381 +Subproject commit fc146e9f23423397fdbfff854646e2c4d1db0fa5 diff --git a/tests/e2e_test.go b/tests/e2e_test.go index f43b2722..8e5e5b2b 100644 --- a/tests/e2e_test.go +++ b/tests/e2e_test.go @@ -91,20 +91,22 @@ var _ = ginkgo.BeforeSuite(func() { warpGenesisTemplateFile, []network.L1Spec{ { - Name: "A", - EVMChainID: 12345, - TeleporterContractAddress: teleporterContractAddress, - TeleporterDeployedBytecode: teleporterDeployedByteCode, - TeleporterDeployerAddress: teleporterDeployerAddress, - NodeCount: 2, + Name: "A", + EVMChainID: 12345, + TeleporterContractAddress: teleporterContractAddress, + TeleporterDeployedBytecode: teleporterDeployedByteCode, + TeleporterDeployerAddress: teleporterDeployerAddress, + NodeCount: 2, + RequirePrimaryNetworkSigners: true, }, { - Name: "B", - EVMChainID: 54321, - TeleporterContractAddress: teleporterContractAddress, - TeleporterDeployedBytecode: teleporterDeployedByteCode, - TeleporterDeployerAddress: teleporterDeployerAddress, - NodeCount: 2, + Name: "B", + EVMChainID: 54321, + TeleporterContractAddress: teleporterContractAddress, + TeleporterDeployedBytecode: teleporterDeployedByteCode, + TeleporterDeployerAddress: teleporterDeployerAddress, + NodeCount: 2, + RequirePrimaryNetworkSigners: true, }, }, 4, diff --git a/tests/utils/warp-genesis-template.json b/tests/utils/warp-genesis-template.json index 4cf2d62e..3ac111e0 100644 --- a/tests/utils/warp-genesis-template.json +++ b/tests/utils/warp-genesis-template.json @@ -22,7 +22,8 @@ "blockGasCostStep": 500000 }, "warpConfig": { - "blockTimestamp": 1719343601 + "blockTimestamp": 1719343601, + "requirePrimaryNetworkSigners" : }, "contractNativeMinterConfig": { "blockTimestamp": 0,