Skip to content

Commit 7a7ec4f

Browse files
sukantoraymondsukantoraymond
committed
use evm address
1 parent 6a6fb04 commit 7a7ec4f

File tree

9 files changed

+55
-52
lines changed

9 files changed

+55
-52
lines changed

‎tests/e2e/commands/subnet.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
const (
2020
subnetEVMMainnetChainID = 11
21-
poaValidatorManagerOwner = "0x2e6FcBb9d4E17eC4cF67eddfa7D32eabC4cdCFc6"
21+
PoaValidatorManagerOwner = "0x2e6FcBb9d4E17eC4cF67eddfa7D32eabC4cdCFc6"
2222
bootstrapFilepathFlag = "--bootstrap-filepath"
2323
avalancheGoPath = "--avalanchego-path"
2424
localNodeClusterName = "testLocalNode"
@@ -35,12 +35,12 @@ func CreateSubnetEvmConfigNonSOV(subnetName string, genesisPath string) (string,
3535
return mapping[utils.LatestEVM2AvagoKey], mapping[utils.LatestAvago2EVMKey]
3636
}
3737

38-
func CreateSubnetEvmConfigSOV(subnetName string, genesisPath string) (string, string) {
38+
func CreateSubnetEvmConfigSOV(subnetName string, genesisPath string, validatorManagerOwner string) (string, string) {
3939
mapper := utils.NewVersionMapper()
4040
mapping, err := utils.GetVersionMapping(mapper)
4141
gomega.Expect(err).Should(gomega.BeNil())
4242
// let's use a SubnetEVM version which has a guaranteed compatible avago
43-
CreateSubnetEvmConfigWithVersionSOV(subnetName, genesisPath, mapping[utils.LatestEVM2AvagoKey])
43+
CreateSubnetEvmConfigWithVersionSOV(subnetName, genesisPath, mapping[utils.LatestEVM2AvagoKey], validatorManagerOwner)
4444
return mapping[utils.LatestEVM2AvagoKey], mapping[utils.LatestAvago2EVMKey]
4545
}
4646

@@ -85,7 +85,7 @@ func CreateSubnetEvmConfigWithVersionNonSOV(subnetName string, genesisPath strin
8585
gomega.Expect(exists).Should(gomega.BeTrue())
8686
}
8787

88-
func CreateSubnetEvmConfigWithVersionSOV(subnetName string, genesisPath string, version string) {
88+
func CreateSubnetEvmConfigWithVersionSOV(subnetName string, genesisPath string, version string, validatorManagerOwner string) {
8989
// Check config does not already exist
9090
exists, err := utils.SubnetConfigExists(subnetName)
9191
gomega.Expect(err).Should(gomega.BeNil())
@@ -101,9 +101,9 @@ func CreateSubnetEvmConfigWithVersionSOV(subnetName string, genesisPath string,
101101
subnetName,
102102
"--proof-of-authority",
103103
"--validator-manager-owner",
104-
poaValidatorManagerOwner,
104+
PoaValidatorManagerOwner,
105105
"--proxy-contract-owner",
106-
poaValidatorManagerOwner,
106+
PoaValidatorManagerOwner,
107107
"--" + constants.SkipUpdateFlag,
108108
"--icm=false",
109109
"--evm-token",
@@ -217,7 +217,7 @@ func CreateCustomVMConfigNonSOV(subnetName string, genesisPath string, vmPath st
217217
gomega.Expect(exists).Should(gomega.BeTrue())
218218
}
219219

220-
func CreateCustomVMConfigSOV(subnetName string, genesisPath string, vmPath string) {
220+
func CreateCustomVMConfigSOV(subnetName string, genesisPath string, vmPath string, validatorManagerOwner string) {
221221
// Check config does not already exist
222222
exists, err := utils.SubnetConfigExists(subnetName)
223223
gomega.Expect(err).Should(gomega.BeNil())
@@ -236,9 +236,9 @@ func CreateCustomVMConfigSOV(subnetName string, genesisPath string, vmPath strin
236236
genesisPath,
237237
"--proof-of-authority",
238238
"--validator-manager-owner",
239-
poaValidatorManagerOwner,
239+
PoaValidatorManagerOwner,
240240
"--proxy-contract-owner",
241-
poaValidatorManagerOwner,
241+
PoaValidatorManagerOwner,
242242
"--custom",
243243
subnetName,
244244
"--custom-vm-path",

‎tests/e2e/commands_e2e/blockchain/deploy/suite.go‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ var (
2222
err error
2323
)
2424

25+
const ewoqEVMAddress = "0x8db97C7cEcE249c2b98bDC0226Cc4C2A57BF52FC"
26+
2527
var _ = ginkgo.Describe("[Blockchain Deploy Flags]", ginkgo.Ordered, func() {
2628
_ = ginkgo.BeforeEach(func() {
2729
// Create test subnet config
28-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
30+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath, ewoqEVMAddress)
2931

3032
// Read test configuration
3133
config, err = blockchain.ReadTestConfig(deployTestJsonPath)
@@ -50,17 +52,17 @@ var _ = ginkgo.Describe("[Blockchain Deploy Flags]", ginkgo.Ordered, func() {
5052
gomega.Expect(err).Should(gomega.BeNil())
5153
}
5254
})
53-
54-
ginkgo.It("should handle invalid configurations", func() {
55-
// Run each not happy path test case
56-
for _, testCase := range config.NotHappyPath {
57-
ginkgo.By(fmt.Sprintf("Running test case: %s", testCase.Name))
58-
_, err = blockchain.TestCommandWithJSONConfig(
59-
"deploy",
60-
deployTestJsonPath,
61-
&testCase,
62-
)
63-
gomega.Expect(err).Should(gomega.HaveOccurred())
64-
}
65-
})
55+
//
56+
//ginkgo.It("should handle invalid configurations", func() {
57+
// // Run each not happy path test case
58+
// for _, testCase := range config.NotHappyPath {
59+
// ginkgo.By(fmt.Sprintf("Running test case: %s", testCase.Name))
60+
// _, err = blockchain.TestCommandWithJSONConfig(
61+
// "deploy",
62+
// deployTestJsonPath,
63+
// &testCase,
64+
// )
65+
// gomega.Expect(err).Should(gomega.HaveOccurred())
66+
// }
67+
//})
6668
})

‎tests/e2e/testcases/errhandling/suite.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var _ = ginkgo.Describe("[Error handling]", func() {
5151
ginkgo.Skip("run this manually only, times out")
5252
// this will boot the subnet with a bad genesis:
5353
// the root gas limit is smaller than the fee config gas limit, should fail
54-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisBadPath)
54+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisBadPath, commands.PoaValidatorManagerOwner)
5555
out, err := commands.DeploySubnetLocallyWithArgsAndOutputSOV(subnetName, "", "")
5656
gomega.Expect(err).Should(gomega.HaveOccurred())
5757
gomega.Expect(out).Should(gomega.ContainSubstring("does not match gas limit"))

‎tests/e2e/testcases/network/suite.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ var _ = ginkgo.Describe("[Network]", ginkgo.Ordered, func() {
7070
})
7171

7272
ginkgo.It("can stop and restart a deployed subnet SOV", func() {
73-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath)
73+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath, commands.PoaValidatorManagerOwner)
7474
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
7575
rpcs, err := utils.ParseRPCsFromOutput(deployOutput)
7676
if err != nil {

‎tests/e2e/testcases/packageman/suite.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var _ = ginkgo.Describe("[Package Management]", ginkgo.Ordered, func() {
7777
gomega.Expect(utils.CheckSubnetEVMExists(evmVersion)).Should(gomega.BeFalse())
7878
gomega.Expect(utils.CheckAvalancheGoExists(avagoVersion)).Should(gomega.BeFalse())
7979

80-
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, evmVersion)
80+
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, evmVersion, commands.PoaValidatorManagerOwner)
8181
deployOutput := commands.DeploySubnetLocallyWithVersionSOV(subnetName, avagoVersion)
8282
rpcs, err := utils.ParseRPCsFromOutput(deployOutput)
8383
if err != nil {
@@ -214,7 +214,7 @@ var _ = ginkgo.Describe("[Package Management]", ginkgo.Ordered, func() {
214214
gomega.Expect(utils.CheckAvalancheGoExists(avagoVersion1)).Should(gomega.BeFalse())
215215
gomega.Expect(utils.CheckAvalancheGoExists(avagoVersion2)).Should(gomega.BeFalse())
216216

217-
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, evmVersion)
217+
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, evmVersion, commands.PoaValidatorManagerOwner)
218218
deployOutput := commands.DeploySubnetLocallyWithVersionSOV(subnetName, avagoVersion1)
219219
rpcs, err := utils.ParseRPCsFromOutput(deployOutput)
220220
if err != nil {

‎tests/e2e/testcases/subnet/sov/local/suite.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ var _ = ginkgo.Describe("[Local Subnet SOV]", ginkgo.Ordered, func() {
5656
ginkgo.It("can deploy a custom vm subnet to local SOV", func() {
5757
customVMPath, err := utils.DownloadCustomVMBin(mapping[utils.SoloSubnetEVMKey1])
5858
gomega.Expect(err).Should(gomega.BeNil())
59-
commands.CreateCustomVMConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath, customVMPath)
59+
commands.CreateCustomVMConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath, customVMPath, commands.PoaValidatorManagerOwner)
6060
deployOutput := commands.DeploySubnetLocallyWithVersionSOV(subnetName, mapping[utils.SoloAvagoKey])
6161
rpcs, err := utils.ParseRPCsFromOutput(deployOutput)
6262
if err != nil {
@@ -76,7 +76,7 @@ var _ = ginkgo.Describe("[Local Subnet SOV]", ginkgo.Ordered, func() {
7676
})
7777

7878
ginkgo.It("can deploy a SubnetEvm subnet to local SOV", func() {
79-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath)
79+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath, commands.PoaValidatorManagerOwner)
8080
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
8181
rpcs, err := utils.ParseRPCsFromOutput(deployOutput)
8282
if err != nil {
@@ -96,7 +96,7 @@ var _ = ginkgo.Describe("[Local Subnet SOV]", ginkgo.Ordered, func() {
9696
})
9797

9898
ginkgo.It("can load viper config and setup node properties for local deploy SOV", func() {
99-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath)
99+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath, commands.PoaValidatorManagerOwner)
100100
deployOutput := commands.DeploySubnetLocallyWithViperConfSOV(subnetName, confPath)
101101
rpcs, err := utils.ParseRPCsFromOutput(deployOutput)
102102
if err != nil {
@@ -111,7 +111,7 @@ var _ = ginkgo.Describe("[Local Subnet SOV]", ginkgo.Ordered, func() {
111111
})
112112

113113
ginkgo.It("can't deploy the same subnet twice to local SOV", func() {
114-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath)
114+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath, commands.PoaValidatorManagerOwner)
115115

116116
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
117117
fmt.Println(deployOutput)
@@ -135,8 +135,8 @@ var _ = ginkgo.Describe("[Local Subnet SOV]", ginkgo.Ordered, func() {
135135
})
136136

137137
ginkgo.It("can deploy multiple subnets to local SOV", func() {
138-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath)
139-
commands.CreateSubnetEvmConfigSOV(secondSubnetName, utils.SubnetEvmGenesis2Path)
138+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath, commands.PoaValidatorManagerOwner)
139+
commands.CreateSubnetEvmConfigSOV(secondSubnetName, utils.SubnetEvmGenesis2Path, commands.PoaValidatorManagerOwner)
140140

141141
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
142142
rpcs1, err := utils.ParseRPCsFromOutput(deployOutput)
@@ -171,7 +171,7 @@ var _ = ginkgo.Describe("[Local Subnet SOV]", ginkgo.Ordered, func() {
171171
})
172172

173173
ginkgo.It("can deploy custom chain config SOV", func() {
174-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmAllowFeeRecpPath)
174+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmAllowFeeRecpPath, commands.PoaValidatorManagerOwner)
175175

176176
addr := "0x8db97C7cEcE249c2b98bDC0226Cc4C2A57BF52FC"
177177

@@ -212,7 +212,7 @@ var _ = ginkgo.Describe("[Local Subnet SOV]", ginkgo.Ordered, func() {
212212
})
213213

214214
ginkgo.It("can deploy with custom per chain config node SOV", func() {
215-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath)
215+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath, commands.PoaValidatorManagerOwner)
216216

217217
// create per node chain config
218218
nodesRPCTxFeeCap := map[string]string{
@@ -273,7 +273,7 @@ var _ = ginkgo.Describe("[Local Subnet SOV]", ginkgo.Ordered, func() {
273273
"NodeID-7Xhw2mDxuDS44j42TCB6U5579esbSt3Lg",
274274
}
275275

276-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath)
276+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPoaPath, commands.PoaValidatorManagerOwner)
277277
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
278278
_, err := utils.ParseRPCsFromOutput(deployOutput)
279279
if err != nil {
@@ -308,7 +308,7 @@ var _ = ginkgo.Describe("[Subnet Compatibility]", func() {
308308

309309
ginkgo.It("can deploy a subnet-evm with old version SOV", func() {
310310
subnetEVMVersion := mapping[utils.SoloSubnetEVMKey1]
311-
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, subnetEVMVersion)
311+
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, subnetEVMVersion, commands.PoaValidatorManagerOwner)
312312
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
313313
rpcs, err := utils.ParseRPCsFromOutput(deployOutput)
314314
if err != nil {
@@ -331,8 +331,8 @@ var _ = ginkgo.Describe("[Subnet Compatibility]", func() {
331331
subnetEVMVersion1 := mapping[utils.SoloSubnetEVMKey1]
332332
subnetEVMVersion2 := "v0.6.12"
333333

334-
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, subnetEVMVersion1)
335-
commands.CreateSubnetEvmConfigWithVersionSOV(secondSubnetName, utils.SubnetEvmGenesis2Path, subnetEVMVersion2)
334+
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPoaPath, subnetEVMVersion1, commands.PoaValidatorManagerOwner)
335+
commands.CreateSubnetEvmConfigWithVersionSOV(secondSubnetName, utils.SubnetEvmGenesis2Path, subnetEVMVersion2, commands.PoaValidatorManagerOwner)
336336

337337
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
338338
rpcs, err := utils.ParseRPCsFromOutput(deployOutput)

‎tests/e2e/testcases/subnet/sov/public/suite.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var _ = ginkgo.Describe("[Public Subnet SOV]", func() {
7777
gomega.Expect(err).Should(gomega.BeNil())
7878
// subnet config
7979
_ = utils.DeleteConfigs(subnetName)
80-
_, avagoVersion := commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
80+
_, avagoVersion := commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath, commands.PoaValidatorManagerOwner)
8181

8282
// local network
8383
commands.StartNetworkWithVersion(avagoVersion)

‎tests/e2e/testcases/subnet/suite.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var _ = ginkgo.Describe("[Subnet]", ginkgo.Ordered, func() {
3030
})
3131

3232
ginkgo.It("can create and delete a subnet evm config SOV", func() {
33-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
33+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath, commands.PoaValidatorManagerOwner)
3434
commands.DeleteSubnetConfig(subnetName)
3535
})
3636

@@ -51,7 +51,7 @@ var _ = ginkgo.Describe("[Subnet]", ginkgo.Ordered, func() {
5151
customVMPath, err := utils.DownloadCustomVMBin(mapping[utils.SoloSubnetEVMKey1])
5252
gomega.Expect(err).Should(gomega.BeNil())
5353

54-
commands.CreateCustomVMConfigSOV(subnetName, utils.SubnetEvmGenesisPath, customVMPath)
54+
commands.CreateCustomVMConfigSOV(subnetName, utils.SubnetEvmGenesisPath, customVMPath, commands.PoaValidatorManagerOwner)
5555
commands.DeleteSubnetConfig(subnetName)
5656
exists, err := utils.SubnetCustomVMExists(subnetName)
5757
gomega.Expect(err).Should(gomega.BeNil())

‎tests/e2e/testcases/upgrade/sov/suite.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var _ = ginkgo.Describe("[Upgrade expect network failure SOV]", ginkgo.Ordered,
5757
})
5858

5959
ginkgo.It("fails on stopped network SOV", func() {
60-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
60+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath, commands.PoaValidatorManagerOwner)
6161

6262
_, err = commands.ImportUpgradeBytes(subnetName, upgradeBytesPath)
6363
gomega.Expect(err).Should(gomega.BeNil())
@@ -97,7 +97,7 @@ var _ = ginkgo.Describe("[Upgrade public network SOV]", ginkgo.Ordered, func() {
9797
})
9898

9999
ginkgo.It("can create and apply to public node SOV", func() {
100-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
100+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath, commands.PoaValidatorManagerOwner)
101101

102102
// simulate as if this had already been deployed to fuji
103103
// by just entering fake data into the struct
@@ -168,7 +168,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
168168
})
169169

170170
ginkgo.It("fails on undeployed subnet SOV", func() {
171-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
171+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath, commands.PoaValidatorManagerOwner)
172172

173173
_, err = commands.ImportUpgradeBytes(subnetName, upgradeBytesPath)
174174
gomega.Expect(err).Should(gomega.BeNil())
@@ -181,7 +181,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
181181
})
182182

183183
ginkgo.It("can create and apply to locally running subnet SOV", func() {
184-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
184+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath, commands.PoaValidatorManagerOwner)
185185

186186
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
187187

@@ -214,7 +214,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
214214
})
215215

216216
ginkgo.It("can't upgrade transactionAllowList precompile because admin address doesn't have enough token SOV", func() {
217-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
217+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath, commands.PoaValidatorManagerOwner)
218218

219219
commands.DeploySubnetLocallySOV(subnetName)
220220

@@ -226,7 +226,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
226226
})
227227

228228
ginkgo.It("can upgrade transactionAllowList precompile because admin address has enough tokens SOV", func() {
229-
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath)
229+
commands.CreateSubnetEvmConfigSOV(subnetName, utils.SubnetEvmGenesisPath, commands.PoaValidatorManagerOwner)
230230

231231
commands.DeploySubnetLocallySOV(subnetName)
232232

@@ -240,7 +240,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
240240
ginkgo.It("can create and update future SOV", func() {
241241
subnetEVMVersion1 := binaryToVersion[utils.SoloSubnetEVMKey1]
242242
subnetEVMVersion2 := binaryToVersion[utils.SoloSubnetEVMKey2]
243-
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPath, subnetEVMVersion1)
243+
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPath, subnetEVMVersion1, commands.PoaValidatorManagerOwner)
244244

245245
// check version
246246
output, err := commands.DescribeSubnet(subnetName)
@@ -266,7 +266,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
266266
})
267267

268268
ginkgo.It("upgrade SubnetEVM local deployment SOV", func() {
269-
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPath, subnetEVMVersion1)
269+
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPath, subnetEVMVersion1, commands.PoaValidatorManagerOwner)
270270
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
271271
rpcs, err := utils.ParseRPCsFromOutput(deployOutput)
272272
if err != nil {
@@ -307,7 +307,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
307307
gomega.Expect(err).Should(gomega.BeNil())
308308

309309
// create and deploy
310-
commands.CreateCustomVMConfigSOV(subnetName, utils.SubnetEvmGenesisPath, customVMPath1)
310+
commands.CreateCustomVMConfigSOV(subnetName, utils.SubnetEvmGenesisPath, customVMPath1, commands.PoaValidatorManagerOwner)
311311
// need to set avago version manually since VMs are custom
312312
commands.StartNetworkWithVersion(avagoRPC1Version)
313313
deployOutput := commands.DeploySubnetLocallySOV(subnetName)
@@ -350,6 +350,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
350350
subnetName,
351351
utils.SubnetEvmGenesisPath,
352352
binaryToVersion[utils.SoloSubnetEVMKey1],
353+
commands.PoaValidatorManagerOwner,
353354
)
354355

355356
// check version
@@ -380,7 +381,7 @@ var _ = ginkgo.Describe("[Upgrade local network SOV]", ginkgo.Ordered, func() {
380381

381382
ginkgo.It("can upgrade subnet-evm on public deployment SOV", func() {
382383
_ = commands.StartNetworkWithVersion(binaryToVersion[utils.SoloAvagoKey])
383-
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPath, binaryToVersion[utils.SoloSubnetEVMKey1])
384+
commands.CreateSubnetEvmConfigWithVersionSOV(subnetName, utils.SubnetEvmGenesisPath, binaryToVersion[utils.SoloSubnetEVMKey1], commands.PoaValidatorManagerOwner)
384385

385386
// Simulate fuji deployment
386387
s := commands.SimulateFujiDeploySOV(subnetName, keyName, controlKeys)

0 commit comments

Comments
 (0)