Skip to content

Commit 98a408f

Browse files
kingpinXDlumtis
kingpinXD
and
lumtis
authored
refactor: add separate accounts for each policy in e2e tests (#2459)
* add policy accounts * seperate policy accounts for each policy type * remove fungible admin and add changelog * generate files --------- Co-authored-by: Lucas Bertrand <[email protected]>
1 parent ce8afec commit 98a408f

15 files changed

+147
-63
lines changed

‎changelog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
* [2349](https://github.com/zeta-chain/node/pull/2349) - add TestBitcoinDepositRefund and WithdrawBitcoinMultipleTimes E2E tests
7777
* [2368](https://github.com/zeta-chain/node/pull/2368) - eliminate panic usage across testing suite
7878
* [2369](https://github.com/zeta-chain/node/pull/2369) - fix random cross-chain swap failure caused by using tiny UTXO
79+
* [2549](https://github.com/zeta-chain/node/pull/2459) - add separate accounts for each policy in e2e tests
7980
* [2415](https://github.com/zeta-chain/node/pull/2415) - add e2e test for upgrade and test admin functionalities
8081

81-
8282
### Fixes
8383

8484
* [1484](https://github.com/zeta-chain/node/issues/1484) - replaced hard-coded `MaxLookaheadNonce` with a default lookback factor

‎cmd/zetae2e/config/localnet.yml

+13-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,19 @@ additional_accounts:
3232
bech32_address: "zeta17w0adeg64ky0daxwd2ugyuneellmjgnx4e483s"
3333
evm_address: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
3434
private_key: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
35-
user_fungible_admin:
36-
bech32_address: "zeta1svzuz982w09vf2y08xsh8qplj36phyz466krj3"
37-
evm_address: "0x8305C114Ea73cAc4A88f39A173803F94741b9055"
38-
private_key: "d88d09a7d6849c15a36eb6931f9dd616091a63e9849a2cc86f309ba11fb8fec5"
35+
policy_accounts:
36+
emergency_policy_account:
37+
bech32_address: "zeta16m2cnrdwtgweq4njc6t470vl325gw4kp6s7tap"
38+
evm_address: "0xd6d5898dAE5A1D905672c6975F3d9f8aA88756C1"
39+
private_key: "88BE93D11624B794F4BCC77BEA7385AF7EAD0B183B913485C74F0A803ABBC3F0"
40+
operational_policy_account:
41+
bech32_address: "zeta1pgx85vzx4fzh5zzyjqgs6a6cmaujd0xs8efrkc"
42+
evm_address: "0x0A0c7a3046AA457A084490110d7758Df7926bcd0"
43+
private_key: "59D1B982BD446545A1740ABD01F1ED9C162B72ACC1522B9B71B6DB5A9C37FA7D"
44+
admin_policy_account:
45+
bech32_address: "zeta142ds9x7raljv2qz9euys93e64gjmgdfnc47dwq"
46+
evm_address: "0xAa9b029BC3EFe4c50045Cf0902c73aAa25b43533"
47+
private_key: "0595CB0CD9BF5264A85A603EC8E43C30ADBB5FD2D9E2EF84C374EA4A65BB616C"
3948
rpcs:
4049
zevm: "http://zetacore0:8545"
4150
evm: "http://eth:8545"

‎cmd/zetae2e/local/local.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,12 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
126126

127127
zetaTxServer, err := txserver.NewZetaTxServer(
128128
conf.RPCs.ZetaCoreRPC,
129-
[]string{utils.FungibleAdminName},
130-
[]string{conf.AdditionalAccounts.UserFungibleAdmin.RawPrivateKey.String()},
129+
[]string{utils.EmergencyPolicyName, utils.OperationalPolicyName, utils.AdminPolicyName},
130+
[]string{
131+
conf.PolicyAccounts.EmergencyPolicyAccount.RawPrivateKey.String(),
132+
conf.PolicyAccounts.OperationalPolicyAccount.RawPrivateKey.String(),
133+
conf.PolicyAccounts.AdminPolicyAccount.RawPrivateKey.String(),
134+
},
131135
conf.ZetaChainID,
132136
)
133137
noError(err)

‎contrib/localnet/scripts/start-zetacored.sh

+22-5
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,20 @@ then
219219

220220
# set admin account
221221
zetacored add-genesis-account zeta1n0rn6sne54hv7w2uu93fl48ncyqz97d3kty6sh 100000000000000000000000000azeta # Funds the localnet_gov_admin account
222-
223-
address=$(yq -r '.additional_accounts.user_fungible_admin.bech32_address' /root/config.yml)
222+
223+
emergency_policy=$(yq -r '.policy_accounts.emergency_policy_account.bech32_address' /root/config.yml)
224+
admin_policy=$(yq -r '.policy_accounts.admin_policy_account.bech32_address' /root/config.yml)
225+
operational_policy=$(yq -r '.policy_accounts.operational_policy_account.bech32_address' /root/config.yml)
226+
227+
224228
zetacored add-genesis-account "$address" 100000000000000000000000000azeta
225-
cat $HOME/.zetacored/config/genesis.json | jq --arg address "$address" '.app_state["authority"]["policies"]["items"][0]["address"] = $address' > $HOME/.zetacored/config/tmp_genesis.json && mv $HOME/.zetacored/config/tmp_genesis.json $HOME/.zetacored/config/genesis.json
226-
cat $HOME/.zetacored/config/genesis.json | jq --arg address "$address" '.app_state["authority"]["policies"]["items"][1]["address"] = $address' > $HOME/.zetacored/config/tmp_genesis.json && mv $HOME/.zetacored/config/tmp_genesis.json $HOME/.zetacored/config/genesis.json
227-
cat $HOME/.zetacored/config/genesis.json | jq --arg address "$address" '.app_state["authority"]["policies"]["items"][2]["address"] = $address' > $HOME/.zetacored/config/tmp_genesis.json && mv $HOME/.zetacored/config/tmp_genesis.json $HOME/.zetacored/config/genesis.json
229+
zetacored add-genesis-account "$emergency_policy" 100000000000000000000000000azeta
230+
zetacored add-genesis-account "$admin_policy" 100000000000000000000000000azeta
231+
zetacored add-genesis-account "$operational_policy" 100000000000000000000000000azeta
232+
233+
cat $HOME/.zetacored/config/genesis.json | jq --arg address "$emergency_policy" '.app_state["authority"]["policies"]["items"][0]["address"] = $address' > $HOME/.zetacored/config/tmp_genesis.json && mv $HOME/.zetacored/config/tmp_genesis.json $HOME/.zetacored/config/genesis.json
234+
cat $HOME/.zetacored/config/genesis.json | jq --arg address "$operational_policy" '.app_state["authority"]["policies"]["items"][1]["address"] = $address' > $HOME/.zetacored/config/tmp_genesis.json && mv $HOME/.zetacored/config/tmp_genesis.json $HOME/.zetacored/config/genesis.json
235+
cat $HOME/.zetacored/config/genesis.json | jq --arg address "$admin_policy" '.app_state["authority"]["policies"]["items"][2]["address"] = $address' > $HOME/.zetacored/config/tmp_genesis.json && mv $HOME/.zetacored/config/tmp_genesis.json $HOME/.zetacored/config/genesis.json
228236

229237
# give balance to runner accounts to deploy contracts directly on zEVM
230238
# default account
@@ -242,6 +250,15 @@ then
242250
# ethers tester
243251
address=$(yq -r '.additional_accounts.user_ether.bech32_address' /root/config.yml)
244252
zetacored add-genesis-account "$address" 100000000000000000000000000azeta
253+
# emergency policy account
254+
address=$(yq -r '.policy_accounts.emergency_policy_account.bech32_address' /root/config.yml)
255+
zetacored add-genesis-account "$address" 100000000000000000000000000azeta
256+
# admin policy account
257+
address=$(yq -r '.policy_accounts.admin_policy_account.bech32_address' /root/config.yml)
258+
zetacored add-genesis-account "$address" 100000000000000000000000000azeta
259+
# operational policy account
260+
address=$(yq -r '.policy_accounts.operational_policy_account.bech32_address' /root/config.yml)
261+
zetacored add-genesis-account "$address" 100000000000000000000000000azeta
245262

246263
# 3. Copy the genesis.json to all the nodes .And use it to create a gentx for every node
247264
zetacored gentx operator 1000000000000000000000azeta --chain-id=$CHAINID --keyring-backend=$KEYRING --gas-prices 20000000000azeta

‎e2e/config/config.go

+44-11
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ type Config struct {
4343
// Default account to use when running tests and running setup
4444
DefaultAccount Account `yaml:"default_account"`
4545
AdditionalAccounts AdditionalAccounts `yaml:"additional_accounts"`
46+
PolicyAccounts PolicyAccounts `yaml:"policy_accounts"`
4647
RPCs RPCs `yaml:"rpcs"`
4748
Contracts Contracts `yaml:"contracts"`
4849
ZetaChainID string `yaml:"zeta_chain_id"`
@@ -57,14 +58,19 @@ type Account struct {
5758

5859
// AdditionalAccounts are extra accounts required to run specific tests
5960
type AdditionalAccounts struct {
60-
UserERC20 Account `yaml:"user_erc20"`
61-
UserZetaTest Account `yaml:"user_zeta_test"`
62-
UserZEVMMPTest Account `yaml:"user_zevm_mp_test"`
63-
UserBitcoin Account `yaml:"user_bitcoin"`
64-
UserEther Account `yaml:"user_ether"`
65-
UserMisc Account `yaml:"user_misc"`
66-
UserAdmin Account `yaml:"user_admin"`
67-
UserFungibleAdmin Account `yaml:"user_fungible_admin"`
61+
UserERC20 Account `yaml:"user_erc20"`
62+
UserZetaTest Account `yaml:"user_zeta_test"`
63+
UserZEVMMPTest Account `yaml:"user_zevm_mp_test"`
64+
UserBitcoin Account `yaml:"user_bitcoin"`
65+
UserEther Account `yaml:"user_ether"`
66+
UserMisc Account `yaml:"user_misc"`
67+
UserAdmin Account `yaml:"user_admin"`
68+
}
69+
70+
type PolicyAccounts struct {
71+
EmergencyPolicyAccount Account `yaml:"emergency_policy_account"`
72+
OperationalPolicyAccount Account `yaml:"operational_policy_account"`
73+
AdminPolicyAccount Account `yaml:"admin_policy_account"`
6874
}
6975

7076
// RPCs contains the configuration for the RPC endpoints
@@ -192,7 +198,14 @@ func (a AdditionalAccounts) AsSlice() []Account {
192198
a.UserEther,
193199
a.UserMisc,
194200
a.UserAdmin,
195-
a.UserFungibleAdmin,
201+
}
202+
}
203+
204+
func (a PolicyAccounts) AsSlice() []Account {
205+
return []Account{
206+
a.EmergencyPolicyAccount,
207+
a.OperationalPolicyAccount,
208+
a.AdminPolicyAccount,
196209
}
197210
}
198211

@@ -216,9 +229,21 @@ func (c Config) Validate() error {
216229
}
217230
err := account.Validate()
218231
if err != nil {
219-
return fmt.Errorf("validating account %d: %w", i, err)
232+
return fmt.Errorf("validating additional account %d: %w", i, err)
220233
}
221234
}
235+
236+
policyAccounts := c.PolicyAccounts.AsSlice()
237+
for i, account := range policyAccounts {
238+
if account.RawEVMAddress == "" {
239+
continue
240+
}
241+
err := account.Validate()
242+
if err != nil {
243+
return fmt.Errorf("validating policy account %d: %w", i, err)
244+
}
245+
}
246+
222247
return nil
223248
}
224249

@@ -257,7 +282,15 @@ func (c *Config) GenerateKeys() error {
257282
if err != nil {
258283
return err
259284
}
260-
c.AdditionalAccounts.UserFungibleAdmin, err = generateAccount()
285+
c.PolicyAccounts.EmergencyPolicyAccount, err = generateAccount()
286+
if err != nil {
287+
return err
288+
}
289+
c.PolicyAccounts.OperationalPolicyAccount, err = generateAccount()
290+
if err != nil {
291+
return err
292+
}
293+
c.PolicyAccounts.AdminPolicyAccount, err = generateAccount()
261294
if err != nil {
262295
return err
263296
}

‎e2e/e2etests/test_erc20_deposit_refund.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@ func TestERC20DepositAndCallRefund(r *runner.E2ERunner, _ []string) {
3636
r.Logger.CCTX(*cctx, "deposit")
3737
r.Logger.Info("Refunding the cctx via admin")
3838

39-
msg := types.NewMsgRefundAbortedCCTX(r.ZetaTxServer.GetAccountAddress(0), cctx.Index, r.EVMAddress().String())
39+
msg := types.NewMsgRefundAbortedCCTX(
40+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.OperationalPolicyName),
41+
cctx.Index,
42+
r.EVMAddress().String(),
43+
)
4044

41-
_, err = r.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, msg)
45+
_, err = r.ZetaTxServer.BroadcastTx(utils.OperationalPolicyName, msg)
4246
require.NoError(r, err)
4347

4448
// Check that the erc20 in the aborted cctx was refunded on ZetaChain

‎e2e/e2etests/test_eth_deposit_liquidity_cap.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ func TestDepositEtherLiquidityCap(r *runner.E2ERunner, args []string) {
2525
amountLessThanCap := liquidityCapArg.BigInt().Div(liquidityCapArg.BigInt(), big.NewInt(10)) // 1/10 of the cap
2626
amountMoreThanCap := liquidityCapArg.BigInt().Mul(liquidityCapArg.BigInt(), big.NewInt(10)) // 10 times the cap
2727
msg := fungibletypes.NewMsgUpdateZRC20LiquidityCap(
28-
r.ZetaTxServer.GetAccountAddress(0),
28+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.OperationalPolicyName),
2929
r.ETHZRC20Addr.Hex(),
3030
liquidityCap,
3131
)
32-
res, err := r.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, msg)
32+
res, err := r.ZetaTxServer.BroadcastTx(utils.OperationalPolicyName, msg)
3333
require.NoError(r, err)
3434

3535
r.Logger.Info("set liquidity cap tx hash: %s", res.TxHash)
@@ -69,12 +69,12 @@ func TestDepositEtherLiquidityCap(r *runner.E2ERunner, args []string) {
6969

7070
r.Logger.Info("Removing the liquidity cap")
7171
msg = fungibletypes.NewMsgUpdateZRC20LiquidityCap(
72-
r.ZetaTxServer.GetAccountAddress(0),
72+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.OperationalPolicyName),
7373
r.ETHZRC20Addr.Hex(),
7474
math.ZeroUint(),
7575
)
7676

77-
res, err = r.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, msg)
77+
res, err = r.ZetaTxServer.BroadcastTx(utils.OperationalPolicyName, msg)
7878
require.NoError(r, err)
7979

8080
r.Logger.Info("remove liquidity cap tx hash: %s", res.TxHash)

‎e2e/e2etests/test_migrate_chain_support.go

+21-20
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,28 @@ func TestMigrateChainSupport(r *runner.E2ERunner, _ []string) {
5858

5959
// update the chain params to set up the chain
6060
chainParams := getNewEVMChainParams(newRunner)
61-
adminAddr, err := newRunner.ZetaTxServer.GetAccountAddressFromName(utils.FungibleAdminName)
62-
require.NoError(r, err)
6361

64-
_, err = newRunner.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, observertypes.NewMsgUpdateChainParams(
65-
adminAddr,
62+
_, err = newRunner.ZetaTxServer.BroadcastTx(utils.OperationalPolicyName, observertypes.NewMsgUpdateChainParams(
63+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.OperationalPolicyName),
6664
chainParams,
6765
))
6866
require.NoError(r, err)
6967

7068
// setup the gas token
7169
require.NoError(r, err)
72-
_, err = newRunner.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, fungibletypes.NewMsgDeployFungibleCoinZRC20(
73-
adminAddr,
74-
"",
75-
chainParams.ChainId,
76-
18,
77-
"Sepolia ETH",
78-
"sETH",
79-
coin.CoinType_Gas,
80-
100000,
81-
))
70+
_, err = newRunner.ZetaTxServer.BroadcastTx(
71+
utils.OperationalPolicyName,
72+
fungibletypes.NewMsgDeployFungibleCoinZRC20(
73+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.OperationalPolicyName),
74+
"",
75+
chainParams.ChainId,
76+
18,
77+
"Sepolia ETH",
78+
"sETH",
79+
coin.CoinType_Gas,
80+
100000,
81+
),
82+
)
8283
require.NoError(r, err)
8384

8485
// set the gas token in the runner
@@ -95,8 +96,8 @@ func TestMigrateChainSupport(r *runner.E2ERunner, _ []string) {
9596
newRunner.ETHZRC20 = ethZRC20
9697

9798
// set the chain nonces for the new chain
98-
_, err = r.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, observertypes.NewMsgResetChainNonces(
99-
adminAddr,
99+
_, err = r.ZetaTxServer.BroadcastTx(utils.OperationalPolicyName, observertypes.NewMsgResetChainNonces(
100+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.OperationalPolicyName),
100101
chainParams.ChainId,
101102
0,
102103
0,
@@ -106,8 +107,8 @@ func TestMigrateChainSupport(r *runner.E2ERunner, _ []string) {
106107
// deactivate the previous chain
107108
chainParams = observertypes.GetDefaultGoerliLocalnetChainParams()
108109
chainParams.IsSupported = false
109-
_, err = newRunner.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, observertypes.NewMsgUpdateChainParams(
110-
adminAddr,
110+
_, err = newRunner.ZetaTxServer.BroadcastTx(utils.OperationalPolicyName, observertypes.NewMsgUpdateChainParams(
111+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.OperationalPolicyName),
111112
chainParams,
112113
))
113114
require.NoError(r, err)
@@ -155,8 +156,8 @@ func TestMigrateChainSupport(r *runner.E2ERunner, _ []string) {
155156

156157
// whitelist erc20 zrc20
157158
newRunner.Logger.Info("whitelisting ERC20 on new network")
158-
res, err := newRunner.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, crosschaintypes.NewMsgWhitelistERC20(
159-
adminAddr,
159+
res, err := newRunner.ZetaTxServer.BroadcastTx(utils.OperationalPolicyName, crosschaintypes.NewMsgWhitelistERC20(
160+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.OperationalPolicyName),
160161
newRunner.ERC20Addr.Hex(),
161162
chains.Sepolia.ChainId,
162163
"USDT",

‎e2e/e2etests/test_pause_zrc20.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ func TestPauseZRC20(r *runner.E2ERunner, _ []string) {
3535
// Pause ETH ZRC20
3636
r.Logger.Info("Pausing ETH")
3737
msgPause := fungibletypes.NewMsgPauseZRC20(
38-
r.ZetaTxServer.GetAccountAddress(0),
38+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.EmergencyPolicyName),
3939
[]string{r.ETHZRC20Addr.Hex()},
4040
)
41-
res, err := r.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, msgPause)
41+
res, err := r.ZetaTxServer.BroadcastTx(utils.EmergencyPolicyName, msgPause)
4242
require.NoError(r, err)
4343
r.Logger.Info("pause zrc20 tx hash: %s", res.TxHash)
4444

@@ -106,10 +106,10 @@ func TestPauseZRC20(r *runner.E2ERunner, _ []string) {
106106
// Unpause ETH ZRC20
107107
r.Logger.Info("Unpausing ETH")
108108
msgUnpause := fungibletypes.NewMsgUnpauseZRC20(
109-
r.ZetaTxServer.GetAccountAddress(0),
109+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.OperationalPolicyName),
110110
[]string{r.ETHZRC20Addr.Hex()},
111111
)
112-
res, err = r.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, msgUnpause)
112+
res, err = r.ZetaTxServer.BroadcastTx(utils.OperationalPolicyName, msgUnpause)
113113
require.NoError(r, err)
114114

115115
r.Logger.Info("unpause zrc20 tx hash: %s", res.TxHash)

‎e2e/e2etests/test_rate_limiter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,11 @@ func waitForWithdrawMined(
167167

168168
// setupRateLimiterFlags sets up the rate limiter flags with flags defined in the test
169169
func setupRateLimiterFlags(r *runner.E2ERunner, flags crosschaintypes.RateLimiterFlags) error {
170-
adminAddr, err := r.ZetaTxServer.GetAccountAddressFromName(utils.FungibleAdminName)
170+
adminAddr, err := r.ZetaTxServer.GetAccountAddressFromName(utils.OperationalPolicyName)
171171
if err != nil {
172172
return err
173173
}
174-
_, err = r.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, crosschaintypes.NewMsgUpdateRateLimiterFlags(
174+
_, err = r.ZetaTxServer.BroadcastTx(utils.OperationalPolicyName, crosschaintypes.NewMsgUpdateRateLimiterFlags(
175175
adminAddr,
176176
flags,
177177
))

‎e2e/e2etests/test_update_bytecode_connector.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ func TestUpdateBytecodeConnector(r *runner.E2ERunner, _ []string) {
4646

4747
r.Logger.Info("Updating the bytecode of the Connector")
4848
msg := fungibletypes.NewMsgUpdateContractBytecode(
49-
r.ZetaTxServer.GetAccountAddress(0),
49+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.AdminPolicyName),
5050
r.ConnectorZEVMAddr.Hex(),
5151
codeHashRes.CodeHash,
5252
)
53-
res, err := r.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, msg)
53+
res, err := r.ZetaTxServer.BroadcastTx(utils.AdminPolicyName, msg)
5454
require.NoError(r, err)
5555
r.Logger.Info("Update connector bytecode tx hash: %s", res.TxHash)
5656

‎e2e/e2etests/test_update_bytecode_zrc20.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ func TestUpdateBytecodeZRC20(r *runner.E2ERunner, _ []string) {
6868

6969
r.Logger.Info("Updating the bytecode of the ZRC20")
7070
msg := fungibletypes.NewMsgUpdateContractBytecode(
71-
r.ZetaTxServer.GetAccountAddress(0),
71+
r.ZetaTxServer.MustGetAccountAddressFromName(utils.AdminPolicyName),
7272
r.ETHZRC20Addr.Hex(),
7373
codeHashRes.CodeHash,
7474
)
75-
res, err := r.ZetaTxServer.BroadcastTx(utils.FungibleAdminName, msg)
75+
res, err := r.ZetaTxServer.BroadcastTx(utils.AdminPolicyName, msg)
7676
require.NoError(r, err)
7777

7878
r.Logger.Info("Update zrc20 bytecode tx hash: %s", res.TxHash)

‎e2e/runner/setup_zeta.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (r *E2ERunner) SetZEVMContracts() {
7575

7676
// deploy system contracts and ZRC20 contracts on ZetaChain
7777
uniswapV2FactoryAddr, uniswapV2RouterAddr, zevmConnectorAddr, wzetaAddr, erc20zrc20Addr, err := r.ZetaTxServer.DeploySystemContractsAndZRC20(
78-
e2eutils.FungibleAdminName,
78+
e2eutils.OperationalPolicyName,
7979
r.ERC20Addr.Hex(),
8080
)
8181
require.NoError(r, err)
@@ -209,12 +209,12 @@ func (r *E2ERunner) SetupBTCZRC20() {
209209
func (r *E2ERunner) EnableHeaderVerification(chainIDList []int64) error {
210210
r.Logger.Print("⚙️ enabling verification flags for block headers")
211211

212-
return r.ZetaTxServer.EnableHeaderVerification(e2eutils.FungibleAdminName, chainIDList)
212+
return r.ZetaTxServer.EnableHeaderVerification(e2eutils.OperationalPolicyName, chainIDList)
213213
}
214214

215215
// FundEmissionsPool funds the emissions pool on ZetaChain with the same value as used originally on mainnet (20M ZETA)
216216
func (r *E2ERunner) FundEmissionsPool() error {
217217
r.Logger.Print("⚙️ funding the emissions pool on ZetaChain with 20M ZETA (%s)", txserver.EmissionsPoolAddress)
218218

219-
return r.ZetaTxServer.FundEmissionsPool(e2eutils.FungibleAdminName, EmissionsPoolFunding)
219+
return r.ZetaTxServer.FundEmissionsPool(e2eutils.OperationalPolicyName, EmissionsPoolFunding)
220220
}

0 commit comments

Comments
 (0)