Merge pull request #592 from ava-labs/test-partial-sync

Partial sync for test L1s
ava-labs · Dec 13, 2024 · cedbdb4 · cedbdb4
2 parents 78d9194 + d7fa482
commit cedbdb4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git 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

diff --git 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=

diff --git a/tests/contracts/lib/teleporter b/tests/contracts/lib/teleporter
diff --git 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
@@ -22,7 +22,8 @@
         "blockGasCostStep": 500000
       },
       "warpConfig": {
-        "blockTimestamp": 1719343601
+        "blockTimestamp": 1719343601,
+        "requirePrimaryNetworkSigners" : <REQUIRE_PRIMARY_NETWORK_SIGNERS>
       },
       "contractNativeMinterConfig": {
         "blockTimestamp": 0,
+1 −0		.gitignore
+1 −1		SECURITY.md
+1 −1		audits/README.md
+1 −4		contracts/README.md
+0 −3		contracts/teleporter/README.md
+2 −2		contracts/teleporter/registry/UPGRADING.md
+5 −5		go.mod
+10 −10		go.sum
+1 −1		scripts/versions.sh
+1 −1		tests/flows/teleporter/validator_churn.go
+7 −6		tests/interfaces/subnet_test_info.go
+58 −33		tests/network/network.go
+14 −12		tests/suites/teleporter/teleporter_suite_test.go
+8 −6		tests/suites/validator-manager/validator_manager_suite_test.go
+14 −7		tests/utils/chain.go
+1 −1		tests/utils/governance.go
+1 −1		tests/utils/ictt.go
+1 −1		tests/utils/teleporter.go
+3 −3		tests/utils/validator_manager.go
+2 −1		tests/utils/warp-genesis-template.json