Skip to content

Commit b8c0030

Browse files
rkolpakovrkolpakov
committed
fix: script iteration
1 parent df047f8 commit b8c0030

File tree

4 files changed

+141
-61
lines changed

4 files changed

+141
-61
lines changed

‎interfaces/RolesValidator.json‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
[
2+
{ "inputs": [], "stateMutability": "nonpayable", "type": "constructor" },
3+
{
4+
"inputs": [
5+
{ "internalType": "address", "name": "entity", "type": "address" },
6+
{ "internalType": "string", "name": "roleName", "type": "string" },
7+
{ "internalType": "address", "name": "app", "type": "address" }
8+
],
9+
"name": "AragonPermissionGranted",
10+
"type": "error"
11+
},
12+
{
13+
"inputs": [
14+
{ "internalType": "address", "name": "entity", "type": "address" },
15+
{ "internalType": "string", "name": "roleName", "type": "string" },
16+
{
17+
"internalType": "address",
18+
"name": "expectedManager",
19+
"type": "address"
20+
},
21+
{ "internalType": "address", "name": "actualManager", "type": "address" }
22+
],
23+
"name": "AragonPermissionInvalidManager",
24+
"type": "error"
25+
},
26+
{
27+
"inputs": [
28+
{ "internalType": "address", "name": "entity", "type": "address" },
29+
{ "internalType": "string", "name": "roleName", "type": "string" },
30+
{ "internalType": "address", "name": "app", "type": "address" }
31+
],
32+
"name": "AragonPermissionNotGranted",
33+
"type": "error"
34+
},
35+
{
36+
"inputs": [
37+
{ "internalType": "address", "name": "entity", "type": "address" },
38+
{ "internalType": "string", "name": "roleName", "type": "string" },
39+
{ "internalType": "address", "name": "app", "type": "address" }
40+
],
41+
"name": "OZRoleNotGranted",
42+
"type": "error"
43+
},
44+
{
45+
"anonymous": false,
46+
"inputs": [
47+
{
48+
"indexed": false,
49+
"internalType": "address",
50+
"name": "entity",
51+
"type": "address"
52+
},
53+
{
54+
"indexed": false,
55+
"internalType": "string",
56+
"name": "roleName",
57+
"type": "string"
58+
}
59+
],
60+
"name": "RoleValidated",
61+
"type": "event"
62+
},
63+
{
64+
"inputs": [],
65+
"name": "ACL",
66+
"outputs": [
67+
{ "internalType": "contract IACL", "name": "", "type": "address" }
68+
],
69+
"stateMutability": "view",
70+
"type": "function"
71+
},
72+
{
73+
"inputs": [],
74+
"name": "ACL_ADDRESS",
75+
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
76+
"stateMutability": "view",
77+
"type": "function"
78+
},
79+
{
80+
"inputs": [],
81+
"name": "AGENT",
82+
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
83+
"stateMutability": "view",
84+
"type": "function"
85+
},
86+
{
87+
"inputs": [],
88+
"name": "EASYTRACK_ALLOWED_TOKENS_REGISTRY",
89+
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
90+
"stateMutability": "view",
91+
"type": "function"
92+
},
93+
{
94+
"inputs": [],
95+
"name": "LIDO",
96+
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
97+
"stateMutability": "view",
98+
"type": "function"
99+
},
100+
{
101+
"inputs": [],
102+
"name": "VOTING",
103+
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
104+
"stateMutability": "view",
105+
"type": "function"
106+
},
107+
{
108+
"inputs": [],
109+
"name": "WITHDRAWAL_QUEUE",
110+
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
111+
"stateMutability": "view",
112+
"type": "function"
113+
},
114+
{
115+
"inputs": [
116+
{
117+
"internalType": "address",
118+
"name": "dgAdminExecutor",
119+
"type": "address"
120+
},
121+
{
122+
"internalType": "address",
123+
"name": "dgResealManager",
124+
"type": "address"
125+
}
126+
],
127+
"name": "validate",
128+
"outputs": [],
129+
"stateMutability": "nonpayable",
130+
"type": "function"
131+
}
132+
]

‎interfaces/RolesVerifier.json‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎scripts/dual_governance_downgrade_holesky.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
encode_permission_grant,
1919
)
2020
from utils.mainnet_fork import pass_and_exec_dao_vote
21-
from dual_governance_upgrade_holesky import dual_governance_contracts
21+
from scripts.dual_governance_upgrade_holesky import dual_governance_contracts
2222

2323

2424
try:

‎scripts/dual_governance_upgrade_holesky.py‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,13 @@
3232

3333
dual_governance_contracts = {
3434
"adminExecutor": "0x936C1dC7d5fAD05E5aD9aBc48b4ab09B88850f04",
35-
"timelock": "0x388AB7b65605e21a75Bb50E24a1eA43DD0091fa5",
36-
"emergencyGovernance": "0xd67d96C6C4DF1eF12c2fb4C908a9484333cEfE60",
37-
"resealManager": "0x632c29848A379a7B30Ee6461ea5e7e1e92d264d0",
3835
"dualGovernance": "0x9F14118Fc548658660a40B351C782a22e9937b42",
39-
"tiebreakerCoreCommittee": "0x6093B9b951C72498EE799639D74dC701Ead3f07B",
40-
"tiebreakerSubCommitteeInfluencers": "0x8F4b730099BFcA35fa4bbFD84f790eD34CAa246f",
41-
"tiebreakerSubCommitteeNodeOperators": "0xBB259276147Af98c0e9186e783D4dbC26e82652F",
42-
"tiebreakerSubCommitteeProtocols": "0x485349eBc3241e0bE8eDf7149C535c0b42Fa9504",
43-
"temporaryEmergencyGovernance": "0xc7467FeFF717C18db08BAEF252f11A84F48e8fF7",
44-
# "EMERGENCY_ACTIVATION_COMMITTEE": "0x526d46eCa1d7969924e981ecDbcAa74e9f0EE566",
45-
# "EMERGENCY_EXECUTION_COMMITTEE": "0x526d46eCa1d7969924e981ecDbcAa74e9f0EE566",
36+
"resealManager": "0x632c29848A379a7B30Ee6461ea5e7e1e92d264d0",
4637
}
4738

4839
def start_vote(tx_params: Dict[str, str], silent: bool = False):
4940
foo_contract = interface.Foo("0xC3fc22C7e0d20247B797fb6dc743BD3879217c81")
50-
roles_verifier = interface.RolesVerifier("0xe0144de0e89390dc469425f471527d9d6bc98b05")
41+
roles_validator = interface.RolesValidator("0x0F8826a574BCFDC4997939076f6D82877971feB3")
5142

5243
vote_desc_items, call_script_items = zip(
5344
(
@@ -125,14 +116,16 @@ def start_vote(tx_params: Dict[str, str], silent: bool = False):
125116
encode_permission_grant(
126117
target_app=contracts.agent,
127118
permission_name="RUN_SCRIPT_ROLE",
128-
grant_to=contracts.dual_governance_admin_executor,
119+
grant_to=dual_governance_contracts["adminExecutor"],
129120
),
130121
),
131122
(
132-
"Verifiy transferred roles",
123+
"Validate transferred roles",
133124
(
134-
roles_verifier.address,
135-
roles_verifier.verify.encode_input()
125+
roles_validator.address,
126+
roles_validator.validate.encode_input(
127+
dual_governance_contracts['adminExecutor'], dual_governance_contracts['resealManager']
128+
),
136129
)
137130
),
138131
(

0 commit comments

Comments
 (0)